Add new macros for upstream merge

meshtastic · May 6, 2022 · 32f0417 · 32f0417
1 parent 9519b48
commit 32f0417
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -29,6 +29,7 @@ default_envs = tbeam
 ;default_envs = nano-g1
 ;default_envs = meshtastic-diy-v1
 ;default_envs = meshtastic-diy-v1.1
+;default_envs = meshtastic-dr-dev
 
 ; board specific config can be moved to the respective 'variants' file.
 ; See https://docs.platformio.org/en/latest/projectconf/section_platformio.html#extra-configs

diff --git a/src/configuration.h b/src/configuration.h
@@ -169,6 +169,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_DIY_V1
 
+#elif defined(DR_DEV)
+// This string must exactly match the case used in release file names or the android updater won't work
+#define HW_VENDOR HardwareModel_DR_DEV
+
 #elif defined(RAK_11200)
 // This string must exactly match the case used in release file names or the android updater won't work
 #define HW_VENDOR HardwareModel_RAK11200
@@ -254,4 +258,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"
diff --git a/variants/diy/dr-dev/variant.h b/variants/diy/dr-dev/variant.h
@@ -5,7 +5,7 @@
 // GPS
 #undef GPS_RX_PIN
 #define GPS_RX_PIN NOT_A_PIN
-#define WANT_GPS 0
+#undef WANT_GPS
 
 #define BUTTON_PIN 2 // The middle button GPIO on the T-Beam
 #define BUTTON_NEED_PULLUP

diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
@@ -26,6 +26,6 @@ board_upload.maximum_size = 4194304
 board_upload.maximum_ram_size = 532480
 build_flags =
  ${esp32_base.build_flags}
- -D DIY_V1
+ -D DR_DEV
  -D EBYTE_E22
  -I variants/diy/dr-dev