From f363895057610122e40eef00a8557ec64e181423 Mon Sep 17 00:00:00 2001 From: Leroy Levin Date: Sun, 18 Oct 2020 17:56:18 -0500 Subject: [PATCH] Update longfi-us915.ino Remove hard coding the LoRaWan variables, some but not all vars be overridden via code, the IDE board options are passed as compile options. --- .../longfi-us915/longfi-us915.ino | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino b/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino index 90c78fa..8b366be 100644 --- a/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino +++ b/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino @@ -23,16 +23,7 @@ uint32_t devAddr = ( uint32_t )0x007e6ae1; /*LoraWan channelsmask, default channels 0-7*/ uint16_t userChannelsMask[6]={ 0xFF00,0x0000,0x0000,0x0000,0x0000,0x0000 }; -// The next 6 variables are set based on the setting -// within the Arduino IDE Tools menu directly under board -// selection if a CubeCell board is selected. -// comment out the following #define if you want to -// hard code them within this sketch. If you do please -// verify their validity below. - -#define ASSIGN_VIA_IDE - -#ifdef ASSIGN_VIA_IDE +/* NOTE: It is very important that these variables be defined correctly in the Arduino IDE Tools->Board options */ /*LoraWan region, select in arduino IDE tools*/ LoRaMacRegion_t loraWanRegion = ACTIVE_REGION; @@ -52,17 +43,6 @@ bool keepNet = LORAWAN_NET_RESERVE; /* Indicates if the node is sending confirmed or unconfirmed messages */ bool isTxConfirmed = LORAWAN_UPLINKMODE; -#else // ASSIGN_VIA_IDE -// hardcode defaults for US915, CLASS A, unconfirmed uplink, no ADR -LoRaMacRegion_t loraWanRegion = LORAMAC_REGION_US915; -DeviceClass_t loraWanClass = CLASS_A; -bool overTheAirActivation = true; // LORAWAN_NETMODE; -bool loraWanAdr = false; // ADR OFF -bool keepNet = false; -bool isTxConfirmed = false; // Unconfirmed uplink - -#endif // ASSIGN_VIA_IDE - /*the application data transmission duty cycle. value in [ms].*/ uint32_t appTxDutyCycle = 15000;