Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions gui/public/i18n/en/translation.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion gui/src/components/tracker/TrackerSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
);
Expand Down
2 changes: 2 additions & 0 deletions gui/src/hooks/firmware-tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<CreateBoardConfigDTO['type'], BoardType> =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
;

Expand Down Expand Up @@ -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"
}

Expand Down
2 changes: 1 addition & 1 deletion solarxr-protocol
Submodule solarxr-protocol updated 26 files
+86 −7 protocol/cpp/include/solarxr_protocol/generated/all_generated.h
+2 −0 protocol/java/src/solarxr_protocol/datatypes/hardware_info/BoardType.java
+2 −1 protocol/java/src/solarxr_protocol/rpc/RpcMessage.java
+4 −0 protocol/java/src/solarxr_protocol/rpc/RpcMessageHeader.java
+2 −0 protocol/java/src/solarxr_protocol/rpc/RpcMessageUnion.java
+62 −0 protocol/java/src/solarxr_protocol/rpc/SerialTrackerCustomCommandRequest.java
+22 −0 protocol/java/src/solarxr_protocol/rpc/SerialTrackerCustomCommandRequestT.java
+1 −1 protocol/java/src/solarxr_protocol/rpc/SerialTrackerFactoryResetRequest.java
+2 −0 protocol/kotlin/src/solarxr_protocol/datatypes/hardware_info/BoardType.kt
+2 −1 protocol/kotlin/src/solarxr_protocol/rpc/RpcMessage.kt
+55 −0 protocol/kotlin/src/solarxr_protocol/rpc/SerialTrackerCustomCommandRequest.kt
+1 −1 protocol/kotlin/src/solarxr_protocol/rpc/SerialTrackerFactoryResetRequest.kt
+2 −0 protocol/rust/src/generated/mod.rs
+9 −1 protocol/rust/src/generated/solarxr_protocol/datatypes/hardware_info/board_type_generated.rs
+7 −3 protocol/rust/src/generated/solarxr_protocol/rpc/rpc_message_generated.rs
+23 −0 protocol/rust/src/generated/solarxr_protocol/rpc/rpc_message_header_generated.rs
+109 −0 protocol/rust/src/generated/solarxr_protocol/rpc/serial_tracker_custom_command_request_generated.rs
+1 −1 protocol/rust/src/generated/solarxr_protocol/rpc/serial_tracker_factory_reset_request_generated.rs
+1 −0 protocol/typescript/src/all_generated.ts
+2 −0 protocol/typescript/src/solarxr-protocol/datatypes/hardware-info/board-type.ts
+2 −1 protocol/typescript/src/solarxr-protocol/rpc/rpc-message-header.ts
+9 −5 protocol/typescript/src/solarxr-protocol/rpc/rpc-message.ts
+79 −0 protocol/typescript/src/solarxr-protocol/rpc/serial-tracker-custom-command-request.ts
+1 −1 protocol/typescript/src/solarxr-protocol/rpc/serial-tracker-factory-reset-request.ts
+2 −0 schema/datatypes/hardware_info.fbs
+7 −1 schema/rpc.fbs