mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-09-19 17:46:38 +00:00
JakubandClaude Sonnet 5
1981826a85
With UI_HAS_JOYSTICK, user_btn (Enter) was left with pulldownup=false and multiclick=true (the plain-PRG-button defaults), instead of matching the other wired joystick contacts. Two effects on a wired Enter button: - No internal pull-up on the Enter pin, unlike the direction/back contacts. - multiclick=true buffers a click for ~280ms waiting for a possible double/ triple click, but UITask.cpp's UI_HAS_JOYSTICK loop only ever checks user_btn for CLICK/LONG_PRESS — so a quick double-tap collapses into a DOUBLE_CLICK event that's silently dropped, making Enter feel laggy and unreliable. wio-tracker-l1 (factory joystick) already builds user_btn with pulldownup/multiclick matching its other contacts; apply the same pattern here, conditional on UI_HAS_JOYSTICK so the stock external-pull-up PRG button path (no joystick) is unchanged. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
67 lines
2.3 KiB
C++
67 lines
2.3 KiB
C++
#include <Arduino.h>
|
|
#include "target.h"
|
|
|
|
HeltecV4Board board;
|
|
|
|
#if defined(P_LORA_SCLK)
|
|
static SPIClass spi;
|
|
RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, spi);
|
|
#else
|
|
RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY);
|
|
#endif
|
|
|
|
WRAPPER_CLASS radio_driver(radio, board);
|
|
|
|
ESP32RTCClock fallback_clock;
|
|
AutoDiscoverRTCClock rtc_clock(fallback_clock);
|
|
|
|
#if ENV_INCLUDE_GPS
|
|
#include <helpers/sensors/MicroNMEALocationProvider.h>
|
|
MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
|
|
EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
|
|
#else
|
|
EnvironmentSensorManager sensors;
|
|
#endif
|
|
|
|
#ifdef DISPLAY_CLASS
|
|
DISPLAY_CLASS display(NULL);
|
|
#if UI_HAS_JOYSTICK
|
|
// Optional wired joystick — see the heltec_v4_companion_solo_dual env for the
|
|
// pin defines this needs. Unlike the Wio Tracker L1 (external pull-ups on
|
|
// board) these pass pulldownup = true, so each contact only has to short its
|
|
// pin to GND; the internal pull-up does the rest. user_btn (Enter) and the
|
|
// direction contacts all get multiclick = false — loop()'s UI_HAS_JOYSTICK
|
|
// branch never looks at DOUBLE_CLICK/TRIPLE_CLICK for Enter, so leaving
|
|
// multiclick on just adds a ~280ms wait-for-more-clicks delay and silently
|
|
// swallows a quick double-tap. Back gets multiclick = true because the UI's
|
|
// triple-click buzzer toggle lives on it.
|
|
MomentaryButton user_btn (PIN_USER_BTN, 1000, true, true, false);
|
|
MomentaryButton joystick_left (JOYSTICK_LEFT, 1000, true, true, false);
|
|
MomentaryButton joystick_right(JOYSTICK_RIGHT, 1000, true, true, false);
|
|
MomentaryButton back_btn (PIN_BACK_BTN, 1000, true, true, true);
|
|
#if UI_HAS_JOYSTICK_UPDOWN
|
|
MomentaryButton joystick_up (JOYSTICK_UP, 1000, true, true, false);
|
|
MomentaryButton joystick_down(JOYSTICK_DOWN, 1000, true, true, false);
|
|
#endif
|
|
#else
|
|
MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
|
|
#endif
|
|
#endif
|
|
|
|
bool radio_init() {
|
|
fallback_clock.begin();
|
|
rtc_clock.begin(Wire);
|
|
|
|
#if defined(P_LORA_SCLK)
|
|
return radio.std_init(&spi);
|
|
#else
|
|
return radio.std_init();
|
|
#endif
|
|
}
|
|
|
|
mesh::LocalIdentity radio_new_identity() {
|
|
RadioNoiseListener rng(radio);
|
|
return mesh::LocalIdentity(&rng); // create new random identity
|
|
}
|
|
|