Skip to content

Commit

Permalink
more cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
zjwhitehead committed Apr 22, 2024
1 parent e98b5ac commit a9350df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
2 changes: 1 addition & 1 deletion src/sp140/rp2040-config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ HardwareConfig v2_config = {
.buzzer_pin = 2,
.led_sw = LED_BUILTIN,
.throttle_pin = A2,
.bmp_pin = 9,
.serial_esc = &Serial1,
.tft_rst = 6,
.tft_cs = 4,
Expand All @@ -24,7 +25,6 @@ HardwareConfig v1_config = {
.buzzer_pin = 10,
.led_sw = 12,
.throttle_pin = A0,
.bmp_pin = 9,
.serial_esc = &Serial1,
.tft_rst = 5,
.tft_cs = 13,
Expand Down
16 changes: 3 additions & 13 deletions src/sp140/sp140.ino
Original file line number Diff line number Diff line change
Expand Up @@ -136,16 +136,6 @@ void trackPowerTask(void *pvParameters) {
vTaskDelete(NULL); // should never reach this
}

void checkButtonTask(void *pvParameters) {
(void) pvParameters; // this is a standard idiom to avoid compiler warnings about unused parameters.

for (;;) { // infinite loop
checkButtons();
delay(5); // wait for 5ms
}
vTaskDelete(NULL); // should never reach this
}

void updateDisplayTask(void *pvParameters) { //TODO set core affinity to one core only
(void) pvParameters; // this is a standard idiom to avoid compiler warnings about unused parameters.

Expand Down Expand Up @@ -187,8 +177,9 @@ void commonSetup() {
Serial.print(F("Booting up (USB) V"));
Serial.print(VERSION_MAJOR + "." + VERSION_MINOR);

pinMode(9, OUTPUT);
digitalWrite(9, HIGH); //barometer fix for V2
const int bmp_enabler = 9;
pinMode(bmp_enabler, OUTPUT);
digitalWrite(bmp_enabler, HIGH); // barometer fix for V2 board

#ifdef M0_PIO
uint8_t eepStatus = eep.begin(eep.twiClock100kHz);
Expand Down Expand Up @@ -346,7 +337,6 @@ void setup140() {
// main loop - everything runs in threads
void loop() {


#ifdef M0_PIO
Watchdog.reset(); // reset the watchdog timer (done in task for RP2040)
#endif
Expand Down

0 comments on commit a9350df

Please sign in to comment.