Refactoring keys/switches/trims in simu (#6515)

Refactoring keys/switches/trims in simu
This commit is contained in:
Bertrand Songis
2019-06-18 20:07:15 +02:00
committed by GitHub
parent 4998191910
commit eaf595bd76
17 changed files with 147 additions and 304 deletions
+1 -1
View File
@@ -90,6 +90,7 @@ set(FIRMWARE_TARGET_SRC
eeprom_driver.cpp
lcd_driver.cpp
pwr_driver.cpp
keys_driver.cpp
usb/device/core/USBD_UDP.c
usb/device/core/USBDDriver.c
usb/device/massstorage/MSDDriver.c
@@ -115,7 +116,6 @@ set(TARGET_SRC
telemetry_driver.cpp
adc_driver.cpp
pulses_driver.cpp
keys_driver.cpp
audio_driver.cpp
buzzer_driver.cpp
haptic_driver.cpp
+1 -1
View File
@@ -52,6 +52,7 @@ void rotaryEncoderEnd();
// Keys driver
#define NUM_SWITCHES 7
#define STORAGE_NUM_SWITCHES NUM_SWITCHES
#define NUM_SWITCHES_POSITIONS 9
enum EnumKeys
{
@@ -220,7 +221,6 @@ void stop_trainer_capture();
void flashWrite(uint32_t * address, uint32_t * buffer);
// Keys driver
uint8_t keyState(uint8_t index);
uint32_t switchState(uint8_t index);
uint32_t readKeys(void);
uint32_t readTrims(void);
+1 -6
View File
@@ -80,7 +80,7 @@ uint32_t readTrims()
return result;
}
uint8_t trimDown(uint8_t idx)
bool trimDown(uint8_t idx)
{
return readTrims() & (1 << idx);
}
@@ -113,11 +113,6 @@ void readKeysAndTrims()
}
}
uint8_t keyState(uint8_t index)
{
return keys[index].state();
}
uint32_t switchState(uint8_t index)
{
uint32_t a = PIOA->PIO_PDSR;