Merge pull request #1 from heiso/dev

wip
heiso · May 12, 2024 · 7be1e0f · 7be1e0f
2 parents 0b4093a + e863455
commit 7be1e0f
Show file tree

Hide file tree

Showing 20 changed files with 1,692 additions and 1,565 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,14 @@
   // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "name": "Attach",
+      "port": 9229,
+      "request": "attach",
+      "skipFiles": ["<node_internals>/**"],
+      "type": "pwa-node",
+      "restart": true
+    },
     {
       "name": "Cortex Debug",
       "cwd": "${workspaceRoot}/firmware",

diff --git a/firmware/Core/Inc/main.h b/firmware/Core/Inc/main.h
@@ -61,7 +61,7 @@ extern "C" {
 
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
-struct calibration {
+struct __attribute__((__packed__)) calibration {
   uint16_t cycles_count;
   uint16_t idle_value;
   uint16_t max_distance;
@@ -72,7 +72,7 @@ enum direction {
   GOING_DOWN,
 };
 
-struct state {
+struct __attribute__((__packed__)) state {
   uint16_t value;
   uint16_t distance;
   uint8_t distance_8bits;
@@ -89,7 +89,7 @@ enum actuation_status {
   STATUS_RAPID_TRIGGER_RESET
 };
 
-struct actuation {
+struct __attribute__((__packed__)) actuation {
   enum direction direction;
   uint8_t direction_changed_point;
   enum actuation_status status;
@@ -107,7 +107,7 @@ enum key_type {
   KEY_TYPE_CONSUMER_CONTROL,
 };
 
-struct layer {
+struct __attribute__((__packed__)) layer {
   enum key_type type;
   uint16_t value;
 };
@@ -118,7 +118,7 @@ enum {
   LAYERS_COUNT
 };
 
-struct key {
+struct __attribute__((__packed__)) key {
   uint8_t is_enabled;
   uint8_t row;
   uint8_t column;
@@ -130,16 +130,6 @@ struct key {
   struct actuation actuation;
 };
 
-struct serial_key {
-  uint8_t row;
-  uint8_t column;
-  uint16_t idle_value;
-  uint16_t max_distance;
-  uint16_t value;
-  uint8_t distance_8bits;
-  enum actuation_status status;
-};
-
 struct user_config {
   uint8_t trigger_offset;
   uint8_t reset_threshold;