mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-13 15:11:20 +10:00
* Add missed include * Another Warning fix * Add another HAS_SCREEN * Namespace fixes * Removed depricated destination types and re-factored destination screen * Get rid of Arduino Strings * Clean up after Copilot * SixthLine Def, Screen Rename Added Sixth Line Definition Screen Rename, and Automatic Line Adjustment * Consistency is hard - fixed "Sixth" * System Frame Updates Adjusted line construction to ensure we fit maximum content per screen. * Fix up notifications * Add a couple more ifdef HAS_SCREEN lines * Add screen->isOverlayBannerShowing() * Don't forget the invert! * Adjust Nodelist Center Divider Adjust Nodelist Center Divider * Fix variable casting * Fix entryText variable as empty before update to fix validation * Altitude is int32_t * Update PowerTelemetry to have correct data type * Fix cppcheck warnings (#6945) * Fix cppcheck warnings * Adjust logic in Power.cpp for power sensor --------- Co-authored-by: Jason P <applewiz@mac.com> * More pixel wrangling so things line up NodeList edition * Adjust NodeList alignments and plumb some background padding for a possible title fix * Better alignment for banner notifications * Move title into drawCommonHeader; initial screen tested * Fonts make spacing items difficult * Improved beeping booping and other buzzer based feedback (#6947) * Improved beeping booping and other buzzer based feedback * audible button feedback (#6949) * Refactor --------- Co-authored-by: todd-herbert <herbert.todd@gmail.com> * Sandpapered the corners of the notification popup * Finalize drawCommonHeader migration * Update Title of Favorite Node Screens * Update node metric alignment on LoRa screen * Update the border for popups to separate it from background * Update PaxcounterModule.cpp with CommonHeader * Update WiFi screen with CommonHeader and related data reflow * It was not, in fact, pointing up * Fix build on wismeshtap * T-deck trackball debounce * Fix uptime on Device Focused page to actually detail * Update Sys screen for new uptime, add label to Freq/Chan on LoRa * Don't display DOP any longer, make Uptime consistent * Revert Uptime change on Favorites, Apply to Device Focused * Label the satelite number to avoid confusion * Boop boop boop boop * Correct GPS positioning and string consistency across strings for GPS * Fix GPS text alignment * Enable canned messages by default * Don't wake screen on new nodes * Cannedmessage list emote support added * Fn+e emote picker for freetext screen * Actually block CannedInput actions while display is shown * Add selection menu to bannerOverlay * Off by one * Move to unified text layouts and spacing * Still my Fav without an "e" * Fully remove EVENT_NODEDB_UPDATED * Simply LoRa screen * Make some char pointers const to fix compilation on native targets * Update drawCompassNorth to include radius * Fix warning * button thread cleanup * Pull OneButton handling from PowerFSM and add MUI switch (#6973) * Trunk * Onebutton Menu Support * Add temporary clock icon * Add gps location to fsi * Banner message state reset * Cast to char to satisfy compiler * Better fast handling of input during banner * Fix warning * Derp * oops * Update ref * Wire buzzer_mode * remove legacy string->print() * Only init screen if one found * Unsigned Char * More buttonThread cleaning * screen.cpp button handling cleanup * The Great Event Rename of 2025 * Fix the Radiomaster * Missed trackball type change * Remove unused function * Make ButtonThread an InputBroker * Coffee hadn't kicked in yet * Add clock icon for Navigation Bar * Restore clock screen definition code - whoops * ExternalNotifications now observe inputBroker * Clock rework (#6992) * Move Clock bits into ClockRenderer space * Rework clock into all device navigation * T-Watch Actually Builds Different * Compile fix --------- Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz> * Add AM/PM to Digital Clock * Flip Seconds and AM/PM on Clock Display * Tik-tok pixels are hard * Fix builds on Thinknode M1 * Check for GPS and don't crash * Don't endif til the end * Rework the OneButton thread to be much less of a mess. (#6997) * Rework the OneButton thread to be much less of a mess. And break lots of targets temporarily * Update src/input/ButtonThread.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix GPS toggle * Send the shutdown event, not just the kbchar * Honor the back button in a notificaiton popup * Draw the right size box for popup with options * Try to un-break all the things --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * 24-hour Clock Should have leading zero, but not 12-hour * Fixup some compile errors * Add intRoutine to ButtonThread init, to get more responsive user button back * Add Timezone picker * Fix Warning * Optionally set the initial selection for the chooser popup * Make back buttons work in canned messages * Drop the wrapper classes * LonPressTime now configurable * Clock Frame can not longer be blank; just add valid time * Back buttons everywhere! * Key Verification confirm banner * Make Elecrow M* top button a back button * Add settings saves * EInk responsiveness fixes * Linux Input Fixes * Add Native Trackball/Joystick support, and move UserButton to Input * No Flight Stick Mode * Send input event * Add Channel Utilization to Device Focused frame * Don't shift screens when we draw new ones * Add showOverlayBanner arguments to no-op * trunk * Default Native trackball to NC * Fix crash in simulator mode * Add longLong button press * Get the args right * Adjust Bluetooth Pairing Screen to account for bottom navigation. * Trackball everywhere, and unPhone buttons * Remap visionmaster secondary button to TB_UP * Kill ScanAndSelect * trunk * No longer need the canned messages input filter * All Canned All the time * Fix stm32 compile error regarding inputBroker * Unify tft lineheights (#7033) * Create variable line heights based upon SCREEN_HEIGHT * Refactor textPositions into method -> getTextPositions * Update SharedUIDisplay.h --------- Co-authored-by: Jason P <applewiz@mac.com> * Adjust top distance for larger displays * Adjust icon sizes for larger displays * Fix Paxcounter compile errors after code updates * Pixel wrangling to make larger screens fit better * Alert frame has precedence over banner -- for now * Unify on ALT_BUTTON * Align AM/PM to the digit, not the segment on larger displays * Move some global pin defines into configuration.h * Scaffolding for BMM150 9-axis gyro * Alt button behavior * Don't add the blank GPS frames without HAS_GPS * EVENT_NODEDB_UPDATED has been retired * Clean out LOG_WARN messages from debugging * Add dismiss message function * Minor buttonThread cleanup * Add BMM150 support * Clean up last warning from dev * Simplify bmm150 init return logic * Add option to reply to messages * Add minimal menu upon selecting home screen * Move Messages to slot 2, rename GPS to Position, move variables nearer functional usage in Screen.cpp * Properly dismiss message * T-Deck Trackball press is not user button * Add select on favorite frame to launch cannedMessage DM * Minor wording change * Less capital letters * Fix empty message check, time isn't reliable * drop dead code * Make UIRenderer a static class instead of namespace * Fix the select on favorite * Check if message is empty early and then 'return' * Add kb_found, and show the option to launch freetype if appropriate * Ignore impossible touchscreen touches * Auto scroll fix * Move linebreak after "from" for banners to maximize screen usage. * Center "No messages to show" on Message frame * Start consolidating buzzer behavior * Fixed signed / unsigned warning * Cast second parameter of max() to make some targets happy * Cast kbchar to (char) to make arduino string happy * Shorten the notice of "No messages" * Add buzzer mode chooser * Add regionPicker to Lora icon * Reduce line spacing and reorder Position screen to resolve overlapping issues * Update message titles, fix GPS icons, add Back options * Leftover boops * Remove chirp * Make the region selection dismissable when a region is already set * Add read-aloud functionality on messages w/ esp8266sam * "Last Heard" is a better label * tweak the beep * 5 options * properly tear down freetext upon cancel * de-convelute canned messages just a bit * Correct height of Mail icon in navigation bar * Remove unused warning * Consolidate time methods into TimeFormatters * Oops * Change LoRa Picker Cancel to Back * Tweak selection characters on Banner * Message render not scrolling on 5th line * More fixes for message scrolling * Remove the safety next on text overflow - we found that root cause * Add pin definitions to fix compilation for obscure target * Don't let the touchscreen send unitialized kbchar values * Make virtual KB just a bit quicker * No more double tap, swipe! * Left is left, and Right is right * Update horizontal lightning bolt design * Move from solid to dashed separator for Message Frame * Single emote feature fix * Manually sort overlapping elements for now * Freetext and clearer choices * Fix ESP32 InkHUD builds on the unify-tft branch (#7087) * Remove BaseUI branding * Capitalization is fun * Revert Meshtastic Boot Frame Changes * Add ANZ_433 LoRa region to picker * Update settings.json --------- Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Jason P <applewiz@mac.com> Co-authored-by: todd-herbert <herbert.todd@gmail.com> Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
253 lines
7.7 KiB
C++
253 lines
7.7 KiB
C++
#include "ExpressLRSFiveWay.h"
|
|
#include "Throttle.h"
|
|
|
|
#ifdef INPUTBROKER_EXPRESSLRSFIVEWAY_TYPE
|
|
|
|
static const char inputSourceName[] = "ExpressLRS5Way"; // should match "allow input source" string
|
|
|
|
/**
|
|
* @brief Calculate fuzz: half the distance to the next nearest neighbor for each joystick position.
|
|
*
|
|
* The goal is to avoid collisions between joystick positions while still maintaining
|
|
* the widest tolerance for the analog value.
|
|
*
|
|
* Example: {10,50,800,1000,300,1600}
|
|
* If we just choose the minimum difference for this array the value would
|
|
* be 40/2 = 20.
|
|
*
|
|
* 20 does not leave enough room for the joystick position using 1600 which
|
|
* could have a +-100 offset.
|
|
*
|
|
* Example Fuzz values: {20, 20, 100, 100, 125, 300} now the fuzz for the 1600
|
|
* position is 300 instead of 20
|
|
*/
|
|
void ExpressLRSFiveWay::calcFuzzValues()
|
|
{
|
|
for (unsigned int i = 0; i < N_JOY_ADC_VALUES; i++) {
|
|
uint16_t closestDist = 0xffff;
|
|
uint16_t ival = joyAdcValues[i];
|
|
// Find the closest value to ival
|
|
for (unsigned int j = 0; j < N_JOY_ADC_VALUES; j++) {
|
|
// Don't compare value with itself
|
|
if (j == i)
|
|
continue;
|
|
uint16_t jval = joyAdcValues[j];
|
|
if (jval < ival && (ival - jval < closestDist))
|
|
closestDist = ival - jval;
|
|
if (jval > ival && (jval - ival < closestDist))
|
|
closestDist = jval - ival;
|
|
} // for j
|
|
|
|
// And the fuzz is half the distance to the closest value
|
|
fuzzValues[i] = closestDist / 2;
|
|
// DBG("joy%u=%u f=%u, ", i, ival, fuzzValues[i]);
|
|
} // for i
|
|
}
|
|
|
|
int ExpressLRSFiveWay::readKey()
|
|
{
|
|
uint16_t value = analogRead(PIN_JOYSTICK);
|
|
|
|
constexpr uint8_t IDX_TO_INPUT[N_JOY_ADC_VALUES - 1] = {UP, DOWN, LEFT, RIGHT, OK};
|
|
for (unsigned int i = 0; i < N_JOY_ADC_VALUES - 1; ++i) {
|
|
if (value < (joyAdcValues[i] + fuzzValues[i]) && value > (joyAdcValues[i] - fuzzValues[i]))
|
|
return IDX_TO_INPUT[i];
|
|
}
|
|
return NO_PRESS;
|
|
}
|
|
|
|
ExpressLRSFiveWay::ExpressLRSFiveWay() : concurrency::OSThread(inputSourceName)
|
|
{
|
|
// ExpressLRS: init values
|
|
isLongPressed = false;
|
|
keyInProcess = NO_PRESS;
|
|
keyDownStart = 0;
|
|
|
|
// Express LRS: calculate the threshold for interpreting ADC values as various buttons
|
|
calcFuzzValues();
|
|
|
|
// Meshtastic: register with canned messages
|
|
inputBroker->registerSource(this);
|
|
}
|
|
|
|
// ExpressLRS: interpret reading as key events
|
|
void ExpressLRSFiveWay::update(int *keyValue, bool *keyLongPressed)
|
|
{
|
|
*keyValue = NO_PRESS;
|
|
|
|
int newKey = readKey();
|
|
if (keyInProcess == NO_PRESS) {
|
|
// New key down
|
|
if (newKey != NO_PRESS) {
|
|
keyDownStart = millis();
|
|
// DBGLN("down=%u", newKey);
|
|
}
|
|
} else {
|
|
// if key released
|
|
if (newKey == NO_PRESS) {
|
|
// DBGLN("up=%u", keyInProcess);
|
|
if (!isLongPressed) {
|
|
if (!Throttle::isWithinTimespanMs(keyDownStart, KEY_DEBOUNCE_MS)) {
|
|
*keyValue = keyInProcess;
|
|
*keyLongPressed = false;
|
|
}
|
|
}
|
|
isLongPressed = false;
|
|
}
|
|
// else if the key has changed while down, reset state for next go-around
|
|
else if (newKey != keyInProcess) {
|
|
newKey = NO_PRESS;
|
|
}
|
|
// else still pressing, waiting for long if not already signaled
|
|
else if (!isLongPressed) {
|
|
if (!Throttle::isWithinTimespanMs(keyDownStart, KEY_LONG_PRESS_MS)) {
|
|
*keyValue = keyInProcess;
|
|
*keyLongPressed = true;
|
|
isLongPressed = true;
|
|
}
|
|
}
|
|
} // if keyInProcess != NO_PRESS
|
|
|
|
keyInProcess = newKey;
|
|
}
|
|
|
|
// Meshtastic: runs at regular intervals
|
|
int32_t ExpressLRSFiveWay::runOnce()
|
|
{
|
|
uint32_t now = millis();
|
|
|
|
// Dismiss any alert frames after 2 seconds
|
|
// Feedback for GPS toggle / adhoc ping
|
|
if (alerting && now > alertingSinceMs + 2000) {
|
|
alerting = false;
|
|
screen->endAlert();
|
|
}
|
|
|
|
// Get key events from ExpressLRS code
|
|
int keyValue;
|
|
bool longPressed;
|
|
update(&keyValue, &longPressed);
|
|
|
|
// Do something about this key press
|
|
determineAction((KeyType)keyValue, longPressed ? LONG : SHORT);
|
|
|
|
// If there has been recent key activity, poll the joystick slightly more frequently
|
|
if (now < keyDownStart + (20 * 1000UL)) // Within last 20 seconds
|
|
return 100;
|
|
|
|
// Otherwise, poll slightly less often
|
|
// Too many missed pressed if much slower than 250ms
|
|
return 250;
|
|
}
|
|
|
|
// Determine what action to take when a button press is detected
|
|
// Written verbose for easier remapping by user
|
|
void ExpressLRSFiveWay::determineAction(KeyType key, PressLength length)
|
|
{
|
|
switch (key) {
|
|
case LEFT:
|
|
if (inCannedMessageMenu()) // If in canned message menu
|
|
sendKey(INPUT_BROKER_CANCEL); // exit the menu (press imaginary cancel key)
|
|
else
|
|
sendKey(INPUT_BROKER_LEFT);
|
|
break;
|
|
|
|
case RIGHT:
|
|
if (inCannedMessageMenu()) // If in canned message menu:
|
|
sendKey(INPUT_BROKER_CANCEL); // exit the menu (press imaginary cancel key)
|
|
else
|
|
sendKey(INPUT_BROKER_RIGHT);
|
|
break;
|
|
|
|
case UP:
|
|
if (length == LONG)
|
|
toggleGPS();
|
|
else
|
|
sendKey(INPUT_BROKER_UP);
|
|
break;
|
|
|
|
case DOWN:
|
|
if (length == LONG)
|
|
sendAdhocPing();
|
|
else
|
|
sendKey(INPUT_BROKER_DOWN);
|
|
break;
|
|
|
|
case OK:
|
|
if (length == LONG)
|
|
shutdown();
|
|
else
|
|
click(); // Use instead of sendKey(OK). Works better when canned message module disabled
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
// Feed input to the canned messages module
|
|
void ExpressLRSFiveWay::sendKey(input_broker_event key)
|
|
{
|
|
InputEvent e;
|
|
e.source = inputSourceName;
|
|
e.inputEvent = key;
|
|
notifyObservers(&e);
|
|
}
|
|
|
|
// Enable or Disable a connected GPS
|
|
// Contained as one method for easier remapping of buttons by user
|
|
void ExpressLRSFiveWay::toggleGPS()
|
|
{
|
|
#if HAS_GPS && !MESHTASTIC_EXCLUDE_GPS
|
|
if (!config.device.disable_triple_click && (gps != nullptr)) {
|
|
gps->toggleGpsMode();
|
|
screen->startAlert("GPS Toggled");
|
|
alerting = true;
|
|
alertingSinceMs = millis();
|
|
}
|
|
#endif
|
|
}
|
|
|
|
// Send either node-info or position, on demand
|
|
// Contained as one method for easier remapping of buttons by user
|
|
void ExpressLRSFiveWay::sendAdhocPing()
|
|
{
|
|
service->refreshLocalMeshNode();
|
|
bool sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
|
|
|
|
// Show custom alert frame, with multi-line centering
|
|
screen->startAlert([sentPosition](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
|
|
uint16_t x_offset = display->width() / 2;
|
|
uint16_t y_offset = 26; // Same constant as the default startAlert frame
|
|
display->setTextAlignment(TEXT_ALIGN_CENTER);
|
|
display->setFont(FONT_MEDIUM);
|
|
display->drawString(x_offset + x, y_offset + y, "Sent ad-hoc");
|
|
display->drawString(x_offset + x, y_offset + FONT_HEIGHT_MEDIUM + y, sentPosition ? "position" : "nodeinfo");
|
|
});
|
|
|
|
alerting = true;
|
|
alertingSinceMs = millis();
|
|
}
|
|
|
|
// Shutdown the node (enter deep-sleep)
|
|
// Contained as one method for easier remapping of buttons by user
|
|
void ExpressLRSFiveWay::shutdown()
|
|
{
|
|
LOG_INFO("Shutdown from long press");
|
|
powerFSM.trigger(EVENT_PRESS);
|
|
screen->startAlert("Shutting down...");
|
|
// Don't set alerting = true. We don't want to auto-dismiss this alert.
|
|
|
|
playShutdownMelody(); // In case user adds a buzzer
|
|
|
|
shutdownAtMsec = millis() + 3000;
|
|
}
|
|
|
|
void ExpressLRSFiveWay::click()
|
|
{
|
|
sendKey(INPUT_BROKER_SELECT);
|
|
}
|
|
|
|
ExpressLRSFiveWay *expressLRSFiveWayInput = nullptr;
|
|
|
|
#endif |