Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Features reponse for esp

Browse Source
This commit is contained in:
Niklas Jensen
2026-01-03 13:38:51 +01:00
committed by nikguin04
parent 210e0363ab
commit f3a3ebe1ea
7 changed files with 406 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/lib/platform_shared/websocket_message.ts
+65 -1
View File
@@ -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
+3
View File
@@ -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
+1 -1
View File
@@ -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
+5 -5
View File
@@ -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
+326 -444
View File
File diff suppressed because it is too large Load Diff
platform_shared/websocket_message.options
+4 -4
View File
@@ -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
+2 -1
View File
@@ -86,7 +86,7 @@ monitor_filters =
esp32_exception_decoder
default
colorize
build_flags =
build_flags =
${factory_settings.build_flags}
${features.build_flags}
${build_settings.build_flags}
@@ -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 =
+<*>