Merge pull request #143 from cyberman54/development

TTGO 21 v1.6 support added

.gitignore

@@ -5,8 +5,8 @@
 .vscode/c_cpp_properties.json
 .vscode/settings.json
 .vscode/launch.json
-src/loraconf.h
 .vscode/*.db
 .vscode/.browse.c_cpp.db*
 .clang_complete
 .gcc-flags.json
+src/loraconf.h

README.md

@@ -49,6 +49,9 @@ Depending on board hardware following features are supported:
 Target platform must be selected in [platformio.ini](https://github.com/cyberman54/ESP32-Paxcounter/blob/master/platformio.ini).<br>
 Hardware dependent settings (pinout etc.) are stored in board files in /hal directory.<br>
 
+<b>A suitable board with paxcounter software preloaded can be purchased via AliExpress 
+<A HREF="https://bit.ly/2MXqZh2">here</A></b>.<br>
+
 <b>3D printable cases</b> can be found (and, if wanted so, ordered) on Thingiverse, see 
 <A HREF="https://www.thingiverse.com/thing:2670713">Heltec</A>, <A HREF="https://www.thingiverse.com/thing:2811127">TTGOv2</A>, <A HREF="https://www.thingiverse.com/thing:3005574">TTGOv2.1</A>, <A HREF="https://www.thingiverse.com/thing:3041339">T-BEAM</A> for example.<br>
 

src/hal/heltec.h

@@ -5,7 +5,6 @@
 #define CFG_sx1276_radio 1
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C // OLED-Display on board
-//#define DISPLAY_FLIP  1 // uncomment this for rotated display
 #define HAS_LED GPIO_NUM_25 // white LED on board
 #define HAS_BUTTON GPIO_NUM_0 // button "PROG" on board
 

src/hal/ttgov21.h

@@ -1,18 +1,49 @@
 /*  Hardware related definitions for TTGO V2.1 Board
 / ATTENTION: check your board version!
 / Different versions are on the market which need different settings in this file:
-/ - without label        -> "old"
+/ - without label       -> use settings (2)
-/ - labelled v1.5 on pcb -> "old"
+/ - labeled V1.5 on pcb -> use settings (2) 
-/ - labelled v1.6 on pcb -> "new"
+/ - labeled V1.6 on pcb -> use settings (1)
+/ Choose the right configuration below
 */
 
+// (1) settings for board labeled "T3_V1.6" on pcb
+
+#define HAS_LORA 1       // comment out if device shall not send data via LoRa
+#define HAS_SPI 1        // comment out if device shall not send data via SPI
+#define CFG_sx1276_radio 1 // HPD13A LoRa SoC
+
+#define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
+#define HAS_LED GPIO_NUM_25 // green on board LED
+#define HAS_BATTERY_PROBE ADC1_GPIO35_CHANNEL // uses GPIO7
+#define BATT_FACTOR 2 // voltage divider 100k/100k on board
+
+// re-define pin definitions of pins_arduino.h
+#define PIN_SPI_SS    GPIO_NUM_18 // ESP32 GPIO18 (Pin18) -- HPD13A NSS/SEL (Pin4) SPI Chip Select Input
+#define PIN_SPI_MOSI  GPIO_NUM_27 // ESP32 GPIO27 (Pin27) -- HPD13A MOSI/DSI (Pin6) SPI Data Input
+#define PIN_SPI_MISO  GPIO_NUM_19 // ESP32 GPIO19 (Pin19) -- HPD13A MISO/DSO (Pin7) SPI Data Output
+#define PIN_SPI_SCK   GPIO_NUM_5  // ESP32 GPIO5 (Pin5)   -- HPD13A SCK (Pin5) SPI Clock Input
+
+// non arduino pin definitions
+#define RST   GPIO_NUM_23 // ESP32 GPIO23 <-> HPD13A RESET
+#define DIO0  GPIO_NUM_26 // ESP32 GPIO26 <-> HPD13A IO0
+#define DIO1  GPIO_NUM_33 // ESP32 GPIO33 <-> HPDIO1 <-> HPD13A IO1
+#define DIO2  GPIO_NUM_32 // ESP32 GPIO32 <-> HPDIO2 <-> HPD13A IO2
+
+// Hardware pin definitions for TTGO V2 Board with OLED SSD1306 0,96" I2C Display
+#define OLED_RST U8X8_PIN_NONE // connected to CPU RST/EN
+#define OLED_SDA GPIO_NUM_21 // ESP32 GPIO21 -- SD1306 D1+D2
+#define OLED_SCL GPIO_NUM_22 // ESP32 GPIO22 -- SD1306 D0
+
+/*
+// (2) settings for boards without label on pcb, or labeled v1.5 on pcb
+
 #define HAS_LORA 1       // comment out if device shall not send data via LoRa
 #define HAS_SPI 1        // comment out if device shall not send data via SPI
 #define CFG_sx1276_radio 1 // HPD13A LoRa SoC
 
 #define HAS_DISPLAY U8X8_SSD1306_128X64_NONAME_HW_I2C
 #define DISPLAY_FLIP  1 // rotated display
-#define HAS_LED GPIO_NUM_23 // green on board LED (new board ONLY)
 #define HAS_BATTERY_PROBE ADC1_GPIO35_CHANNEL // uses GPIO7
 #define BATT_FACTOR 2 // voltage divider 100k/100k on board
 
@@ -24,8 +55,7 @@
 
 // non arduino pin definitions
 #define RST   LMIC_UNUSED_PIN   // connected to ESP32 RST/EN (old board)
-//#define RST   GPIO_NUM_12     // (old board v1.5)
+//#define RST   GPIO_NUM_12     // (boards labeled v1.5)
-//#define RST   GPIO_NUM_19     //(new board)
 #define DIO0  GPIO_NUM_26 // ESP32 GPIO26 <-> HPD13A IO0
 #define DIO1  GPIO_NUM_33 // ESP32 GPIO33 <-> HPDIO1 <-> HPD13A IO1
 #define DIO2  GPIO_NUM_32 // ESP32 GPIO32 <-> HPDIO2 <-> HPD13A IO2
@@ -34,3 +64,4 @@
 #define OLED_RST U8X8_PIN_NONE // connected to CPU RST/EN
 #define OLED_SDA GPIO_NUM_21 // ESP32 GPIO21 -- SD1306 D1+D2
 #define OLED_SCL GPIO_NUM_22 // ESP32 GPIO22 -- SD1306 D0
+*/