Standardizing Chipcon interface, bringing it into line with the NRF code.

[goodfet] / client / goodfet.cc

diff --git a/client/goodfet.cc b/client/goodfet.cc
index b2e76bd..f5e46b5 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -14,13 +14,14 @@ from intelhex import IntelHex;
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
+    print "%s erase" % sys.argv[0];
+    print "%s flash $foo.hex" % sys.argv[0];
     print "%s test" % sys.argv[0];
     print "%s term" % sys.argv[0];
     print "%s info" % sys.argv[0];
-    print "%s radioinfo" % sys.argv[0];
+    print "%s regs" % sys.argv[0];
     print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s dumpdata $foo.hex [0x$start 0x$stop]" % sys.argv[0];
-    print "%s erase" % sys.argv[0];
     print "%s writedata $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s peekdata 0x$start [0x$stop]" % sys.argv[0];
@@ -39,8 +40,6 @@ client.serInit()
 client.setup();
 client.start();
 
-#Get SmartRF Studio regs if they exist.
-#client.loadsymbols(); 
 
 if(sys.argv[1]=="explore"):
     print "Exploring undefined commands."
@@ -98,9 +97,16 @@ if(sys.argv[1]=="dumpdata"):
 if(sys.argv[1]=="status"):
     print "Status: %s" %client.status();
 if(sys.argv[1]=="info"):
-    print "%s" % client.CCidentstr();
-if(sys.argv[1]=="radioinfo"):
+    print "Ident   %s" % client.CCidentstr();
+    print "Freq    %10.3f MHz" % (client.RF_getfreq()/10**6);
+    #print "Rate    %10i kbps" % (client.RF_getrate()/1000);
+    #print "PacketLen %02i bytes" % client.RF_getpacketlen();
+    #print "SMAC  0x%010x" % client.RF_getsmac();
+    #print "TMAC  0x%010x" % client.RF_gettmac();
+
+if(sys.argv[1]=="regs"):
     client.CMDrs();
+
 if(sys.argv[1]=="erase"):
     print "Status: %s" % client.status();
     client.CCchiperase();