v0.0.3 modifed examples, update AT instruction

Author: Heltec-Aaron-Lee

boards.txt

@@ -33,8 +33,6 @@ CubeCell-Board.menu.LORAWAN_REGION.915US=REGION_US915
 CubeCell-Board.menu.LORAWAN_REGION.915US.build.band=REGION_US915
 CubeCell-Board.menu.LORAWAN_REGION.915_HYBRID=REGION_US915_HYBRID
 CubeCell-Board.menu.LORAWAN_REGION.915_HYBRID.build.band=REGION_US915_HYBRID
-CubeCell-Board.menu.LORAWAN_REGION.470ACN=REGION_CN470A
-CubeCell-Board.menu.LORAWAN_REGION.470ACN.build.band=REGION_CN470A
 
 CubeCell-Board.menu.LORAWAN_MODE.0=CLASS_A
 CubeCell-Board.menu.LORAWAN_MODE.0.build.LORAWAN_MODE=CLASS_A
@@ -79,8 +77,6 @@ CubeCell-Capsule.menu.LORAWAN_REGION.915US=REGION_US915
 CubeCell-Capsule.menu.LORAWAN_REGION.915US.build.band=REGION_US915
 CubeCell-Capsule.menu.LORAWAN_REGION.915_HYBRID=REGION_US915_HYBRID
 CubeCell-Capsule.menu.LORAWAN_REGION.915_HYBRID.build.band=REGION_US915_HYBRID
-CubeCell-Capsule.menu.LORAWAN_REGION.470ACN=REGION_CN470A
-CubeCell-Capsule.menu.LORAWAN_REGION.470ACN.build.band=REGION_CN470A
 
 CubeCell-Capsule.menu.LORAWAN_MODE.0=CLASS_A
 CubeCell-Capsule.menu.LORAWAN_MODE.0.build.LORAWAN_MODE=CLASS_A
@@ -126,8 +122,6 @@ CubeCell-Module.menu.LORAWAN_REGION.915US=REGION_US915
 CubeCell-Module.menu.LORAWAN_REGION.915US.build.band=REGION_US915
 CubeCell-Module.menu.LORAWAN_REGION.915_HYBRID=REGION_US915_HYBRID
 CubeCell-Module.menu.LORAWAN_REGION.915_HYBRID.build.band=REGION_US915_HYBRID
-CubeCell-Module.menu.LORAWAN_REGION.470ACN=REGION_CN470A
-CubeCell-Module.menu.LORAWAN_REGION.470ACN.build.band=REGION_CN470A
 
 CubeCell-Module.menu.LORAWAN_MODE.0=CLASS_A
 CubeCell-Module.menu.LORAWAN_MODE.0.build.LORAWAN_MODE=CLASS_A

cores/asr650x/cores/AT_Command.h

@@ -9,6 +9,27 @@
 extern "C" {
 #endif
 
+/*!
+ * Device states
+ */
+enum eDeviceState_LoraWan
+{
+    DEVICE_STATE_INIT,
+    DEVICE_STATE_JOIN,
+    DEVICE_STATE_SEND,
+    DEVICE_STATE_CYCLE,
+    DEVICE_STATE_SLEEP
+};
+
+enum eDeviceState_Lora
+{
+    LORA_INIT,
+    LORA_SEND,
+    LORA_RECEIVE,
+    MCU_SLEEP,
+};
+
+
 void Enable_AT(void);
 void getDevParam(void);
 void printDevParam(void);

cores/asr650x/kernel/protocols/lorawan/lora/mac/LoRaMac.h

@@ -2133,12 +2133,6 @@ typedef enum eLoRaMacRegion_t {
      * North american band on 915MHz with a maximum of 16 channels
      */
     LORAMAC_REGION_US915_HYBRID,
-
-    /*!
-     * Chinese band on 470MHz (Alibaba)
-     * Uplink = Downlink
-     */
-    LORAMAC_REGION_CN470A,
 } LoRaMacRegion_t;
 
 /*!

cores/asr650x/kernel/protocols/lorawan/lora/mac/region/Region.c

@@ -199,60 +199,6 @@ Maintainer: Miguel Luis ( Semtech ), Gregory Cristian ( Semtech ) and Daniel Jae
 #define CN470_RX_BEACON_SETUP( )
 #endif
 
-#ifdef REGION_CN470A
-#include "RegionCN470A.h"
-#define CN470A_CASE                                 case LORAMAC_REGION_CN470A:
-#define CN470A_IS_ACTIVE( )                         CN470A_CASE { return true; }
-#define CN470A_GET_PHY_PARAM( )                     CN470A_CASE { return RegionCN470AGetPhyParam( getPhy ); }
-#define CN470A_SET_BAND_TX_DONE( )                  CN470A_CASE { RegionCN470ASetBandTxDone( txDone ); break; }
-#define CN470A_INIT_DEFAULTS( )                     CN470A_CASE { RegionCN470AInitDefaults( type ); break; }
-#define CN470A_VERIFY( )                            CN470A_CASE { return RegionCN470AVerify( verify, phyAttribute ); }
-#define CN470A_APPLY_CF_LIST( )                     CN470A_CASE { RegionCN470AApplyCFList( applyCFList ); break; }
-#define CN470A_CHAN_MASK_SET( )                     CN470A_CASE { return RegionCN470AChanMaskSet( chanMaskSet ); }
-#define CN470A_ADR_NEXT( )                          CN470A_CASE { return RegionCN470AAdrNext( adrNext, drOut, txPowOut, adrAckCounter ); }
-#define CN470A_COMPUTE_RX_WINDOW_PARAMETERS( )      CN470A_CASE { RegionCN470AComputeRxWindowParameters( datarate, minRxSymbols, rxError, rxConfigParams ); break; }
-#define CN470A_RX_CONFIG( )                         CN470A_CASE { return RegionCN470ARxConfig( rxConfig, datarate ); }
-#define CN470A_TX_CONFIG( )                         CN470A_CASE { return RegionCN470ATxConfig( txConfig, txPower, txTimeOnAir ); }
-#define CN470A_LINK_ADR_REQ( )                      CN470A_CASE { return RegionCN470ALinkAdrReq( linkAdrReq, drOut, txPowOut, nbRepOut, nbBytesParsed ); }
-#define CN470A_RX_PARAM_SETUP_REQ( )                CN470A_CASE { return RegionCN470ARxParamSetupReq( rxParamSetupReq ); }
-#define CN470A_NEW_CHANNEL_REQ( )                   CN470A_CASE { return RegionCN470ANewChannelReq( newChannelReq ); }
-#define CN470A_TX_PARAM_SETUP_REQ( )                CN470A_CASE { return RegionCN470ATxParamSetupReq( txParamSetupReq ); }
-#define CN470A_DL_CHANNEL_REQ( )                    CN470A_CASE { return RegionCN470ADlChannelReq( dlChannelReq ); }
-#define CN470A_ALTERNATE_DR( )                      CN470A_CASE { return RegionCN470AAlternateDr( alternateDr ); }
-#define CN470A_CALC_BACKOFF( )                      CN470A_CASE { RegionCN470ACalcBackOff( calcBackOff ); break; }
-#define CN470A_NEXT_CHANNEL( )                      CN470A_CASE { return RegionCN470ANextChannel( nextChanParams, channel, time, aggregatedTimeOff ); }
-#define CN470A_CHANNEL_ADD( )                       CN470A_CASE { return RegionCN470AChannelAdd( channelAdd ); }
-#define CN470A_CHANNEL_REMOVE( )                    CN470A_CASE { return RegionCN470AChannelsRemove( channelRemove ); }
-#define CN470A_SET_CONTINUOUS_WAVE( )               CN470A_CASE { RegionCN470ASetContinuousWave( continuousWave ); break; }
-#define CN470A_APPLY_DR_OFFSET( )                   CN470A_CASE { return RegionCN470AApplyDrOffset( downlinkDwellTime, dr, drOffset ); }
-#define CN470A_RX_BEACON_SETUP( )                   CN470A_CASE { RegionCN470ARxBeaconSetup( rxBeaconSetup, outDr ); }
-#else
-#define CN470A_IS_ACTIVE( )
-#define CN470A_GET_PHY_PARAM( )
-#define CN470A_SET_BAND_TX_DONE( )
-#define CN470A_INIT_DEFAULTS( )
-#define CN470A_VERIFY( )
-#define CN470A_APPLY_CF_LIST( )
-#define CN470A_CHAN_MASK_SET( )
-#define CN470A_ADR_NEXT( )
-#define CN470A_COMPUTE_RX_WINDOW_PARAMETERS( )
-#define CN470A_RX_CONFIG( )
-#define CN470A_TX_CONFIG( )
-#define CN470A_LINK_ADR_REQ( )
-#define CN470A_RX_PARAM_SETUP_REQ( )
-#define CN470A_NEW_CHANNEL_REQ( )
-#define CN470A_TX_PARAM_SETUP_REQ( )
-#define CN470A_DL_CHANNEL_REQ( )
-#define CN470A_ALTERNATE_DR( )
-#define CN470A_CALC_BACKOFF( )
-#define CN470A_NEXT_CHANNEL( )
-#define CN470A_CHANNEL_ADD( )
-#define CN470A_CHANNEL_REMOVE( )
-#define CN470A_SET_CONTINUOUS_WAVE( )
-#define CN470A_APPLY_DR_OFFSET( )
-#define CN470A_RX_BEACON_SETUP( )
-#endif
-
 #ifdef REGION_CN779
 #include "RegionCN779.h"
 #define CN779_CASE                                 case LORAMAC_REGION_CN779:
@@ -638,7 +584,6 @@ bool RegionIsActive( LoRaMacRegion_t region )
         AS923_IS_ACTIVE( );
         AU915_IS_ACTIVE( );
         CN470_IS_ACTIVE( );
-        CN470A_IS_ACTIVE( );
         CN779_IS_ACTIVE( );
         EU433_IS_ACTIVE( );
         EU868_IS_ACTIVE( );
@@ -661,7 +606,6 @@ PhyParam_t RegionGetPhyParam( LoRaMacRegion_t region, GetPhyParams_t* getPhy )
         AS923_GET_PHY_PARAM( );
         AU915_GET_PHY_PARAM( );
         CN470_GET_PHY_PARAM( );
-        CN470A_GET_PHY_PARAM( );
         CN779_GET_PHY_PARAM( );
         EU433_GET_PHY_PARAM( );
         EU868_GET_PHY_PARAM( );
@@ -683,7 +627,6 @@ void RegionSetBandTxDone( LoRaMacRegion_t region, SetBandTxDoneParams_t* txDone
         AS923_SET_BAND_TX_DONE( );
         AU915_SET_BAND_TX_DONE( );
         CN470_SET_BAND_TX_DONE( );
-        CN470A_SET_BAND_TX_DONE( );
         CN779_SET_BAND_TX_DONE( );
         EU433_SET_BAND_TX_DONE( );
         EU868_SET_BAND_TX_DONE( );
@@ -705,7 +648,6 @@ void RegionInitDefaults( LoRaMacRegion_t region, InitType_t type )
         AS923_INIT_DEFAULTS( );
         AU915_INIT_DEFAULTS( );
         CN470_INIT_DEFAULTS( );
-        CN470A_INIT_DEFAULTS( );
         CN779_INIT_DEFAULTS( );
         EU433_INIT_DEFAULTS( );
         EU868_INIT_DEFAULTS( );
@@ -727,7 +669,6 @@ bool RegionVerify( LoRaMacRegion_t region, VerifyParams_t* verify, PhyAttribute_
         AS923_VERIFY( );
         AU915_VERIFY( );
         CN470_VERIFY( );
-        CN470A_VERIFY( );
         CN779_VERIFY( );
         EU433_VERIFY( );
         EU868_VERIFY( );
@@ -749,7 +690,6 @@ void RegionApplyCFList( LoRaMacRegion_t region, ApplyCFListParams_t* applyCFList
         AS923_APPLY_CF_LIST( );
         AU915_APPLY_CF_LIST( );
         CN470_APPLY_CF_LIST( );
-        CN470A_APPLY_CF_LIST( );
         CN779_APPLY_CF_LIST( );
         EU433_APPLY_CF_LIST( );
         EU868_APPLY_CF_LIST( );
@@ -771,7 +711,6 @@ bool RegionChanMaskSet( LoRaMacRegion_t region, ChanMaskSetParams_t* chanMaskSet
         AS923_CHAN_MASK_SET( );
         AU915_CHAN_MASK_SET( );
         CN470_CHAN_MASK_SET( );
-        CN470A_CHAN_MASK_SET( );
         CN779_CHAN_MASK_SET( );
         EU433_CHAN_MASK_SET( );
         EU868_CHAN_MASK_SET( );
@@ -793,7 +732,6 @@ bool RegionAdrNext( LoRaMacRegion_t region, AdrNextParams_t* adrNext, int8_t* dr
         AS923_ADR_NEXT( );
         AU915_ADR_NEXT( );
         CN470_ADR_NEXT( );
-        CN470A_ADR_NEXT( );
         CN779_ADR_NEXT( );
         EU433_ADR_NEXT( );
         EU868_ADR_NEXT( );
@@ -815,7 +753,6 @@ void RegionComputeRxWindowParameters( LoRaMacRegion_t region, int8_t datarate, u
         AS923_COMPUTE_RX_WINDOW_PARAMETERS( );
         AU915_COMPUTE_RX_WINDOW_PARAMETERS( );
         CN470_COMPUTE_RX_WINDOW_PARAMETERS( );
-        CN470A_COMPUTE_RX_WINDOW_PARAMETERS( );
         CN779_COMPUTE_RX_WINDOW_PARAMETERS( );
         EU433_COMPUTE_RX_WINDOW_PARAMETERS( );
         EU868_COMPUTE_RX_WINDOW_PARAMETERS( );
@@ -837,7 +774,6 @@ bool RegionRxConfig( LoRaMacRegion_t region, RxConfigParams_t* rxConfig, int8_t*
         AS923_RX_CONFIG( );
         AU915_RX_CONFIG( );
         CN470_RX_CONFIG( );
-        CN470A_RX_CONFIG( );
         CN779_RX_CONFIG( );
         EU433_RX_CONFIG( );
         EU868_RX_CONFIG( );
@@ -859,7 +795,6 @@ bool RegionTxConfig( LoRaMacRegion_t region, TxConfigParams_t* txConfig, int8_t*
         AS923_TX_CONFIG( );
         AU915_TX_CONFIG( );
         CN470_TX_CONFIG( );
-        CN470A_TX_CONFIG( );
         CN779_TX_CONFIG( );
         EU433_TX_CONFIG( );
         EU868_TX_CONFIG( );
@@ -881,7 +816,6 @@ uint8_t RegionLinkAdrReq( LoRaMacRegion_t region, LinkAdrReqParams_t* linkAdrReq
         AS923_LINK_ADR_REQ( );
         AU915_LINK_ADR_REQ( );
         CN470_LINK_ADR_REQ( );
-        CN470A_LINK_ADR_REQ( );
         CN779_LINK_ADR_REQ( );
         EU433_LINK_ADR_REQ( );
         EU868_LINK_ADR_REQ( );
@@ -903,7 +837,6 @@ uint8_t RegionRxParamSetupReq( LoRaMacRegion_t region, RxParamSetupReqParams_t*
         AS923_RX_PARAM_SETUP_REQ( );
         AU915_RX_PARAM_SETUP_REQ( );
         CN470_RX_PARAM_SETUP_REQ( );
-        CN470A_RX_PARAM_SETUP_REQ( );
         CN779_RX_PARAM_SETUP_REQ( );
         EU433_RX_PARAM_SETUP_REQ( );
         EU868_RX_PARAM_SETUP_REQ( );
@@ -925,7 +858,6 @@ uint8_t RegionNewChannelReq( LoRaMacRegion_t region, NewChannelReqParams_t* newC
         AS923_NEW_CHANNEL_REQ( );
         AU915_NEW_CHANNEL_REQ( );
         CN470_NEW_CHANNEL_REQ( );
-        CN470A_NEW_CHANNEL_REQ( );
         CN779_NEW_CHANNEL_REQ( );
         EU433_NEW_CHANNEL_REQ( );
         EU868_NEW_CHANNEL_REQ( );
@@ -947,7 +879,6 @@ int8_t RegionTxParamSetupReq( LoRaMacRegion_t region, TxParamSetupReqParams_t* t
         AS923_TX_PARAM_SETUP_REQ( );
         AU915_TX_PARAM_SETUP_REQ( );
         CN470_TX_PARAM_SETUP_REQ( );
-        CN470A_TX_PARAM_SETUP_REQ( );
         CN779_TX_PARAM_SETUP_REQ( );
         EU433_TX_PARAM_SETUP_REQ( );
         EU868_TX_PARAM_SETUP_REQ( );
@@ -969,7 +900,6 @@ uint8_t RegionDlChannelReq( LoRaMacRegion_t region, DlChannelReqParams_t* dlChan
         AS923_DL_CHANNEL_REQ( );
         AU915_DL_CHANNEL_REQ( );
         CN470_DL_CHANNEL_REQ( );
-        CN470A_DL_CHANNEL_REQ( );
         CN779_DL_CHANNEL_REQ( );
         EU433_DL_CHANNEL_REQ( );
         EU868_DL_CHANNEL_REQ( );
@@ -991,7 +921,6 @@ int8_t RegionAlternateDr( LoRaMacRegion_t region, AlternateDrParams_t* alternate
         AS923_ALTERNATE_DR( );
         AU915_ALTERNATE_DR( );
         CN470_ALTERNATE_DR( );
-        CN470A_ALTERNATE_DR( );
         CN779_ALTERNATE_DR( );
         EU433_ALTERNATE_DR( );
         EU868_ALTERNATE_DR( );
@@ -1013,7 +942,6 @@ void RegionCalcBackOff( LoRaMacRegion_t region, CalcBackOffParams_t* calcBackOff
         AS923_CALC_BACKOFF( );
         AU915_CALC_BACKOFF( );
         CN470_CALC_BACKOFF( );
-        CN470A_CALC_BACKOFF( );
         CN779_CALC_BACKOFF( );
         EU433_CALC_BACKOFF( );
         EU868_CALC_BACKOFF( );
@@ -1035,7 +963,6 @@ bool RegionNextChannel( LoRaMacRegion_t region, NextChanParams_t* nextChanParams
         AS923_NEXT_CHANNEL( );
         AU915_NEXT_CHANNEL( );
         CN470_NEXT_CHANNEL( );
-        CN470A_NEXT_CHANNEL( );
         CN779_NEXT_CHANNEL( );
         EU433_NEXT_CHANNEL( );
         EU868_NEXT_CHANNEL( );
@@ -1057,7 +984,6 @@ LoRaMacStatus_t RegionChannelAdd( LoRaMacRegion_t region, ChannelAddParams_t* ch
         AS923_CHANNEL_ADD( );
         AU915_CHANNEL_ADD( );
         CN470_CHANNEL_ADD( );
-        CN470A_CHANNEL_ADD( );
         CN779_CHANNEL_ADD( );
         EU433_CHANNEL_ADD( );
         EU868_CHANNEL_ADD( );
@@ -1079,7 +1005,6 @@ bool RegionChannelsRemove( LoRaMacRegion_t region, ChannelRemoveParams_t* channe
         AS923_CHANNEL_REMOVE( );
         AU915_CHANNEL_REMOVE( );
         CN470_CHANNEL_REMOVE( );
-        CN470A_CHANNEL_REMOVE( );
         CN779_CHANNEL_REMOVE( );
         EU433_CHANNEL_REMOVE( );
         EU868_CHANNEL_REMOVE( );
@@ -1101,7 +1026,6 @@ void RegionSetContinuousWave( LoRaMacRegion_t region, ContinuousWaveParams_t* co
         AS923_SET_CONTINUOUS_WAVE( );
         AU915_SET_CONTINUOUS_WAVE( );
         CN470_SET_CONTINUOUS_WAVE( );
-        CN470A_SET_CONTINUOUS_WAVE( );
         CN779_SET_CONTINUOUS_WAVE( );
         EU433_SET_CONTINUOUS_WAVE( );
         EU868_SET_CONTINUOUS_WAVE( );
@@ -1123,7 +1047,6 @@ uint8_t RegionApplyDrOffset( LoRaMacRegion_t region, uint8_t downlinkDwellTime,
         AS923_APPLY_DR_OFFSET( );
         AU915_APPLY_DR_OFFSET( );
         CN470_APPLY_DR_OFFSET( );
-        CN470A_APPLY_DR_OFFSET( );
         CN779_APPLY_DR_OFFSET( );
         EU433_APPLY_DR_OFFSET( );
         EU868_APPLY_DR_OFFSET( );
@@ -1145,7 +1068,6 @@ void RegionRxBeaconSetup( LoRaMacRegion_t region, RxBeaconSetup_t* rxBeaconSetup
         AS923_RX_BEACON_SETUP( );
         AU915_RX_BEACON_SETUP( );
         CN470_RX_BEACON_SETUP( );
-        CN470A_RX_BEACON_SETUP( );
         CN779_RX_BEACON_SETUP( );
         EU433_RX_BEACON_SETUP( );
         EU868_RX_BEACON_SETUP( );