Skip to content

Fix OS_DETECTION_KEYBOARD_RESET #25015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 12, 2025
Merged

Fix OS_DETECTION_KEYBOARD_RESET #25015

merged 2 commits into from
May 12, 2025

Conversation

qvr
Copy link
Contributor

@qvr qvr commented Mar 15, 2025

Description

In #24379 the OS_DETECTION_KEYBOARD_RESET logic got inadvertently changed to only reset if the keyboard ends up stuck in the INIT phase, which was apparently an issue with some KVMs, but this means that it no longer does what it originally was meant to do.

This PR leaves that functionality, but also resets the keyboard on USB device reinitilization again, as long as it had been stable for debounce duration before that. The debounce time used for reset is by default the same as for the detection, but it can be tuned with the undocumented OS_DETECTION_RESET_DEBOUNCE setting.

We set the debounce timer in the USB device change callback, because reacting to state changes in the main task loop feels racy. Actual reset still happens in os_detection_task, because some MCUs seem not to like it if they are being immediately reset on USB state change.

Fixes #24920.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added the core label Mar 15, 2025
@qvr qvr force-pushed the fix/os_detection_reset branch from e431df8 to 9db07a6 Compare March 15, 2025 08:49
@bin101
Copy link

bin101 commented Mar 25, 2025

Hi sth seems to be still off.

After following this cycle:

  1. Starting on macos (os is detected correctly)
  2. Switching the KVM to windows (os is detected correctly)
    a. store_setups_in_eeprom()
  3. Switching back to macos (os is NOT detected correctly)

My kb is in a frozen state and needs a power cycle.

The stored values print this on the console:

Keebio:Iris LM-K Rev. 1:1: i: 0, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 1, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 2, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 3, wLength: 0x0E
Keebio:Iris LM-K Rev. 1:1: i: 4, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 5, wLength: 0x42
Keebio:Iris LM-K Rev. 1:1: i: 6, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 7, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 8, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 9, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 10, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 11, wLength: 0x04
Keebio:Iris LM-K Rev. 1:1: i: 12, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 13, wLength: 0x04
Keebio:Iris LM-K Rev. 1:1: i: 14, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 15, wLength: 0x04
Keebio:Iris LM-K Rev. 1:1: i: 16, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 17, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 18, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 19, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 20, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 21, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 22, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 23, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 24, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 25, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 26, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 27, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 28, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 29, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 30, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 31, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 32, wLength: 0x202
Keebio:Iris LM-K Rev. 1:1: i: 33, wLength: 0x202
Keebio:Iris LM-K Rev. 1:1: i: 34, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 35, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 36, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 37, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 38, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 39, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 40, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 41, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 42, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 43, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 44, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 45, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 46, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 47, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 48, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 49, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 50, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 51, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 52, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 53, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 54, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 55, wLength: 0x20A

@tzarc
Copy link
Member

tzarc commented Mar 25, 2025

All bets are off with a KVM, tbh. I wouldn’t be terribly confident that there are identical data streams from the host to kvm, and kvm to device. History has shown that the smarter the kvm, the less likely it is to work with that sort of thing.

@tzarc
Copy link
Member

tzarc commented Mar 25, 2025

My kb is in a frozen state and needs a power cycle.

That said, this should probably be looked at. Only thought is perhaps it’s running out of eeprom and locking up.

@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

My kb is in a frozen state and needs a power cycle.

Are you using this PR only, or do you have this part still commented out also?
#24920 (comment)

Just commenting out that check can easily lead to boot-loop.

@bin101
Copy link

bin101 commented Mar 25, 2025

I pulled the latest main from this mornin and replaced quantum/os_detection.c with your version.

@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

I don't see how this code could end up frozen. Are you able to tell if it's in a boot loop or really frozen?

Have you changed the default debounce time? What code do you have in your process_detected_host_os_*?

@bin101
Copy link

bin101 commented Mar 25, 2025

Take a look at my userspace code

@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

Take a look at my userspace code

You don't seem to have OS_DETECTION_KEYBOARD_RESET enabled at all, so this PR is not even compiled in. Possibly you are running out of eeprom as @tzarc suggested.

@bin101
Copy link

bin101 commented Mar 25, 2025

okay you're right but with the reset enabled the kb isn't showing any response at all after a KVM switch from macos to win.

with a switch from win to macos I can retrieve this output:

Keebio:Iris LM-K Rev. 1:1: i: 0, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 1, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 2, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 3, wLength: 0x04
Keebio:Iris LM-K Rev. 1:1: i: 4, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 5, wLength: 0x04
Keebio:Iris LM-K Rev. 1:1: i: 6, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 7, wLength: 0x04
Keebio:Iris LM-K Rev. 1:1: i: 8, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 9, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 10, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 11, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 12, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 13, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 14, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 15, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 16, wLength: 0x202
Keebio:Iris LM-K Rev. 1:1: i: 17, wLength: 0x202
Keebio:Iris LM-K Rev. 1:1: i: 18, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 19, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 20, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 21, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 22, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 23, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 24, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 25, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 26, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 27, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 28, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 29, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 30, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 31, wLength: 0x20A
Keebio:Iris LM-K Rev. 1:1: i: 32, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 33, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 34, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 35, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 36, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 37, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 38, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 39, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 40, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 41, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 42, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 43, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 44, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 45, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 46, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 47, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 48, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 49, wLength: 0x103
Keebio:Iris LM-K Rev. 1:1: i: 50, wLength: 0x204
Keebio:Iris LM-K Rev. 1:1: i: 51, wLength: 0xBDA0
Keebio:Iris LM-K Rev. 1:1: i: 52, wLength: 0x101
Keebio:Iris LM-K Rev. 1:1: i: 53, wLength: 0x00
Keebio:Iris LM-K Rev. 1:1: i: 54, wLength: 0x202
Keebio:Iris LM-K Rev. 1:1: i: 55, wLength: 0xBDCD
Keebio:Iris LM-K Rev. 1:1: i: 56, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 57, wLength: 0x11
Keebio:Iris LM-K Rev. 1:1: i: 58, wLength: 0x202
Keebio:Iris LM-K Rev. 1:1: i: 59, wLength: 0xBE78
Keebio:Iris LM-K Rev. 1:1: i: 60, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 61, wLength: 0x22
Keebio:Iris LM-K Rev. 1:1: i: 62, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 63, wLength: 0x0E
Keebio:Iris LM-K Rev. 1:1: i: 64, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 65, wLength: 0x42
Keebio:Iris LM-K Rev. 1:1: i: 66, wLength: 0xFF
Keebio:Iris LM-K Rev. 1:1: i: 67, wLength: 0xFF

index 60 to 67 is the fingerprint I get from macos, so no reset executed? Will try the single report.

Edit: Activating single report also didn't help

@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

okay you're right but with the reset enabled the kb isn't showing any response at all after a KVM switch from macos to win.

with a switch from win to macos I can retrieve this output:
index 60 to 67 is the fingerprint I get from macos, so no reset executed? Will try the single report.

Edit: Activating single report also didn't help

What response do you expect that you do not see? I'm not sure you can say based on the debug output that the reset did not happen.

Your process_detected_host_os_user will default to _MAC layout if the detection ends up unsure after the switch.

This PR will reset the keyboard if the USB state goes to INIT after it had already been CONFIGURED for debounce time. If your KVM does not change the USB state, or the OS can't be correctly fingerprinted via your KVM even after the reset, that would be beyond the scope of this PR.

@bin101
Copy link

bin101 commented Mar 25, 2025

Ah okay I thought the kb does a full "reboot" and I would see only the output from one os and then the detection by fingerprint grabs.

@bin101
Copy link

bin101 commented Mar 25, 2025

Sorry my C and hardware programming knowledge got a little bit rusty.
I tried to log the usb state changes with this quick 'n dirty change, so I can print the usb state changes to console:

diff --git a/quantum/os_detection.c b/quantum/os_detection.c
index df12297c14..5b9c9fa38a 100644
--- a/quantum/os_detection.c
+++ b/quantum/os_detection.c
@@ -29,10 +29,12 @@
 
  #    define STORED_USB_SETUPS 50
  #    define EEPROM_USER_OFFSET (uint8_t*)EECONFIG_SIZE
 
  static uint16_t usb_setups[STORED_USB_SETUPS];
+ static uint16_t usb_states[STORED_USB_SETUPS];
+ static uint8_t usb_states_index = 0;
  #endif
 
  #ifndef OS_DETECTION_DEBOUNCE
  #    define OS_DETECTION_DEBOUNCE 250
  #endif
@@ -190,10 +192,16 @@
      }
      current_usb_device_state = usb_device_state;
      last_time                = timer_read_fast();
      debouncing               = true;
 
+     usb_states[usb_states_index] = (uint16_t)usb_device_state.configure_state;
+     usb_states_index++;
+     if (usb_states_index >= STORED_USB_SETUPS) {
+         usb_states_index = 0;
+     }
+
  #ifdef OS_DETECTION_KEYBOARD_RESET
      if (current_usb_device_state.configure_state == USB_DEVICE_STATE_CONFIGURED) {
          configured_since = timer_read_fast();
      } else if (current_usb_device_state.configure_state == USB_DEVICE_STATE_INIT) {
          // reset the keyboard only if it's been stable for at least debounce duration, to avoid issues with some KVMs
@@ -223,13 +231,13 @@
      }
  #    endif
  }
 
  void store_setups_in_eeprom(void) {
-     eeprom_update_byte(EEPROM_USER_OFFSET, setups_data.count);
-     for (uint16_t i = 0; i < setups_data.count; ++i) {
+     eeprom_update_byte(EEPROM_USER_OFFSET, usb_states_index);
+     for (uint16_t i = 0; i < usb_states_index; ++i) {
          uint16_t* addr = (uint16_t*)EEPROM_USER_OFFSET + i * sizeof(uint16_t) + sizeof(uint8_t);
-         eeprom_update_word(addr, usb_setups[i]);
+         eeprom_update_word(addr, usb_states[i]);
      }
  }
 
  #endif // OS_DETECTION_DEBUG_ENABLE

Plain mac:

Keebio:Iris LM-K Rev. 1:1: i: 0, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 1, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 2, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 3, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 4, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 5, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 6, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 7, wLength: 0x02

Plain win:

Keebio:Iris LM-K Rev. 1:1: i: 0, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 1, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 2, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 3, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 4, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 5, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 6, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 7, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 8, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 9, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 10, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 11, wLength: 0x02

win -> mac:

Keebio:Iris LM-K Rev. 1:1: i: 0, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 1, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 2, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 3, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 4, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 5, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 6, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 7, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 8, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 9, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 10, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 11, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 12, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 13, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 14, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 15, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 16, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 17, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 18, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 19, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 20, wLength: 0x02

mac -> win:

Keebio:Iris LM-K Rev. 1:1: i: 0, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 1, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 2, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 3, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 4, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 5, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 6, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 7, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 8, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 9, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 10, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 11, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 12, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 13, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 14, wLength: 0x03
Keebio:Iris LM-K Rev. 1:1: i: 15, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 16, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 17, wLength: 0x01
Keebio:Iris LM-K Rev. 1:1: i: 18, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 19, wLength: 0x02
Keebio:Iris LM-K Rev. 1:1: i: 20, wLength: 0x02

When i read this correctly the KVM is triggering the state change just fine. So my only guess is that setups_data is not reset on USB reINITs? Is this still not scope of my reported issue/this PR?

@qvr qvr force-pushed the fix/os_detection_reset branch from 9db07a6 to 0be8823 Compare March 25, 2025 16:37
@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

The one issue I can see is that your USB state is moving from configured to suspend and back twice, before moving to init state. The debounce timer for "last configured" state is reset during this, and then if the init happens during debounce window, no reset will happen.

I pushed a new commit that only sets the last configured timer once, and it is only reset in INIT state. Can you try this out if your keyboard is now reset correctly?

@bin101
Copy link

bin101 commented Mar 25, 2025

Unfortunately, this didn't solve the problem. Now I get a freeze every time I press the KVM switch.

@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

Can you disable the debugging, and your other changes, and make sure you have the reset feature enabled?

@bin101
Copy link

bin101 commented Mar 25, 2025

Still no change

@bin101
Copy link

bin101 commented Mar 25, 2025

Found a working solution for me:

#ifdef OS_DETECTION_KEYBOARD_RESET
 static volatile bool was_configured_before = false;
 static volatile bool init_state_passed = false;
 #endif

 void os_detection_notify_usb_device_state_change(struct usb_device_state usb_device_state) {
     // treat this like any other source of instability
     if (maxprev_usb_device_state.configure_state < current_usb_device_state.configure_state) {
         maxprev_usb_device_state.configure_state = current_usb_device_state.configure_state;
     }
     current_usb_device_state = usb_device_state;
     last_time                = timer_read_fast();
     debouncing               = true;

 #ifdef OS_DETECTION_KEYBOARD_RESET
     if (init_state_passed && current_usb_device_state.configure_state == USB_DEVICE_STATE_CONFIGURED) {
        init_state_passed = false;

        if(was_configured_before) {
            soft_reset_keyboard();
        }
        was_configured_before = true;

     } else if (!init_state_passed && current_usb_device_state.configure_state == USB_DEVICE_STATE_INIT) {
         init_state_passed = true;
     }
 #endif
 }

The problem is the debounce check after usb state changes. os_detection_notify_usb_device_state_change with USB_DEVICE_STATE_INIT can easily skip over the if clause with the soft reset invoke if the time has not been progressed enough and then the usb state is already USB_DEVICE_STATE_CONFIGURED and we do not reset at all.

Only problem left: The kb will reset multiple times after pressing the KVM switch until the state is stabilized.

Green index keys = macos
Blue index keys = win

playback.1.mp4

@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

and then the usb state is already USB_DEVICE_STATE_CONFIGURED and we do not reset at all.

So just to clarify, when you said that the keyboard was frozen, it was in fact not frozen and did just not simply reset and just stayed in previous mode? Or what did you mean by freeze? If the code did nothing, what was freezing? I'm really confused here.

Only problem left: The kb will reset multiple times after pressing the KVM switch until the state is stabilized.

I wonder if your issue would be solved with a smaller (customizable, separate from the detection) debounce time.

@bin101
Copy link

bin101 commented Mar 25, 2025

By freeze I meant that I got no reaction by keypresses, LEDs were all off or stayed in one previous configuration.

A separate smaller debounce time or no one at all (this is actually my solution?) is really maybe the answer.

@sigprof also mentioned this in #24920

@bin101
Copy link

bin101 commented Mar 25, 2025

This solution also works for me and is more complain with your approach:

#ifdef OS_DETECTION_KEYBOARD_RESET
    if (configured_since == 0 && current_usb_device_state.configure_state == USB_DEVICE_STATE_CONFIGURED) {
        configured_since = timer_read_fast();
    } else if (current_usb_device_state.configure_state == USB_DEVICE_STATE_INIT) {
        configured_since = 0;
    }

    // reset the keyboard only if it's been stable for at least debounce duration, to avoid issues with some KVMs
    if (configured_since > 0 && timer_elapsed_fast(configured_since) >= OS_DETECTION_DEBOUNCE) {
        soft_reset_keyboard();
    }
#endif

This also avoids multiple resets in my case.

@qvr
Copy link
Contributor Author

qvr commented Mar 25, 2025

Aha, so it sounds like your keyboard gets locked up if it is being reset immediately when it goes to INIT state? So the debounce timer is probably not your issue, and the original comment about resets there causing instabilities might be true after all.

I think the reset needs to be moved back to os_detection_task, and only leave the debounce timer (re-)setting in os_detection_notify_usb_device_state_change.

I pushed couple of new commits, can you test this now (on an otherwise clean git tree)? There's also the option of setting different debounce time for the reset, but try it with the default first.

@bin101
Copy link

bin101 commented Mar 26, 2025

Success 👍 Could even keep the reset debounce at 250ms. So the problem was indeed that the reset happened during INIT.

@qvr
Copy link
Contributor Author

qvr commented Mar 26, 2025

Great stuff! This was "fun" to debug. 👍

So note to maintainers, this is again ready for review, and now works for at least 2 people!

I can squash the commits if needed, or you can squash when merging, let me know.

@qvr qvr changed the base branch from master to develop April 22, 2025 20:15
@qvr qvr force-pushed the fix/os_detection_reset branch from ed4d09f to e3f88dc Compare April 22, 2025 20:16
@qvr
Copy link
Contributor Author

qvr commented Apr 22, 2025

Squashed and rebased onto develop.

@drashna drashna requested a review from a team April 24, 2025 20:06
@tzarc tzarc merged commit 070dea4 into qmk:develop May 12, 2025
4 checks passed
JoseCaliz pushed a commit to JoseCaliz/qmk_firmware that referenced this pull request Jun 3, 2025
Co-authored-by: Nick Brassel <nick@tzarc.org>
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 4, 2025
* add 75_(ansi|iso) Community Layouts to mechlovin/olly/octagon (qmk#22459)

* expand mechlovin/olly/octagon

* Update info.json

* Rename info.json to keyboard.json

* correct matrix position for key

* remove VIA

* [Core] get_keycode_string(): function to format keycodes as strings, for more readable debug logging. (qmk#24787)

* keycode_string(): Format keycodes as strings.

This adds the `keycode_string()` function described in
https://getreuer.info/posts/keyboards/keycode-string/index.html
as a core feature.

* Fix formatting.

* keycode_string review revisions.

* Rename keycode_string() -> get_keycode_string() for consistency with
  existing string utils like get_u8_str().

* Revise custom keycode names with separate _user and _kb tables.

* Correct indent in builddefs/generic_features.mk.

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

* Add KC_NUHS, KC_NUBS, and KC_CAPS.

* Fix linking error with custom names.

* Attempt at simplifying interface.

* Formatting fix.

* Several fixes and revisions.

* Don't use PSTR in KEYCODE_STRING_NAME, since this fails to build on
  AVR. Store custom names in RAM.
* Revise the internal table of common keycode names to use its own
  storage representation, still in PROGMEM, and now more efficiently
  stored flat in 8 bytes per entry.
* Support Swap Hands keycodes and a few other keycodes.

* Revert "Formatting fix."

This reverts commit 2a27710.

* Revert "Attempt at simplifying interface."

This reverts commit 8eaf67d.

* Simplify custom names API by sigprof's suggestion.

* Support more keycodes.

* Add QK_LOCK keycode.
* Add Secure keycodes.
* Add Joystick keycodes.
* Add Programmable Button keycodes.
* Add macro MC_ keycodes.
* For remaining keys in known code ranges, stringify them as
  "QK_<feature>+<number>". For instance, "QK_MIDI+7".

* Bug fix and a few improvements.

* Fix missing right-hand bit when displaying 5-bit mods numerically.
* Support KC_HYPR, KC_MEH, HYPR_T(kc), MEH_T(kc).
* Exclude one-shot keycodes when NO_ACTION_ONESHOT is defined.

---------

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

* Align to latest CLI dependencies (qmk#24553)

* Align to latest CLI dependencies

* Update docs

* Add Community Layout support to daskeyboard4 (qmk#23884)

add ansi CL

* Add the plywrks ply8x hotswap variant. (qmk#23558)

* Add hotswap variant

* Update RGB matrix

* Move files around to target develop

* Revert rules.mk for keyboards/jaykeeb/joker/rules.mk

* Update keyboards/plywrks/ply8x/hotswap/keyboard.json

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Apply suggestions from code review

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Add missing community layouts

* Delete keyboards/plywrks/ply8x/rules.mk

* Update missing keys in RGB matrix

* Add missing key in RGB matrix for hotswap ver

* Remove via keymaps

* Add keyboard alias for plywrks/ply8x to plywrks/ply8x/solder

* Fix typo

* Fix another typo

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* [Core] use `keycode_string` in unit tests (qmk#25042)

* tests: use keycode_string feature

With a proper keycode to string implementation in qmk there is no need
to use the unit tests only implementation anymore.

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* tests: remove keycode_util feature

This feature is no longer used as we switched the tests to the
keycode string implementation.

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* Non-volatile memory data repository pattern (qmk#24356)

* First batch of eeconfig conversions.

* Offset and length for datablocks.

* `via`, `dynamic_keymap`.

* Fix filename.

* Commentary.

* wilba leds

* satisfaction75

* satisfaction75

* more keyboard whack-a-mole

* satisfaction75

* omnikeyish

* more whack-a-mole

* `generic_features.mk` to automatically pick up nvm repositories

* thievery

* deferred variable resolve

* whitespace

* convert api to structs/unions

* convert api to structs/unions

* convert api to structs/unions

* fixups

* code-side docs

* code size fix

* rollback

* nvm_xxxxx_erase

* Updated location of eeconfig magic numbers so non-EEPROM nvm drivers can use them too.

* Fixup build.

* Fixup compilation error with encoders.

* Build fixes.

* Add `via_ci` keymap to onekey to exercise VIA bindings (and thus dynamic keymap et.al.), fixup compilation errors based on preprocessor+sizeof.

* Build failure rectification.

* Migrate remaining `split.soft_serial_pin` to `split.serial.pin` (qmk#25046)

* Migrate keyboards/bastardkb

* Migrate keyboards/handwired

* Migrate keyboards/helix

* Fix duplicate serial key

* Fix outdated GPIO control function usage (qmk#25060)

* [Modules] Provide access to current path in `rules.mk`. (qmk#25061)

* Update keymap for keycult 1800 (qmk#25070)

Update keymap

Co-authored-by: yiancar <yiancar@gmail.com>

* Add handwired/erikpeyronson/erkbd (qmk#25030)


Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add support for Starry FRL (qmk#24626)


Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Add "Large Lad" keyboard (qmk#24727)

Co-authored-by: jack <jack@pngu.org>

* Bump vite from 5.4.12 to 5.4.15 in /builddefs/docsgen (qmk#25065)

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.4.12 to 5.4.15.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v5.4.15/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v5.4.15/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Allow AnnePro2 to reboot (qmk#24886)

Without this, the QK_REBOOT key did nothing.

* Fix path typo related RP2040 (qmk#25069)

Fix path typo

* Update onekey example for nucleo f446re (qmk#25067)

* use accessible pins for nucleo f446re onekey example

* remove pin collision with matrix in keyboard.json

* use accessible pins for LED

* remove pin collision with matrix

* Update readme.md to reflect pin changes

* Module documentation typo correction (qmk#25073)

* Fix lockups on AVR with `qmk/hello_world` module (qmk#25074)

Fix lockups on AVR.

* At101ish (qmk#25072)

* Dell AT101 replacement pcb support

* Update keyboards/at101ish/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* remove empty src clause in makefile

* feature: Update at101ish to qmk v0.28

* feature: Add osdetecting keymap variant.

* refactor: Move at101ish keyboard to handwired folder.

* fix: Adjust at101ish readme-

* fix: review changes.

* chore: Remove unneeded feature.

---------

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

* Add "license" field to Community Module JSON schema. (qmk#25085)

Add "license" field to community module schema.

* Add kt60HS-T v2 PCB (qmk#25080)

* Add kt60HS-Tv2

* Update keyboards/keyten/kt60hs_t/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v1/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v2/keyboard.json

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v2/readme.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/info.json

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Change of structure

* Moving the keyboard

* Update data/mappings/keyboard_aliases.hjson

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/keyten/kt60hs_t/v1/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/keyten/kt60hs_t/v2/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

---------

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Make sure that unit tests run on all release versions

* [ErgoDox EZ] Fix complication issues due to updates

* [ErgoDox EZ] Fix compilication errors and warnings

We want all green!

* Fix 'qmk lint -kb' argument handling (qmk#25093)

* Refactor Deemen17 Works DE60 (qmk#25088)

* Add Coban Pad 12A (qmk#25039)



Co-authored-by: jack <jack@pngu.org>

* [Keyboard] Add PHDesign PH60/Multi Keyboard PCB (qmk#25086)

* Add PH60/Multi Support

* Add PCB PIcture for README

* Remove MO(_FN2)

* README Typo Fix

* Layout and README Adjustment

* Add README for PHDesign Main Folder

* Keymap Improvement

* Update README.md

* [Keyboard] Add Ortho Slayer (qmk#25099)

* Add Ortho Slayer

* Update keyboards/keyten/ortho_slayer/keymaps/default/keymap.c

Co-authored-by: jack <jack@pngu.org>

* Update keyboards/keyten/ortho_slayer/readme.md

Co-authored-by: jack <jack@pngu.org>

---------

Co-authored-by: jack <jack@pngu.org>

* Fix coban pad9a wrong layout in keyboard.json (qmk#25100)

* Remove `CTPC`/`CONVERT_TO_PROTON_C` options (qmk#25111)

* Remove direct docs.qmk.fm links from docs (qmk#25113)

* Add warning when deprecated 'promicro_rp2040' is used (qmk#25112)

* Add Vida to QMK (qmk#24225)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* More Windows->Unix style path fixes. (qmk#25119)

* Include `math.h` where necessary. (qmk#25122)

* Cater for use of `__errno_r()` in ChibiOS syscalls.c with newer picolibc revisions (qmk#25121)

* chore: Allow disabling underglow on Work Louder devices (qmk#25123) (qmk#25120)

* Allow disabling Underglow on Work Louder devices

Allows disabling Underglow on Work Louder devices by using `RGBLIGHT_ENABLE = no` on rules.mk

* Update keyboards/work_louder/rgb_functions.c

Suggested by @zvecr on review.

Co-authored-by: Joel Challis <git@zvecr.com>

---------

Co-authored-by: Joel Challis <git@zvecr.com>

* Exclude external userspace from lint checking (qmk#24680)

* fix: Fix startup sound for Preonic (qmk#25132) (qmk#25133)

Add `AUDIO_INIT_DELAY ` to config.h to resolve

* New standard layout for Savage65 (65_ansi_blocker_tsangan_split_bs) (qmk#24690)

* Added a default firmware and layout for the WindStudio Wind X R1
keyboard.

* Wind X R1: cleaned-up the folders to make clear that this firmware is
for the release 1 of this keyboard.

* Delete keyboards/windstudio/wind_x/R1 directory

Removing the uppercase R1 folder

* feat(cannonkeys/savage65): Added layout to keyboard.json
- Added the layout LAYOUT_65_ansi_blocker_tsangan_split_bs to the
  community layouts.

* kradoindustries_promenade: add LAYOUT_1x2u (qmk#25090)

* Update shuguet/shu89 (qmk#24780)

* Update keyboard.json

Update mod keys location in RGB layout.

* Update keyboard.json

* Update keyboards/shuguet/shu89/keyboard.json

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

---------

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

* [Keyboard] Add suika83opti (qmk#24991)

* [chore]: move and rename mouse/scroll min/max defines (qmk#25141)

* protocol: move {XY/HV}_REPORT_{MIN,MAX} into report.h

..to allow easier re-use in other code implementations.

* protocol: rename {XY/HV}_REPORT_{MIN/MAX} to MOUSE_REPORT_{XY/HV}_{MIN/MAX}

..to avoid naming collisions.

* [Core] Flow Tap tap-hold option to disable HRMs during fast typing (qmk#25125)

aka Global Quick Tap, Require Prior Idle

* Add Link keyboard (qmk#25058)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove Sofle `rgb_default` keymap & tidy readme's (qmk#25010)

* Added Keyboard LumPy27 (qmk#24967)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] Kobold r1 (qmk#25161)

* Kobold r1

* Apply suggestions from code review

Co-authored-by: jack <jack@pngu.org>

* `board_init` => `early_hardware_init_post`.

---------

Co-authored-by: jack <jack@pngu.org>

* [Docs] Unify lighting step descriptions (qmk#25167)

unify lighting step descriptions and defaults across docs

* [Keyboard] Add voidhhkb-hotswap (qmk#25007)

* Added files for voidhhkb-hotswap

* Updated keyboard name to resolve build errors

* Implement suggestions from PR. Use 60_hhkb community layout.

* Update keyboards/void/voidhhkb_hotswap/readme.md

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

* Apply suggestions from code review

Co-authored-by: jack <jack@pngu.org>

---------

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

* Remove duplication of RGB Matrix defaults (qmk#25146)

* Remove duplication of RGB Matrix defaults

* Remove more duplication of defaults

* fix

* Fix missing and extra commas in JSON schema (qmk#25057)

* Remove duplication of RGBLight defaults (qmk#25169)

* Ignore the Layer Lock key in Repeat Key and Caps Word. (qmk#25171)

* Allow for disabling EEPROM subsystem entirely. (qmk#25173)

* [keyboard] ymdk/id75/rp2040 (qmk#25157)

Co-authored-by: tao heihei <>

* Remove `bluefruit_le_read_battery_voltage` function (qmk#25129)

* Fix 'Would you like to clone the submodules?' prompt under msys (qmk#24958)

* Fixup eeconfig lighting reset. (qmk#25166)

* DOCS: `qmk-hid` missing in bootloaders list? (qmk#25177)

* Fix for `.clangd`. (qmk#25180)

* Update develop branch to Pico SDK 1.5.1 (qmk#25178)

* Add lint warning for empty url (qmk#25182)

* Implement connection keycode logic (qmk#25176)

* Add handwired/footy (qmk#25151)

Co-authored-by: jack <jack@pngu.org>

* Decrease firmware size for `anavi/macropad8`. (qmk#25185)

Preparation for bootstrapper.

* Align ChibiOS `USB_WAIT_FOR_ENUMERATION` implementation (qmk#25184)

* [Bug][Core] Fix for Flow Tap: fix handling of distinct taps and timer updates. (qmk#25175)

* Flow Tap bug fix.

As reported by @amarz45 and @mwpardue, there is a bug where if two
tap-hold keys are pressed in distinct taps back to back, then Flow Tap
is not applied on the second tap-hold key, but it should be.

In a related bug reported by @NikGovorov, if a tap-hold key is held
followed by a tap of a tap-hold key, then Flow Tap updates its timer on
the release of the held tap-hold key, but it should be ignored.

The problem common to both these bugs is that I incorrectly assumed
`tapping_key` is cleared to noevent once it is released, when actually
`tapping_key` is still maintained for `TAPPING_TERM` ms after release
(for Quick Tap). This commit fixes that. Thanks to @amarz45, @mwpardue,
and @NikGovorov for reporting!

Details:

* Logic for converting the current tap-hold event to a tap is extracted
  to `flow_tap_key_if_within_term()`, which is now invoked also in the
  post-release "interfered with other tap key" case. This fixes the
  distinct taps bug.

* The Flow Tap timer is now updated at the beginning of each call to
  `process_record()`, provided that there is no unsettled tap-hold key
  at that time and that the record is not for a mod or layer switch key.
  By moving this update logic to `process_record()`, it is conceptually
  simpler and more robust.

* Unit tests extended to cover the reported scenarios.

* Fix formatting.

* Revision to fix @NikGovorov's scenario.

The issue is that when another key is pressed while a layer-tap hasn't
been settled yet, the `prev_keycode` remembers the keycode from before
the layer switched. This can then enable Flow Tap for the following key
when it shouldn't, or vice versa.

Thanks to @NikGovorov for reporting!

This commit revises Flow Tap in the following ways:

* The previous key and timer are both updated from `process_record()`.
  This is slightly later in the sequence of processing than before, and
  by this point, a just-settled layer-tap should have taken effect so
  that the keycode from the correct layer is remembered.

* The Flow Tap previous key and timer are updated now also on key
  release events, except for releases of modifiers and held layer
  switches.

* The Flow Tap previous key and timer are now updated together, for
  simplicity. This makes the logic easier to think about.

* A few additional unit tests, including @NikGovorov's scenario as
  "layer_tap_ignored_with_disabled_key_complex."

* Remove empty `url` fields (qmk#25181)

* Prompt for converter when creating new keymap (qmk#25116)

* High resolution scrolling (without feature report parsing) (qmk#24423)

* hires scrolling without feature report parsing

* fix valid range for exponent

* fix incorrect minimum exponent value documentation

* Avoid duplication in generated community modules `rules.mk` (qmk#25135)

* Bump rlespinasse/github-slug-action from 3 to 5 (qmk#25021)

* Remove `"console":false` from keyboards (qmk#25190)

* Update 'qmk generate-api' to only publish pure DD keymaps (qmk#24782)

* Remove more duplication of defaults (qmk#25189)

* Align `new-keyboard` template to current standards (qmk#25191)

* Bump vite from 5.4.15 to 5.4.18 in /builddefs/docsgen (qmk#25192)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix `boardsource/beiwagon` RGB Matrix coordinates (qmk#25018)

* Remove `"command":false` from keyboards (qmk#25193)

* Extend lint checks to reject duplication of defaults (qmk#25149)

* modelh: add prerequisites for via support (qmk#24932)

* First TypeK support (qmk#22876)

* Add Lemokey X0 keyboard (qmk#24994)

* keyboards/annepro2/ld: Add per-variant linker scripts (qmk#24999)

C18 has an MCU with 16K SRAM, up from C15's 8K.

Split the linker script into C15 and C18 variants to make use of the
larger RAM capacity of C18.

* Add new keyboard MirageiX (qmk#25054)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <0x6a73@protonmail.com>

* [Keymap] Sofle RGB - fixed stuck on numpad layer and layout comments (qmk#24942)

* Add handwired 4x14 LuMaWing keyboard (qmk#24885)

* Add jcpm2 (JC Pro Macro 2) (qmk#24816)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* [Keyboard] Add splitkb.com's Halcyon Elora rev2 (qmk#24790)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] mzmkb/slimdash/rev1 (qmk#24804)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* Added new keyboard epssp75 (qmk#24756)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Addition of OK-1 (qmk#24646)

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add Umbra keyboard (qmk#24569)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Amptrics 0420 keyboard addition (qmk#24744)

Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>

* [Core] Enhance Flow Tap to work better for rolls over multiple tap-hold keys. (qmk#25200)

* Flow Tap revision for rolling press.

* Remove debugging cruft.

* Formatting fix.

* amptrics/0422 - Prevent OOB in `update_leds_for_layer` (qmk#25209)

* [Keyboard] Add Gravity-45(qmk#25206)

* add gravity-45

* readme.md

* fix readme

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: jack <0x6a73@protonmail.com>

* run qmk format-json -i keyboards/green_keys/gravity_45/keyboard.json

* add url

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboard.json

* Update keyboard.json

* Update keyboards/green_keys/gravity_45/keyboard.json

Co-authored-by: Drashna Jaelre <drashna@live.com>

---------

Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>

* Remove redundant keyboard headers (qmk#25208)

* Fix Spleeb compile when pointing device is enabled (qmk#25016)

* [Bug] Minimise force-included files (qmk#25194)

* Add additional hooks for Community modules (qmk#25050)

* Workaround for resolving keyboard alias for config file values (qmk#25228)

* Generate versions to keycode headers (qmk#25219)

* Resolve alias for `qmk new-keymap` keyboard prompts (qmk#25210)

* [Keyboard] Add Binepad KN01 (qmk#25224)

* Add Binepad NeoKnob KN01

* post @waffle87 recommendations

* Add battery changed callbacks (qmk#25207)

* Ensure `qmk_userspace_paths` maintains detected order (qmk#25204)

* Bind Bluetooth driver to `host_driver_t` (qmk#25199)

* Deprecate `qmk generate-compilation-database`. (qmk#25237)

* Remove force disable of NKRO when Bluetooth enabled (qmk#25201)

* Keycult 60 (qmk#25213)

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: jack <jack@pngu.org>

* [Keyboard] Add Binepad KnobX1 (qmk#25222)

Co-authored-by: Drashna Jaelre <drashna@live.com>

* [Keyboard] Update Tractyl Manuform and add F405 (weact) variant (qmk#24764)

* Layout corrections: Zed60 (qmk#25003)

* Fixed print statement after enabling 32-bit layers (qmk#25027)

* Fix Aurora sweep default keymap configuration (qmk#25148)

* Docs update for installing qmk with uv (qmk#24995)

* CXT Studio 12E3: Fix encoder resolutions not applying (qmk#25242)

* add resolution to encoders so they apply

* Tweak default keymap

* replace KC_UNDO with C(KC_Z) as well

* Add debounce to duplicated defaults check (qmk#25246)

* [Docs] Fix typos introduced by PR qmk#25050 (qmk#25250)

It isn't a drashna PR if there aren't some typos in it somewhere.

* Allow LVGL onekey keymap to be able compile for other board (qmk#25005)

* [Keyboard] Add Jason Hazel’s Bad Wings v2 (qmk#25252)

Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>

* Add raw_hid support to host driver (qmk#25255)

* Fix Wear Leveling compilation (qmk#25254)

* [New Feature/Core] New RGB Matrix Animation "Starlight Smooth" (qmk#25203)

* Enable community modules to define LED matrix and RGB matrix effects. (qmk#25187)

Co-authored-by: Joel Challis <git@zvecr.com>

* Fix OS_DETECTION_KEYBOARD_RESET (qmk#25015)

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Fixes the numlock indicator for Magic Force MF17 numpad (qmk#25260)

* Add Harite v2 keyboard (qmk#24975)

* dlip/haritev2 - Post merge fixes (qmk#25264)

* Remove more USB only branches from NKRO handling (qmk#25263)

* Deprecate `usb.force_nkro`/`FORCE_NKRO` (qmk#25262)

* Add BDN9 Rev. 3 (qmk#25261)

* Remove duplicate of SPI default config from keyboards (qmk#25266)

* Resolve miscellaneous keyboard lint warnings (qmk#25268)

* Add Zeropad (qmk#24737)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* Add Waveshare RP2040-Keyboard-3 support (qmk#25269)

* Update PR checklist notes on custom matrix (qmk#25240)

* Chew folders (qmk#24785)

* gcc15 AVR compilation fixes (qmk#25238)

* [Core] STM32G0x1 support (qmk#24301)

* Use relative paths for schemas, instead of $id. Enables VScode validation. (qmk#25251)

* add doio/kb03 (qmk#24815)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* Move rookiebwoy to ivndbt (qmk#25142)

* [Chore] use {rgblight,rgb_matrix}_hsv_to_rgb overrides (qmk#25271)

* Remove outdated `nix` support due to bit-rot. (qmk#25280)

* Add `compiler_support.h` (qmk#25274)

* Configure boards to use development_board - 0-9 (qmk#25287)

* [Fix] lib8tion: enable fixed scale8 and blend functions (qmk#25272)

lib8tion: enable fixed scale8 and blend functions

These FastLED derived lib8tion functions have been fixed and enabled by
default in FastLED. QMK just never set these defines, there is no reason
to keep the buggy implementation. It is assumed that nobody relied on
the buggy behavior.

* Configure boards to use development_board - UVWXYZ (qmk#25288)

* [Docs] Fix tap_hold code blocks (qmk#25298)

* salicylic_acid3/getta25 - Fix oled keymap (qmk#25295)

* Configure boards to use development_board - S (qmk#25293)

* Configure boards to use development_board - T (qmk#25294)

* 2025 Q2 changelog (qmk#25297)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update Oryx module for newer code

* Soft reset matrix

* Use improved i2c reset for voyager and moonlander matrix

* Fix formatting

* Remove labeler action (unneeded)

* Fix module API version for Oryx module

* Use i2cStop instead of trying to work around

---------

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: QMK Bot <hello@qmk.fm>
Co-authored-by: Pascal Getreuer <50221757+getreuer@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: yiancar <yiangosyiangou@cytanet.com.cy>
Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Erik Peyronson <erikpeyronson@gmail.com>
Co-authored-by: Erik Peyronson <erik.peyronson@gmail.com>
Co-authored-by: Sắn <59417802+MaiTheSan@users.noreply.github.com>
Co-authored-by: Hyphen-ated <Hyphen-ated@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Geoffrey Frogeye <s+github@frogeye.fr>
Co-authored-by: lsh4711 <120231876+lsh4711@users.noreply.github.com>
Co-authored-by: Ben Green <bengreen.uk@gmail.com>
Co-authored-by: フィルターペーパー <76888457+filterpaper@users.noreply.github.com>
Co-authored-by: henrikosorensen <henrik.sorensen@gmail.com>
Co-authored-by: Ivan Gromov <38141348+key10iq@users.noreply.github.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com>
Co-authored-by: Dam Vu Duy <RyanDam@users.noreply.github.com>
Co-authored-by: nonameCCC <79012391+nonameCCC@users.noreply.github.com>
Co-authored-by: sudo pacman -Syu <hauvipapro@gmail.com>
Co-authored-by: Andrew Kannan <andrew.kannan@gmail.com>
Co-authored-by: Luis Garcia <luis@bitjester.com>
Co-authored-by: Christian C. Berclaz <christian.berclaz@mac.com>
Co-authored-by: Olivier Mehani <shtrom-github@ssji.net>
Co-authored-by: Sylvain Huguet <sylvain@huguet.me>
Co-authored-by: suikagiken <115451678+suikagiken@users.noreply.github.com>
Co-authored-by: Daniel Reisch <danieljreisch@gmail.com>
Co-authored-by: ClownFish <177758267+clownfish-og@users.noreply.github.com>
Co-authored-by: JamesWilson1996 <47866504+JamesWilson1996@users.noreply.github.com>
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Jan Bláha <blaha.j502@gmail.com>
Co-authored-by: Eric Molitor <534583+emolitor@users.noreply.github.com>
Co-authored-by: CJ Pais <cj@cjpais.com>
Co-authored-by: eynsai <47629346+eynsai@users.noreply.github.com>
Co-authored-by: Joel Beckmeyer <joel@beckmeyer.us>
Co-authored-by: Álvaro A. Volpato <alvaro.augusto.volpato@gmail.com>
Co-authored-by: Aidan Gauland <aidalgol@users.noreply.github.com>
Co-authored-by: Michał Kopeć <michal@nozomi.space>
Co-authored-by: takashicompany <t@kashi.company>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Matheus Marques <matheusmbar@gmail.com>
Co-authored-by: LucasMateijsen <l.mateijsen@outlook.com>
Co-authored-by: Jeremy Cook <jscook55@gmail.com>
Co-authored-by: VeyPatch <126267034+VeyPatch@users.noreply.github.com>
Co-authored-by: mizma <omoikane@path-works.net>
Co-authored-by: hen-des <141591967+hen-des@users.noreply.github.com>
Co-authored-by: Cipulot <40441626+Cipulot@users.noreply.github.com>
Co-authored-by: josephawilliamsiv <31166673+josephawilliamsiv@users.noreply.github.com>
Co-authored-by: vchowl <vchowl@outlook.com>
Co-authored-by: Christopher Hoage <iam@chrishoage.com>
Co-authored-by: Silvino R. <366673+silvinor@users.noreply.github.com>
Co-authored-by: dabstractor <dustindschultz@gmail.com>
Co-authored-by: Nathan Cain <13713501+nathanscain@users.noreply.github.com>
Co-authored-by: muge <221161+muge@users.noreply.github.com>
Co-authored-by: HorrorTroll <sonicvipduc@gmail.com>
Co-authored-by: cyxae <cyxae@amphitryon.nrst.fr>
Co-authored-by: Florent Allard <florent.allard@savoirfairelinux.com>
Co-authored-by: art-was-here <mail@buckles.email>
Co-authored-by: Matti Hiljanen <170205+qvr@users.noreply.github.com>
Co-authored-by: Wasteland Fluttershy <ingvardm@gmail.com>
Co-authored-by: Dane Lipscombe <danelipscombe@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
Co-authored-by: Infos <136488157+diffrentGuesser@users.noreply.github.com>
Co-authored-by: Florent Linguenheld <f@linguenheld.fr>
Co-authored-by: ivan <81021475+ivndbt@users.noreply.github.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
faisyl pushed a commit to faisyl/qmk_firmware that referenced this pull request Jun 21, 2025
Co-authored-by: Nick Brassel <nick@tzarc.org>
srphcr pushed a commit to srphcr/qmk_firmware that referenced this pull request Jun 27, 2025
Co-authored-by: Nick Brassel <nick@tzarc.org>
Jari27 pushed a commit to Jari27/qmk_firmware that referenced this pull request Jul 3, 2025
Co-authored-by: Nick Brassel <nick@tzarc.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] OS_DETECTION_KEYBOARD_RESET is not executed
4 participants