move things about a bit

AmyJeanes · AmyJeanes · commit 93e2f9d141d2 · 2025-12-17T01:08:03.000Z
diff --git a/Keypad.Firmware/src/buttons.c b/Keypad.Firmware/src/buttons.c
@@ -2,7 +2,7 @@
 #include "hid.h"
 #include "util.h"
 #include "buttons.h"
-#include "../configuration_data.h"
+#include "configuration_data.h"
 
 static bool *button_state_s = NULL;
 static size_t button_state_capacity_s = 0;
diff --git a/Keypad.Firmware/src/buttons.cpp b/Keypad.Firmware/src/buttons.cpp
diff --git a/Keypad.Firmware/src/configuration_data.c b/Keypad.Firmware/src/configuration_data.c
@@ -1,6 +1,6 @@
 #include <Arduino.h>
 
-#include "configuration.h"
+#include "../configuration.h"
 
 static bool button_state_storage_s[CONFIGURATION_BUTTON_CAPACITY];
 
diff --git a/Keypad.Firmware/src/configuration_data.h b/Keypad.Firmware/src/configuration_data.h
@@ -4,7 +4,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include "src/hid.h"
+#include "hid.h"
 
 typedef struct
 {
diff --git a/Keypad.Firmware/src/encoder.c b/Keypad.Firmware/src/encoder.c
@@ -6,7 +6,7 @@
 #include <Arduino.h>
 
 #include "hid.h"
-#include "../configuration_data.h"
+#include "configuration_data.h"
 
 // lookup table for quadrature transitions (prev<<2 | current)
 static const int8_t rotary_table_s[16] = {
diff --git a/Keypad.Firmware/src/hid.c b/Keypad.Firmware/src/hid.c
@@ -2,7 +2,7 @@
 #include "userUsbHidKeyboardMouse/USBHIDKeyboardMouse.h"
 #include "led.h"
 #include "hid.h"
-#include "../configuration_data.h"
+#include "configuration_data.h"
 
 #define HID_CONSUMER_VOLUME_INCREMENT 0x00E9
 #define HID_CONSUMER_VOLUME_DECREMENT 0x00EA
diff --git a/Keypad.Flasher.Server.Tests/ConfigurationGeneratorTests.cs b/Keypad.Flasher.Server.Tests/ConfigurationGeneratorTests.cs
@@ -25,7 +25,7 @@ public void GenerateHeader_MatchesExpectedLayout()
             var expected = Lines(
                 "#pragma once",
                 string.Empty,
-                "#include \"configuration_data.h\"",
+                "#include \"src/configuration_data.h\"",
                 string.Empty,
                 "#define CONFIGURATION_BUTTON_CAPACITY 2",
                 "#define CONFIGURATION_ENCODER_CAPACITY 0");
diff --git a/Keypad.Flasher.Server/Configuration/ConfigurationGenerator.cs b/Keypad.Flasher.Server/Configuration/ConfigurationGenerator.cs
@@ -12,7 +12,7 @@ public string GenerateHeader(ConfigurationDefinition configuration)
             var sb = new StringBuilder();
             sb.AppendLine("#pragma once");
             sb.AppendLine();
-            sb.AppendLine("#include \"configuration_data.h\"");
+            sb.AppendLine("#include \"src/configuration_data.h\"");
             sb.AppendLine();
             sb.AppendLine($"#define CONFIGURATION_BUTTON_CAPACITY {configuration.Buttons.Count}");
             sb.AppendLine($"#define CONFIGURATION_ENCODER_CAPACITY {configuration.Encoders.Count}");

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include <stddef.h>`
`5`	`5`	`#include <stdbool.h>`
`6`	`6`
`7`		`-#include "src/hid.h"`
	`7`	`+#include "hid.h"`
`8`	`8`
`9`	`9`	`typedef struct`
`10`	`10`	`{`