From 8c418fd7793d63202820445b7752daff28c7aac7 Mon Sep 17 00:00:00 2001 From: Niklas Jensen Date: Sun, 28 Dec 2025 22:25:46 +0100 Subject: [PATCH] Revert "Added protobufs for TS" This reverts commit 37b9baf7c8d9bf33c3ac29063f8ee697b20ef497. --- .vscode/settings.json | 56 ++++--------------- app/env.d.ts | 12 ++-- app/package.json | 2 - app/pnpm-lock.yaml | 31 ---------- app/vite.config.ts | 2 +- compile_proto_TEMP | 3 - esp32/factory_settings.ini | 4 +- esp32/features.ini | 4 +- esp32/include/settings/peripherals_settings.h | 9 +-- platform_shared/example.proto | 13 ----- 10 files changed, 24 insertions(+), 112 deletions(-) delete mode 100644 compile_proto_TEMP delete mode 100644 platform_shared/example.proto diff --git a/.vscode/settings.json b/.vscode/settings.json index 8f6ee5f..2ff8141 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,51 +1,15 @@ { "files.associations": { - "cmath": "cpp", - "array": "cpp", - "deque": "cpp", - "string": "cpp", - "unordered_map": "cpp", - "unordered_set": "cpp", - "vector": "cpp", - "string_view": "cpp", - "initializer_list": "cpp", - "regex": "cpp", - "list": "cpp", - "memory": "cpp", - "random": "cpp", - "atomic": "cpp", - "cctype": "cpp", - "clocale": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "map": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "iosfwd": "cpp", - "istream": "cpp", - "limits": "cpp", - "new": "cpp", - "ostream": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "streambuf": "cpp", - "cinttypes": "cpp", - "typeinfo": "cpp" + "cmath": "cpp", + "array": "cpp", + "deque": "cpp", + "string": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "string_view": "cpp", + "initializer_list": "cpp", + "regex": "cpp" }, "editor.tabSize": 4, "editor.detectIndentation": false, diff --git a/app/env.d.ts b/app/env.d.ts index fe77695..8c7f1c8 100644 --- a/app/env.d.ts +++ b/app/env.d.ts @@ -1,8 +1,8 @@ -declare module "app-env" { - interface ENV { - VITE_USE_HOST_NAME: boolean; - } +declare module 'app-env' { + interface ENV { + VITE_USE_HOST_NAME: boolean + } - const appEnv: ENV; - export default appEnv; + const appEnv: ENV + export default appEnv } diff --git a/app/package.json b/app/package.json index af93a57..bdad5cc 100644 --- a/app/package.json +++ b/app/package.json @@ -48,7 +48,6 @@ }, "type": "module", "dependencies": { - "@bufbuild/protobuf": "^2.10.2", "@msgpack/msgpack": "^3.1.2", "@niku/vite-env-caster": "^1.1.2", "@sveltejs/adapter-auto": "^6.1.1", @@ -61,7 +60,6 @@ "svelte-dnd-list": "^0.1.8", "svelte-modals": "^2.0.1", "three": "^0.180.0", - "ts-proto": "^2.10.1", "urdf-loader": "^0.12.6", "uzip": "^0.20201231.0", "xacro-parser": "^0.3.10" diff --git a/app/pnpm-lock.yaml b/app/pnpm-lock.yaml index 93b949c..14a7ac5 100644 --- a/app/pnpm-lock.yaml +++ b/app/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - '@bufbuild/protobuf': - specifier: ^2.10.2 - version: 2.10.2 '@msgpack/msgpack': specifier: ^3.1.2 version: 3.1.2 @@ -47,9 +44,6 @@ importers: three: specifier: ^0.180.0 version: 0.180.0 - ts-proto: - specifier: ^2.10.1 - version: 2.10.1 urdf-loader: specifier: ^0.12.6 version: 0.12.6(three@0.180.0) @@ -165,9 +159,6 @@ packages: '@asamuzakjp/nwsapi@2.3.9': resolution: {integrity: sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==} - '@bufbuild/protobuf@2.10.2': - resolution: {integrity: sha512-uFsRXwIGyu+r6AMdz+XijIIZJYpoWeYzILt5yZ2d3mCjQrWUTVpVD9WL/jZAbvp+Ed04rOhrsk7FiTcEDseB5A==} - '@csstools/color-helpers@5.1.0': resolution: {integrity: sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==} engines: {node: '>=18'} @@ -996,10 +987,6 @@ packages: caniuse-lite@1.0.30001749: resolution: {integrity: sha512-0rw2fJOmLfnzCRbkm8EyHL8SvI2Apu5UbnQuTsJ0ClgrH8hcwFooJ1s5R0EP8o8aVrFu8++ae29Kt9/gZAZp/Q==} - case-anything@2.1.13: - resolution: {integrity: sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==} - engines: {node: '>=12.13'} - chai@5.3.3: resolution: {integrity: sha512-4zNhdJD/iOjSH0A05ea+Ke6MU5mmpQcbQsSOkgdaUMJ9zTlDTD/GYlwohmIE2u0gaxHYiVHEn1Fw9mZ/ktJWgw==} engines: {node: '>=18'} @@ -1107,11 +1094,6 @@ packages: resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==} engines: {node: '>=0.10.0'} - detect-libc@1.0.3: - resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==} - engines: {node: '>=0.10'} - hasBin: true - detect-libc@2.1.2: resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==} engines: {node: '>=8'} @@ -1119,9 +1101,6 @@ packages: devalue@5.3.2: resolution: {integrity: sha512-UDsjUbpQn9kvm68slnrs+mfxwFkIflOhkanmyabZ8zOYk8SMEIbJ3TK+88g70hSIeytu4y18f0z/hYHMTrXIWw==} - dprint-node@1.0.8: - resolution: {integrity: sha512-iVKnUtYfGrYcW1ZAlfR/F59cUVL8QIhWoBJoSjkkdua/dkWIgjZfiLMeTjiB06X0ZLkQ0M2C1VbUj/CxkIf1zg==} - electron-to-chromium@1.5.234: resolution: {integrity: sha512-RXfEp2x+VRYn8jbKfQlRImzoJU01kyDvVPBmG39eU2iuRVhuS6vQNocB8J0/8GrIMLnPzgz4eW6WiRnJkTuNWg==} @@ -2268,8 +2247,6 @@ snapshots: '@asamuzakjp/nwsapi@2.3.9': {} - '@bufbuild/protobuf@2.10.2': {} - '@csstools/color-helpers@5.1.0': {} '@csstools/css-calc@2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)': @@ -3038,8 +3015,6 @@ snapshots: caniuse-lite@1.0.30001749: {} - case-anything@2.1.13: {} - chai@5.3.3: dependencies: assertion-error: 2.0.1 @@ -3134,16 +3109,10 @@ snapshots: deepmerge@4.3.1: {} - detect-libc@1.0.3: {} - detect-libc@2.1.2: {} devalue@5.3.2: {} - dprint-node@1.0.8: - dependencies: - detect-libc: 1.0.3 - electron-to-chromium@1.5.234: {} emoji-regex@8.0.0: {} diff --git a/app/vite.config.ts b/app/vite.config.ts index c52e58f..33284b8 100644 --- a/app/vite.config.ts +++ b/app/vite.config.ts @@ -21,7 +21,7 @@ export default defineConfig({ server: { proxy: { '/api': { - target: 'http://192.168.50.22/', + target: 'http://spot-micro.local/', changeOrigin: true, ws: true } diff --git a/compile_proto_TEMP b/compile_proto_TEMP deleted file mode 100644 index 72544eb..0000000 --- a/compile_proto_TEMP +++ /dev/null @@ -1,3 +0,0 @@ -This file is temporary, just to show how ot compile the proto files - -protoc --plugin="protoc-gen-ts_proto=$(Resolve-Path app\node_modules\.bin\protoc-gen-ts_proto.CMD)" --ts_proto_out="./app/proto" "platform_shared\example.proto" \ No newline at end of file diff --git a/esp32/factory_settings.ini b/esp32/factory_settings.ini index 9aa5d7a..8b4686d 100644 --- a/esp32/factory_settings.ini +++ b/esp32/factory_settings.ini @@ -10,8 +10,8 @@ build_flags = -D APP_VERSION=\"0.1.0\" ; WiFi settings - -D FACTORY_WIFI_SSID=\"Dunder\ Milffin\" - -D FACTORY_WIFI_PASSWORD=\"BodomReaper666\" + -D FACTORY_WIFI_SSID=\"\" + -D FACTORY_WIFI_PASSWORD=\"\" -D FACTORY_WIFI_HOSTNAME=\"spot-micro\" ; supports placeholders ; Access point settings diff --git a/esp32/features.ini b/esp32/features.ini index 5ee98d0..5ecd496 100644 --- a/esp32/features.ini +++ b/esp32/features.ini @@ -1,8 +1,8 @@ [features] build_flags = ; Kinematics - Choose only one -; -D SPOTMICRO_ESP32 - -D SPOTMICRO_ESP32_MINI + -D SPOTMICRO_ESP32 +; -D SPOTMICRO_ESP32_MINI ; -D SPOTMICRO_YERTLE ; Firmware flags diff --git a/esp32/include/settings/peripherals_settings.h b/esp32/include/settings/peripherals_settings.h index e81a1c3..6947b7a 100644 --- a/esp32/include/settings/peripherals_settings.h +++ b/esp32/include/settings/peripherals_settings.h @@ -14,9 +14,6 @@ #ifndef SCL_PIN #define SCL_PIN SCL #endif -// #define STR(x) #x -// #define XSTR(x) STR(x) -// #pragma message ("SDA PIN: " XSTR(SDA_PIN)) #ifndef I2C_FREQUENCY #define I2C_FREQUENCY 1000000UL #endif @@ -45,9 +42,9 @@ class PeripheralsConfiguration { } static StateUpdateResult update(JsonVariant &root, PeripheralsConfiguration &settings) { - //settings.sda = root["sda"] | SDA_PIN; - //settings.scl = root["scl"] | SCL_PIN; - //settings.frequency = root["frequency"] | I2C_FREQUENCY; + settings.sda = root["sda"] | SDA_PIN; + settings.scl = root["scl"] | SCL_PIN; + settings.frequency = root["frequency"] | I2C_FREQUENCY; return StateUpdateResult::CHANGED; }; }; \ No newline at end of file diff --git a/platform_shared/example.proto b/platform_shared/example.proto deleted file mode 100644 index e7e6929..0000000 --- a/platform_shared/example.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto3"; - - -enum IMUType { - IMU_NONE = 0; - IMU_ACCEL = 1; - IMU_GYRO = 2; -} - -message IMUReport { - IMUType type = 1; - double x_val = 2; -} \ No newline at end of file