Skip to content

Fix config parser silently dropping NFC/flash when touch/buzzer present #6

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

Open
balloob wants to merge 1 commit into
base: main
Choose a base branch
from
+65 −1
Open

Fix config parser silently dropping NFC/flash when touch/buzzer present #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 55 additions & 1 deletion opendisplay_config_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,42 @@ bool parseConfigBytes(uint8_t* configData, uint32_t configLen, struct GlobalConf
}
break;

case CONFIG_PKT_TOUCH: // touch_controller (0x28) - handled by main MCU, skip on Silabs
if (offset > configLen) {
printf("Offset overflow before touch\r\n");
globalConfig->loaded = false;
return false;
}
if (offset + CONFIG_PKT_TOUCH_SIZE <= configLen - 2) {
offset += CONFIG_PKT_TOUCH_SIZE;
if (offset > configLen) {
printf("Offset overflow after touch\r\n");
globalConfig->loaded = false;
return false;
}
} else {
offset = configLen - 2; // Skip to CRC
}
break;

case CONFIG_PKT_BUZZER: // passive_buzzer (0x29) - handled by main MCU, skip on Silabs
if (offset > configLen) {
printf("Offset overflow before buzzer\r\n");
globalConfig->loaded = false;
return false;
}
if (offset + CONFIG_PKT_BUZZER_SIZE <= configLen - 2) {
offset += CONFIG_PKT_BUZZER_SIZE;
if (offset > configLen) {
printf("Offset overflow after buzzer\r\n");
globalConfig->loaded = false;
return false;
}
} else {
offset = configLen - 2; // Skip to CRC
}
break;

case CONFIG_PKT_NFC: // nfc_config (0x2A)
if (offset > configLen) {
printf("Offset overflow before nfc_config\r\n");
Expand Down Expand Up @@ -423,7 +459,25 @@ bool parseConfigBytes(uint8_t* configData, uint32_t configLen, struct GlobalConf
return false;
}
break;


case CONFIG_PKT_DATA_EXTENDED: // data_extended (0x2C) - host-only strings, skip on Silabs
if (offset > configLen) {
printf("Offset overflow before data_extended\r\n");
globalConfig->loaded = false;
return false;
}
if (offset + CONFIG_PKT_DATA_EXTENDED_SIZE <= configLen - 2) {
offset += CONFIG_PKT_DATA_EXTENDED_SIZE;
if (offset > configLen) {
printf("Offset overflow after data_extended\r\n");
globalConfig->loaded = false;
return false;
}
} else {
offset = configLen - 2; // Skip to CRC
}
break;

default:
printf("Unknown pkt 0x%02X @%u\r\n", packetId, (unsigned)(offset - 2));
offset = configLen - 2; // Skip to CRC
Expand Down
10 changes: 10 additions & 0 deletions opendisplay_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,18 @@
#define CONFIG_PKT_BINARY_INPUT 0x25
#define CONFIG_PKT_WIFI 0x26
#define CONFIG_PKT_SECURITY 0x27
#define CONFIG_PKT_TOUCH 0x28
#define CONFIG_PKT_BUZZER 0x29
#define CONFIG_PKT_NFC 0x2A
#define CONFIG_PKT_FLASH 0x2B
#define CONFIG_PKT_DATA_EXTENDED 0x2C

/* Wire sizes of config packets Silabs does not consume itself (touch/buzzer are
* handled by the main MCU, data_extended is host-only). They must still be
* skipped by their exact size so later packets (NFC 0x2A, flash 0x2B) parse. */
#define CONFIG_PKT_TOUCH_SIZE 32
#define CONFIG_PKT_BUZZER_SIZE 32
#define CONFIG_PKT_DATA_EXTENDED_SIZE 288

#define CONFIG_CHUNK_SIZE 200
#define CONFIG_CHUNK_SIZE_WITH_PREFIX 202
Expand Down