diff --git a/README.md b/README.md index 39aebf9d7..b9d95d485 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Meshtastic Firmware -![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/meshtastic-device/total) -[![CI](https://img.shields.io/github/workflow/status/meshtastic/Meshtastic-device/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/repo/actions/workflows/main_matrix.yml) -[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-device)](https://cla-assistant.io/meshtastic/Meshtastic-device) +![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total) +[![CI](https://img.shields.io/github/workflow/status/meshtastic/firmware/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/repo/actions/workflows/main_matrix.yml) +[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/firmware)](https://cla-assistant.io/meshtastic/firmware) [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/) [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss) @@ -10,10 +10,9 @@ This repository contains the device firmware for the Meshtastic project. - **[Building Instructions](https://meshtastic.org/docs/developers/Firmware/build)** **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)** ## Stats -![Alt](https://repobeats.axiom.co/api/embed/99a2cf5622bb4807f9e8c3b86589f1133cce58a2.svg 'Repobeats analytics image') +![Alt](https://repobeats.axiom.co/api/embed/99a2cf5622bb4807f9e8c3b86589f1133cce58a2.svg "Repobeats analytics image") diff --git a/bin/promote-release.sh b/bin/promote-release.sh index b9380b02b..f96d2a568 100755 --- a/bin/promote-release.sh +++ b/bin/promote-release.sh @@ -9,9 +9,6 @@ VERSION=`bin/buildinfo.py long` # Must have a V prefix to trigger github git tag "v${VERSION}" -# Commented out per https://github.com/meshtastic/Meshtastic-device/issues/947 -#git push root "v${VERSION}" # push the tag - git push origin "v${VERSION}" # push the tag echo "Tag ${VERSION} pushed to github, github actions should now be building the draft release. If it seems good, click to publish it" diff --git a/bin/regen-protos.sh b/bin/regen-protos.sh index 9c16591e3..2734c213b 100755 --- a/bin/regen-protos.sh +++ b/bin/regen-protos.sh @@ -3,7 +3,7 @@ set -e echo "This script requires https://jpa.kapsi.fi/nanopb/download/ version 0.4.6 to be located in the" -echo "meshtastic-device root directory if the following step fails, you should download the correct" +echo "firmware root directory if the following step fails, you should download the correct" echo "prebuilt binaries for your computer into nanopb-0.4.6" # the nanopb tool seems to require that the .options file be in the current directory! diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp index c16f52592..dd3992a14 100644 --- a/src/PowerFSM.cpp +++ b/src/PowerFSM.cpp @@ -337,7 +337,7 @@ void PowerFSM_setup() #ifdef ARCH_ESP32 // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally) - // See: https://github.com/meshtastic/Meshtastic-device/issues/1071 + // See: https://github.com/meshtastic/firmware/issues/1071 if (isRouter || config.power.is_power_saving) { powerFSM.add_timed_transition(&stateNB, &stateLS, getConfiguredOrDefaultMs(config.power.min_wake_secs, default_min_wake_secs), NULL, "Min wake timeout"); powerFSM.add_timed_transition(&stateDARK, &stateLS, getConfiguredOrDefaultMs(config.power.wait_bluetooth_secs, default_wait_bluetooth_secs), NULL, "Bluetooth timeout"); diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp index 0af92a5c9..9ae211e6e 100644 --- a/src/mesh/Channels.cpp +++ b/src/mesh/Channels.cpp @@ -267,7 +267,7 @@ their nodes * * This function will also need to be implemented in GUI apps that talk to the radio. * -* https://github.com/meshtastic/Meshtastic-device/issues/269 +* https://github.com/meshtastic/firmware/issues/269 */ const char *Channels::getPrimaryName() { diff --git a/src/mesh/Channels.h b/src/mesh/Channels.h index 5c5af0ec2..ebf08d32c 100644 --- a/src/mesh/Channels.h +++ b/src/mesh/Channels.h @@ -74,7 +74,7 @@ class Channels * * This function will also need to be implemented in GUI apps that talk to the radio. * - * https://github.com/meshtastic/Meshtastic-device/issues/269 + * https://github.com/meshtastic/firmware/issues/269 */ const char *getPrimaryName(); diff --git a/src/mesh/generated/portnums.pb.h b/src/mesh/generated/portnums.pb.h index 3c68e9bb0..d272fe2b9 100644 --- a/src/mesh/generated/portnums.pb.h +++ b/src/mesh/generated/portnums.pb.h @@ -81,7 +81,7 @@ typedef enum _PortNum { PortNum_SIMULATOR_APP = 69, /* Private applications should use portnums >= 256. To simplify initial development and testing you can use "PRIVATE_APP" - in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/Meshtastic-device/blob/master/bin/regen-protos.sh)) */ + in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh)) */ PortNum_PRIVATE_APP = 256, /* ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder */ PortNum_ATAK_FORWARDER = 257, diff --git a/src/modules/ExternalNotificationModule.cpp b/src/modules/ExternalNotificationModule.cpp index 56a0db941..366ec6849 100644 --- a/src/modules/ExternalNotificationModule.cpp +++ b/src/modules/ExternalNotificationModule.cpp @@ -16,10 +16,10 @@ /* Documentation: - https://github.com/meshtastic/Meshtastic-device/blob/master/docs/software/modules/ExternalNotificationModule.md + https://github.com/meshtastic/firmware/blob/master/docs/software/modules/ExternalNotificationModule.md This module supports: - https://github.com/meshtastic/Meshtastic-device/issues/654 + https://github.com/meshtastic/firmware/issues/654 Quick reference: