Tidy Wireless Paper variant files (#4238)

* Quick tidy of pins_arduino.h
Matches requests made at #4226 (comment))

* Tidy variant.h

* Change deprecated ADC attenuation parameter
From 11dB to 12dB. Resolves compiler warning. Allegly, no impact on function: `This is deprecated, it behaves the same as `ADC_ATTEN_DB_12`

variants/heltec_wireless_paper/pins_arduino.h

@@ -3,11 +3,7 @@
 
 #include <stdint.h>
 
-#define WIFI_Kit_32 true
-#define DISPLAY_HEIGHT 64
-#define DISPLAY_WIDTH 128
-
-static const uint8_t LED_BUILTIN = 35;
+static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
 #define LED_BUILTIN LED_BUILTIN
 
@@ -65,6 +61,6 @@ static const uint8_t LED = 18;
 
 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 */

variants/heltec_wireless_paper/variant.h

@@ -1,47 +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 4
 #define PIN_EINK_BUSY 7
 #define PIN_EINK_DC 5
 #define PIN_EINK_RES 6
 #define PIN_EINK_SCLK 3
 #define PIN_EINK_MOSI 2
 
-/*
- * SPI interfaces
- */
+// 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 10 // MISO      P0.17
-#define PIN_SPI_MOSI 11 // MOSI      P0.15
-#define PIN_SPI_SCK 9   // SCK       P0.13
-
-#define VEXT_ENABLE 45 // active low, powers the oled display and the lora antenna boost
-#define BUTTON_PIN 0
-
+// Power
+#define VEXT_ENABLE 45 // Active low, powers the E-Ink display
 #define ADC_CTRL 19
 #define BATTERY_PIN 20
 #define ADC_CHANNEL ADC2_GPIO20_CHANNEL
 #define ADC_MULTIPLIER 2                // Voltage divider is roughly 1:1
 #define BAT_MEASURE_ADC_UNIT 2          // Use ADC2
-#define ADC_ATTENUATION ADC_ATTEN_DB_11 // Voltage divider output is quite high
+#define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
 
+// LoRa
 #define USE_SX1262
 
 #define LORA_DIO0 -1 // 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

variants/heltec_wireless_paper_v1/pins_arduino.h

@@ -3,11 +3,7 @@
 
 #include <stdint.h>
 
-#define WIFI_Kit_32 true
-#define DISPLAY_HEIGHT 64
-#define DISPLAY_WIDTH 128
-
-static const uint8_t LED_BUILTIN = 35;
+static const uint8_t LED_BUILTIN = 18;
 #define BUILTIN_LED LED_BUILTIN // backward compatibility
 #define LED_BUILTIN LED_BUILTIN
 
@@ -65,6 +61,6 @@ static const uint8_t LED = 18;
 
 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 */

variants/heltec_wireless_paper_v1/variant.h

@@ -1,47 +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 4
 #define PIN_EINK_BUSY 7
 #define PIN_EINK_DC 5
 #define PIN_EINK_RES 6
 #define PIN_EINK_SCLK 3
 #define PIN_EINK_MOSI 2
 
-/*
- * SPI interfaces
- */
+// 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 10 // MISO      P0.17
-#define PIN_SPI_MOSI 11 // MOSI      P0.15
-#define PIN_SPI_SCK 9   // SCK       P0.13
-
-#define VEXT_ENABLE 45 // active low, powers the oled display and the lora antenna boost
-#define BUTTON_PIN 0
-
+// Power
+#define VEXT_ENABLE 45 // Active low, powers the E-Ink display
 #define ADC_CTRL 19
 #define BATTERY_PIN 20
 #define ADC_CHANNEL ADC2_GPIO20_CHANNEL
 #define ADC_MULTIPLIER 2                // Voltage divider is roughly 1:1
 #define BAT_MEASURE_ADC_UNIT 2          // Use ADC2
-#define ADC_ATTENUATION ADC_ATTEN_DB_11 // Voltage divider output is quite high
+#define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
 
+// LoRa
 #define USE_SX1262
 
 #define LORA_DIO0 -1 // 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