Skip to content
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

Move FORCE_NKRO to data driven #20604

Merged
merged 3 commits into from
May 1, 2023
Merged

Move FORCE_NKRO to data driven #20604

merged 3 commits into from
May 1, 2023

Conversation

fauxpark
Copy link
Member

Description

And kill off some empty keyboard headers.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (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).

@fauxpark
Copy link
Member Author

Only SHA mismatch is cannonkeys/ortho60v2, for some reason.

--- cannonkeys_ortho60v2_default.elf.base.dis
+++ cannonkeys_ortho60v2_default.elf.pr.dis
@@ -19354,72 +19354,72 @@
        nop                     ; (mov r8, r8)
        .word   0x100067dc

-<____wrap___aeabi_uldivmod_veneer>:
+<__pico_program_bulk_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_uldivmod_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<__pico_program_bulk_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x20000305
+       .word   0x20000125

-<____wrap___aeabi_uidiv_veneer>:
+<____wrap___aeabi_idivmod_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_uidiv_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_idivmod_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x200002b5
+       .word   0x20000275

-<__flash_range_erase_veneer>:
+<____wrap___aeabi_uidivmod_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<__flash_range_erase_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_uidivmod_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x200001fd
+       .word   0x200002b5

-<____wrap___aeabi_idiv_veneer>:
+<____wrap___aeabi_uldivmod_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_idiv_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_uldivmod_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x20000275
+       .word   0x20000305

-<__pico_program_bulk_veneer>:
+<____wrap___aeabi_lmul_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<__pico_program_bulk_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_lmul_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x20000125
+       .word   0x200006dd

-<____wrap___aeabi_idivmod_veneer>:
+<__flash_range_erase_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_idivmod_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<__flash_range_erase_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x20000275
+       .word   0x200001fd

-<____wrap___aeabi_lmul_veneer>:
+<____wrap___aeabi_idiv_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_lmul_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_idiv_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x200006dd
+       .word   0x20000275

-<____wrap___aeabi_uidivmod_veneer>:
+<____wrap___aeabi_uidiv_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_uidivmod_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<____wrap___aeabi_uidiv_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
@@ -20501,14 +20501,14 @@
        bx      lr
        ...

-<____aeabi_ldiv0_veneer>:
+<__hard_assertion_failure_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<____aeabi_ldiv0_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<__hard_assertion_failure_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x10000351
+       .word   0x100061e1

 <____aeabi_idiv0_veneer>:
        push    {r0}
@@ -20519,14 +20519,14 @@
        nop
        .word   0x10000351

-<__hard_assertion_failure_veneer>:
+<____aeabi_ldiv0_veneer>:
        push    {r0}
-       ldr     r0, [pc, #8]    ; (<__hard_assertion_failure_veneer+0xc>)
+       ldr     r0, [pc, #8]    ; (<____aeabi_ldiv0_veneer+0xc>)
        mov     ip, r0
        pop     {r0}
        bx      ip
        nop
-       .word   0x100061e1
+       .word   0x10000351

 <keyboard_report>:
        ...

@drashna drashna requested a review from a team April 28, 2023 05:51
@fauxpark fauxpark merged commit 12d42ce into qmk:develop May 1, 2023
@fauxpark fauxpark deleted the dd-force-nkro branch May 1, 2023 03:33
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Jun 22, 2023
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants