From b34258dbd644f13aeed00c3fa75e8d8297067f09 Mon Sep 17 00:00:00 2001 From: Ilya Zhuravlev Date: Wed, 30 Jun 2021 23:42:40 -0400 Subject: [PATCH] qmk_settings: update with test settings --- quantum/qmk_settings.c | 7 +++++++ quantum/qmk_settings.h | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/quantum/qmk_settings.c b/quantum/qmk_settings.c index d63a54a8c5..346cd8023c 100644 --- a/quantum/qmk_settings.c +++ b/quantum/qmk_settings.c @@ -10,6 +10,13 @@ qmk_settings_t QS; static const qmk_settings_proto_t protos[] PROGMEM = { DECLARE_SETTING(1, grave_esc_override), + DECLARE_SETTING(2, debounce_time), + DECLARE_SETTING(3, auto_shift), + DECLARE_SETTING(4, auto_shift_timeout), + DECLARE_SETTING(5, osk_tap_toggle), + DECLARE_SETTING(6, osk_timeout), + DECLARE_SETTING(7, tapping_term), + DECLARE_SETTING(8, tap_hold), }; static const qmk_settings_proto_t *find_setting(uint16_t qsid) { diff --git a/quantum/qmk_settings.h b/quantum/qmk_settings.h index e117a3b856..86c075abc0 100644 --- a/quantum/qmk_settings.h +++ b/quantum/qmk_settings.h @@ -35,10 +35,19 @@ #ifdef QMK_SETTINGS /* dynamic settings framework is enabled */ -/* actual settings - stored in RAM and backed by EEPROM */ +/* actual settings - stored in RAM and backed by EEPROM + these are in arbitrary order to ensure they are aligned w/o any holes, and the order can be changed at will */ typedef struct { uint8_t grave_esc_override; + uint8_t auto_shift; + uint8_t osk_tap_toggle; + uint8_t tap_hold; + uint16_t debounce_time; + uint16_t auto_shift_timeout; + uint16_t osk_timeout; + uint16_t tapping_term; } qmk_settings_t; +_Static_assert(sizeof(qmk_settings_t) == 12, "unexpected size of the qmk_settings_t structure"); /* setting prototype - describes how to get/set settings, stored in flash */ typedef struct {