kevin/meshtastic_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Fix L1 E-Ink InkHUD issues (#10804)

Browse Source 
* Fixes

* Update KeyboardApplet.cpp

* Potential fix for pull request finding

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

* Potential fix for pull request finding

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

* Potential fix for pull request finding

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

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
This commit is contained in:
HarukiToreda
2026-06-28 15:27:01 -05:00
committed by GitHub
co-authored by GitHub Ben Meadors Copilot Autofix powered by AI
parent 0baf8b1db6
commit 29b3cfaeca
7 changed files with 245 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
variants/nrf52840/seeed_wio_tracker_L1/variant.cpp
+16 -1
View File
@@ -22,6 +22,16 @@
#include "wiring_constants.h"
#include "wiring_digital.h"
namespace
{
void configureWakeOnPress(uint8_t digitalPin)
{
const uint32_t gpioPin = g_ADigitalPinMap[digitalPin];
nrf_gpio_cfg_input(gpioPin, NRF_GPIO_PIN_PULLUP);
nrf_gpio_cfg_sense_set(gpioPin, NRF_GPIO_PIN_SENSE_LOW);
}
} // namespace
/**
* @brief Digital pin to GPIO port/pin mapping table
*
@@ -93,4 +103,9 @@ void initVariant()
pinMode(PIN_LED2, OUTPUT);
digitalWrite(PIN_LED2, LOW);
pinMode(PIN_LED2, OUTPUT);
}
}
void variant_shutdown()
{
configureWakeOnPress(CANCEL_BUTTON_PIN);
}
variants/nrf52840/seeed_wio_tracker_L1/variant.h
+4 -2
View File
@@ -105,7 +105,9 @@ static const uint8_t SCL = PIN_WIRE_SCL;
// Power Management
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
#define BAT_READ 30 // D30 = P0.04 Reads battery voltage from divider on signal board.
#define BAT_READ 30 // D30 = P0.04 Battery divider enable (BAT_CTL) on signal board.
#define ADC_CTRL BAT_READ
#define ADC_CTRL_ENABLED HIGH
#define BATTERY_SENSE_RESOLUTION_BITS 12
#define ADC_MULTIPLIER 2.0
#define BATTERY_PIN PIN_VBAT // PIN_A7
@@ -178,4 +180,4 @@ extern "C" {
}
#endif
#endif // _SEEED_SOLAR_NODE_H_
#endif // _SEEED_TRACKER_L1_H_
variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini
+6 -9
View File
@@ -40,19 +40,16 @@ debug_tool = jlink
[env:seeed_wio_tracker_L1_eink-inkhud]
board = seeed_wio_tracker_L1
extends = nrf52840_base, inkhud
extends = env:seeed_wio_tracker_L1_eink, inkhud
build_flags =
${nrf52840_base.build_flags}
${env:seeed_wio_tracker_L1_eink.build_flags}
${inkhud.build_flags}
-I variants/nrf52840/seeed_wio_tracker_L1_eink
-D SEEED_WIO_TRACKER_L1
-D BUTTON_PIN=D13
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
build_src_filter =
${nrf52_base.build_src_filter}
build_src_filter =
${env:seeed_wio_tracker_L1_eink.build_src_filter}
${inkhud.build_src_filter}
+<../variants/nrf52840/seeed_wio_tracker_L1_eink>
lib_deps =
${inkhud.lib_deps} ; Before base libs_deps, so we use ZinggJM/GFXRoot instead of AdafruitGFX (saves space)
${nrf52840_base.lib_deps}
${env:seeed_wio_tracker_L1_eink.lib_deps}
board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
debug_tool = jlink
variants/nrf52840/seeed_wio_tracker_L1_eink/variant.cpp
+16 -1
View File
@@ -22,6 +22,16 @@
#include "wiring_constants.h"
#include "wiring_digital.h"
namespace
{
void configureWakeOnPress(uint8_t digitalPin)
{
const uint32_t gpioPin = g_ADigitalPinMap[digitalPin];
nrf_gpio_cfg_input(gpioPin, NRF_GPIO_PIN_PULLUP);
nrf_gpio_cfg_sense_set(gpioPin, NRF_GPIO_PIN_SENSE_LOW);
}
} // namespace
/**
* @brief Digital pin to GPIO port/pin mapping table
*
@@ -100,4 +110,9 @@ void initVariant()
digitalWrite(PIN_LED1, LOW);
pinMode(PIN_LED2, OUTPUT);
digitalWrite(PIN_LED2, LOW);
}
}
void variant_shutdown()
{
configureWakeOnPress(CANCEL_BUTTON_PIN);
}
variants/nrf52840/seeed_wio_tracker_L1_eink/variant.h
+4 -2
View File
@@ -113,7 +113,9 @@ static const uint8_t SCL = PIN_WIRE_SCL;
// Power Management
// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
#define BAT_READ 30 // D30 = P0.04 Reads battery voltage from divider on signal board.
#define BAT_READ 30 // D30 = P0.04 Battery divider enable (BAT_CTL) on signal board.
#define ADC_CTRL BAT_READ
#define ADC_CTRL_ENABLED HIGH
#define BATTERY_SENSE_RESOLUTION_BITS 12
#define ADC_MULTIPLIER 2.0
#define BATTERY_PIN PIN_VBAT // PIN_A7
@@ -189,4 +191,4 @@ extern "C" {
}
#endif
#endif // _SEEED_TRACKER_L1_H_
#endif // _SEEED_TRACKER_L1_H_