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.

Sign up for GitHub

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

Jump to bottom

Fix joystick build for ChibiOS #19602

Merged
merged 1 commit into from
Jan 15, 2023
Merged

Fix joystick build for ChibiOS #19602

merged 1 commit into from
Jan 15, 2023

Conversation

sigprof
Copy link
Contributor

@sigprof sigprof commented Jan 15, 2023

Description

The code for the joystick feature failed to build on ChibiOS, because the old joystick_report_t type name was used instead of report_joystick_t. Apparently the code in #14814 was written before #19052, but has been merged after that PR without updating.

The master branch is not affected — the offending code is only in develop.

Types of Changes

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

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).

@sigprof
Fix joystick build for ChibiOS
93d718e 
`joystick_report_t` was renamed to `report_joystick_t`, but apparently
one place in the code was missed.
@github-actions github-actions bot added the core label Jan 15, 2023
@sigprof sigprof mentioned this pull request Jan 15, 2023
Merged
16 tasks
@zvecr zvecr merged commit 955829b into qmk:develop Jan 15, 2023
freznel10 added a commit to freznel10/qmk_firmware that referenced this pull request Jan 18, 2023
@freznel10
Squashed commit of the following:
2770e58 
commit f2b75cbe06e49bf941c5b6dfa481b9caf255edde
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 17 07:30:05 2023 -0700

    rebase and cleanup

commit 3ce417eca4883c17016af529cc803bc04e7f7f00
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 17 07:18:10 2023 -0700

    finally fix hscroll fully and add maybe ability to change multiplier at runtime

commit a6a62b76719b577999bd4609b4c52b5117086adc
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 16 13:44:14 2023 -0700

    major update/revision most issues fixed

commit b7a90fb940d7c7fa2d952793f98c2984aed5f915
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 10 22:54:48 2023 -0700

    bugfix for disable function

commit 756275b4208e9c4710416d6fc9cb7e36492be551
Author: Alabastard-64 <[email protected]>
Date:   Tue Jan 10 21:32:56 2023 -0700

    Fix HID descriptor for Horizontal scroll, add disable function, and various bugfixes

commit 671c176a7aaa5812f9391b083bcfed86fc93239d
Author: Alabastard-64 <[email protected]>
Date:   Sat Jan 7 22:55:18 2023 -0700

    linting except on vusb and doc update

commit 83c477cff9e42389365c9aeb32c29d028b49c21e
Author: Alabastard-64 <[email protected]>
Date:   Sat Jan 7 21:49:47 2023 -0700

    all tested versions working and doc

commit d8590eee684f57f82e5e60fc5eff518524e460b4
Author: Alabastard-64 <[email protected]>
Date:   Fri Jan 6 11:53:00 2023 -0700

    real initial release everything working and tested on Atmel U4 chips

commit f23af60faa8ea2509ff0c03f83fac471e58ef9b6
Author: Alabastard-64 <[email protected]>
Date:   Wed Jan 4 12:15:44 2023 -0700

    update: not broken... but not working either

commit 4b58f08c206a1b29635890f4b36aeea9e4818e65
Author: Alabastard-64 <[email protected]>
Date:   Mon Jan 2 09:51:37 2023 -0700

    initial commit (currently broken...)

commit ebada5092192550303c1f2e7caa4d82cfcb70a53
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:58:39 2022 -0700

    doc update

commit 825eea16f51e19b781fca51a53b32b091431c55e
Author: Alabastard-64 <[email protected]>
Date:   Fri Dec 23 14:51:37 2022 -0700

    linting

commit b5d37d6153a483974c047d712a7e34ce1960bf34
Author: Alabastard-64 <[email protected]>
Date:   Thu Dec 22 19:13:24 2022 -0700

    fixes and doc improvements

commit c9ec67ed252cc8a310e4ce0dfa5b540978eae214
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 23:07:52 2022 -0700

    fix previous changes to precision mode now working as intended additional mode fixes

commit c6282586b07f2f17f891e6ef4b2ab980e3d23d63
Author: Alabastard-64 <[email protected]>
Date:   Wed Dec 21 20:29:11 2022 -0700

    doc update and precision changes

commit 414bff0f3a79637975a5c1926dc59cd652a3a8eb
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:53:47 2022 -0700

    more doc updates/code cleanup

commit 77444eda136ddf6e7c395221a263039763c7f3cd
Author: Alabastard-64 <[email protected]>
Date:   Tue Dec 13 00:20:15 2022 -0700

    code and doc fixup

commit d89945415449ba5a06f8892b1bf9771cf18ad9aa
Author: Alabastard-64 <[email protected]>
Date:   Mon Dec 12 23:10:19 2022 -0700

    update and linting

commit c13accd651e4fd1bf2754aba00ecf82f350e6210
Author: Alabastard-64 <[email protected]>
Date:   Sun Dec 11 21:08:08 2022 -0700

    post rebase/squash cleanup

commit ce34c0aa810607cd347ad536c9eae2b7cfd6180e
Author: Alabastard-64 <[email protected]>
Date:   Tue Aug 30 01:23:41 2022 -0600

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670816485 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670813789 -0700

    parent c6ab70e
    author Alabastard-64 <[email protected]> 1661844221 -0600
    committer Alabastard-64 <[email protected]> 1670812067 -0700

    Squashed all previous Commits

commit d448ff4
Merge: 3b60a05 625e574
Author: QMK Bot <[email protected]>
Date:   Tue Jan 17 07:40:37 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 625e574
Author: QMK Bot <[email protected]>
Date:   Mon Jan 16 23:39:09 2023 -0800

    Format code according to conventions (qmk#19615)

commit 3b60a05
Merge: 275673c 9f84b9a
Author: QMK Bot <[email protected]>
Date:   Tue Jan 17 05:57:55 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 9f84b9a
Author: Ivan Gromov <[email protected]>
Date:   Tue Jan 17 09:57:18 2023 +0400

    [Keyboard] Add kt3700 (qmk#19432)

    Co-authored-by: Sergey Vlasov <[email protected]>
    Co-authored-by: Joel Challis <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 275673c
Merge: 69397d4 c6cc104
Author: QMK Bot <[email protected]>
Date:   Tue Jan 17 05:57:09 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit c6cc104
Author: JW2586 <[email protected]>
Date:   Tue Jan 17 05:56:37 2023 +0000

    [Keyboard] Waterfowl - Updated default keymap (qmk#19438)

    Co-authored-by: jack <[email protected]>

commit 69397d4
Merge: db7ca07 7b795b2
Author: QMK Bot <[email protected]>
Date:   Tue Jan 17 05:49:24 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 7b795b2
Author: Alabahuy <[email protected]>
Date:   Tue Jan 17 12:48:44 2023 +0700

    [Keyboard] add kamigakushi (qmk#19514)

commit db7ca07
Author: Jouke Witteveen <[email protected]>
Date:   Tue Jan 17 06:23:57 2023 +0100

    Process Tap Dances before WPM/Velocikey (qmk#19599)

commit a52b3aa
Merge: 2cf904b 49f3ffa
Author: QMK Bot <[email protected]>
Date:   Tue Jan 17 04:34:24 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 49f3ffa
Author: d-floe <[email protected]>
Date:   Mon Jan 16 22:33:49 2023 -0600

    [Keyboard] Add Bubble 75 (qmk#18863)

    Co-authored-by: Drashna Jaelre <[email protected]>
    Co-authored-by: Ryan <[email protected]>

commit 2cf904b
Merge: 0ff5292 4098ff5
Author: QMK Bot <[email protected]>
Date:   Tue Jan 17 01:55:46 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 4098ff5
Author: era <[email protected]>
Date:   Tue Jan 17 10:55:13 2023 +0900

    [Keyboard] Add ERA65 (qmk#19591)

    Co-authored-by: Ryan <[email protected]>

commit 0ff5292
Author: Albert Y <[email protected]>
Date:   Tue Jan 17 09:54:51 2023 +0800

    Refactor pixel rain animation (qmk#19606)

commit 7acc3f4
Author: Ryan <[email protected]>
Date:   Tue Jan 17 12:54:26 2023 +1100

    ChibiOS: Consolidate report sending code (qmk#19607)

commit 6fd4d8c
Merge: 4c7f67f 465b6a1
Author: QMK Bot <[email protected]>
Date:   Mon Jan 16 22:42:25 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 465b6a1
Author: Tom Barnes <[email protected]>
Date:   Mon Jan 16 22:41:52 2023 +0000

    Docs/space b cleanup (qmk#19612)

    * Clean up remaining mentions of the deprecated Space B reset method

    * cleanup auto_tag.yml that got sucked in

commit 4c7f67f
Merge: b6e42db 2bff00e
Author: QMK Bot <[email protected]>
Date:   Mon Jan 16 09:33:19 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 2bff00e
Author: Pablo Martínez <[email protected]>
Date:   Mon Jan 16 10:32:43 2023 +0100

    Small doc changes (qmk#19601)

commit b6e42db
Merge: b077e63 917d93e
Author: QMK Bot <[email protected]>
Date:   Mon Jan 16 08:52:56 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 917d93e
Author: Sergey Vlasov <[email protected]>
Date:   Mon Jan 16 11:52:18 2023 +0300

    [Docs] Fix `JOYSTICK_AXIS_COUNT` name in docs (qmk#19605)

commit b077e63
Merge: 401b475 4f83b67
Author: QMK Bot <[email protected]>
Date:   Mon Jan 16 08:49:16 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 4f83b67
Author: adiabatic <[email protected]>
Date:   Mon Jan 16 00:48:41 2023 -0800

    [Keymap] Improve Zweihander layout for the Ergodox EZ (qmk#18737)

commit 401b475
Merge: 955829b fe27e46
Author: QMK Bot <[email protected]>
Date:   Mon Jan 16 00:56:04 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit fe27e46
Author: Ryan Baker <[email protected]>
Date:   Sun Jan 15 19:55:30 2023 -0500

    [Keyboard] Add rb87 (qmk#19546)

commit 955829b
Author: Sergey Vlasov <[email protected]>
Date:   Mon Jan 16 02:29:29 2023 +0300

    Fix joystick build for ChibiOS (qmk#19602)

    `joystick_report_t` was renamed to `report_joystick_t`, but apparently
    one place in the code was missed.

commit 0730740
Author: Joel Challis <[email protected]>
Date:   Sun Jan 15 15:04:32 2023 +0000

    Add mmoskal/uf2-stm32f103 bootloader support (qmk#19594)

commit a920714
Author: Ryan <[email protected]>
Date:   Sun Jan 15 19:40:52 2023 +1100

    usb_main.c: remove `CH_KERNEL_MAJOR` check (qmk#19597)

commit 8046467
Merge: d40516c 44bcde1
Author: QMK Bot <[email protected]>
Date:   Sun Jan 15 08:03:56 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 44bcde1
Author: Christian Brauner <[email protected]>
Date:   Sun Jan 15 09:03:27 2023 +0100

    [Keymap] Update brauner preonic layout (qmk#19595)

commit 2c98e79
Author: jack <[email protected]>
Date:   Sun Jan 15 01:03:16 2023 -0700

    [Keyboard] Fixup gingko65 matrix pins (qmk#19589)

commit d40516c
Merge: 5f46e29 e7d1b21
Author: QMK Bot <[email protected]>
Date:   Sun Jan 15 03:58:42 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit e7d1b21
Author: jurassic73 <[email protected]>
Date:   Sat Jan 14 19:58:09 2023 -0800

    [Keyboard] Update handwired/split89 to new standard. (qmk#19540)

    Co-authored-by: James Young <[email protected]>

commit 5f46e29
Merge: 45851a1 4a53d9c
Author: QMK Bot <[email protected]>
Date:   Sun Jan 15 03:47:13 2023 +0000

    Merge remote-tracking branch 'origin/master' into develop

commit 4a53d9c
Author: Bastien BALOUP <[email protected]>
Date:   Sun Jan 15 04:46:13 2023 +0100

    [Keymap] Add Bastian-Baloup sofle keymap (qmk#18836)

    Co-authored-by: Ryan <[email protected]>
omikronik pushed a commit to omikronik/qmk_firmware that referenced this pull request Jan 22, 2023
@sigprof @omikronik
Fix joystick build for ChibiOS (qmk#19602)
549cf4f 
`joystick_report_t` was renamed to `report_joystick_t`, but apparently
one place in the code was missed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tzarc tzarc tzarc approved these changes

Assignees
No one assigned
Labels
core
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@sigprof @tzarc @zvecr