Features reponse for esp

app/src/lib/platform_shared/websocket_message.ts

@@ -340,6 +340,8 @@ export interface WebsocketMessage {
   peripheralSettings?: PeripheralSettingsData | undefined;
   peripheralSettingsDataRequest?: PeripheralSettingsDataRequest | undefined;
   kinematicData?: KinematicData | undefined;
+  servoPwm?: ServoPWMData | undefined;
+  servoState?: ServoStateData | undefined;
   wifiSettings?: WifiSettingsData | undefined;
   humanInputData?: HumanInputData | undefined;
   rssi?: RSSIData | undefined;
@@ -3667,6 +3669,8 @@ function createBaseWebsocketMessage(): WebsocketMessage {
     peripheralSettings: undefined,
     peripheralSettingsDataRequest: undefined,
     kinematicData: undefined,
+    servoPwm: undefined,
+    servoState: undefined,
     wifiSettings: undefined,
     humanInputData: undefined,
     rssi: undefined,
@@ -3732,6 +3736,12 @@ export const WebsocketMessage: MessageFns<WebsocketMessage> = {
     if (message.kinematicData !== undefined) {
       KinematicData.encode(message.kinematicData, writer.uint32(1602).fork()).join();
     }
+    if (message.servoPwm !== undefined) {
+      ServoPWMData.encode(message.servoPwm, writer.uint32(1682).fork()).join();
+    }
+    if (message.servoState !== undefined) {
+      ServoStateData.encode(message.servoState, writer.uint32(1690).fork()).join();
+    }
     if (message.wifiSettings !== undefined) {
       WifiSettingsData.encode(message.wifiSettings, writer.uint32(1922).fork()).join();
     }
@@ -3903,6 +3913,22 @@ export const WebsocketMessage: MessageFns<WebsocketMessage> = {
           message.kinematicData = KinematicData.decode(reader, reader.uint32());
           continue;
         }
+        case 210: {
+          if (tag !== 1682) {
+            break;
+          }
+
+          message.servoPwm = ServoPWMData.decode(reader, reader.uint32());
+          continue;
+        }
+        case 211: {
+          if (tag !== 1690) {
+            break;
+          }
+
+          message.servoState = ServoStateData.decode(reader, reader.uint32());
+          continue;
+        }
         case 240: {
           if (tag !== 1922) {
             break;
@@ -3969,6 +3995,8 @@ export const WebsocketMessage: MessageFns<WebsocketMessage> = {
         ? PeripheralSettingsDataRequest.fromJSON(object.peripheralSettingsDataRequest)
         : undefined,
       kinematicData: isSet(object.kinematicData) ? KinematicData.fromJSON(object.kinematicData) : undefined,
+      servoPwm: isSet(object.servoPwm) ? ServoPWMData.fromJSON(object.servoPwm) : undefined,
+      servoState: isSet(object.servoState) ? ServoStateData.fromJSON(object.servoState) : undefined,
       wifiSettings: isSet(object.wifiSettings) ? WifiSettingsData.fromJSON(object.wifiSettings) : undefined,
       humanInputData: isSet(object.humanInputData) ? HumanInputData.fromJSON(object.humanInputData) : undefined,
       rssi: isSet(object.rssi) ? RSSIData.fromJSON(object.rssi) : undefined,
@@ -4034,6 +4062,12 @@ export const WebsocketMessage: MessageFns<WebsocketMessage> = {
     if (message.kinematicData !== undefined) {
       obj.kinematicData = KinematicData.toJSON(message.kinematicData);
     }
+    if (message.servoPwm !== undefined) {
+      obj.servoPwm = ServoPWMData.toJSON(message.servoPwm);
+    }
+    if (message.servoState !== undefined) {
+      obj.servoState = ServoStateData.toJSON(message.servoState);
+    }
     if (message.wifiSettings !== undefined) {
       obj.wifiSettings = WifiSettingsData.toJSON(message.wifiSettings);
     }
@@ -4105,6 +4139,12 @@ export const WebsocketMessage: MessageFns<WebsocketMessage> = {
     message.kinematicData = (object.kinematicData !== undefined && object.kinematicData !== null)
       ? KinematicData.fromPartial(object.kinematicData)
       : undefined;
+    message.servoPwm = (object.servoPwm !== undefined && object.servoPwm !== null)
+      ? ServoPWMData.fromPartial(object.servoPwm)
+      : undefined;
+    message.servoState = (object.servoState !== undefined && object.servoState !== null)
+      ? ServoStateData.fromPartial(object.servoState)
+      : undefined;
     message.wifiSettings = (object.wifiSettings !== undefined && object.wifiSettings !== null)
       ? WifiSettingsData.fromPartial(object.wifiSettings)
       : undefined;
@@ -6097,6 +6137,30 @@ export const protoMetadata: ProtoMetadata = {
         "jsonName": "kinematicData",
         "options": undefined,
         "proto3Optional": false,
+      }, {
+        "name": "servo_pwm",
+        "number": 210,
+        "label": 1,
+        "type": 11,
+        "typeName": ".socket_message.ServoPWMData",
+        "extendee": "",
+        "defaultValue": "",
+        "oneofIndex": 0,
+        "jsonName": "servoPwm",
+        "options": undefined,
+        "proto3Optional": false,
+      }, {
+        "name": "servo_state",
+        "number": 211,
+        "label": 1,
+        "type": 11,
+        "typeName": ".socket_message.ServoStateData",
+        "extendee": "",
+        "defaultValue": "",
+        "oneofIndex": 0,
+        "jsonName": "servoState",
+        "options": undefined,
+        "proto3Optional": false,
       }, {
         "name": "wifi_settings",
         "number": 240,
@@ -6208,7 +6272,7 @@ export const protoMetadata: ProtoMetadata = {
         "leadingDetachedComments": [],
       }, {
         "path": [4, 34],
-        "span": [159, 0, 184, 1],
+        "span": [159, 0, 186, 1],
         "leadingComments": " WebSocket message wrapper\n Only ONE field will be set at a time (oneof ensures this)\n",
         "trailingComments": "",
         "leadingDetachedComments": [],

esp32/include/communication/proto_helpers.h

@@ -39,6 +39,9 @@ DEFINE_MESSAGE_TRAITS(I2CScanDataRequest, i2c_scan_data_request)
 DEFINE_MESSAGE_TRAITS(PeripheralSettingsDataRequest, peripheral_settings_data_request)
 DEFINE_MESSAGE_TRAITS(ServoPWMData, servo_pwm)
 DEFINE_MESSAGE_TRAITS(ServoStateData, servo_state)
+DEFINE_MESSAGE_TRAITS(CorrelationRequest, correlation_request)
+DEFINE_MESSAGE_TRAITS(CorrelationResponse, correlation_response)
+
 
 #undef DEFINE_MESSAGE_TRAITS
 

esp32/include/features.h

@@ -76,7 +76,7 @@ void printFeatureConfiguration();
 
 void features(JsonObject &root);
 
-void features_request(socket_message_FeaturesDataRequest& fd_req, socket_message_FeaturesDataResponse& fd_res)
+void features_request(const socket_message_FeaturesDataRequest& fd_req, socket_message_FeaturesDataResponse& fd_res);
 
 esp_err_t getFeatures(PsychicRequest *request);
 

esp32/src/features.cpp

@@ -29,7 +29,7 @@ void printFeatureConfiguration() {
     ESP_LOGI("Features", "==========================================================");
 }
 
-void features_request(socket_message_FeaturesDataRequest& fd_req, socket_message_FeaturesDataResponse& fd_res) {
+void features_request(const socket_message_FeaturesDataRequest& fd_req, socket_message_FeaturesDataResponse& fd_res) {
     fd_res.camera = USE_CAMERA ? true : false;
     fd_res.imu = (USE_MPU6050 || USE_BNO055) ? true : false;
     fd_res.mag = (USE_HMC5883 || USE_BNO055) ? true : false;
@@ -40,10 +40,10 @@ void features_request(socket_message_FeaturesDataRequest& fd_req, socket_message
     fd_res.ws2812 = USE_WS2812 ? true : false;
     fd_res.mdns = USE_MDNS ? true : false;
     fd_res.embed_www = EMBED_WEBAPP ? true : false;
-    strcpy(fd_res.firmware_version, APP_VERSION);
-    strcpy(fd_res.firmware_name, APP_NAME);
-    strcpy(fd_res.firmware_built_target, BUILD_TARGET);
-    strcpy(fd_res.variant, KINEMATICS_VARIANT_STR);
+    fd_res.firmware_version = APP_VERSION;
+    fd_res.firmware_name = APP_NAME;
+    fd_res.firmware_built_target = BUILD_TARGET;
+    fd_res.variant = KINEMATICS_VARIANT_STR;
 }
 
 

esp32/src/platform_shared/websocket_message.pb.h

@@ -71,10 +71,10 @@ typedef struct _socket_message_IMUData {
 } socket_message_IMUData;
 
 typedef struct _socket_message_FeaturesDataResponse {
-    pb_callback_t variant;
-    pb_callback_t firmware_built_target;
-    pb_callback_t firmware_name;
-    pb_callback_t firmware_version;
+    char *variant;
+    char *firmware_built_target;
+    char *firmware_name;
+    char *firmware_version;
     bool camera;
     bool imu;
     bool mag;
@@ -94,8 +94,7 @@ typedef struct _socket_message_CorrelationRequest {
     uint32_t correlation_id; /* Used for request-response correlation */
     pb_size_t which_request;
     union _socket_message_CorrelationRequest_request {
-        /* NOTE: requests must have same tag id as correlating to the response type (currently not enforced in C, but
-         * will be, and tests will fail) */
+        /* NOTE: requests must have same tag id as correlating to the response type (currently not enforced in C, but will be, and tests will fail) */
         socket_message_FeaturesDataRequest features_data_request;
     } request;
 } socket_message_CorrelationRequest;
@@ -105,8 +104,7 @@ typedef struct _socket_message_CorrelationResponse {
     uint32_t stauts_code;
     pb_size_t which_response;
     union _socket_message_CorrelationResponse_response {
-        /* NOTE: responses must have same tag id as correlating to the request type (currently not enforced in C, but
-         * will be, and tests will fail) */
+        /* NOTE: responses must have same tag id as correlating to the request type (currently not enforced in C, but will be, and tests will fail) */
         socket_message_FeaturesDataResponse features_data_response;
     } response;
 } socket_message_CorrelationResponse;
@@ -299,6 +297,7 @@ typedef struct _socket_message_WebsocketMessage {
     } message;
 } socket_message_WebsocketMessage;
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -312,241 +311,115 @@ extern "C" {
 #define _socket_message_WalkGaits_MAX socket_message_WalkGaits_CRAWL
 #define _socket_message_WalkGaits_ARRAYSIZE ((socket_message_WalkGaits)(socket_message_WalkGaits_CRAWL+1))
 
+
+
+
+
+
+
+
+
+
+
+
+
 #define socket_message_ModeData_mode_ENUMTYPE socket_message_ModesEnum
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #define socket_message_WalkGaitData_gait_ENUMTYPE socket_message_WalkGaits
 
+
+
+
+
+
+
+
 /* Initializer values for message structs */
-#define socket_message_Vector_init_default \
-    { 0, 0 }
-#define socket_message_I2CDevice_init_default \
-    { 0, "", "" }
-#define socket_message_PinConfig_init_default \
-    { 0, "", "", "" }
-#define socket_message_KnownNetworkItem_init_default \
-    { "", "", 0, false, "", false, "", false, "", false, "", false, "" }
-#define socket_message_IMUData_init_default \
-    { 0, 0, 0, 0, 0, 0, 0 }
-#define socket_message_FeaturesDataResponse_init_default \
-    { {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-#define socket_message_FeaturesDataRequest_init_default \
-    { 0 }
-#define socket_message_CorrelationRequest_init_default            \
-    {                                                             \
-        0, 0, { socket_message_FeaturesDataRequest_init_default } \
-    }
-#define socket_message_CorrelationResponse_init_default               \
-    {                                                                 \
-        0, 0, 0, { socket_message_FeaturesDataResponse_init_default } \
-    }
-#define socket_message_StaticSystemInformation_init_default \
-    { "", "", 0, "", 0, 0, 0, 0, "", "", 0, 0, "" }
-#define socket_message_IMUCalibrateData_init_default \
-    { 0 }
-#define socket_message_IMUCalibrateExecute_init_default \
-    { 0 }
-#define socket_message_ModeData_init_default \
-    { _socket_message_ModesEnum_MIN }
-#define socket_message_ControllerInputData_init_default \
-    { false, socket_message_Vector_init_default, false, socket_message_Vector_init_default, 0, 0, 0 }
-#define socket_message_AnalyticsData_init_default \
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-#define socket_message_ServoPWMData_init_default \
-    { 0, 0 }
-#define socket_message_ServoStateData_init_default \
-    { 0 }
-#define socket_message_AnglesData_init_default    \
-    {                                             \
-        0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } \
-    }
-#define socket_message_I2CScanData_init_default                                               \
-    {                                                                                         \
-        0, {                                                                                  \
-            socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default,     \
-                socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, \
-                socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, \
-                socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, \
-                socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, \
-                socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, \
-                socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, \
-                socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default  \
-        }                                                                                     \
-    }
-#define socket_message_I2CScanDataRequest_init_default \
-    { 0 }
-#define socket_message_PeripheralSettingsData_init_default                                    \
-    {                                                                                         \
-        0, 0, 0, 0, {                                                                         \
-            socket_message_PinConfig_init_default, socket_message_PinConfig_init_default,     \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, \
-                socket_message_PinConfig_init_default, socket_message_PinConfig_init_default  \
-        }                                                                                     \
-    }
-#define socket_message_PeripheralSettingsDataRequest_init_default \
-    { 0 }
-#define socket_message_WifiSettingsData_init_default                                                        \
-    {                                                                                                       \
-        "", 0, 0, {                                                                                         \
-            socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default,     \
-                socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, \
-                socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, \
-                socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default  \
-        }                                                                                                   \
-    }
-#define socket_message_RSSIData_init_default \
-    { 0 }
-#define socket_message_DownloadOTAData_init_default \
-    { "", 0, "" }
-#define socket_message_SonarData_init_default \
-    { "" }
-#define socket_message_HumanInputData_init_default \
-    { false, socket_message_Vector_init_default, false, socket_message_Vector_init_default, 0, 0, 0 }
-#define socket_message_SystemInformation_init_default \
-    { false, socket_message_AnalyticsData_init_default, false, socket_message_StaticSystemInformation_init_default }
-#define socket_message_WalkGaitData_init_default \
-    { _socket_message_WalkGaits_MIN }
-#define socket_message_KinematicData_init_default \
-    { 0, 0, 0, 0, 0, 0 }
-#define socket_message_SubscribeNotification_init_default \
-    { 0 }
-#define socket_message_UnsubscribeNotification_init_default \
-    { 0 }
-#define socket_message_PingMsg_init_default \
-    { 0 }
-#define socket_message_PongMsg_init_default \
-    { 0 }
-#define socket_message_WebsocketMessage_init_default          \
-    {                                                         \
-        0, { socket_message_CorrelationRequest_init_default } \
-    }
-#define socket_message_Vector_init_zero \
-    { 0, 0 }
-#define socket_message_I2CDevice_init_zero \
-    { 0, "", "" }
-#define socket_message_PinConfig_init_zero \
-    { 0, "", "", "" }
-#define socket_message_KnownNetworkItem_init_zero \
-    { "", "", 0, false, "", false, "", false, "", false, "", false, "" }
-#define socket_message_IMUData_init_zero \
-    { 0, 0, 0, 0, 0, 0, 0 }
-#define socket_message_FeaturesDataResponse_init_zero \
-    { {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, {{NULL}, NULL}, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-#define socket_message_FeaturesDataRequest_init_zero \
-    { 0 }
-#define socket_message_CorrelationRequest_init_zero            \
-    {                                                          \
-        0, 0, { socket_message_FeaturesDataRequest_init_zero } \
-    }
-#define socket_message_CorrelationResponse_init_zero               \
-    {                                                              \
-        0, 0, 0, { socket_message_FeaturesDataResponse_init_zero } \
-    }
-#define socket_message_StaticSystemInformation_init_zero \
-    { "", "", 0, "", 0, 0, 0, 0, "", "", 0, 0, "" }
-#define socket_message_IMUCalibrateData_init_zero \
-    { 0 }
-#define socket_message_IMUCalibrateExecute_init_zero \
-    { 0 }
-#define socket_message_ModeData_init_zero \
-    { _socket_message_ModesEnum_MIN }
-#define socket_message_ControllerInputData_init_zero \
-    { false, socket_message_Vector_init_zero, false, socket_message_Vector_init_zero, 0, 0, 0 }
-#define socket_message_AnalyticsData_init_zero \
-    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-#define socket_message_ServoPWMData_init_zero \
-    { 0, 0 }
-#define socket_message_ServoStateData_init_zero \
-    { 0 }
-#define socket_message_AnglesData_init_zero       \
-    {                                             \
-        0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } \
-    }
-#define socket_message_I2CScanData_init_zero                                            \
-    {                                                                                   \
-        0, {                                                                            \
-            socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero,     \
-                socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, \
-                socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, \
-                socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, \
-                socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, \
-                socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, \
-                socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, \
-                socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero  \
-        }                                                                               \
-    }
-#define socket_message_I2CScanDataRequest_init_zero \
-    { 0 }
-#define socket_message_PeripheralSettingsData_init_zero                                 \
-    {                                                                                   \
-        0, 0, 0, 0, {                                                                   \
-            socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero,     \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, \
-                socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero  \
-        }                                                                               \
-    }
-#define socket_message_PeripheralSettingsDataRequest_init_zero \
-    { 0 }
-#define socket_message_WifiSettingsData_init_zero                                                     \
-    {                                                                                                 \
-        "", 0, 0, {                                                                                   \
-            socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero,     \
-                socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, \
-                socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, \
-                socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero  \
-        }                                                                                             \
-    }
-#define socket_message_RSSIData_init_zero \
-    { 0 }
-#define socket_message_DownloadOTAData_init_zero \
-    { "", 0, "" }
-#define socket_message_SonarData_init_zero \
-    { "" }
-#define socket_message_HumanInputData_init_zero \
-    { false, socket_message_Vector_init_zero, false, socket_message_Vector_init_zero, 0, 0, 0 }
-#define socket_message_SystemInformation_init_zero \
-    { false, socket_message_AnalyticsData_init_zero, false, socket_message_StaticSystemInformation_init_zero }
-#define socket_message_WalkGaitData_init_zero \
-    { _socket_message_WalkGaits_MIN }
-#define socket_message_KinematicData_init_zero \
-    { 0, 0, 0, 0, 0, 0 }
-#define socket_message_SubscribeNotification_init_zero \
-    { 0 }
-#define socket_message_UnsubscribeNotification_init_zero \
-    { 0 }
-#define socket_message_PingMsg_init_zero \
-    { 0 }
-#define socket_message_PongMsg_init_zero \
-    { 0 }
-#define socket_message_WebsocketMessage_init_zero          \
-    {                                                      \
-        0, { socket_message_CorrelationRequest_init_zero } \
-    }
+#define socket_message_Vector_init_default       {0, 0}
+#define socket_message_I2CDevice_init_default    {0, "", ""}
+#define socket_message_PinConfig_init_default    {0, "", "", ""}
+#define socket_message_KnownNetworkItem_init_default {"", "", 0, false, "", false, "", false, "", false, "", false, ""}
+#define socket_message_IMUData_init_default      {0, 0, 0, 0, 0, 0, 0}
+#define socket_message_FeaturesDataResponse_init_default {NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define socket_message_FeaturesDataRequest_init_default {0}
+#define socket_message_CorrelationRequest_init_default {0, 0, {socket_message_FeaturesDataRequest_init_default}}
+#define socket_message_CorrelationResponse_init_default {0, 0, 0, {socket_message_FeaturesDataResponse_init_default}}
+#define socket_message_StaticSystemInformation_init_default {"", "", 0, "", 0, 0, 0, 0, "", "", 0, 0, ""}
+#define socket_message_IMUCalibrateData_init_default {0}
+#define socket_message_IMUCalibrateExecute_init_default {0}
+#define socket_message_ModeData_init_default     {_socket_message_ModesEnum_MIN}
+#define socket_message_ControllerInputData_init_default {false, socket_message_Vector_init_default, false, socket_message_Vector_init_default, 0, 0, 0}
+#define socket_message_AnalyticsData_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define socket_message_ServoPWMData_init_default {0, 0}
+#define socket_message_ServoStateData_init_default {0}
+#define socket_message_AnglesData_init_default   {0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}
+#define socket_message_I2CScanData_init_default  {0, {socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default, socket_message_I2CDevice_init_default}}
+#define socket_message_I2CScanDataRequest_init_default {0}
+#define socket_message_PeripheralSettingsData_init_default {0, 0, 0, 0, {socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default, socket_message_PinConfig_init_default}}
+#define socket_message_PeripheralSettingsDataRequest_init_default {0}
+#define socket_message_WifiSettingsData_init_default {"", 0, 0, {socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default, socket_message_KnownNetworkItem_init_default}}
+#define socket_message_RSSIData_init_default     {0}
+#define socket_message_DownloadOTAData_init_default {"", 0, ""}
+#define socket_message_SonarData_init_default    {""}
+#define socket_message_HumanInputData_init_default {false, socket_message_Vector_init_default, false, socket_message_Vector_init_default, 0, 0, 0}
+#define socket_message_SystemInformation_init_default {false, socket_message_AnalyticsData_init_default, false, socket_message_StaticSystemInformation_init_default}
+#define socket_message_WalkGaitData_init_default {_socket_message_WalkGaits_MIN}
+#define socket_message_KinematicData_init_default {0, 0, 0, 0, 0, 0}
+#define socket_message_SubscribeNotification_init_default {0}
+#define socket_message_UnsubscribeNotification_init_default {0}
+#define socket_message_PingMsg_init_default      {0}
+#define socket_message_PongMsg_init_default      {0}
+#define socket_message_WebsocketMessage_init_default {0, {socket_message_CorrelationRequest_init_default}}
+#define socket_message_Vector_init_zero          {0, 0}
+#define socket_message_I2CDevice_init_zero       {0, "", ""}
+#define socket_message_PinConfig_init_zero       {0, "", "", ""}
+#define socket_message_KnownNetworkItem_init_zero {"", "", 0, false, "", false, "", false, "", false, "", false, ""}
+#define socket_message_IMUData_init_zero         {0, 0, 0, 0, 0, 0, 0}
+#define socket_message_FeaturesDataResponse_init_zero {NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define socket_message_FeaturesDataRequest_init_zero {0}
+#define socket_message_CorrelationRequest_init_zero {0, 0, {socket_message_FeaturesDataRequest_init_zero}}
+#define socket_message_CorrelationResponse_init_zero {0, 0, 0, {socket_message_FeaturesDataResponse_init_zero}}
+#define socket_message_StaticSystemInformation_init_zero {"", "", 0, "", 0, 0, 0, 0, "", "", 0, 0, ""}
+#define socket_message_IMUCalibrateData_init_zero {0}
+#define socket_message_IMUCalibrateExecute_init_zero {0}
+#define socket_message_ModeData_init_zero        {_socket_message_ModesEnum_MIN}
+#define socket_message_ControllerInputData_init_zero {false, socket_message_Vector_init_zero, false, socket_message_Vector_init_zero, 0, 0, 0}
+#define socket_message_AnalyticsData_init_zero   {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define socket_message_ServoPWMData_init_zero    {0, 0}
+#define socket_message_ServoStateData_init_zero  {0}
+#define socket_message_AnglesData_init_zero      {0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}
+#define socket_message_I2CScanData_init_zero     {0, {socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero, socket_message_I2CDevice_init_zero}}
+#define socket_message_I2CScanDataRequest_init_zero {0}
+#define socket_message_PeripheralSettingsData_init_zero {0, 0, 0, 0, {socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero, socket_message_PinConfig_init_zero}}
+#define socket_message_PeripheralSettingsDataRequest_init_zero {0}
+#define socket_message_WifiSettingsData_init_zero {"", 0, 0, {socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero, socket_message_KnownNetworkItem_init_zero}}
+#define socket_message_RSSIData_init_zero        {0}
+#define socket_message_DownloadOTAData_init_zero {"", 0, ""}
+#define socket_message_SonarData_init_zero       {""}
+#define socket_message_HumanInputData_init_zero  {false, socket_message_Vector_init_zero, false, socket_message_Vector_init_zero, 0, 0, 0}
+#define socket_message_SystemInformation_init_zero {false, socket_message_AnalyticsData_init_zero, false, socket_message_StaticSystemInformation_init_zero}
+#define socket_message_WalkGaitData_init_zero    {_socket_message_WalkGaits_MIN}
+#define socket_message_KinematicData_init_zero   {0, 0, 0, 0, 0, 0}
+#define socket_message_SubscribeNotification_init_zero {0}
+#define socket_message_UnsubscribeNotification_init_zero {0}
+#define socket_message_PingMsg_init_zero         {0}
+#define socket_message_PongMsg_init_zero         {0}
+#define socket_message_WebsocketMessage_init_zero {0, {socket_message_CorrelationRequest_init_zero}}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define socket_message_Vector_x_tag              1
@@ -729,10 +602,10 @@ extern "C" {
 #define socket_message_IMUData_DEFAULT NULL
 
 #define socket_message_FeaturesDataResponse_FIELDLIST(X, a) \
-    X(a, CALLBACK, SINGULAR, STRING, variant, 10)               \
-    X(a, CALLBACK, SINGULAR, STRING, firmware_built_target, 20) \
-    X(a, CALLBACK, SINGULAR, STRING, firmware_name, 30)         \
-    X(a, CALLBACK, SINGULAR, STRING, firmware_version, 40)      \
+X(a, POINTER,  SINGULAR, STRING,   variant,          10) \
+X(a, POINTER,  SINGULAR, STRING,   firmware_built_target,  20) \
+X(a, POINTER,  SINGULAR, STRING,   firmware_name,    30) \
+X(a, POINTER,  SINGULAR, STRING,   firmware_version,  40) \
 X(a, STATIC,   SINGULAR, BOOL,     camera,           50) \
 X(a, STATIC,   SINGULAR, BOOL,     imu,              60) \
 X(a, STATIC,   SINGULAR, BOOL,     mag,              70) \
@@ -742,10 +615,11 @@ extern "C" {
 X(a, STATIC,   SINGULAR, BOOL,     ws2812,          110) \
 X(a, STATIC,   SINGULAR, BOOL,     mdns,            120) \
 X(a, STATIC,   SINGULAR, BOOL,     embed_www,       130)
-#define socket_message_FeaturesDataResponse_CALLBACK pb_default_field_callback
+#define socket_message_FeaturesDataResponse_CALLBACK NULL
 #define socket_message_FeaturesDataResponse_DEFAULT NULL
 
-#define socket_message_FeaturesDataRequest_FIELDLIST(X, a) X(a, STATIC, SINGULAR, BOOL, sonar_test, 1)
+#define socket_message_FeaturesDataRequest_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     sonar_test,        1)
 #define socket_message_FeaturesDataRequest_CALLBACK NULL
 #define socket_message_FeaturesDataRequest_DEFAULT NULL
 
@@ -781,16 +655,18 @@ extern "C" {
 #define socket_message_StaticSystemInformation_CALLBACK NULL
 #define socket_message_StaticSystemInformation_DEFAULT NULL
 
-#define socket_message_IMUCalibrateData_FIELDLIST(X, a) X(a, STATIC, SINGULAR, BOOL, success, 1)
+#define socket_message_IMUCalibrateData_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     success,           1)
 #define socket_message_IMUCalibrateData_CALLBACK NULL
 #define socket_message_IMUCalibrateData_DEFAULT NULL
 
-#define socket_message_IMUCalibrateExecute_FIELDLIST(X, a)
+#define socket_message_IMUCalibrateExecute_FIELDLIST(X, a) \
 
 #define socket_message_IMUCalibrateExecute_CALLBACK NULL
 #define socket_message_IMUCalibrateExecute_DEFAULT NULL
 
-#define socket_message_ModeData_FIELDLIST(X, a) X(a, STATIC, SINGULAR, UENUM, mode, 1)
+#define socket_message_ModeData_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UENUM,    mode,              1)
 #define socket_message_ModeData_CALLBACK NULL
 #define socket_message_ModeData_DEFAULT NULL
 
@@ -828,20 +704,23 @@ extern "C" {
 #define socket_message_ServoPWMData_CALLBACK NULL
 #define socket_message_ServoPWMData_DEFAULT NULL
 
-#define socket_message_ServoStateData_FIELDLIST(X, a) X(a, STATIC, SINGULAR, BOOL, active, 1)
+#define socket_message_ServoStateData_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     active,            1)
 #define socket_message_ServoStateData_CALLBACK NULL
 #define socket_message_ServoStateData_DEFAULT NULL
 
-#define socket_message_AnglesData_FIELDLIST(X, a) X(a, STATIC, REPEATED, INT32, angles, 1)
+#define socket_message_AnglesData_FIELDLIST(X, a) \
+X(a, STATIC,   REPEATED, INT32,    angles,            1)
 #define socket_message_AnglesData_CALLBACK NULL
 #define socket_message_AnglesData_DEFAULT NULL
 
-#define socket_message_I2CScanData_FIELDLIST(X, a) X(a, STATIC, REPEATED, MESSAGE, devices, 1)
+#define socket_message_I2CScanData_FIELDLIST(X, a) \
+X(a, STATIC,   REPEATED, MESSAGE,  devices,           1)
 #define socket_message_I2CScanData_CALLBACK NULL
 #define socket_message_I2CScanData_DEFAULT NULL
 #define socket_message_I2CScanData_devices_MSGTYPE socket_message_I2CDevice
 
-#define socket_message_I2CScanDataRequest_FIELDLIST(X, a)
+#define socket_message_I2CScanDataRequest_FIELDLIST(X, a) \
 
 #define socket_message_I2CScanDataRequest_CALLBACK NULL
 #define socket_message_I2CScanDataRequest_DEFAULT NULL
@@ -855,7 +734,7 @@ extern "C" {
 #define socket_message_PeripheralSettingsData_DEFAULT NULL
 #define socket_message_PeripheralSettingsData_pins_MSGTYPE socket_message_PinConfig
 
-#define socket_message_PeripheralSettingsDataRequest_FIELDLIST(X, a)
+#define socket_message_PeripheralSettingsDataRequest_FIELDLIST(X, a) \
 
 #define socket_message_PeripheralSettingsDataRequest_CALLBACK NULL
 #define socket_message_PeripheralSettingsDataRequest_DEFAULT NULL
@@ -868,7 +747,8 @@ extern "C" {
 #define socket_message_WifiSettingsData_DEFAULT NULL
 #define socket_message_WifiSettingsData_wifi_networks_MSGTYPE socket_message_KnownNetworkItem
 
-#define socket_message_RSSIData_FIELDLIST(X, a) X(a, STATIC, SINGULAR, INT32, rssi, 1)
+#define socket_message_RSSIData_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, INT32,    rssi,              1)
 #define socket_message_RSSIData_CALLBACK NULL
 #define socket_message_RSSIData_DEFAULT NULL
 
@@ -879,7 +759,8 @@ extern "C" {
 #define socket_message_DownloadOTAData_CALLBACK NULL
 #define socket_message_DownloadOTAData_DEFAULT NULL
 
-#define socket_message_SonarData_FIELDLIST(X, a) X(a, STATIC, SINGULAR, STRING, dummy_field, 1)
+#define socket_message_SonarData_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, STRING,   dummy_field,       1)
 #define socket_message_SonarData_CALLBACK NULL
 #define socket_message_SonarData_DEFAULT NULL
 
@@ -902,7 +783,8 @@ extern "C" {
 #define socket_message_SystemInformation_analytics_data_MSGTYPE socket_message_AnalyticsData
 #define socket_message_SystemInformation_static_system_information_MSGTYPE socket_message_StaticSystemInformation
 
-#define socket_message_WalkGaitData_FIELDLIST(X, a) X(a, STATIC, SINGULAR, UENUM, gait, 1)
+#define socket_message_WalkGaitData_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UENUM,    gait,              1)
 #define socket_message_WalkGaitData_CALLBACK NULL
 #define socket_message_WalkGaitData_DEFAULT NULL
 
@@ -916,20 +798,22 @@ extern "C" {
 #define socket_message_KinematicData_CALLBACK NULL
 #define socket_message_KinematicData_DEFAULT NULL
 
-#define socket_message_SubscribeNotification_FIELDLIST(X, a) X(a, STATIC, SINGULAR, INT32, tag, 1)
+#define socket_message_SubscribeNotification_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, INT32,    tag,               1)
 #define socket_message_SubscribeNotification_CALLBACK NULL
 #define socket_message_SubscribeNotification_DEFAULT NULL
 
-#define socket_message_UnsubscribeNotification_FIELDLIST(X, a) X(a, STATIC, SINGULAR, INT32, tag, 1)
+#define socket_message_UnsubscribeNotification_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, INT32,    tag,               1)
 #define socket_message_UnsubscribeNotification_CALLBACK NULL
 #define socket_message_UnsubscribeNotification_DEFAULT NULL
 
-#define socket_message_PingMsg_FIELDLIST(X, a)
+#define socket_message_PingMsg_FIELDLIST(X, a) \
 
 #define socket_message_PingMsg_CALLBACK NULL
 #define socket_message_PingMsg_DEFAULT NULL
 
-#define socket_message_PongMsg_FIELDLIST(X, a)
+#define socket_message_PongMsg_FIELDLIST(X, a) \
 
 #define socket_message_PongMsg_CALLBACK NULL
 #define socket_message_PongMsg_DEFAULT NULL
@@ -952,8 +836,7 @@ extern "C" {
 X(a, STATIC,   ONEOF,    MESSAGE,  (message,i2c_scan,message.i2c_scan), 180) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (message,i2c_scan_data_request,message.i2c_scan_data_request), 181) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (message,peripheral_settings,message.peripheral_settings), 190) \
-    X(a, STATIC, ONEOF, MESSAGE,                                                                       \
-      (message, peripheral_settings_data_request, message.peripheral_settings_data_request), 191)      \
+X(a, STATIC,   ONEOF,    MESSAGE,  (message,peripheral_settings_data_request,message.peripheral_settings_data_request), 191) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (message,kinematic_data,message.kinematic_data), 200) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (message,servo_pwm,message.servo_pwm), 210) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (message,servo_state,message.servo_state), 211) \
@@ -979,8 +862,7 @@ extern "C" {
 #define socket_message_WebsocketMessage_message_i2c_scan_MSGTYPE socket_message_I2CScanData
 #define socket_message_WebsocketMessage_message_i2c_scan_data_request_MSGTYPE socket_message_I2CScanDataRequest
 #define socket_message_WebsocketMessage_message_peripheral_settings_MSGTYPE socket_message_PeripheralSettingsData
-#define socket_message_WebsocketMessage_message_peripheral_settings_data_request_MSGTYPE \
-    socket_message_PeripheralSettingsDataRequest
+#define socket_message_WebsocketMessage_message_peripheral_settings_data_request_MSGTYPE socket_message_PeripheralSettingsDataRequest
 #define socket_message_WebsocketMessage_message_kinematic_data_MSGTYPE socket_message_KinematicData
 #define socket_message_WebsocketMessage_message_servo_pwm_MSGTYPE socket_message_ServoPWMData
 #define socket_message_WebsocketMessage_message_servo_state_MSGTYPE socket_message_ServoStateData

platform_shared/websocket_message.options

@@ -34,7 +34,7 @@ socket_message.DownloadOTAData.error max_size:64
 
 socket_message.SonarData.dummy_field max_size:16
 
-socket_message.FeaturesDataResponse.variant max_size:32
-socket_message.FeaturesDataResponse.firmware_built_target max_size:32
-socket_message.FeaturesDataResponse.firmware_name max_size:32
-socket_message.FeaturesDataResponse.firmware_version max_size:32
+socket_message.FeaturesDataResponse.variant type:FT_POINTER
+socket_message.FeaturesDataResponse.firmware_built_target type:FT_POINTER
+socket_message.FeaturesDataResponse.firmware_name type:FT_POINTER
+socket_message.FeaturesDataResponse.firmware_version type:FT_POINTER

platformio.ini

@@ -98,6 +98,7 @@ build_flags =
     -fdata-sections
     -Wl,--gc-sections
     -I submodules/nanopb
+    -Wno-missing-braces ; Added to suppress protobufs extra nested braces causing warning
 build_unflags = -std=gnu++11
 build_src_filter =
     +<*>