Format code according to conventions (#12046 )

Co-authored-by: QMK Bot <hello@qmk.fm>
Fix build for attiny85-based boards. (#12044 )
2021-02-27 22:35:41 +00:00 · 2021-02-28 09:33:33 +11:00 · 2021-02-28 09:20:36 +11:00 · 2021-02-27 22:07:55 +00:00 · 2021-02-27 14:01:16 -08:00
5 changed files with 8 additions and 2 deletions
--- a/keyboards/linworks/whale75/rules.mk
+++ b/keyboards/linworks/whale75/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F303
+BOARD = QMK_PROTON_C

 # Build Options
 #   change yes to no to disable
--- a/keyboards/melgeek/mj63/rev2/rules.mk
+++ b/keyboards/melgeek/mj63/rev2/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F303
+BOARD = QMK_PROTON_C

 # Build Options
 #   change yes to no to disable
--- a/keyboards/melgeek/mj64/rev3/rules.mk
+++ b/keyboards/melgeek/mj64/rev3/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F303
+BOARD = QMK_PROTON_C

 # Build Options
 #   change yes to no to disable
--- a/keyboards/melgeek/mj65/rev3/rules.mk
+++ b/keyboards/melgeek/mj65/rev3/rules.mk
@ -1,5 +1,6 @@
 # MCU name
 MCU = STM32F303
+BOARD = QMK_PROTON_C

 # Build Options
 #   change yes to no to disable
--- a/tmk_core/protocol/vusb/main.c
+++ b/tmk_core/protocol/vusb/main.c
@ -82,14 +82,16 @@ static void vusb_suspend(void) {
    suspend_power_down();
 }

+#if USB_COUNT_SOF
 static void vusb_wakeup(void) {
    vusb_suspended = false;
    suspend_wakeup_init();

-#ifdef SLEEP_LED_ENABLE
+#    ifdef SLEEP_LED_ENABLE
    sleep_led_disable();
-#endif
+#    endif
 }
+#endif

 /** \brief Setup USB
 *
Author	SHA1	Message	Date
github-actions[bot]	deaabff752	Format code according to conventions (#12046 ) Co-authored-by: QMK Bot <hello@qmk.fm>	2021-02-27 22:35:41 +00:00
Nick Brassel	6623744172	Fix build for attiny85-based boards. (#12044 )	2021-02-28 09:33:33 +11:00
Nick Brassel	e2d3cefc95	Fix up build failures for melgeek boards after Feb27 develop merge. (#12043 )	2021-02-28 09:20:36 +11:00
Nick Brassel	dd61f7795f	Fix build for linworks/whale75. (#12042 )	2021-02-27 22:07:55 +00:00
James Young	aa038994b2	Force update the version tag	2021-02-27 14:01:16 -08:00