Skip to content

Commit 5709000

Browse files
committed
offset SPI button count in flash by 1 to allow 1-64 buttons to be stored
1 parent 7a247d1 commit 5709000

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

Firmware/FFBoard/UserExtensions/Src/SPIButtons.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ CommandStatus SPI_Buttons::command(const ParsedCommand& cmd,std::vector<CommandR
248248

249249
static ButtonSourceConfig decodeIntToConf(uint16_t config_int, uint16_t config_int_2){
250250
ButtonSourceConfig c;
251-
c.numButtons = config_int & 0x3F;
251+
c.numButtons = (config_int & 0x3F) + 1;
252252
c.invert = (config_int >> 6) & 0x1;
253253
c.cutRight = (config_int >> 7) & 0x1;
254254
c.mode = SPI_BtnMode(config_int >> 8);
255255
c.cs_num = static_cast<uint8_t>(config_int_2 & 0xF); // Leaving space for other use.
256256
return c;
257257
}
258258
static std::tuple<uint16_t, uint16_t> encodeConfToInt(ButtonSourceConfig* c){
259-
uint16_t val = c->numButtons & 0x3F;
259+
uint16_t val = (c->numButtons-1) & 0x3F; // 1-64
260260
val |= c->invert << 6;
261261
val |= c->cutRight << 7;
262262
val |= (uint8_t)c->mode << 8;

0 commit comments

Comments
 (0)