Beginning of model rework

app/src/lib/types/models.ts

@@ -1,13 +1,6 @@
 
 export type vector = { x: number; y: number }
 
-export interface ControllerInput {
-    left: vector
-    right: vector
-    height: number
-    speed: number
-    s1: number
-}
 
 export type GithubRelease = {
     message: string
@@ -18,7 +11,6 @@ export type GithubRelease = {
     }>
 }
 
-export type angles = number[] | Int16Array
 
 export type WifiStatus = {
     status: number
@@ -34,26 +26,11 @@ export type WifiStatus = {
     dns_ip_2?: string
 }
 
-export type WifiSettings = {
-    hostname: string
-    priority_RSSI: boolean
-    wifi_networks: KnownNetworkItem[]
-}
 
 export type NetworkList = {
     networks: NetworkItem[]
 }
 
-export type KnownNetworkItem = {
-    ssid: string
-    password: string
-    static_ip_config: boolean
-    local_ip?: string
-    subnet_mask?: string
-    gateway_ip?: string
-    dns_ip_1?: string
-    dns_ip_2?: string
-}
 
 export type NetworkItem = {
     rssi: number
@@ -88,22 +65,6 @@ export type DownloadOTA = {
     error: string
 }
 
-export type Analytics = {
-    max_alloc_heap: number
-    psram_size: number
-    free_psram: number
-    free_heap: number
-    total_heap: number
-    min_free_heap: number
-    core_temp: number
-    fs_total: number
-    fs_used: number
-    uptime: number
-    cpu0_usage: number
-    cpu1_usage: number
-    cpu_usage: number
-}
-
 export type Rssi = {
     rssi: number
     ssid: string
@@ -143,9 +104,6 @@ export type IMUMsg = {
     bmp: [number, number, number, boolean]
 }
 
-export type IMUCalibrationResult = {
-    success: boolean
-}
 
 export interface I2CDevice {
     address: number
@@ -153,19 +111,6 @@ export interface I2CDevice {
     name: string
 }
 
-export type PinConfig = {
-    pin: number
-    mode: string
-    type: string
-    role: string
-}
-
-export type PeripheralsConfiguration = {
-    sda: number
-    scl: number
-    frequency: number
-    pins: PinConfig[]
-}
 
 export type CameraSettings = {
     framesize: number

platform_shared/websocket_message.proto

@@ -1,5 +1,10 @@
 syntax = "proto3";
 
+message Vector { float x = 1; float y = 2; }
+message I2CDevice { int32 address = 1; string part_number = 2; string name = 3; }
+message PinConfig { int32 pin = 1; string mode = 2; string type = 3; string role = 4; }
+message KnownNetworkItem { string ssid = 1; string password = 2; bool static_ip = 3; optional string local_ip = 4; optional string subnet_mask = 5; optional string gateway_ip = 6; optional string dns_ip_1 = 7; optional string dns_ip_2 = 8;  }
+
 // Individual message data types
 message IMUData {
     float x = 1;
@@ -8,20 +13,34 @@ message IMUData {
     float temp = 4;
 }
 
-message IMUCalibrateData {}
+message IMUCalibrateData { bool success = 1; }
 message ModeData { int32 mode = 1; }
-message InputData {}
+message ControllerInputData {
-message AnalyticsData {}
+    Vector left = 1;
-message PositionData {}
+    Vector right = 2;
-message AnglesData { repeated float angles = 1; }
+    float height = 3;
-message I2CScanData {}
+    float speed = 4;
-message PeripheralSettingsData {}
+    float s1 = 5;
-message OTAStatusData {}
+}
-message GaitData {}
+message AnalyticsData {
-message ServoStateData {}
+    int32 max_alloc_heap = 1;
-message ServoPWMData {}
+    int32 psram_size = 2;
-message WifiSettingsData {}
+    int32 free_psram = 3;
-message SonarData {}
+    int32 free_heap = 4;
+    int32 total_heap = 5;
+    int32 min_free_heap = 6;
+    float core_temp = 7;
+    int32 fs_total = 8;
+    int32 fs_used = 9;
+    int64 uptime = 10;
+    int32 cpu0_usage = 11;
+    int32 cpu1_usage = 12;
+    int32 cpu_usage = 13;
+}
+message AnglesData { repeated int32 angles = 1; }
+message I2CScanData { repeated I2CDevice devices = 1; }
+message PeripheralSettingsData { int32 sda = 1; int32 scl = 2; int32 frequency = 3; repeated PinConfig pins = 4; }
+message WifiSettingsData { string hostname = 1; bool priority_rssi = 2; repeated KnownNetworkItem wifi_networks = 3; }
 message RSSIData { int32 rssi = 1; }
 
 message SubscribeNotification { int32 tag = 1; }
@@ -42,18 +61,12 @@ message WebsocketMessage {
         IMUData imu = 110;
         IMUCalibrateData imu_calibrate = 120;
         ModeData mode = 130;
-        InputData input = 140;
+        ControllerInputData input = 140;
         AnalyticsData analytics = 150;
-        PositionData position = 160;
         AnglesData angles = 170;
         I2CScanData i2c_scan = 180;
         PeripheralSettingsData peripheral_settings = 190;
-        OTAStatusData ota_status = 200;
-        GaitData gait = 210;
-        ServoStateData servo_state = 220;
-        ServoPWMData servo_pwm = 230;
         WifiSettingsData wifi_settings = 240;
-        SonarData sonar = 250;
         RSSIData rssi = 260;
     }
 }