Added some subghz page to some tools

Author: rmspeers

killerbee/__init__.py

@@ -315,7 +315,7 @@ def page(self):
         # Driver must have this variable name set in its set_channel function
         return self.driver._page
 
-    def set_channel(self, channel, page= 0):
+    def set_channel(self, channel, page=0):
         '''
         Sets the radio interface to the specifid channel & page (subghz)
         @type channel: Integer

tools/zbjammer

@@ -24,6 +24,7 @@ def interrupt(signum, frame):
 parser = argparse.ArgumentParser(description=__doc__)
 parser.add_argument('-i', '--iface', '--dev', action='store', dest='devstring')
 parser.add_argument('-c', '-f', '--channel', action='store', type=int, default=None)
+parser.add_argument('-z', '--subghz_page', action='store', type=int, default=0)
 parser.add_argument('-D', action='store_true', dest='showdev')
 args = parser.parse_args()
 
@@ -37,11 +38,11 @@ if args.channel == None:
 
 kb = KillerBee(device=args.devstring)
 signal.signal(signal.SIGINT, interrupt)
-if not kb.is_valid_channel(args.channel):
-    print >>sys.stderr, "ERROR: Must specify a valid IEEE 802.15.4 channel for the selected device."
+if not kb.is_valid_channel(args.channel, args.subghz_page):
+    print >>sys.stderr, "ERROR: Must specify a valid IEEE 802.15.4 channel/page for the selected device."
     kb.close()
     sys.exit(1)
-kb.set_channel(args.channel)
+kb.set_channel(args.channel, page=args.subghz_page)
 
 print "zbjammer: jamming channel", args.channel
 print "*** WARNING: this may not actually work on your hardware! Check with spectrum analyser!"

tools/zbrealign

@@ -49,6 +49,7 @@ if __name__ == '__main__':
     # Command-line arguments
     parser = argparse.ArgumentParser()
     parser.add_argument('-f', '--channel', '-c', action='store', dest='channel', required=True, type=int, default=11)
+    parser.add_argument('-z', '--subghz_page', action='store', type=int, default=0)
     parser.add_argument('-i', '--interface', action='store', dest='devstring', default=None)
     parser.add_argument('-p', '--panid', help="The current PAN ID of the victim PAN", action='store', required=True, type=tohex)
     parser.add_argument('-s', '--coordinator', help="Realignment packet coordinator short address", action='store', required=True, type=tohex)
@@ -66,7 +67,7 @@ if __name__ == '__main__':
     #TODO: seqnums for each direction
 
     kb = KillerBee(device=args.devstring)
-    kb.set_channel(args.channel)
+    kb.set_channel(args.channel, page=args.subghz_page)
 
     seqnummac = args.srcseq
 

tools/zbreplay

@@ -44,6 +44,7 @@ parser.add_argument('-r', '--pcapfile', action='store', default=None)
 parser.add_argument('-R', '--dsnafile', action='store', default=None)
 #parser.add_argument('-g', '--gps', '--ignore', action='append', dest='ignore')
 parser.add_argument('-c', '-f', '--channel', action='store', type=int, default=None)
+parser.add_argument('-z', '--subghz_page', action='store', type=int, default=0)
 parser.add_argument('-n', '--count', action='store', type=int, default=-1)
 parser.add_argument('-s', '--sleep', action='store', type=float, default=1.0)
 parser.add_argument('-D', action='store_true', dest='showdev')
@@ -69,11 +70,11 @@ elif args.dsnafile is not None:
 
 kb = KillerBee(device=args.devstring)
 signal.signal(signal.SIGINT, interrupt)
-if not kb.is_valid_channel(args.channel):
-    print >>sys.stderr, "ERROR: Must specify a valid IEEE 802.15.4 channel for the selected device."
+if not kb.is_valid_channel(args.channel, args.subghz_page):
+    print >>sys.stderr, "ERROR: Must specify a valid IEEE 802.15.4 channel/page for the selected device."
     kb.close()
     sys.exit(1)
-kb.set_channel(args.channel)
+kb.set_channel(args.channel, page=args.subghz_page)
 
 print("zbreplay: retransmitting frames from \'{0}\' on interface \'{1}\' with a delay of {2} seconds.".format(savefile, kb.get_dev_info()[0], args.sleep))