mirror of
https://github.com/meshtastic/firmware.git
synced 2025-09-07 03:59:37 +00:00
Merge branch 'develop' into baseui_updates
This commit is contained in:
commit
d6dca63798
@ -87,6 +87,9 @@
|
|||||||
</screenshots>
|
</screenshots>
|
||||||
|
|
||||||
<releases>
|
<releases>
|
||||||
|
<release version="2.7.8" date="2025-08-30">
|
||||||
|
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.8</url>
|
||||||
|
</release>
|
||||||
<release version="2.7.7" date="2025-08-28">
|
<release version="2.7.7" date="2025-08-28">
|
||||||
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.7</url>
|
<url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.7</url>
|
||||||
</release>
|
</release>
|
||||||
|
7
debian/changelog
vendored
7
debian/changelog
vendored
@ -1,4 +1,4 @@
|
|||||||
meshtasticd (2.7.7.0) UNRELEASED; urgency=medium
|
meshtasticd (2.7.8.0) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
[ Austin Lane ]
|
[ Austin Lane ]
|
||||||
* Initial packaging
|
* Initial packaging
|
||||||
@ -41,4 +41,7 @@ meshtasticd (2.7.7.0) UNRELEASED; urgency=medium
|
|||||||
* GitHub Actions Automatic version bump
|
* GitHub Actions Automatic version bump
|
||||||
* GitHub Actions Automatic version bump
|
* GitHub Actions Automatic version bump
|
||||||
|
|
||||||
-- Ubuntu <github-actions[bot]@users.noreply.github.com> Thu, 28 Aug 2025 10:33:25 +0000
|
[ ]
|
||||||
|
* GitHub Actions Automatic version bump
|
||||||
|
|
||||||
|
-- <github-actions[bot]@users.noreply.github.com> Sat, 30 Aug 2025 00:26:04 +0000
|
||||||
|
@ -4,15 +4,7 @@ extends = nrf52840_base
|
|||||||
board = meshtiny
|
board = meshtiny
|
||||||
board_level = extra
|
board_level = extra
|
||||||
build_flags = ${nrf52840_base.build_flags} -Ivariants/nrf52840/meshtiny -D MESHTINY
|
build_flags = ${nrf52840_base.build_flags} -Ivariants/nrf52840/meshtiny -D MESHTINY
|
||||||
-DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
|
-D USE_PIN_BUZZER
|
||||||
-DRADIOLIB_EXCLUDE_SX128X=1
|
|
||||||
-DRADIOLIB_EXCLUDE_SX127X=1
|
|
||||||
-DRADIOLIB_EXCLUDE_LR11X0=1
|
|
||||||
-D INPUTDRIVER_ENCODER_TYPE=2
|
|
||||||
-D INPUTDRIVER_ENCODER_UP=4
|
|
||||||
-D INPUTDRIVER_ENCODER_DOWN=26
|
|
||||||
-D INPUTDRIVER_ENCODER_BTN=28
|
|
||||||
-D USE_PIN_BUZZER=PIN_BUZZER
|
|
||||||
-D MESHTASTIC_EXCLUDE_GPS=1
|
-D MESHTASTIC_EXCLUDE_GPS=1
|
||||||
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/meshtiny>
|
build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/meshtiny>
|
||||||
lib_deps =
|
lib_deps =
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
#define MESHTINY
|
#define MESHTINY
|
||||||
|
|
||||||
// #define RAK4630
|
|
||||||
|
|
||||||
/** Master clock frequency */
|
/** Master clock frequency */
|
||||||
#define VARIANT_MCK (64000000ul)
|
#define VARIANT_MCK (64000000ul)
|
||||||
|
|
||||||
@ -76,11 +74,10 @@ extern "C" {
|
|||||||
* Buttons
|
* Buttons
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define PIN_BUTTON1 9
|
#define CANCEL_BUTTON_PIN 9
|
||||||
#define BUTTON_NEED_PULLUP
|
#define BUTTON_NEED_PULLUP
|
||||||
#define PIN_BUTTON2 12
|
#define CANCEL_BUTTON_ACTIVE_LOW true
|
||||||
#define PIN_BUTTON3 24
|
#define CANCEL_BUTTON_ACTIVE_PULLUP false
|
||||||
#define PIN_BUTTON4 25
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Analog pins
|
* Analog pins
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
[VERSION]
|
[VERSION]
|
||||||
major = 2
|
major = 2
|
||||||
minor = 7
|
minor = 7
|
||||||
build = 7
|
build = 8
|
||||||
|
Loading…
Reference in New Issue
Block a user