From 3e551f4d0ee574a42f9b2c308dc525e80b275133 Mon Sep 17 00:00:00 2001 From: Florian Date: Mon, 8 Jul 2024 17:41:28 +0700 Subject: [PATCH] feat: store the firmware version in the usb spec SERIAL_NUMBER data blob --- keyboards/zsa/common/config.h | 6 +++--- keyboards/zsa/common/oryx.c | 8 ++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/keyboards/zsa/common/config.h b/keyboards/zsa/common/config.h index 8a0ef47e48..9d3cfbc8e1 100644 --- a/keyboards/zsa/common/config.h +++ b/keyboards/zsa/common/config.h @@ -4,9 +4,9 @@ #pragma once #ifdef ORYX_ENABLE -# ifndef FIRMWARE_VERSION -# define FIRMWARE_VERSION u8"default/latest" -# endif // FIRMWARE_VERSION +# ifndef SERIAL_NUMBER +# define SERIAL_NUMBER default/latest +# endif // SERIAL_NUMBER # ifndef RAW_USAGE_PAGE # define RAW_USAGE_PAGE 0xFF60 # endif // RAW_USAGE_PAGE diff --git a/keyboards/zsa/common/oryx.c b/keyboards/zsa/common/oryx.c index 8b57c20bc2..da639a7b45 100644 --- a/keyboards/zsa/common/oryx.c +++ b/keyboards/zsa/common/oryx.c @@ -4,10 +4,6 @@ #include #include "oryx.h" -#ifndef FIRMWARE_VERSION -# define FIRMWARE_VERSION u8"default/latest" -#endif // FIRMWARE_VERSION - rawhid_state_t rawhid_state = { .paired = false, .rgb_control = false, @@ -110,13 +106,13 @@ void raw_hid_receive(uint8_t *data, uint8_t length) { switch (command) { case ORYX_CMD_GET_FW_VERSION: { uint8_t event[RAW_EPSIZE]; - uint8_t fw_version_size = sizeof(FIRMWARE_VERSION); + uint8_t fw_version_size = sizeof(SERIAL_NUMBER); uint8_t stop[1]; event[0] = ORYX_EVT_GET_FW_VERSION; stop[0] = ORYX_STOP_BIT; - memcpy(event + 1, FIRMWARE_VERSION, fw_version_size); + memcpy(event + 1, SERIAL_NUMBER, fw_version_size); memcpy(event + fw_version_size, stop, 1); raw_hid_send_oryx(event, RAW_EPSIZE);