Merge branch 'master' into fix_some_cpp_warnings

platformio.ini

@@ -11,8 +11,9 @@
 [platformio]
 default_envs = tbeam
 ;default_envs = tbeam0.7
-;default_envs = heltec-v2.0
 ;default_envs = heltec-v1
+;default_envs = heltec-v2.0
+;default_envs = heltec-v2.1
 ;default_envs = tlora-v1
 ;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
@@ -198,7 +199,7 @@ build_flags =
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
 build_flags = 
-  ${esp32_base.build_flags} -D HELTEC_V2_1 -I variants/heltec_v2
+  ${esp32_base.build_flags} -D HELTEC_V2_1 -I variants/heltec_v2.1
 
 [env:tlora-v1]
 extends = esp32_base

variants/heltec_v2.1/variant.h

@@ -0,0 +1,31 @@
+// the default ESP32 Pin of 15 is the Oled SCL, set to 36 and 37 and works fine.
+// Tested on Neo6m module.
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+#define GPS_RX_PIN 36
+#define GPS_TX_PIN 37
+
+#ifndef USE_JTAG  // gpio15 is TDO for JTAG, so no I2C on this board while doing jtag
+#define I2C_SDA 4 // I2C pins for this board
+#define I2C_SCL 15
+#endif
+
+#define RESET_OLED 16 // If defined, this pin will be used to reset the display controller
+
+#define VEXT_ENABLE 21 // active low, powers the oled display and the lora antenna boost
+#define LED_PIN 25     // If defined we will blink this LED
+#define BUTTON_PIN 0   // If defined, this will be used for user button presses
+
+#define USE_RF95
+#define LORA_DIO0 26 // a No connect on the SX1262 module
+#ifndef USE_JTAG
+#define LORA_RESET 14
+#endif
+#define LORA_DIO1 35 // Not really used
+#define LORA_DIO2 34 // Not really used
+
+// ratio of voltage divider = 3.20 (schematic R12=100k, R10=220k)
+// device to device variations, the actual ratio can be between 3.2 and 4
+#define ADC_MULTIPLIER 3.6 // best fit
+#define BATTERY_PIN 37 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.

variants/heltec_v2/variant.h

@@ -24,18 +24,7 @@
 #define LORA_DIO1 35 // Not really used
 #define LORA_DIO2 34 // Not really used
 
-// ratio of voltage divider = 3.20 (R1=100k, R2=220k)
+// ratio of voltage divider = 3.20 (R12=100k, R10=220k)
 #define ADC_MULTIPLIER 3.2
-
-#ifdef HELTEC_V2_0
-
 #define BATTERY_PIN 13 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 
-#endif
-
-#ifdef HELTEC_V2_1
-
-#define BATTERY_PIN 37 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
-
-#endif