diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 12:13:19 +1100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 12:13:19 +1100 |
| commit | c9ba618654417ec115809a031d315f8327c79ad4 (patch) | |
| tree | cd5b907af5bebde7062897ff847e473232ed1214 /tmk_core/protocol/chibios/main.c | |
| parent | 2bb2977c133646c4e056960e72029270d77cc1eb (diff) | |
| parent | d977daa8dc9136746425f9e1414e1f93cb161877 (diff) | |
| download | qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.gz qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.zip | |
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
# quantum/matrix.c
Diffstat (limited to 'tmk_core/protocol/chibios/main.c')
| -rw-r--r-- | tmk_core/protocol/chibios/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/protocol/chibios/main.c b/tmk_core/protocol/chibios/main.c index ee9571c95..5436d4909 100644 --- a/tmk_core/protocol/chibios/main.c +++ b/tmk_core/protocol/chibios/main.c | |||
| @@ -113,7 +113,7 @@ int main(void) { | |||
| 113 | chSysInit(); | 113 | chSysInit(); |
| 114 | 114 | ||
| 115 | #ifdef STM32_EEPROM_ENABLE | 115 | #ifdef STM32_EEPROM_ENABLE |
| 116 | EEPROM_init(); | 116 | EEPROM_Init(); |
| 117 | #endif | 117 | #endif |
| 118 | 118 | ||
| 119 | // TESTING | 119 | // TESTING |