change the default values of WebUI fields

minor refactoring on web server global variable reading
insighio · Sep 29, 2021 · 141f10e · 141f10e
1 parent 3ab50c1
commit 141f10e
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/insighioNode/apps/demo_console/templ/lora_config_templ.py b/insighioNode/apps/demo_console/templ/lora_config_templ.py
@@ -8,9 +8,9 @@
 _MAX_CONNECTION_ATTEMPT_TIME_SEC = 60
 
 """ LoRa-related configuration options """
-_DEV_EUI = '<lora-dev-eui>'
-_APP_EUI = '<lora-app-eui>'
-_APP_KEY = '<lora-app-key>'
+_DEV_EUI = "<lora-dev-eui>"
+_APP_EUI = "<lora-app-eui>"
+_APP_KEY = "<lora-app-key>"
 
 from network import LoRa
 _LORA_REGION = LoRa.<lora-region>

diff --git a/insighioNode/lib/device_info/__init__.py b/insighioNode/lib/device_info/__init__.py
@@ -62,7 +62,7 @@ def _try_get_lora_mac_bytes(force_init_region=False):
 def get_lora_mac():
     """ Returns a device id based on lora mac in readable format and in raw format """
     # valid only for lora compatible devices
-    if sys.platform in _LORA_COMPATIBLE_PLATFORMS:
+    if not is_esp32() and sys.platform in _LORA_COMPATIBLE_PLATFORMS:
         mac = _try_get_lora_mac_bytes()
 
         if mac is None:

diff --git a/insighioNode/lib/gpio_handler/__init__.py b/insighioNode/lib/gpio_handler/__init__.py
@@ -52,8 +52,6 @@ def get_input_voltage(pin, voltage_divider=1, attn=ADC.ATTN_11DB, measurement_cy
         return round((tmp / measurement_cycles) * voltage_divider)
     # typical voltage_divider levels: 3.054 --> Exp Board 2.0, 2 --> Exp Board 3, 11 --> in-house implementation
 
-    # should we use round function since the following division returns millivolt?
-
 
 def get_vin(pin='P16'):
     """ A simple wrapper to take Vin for pycom modules (relevant only when an expansion board is used) """

diff --git a/insighioNode/web_server.py b/insighioNode/web_server.py
@@ -8,6 +8,7 @@
 import utils
 import machine
 import logging
+import ure
 
 
 class WebServer:
@@ -51,11 +52,12 @@ def __init__(self):
         device_info.set_defaults()
 
     def saveGlobalVarIfFoundInLine(self, line, strToSearch, globalVarName, delimiter):
-        if line.startswith(strToSearch):
+        if ure.match(strToSearch, line):
+        #if line.startswith(strToSearch):
             elems = line.split(delimiter)
-            logging.info(strToSearch + ": " + str(elems))
             if len(elems) > 1 and elems[1] != "":
                 self.pyhtmlMod.SetGlobalVar(globalVarName, elems[1])
+                logging.debug("var '{}' = {}".format(globalVarName, elems[1]))
                 return True
         return False
 
@@ -71,10 +73,10 @@ def extractInsighioIds(self):
         self.pyhtmlMod.SetGlobalVar("insighioDeviceToken", "")
 
         while i < linesCount:
-            if (self.saveGlobalVarIfFoundInLine(projectConfig[i], '    protocol_config.message_channel_id', "insighioChannelId", '"') or
-                self.saveGlobalVarIfFoundInLine(projectConfig[i], '    protocol_config.control_channel_id', "insighioControlChannel", '"') or
-                self.saveGlobalVarIfFoundInLine(projectConfig[i], '    protocol_config.thing_id', "insighioDeviceId", '"') or
-                self.saveGlobalVarIfFoundInLine(projectConfig[i], '    protocol_config.thing_token', "insighioDeviceToken", '"')):
+            if (self.saveGlobalVarIfFoundInLine(projectConfig[i], r'^(\s*\w+\.)?message_channel_id', "insighioChannelId", '"') or
+                self.saveGlobalVarIfFoundInLine(projectConfig[i], r'^(\s*\w+\.)?control_channel_id', "insighioControlChannel", '"') or
+                self.saveGlobalVarIfFoundInLine(projectConfig[i], r'^(\s*\w+\.)?thing_id', "insighioDeviceId", '"') or
+                self.saveGlobalVarIfFoundInLine(projectConfig[i], r'^(\s*\w+\.)?thing_token', "insighioDeviceToken", '"')):
                euisFilled = euisFilled + 1
 
             if euisFilled == 4:
@@ -101,8 +103,8 @@ def extractLoRaUIDS(self):
         self.pyhtmlMod.SetGlobalVar("loraAppKey", "")
 
         while i < linesCount:
-            if (self.saveGlobalVarIfFoundInLine(projectConfig[i], '_APP_EUI', "loraAppEUI", "'") or
-                self.saveGlobalVarIfFoundInLine(projectConfig[i], '_APP_KEY', "loraAppKey", "'")):
+            if (self.saveGlobalVarIfFoundInLine(projectConfig[i], '_APP_EUI', "loraAppEUI", '"') or
+                self.saveGlobalVarIfFoundInLine(projectConfig[i], '_APP_KEY', "loraAppKey", '"')):
                 euisFilled = euisFilled + 1
 
             if euisFilled == 3:

diff --git a/insighioNode/www/step-3-config-cellular.pyhtml b/insighioNode/www/step-3-config-cellular.pyhtml
@@ -69,7 +69,7 @@
                       <label class="form-label" for="input-example-cellular">APN</label>
                     </div>
                     <div class="col-9 col-sm-12">
-                      <input class="form-input constr-field" type="text" id="input-apn" placeholder="" />
+                      <input class="form-input constr-field" type="text" id="input-apn" placeholder="" value="iot.1nce.net"/>
                     </div>
                     <br />
                     <br />
@@ -79,9 +79,9 @@
                     <div class="col-9 col-sm-12">
                       <div class="form-group">
                         <select class="form-select"  id="input-cell-tech">
-                          <option>auto</option>
                           <option>GSM</option>
                           <option>NBIoT</option>
+                          <option>auto</option>
                         </select>
                       </div>
                     </div>

diff --git a/insighioNode/www/step-5-measurements.html b/insighioNode/www/step-5-measurements.html
@@ -114,7 +114,7 @@
                     <div class="col-8 col-sm-12">
                       <div class="form-group">
                         <label class="form-switch">
-                          <input type="checkbox" id="input-ota" />
+                          <input type="checkbox" id="input-ota" checked />
                           <i class="form-icon"></i>
                         </label>
                       </div>

diff --git a/insighioNode/www/step-6-timing.html b/insighioNode/www/step-6-timing.html
@@ -70,7 +70,7 @@
                       <label class="form-label" for="input-example-cellular">Sleep Period (seconds)</label>
                     </div>
                     <div class="col-3 col-sm-12">
-                      <input class="form-input constr-field" type="number" id="input-period" value=600 />
+                      <input class="form-input constr-field" type="number" id="input-period" value=300 />
                     </div>
                     <div class="column col-3 col-mr-auto"></div>
                   </div>
@@ -95,7 +95,7 @@
                     <div class="col-8 col-sm-12">
                       <div class="form-group">
                         <label class="form-switch">
-                          <input type="checkbox" id="input-ins-batch-upload-enable" onclick="sensorStatusChanged('ins-batch-upload')" />
+                          <input type="checkbox" id="input-ins-batch-upload-enable" onclick="sensorStatusChanged('ins-batch-upload')" checked/>
                           <i class="form-icon"></i>
                         </label>
                       </div>
@@ -111,7 +111,7 @@
                           </label>
                         </div>
                         <div class="col-3 col-sm-12">
-                          <input class="form-input constr-field" type="number" id="input-message-buffer-size" value=50 />
+                          <input class="form-input constr-field" type="number" id="input-message-buffer-size" value=144 />
                         </div>
                         <div class="column col-5 col-mr-auto"></div>
                       </div>