pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-08 14:12:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fixes BUG #6243 Heltec Tracker (#6781)

Browse Source 
* fix wireless tracker screen issues

* fix SHTC3 BUG

* Remove the 32K crystal oscillator option for the Wireless Paper and Vision Master series.

* Correct spelling errors

* Update src/graphics/Screen.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
Richard Zhang 2025-05-14 19:29:05 +08:00 committed by GitHub
parent 0a8bd1e4be
commit d9ad2322e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/graphics/Screen.cpp
View File

@ -1612,6 +1612,9 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
#ifdef T_WATCH_S3 #ifdef T_WATCH_S3
PMU->enablePowerOutput(XPOWERS_ALDO2); PMU->enablePowerOutput(XPOWERS_ALDO2);
#endif #endif
#ifdef HELTEC_TRACKER_V1_X
uint8_t tft_vext_enabled=digitalRead(VEXT_ENABLE);
#endif
#if !ARCH_PORTDUINO #if !ARCH_PORTDUINO
dispdev->displayOn(); dispdev->displayOn();
#endif #endif
@ -1622,6 +1625,13 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
#endif #endif
dispdev->displayOn(); dispdev->displayOn();
#ifdef HELTEC_TRACKER_V1_X
// If the TFT VEXT power is not enabled, initialize the UI.
if(!tft_vext_enabled)
{
ui->init();
}
#endif
#ifdef USE_ST7789 #ifdef USE_ST7789
pinMode(VTFT_CTRL, OUTPUT); pinMode(VTFT_CTRL, OUTPUT);
digitalWrite(VTFT_CTRL, LOW); digitalWrite(VTFT_CTRL, LOW);

2
src/modules/Telemetry/Sensor/SHTC3Sensor.cpp
View File

@ -15,7 +15,7 @@ int32_t SHTC3Sensor::runOnce()
if (!hasSensor()) { if (!hasSensor()) {
return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS; return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
} }
status = shtc3.begin(); status = shtc3.begin(nodeTelemetrySensorsMap[sensorType].second);
return initI2CSensor(); return initI2CSensor();
} }

1
variants/heltec_vision_master_e213/variant.h
View File

@ -31,7 +31,6 @@
#define ADC_CHANNEL ADC1_GPIO7_CHANNEL #define ADC_CHANNEL ADC1_GPIO7_CHANNEL
#define ADC_MULTIPLIER 4.9 * 1.03 #define ADC_MULTIPLIER 4.9 * 1.03
#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5
#define HAS_32768HZ
// LoRa // LoRa
#define USE_SX1262 #define USE_SX1262

1
variants/heltec_vision_master_e290/variant.h
View File

@ -30,7 +30,6 @@
#define ADC_CHANNEL ADC1_GPIO7_CHANNEL #define ADC_CHANNEL ADC1_GPIO7_CHANNEL
#define ADC_MULTIPLIER 4.9 * 1.03 #define ADC_MULTIPLIER 4.9 * 1.03
#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5
#define HAS_32768HZ
// LoRa // LoRa
#define USE_SX1262 #define USE_SX1262

1
variants/heltec_vision_master_t190/variant.h
View File

@ -47,7 +47,6 @@
#define ADC_CHANNEL ADC1_GPIO6_CHANNEL #define ADC_CHANNEL ADC1_GPIO6_CHANNEL
#define ADC_MULTIPLIER 4.9 * 1.03 // Voltage divider is roughly 1:1 #define ADC_MULTIPLIER 4.9 * 1.03 // Voltage divider is roughly 1:1
#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // Voltage divider output is quite high #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // Voltage divider output is quite high
#define HAS_32768HZ
// LoRa // LoRa
#define USE_SX1262 #define USE_SX1262

1
variants/heltec_wireless_paper/variant.h
View File

@ -28,7 +28,6 @@
#define ADC_MULTIPLIER 2 // Voltage divider is roughly 1:1 #define ADC_MULTIPLIER 2 // Voltage divider is roughly 1:1
#define BAT_MEASURE_ADC_UNIT 2 // Use ADC2 #define BAT_MEASURE_ADC_UNIT 2 // Use ADC2
#define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high #define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
#define HAS_32768HZ
#define ADC_CTRL_ENABLED LOW #define ADC_CTRL_ENABLED LOW
#define NO_EXT_GPIO 1 #define NO_EXT_GPIO 1

1
variants/heltec_wireless_paper_v1/variant.h
View File

@ -29,7 +29,6 @@
#define ADC_MULTIPLIER 2 // Voltage divider is roughly 1:1 #define ADC_MULTIPLIER 2 // Voltage divider is roughly 1:1
#define BAT_MEASURE_ADC_UNIT 2 // Use ADC2 #define BAT_MEASURE_ADC_UNIT 2 // Use ADC2
#define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high #define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
#define HAS_32768HZ
#define ADC_CTRL_ENABLED LOW #define ADC_CTRL_ENABLED LOW
#define NO_EXT_GPIO 1 #define NO_EXT_GPIO 1