Tidy variant folders

todd-herbert · Jul 29, 2024 · a30b95d · a30b95d
1 parent 42d6611
commit a30b95d
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 34 deletions.
diff --git a/variants/heltec_vision_master_e213/variant.h b/variants/heltec_vision_master_e213/variant.h
@@ -15,9 +15,9 @@
 
 // SPI
 #define SPI_INTERFACES_COUNT 2
-#define PIN_SPI_MISO 10 // MISO
-#define PIN_SPI_MOSI 11 // MOSI
-#define PIN_SPI_SCK 9   // SCK
+#define PIN_SPI_MISO 11
+#define PIN_SPI_MOSI 10
+#define PIN_SPI_SCK 9
 
 // Power
 #define VEXT_ENABLE 18            // Powers the E-Ink display, and the 3.3V supply to the I2C QuickLink connector
@@ -33,7 +33,7 @@
 // LoRa
 #define USE_SX1262
 
-#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_DIO0 RADIOLIB_NC // a No connect on the SX1262 module
 #define LORA_RESET 12
 #define LORA_DIO1 14 // SX1262 IRQ
 #define LORA_DIO2 13 // SX1262 BUSY

diff --git a/variants/heltec_vision_master_e290/pins_arduino.h b/variants/heltec_vision_master_e290/pins_arduino.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-static const uint8_t LED_BUILTIN = 35;
+static const uint8_t LED_BUILTIN = -1;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
 #define LED_BUILTIN LED_BUILTIN
 
@@ -56,6 +56,6 @@ static const uint8_t T14 = 14;
 
 static const uint8_t RST_LoRa = 12;
 static const uint8_t BUSY_LoRa = 13;
-static const uint8_t DIO0 = 14;
+static const uint8_t DIO1 = 14;
 
 #endif /* Pins_Arduino_h */
diff --git a/variants/heltec_vision_master_e290/variant.h b/variants/heltec_vision_master_e290/variant.h
@@ -1,48 +1,41 @@
-// #define LED_PIN 18
+#define BUTTON_PIN 0
 
-// Enable bus for external periherals
+// I2C
 #define I2C_SDA SDA
 #define I2C_SCL SCL
 
+// Display (E-Ink)
 #define USE_EINK
-
-/*
- * eink display pins
- */
 #define PIN_EINK_CS 3
 #define PIN_EINK_BUSY 6
 #define PIN_EINK_DC 4
 #define PIN_EINK_RES 5
 #define PIN_EINK_SCLK 2
 #define PIN_EINK_MOSI 1
 
-/*
- * SPI interfaces
- */
+// SPI
 #define SPI_INTERFACES_COUNT 2
+#define PIN_SPI_MISO 11
+#define PIN_SPI_MOSI 10
+#define PIN_SPI_SCK 9
 
-#define PIN_SPI_MISO 10 // MISO
-#define PIN_SPI_MOSI 11 // MOSI
-#define PIN_SPI_SCK 9   // SCK
-
-#define VEXT_ENABLE 18 // powers the e-ink display
-#define VEXT_ON_VALUE 1
-#define BUTTON_PIN 0
-
+// Power
+#define VEXT_ENABLE 18 // Powers the E-Ink display only
+#define VEXT_ON_VALUE HIGH
 #define ADC_CTRL 46
 #define ADC_CTRL_ENABLED HIGH
 #define BATTERY_PIN 7
 #define ADC_CHANNEL ADC1_GPIO7_CHANNEL
 #define ADC_MULTIPLIER 4.9 * 1.03
-#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // Voltage divider output is quite high
+#define ADC_ATTENUATION ADC_ATTEN_DB_2_5
 
+// LoRa
 #define USE_SX1262
 
-#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_DIO0 RADIOLIB_NC // a No connect on the SX1262 module
 #define LORA_RESET 12
 #define LORA_DIO1 14 // SX1262 IRQ
 #define LORA_DIO2 13 // SX1262 BUSY
-#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled
 
 #define LORA_SCK 9
 #define LORA_MISO 11

diff --git a/variants/heltec_wireless_paper/variant.h b/variants/heltec_wireless_paper/variant.h
@@ -16,9 +16,9 @@
 
 // SPI
 #define SPI_INTERFACES_COUNT 2
-#define PIN_SPI_MISO 10 // MISO
-#define PIN_SPI_MOSI 11 // MOSI
-#define PIN_SPI_SCK 9   // SCK
+#define PIN_SPI_MISO 11
+#define PIN_SPI_MOSI 10
+#define PIN_SPI_SCK 9
 
 // Power
 #define VEXT_ENABLE 45 // Active low, powers the E-Ink display
@@ -32,7 +32,7 @@
 // LoRa
 #define USE_SX1262
 
-#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_DIO0 RADIOLIB_NC // a No connect on the SX1262 module
 #define LORA_RESET 12
 #define LORA_DIO1 14 // SX1262 IRQ
 #define LORA_DIO2 13 // SX1262 BUSY

diff --git a/variants/heltec_wireless_paper_v1/variant.h b/variants/heltec_wireless_paper_v1/variant.h
@@ -16,9 +16,9 @@
 
 // SPI
 #define SPI_INTERFACES_COUNT 2
-#define PIN_SPI_MISO 10 // MISO
-#define PIN_SPI_MOSI 11 // MOSI
-#define PIN_SPI_SCK 9   // SCK
+#define PIN_SPI_MISO 11
+#define PIN_SPI_MOSI 10
+#define PIN_SPI_SCK 9
 
 // Power
 #define VEXT_ENABLE 45 // Active low, powers the E-Ink display
@@ -32,7 +32,7 @@
 // LoRa
 #define USE_SX1262
 
-#define LORA_DIO0 -1 // a No connect on the SX1262 module
+#define LORA_DIO0 RADIOLIB_NC // a No connect on the SX1262 module
 #define LORA_RESET 12
 #define LORA_DIO1 14 // SX1262 IRQ
 #define LORA_DIO2 13 // SX1262 BUSY