jepler/uf2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add =null syntax to remove entries

Browse source
This commit is contained in:
Michal Moskal 2019-01-28 10:37:52 +00:00
parent b31f82edf6
commit 0d0317634c
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cf2.md
View file

@ -94,6 +94,9 @@ PIN_DISPLAY_MOSI = PIN_MOSI
# custom configuration keys # custom configuration keys
_679732427 = 123 _679732427 = 123
_815320287 = 0x80192 _815320287 = 0x80192
# remove an existing config entry
PIN_BTN_MENU2 = null
``` ```
The keys are either key names, or underscore followed by a decimal number. The keys are either key names, or underscore followed by a decimal number.
@ -109,6 +112,10 @@ The way pin numbers are parsed depends on the `PINS_PORT_SIZE`:
Certain keys (like `PINS_PORT_SIZE`) have a number of pre-defined values, Certain keys (like `PINS_PORT_SIZE`) have a number of pre-defined values,
which can be used instead of integers. which can be used instead of integers.
Because you're usually use this syntax to patch an existing configuration,
you sometimes may want to remove an entry that's already there.
To do that, use `null` as the value of the key.
For list of keys and predefined values, see `configkeys.h` which can be downloaded For list of keys and predefined values, see `configkeys.h` which can be downloaded
from the patcher website. from the patcher website.

11
patcher/patcher.js
View file

@ -654,6 +654,16 @@ function patchConfig(buf, cfg) {
} }
}) })
let changes = ""
forAll((kn, k, v) => {
v = v.toUpperCase()
if (v == "NULL" || v == "UNDEFINED") {
let old = lookupCfg(cfgdata, k)
changes += "remove " + showKV(k, old, portSize0) + "\n"
delete cfgMap[k]
}
})
forAll((kn, k, v) => { forAll((kn, k, v) => {
if (isNaN(parseInt(v))) if (isNaN(parseInt(v)))
err("Value not understood: " + v) err("Value not understood: " + v)
@ -667,7 +677,6 @@ function patchConfig(buf, cfg) {
patch.push(parseInt(cfgMap[k])) patch.push(parseInt(cfgMap[k]))
} }
let changes = ""
for (let i = 0; i < patch.length; i += 2) { for (let i = 0; i < patch.length; i += 2) {
let k = patch[i] let k = patch[i]
let v = patch[i + 1] let v = patch[i + 1]