Refactoring keys/switches/trims in simu (#6515)
Refactoring keys/switches/trims in simu
This commit is contained in:
@@ -309,16 +309,12 @@ enum EnumSwitchesPositions
|
||||
SW_SGMBR0,
|
||||
SW_SGMBR1,
|
||||
SW_SGMBR2,
|
||||
STORAGE_NUM_SWITCHES_POSITIONS
|
||||
NUM_SWITCHES_POSITIONS
|
||||
};
|
||||
|
||||
|
||||
#if defined(__cplusplus)
|
||||
static_assert(STORAGE_NUM_SWITCHES_POSITIONS == NUM_SWITCHES * 3, "Wrong switches positions count");
|
||||
#endif
|
||||
#define STORAGE_NUM_SWITCHES_POSITIONS (STORAGE_NUM_SWITCHES * 3)
|
||||
|
||||
void keysInit(void);
|
||||
uint8_t keyState(uint8_t index);
|
||||
uint32_t switchState(uint8_t index);
|
||||
uint32_t readKeys(void);
|
||||
#define KEYS_PRESSED() (readKeys())
|
||||
|
||||
@@ -79,9 +79,9 @@ uint32_t readTrims()
|
||||
return result;
|
||||
}
|
||||
|
||||
uint16_t trimDown(uint16_t idx)
|
||||
bool trimDown(uint8_t idx)
|
||||
{
|
||||
return readTrims() & (1 << idx);
|
||||
return readTrims() & ((uint32_t)1 << idx);
|
||||
}
|
||||
|
||||
bool keyDown()
|
||||
@@ -158,11 +158,6 @@ void readKeysAndTrims()
|
||||
} \
|
||||
break
|
||||
|
||||
uint8_t keyState(uint8_t index)
|
||||
{
|
||||
return keys[index].state();
|
||||
}
|
||||
|
||||
#if !defined(BOOT)
|
||||
uint32_t switchState(uint8_t index)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user