pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-21 17:20:01 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'meshtastic:master' into master

Browse Source
This commit is contained in:
Mictronics 2024-01-12 08:50:28 +01:00 committed by GitHub
commit 7043c3fdf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/graphics/TFTDisplay.cpp
View File

@ -425,7 +425,8 @@ TFTDisplay::TFTDisplay(uint8_t address, int sda, int scl, OLEDDISPLAY_GEOMETRY g
void TFTDisplay::display(bool fromBlank) void TFTDisplay::display(bool fromBlank)
{ {
if (fromBlank) if (fromBlank)
tft->clear(); tft->fillScreen(TFT_BLACK);
// tft->clear();
concurrency::LockGuard g(spiLock); concurrency::LockGuard g(spiLock);
uint16_t x, y; uint16_t x, y;

4
variants/m5stack_coreink/platformio.ini
View File

@ -16,11 +16,11 @@ build_flags =
-DM5STACK -DM5STACK
lib_deps = lib_deps =
${esp32_base.lib_deps} ${esp32_base.lib_deps}
zinggjm/GxEPD2@^1.4.9 zinggjm/GxEPD2@^1.5.3
lewisxhe/PCF8563_Library@^1.0.1 lewisxhe/PCF8563_Library@^1.0.1
lib_ignore = lib_ignore =
m5stack-coreink m5stack-coreink
monitor_filters = esp32_exception_decoder monitor_filters = esp32_exception_decoder
board_build.f_cpu = 240000000L board_build.f_cpu = 240000000L
upload_protocol = esptool upload_protocol = esptool
;upload_port = /dev/ttyACM0 upload_port = /dev/ttyACM0

27
variants/m5stack_coreink/variant.h
View File

@ -2,16 +2,12 @@
#define I2C_SDA 21 #define I2C_SDA 21
#define I2C_SCL 22 #define I2C_SCL 22
// 7-07-2023 Or enable Secondary I2C Bus
// #define I2C_SDA1 32
// #define I2C_SCL1 33
#define HAS_GPS 1 #define HAS_GPS 1
#undef GPS_RX_PIN #undef GPS_RX_PIN
#undef GPS_TX_PIN #undef GPS_TX_PIN
// Use Secondary I2C Bus as GPS Serial // Use Secondary I2C Bus as GPS Serial
#define GPS_RX_PIN 33 #define GPS_RX_PIN 33
#define GPS_TX_PIN 32 // #define GPS_TX_PIN 32 (now used by SX1262 BUSY as GPS works with just RX)
// Green LED // Green LED
#define LED_INVERTED 0 #define LED_INVERTED 0
@ -38,7 +34,9 @@
#undef LORA_MISO #undef LORA_MISO
#undef LORA_MOSI #undef LORA_MOSI
#undef LORA_CS #undef LORA_CS
#define USE_RF95 #define USE_RF95
// #define USE_SX1262
// #define USE_SX1280 // #define USE_SX1280
#ifdef USE_RF95 #ifdef USE_RF95
@ -52,6 +50,23 @@
#define LORA_DIO2 RADIOLIB_NC #define LORA_DIO2 RADIOLIB_NC
#endif #endif
// https://www.waveshare.com/core1262-868m.htm
#ifdef USE_SX1262
#define LORA_SCK 18
#define LORA_MISO 34
#define LORA_MOSI 23
#define LORA_CS 14
#define LORA_RESET 26
#define LORA_DIO1 25
#define LORA_DIO2 32 // 33 // (13 not working) //BUSY pin on SX1262
#define SX126X_CS LORA_CS
#define SX126X_DIO1 LORA_DIO1
#define SX126X_BUSY LORA_DIO2
#define SX126X_RESET LORA_RESET
#define SX126X_DIO2_AS_RF_SWITCH
#define SX126X_DIO3_TCXO_VOLTAGE 1.8
#endif
#ifdef USE_SX1280 #ifdef USE_SX1280
#define LORA_SCK 18 #define LORA_SCK 18
#define LORA_MISO 34 #define LORA_MISO 34
@ -90,5 +105,5 @@
// | // |
// GND // GND
// https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58 // https://github.com/m5stack/M5Core-Ink/blob/master/examples/Basics/FactoryTest/FactoryTest.ino#L58
#define ADC_MULTIPLIER 5 // Just a guess for now... more detailed getBatVoltage above #define ADC_MULTIPLIER 5
// https://embeddedexplorer.com/esp32-adc-esp-idf-tutorial/ // https://embeddedexplorer.com/esp32-adc-esp-idf-tutorial/

2
version.properties
View File

@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 2 major = 2
minor = 2 minor = 2
build = 18 build = 19