add tooltip in lora for the default APP_EUI

+ fix configuration reading in case of None string
insighio · May 31, 2024 · f4f2c44 · f4f2c44
1 parent b7f2ff9
commit f4f2c44
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/insighioNode/lib/networking/lora.py b/insighioNode/lib/networking/lora.py
@@ -70,7 +70,7 @@ def join(cfg, lora_keys):
 
     modem.set_dev_eui(lora_keys[0])
 
-    if lora_keys[1]:
+    if lora_keys[1] and lora_keys[1] != "None":
         modem.set_app_eui(lora_keys[1])
     else:
         _DEFAULT_APP_EUI = "0000000000000001"

diff --git a/insighioNode/lib/utils/configuration_handler.py b/insighioNode/lib/utils/configuration_handler.py
@@ -188,6 +188,8 @@ def get_config_values(fillWithUndefinedIfNotExists=True, prepareForInternalUse=F
             value = getattr(cfg, key)
             if isinstance(value, (int, float, str)):
                 configKeyValues[webUIKey] = str(value)
+                if configKeyValues[webUIKey] == "None":
+                    configKeyValues[webUIKey] = ""
             elif isinstance(value, bool):
                 configKeyValues[webUIKey] = str(value).lower()
             elif isinstance(value, NoneType):

diff --git a/insighioNode/www/step-4-keys-lora.html b/insighioNode/www/step-4-keys-lora.html
@@ -52,7 +52,16 @@
                 <br />
                 <br />
                 <div class="col-3 col-sm-12">
-                  <label class="form-label" for="input-app-eui">APP_EUI</label>
+                  <label class="form-label" for="input-app-eui">APP_EUI<div class="popover popover-bottom">
+                    <button class="btn btn-link">(Optional)</button>
+                    <div class="popover-container">
+                      <div class="card">
+                        <div class="card-body">
+                          If left blank, default value "0000000000000001" will be used
+                        </div>
+                      </div>
+                    </div>
+                  </div></label>
                 </div>
                 <div class="col-9 col-sm-12">
                   <input class="form-input constr-field" type="text" id="input-app-eui" />