when secondary transmission is enabled, consider as success if even 1 of the two connections and data transmissions is successful. Also report connection and transmission status of secondary connection to the message transmitted via the primary connection

Author: ftylitak

insighioNode/apps/demo_console/cellular.py

@@ -146,9 +146,17 @@ def connect(cfg):
             set_value(
                 results,
                 "status",
-                status == cellular.MODEM_CONNECTED and tc_success and (not is_secondary_transfer_protocol_enabled or tc_secondary_success),
+                status == cellular.MODEM_CONNECTED and tc_success,
             )
 
+            if is_secondary_transfer_protocol_enabled:
+                logging.debug("tc_secondary_success: {}".format(tc_secondary_success))
+                set_value(
+                    results,
+                    "secondary_conn_status",
+                    1 if tc_secondary_success else 0,
+                )
+
     return results
 
 
@@ -158,8 +166,10 @@ def is_connected():
         modem_instance
         and transfer_client
         and modem_instance.is_connected()
-        and transfer_client.is_connected()
-        and (not is_secondary_transfer_protocol_enabled or (transfer_secondary_client and transfer_secondary_client.is_connected()))
+        and (
+            transfer_client.is_connected()
+            or (not is_secondary_transfer_protocol_enabled or (transfer_secondary_client and transfer_secondary_client.is_connected()))
+        )
     )
 
 

insighioNode/apps/demo_console/message_buffer.py

@@ -131,18 +131,21 @@ def parse_stored_measurements_and_upload(network):
             data = json.loads(line)
             update_timestamp_based_on_diff_dt(data, True)
 
-            message = network.create_message(cfg.get("device_id"), data)
-            message_send_status = network.send_message(cfg, message)
-
-            completed_without_errors &= message_send_status
-
-            logging.debug("Message send status: " + str(message_send_status))
-
             if utils.get_var_from_module(network, "is_secondary_transfer_protocol_enabled"):
                 message_sec = network.create_secondary_message(cfg.get("device_id"), data)
                 message_sec_send_status = network.send_secondary_message(cfg, message_sec)
                 logging.debug("Secondary message send status: " + str(message_sec_send_status))
-                completed_without_errors &= message_sec_send_status
+                data["secondary_message_send_status"] = {"value": 1 if message_sec_send_status else 0}
+                # completed_without_errors &= message_sec_send_status
+            else:
+                message_sec_send_status = True
+
+            message = network.create_message(cfg.get("device_id"), data)
+            message_send_status = network.send_message(cfg, message)
+
+            completed_without_errors &= message_send_status or message_sec_send_status
+
+            logging.debug("Message send status: {}, message_sec_send_status: {}".format(message_send_status, message_sec_send_status))
 
             # this only works for BG600 modem since it supports correct message transmission status
             if message_send_status is not None and not message_send_status:

insighioNode/apps/demo_console/templ/common_templ.py

@@ -53,8 +53,6 @@
 """ System configuration options """
 _WD_PERIOD = 120 # watchdog time for rebooting in seconds
 
-_STORE_MEASUREMENT_IF_FAILED_CONNECTION=<store-meas-if-failed-conn>
-
 _SYSTEM_SETTINGS = '<system-settings>'
 
 _LOW_LATENCY_MODE_ON = <low-latency-mode-on>