Skip to content

firmware: restore joystick decoding in non-J1939 mode#52

Merged
CamilleTTT merged 1 commit intoToyotaInfoTech:mainfrom
BenGardiner:try_fix_joystick
Apr 20, 2026
Merged

firmware: restore joystick decoding in non-J1939 mode#52
CamilleTTT merged 1 commit intoToyotaInfoTech:mainfrom
BenGardiner:try_fix_joystick

Conversation

@BenGardiner
Copy link
Copy Markdown
Contributor

Restore joystick decoding in standard CAN mode by re-adding the decoding call in CAN_SIM_CONTROL_SHIFT_CANID case. Also fixed a misplaced J1939 guard that was preventing JOYSTICK_BUTTONS from being received even if sent.

Restore joystick decoding in standard CAN mode by re-adding the decoding call in CAN_SIM_CONTROL_SHIFT_CANID case. Also fixed a misplaced J1939 guard that was preventing JOYSTICK_BUTTONS from being received even if sent.
@github-actions
Copy link
Copy Markdown
Contributor

🔨 Build & Macro Coverage Report

Default Builds — Hex File Sizes

ECU Debug (tag 15.0) Release (tag 15.0)
ECUA 531 KiB (544219 bytes) 359 KiB (367680 bytes)
ECUB 339 KiB (347536 bytes) 198 KiB (203160 bytes)
ECUC 319 KiB (327662 bytes) 177 KiB (182234 bytes)
ECUD 329 KiB (337660 bytes) 184 KiB (189374 bytes)

Macro Coverage Build Results

Variant Macros Changed Result Warnings
gsusb +ENABLE_GSUSB ✅ Pass 0
gsusb_and_bb +ENABLE_GSUSB +ENABLE_BITBANG ✅ Pass 0
i2c +ENABLE_I2C ✅ Pass 0
j1939 +ENABLE_J1939_MODE ✅ Pass 0
j1939_showcase_mode +ENABLE_J1939_MODE +RAMN_SHOWCASE_MODE ✅ Pass 0
kwp +ENABLE_KWP ✅ Pass 0
no_debug ENABLE_USB_DEBUGENABLE_JOYSTICK_CONTROLSENABLE_SCREENENABLE_CHIP8GENERATE_RUNTIME_STATS ✅ Pass 0
no_dynamic_bitrate ENABLE_DYNAMIC_BITRATE ✅ Pass 0
no_extras ENABLE_J1979ENABLE_MINICTFENABLE_CHIP8ENABLE_SCREENENABLE_SPI ✅ Pass 0
no_uds ENABLE_UDSENABLE_UDS_REPROGRAMMING ✅ Pass 12
uart +ENABLE_UARTENABLE_CDCENABLE_USB ✅ Pass 13
usb_autodetect +ENABLE_USB_AUTODETECT ✅ Pass 0
watchdog +WATCHDOG_ENABLE ✅ Pass 0

Source Code Compile Coverage

  • Total .c source lines: 21267
  • Lines compiled in ≥1 configuration: 19920 (~94%)
  • ENABLE_ macro coverage: 23/23 (100.0%) macros tested in both ON and OFF states
Full ENABLE_ Macro Coverage Table
# Macro Tested ON Tested OFF Covered
1 ENABLE_ADC default (ECUB, ECUC, ECUD) default (ECUA)
2 ENABLE_BITBANG default (ECUA), variant: gsusb_and_bb default (ECUB, ECUC, ECUD)
3 ENABLE_CDC default (ECUA) default (ECUB, ECUC, ECUD), variant: uart
4 ENABLE_CHIP8 default (ECUA) default (ECUB, ECUC, ECUD), variant: no_debug, variant: no_extras
5 ENABLE_DYNAMIC_BITRATE default (ECUA, ECUB, ECUC, ECUD) variant: no_dynamic_bitrate
6 ENABLE_GSUSB variant: gsusb, variant: gsusb_and_bb default (ECUA, ECUB, ECUC, ECUD)
7 ENABLE_I2C variant: i2c default (ECUA, ECUB, ECUC, ECUD)
8 ENABLE_J1939_MODE variant: j1939, variant: j1939_showcase_mode default (ECUA, ECUB, ECUC, ECUD)
9 ENABLE_J1979 default (ECUA, ECUB, ECUC, ECUD) variant: no_extras
10 ENABLE_JOYSTICK_CONTROLS default (ECUA) default (ECUB, ECUC, ECUD), variant: no_debug
11 ENABLE_KWP variant: kwp default (ECUA, ECUB, ECUC, ECUD)
12 ENABLE_MINICTF default (ECUA, ECUD) default (ECUB, ECUC), variant: no_extras
13 ENABLE_SCREEN default (ECUA) default (ECUB, ECUC, ECUD), variant: no_debug, variant: no_extras
14 ENABLE_SPI default (ECUA, ECUD) default (ECUB, ECUC), variant: no_extras
15 ENABLE_UART variant: uart default (ECUA, ECUB, ECUC, ECUD)
16 ENABLE_UDS default (ECUA, ECUB, ECUC, ECUD) variant: no_uds
17 ENABLE_UDS_REPROGRAMMING default (ECUA, ECUB, ECUC, ECUD) variant: no_uds
18 ENABLE_USB default (ECUA) default (ECUB, ECUC, ECUD), variant: uart
19 ENABLE_USB_AUTODETECT variant: usb_autodetect default (ECUA, ECUB, ECUC, ECUD)
20 ENABLE_USB_DEBUG default (ECUA) default (ECUB, ECUC, ECUD), variant: no_debug
21 ENABLE_XCP default (ECUB, ECUC, ECUD) default (ECUA)
22 GENERATE_RUNTIME_STATS default (ECUA, ECUB, ECUC, ECUD) variant: no_debug
23 WATCHDOG_ENABLE variant: watchdog default (ECUA, ECUB, ECUC, ECUD)

@CamilleTTT CamilleTTT merged commit b3b5e81 into ToyotaInfoTech:main Apr 20, 2026
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants