mirror of
https://github.com/meshtastic/firmware.git
synced 2025-08-01 11:25:44 +00:00
4feaec651f
* 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>
143 lines
4.0 KiB
C
143 lines
4.0 KiB
C
#pragma once
|
|
|
|
#define ARCH_NRF52
|
|
|
|
//
|
|
// defaults for NRF52 architecture
|
|
//
|
|
#ifndef HAS_BLUETOOTH
|
|
#define HAS_BLUETOOTH 1
|
|
#endif
|
|
#ifndef HAS_SCREEN
|
|
#define HAS_SCREEN 1
|
|
#endif
|
|
#ifndef HAS_WIRE
|
|
#define HAS_WIRE 1
|
|
#endif
|
|
#ifndef HAS_GPS
|
|
#define HAS_GPS 1
|
|
#endif
|
|
#ifndef HAS_BUTTON
|
|
#define HAS_BUTTON 1
|
|
#endif
|
|
#ifndef HAS_TELEMETRY
|
|
#define HAS_TELEMETRY 1
|
|
#endif
|
|
#ifndef HAS_SENSOR
|
|
#define HAS_SENSOR 1
|
|
#endif
|
|
#ifndef HAS_RADIO
|
|
#define HAS_RADIO 1
|
|
#endif
|
|
#ifndef HAS_CPU_SHUTDOWN
|
|
#define HAS_CPU_SHUTDOWN 1
|
|
#endif
|
|
#ifndef HAS_CUSTOM_CRYPTO_ENGINE
|
|
#define HAS_CUSTOM_CRYPTO_ENGINE 1
|
|
#endif
|
|
|
|
//
|
|
// set HW_VENDOR
|
|
//
|
|
|
|
// This string must exactly match the case used in release file names or the android updater won't work
|
|
#ifdef ARDUINO_NRF52840_PCA10056
|
|
#define HW_VENDOR meshtastic_HardwareModel_NRF52840DK
|
|
#elif defined(ARDUINO_NRF52840_PPR)
|
|
#define HW_VENDOR meshtastic_HardwareModel_PPR
|
|
#elif defined(RAK2560)
|
|
#define HW_VENDOR meshtastic_HardwareModel_RAK2560
|
|
#elif defined(WISMESH_TAP)
|
|
#define HW_VENDOR meshtastic_HardwareModel_WISMESH_TAP
|
|
#elif defined(GAT562_MESH_TRIAL_TRACKER)
|
|
#define HW_VENDOR meshtastic_HardwareModel_GAT562_MESH_TRIAL_TRACKER
|
|
#elif defined(RAK4630)
|
|
#define HW_VENDOR meshtastic_HardwareModel_RAK4631
|
|
#elif defined(TTGO_T_ECHO)
|
|
#define HW_VENDOR meshtastic_HardwareModel_T_ECHO
|
|
#elif defined(ELECROW_ThinkNode_M1)
|
|
#define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M1
|
|
#elif defined(NANO_G2_ULTRA)
|
|
#define HW_VENDOR meshtastic_HardwareModel_NANO_G2_ULTRA
|
|
#elif defined(CANARYONE)
|
|
#define HW_VENDOR meshtastic_HardwareModel_CANARYONE
|
|
#elif defined(NORDIC_PCA10059)
|
|
#define HW_VENDOR meshtastic_HardwareModel_NRF52840_PCA10059
|
|
#elif defined(TWC_MESH_V4)
|
|
#define HW_VENDOR meshtastic_HardwareModel_TWC_MESH_V4
|
|
#elif defined(NRF52_PROMICRO_DIY)
|
|
#define HW_VENDOR meshtastic_HardwareModel_NRF52_PROMICRO_DIY
|
|
#elif defined(WIO_WM1110)
|
|
#define HW_VENDOR meshtastic_HardwareModel_WIO_WM1110
|
|
#elif defined(TRACKER_T1000_E)
|
|
#define HW_VENDOR meshtastic_HardwareModel_TRACKER_T1000_E
|
|
#elif defined(ME25LS01_4Y10TD)
|
|
#define HW_VENDOR meshtastic_HardwareModel_ME25LS01_4Y10TD
|
|
#elif defined(MS24SF1)
|
|
#define HW_VENDOR meshtastic_HardwareModel_MS24SF1
|
|
#elif defined(PRIVATE_HW) || defined(FEATHER_DIY)
|
|
#define HW_VENDOR meshtastic_HardwareModel_PRIVATE_HW
|
|
#elif defined(HELTEC_T114)
|
|
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_NODE_T114
|
|
#elif defined(MESHLINK)
|
|
#define HW_VENDOR meshtastic_HardwareModel_MESHLINK
|
|
#elif defined(SEEED_XIAO_NRF52840_KIT)
|
|
#define HW_VENDOR meshtastic_HardwareModel_XIAO_NRF52_KIT
|
|
#elif defined(SEEED_SOLAR_NODE)
|
|
#define HW_VENDOR meshtastic_HardwareModel_SEEED_SOLAR_NODE
|
|
#elif defined(HELTEC_MESH_POCKET)
|
|
#define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_POCKET
|
|
#elif defined(NOMADSTAR_METEOR_PRO)
|
|
#define HW_VENDOR meshtastic_HardwareModel_NOMADSTAR_METEOR_PRO
|
|
#elif defined(SEEED_WIO_TRACKER_L1)
|
|
#define HW_VENDOR meshtastic_HardwareModel_SEEED_WIO_TRACKER_L1
|
|
#else
|
|
#define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN
|
|
#endif
|
|
|
|
//
|
|
// Standard definitions for NRF52 targets
|
|
//
|
|
|
|
#ifdef ARDUINO_NRF52840_PCA10056
|
|
|
|
// This board uses 0 to be mean LED on
|
|
#undef LED_STATE_ON
|
|
#define LED_STATE_ON 0 // State when LED is lit
|
|
|
|
#endif
|
|
|
|
#ifdef _SEEED_XIAO_NRF52840_SENSE_H_
|
|
|
|
// This board uses 0 to be mean LED on
|
|
#undef LED_STATE_ON
|
|
#define LED_STATE_ON 0 // State when LED is lit
|
|
|
|
#endif
|
|
|
|
#define LED_PIN PIN_LED1 // LED1 on nrf52840-DK
|
|
|
|
#ifdef PIN_BUTTON1
|
|
#define BUTTON_PIN PIN_BUTTON1
|
|
#endif
|
|
|
|
#ifdef PIN_BUTTON_TOUCH
|
|
#define BUTTON_PIN_TOUCH PIN_BUTTON_TOUCH
|
|
#endif
|
|
|
|
// Always include the SEGGER code on NRF52 - because useful for debugging
|
|
#include "SEGGER_RTT.h"
|
|
|
|
// The channel we send stdout data to
|
|
#define SEGGER_STDOUT_CH 0
|
|
|
|
// Debug printing to segger console
|
|
#define SEGGER_MSG(...) SEGGER_RTT_printf(SEGGER_STDOUT_CH, __VA_ARGS__)
|
|
|
|
// If we are not on a NRF52840 (which has built in USB-ACM serial support) and we don't have serial pins hooked up, then we MUST
|
|
// use SEGGER for debug output
|
|
#if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
|
|
// No serial ports on this board - ONLY use segger in memory console
|
|
#define USE_SEGGER
|
|
#endif
|