diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl index 3cf68761ad..1914370430 100644 --- a/gui/public/i18n/en/translation.ftl +++ b/gui/public/i18n/en/translation.ftl @@ -100,6 +100,8 @@ board_type-XIAO_ESP32C3 = Seeed Studio XIAO ESP32C3 board_type-HARITORA = Haritora board_type-ESP32C6DEVKITC1 = Espressif ESP32-C6 DevKitC-1 board_type-GLOVE_IMU_SLIMEVR_DEV = SlimeVR Dev IMU Glove +board_type-SLIMEVR_V1_2 = SlimeVR v1.2 +board_type-ESP32S3_SUPERMINI = ESP32-S3 SuperMini ## Proportions skeleton_bone-NONE = None diff --git a/gui/src/components/tracker/TrackerSettings.tsx b/gui/src/components/tracker/TrackerSettings.tsx index 4f0489cce0..ac541eee92 100644 --- a/gui/src/components/tracker/TrackerSettings.tsx +++ b/gui/src/components/tracker/TrackerSettings.tsx @@ -171,7 +171,9 @@ export function TrackerSettingsPage() { tracker?.device?.hardwareInfo && checkForUpdate(currentFirmwareRelease, tracker?.device); const updateUnavailable = - tracker?.device?.hardwareInfo?.officialBoardType !== BoardType.SLIMEVR || + (tracker?.device?.hardwareInfo?.officialBoardType !== BoardType.SLIMEVR && + tracker?.device?.hardwareInfo?.officialBoardType !== + BoardType.SLIMEVR_V1_2) || !semver.valid( tracker?.device?.hardwareInfo?.firmwareVersion?.toString() ?? 'none' ); diff --git a/gui/src/hooks/firmware-tool.ts b/gui/src/hooks/firmware-tool.ts index 58f48eda5c..cc2fd9f30a 100644 --- a/gui/src/hooks/firmware-tool.ts +++ b/gui/src/hooks/firmware-tool.ts @@ -65,6 +65,8 @@ export const boardTypeToFirmwareToolBoardType: Record< [BoardType.ESP32C6DEVKITC1]: null, [BoardType.GLOVE_IMU_SLIMEVR_DEV]: null, [BoardType.GESTURES]: null, + [BoardType.SLIMEVR_V1_2]: null, + [BoardType.ESP32S3_SUPERMINI]: null, }; export const firmwareToolToBoardType: Record = diff --git a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/FirmwareConstants.kt b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/FirmwareConstants.kt index 1b3ebf464c..b51a0cbb4f 100644 --- a/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/FirmwareConstants.kt +++ b/server/core/src/main/java/dev/slimevr/tracking/trackers/udp/FirmwareConstants.kt @@ -56,6 +56,8 @@ enum class BoardType(val id: UInt) { ESP32C6DEVKITC1(19u), GLOVE_IMU_SLIMEVR_DEV(20u), GESTURES(21u), + SLIMEVR_V1_2(22u), + ESP32S3_SUPERMINI(23u), DEV_RESERVED(250u), ; @@ -84,6 +86,8 @@ enum class BoardType(val id: UInt) { HARITORA -> "Haritora" ESP32C6DEVKITC1 -> "Espressif ESP32-C6 DevKitC-1" GLOVE_IMU_SLIMEVR_DEV -> "SlimeVR Dev IMU Glove" + SLIMEVR_V1_2 -> "SlimeVR v1.2" + ESP32S3_SUPERMINI -> "ESP32-S3 SuperMini" DEV_RESERVED -> "Prototype" } diff --git a/solarxr-protocol b/solarxr-protocol index df26226d10..eed73567f7 160000 --- a/solarxr-protocol +++ b/solarxr-protocol @@ -1 +1 @@ -Subproject commit df26226d104f75527a669e03879be675777885e3 +Subproject commit eed73567f77df0c3b556206803f17ea0748bc761