#12. cleaner UI

openwsn-berkeley · Oct 20, 2021 · fc1d6c6 · fc1d6c6
1 parent 837e13a
commit fc1d6c6
Show file tree

Hide file tree

Showing 6 changed files with 4,006 additions and 3,874 deletions.
diff --git a/01_software/scumprogrammer/InterfaceWeb.py b/01_software/scumprogrammer/InterfaceWeb.py
@@ -87,8 +87,12 @@ def _webhandle_data_GET(self):
     def _webhandle_action_POST(self):
         cmdjson = bottle.request.json
         elem    = cmdjson['element'][len("button_"):-len("_rect")]
-        if   elem=='bootload':
-            self.scumConnector.bootload(self.binfile)
+        if   elem=='transfer':
+            self.scumConnector.transfer(self.binfile)
+        elif elem=='clear':
+            self.scumConnector.clear()
+        elif elem=='load':
+            self.scumConnector.load()
         elif elem=='reset':
             self.scumConnector.reset()
         elif elem=='GPIOcal':

diff --git a/01_software/scumprogrammer/ScumConnector.py b/01_software/scumprogrammer/ScumConnector.py
@@ -48,7 +48,7 @@ def get_isconnected(self):
 
     #=== commands
 
-    def bootload(self,binfile):
+    def transfer(self,binfile):
 
         # read file
         with open(binfile,'rb') as f:
@@ -71,11 +71,14 @@ def bootload(self,binfile):
         for (offset,chunk) in enumerate(chunks):
             self.hdlc.send([self.CMD_CHUNK,offset%256,len(chunks)%256]+chunk)
 
-        # send load
-        self.hdlc.send([self.CMD_LOAD])
-
         print('end ({:03f})'.format(time.time()-startts))
 
+    def clear(self):
+        self.hdlc.send([self.CMD_CLEAR])
+
+    def load(self):
+        self.hdlc.send([self.CMD_LOAD])
+
     def reset(self):
         self.hdlc.send([self.CMD_RESET])
 

diff --git a/01_software/scumprogrammer/static/scum.js b/01_software/scumprogrammer/static/scum.js
@@ -20,7 +20,7 @@ function loadSvg() {
 function buildPage() {
 
     // buttons can be clicked
-    buttonNames = ["bootload","reset","GPIOcal"]
+    buttonNames = ["transfer","clear","load","reset","GPIOcal"]
     for (var i in buttonNames) {
         d3.select("#button_"+buttonNames[i]+"_rect")
             .classed("button", true);

diff --git a/01_software/scumprogrammer/static/scumprogrammer_ui.ai b/01_software/scumprogrammer/static/scumprogrammer_ui.ai
diff --git a/01_software/scumprogrammer/static/scumprogrammer_ui.svg b/01_software/scumprogrammer/static/scumprogrammer_ui.svg
diff --git a/02_firmware_nRF52840-DK/scum-programmer.c b/02_firmware_nRF52840-DK/scum-programmer.c
@@ -176,11 +176,41 @@ static bool cmd_handler_LOAD(uint8_t* cmd, uint8_t cmdLen) {
 }
 
 static bool cmd_handler_RESET(uint8_t* cmd, uint8_t cmdLen) {
-    return true; // TODO
+    bool returnVal;
+
+    returnVal = false;
+    do {
+        // check
+        if (cmdLen!=0) {
+            break;
+        }
+        returnVal = true;
+
+        // do
+        // TODO
+
+    } while(0);
+
+    return returnVal;
 }
 
 static bool cmd_handler_GPIOCAL(uint8_t* cmd, uint8_t cmdLen){
-    return true; // TODO
+    bool returnVal;
+
+    returnVal = false;
+    do {
+        // check
+        if (cmdLen!=1) {
+            break;
+        }
+        returnVal = true;
+
+        // do
+        // TODO
+
+    } while(0);
+
+    return returnVal;
 }
 
 //=== hdlc