diff --git a/Heltec-CubeCell-Board/longfi-us915/README.md b/Heltec-CubeCell-Board/longfi-us915/README.md index ffdae66..6a55396 100644 --- a/Heltec-CubeCell-Board/longfi-us915/README.md +++ b/Heltec-CubeCell-Board/longfi-us915/README.md @@ -23,7 +23,7 @@ Arduino IDE: Arduino IDE: 1. Select File -> Examples -> LoRa -> LoRaWAN 2. Select Tools -> Port: "COM# or ttyACM#" -3. Enter DevEUI(msb), AppEUI(msb), and AppKey(msb) from Helium Console, at lines 34,35,36. +3. Enter DevEUI(msb), AppEUI(msb), and AppKey(msb) from Helium Console, at lines 14, 15, 16. ``` uint8_t DevEui[] = { FILL_ME_IN }; uint8_t AppEui[] = { FILL_ME_IN }; diff --git a/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino b/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino index 20899e4..661d6e4 100644 --- a/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino +++ b/Heltec-CubeCell-Board/longfi-us915/longfi-us915.ino @@ -1,63 +1,51 @@ -/* - * HelTec Automation(TM) LoRaWAN 1.0.2 OTAA example use OTAA, CLASS A - * - * Function summary: - * - * - use internal RTC(150KHz); - * - * - Include stop mode and deep sleep mode; - * - * - 15S data send cycle; - * - * - Informations output via serial(115200); - * - * - Only ESP32 + LoRa series boards can use this library, need a license - * to make the code run(check you license here: http://www.heltec.cn/search ); - * - * You can change some definition in "Commissioning.h" and "LoRaMac-definitions.h" - * - * HelTec AutoMation, Chengdu, China. - * 成都惠利特自动化科技有限公司 - * https://heltec.org - * support@heltec.cn - * - *this project also release in GitHub: - *https://github.com/HelTecAutomation/ESP32_LoRaWAN -*/ - -#include +#include "LoRaWan_APP.h" #include "Arduino.h" -/*license for Heltec ESP32 LoRaWan, quary your ChipID relevant license: http://resource.heltec.cn/search */ -uint32_t license[4] = {0xC1670CF8, 0x19C71AD5, 0x6CE47540, 0x8CF267EC}; +/* + * set LoraWan_RGB to Active,the RGB active in loraWan + * RGB red means sending; + * RGB purple means joined done; + * RGB blue means RxWindow1; + * RGB yellow means RxWindow2; + * RGB green means received done; + */ + /* OTAA para*/ -uint8_t DevEui[] = { FILL_ME_IN }; -uint8_t AppEui[] = { FILL_ME_IN }; -uint8_t AppKey[] = { FILL_ME_IN }; +uint8_t devEui[] = { FILL_ME_IN }; +uint8_t appEui[] = { FILL_ME_IN }; +uint8_t appKey[] = { FILL_ME_IN }; /* ABP para*/ -uint8_t NwkSKey[] = { 0x15, 0xb1, 0xd0, 0xef, 0xa4, 0x63, 0xdf, 0xbe, 0x3d, 0x11, 0x18, 0x1e, 0x1e, 0xc7, 0xda,0x85 }; -uint8_t AppSKey[] = { 0xd7, 0x2c, 0x78, 0x75, 0x8c, 0xdc, 0xca, 0xbf, 0x55, 0xee, 0x4a, 0x77, 0x8d, 0x16, 0xef,0x67 }; -uint32_t DevAddr = ( uint32_t )0x007e6ae1; +uint8_t nwkSKey[] = { 0x15, 0xb1, 0xd0, 0xef, 0xa4, 0x63, 0xdf, 0xbe, 0x3d, 0x11, 0x18, 0x1e, 0x1e, 0xc7, 0xda,0x85 }; +uint8_t appSKey[] = { 0xd7, 0x2c, 0x78, 0x75, 0x8c, 0xdc, 0xca, 0xbf, 0x55, 0xee, 0x4a, 0x77, 0x8d, 0x16, 0xef,0x67 }; +uint32_t devAddr = ( uint32_t )0x007e6ae1; + +/*LoraWan channelsmask, default channels 0-7*/ +uint16_t userChannelsMask[6]={ 0x0000,0x0000,0x0000,0x00FF,0x0000,0x0000 }; + +/*LoraWan region, select in arduino IDE tools*/ +LoRaMacRegion_t loraWanRegion = ACTIVE_REGION; /*LoraWan Class, Class A and Class C are supported*/ -DeviceClass_t loraWanClass = CLASS_A; +DeviceClass_t loraWanClass = LORAWAN_CLASS; /*the application data transmission duty cycle. value in [ms].*/ uint32_t appTxDutyCycle = 15000; /*OTAA or ABP*/ -bool overTheAirActivation = true; +bool overTheAirActivation = LORAWAN_NETMODE; /*ADR enable*/ -bool loraWanAdr = false; +bool loraWanAdr = LORAWAN_ADR; + +/* set LORAWAN_Net_Reserve ON, the node could save the network info to flash, when node reset not need to join again */ +bool keepNet = LORAWAN_NET_RESERVE; /* Indicates if the node is sending confirmed or unconfirmed messages */ -bool isTxConfirmed = false; +bool isTxConfirmed = LORAWAN_UPLINKMODE; /* Application port */ uint8_t appPort = 2; - /*! * Number of trials to transmit the frame, if the LoRaMAC layer did not * receive an acknowledgment. The MAC performs a datarate adaptation, @@ -78,85 +66,79 @@ uint8_t appPort = 2; * Note, that if NbTrials is set to 1 or 2, the MAC will not decrease * the datarate, in case the LoRaMAC layer did not receive an acknowledgment */ -uint8_t confirmedNbTrials = 8; - -/*LoraWan debug level, select in arduino IDE tools. -* None : print basic info. -* Freq : print Tx and Rx freq, DR info. -* Freq && DIO : print Tx and Rx freq, DR, DIO0 interrupt and DIO1 interrupt info. -* Freq && DIO && PW: print Tx and Rx freq, DR, DIO0 interrupt, DIO1 interrupt, MCU sleep and MCU wake info. -*/ -uint8_t debugLevel = LoRaWAN_DEBUG_LEVEL; - -/*LoraWan region, select in arduino IDE tools*/ -LoRaMacRegion_t loraWanRegion = ACTIVE_REGION; - +uint8_t confirmedNbTrials = 4; +/* Prepares the payload of the frame */ static void prepareTxFrame( uint8_t port ) { - appDataSize = 4;//AppDataSize max value is 64 + /*appData size is LORAWAN_APP_DATA_MAX_SIZE which is defined in "commissioning.h". + *appDataSize max value is LORAWAN_APP_DATA_MAX_SIZE. + *if enabled AT, don't modify LORAWAN_APP_DATA_MAX_SIZE, it may cause system hanging or failure. + *if disabled AT, LORAWAN_APP_DATA_MAX_SIZE can be modified, the max value is reference to lorawan region and SF. + *for example, if use REGION_CN470, + *the max value for different DR can be found in MaxPayloadOfDatarateCN470 refer to DataratesCN470 and BandwidthsCN470 in "RegionCN470.h". + */ + appDataSize = 4; appData[0] = 0x00; appData[1] = 0x01; appData[2] = 0x02; appData[3] = 0x03; } -// Add your initialization code here -void setup() -{ - if(mcuStarted==0) - { - LoRaWAN.displayMcuInit(); - } - Serial.begin(115200); - while (!Serial); - SPI.begin(SCK,MISO,MOSI,SS); - Mcu.init(SS,RST_LoRa,DIO0,DIO1,license); - deviceState = DEVICE_STATE_INIT; + +void setup() { + boardInitMcu(); + Serial.begin(115200); +#if(AT_SUPPORT) + enableAt(); +#endif + deviceState = DEVICE_STATE_INIT; + LoRaWAN.ifskipjoin(); } -// The loop function is called in an endless loop void loop() { - switch( deviceState ) - { - case DEVICE_STATE_INIT: - { - LoRaWAN.init(loraWanClass,loraWanRegion); - break; - } - case DEVICE_STATE_JOIN: - { - LoRaWAN.displayJoining(); - LoRaWAN.join(); - break; - } - case DEVICE_STATE_SEND: - { - LoRaWAN.displaySending(); - prepareTxFrame( appPort ); - LoRaWAN.send(loraWanClass); - deviceState = DEVICE_STATE_CYCLE; - break; - } - case DEVICE_STATE_CYCLE: - { - // Schedule next packet transmission - txDutyCycleTime = appTxDutyCycle + randr( -APP_TX_DUTYCYCLE_RND, APP_TX_DUTYCYCLE_RND ); - LoRaWAN.cycle(txDutyCycleTime); - deviceState = DEVICE_STATE_SLEEP; - break; - } - case DEVICE_STATE_SLEEP: - { - LoRaWAN.displayAck(); - LoRaWAN.sleep(loraWanClass,debugLevel); - break; - } - default: - { - deviceState = DEVICE_STATE_INIT; - break; - } - } + switch( deviceState ) + { + case DEVICE_STATE_INIT: + { +#if(AT_SUPPORT) + getDevParam(); +#endif + printDevParam(); + LoRaWAN.init(loraWanClass,loraWanRegion); + deviceState = DEVICE_STATE_JOIN; + break; + } + case DEVICE_STATE_JOIN: + { + LoRaWAN.join(); + break; + } + case DEVICE_STATE_SEND: + { + prepareTxFrame( appPort ); + LoRaWAN.send(); + deviceState = DEVICE_STATE_CYCLE; + break; + } + case DEVICE_STATE_CYCLE: + { + // Schedule next packet transmission + txDutyCycleTime = appTxDutyCycle + randr( 0, APP_TX_DUTYCYCLE_RND ); + LoRaWAN.cycle(txDutyCycleTime); + deviceState = DEVICE_STATE_SLEEP; + break; + } + case DEVICE_STATE_SLEEP: + { + LoRaWAN.sleep(); + break; + } + default: + { + deviceState = DEVICE_STATE_INIT; + break; + } + } } \ No newline at end of file