update v1.7.2

OTAA RX2DR is set to 0 by default now for EU868

Author: engineer-lin

.gitignore

@@ -1 +1 @@
-STM32CubeExpansion_LRWAN\Projects\Multi\Applications\LoRa\DRAGINO-LRWAN(AT)\MDK-ARM\STM32L072CZ-Nucleo\sx1276mb1las\
+STM32CubeExpansion_LRWAN/Projects/Multi/Applications/LoRa/DRAGINO-LRWAN(AT)/MDK-ARM/STM32L072CZ-Nucleo/sx1276mb1las/*

STM32CubeExpansion_LRWAN/Middlewares/Third_Party/Lora/Mac/region/RegionEU868.c

@@ -48,7 +48,6 @@
 // Definitions
 #define CHANNELS_MASK_SIZE              1
 
-extern uint8_t joinrx2_dr;
 extern LoRaMacParams_t LoRaMacParams;
 extern uint8_t payloadlens;
 extern bool DR_small;
@@ -296,14 +295,7 @@ PhyParam_t RegionEU868GetPhyParam( GetPhyParams_t* getPhy )
         }
         case PHY_DEF_RX2_DR:
         {
-					  if(joinrx2_dr==0)
-						{
-							phyParam.Value = EU868_RX_WND_2_DR;
-						}
-						else
-						{
-							phyParam.Value = joinrx2_dr;
-						}
+						phyParam.Value = EU868_RX_WND_2_DR;
             break;
         }
         case PHY_CHANNELS_MASK:

STM32CubeExpansion_LRWAN/Projects/Multi/Applications/LoRa/DRAGINO-LRWAN(AT)/inc/version.h

@@ -72,7 +72,7 @@ Maintainer: Miguel Luis, Gregory Cristian and Wael Guibene
 #define TEST_VERSION (uint32_t) 0x00000000  /*1 lsb is always 0 in releases   */
 #define LRWAN_VERSION  (uint32_t) 0x00001140  /*3 next hex is i_cube release*/
 #define VERSION   (uint32_t) ( LORA_MAC_VERSION | LRWAN_VERSION | TEST_VERSION )
-#define AT_VERSION_STRING	"v1.7"
+#define AT_VERSION_STRING	"v1.7.2"
 #define AT_LoRaWan_VERSION_STRING	"DR-LWS-005"
 
 /* Exported types ------------------------------------------------------------*/

STM32CubeExpansion_LRWAN/Projects/Multi/Applications/LoRa/DRAGINO-LRWAN(AT)/src/lora.c

@@ -83,7 +83,6 @@ uint16_t fire_version=0;
 uint16_t fire_frequcy=0;
 uint8_t mode;
 uint8_t inmode;
-uint8_t joinrx2_dr;
 bool rx2_flags=0;
 bool fdr_flags=0;
 
@@ -1170,8 +1169,7 @@ void Read_Config(void)
   if((rx2_flags==0)||(lora_config.otaa==LORA_DISABLE))
   {		
 	mib.Type = MIB_RX2_CHANNEL;
-	mib.Param.Rx2Channel.Datarate=r_config[3];
-	joinrx2_dr=r_config[3];				
+	mib.Param.Rx2Channel.Datarate=r_config[3];		
 	LoRaMacMibSetRequestConfirm( &mib );
   }
   else if(rx2_flags==1)
@@ -1287,6 +1285,7 @@ void new_firmware_update(void)
 		update_flags[0]=(fire_frequcy<<16)| fire_version;
 		EEPROM_program(EEPROM_USER_Firmware_FLAGS,update_flags,1);//store hardversion
 		FLASH_erase(0x8018F80);//page 799
+	  FLASH_program_on_addr(0x8018F80,0x12);			
 		FLASH_erase(FLASH_USER_START_ADDR_CONFIG);
 		NVIC_SystemReset();		
 	}