diff --git a/README.md b/README.md index ef68637a..0241a3c4 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ LoLin32lite + [LoraNode32-Lite shield](https://github.com/hallard/LoLin32-Lite-L - Pyom: WiPy - WeMos: LoLin32, LoLin32 Lite, WeMos D32, [Wemos32 Oled](https://www.instructables.com/id/ESP32-With-Integrated-OLED-WEMOSLolin-Getting-Star/) - Crowdsupply: [TinyPICO](https://www.crowdsupply.com/unexpected-maker/tinypico) +- TTGO: [T-Display](https://www.aliexpress.com/item/33048962331.html) - Generic ESP32 Depending on board hardware following features are supported: @@ -422,7 +423,7 @@ Send for example `8386` as Downlink on Port 2 to get battery status and time/dat useful to clear pending commands from LoRaWAN server quere, or to check RSSI on device -0x09 reset functions (send this command with confirmed ack only to avoid boot loops!) +0x09 reset functions (send this command UNconfirmed only to avoid boot loops!) 0 = restart device (coldstart) 1 = reset MAC counter to zero diff --git a/img/Paxcounter-ttgo-tdisplay.jpg b/img/Paxcounter-ttgo-tdisplay.jpg new file mode 100644 index 00000000..7e3cac4b Binary files /dev/null and b/img/Paxcounter-ttgo-tdisplay.jpg differ diff --git a/platformio_orig.ini b/platformio_orig.ini index 79e3bf75..def51a91 100644 --- a/platformio_orig.ini +++ b/platformio_orig.ini @@ -20,6 +20,7 @@ halfile = generic.h ;halfile = ttgofox.h ;halfile = ttgobeam.h ;halfile = ttgobeam10.h +;halfile = ttgotdisplay.h ;halfile = fipy.h ;halfile = lopy.h ;halfile = lopy4.h diff --git a/src/display.cpp b/src/display.cpp index 7e7e5b38..43be8d80 100644 --- a/src/display.cpp +++ b/src/display.cpp @@ -53,7 +53,7 @@ QRCode qrcode; #if (HAS_DISPLAY) == 1 OBDISP ssoled; #elif (HAS_DISPLAY) == 2 -TFT_eSPI tft = TFT_eSPI(); +TFT_eSPI tft = TFT_eSPI(MY_DISPLAY_WIDTH, MY_DISPLAY_HEIGHT); #else #error Unknown display type specified in hal file #endif diff --git a/src/hal/ttgotdisplay.h b/src/hal/ttgotdisplay.h new file mode 100644 index 00000000..0011d825 --- /dev/null +++ b/src/hal/ttgotdisplay.h @@ -0,0 +1,55 @@ +// clang-format off +// upload_speed 1500000 +// board esp32dev + +#ifndef _TTGOTDISPLAY_H +#define _TTGOTDISPLAY_H + +#include + +#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature + +#define HAS_DISPLAY 2 // TFT-LCD, support work in progess, not ready yet +#define MY_DISPLAY_FLIP 1 // use if display is rotated + +#define HAS_LED NOT_A_PIN // no on board LED (?) +#define HAS_BUTTON (35) // on board button A + +// power management settings +#define BAT_MEASURE_ADC ADC1_GPIO34_CHANNEL // battery probe GPIO pin -> ADC1_CHANNEL_6 +#define BAT_VOLTAGE_DIVIDER 2.605f // voltage divider + +// Display Settings +#define MY_DISPLAY_WIDTH 135 +#define MY_DISPLAY_HEIGHT 240 +#define MY_DISPLAY_INVERT 1 + +// setting for TTGO T-display +#define USER_SETUP_LOADED 1 +#define ST7789_DRIVER 1 + +#define CGRAM_OFFSET + +#define TFT_MOSI GPIO_NUM_19 // SPI +#define TFT_SCLK GPIO_NUM_18 // SPI +#define TFT_CS GPIO_NUM_5 // Chip select control +#define TFT_DC GPIO_NUM_16 // Data Command control +#define TFT_RST GPIO_NUM_23 // Reset +#define TFT_BL GPIO_NUM_4 // LED back-light + +#define TFT_RGB_ORDER TFT_BGR // Colour order Blue-Green-Red + +#define LOAD_GLCD // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH +#define LOAD_FONT2 // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters +#define LOAD_FONT4 // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters +#define LOAD_FONT6 // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm +#define LOAD_FONT7 // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:-. +#define LOAD_FONT8 // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-. +//#define LOAD_FONT8N // Font 8. Alternative to Font 8 above, slightly narrower, so 3 digits fit a 160 pixel TFT +#define LOAD_GFXFF // FreeFonts. Include access to the 48 Adafruit_GFX free fonts FF1 to FF48 and custom fonts +#define SMOOTH_FONT + +#define SPI_FREQUENCY 40000000 +#define SPI_READ_FREQUENCY 6000000 + +#endif diff --git a/src/macsniff.cpp b/src/macsniff.cpp index e25e6cf8..7a5063c7 100644 --- a/src/macsniff.cpp +++ b/src/macsniff.cpp @@ -212,4 +212,4 @@ uint16_t mac_analyze(MacBuffer_t MacBuffer) { // if an unknown Wifi or BLE mac was counted, return hash of this mac, else 0 return (added ? hashedmac : 0); -} \ No newline at end of file +}