Make the parser parse mouse properties, LED brightness values, and double tap switch layer timeout. Rename pointer config properties.

right/src/config_parser/basic_types.c

@@ -8,7 +8,6 @@ uint8_t ReadUInt8(config_buffer_t *buffer)
 uint16_t ReadUInt16(config_buffer_t *buffer)
 {
     uint16_t uInt16 = ReadUInt8(buffer);
-
     uInt16 |= ReadUInt8(buffer) << 8;
     return uInt16;
 }
@@ -26,14 +25,12 @@ bool ReadBool(config_buffer_t *buffer)
 uint16_t ReadCompactLength(config_buffer_t *buffer)
 {
     uint16_t compactLength = ReadUInt8(buffer);
-
     return compactLength == 0xFF ? ReadUInt16(buffer) : compactLength;
 }
 
 const char *ReadString(config_buffer_t *buffer, uint16_t *len)
 {
     const char *string;
-
     *len = ReadCompactLength(buffer);
     string = (const char *)(buffer->buffer + buffer->offset);
     buffer->offset += *len;

right/src/config_parser/parse_config.c

@@ -4,35 +4,84 @@
 #include "keymap.h"
 #include "config_globals.h"
 #include "macros.h"
+#include "usb_report_updater.h"
 
 static parser_error_t parseModuleConfiguration(config_buffer_t *buffer)
 {
     uint8_t id = ReadUInt8(buffer);
-    uint8_t initialPointerSpeed = ReadUInt8(buffer);
-    uint8_t pointerAcceleration = ReadUInt8(buffer);
-    uint8_t maxPointerSpeed = ReadUInt8(buffer);
+    uint8_t deceleratedPointerSpeedMultiplier = ReadUInt8(buffer);
+    uint8_t basePointerSpeedMultiplier = ReadUInt8(buffer);
+    uint8_t acceleratedPointerSpeed = ReadUInt8(buffer);
 
     (void)id;
-    (void)initialPointerSpeed;
-    (void)pointerAcceleration;
-    (void)maxPointerSpeed;
+    (void)deceleratedPointerSpeedMultiplier;
+    (void)basePointerSpeedMultiplier;
+    (void)acceleratedPointerSpeed;
     return ParserError_Success;
 }
 
 parser_error_t ParseConfig(config_buffer_t *buffer)
 {
+    // Miscellaneous properties
+
     uint16_t len;
     uint16_t macroCount;
     uint16_t keymapCount;
     parser_error_t errorCode;
 
-    uint16_t dataModelVersion = ReadUInt16(buffer);
+    uint16_t dataModelMajorVersion = ReadUInt16(buffer);
+    uint16_t dataModelMinorVersion = ReadUInt16(buffer);
+    uint16_t dataModelPatchVersion = ReadUInt16(buffer);
     uint16_t userConfigLength = ReadUInt16(buffer);
-    (void)userConfigLength;
-    ReadString(buffer, &len); // Ignore device name
-    uint16_t moduleConfigurationCount = ReadCompactLength(buffer);
+    const char *deviceName = ReadString(buffer, &len);
+    uint16_t doubleTapSwitchLayerTimeout = ReadUInt16(buffer);
 
-    (void)dataModelVersion;
+    (void)userConfigLength;
+    (void)dataModelMajorVersion;
+    (void)dataModelMinorVersion;
+    (void)dataModelPatchVersion;
+    (void)deviceName;
+
+    // LED brightness
+
+    uint8_t iconsAndLayerTextsBrightness = ReadUInt8(buffer);
+    uint8_t alphanumericSegmentsBrightness = ReadUInt8(buffer);
+    uint8_t keyBacklightBrightness = ReadUInt8(buffer);
+
+    (void)iconsAndLayerTextsBrightness;
+    (void)alphanumericSegmentsBrightness;
+    (void)keyBacklightBrightness;
+
+    // Mouse kinetic properties
+
+    uint8_t mouseMoveInitialSpeed = ReadUInt8(buffer);
+    uint8_t mouseMoveAcceleration = ReadUInt8(buffer);
+    uint8_t mouseMoveDeceleratedSpeed = ReadUInt8(buffer);
+    uint8_t mouseMoveBaseSpeed = ReadUInt8(buffer);
+    uint8_t mouseMoveAcceleratedSpeed = ReadUInt8(buffer);
+    uint8_t mouseScrollInitialSpeed = ReadUInt8(buffer);
+    uint8_t mouseScrollAcceleration = ReadUInt8(buffer);
+    uint8_t mouseScrollDeceleratedSpeed = ReadUInt8(buffer);
+    uint8_t mouseScrollBaseSpeed = ReadUInt8(buffer);
+    uint8_t mouseScrollAcceleratedSpeed = ReadUInt8(buffer);
+
+    if (mouseMoveInitialSpeed == 0 ||
+        mouseMoveAcceleration == 0 ||
+        mouseMoveDeceleratedSpeed == 0 ||
+        mouseMoveBaseSpeed == 0 ||
+        mouseMoveAcceleratedSpeed == 0 ||
+        mouseScrollInitialSpeed == 0 ||
+        mouseScrollAcceleration == 0 ||
+        mouseScrollDeceleratedSpeed == 0 ||
+        mouseScrollBaseSpeed == 0 ||
+        mouseScrollAcceleratedSpeed == 0)
+    {
+        return ParserError_InvalidMouseKineticProperty;
+    }
+
+    // Module configurations
+
+    uint16_t moduleConfigurationCount = ReadCompactLength(buffer);
 
     if (moduleConfigurationCount > 255) {
         return ParserError_InvalidModuleConfigurationCount;
@@ -45,6 +94,8 @@ parser_error_t ParseConfig(config_buffer_t *buffer)
         }
     }
 
+    // Macros
+
     macroCount = ReadCompactLength(buffer);
     if (macroCount > MAX_MACRO_NUM) {
         return ParserError_InvalidMacroCount;
@@ -57,6 +108,8 @@ parser_error_t ParseConfig(config_buffer_t *buffer)
         }
     }
 
+    // Keymaps
+
     keymapCount = ReadCompactLength(buffer);
     if (keymapCount == 0 || keymapCount > MAX_KEYMAP_NUM) {
         return ParserError_InvalidKeymapCount;
@@ -69,7 +122,23 @@ parser_error_t ParseConfig(config_buffer_t *buffer)
         }
     }
 
+    // If parsing succeeded then apply the parsed values.
+
     if (!ParserRunDry) {
+        DoubleTapSwitchLayerTimeout = doubleTapSwitchLayerTimeout;
+
+        MouseMoveState.initialSpeed = mouseMoveInitialSpeed;
+        MouseMoveState.acceleration = mouseMoveAcceleration;
+        MouseMoveState.deceleratedSpeed = mouseMoveDeceleratedSpeed;
+        MouseMoveState.baseSpeed = mouseMoveBaseSpeed;
+        MouseMoveState.acceleratedSpeed = mouseMoveAcceleratedSpeed;
+
+        MouseScrollState.initialSpeed = mouseScrollInitialSpeed;
+        MouseScrollState.acceleration = mouseScrollAcceleration;
+        MouseScrollState.deceleratedSpeed = mouseScrollDeceleratedSpeed;
+        MouseScrollState.baseSpeed = mouseScrollBaseSpeed;
+        MouseScrollState.acceleratedSpeed = mouseScrollAcceleratedSpeed;
+
         AllKeymapsCount = keymapCount;
         AllMacrosCount = macroCount;
     }

right/src/config_parser/parse_config.h

@@ -8,20 +8,21 @@
 // Typedefs:
 
     typedef enum {
-        ParserError_Success,
-        ParserError_InvalidSerializedKeystrokeType,
-        ParserError_InvalidSerializedMouseAction,
-        ParserError_InvalidSerializedKeyActionType,
-        ParserError_InvalidLayerCount,
-        ParserError_InvalidModuleCount,
-        ParserError_InvalidActionCount,
-        ParserError_InvalidSerializedMacroActionType,
-        ParserError_InvalidSerializedSwitchKeymapAction,
-        ParserError_InvalidModuleConfigurationCount,
-        ParserError_InvalidKeymapCount,
-        ParserError_InvalidAbbreviationLen,
-        ParserError_InvalidMacroCount,
-        ParserError_InvalidSerializedPlayMacroAction,
+        ParserError_Success                             =  0,
+        ParserError_InvalidSerializedKeystrokeType      =  1,
+        ParserError_InvalidSerializedMouseAction        =  2,
+        ParserError_InvalidSerializedKeyActionType      =  3,
+        ParserError_InvalidLayerCount                   =  4,
+        ParserError_InvalidModuleCount                  =  5,
+        ParserError_InvalidActionCount                  =  6,
+        ParserError_InvalidSerializedMacroActionType    =  7,
+        ParserError_InvalidSerializedSwitchKeymapAction =  8,
+        ParserError_InvalidModuleConfigurationCount     =  9,
+        ParserError_InvalidKeymapCount                  = 10,
+        ParserError_InvalidAbbreviationLen              = 11,
+        ParserError_InvalidMacroCount                   = 12,
+        ParserError_InvalidSerializedPlayMacroAction    = 13,
+        ParserError_InvalidMouseKineticProperty         = 14,
     } parser_error_t;
 
 // Functions: