Merge 95e6246983 into 13581820b8

Update data/mappings/info_rules.hjson
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-10-14 17:07:00 -04:00 · 2023-03-22 13:08:18 -07:00 · 2023-03-21 04:25:50 +00:00 · 2023-03-21 03:43:56 +00:00
4 changed files with 9 additions and 4 deletions
--- a/builddefs/show_options.mk
+++ b/builddefs/show_options.mk
@ -70,6 +70,7 @@ OTHER_OPTION_NAMES = \
  WATCHDOG_ENABLE \
  ERGOINU \
  NO_USB_STARTUP_CHECK \
+  DISABLE_AVR_DEEP_SLEEP \
  DISABLE_PROMICRO_LEDs \
  MITOSIS_DATAGROK_BOTTOMSPACE \
  MITOSIS_DATAGROK_SLOWUART \
--- a/docs/config_options.md
+++ b/docs/config_options.md
@ -450,6 +450,8 @@ Use these to enable or disable building certain features. The more you have enab
  * Forces the keyboard to wait for a USB connection to be established before it starts up
 * `NO_USB_STARTUP_CHECK`
  * Disables usb suspend check after keyboard startup. Usually the keyboard waits for the host to wake it up before any tasks are performed. This is useful for split keyboards as one half will not get a wakeup call but must send commands to the master.
+* `DISABLE_AVR_DEEP_SLEEP`
+  * Disables AVR deep sleep. Similar to `NO_SUSPEND_POWER_DOWN` with the suspend routines executed, so backlight, audio, and OLED will be still turned off during sleep.
 * `DEFERRED_EXEC_ENABLE`
  * Enables deferred executor support -- timed delays before callbacks are invoked. See [deferred execution](custom_quantum_functions#deferred-execution) for more information.
 * `DYNAMIC_TAPPING_TERM_ENABLE`
--- a/platforms/avr/suspend.c
+++ b/platforms/avr/suspend.c
@ -13,9 +13,7 @@
 #    include "vusb.h"
 #endif

-// TODO: This needs some cleanup
-
-#if !defined(NO_SUSPEND_POWER_DOWN) && defined(WDT_vect)
+#if !defined(NO_SUSPEND_POWER_DOWN) && !defined(DISABLE_AVR_DEEP_SLEEP) && defined(WDT_vect)

 // clang-format off
 #define wdt_intr_enable(value) \
@ -105,7 +103,7 @@ void suspend_power_down(void) {

 #ifndef NO_SUSPEND_POWER_DOWN
    // Enter sleep state if possible (ie, the MCU has a watchdog timeout interrupt)
-#    if defined(WDT_vect)
+#    if defined(WDT_vect) && !defined(DISABLE_AVR_DEEP_SLEEP)
    power_down(WDTO_15MS);
 #    endif
 #endif
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@ -66,6 +66,10 @@ ifeq ($(strip $(USB_WAIT_FOR_ENUMERATION)), yes)
    OPT_DEFS += -DUSB_WAIT_FOR_ENUMERATION
 endif

+ifeq ($(strip $(DISABLE_AVR_DEEP_SLEEP)), yes)
+    TMK_COMMON_DEFS += -DDISABLE_AVR_DEEP_SLEEP
+endif
+
 ifeq ($(strip $(JOYSTICK_SHARED_EP)), yes)
    OPT_DEFS += -DJOYSTICK_SHARED_EP
    SHARED_EP_ENABLE = yes
Author	SHA1	Message	Date
Jay Greco	33bd95dab5	Merge `95e6246983` into `13581820b8`	2024-10-14 17:07:00 -04:00
Jay Greco	95e6246983	Update data/mappings/info_rules.hjson Co-authored-by: Ryan <fauxpark@gmail.com>	2023-03-22 13:08:18 -07:00
Jay Greco	b08742016f	Move config to info_rules.hjson	2023-03-21 04:25:50 +00:00
Jay Greco	ae97f31d23	avr/suspend: Add DISABLE_AVR_DEEP_SLEEP option	2023-03-21 03:43:56 +00:00