fix usage() to print both rs232 interfaces

README.md

@@ -5,8 +5,9 @@ printing receptions and reporting them to wsprnet and pskreporter.
 The programs with switch among bands automatically on a few radio types.
 The software works on Macs, Linux, and FreeBSD.
 
-I've borrowed code and ideas from Joe Taylor, Phil Karn, and others
-identified in comments in the code.
+While these programs don't use Joe Taylor's WSJT software, they do
+incorporate ideas from that software. These programs use Phil Karn's
+Reed-Solomon and convolutional decoders.
 
 The software depends on a few packages. Here's how to install them
 on Ubuntu Linux:

pskreport.py

@@ -160,14 +160,3 @@ def got(self, call, hz, mode, grid, tm):
             self.send(pkt)
             self.pending = [ ]
             self.last_send = time.time()
-
-if __name__ == '__main__':
-    pskr = T("AB1HL", "FN42", "weakmon 0.2", True)
-
-    #pkt = pskr.fmt([ [ "W1WW", 10138000, "CW", "EM11", time.time() ],
-    #                 [ "K1D", 14076000, "JT65", "DD14", time.time() ] ])
-    #pskr.dump(pkt)
-    #pskr.send(pkt)
-
-    pskr.got("W1WW", 10138000, "CW", "EM11", time.time())
-    pskr.got("K1D", 14076000, "JT65", "DD14", time.time())

weakargs.py

@@ -5,6 +5,7 @@
 import argparse
 import sys
 import weakaudio
+import weakcat
 import time
 
 #
@@ -22,6 +23,7 @@ def stdparse(description):
   def myerror(message):
     parser.print_usage(sys.stderr)
     weakaudio.usage()
+    weakcat.usage()
     parser.exit(2, ('%s: error: %s\n') % (parser.prog, message))
 
   parser.error = myerror

weakcat.py

@@ -135,7 +135,7 @@ def getf(self, vfo):
     # DATA. DATA A. USB. 2.8 khz.
     # need to do it for each ham band.
     def set_usb_data(self):
-        for mhz in [ 1.8, 3.5, 7.0, 10.1, 14.0, 18.068, 21.0, 24.890, 28.0 ]:
+        for mhz in [ 3.576, 7.076, 10.138, 14.076, 18.102, 21.076, 24.917, 28.076 ]:
             self.setf(0, int(mhz * 1000000))
             self.cmd("MD6") # DATA
             self.cmd("DT0") # DATA A

wsprmon.py

@@ -186,7 +186,7 @@ def gonet(self):
                 url += "tcall=%s&" % (call)
                 url += "tgrid=%s&" % (grid)
                 url += "dbm=%s&" % (dbm)
-                url += "version=weakmon-0.2&"
+                url += "version=weakmon-0.3&"
                 url += "mode=2"
 
                 try: