summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-07 05:44:58 +0000
committerQMK Bot <hello@qmk.fm>2022-07-07 05:44:58 +0000
commit8f086faf8ae919997b42c9842cac10b144bc62b4 (patch)
tree2cb8d722c5964236dbdcd3aafaaf52a89a1ecb69
parent744af003befb3f5cf6dc6b6f3e581f288d598f96 (diff)
parent0d30565bb7506d6d5c25d8fb28684859434493eb (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/mechwild/waka60/f401/config.h (renamed from keyboards/mechwild/waka60/f401/eeprom/config.h)0
-rw-r--r--keyboards/mechwild/waka60/f401/halconf.h (renamed from keyboards/mechwild/waka60/f411/eeprom/halconf.h)3
-rw-r--r--keyboards/mechwild/waka60/f401/mcuconf.h (renamed from keyboards/mechwild/waka60/f401/eeprom/mcuconf.h)5
-rw-r--r--keyboards/mechwild/waka60/f411/config.h (renamed from keyboards/mechwild/waka60/f411/eeprom/config.h)0
-rw-r--r--keyboards/mechwild/waka60/f411/halconf.h (renamed from keyboards/mechwild/waka60/f401/eeprom/halconf.h)3
-rw-r--r--keyboards/mechwild/waka60/f411/mcuconf.h (renamed from keyboards/mechwild/waka60/f411/eeprom/mcuconf.h)5
6 files changed, 16 insertions, 0 deletions
diff --git a/keyboards/mechwild/waka60/f401/eeprom/config.h b/keyboards/mechwild/waka60/f401/config.h
index 83eed90b99..83eed90b99 100644
--- a/keyboards/mechwild/waka60/f401/eeprom/config.h
+++ b/keyboards/mechwild/waka60/f401/config.h
diff --git a/keyboards/mechwild/waka60/f411/eeprom/halconf.h b/keyboards/mechwild/waka60/f401/halconf.h
index b57977316a..25309fc70f 100644
--- a/keyboards/mechwild/waka60/f411/eeprom/halconf.h
+++ b/keyboards/mechwild/waka60/f401/halconf.h
@@ -17,6 +17,9 @@
#pragma once
#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+#define HAL_USE_GPT TRUE
#include_next <halconf.h>
diff --git a/keyboards/mechwild/waka60/f401/eeprom/mcuconf.h b/keyboards/mechwild/waka60/f401/mcuconf.h
index da43021663..95339690cf 100644
--- a/keyboards/mechwild/waka60/f401/eeprom/mcuconf.h
+++ b/keyboards/mechwild/waka60/f401/mcuconf.h
@@ -20,3 +20,8 @@
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
+#undef STM32_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE \ No newline at end of file
diff --git a/keyboards/mechwild/waka60/f411/eeprom/config.h b/keyboards/mechwild/waka60/f411/config.h
index 83eed90b99..83eed90b99 100644
--- a/keyboards/mechwild/waka60/f411/eeprom/config.h
+++ b/keyboards/mechwild/waka60/f411/config.h
diff --git a/keyboards/mechwild/waka60/f401/eeprom/halconf.h b/keyboards/mechwild/waka60/f411/halconf.h
index b57977316a..25309fc70f 100644
--- a/keyboards/mechwild/waka60/f401/eeprom/halconf.h
+++ b/keyboards/mechwild/waka60/f411/halconf.h
@@ -17,6 +17,9 @@
#pragma once
#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+#define HAL_USE_PAL TRUE
+#define HAL_USE_GPT TRUE
#include_next <halconf.h>
diff --git a/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h b/keyboards/mechwild/waka60/f411/mcuconf.h
index da43021663..f903d8880f 100644
--- a/keyboards/mechwild/waka60/f411/eeprom/mcuconf.h
+++ b/keyboards/mechwild/waka60/f411/mcuconf.h
@@ -20,3 +20,8 @@
#undef STM32_I2C_USE_I2C1
#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
+#undef STM32_GPT_USE_TIM4
+#define STM32_GPT_USE_TIM4 TRUE