Diff: main.cpp

Revision:

4:db424a8eb3c6

Parent:

2:5e56875de51b

Child:

6:d2b02915dea1

--- a/main.cpp	Wed Sep 05 17:37:02 2018 -0700
+++ b/main.cpp	Fri Jun 12 11:44:32 2020 -0700
@@ -1,17 +1,19 @@
 #include "radio.h"
 
-#if defined(SX127x_H)
+#if defined(SX128x_H)
+    #define BW_KHZ              200
+    #define SPREADING_FACTOR    7
+    #define CF_HZ               2487000000
+    #define TX_DBM              6
+#else
+    #if defined(SX128x_H)
+        #define TX_DBM              (Radio::chipType == CHIP_TYPE_SX1262 ? 20 : 14)
+    #else
+        #define TX_DBM              20
+    #endif
     #define BW_KHZ              125
     #define SPREADING_FACTOR    7
     #define CF_HZ               915000000
-#elif defined(SX126x_H)
-    #define BW_KHZ              125
-    #define SPREADING_FACTOR    7
-    #define CF_HZ               915000000
-#elif defined(SX128x_H)
-    #define BW_KHZ              200
-    #define SPREADING_FACTOR    7
-    #define CF_HZ               2487000000
 #endif
 
 DigitalOut myled(LED1);
@@ -53,7 +55,6 @@
     
     Radio::Init(&rev);
 
-    Radio::radio.hw_reset();
     Radio::Standby();
     Radio::LoRaModemConfig(BW_KHZ, SPREADING_FACTOR, 1);
     Radio::SetChannel(CF_HZ);