Allows start even if sink init failed

Generate event status with Gw online, Sink down.

Author: StephaneTriomphe

example/linux/gw-example/main.c

@@ -281,7 +281,7 @@ static bool reconnect(uint32_t timeout_s)
 
     // Setup last will
     proto_size = WPC_PROTO_MAX_EVENTSTATUS_SIZE;
-    if (WPC_Proto_get_current_event_status(false, event_status_p, &proto_size) == APP_RES_PROTO_OK)
+    if (WPC_Proto_get_current_event_status(false, false, event_status_p, &proto_size) == APP_RES_PROTO_OK)
     {
         will_options.topicName = topic_status;
         will_options.qos = 1;
@@ -319,7 +319,7 @@ static bool reconnect(uint32_t timeout_s)
 
     // Set our current status
     proto_size = WPC_PROTO_MAX_EVENTSTATUS_SIZE;
-    if (WPC_Proto_get_current_event_status(true, event_status_p, &proto_size) == APP_RES_PROTO_OK)
+    if (WPC_Proto_get_current_event_status(true, true, event_status_p, &proto_size) == APP_RES_PROTO_OK)
     {
         MQTT_publish(topic_status, event_status_p, proto_size, true);
     }

lib/api/wpc_proto.h

@@ -157,9 +157,11 @@ app_proto_res_e WPC_Proto_register_for_event_status(onEventStatus_cb_f onEventSt
 /**
  * \brief        Get current event Status. It is mainly required at boot time of gateway
  *               to publish Gateway status (and no event status are generated yet)
- * \param[in]    online
+ * \param[in]    gw_online
  *               If true, get the "ONLINE" current status. If false, get the "OFFLINE" status
  *               to be published as last will topic
+ * \param[in]    sink_online
+ *               If true, one sink config is attached, if false, none.
  * \param[out]   event_status_p
  *               Pointer to buffer to store the event status
  *               Not updated in case return code is different from APP_RES_PROTO_OK
@@ -170,7 +172,8 @@ app_proto_res_e WPC_Proto_register_for_event_status(onEventStatus_cb_f onEventSt
  *               Set to 0 in case return code is different from APP_RES_PROTO_OK
  * \note         Buffer size should higher or equal to @WPC_PROTO_MAX_EVENTSTATUS_SIZE
  */
-app_proto_res_e WPC_Proto_get_current_event_status(bool online,
+app_proto_res_e WPC_Proto_get_current_event_status(bool gw_online,
+                                                   bool sink_online,
                                                    uint8_t * event_status_p,
                                                    size_t * event_status_size_p);
 

lib/wpc_proto/internal_modules/proto_config.c

@@ -1076,7 +1076,8 @@ app_proto_res_e Proto_config_handle_set_scratchpad_target_and_action_request(
     return APP_RES_PROTO_OK;
 }
 
-app_proto_res_e Proto_config_get_current_event_status(bool online,
+app_proto_res_e Proto_config_get_current_event_status(bool gw_online,
+                                                      bool sink_online,
                                                       uint8_t * event_status_p,
                                                       size_t * event_status_size_p)
 {
@@ -1096,8 +1097,8 @@ app_proto_res_e Proto_config_get_current_event_status(bool online,
     message_wirepas.status_event = message_StatusEvent_p;
 
     fill_status_event(message_StatusEvent_p,
-                      online ? wp_OnOffState_ON : wp_OnOffState_OFF,
-                      online ? 1 : 0);
+                      gw_online ? wp_OnOffState_ON : wp_OnOffState_OFF,
+                      sink_online ? 1 : 0);
 
     // Using the module static buffer
     pb_ostream_t stream = pb_ostream_from_buffer(event_status_p, *event_status_size_p);

lib/wpc_proto/internal_modules/proto_config.h

@@ -84,8 +84,8 @@ app_proto_res_e Proto_config_handle_set_scratchpad_target_and_action_request(
                                             wp_SetScratchpadTargetAndActionReq *req,
                                             wp_SetScratchpadTargetAndActionResp *resp);
 
-
-app_proto_res_e Proto_config_get_current_event_status(bool online,
+app_proto_res_e Proto_config_get_current_event_status(bool gw_online,
+                                                      bool sink_online,
                                                       uint8_t * event_status_p,
                                                       size_t * event_status_size_p);
 

lib/wpc_proto/wpc_proto.c

@@ -79,6 +79,8 @@ app_proto_res_e WPC_Proto_initialize(const char * port_name,
     _Static_assert(WPC_PROTO_MAX_EVENTSTATUS_SIZE >= (wp_StatusEvent_size + WPC_PROTO_GENERIC_MESSAGE_OVERHEAD),
                    "Max proto size too low");
 
+    Common_init(gateway_id, gateway_model, gateway_version, sink_id);
+
     if (open_and_check_connection(bitrate, port_name) != 0)
     {
         return APP_RES_PROTO_WPC_NOT_INITIALIZED;
@@ -95,7 +97,6 @@ app_proto_res_e WPC_Proto_initialize(const char * port_name,
         return APP_RES_PROTO_WRONG_PARAMETER;
     }
 
-    Common_init(gateway_id, gateway_model, gateway_version, sink_id);
     Proto_data_init();
     Proto_config_init();
     Proto_otap_init();
@@ -352,11 +353,13 @@ app_proto_res_e WPC_Proto_handle_request(const uint8_t * request_p,
 
 }
 
-app_proto_res_e WPC_Proto_get_current_event_status(bool online,
+app_proto_res_e WPC_Proto_get_current_event_status(bool gw_online,
+                                                   bool sink_online,
                                                    uint8_t * event_status_p,
                                                    size_t * event_status_size_p)
 {
-    return Proto_config_get_current_event_status(online,
+    return Proto_config_get_current_event_status(gw_online,
+                                                 sink_online,
                                                  event_status_p,
                                                  event_status_size_p);
 }