Merge 95e6246983 into 7e53bb9965

Co-authored-by: Ryan <fauxpark@gmail.com>

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 \

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`

platforms/avr/suspend.c

@@ -13,9 +13,7 @@
 #    include "vusb.h"
 #endif
 
-// TODO: This needs some cleanup
+#if !defined(NO_SUSPEND_POWER_DOWN) && !defined(DISABLE_AVR_DEEP_SLEEP) && defined(WDT_vect)
-
-#if !defined(NO_SUSPEND_POWER_DOWN) && 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

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

tmk_core/protocol/usb_descriptor.c

@@ -305,7 +305,7 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
             HID_RI_LOGICAL_MAXIMUM(16, 0x7FFF),
             HID_RI_REPORT_COUNT(8, 0x02),
             HID_RI_REPORT_SIZE(8, 0x10),
-            HID_RI_UNIT(8, 0x33),          // Inch, English Linear
+            HID_RI_UNIT(8, 0x13),          // Inch, English Linear
             HID_RI_UNIT_EXPONENT(8, 0x0E), // -2
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
         HID_RI_END_COLLECTION(0),

tmk_core/protocol/vusb/vusb.c

@@ -673,7 +673,7 @@ const PROGMEM uchar shared_hid_report[] = {
     0x26, 0xFF, 0x7F, //     Logical Maximum (32767)
     0x95, 0x02,       //     Report Count (2)
     0x75, 0x10,       //     Report Size (16)
-    0x65, 0x33,       //     Unit (Inch, English Linear)
+    0x65, 0x13,       //     Unit (Inch, English Linear)
     0x55, 0x0E,       //     Unit Exponent (-2)
     0x81, 0x02,       //     Input (Data, Variable, Absolute)
     0xC0,             //   End Collection