rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-31 07:01:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

weed out old versioning macros (#1312)

Browse Source 
weed out old versioning macros
This commit is contained in:
Thomas Göttgens
2022-03-20 11:53:37 +01:00
committed by GitHub
parent 8adacba3a1
commit bbf044795a
7 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/configuration.h
View File

@@ -34,9 +34,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#error APP_VERSION must be set by the build environment
#endif
// If app version is not specified we assume we are not being invoked by the build script
// FIXME: This is still needed by the Bluetooth Stack and needs to be replaced by something better. Remnant of the old versioning system.
#ifndef HW_VERSION
#error HW_VERSION, and HW_VERSION_countryname must be set by the build environment
#define HW_VERSION "1.0"
#endif
// -----------------------------------------------------------------------------
@@ -242,4 +242,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "variant.h"
#include "RF95Configuration.h"
#include "DebugConfiguration.h"
#include "DebugConfiguration.h"

2
src/main.cpp
View File

@@ -207,7 +207,7 @@ void setup()
#endif
// Hello
DEBUG_MSG("Meshtastic hwvendor=%d, swver=%s, hwver=%s\n", HW_VENDOR, optstr(APP_VERSION), optstr(HW_VERSION));
DEBUG_MSG("Meshtastic hwvendor=%d, swver=%s\n", HW_VENDOR, optstr(APP_VERSION));
#ifndef NO_ESP32
// Don't init display if we don't have one or we are waking headless due to a timer event