diff options
| author | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2020-12-16 03:27:52 +0000 |
| commit | 2e0f2025bd9f400dd8f5b0cad8ba80667193408d (patch) | |
| tree | 2e3d0fb98b20bdd4e39b4719abdffe4e29e242e9 /keyboards/ergodox_stm32 | |
| parent | 416dea2c54c885a1d58d6924be6b346c8eb87f47 (diff) | |
| parent | 9366ed728280f4875ebbba9c0ef1eade03c96d35 (diff) | |
| download | qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.tar.gz qmk_firmware-2e0f2025bd9f400dd8f5b0cad8ba80667193408d.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/ergodox_stm32')
| -rw-r--r-- | keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c | 2 | ||||
| -rw-r--r-- | keyboards/ergodox_stm32/ergodox_stm32.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c b/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c index d953d6a13..48844e34a 100644 --- a/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c +++ b/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | limitations under the License. | 14 | limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include "hal.h" | 17 | #include <hal.h> |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * @brief PAL setup. | 20 | * @brief PAL setup. |
diff --git a/keyboards/ergodox_stm32/ergodox_stm32.h b/keyboards/ergodox_stm32/ergodox_stm32.h index be1c2e9c3..b84b101f3 100644 --- a/keyboards/ergodox_stm32/ergodox_stm32.h +++ b/keyboards/ergodox_stm32/ergodox_stm32.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | #include "action_layer.h" | 4 | #include "action_layer.h" |
| 5 | #include <stdint.h> | 5 | #include <stdint.h> |
| 6 | #include <stdbool.h> | 6 | #include <stdbool.h> |
| 7 | #include "hal.h" | 7 | #include <hal.h> |
| 8 | 8 | ||
| 9 | // #define I2C_ADDR 0b01000000 | 9 | // #define I2C_ADDR 0b01000000 |
| 10 | #define I2C_ADDR 0b01000000 | 10 | #define I2C_ADDR 0b01000000 |