weed out old versioning macros (#1312)

weed out old versioning macros

bin/build-all.sh

@@ -34,8 +34,6 @@ function do_build() {
     # The shell vars the build tool expects to find
     export APP_VERSION=$VERSION
 
-    # Are we building a universal/regionless rom?
-    export HW_VERSION="1.0"
     basename=universal/firmware-$BOARD-$VERSION
 
     pio run --environment $BOARD # -v

bin/build-esp32.sh

@@ -22,8 +22,6 @@ rm -f .pio/build/$1/firmware.*
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
-# Are we building a universal/regionless rom?
-export HW_VERSION="1.0"
 basename=firmware-$1-$VERSION
 
 pio run --environment $1 # -v

bin/build-nrf52.sh

@@ -22,7 +22,6 @@ rm -f .pio/build/$1/firmware.*
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
-export HW_VERSION="1.0"
 basename=firmware-$1-$VERSION
 
 pio run --environment $1 # -v

platformio.ini

@@ -34,8 +34,6 @@ extra_scripts = bin/platformio-custom.py
 build_flags = -Wno-missing-field-initializers
   -Wno-format 
   -Isrc -Isrc/mesh -Isrc/gps -Isrc/buzz -Wl,-Map,.pio/build/output.map 
-  -DHW_VERSION_${sysenv.COUNTRY}
-  -DHW_VERSION=${sysenv.HW_VERSION}
   -DUSE_THREAD_NAMES
   -DTINYGPS_OPTION_NO_CUSTOM_FIELDS
 

src/configuration.h

@@ -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"

src/main.cpp

@@ -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

variants/lora_isp4520/variant.h

@@ -19,10 +19,6 @@
 #ifndef _VARIANT_LORA_ISP4520_
 #define _VARIANT_LORA_ISP4520_
 
-#define HW_VERSION_US 1
-#undef HW_VERSION
-#define HW_VERSION "1.0"
-
 #define USE_SEGGER
 /*----------------------------------------------------------------------------
  *        Headers