From ffcdfc6c032578e89b7c409c8afb15f1b907fd1e Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 1 Apr 2022 08:15:15 +1100 Subject: [PATCH] Swap info.json.gz length to #define. --- data/xap/xap_0.1.0.hjson | 2 +- lib/python/qmk/xap/gen_firmware/info_generator.py | 2 +- quantum/xap/xap.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/xap/xap_0.1.0.hjson b/data/xap/xap_0.1.0.hjson index 82dffb192b..42b0476f7a 100755 --- a/data/xap/xap_0.1.0.hjson +++ b/data/xap/xap_0.1.0.hjson @@ -240,7 +240,7 @@ define: INFO_LEN_QUERY description: Retrieves the length of info.json return_type: u32 - return_constant: info_json_gz_len + return_constant: INFO_JSON_GZ_LEN } 0x06: { type: command diff --git a/lib/python/qmk/xap/gen_firmware/info_generator.py b/lib/python/qmk/xap/gen_firmware/info_generator.py index c25d82181b..a1a6f1b40c 100644 --- a/lib/python/qmk/xap/gen_firmware/info_generator.py +++ b/lib/python/qmk/xap/gen_firmware/info_generator.py @@ -36,6 +36,6 @@ def generate_info(output_file, keyboard, keymap): lines.append('static const unsigned char info_json_gz[] PROGMEM = {') lines.append(data) lines.append('};') - lines.append(f'static const unsigned int info_json_gz_len = {data_len};') + lines.append(f'#define INFO_JSON_GZ_LEN {data_len}') dump_lines(output_file, lines) diff --git a/quantum/xap/xap.c b/quantum/xap/xap.c index a5d8b3cc0d..00901b0423 100644 --- a/quantum/xap/xap.c +++ b/quantum/xap/xap.c @@ -19,8 +19,8 @@ #include "info_json_gz.h" bool get_info_json_chunk(uint16_t offset, uint8_t *data, uint8_t data_len) { - if (offset + data_len > info_json_gz_len) { - data_len = info_json_gz_len - offset; + if (offset + data_len > INFO_JSON_GZ_LEN) { + data_len = INFO_JSON_GZ_LEN - offset; } memcpy_P(data, &info_json_gz[offset], data_len);