Skip to content

Commit 8d09840

Browse files
committed
Finish evil merge cleanup
1 parent 6171ad8 commit 8d09840

1 file changed

Lines changed: 1 addition & 67 deletions

File tree

src/main.cpp

Lines changed: 1 addition & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -340,73 +340,7 @@ void setup()
340340

341341
#ifdef BLE_LED
342342
pinMode(BLE_LED, OUTPUT);
343-
#ifdef BLE_LED_INVERTED
344-
digitalWrite(BLE_LED, HIGH);
345-
#else
346-
digitalWrite(BLE_LED, LOW);
347-
#endif
348-
#endif
349-
350-
#if defined(T_DECK)
351-
// GPIO10 manages all peripheral power supplies
352-
// Turn on peripheral power immediately after MUC starts.
353-
// If some boards are turned on late, ESP32 will reset due to low voltage.
354-
// ESP32-C3(Keyboard) , MAX98357A(Audio Power Amplifier) ,
355-
// TF Card , Display backlight(AW9364DNR) , AN48841B(Trackball) , ES7210(Decoder)
356-
pinMode(KB_POWERON, OUTPUT);
357-
digitalWrite(KB_POWERON, HIGH);
358-
// T-Deck has all three SPI peripherals (TFT, SD, LoRa) attached to the same SPI bus
359-
// We need to initialize all CS pins in advance otherwise there will be SPI communication issues
360-
// e.g. when detecting the SD card
361-
pinMode(LORA_CS, OUTPUT);
362-
digitalWrite(LORA_CS, HIGH);
363-
pinMode(SDCARD_CS, OUTPUT);
364-
digitalWrite(SDCARD_CS, HIGH);
365-
pinMode(TFT_CS, OUTPUT);
366-
digitalWrite(TFT_CS, HIGH);
367-
delay(100);
368-
#elif defined(T_DECK_PRO)
369-
pinMode(LORA_EN, OUTPUT);
370-
digitalWrite(LORA_EN, HIGH);
371-
pinMode(LORA_CS, OUTPUT);
372-
digitalWrite(LORA_CS, HIGH);
373-
pinMode(SDCARD_CS, OUTPUT);
374-
digitalWrite(SDCARD_CS, HIGH);
375-
pinMode(PIN_EINK_CS, OUTPUT);
376-
digitalWrite(PIN_EINK_CS, HIGH);
377-
#if PIN_EINK_RES >= 0
378-
pinMode(PIN_EINK_RES, OUTPUT);
379-
digitalWrite(PIN_EINK_RES, HIGH);
380-
#endif
381-
pinMode(CST328_PIN_RST, OUTPUT);
382-
digitalWrite(CST328_PIN_RST, HIGH);
383-
#elif defined(T_LORA_PAGER)
384-
pinMode(LORA_CS, OUTPUT);
385-
digitalWrite(LORA_CS, HIGH);
386-
pinMode(SDCARD_CS, OUTPUT);
387-
digitalWrite(SDCARD_CS, HIGH);
388-
pinMode(TFT_CS, OUTPUT);
389-
digitalWrite(TFT_CS, HIGH);
390-
pinMode(KB_INT, INPUT_PULLUP);
391-
// io expander
392-
io.begin(Wire, XL9555_SLAVE_ADDRESS0, SDA, SCL);
393-
io.pinMode(EXPANDS_DRV_EN, OUTPUT);
394-
io.digitalWrite(EXPANDS_DRV_EN, HIGH);
395-
io.pinMode(EXPANDS_AMP_EN, OUTPUT);
396-
io.digitalWrite(EXPANDS_AMP_EN, LOW);
397-
io.pinMode(EXPANDS_LORA_EN, OUTPUT);
398-
io.digitalWrite(EXPANDS_LORA_EN, HIGH);
399-
io.pinMode(EXPANDS_GPS_EN, OUTPUT);
400-
io.digitalWrite(EXPANDS_GPS_EN, HIGH);
401-
io.pinMode(EXPANDS_KB_EN, OUTPUT);
402-
io.digitalWrite(EXPANDS_KB_EN, HIGH);
403-
io.pinMode(EXPANDS_SD_EN, OUTPUT);
404-
io.digitalWrite(EXPANDS_SD_EN, HIGH);
405-
io.pinMode(EXPANDS_GPIO_EN, OUTPUT);
406-
io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
407-
io.pinMode(EXPANDS_SD_PULLEN, INPUT);
408-
#elif defined(HACKADAY_COMMUNICATOR)
409-
pinMode(KB_INT, INPUT);
343+
digitalWrite(BLE_LED, LED_STATE_OFF);
410344
#endif
411345

412346
concurrency::hasBeenSetup = true;

0 commit comments

Comments
 (0)