Merge branch 'master' into fix-empty-position-packets

meshtastic · Jul 30, 2022 · 4ee0a05 · 4ee0a05
2 parents 688d6c1 + 13a287c
commit 4ee0a05
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/platformio-custom.py b/bin/platformio-custom.py
@@ -17,7 +17,7 @@
 
 prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
-print("Using meshtastic platformio-custom.py, firmare version " + verObj['long'])
+print("Using meshtastic platformio-custom.py, firmware version " + verObj['long'])
 # print("path is" + ','.join(sys.path))
 
 # General options that are passed to the C and C++ compilers

diff --git a/bin/readprops.py b/bin/readprops.py
@@ -32,6 +32,6 @@ def readProps(prefsLoc):
         # traceback.print_exc()
         verObj['long'] = verObj['short']
 
-    # print("firmare version " + verStr)
+    # print("firmware version " + verStr)
     return verObj
 # print("path is" + ','.join(sys.path))
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
@@ -1,4 +1,4 @@
-; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmare for 5005/19003, with or without OLED RAK 1921
+; The very slick RAK wireless RAK 4631 / 4630 board - Unified firmware for 5005/19003, with or without OLED RAK 1921
 [env:rak4631]
 extends = nrf52840_base
 board = wiscore_rak4631