wip: split firmware code

heiso · Nov 13, 2024 · 8d8856c · 8d8856c
1 parent 3acdfe5
commit 8d8856c
Show file tree

Hide file tree

Showing 4 changed files with 589 additions and 537 deletions.
diff --git a/firmware/Core/Inc/keyboard.h b/firmware/Core/Inc/keyboard.h
@@ -0,0 +1,120 @@
+/* Define to prevent recursive inclusion -------------------------------------*/
+#ifndef __KEYBOARD_H
+#define __KEYBOARD_H
+
+#define CALIBRATION_CYCLES 20
+
+#define DEFAULT_TRIGGER_OFFSET 64
+#define DEFAULT_RESET_THRESHOLD 3
+#define DEFAULT_RAPID_TRIGGER_OFFSET 40
+#define DEFAULT_SCREAMING_VELOCITY_TRIGGER 45
+#define DEFAULT_TAP_TIMEOUT 200
+
+#define IDLE_VALUE_APPROX 1800
+#define MAX_DISTANCE_APPROX 500
+#define IDLE_VALUE_OFFSET 10
+#define MAX_DISTANCE_OFFSET 60
+#define IDLE_CYCLES_UNTIL_SLEEP 15
+
+#define ADC_CHANNEL_COUNT 5
+#define AMUX_SELECT_PINS_COUNT 4
+#define AMUX_CHANNEL_COUNT 16
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define XXXX 0xff
+#define ____ 0x00
+
+#define SPECIAL(X) (0b1000000000000000 | X)
+
+struct __attribute__((__packed__)) calibration {
+  uint16_t cycles_count;
+  uint16_t idle_value;
+  uint16_t max_distance;
+};
+
+enum direction {
+  GOING_UP,
+  GOING_DOWN,
+};
+
+struct __attribute__((__packed__)) state {
+  uint16_t value;
+  uint16_t distance;
+  uint8_t distance_8bits;
+  float filtered_distance;
+  int8_t velocity;
+  uint8_t filtered_distance_8bits;
+};
+
+enum actuation_status {
+  STATUS_MIGHT_BE_TAP,
+  STATUS_TAP,
+  STATUS_TRIGGERED,
+  STATUS_RESET,
+  STATUS_RAPID_TRIGGER_RESET
+};
+
+struct __attribute__((__packed__)) actuation {
+  enum direction direction;
+  uint8_t direction_changed_point;
+  enum actuation_status status;
+  uint8_t reset_offset;
+  uint8_t trigger_offset;
+  uint8_t rapid_trigger_offset;
+  uint8_t is_continuous_rapid_trigger_enabled;
+  uint32_t triggered_at;
+};
+
+enum key_type {
+  KEY_TYPE_EMPTY,
+  KEY_TYPE_NORMAL,
+  KEY_TYPE_MODIFIER,
+  KEY_TYPE_CONSUMER_CONTROL,
+};
+
+struct __attribute__((__packed__)) layer {
+  enum key_type type;
+  uint16_t value;
+};
+
+enum {
+  _BASE_LAYER,
+  _TAP_LAYER,
+  LAYERS_COUNT
+};
+
+struct __attribute__((__packed__)) key {
+  uint8_t is_enabled;
+  uint8_t row;
+  uint8_t column;
+  uint8_t idle_counter;
+  uint8_t is_idle;
+  struct layer layers[LAYERS_COUNT];
+  struct calibration calibration;
+  struct state state;
+  struct actuation actuation;
+};
+
+struct user_config {
+  uint8_t trigger_offset;
+  uint8_t reset_threshold;
+  uint8_t rapid_trigger_offset;
+  uint8_t screaming_velocity_trigger;
+  uint16_t tap_timeout;
+  uint16_t keymaps[LAYERS_COUNT][MATRIX_ROWS][MATRIX_COLS];
+};
+
+struct user_config keyboard_user_config;
+static void keyboard_task();
+static void keyboard_init_keys();
+static void keyboard_read_config();
+static uint8_t keyboard_write_config(uint8_t *buffer, uint16_t offset, uint16_t size);
+static void keyboard_select_amux(uint8_t amux_channel);
+static void keyboard_select_adc(uint8_t adc_channel);
+static uint16_t keyboard_read_adc();
+static void keyboard_close_adc();
+static uint32_t keyboard_get_time();
+
+#endif /* __KEYBOARD_H */
diff --git a/firmware/Core/Inc/main.h b/firmware/Core/Inc/main.h
@@ -33,112 +33,11 @@ extern "C" {
 /* USER CODE BEGIN Includes */
 #define CONFIG_ADDRESS 0x08040000
 
-#define CALIBRATION_CYCLES 20
-
-#define DEFAULT_TRIGGER_OFFSET 64
-#define DEFAULT_RESET_THRESHOLD 3
-#define DEFAULT_RAPID_TRIGGER_OFFSET 40
-#define DEFAULT_SCREAMING_VELOCITY_TRIGGER 45
-#define DEFAULT_TAP_TIMEOUT 200
-
-#define IDLE_VALUE_APPROX 1800
-#define MAX_DISTANCE_APPROX 500
-#define IDLE_VALUE_OFFSET 10
-#define MAX_DISTANCE_OFFSET 60
-#define IDLE_CYCLES_UNTIL_SLEEP 15
-
-#define ADC_CHANNEL_COUNT 5
-#define AMUX_SELECT_PINS_COUNT 4
-#define AMUX_CHANNEL_COUNT 16
-
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 15
-
-#define XXXX 0xff
-#define ____ 0x00
-
-#define SPECIAL(X) (0b1000000000000000 | X)
 /* USER CODE END Includes */
 
 /* Exported types ------------------------------------------------------------*/
 /* USER CODE BEGIN ET */
-struct __attribute__((__packed__)) calibration {
-  uint16_t cycles_count;
-  uint16_t idle_value;
-  uint16_t max_distance;
-};
-
-enum direction {
-  GOING_UP,
-  GOING_DOWN,
-};
-
-struct __attribute__((__packed__)) state {
-  uint16_t value;
-  uint16_t distance;
-  uint8_t distance_8bits;
-  float filtered_distance;
-  int8_t velocity;
-  uint8_t filtered_distance_8bits;
-};
-
-enum actuation_status {
-  STATUS_MIGHT_BE_TAP,
-  STATUS_TAP,
-  STATUS_TRIGGERED,
-  STATUS_RESET,
-  STATUS_RAPID_TRIGGER_RESET
-};
-
-struct __attribute__((__packed__)) actuation {
-  enum direction direction;
-  uint8_t direction_changed_point;
-  enum actuation_status status;
-  uint8_t reset_offset;
-  uint8_t trigger_offset;
-  uint8_t rapid_trigger_offset;
-  uint8_t is_continuous_rapid_trigger_enabled;
-  uint32_t triggered_at;
-};
-
-enum key_type {
-  KEY_TYPE_EMPTY,
-  KEY_TYPE_NORMAL,
-  KEY_TYPE_MODIFIER,
-  KEY_TYPE_CONSUMER_CONTROL,
-};
-
-struct __attribute__((__packed__)) layer {
-  enum key_type type;
-  uint16_t value;
-};
-
-enum {
-  _BASE_LAYER,
-  _TAP_LAYER,
-  LAYERS_COUNT
-};
-
-struct __attribute__((__packed__)) key {
-  uint8_t is_enabled;
-  uint8_t row;
-  uint8_t column;
-  uint8_t idle_counter;
-  uint8_t is_idle;
-  struct layer layers[LAYERS_COUNT];
-  struct calibration calibration;
-  struct state state;
-  struct actuation actuation;
-};
-
-struct user_config {
-  uint8_t trigger_offset;
-  uint8_t reset_threshold;
-  uint8_t rapid_trigger_offset;
-  uint8_t screaming_velocity_trigger;
-  uint16_t tap_timeout;
-  uint16_t keymaps[LAYERS_COUNT][MATRIX_ROWS][MATRIX_COLS];
-};
+
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/