diff --git a/Core/Src/main.c b/Core/Src/main.c index 7909695..c8b4555 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -144,7 +144,7 @@ int main(void) /* USER CODE END WHILE */ MX_LoRaWAN_Process(); - LED_TOGGLE; + /* USER CODE BEGIN 3 */ } /* USER CODE END 3 */ diff --git a/Core/Src/stm32_lpm_if.c b/Core/Src/stm32_lpm_if.c index 5c89b7b..0261d05 100644 --- a/Core/Src/stm32_lpm_if.c +++ b/Core/Src/stm32_lpm_if.c @@ -102,6 +102,17 @@ void PWR_EnterStopMode(void) HAL_GPIO_DeInit(GPIOB,GPIO_PIN_All); HAL_GPIO_DeInit(GPIOC,GPIO_PIN_All); #endif +#if 0 + HAL_UART_DeInit(&huart2); + vcom_DeInit(); + + HAL_GPIO_WritePin(GPIOA, GPIO_PIN_All, GPIO_PIN_RESET); + + HAL_GPIO_DeInit(GPIOB,GPIO_PIN_All); // NO rejoin issue + HAL_GPIO_WritePin(GPIOB, GPIO_PIN_All, GPIO_PIN_RESET); //no rejoin issue + + HAL_GPIO_WritePin(GPIOC, GPIO_PIN_All, GPIO_PIN_RESET); //no rejoin issue +#endif #if 0 __HAL_RCC_GPIOA_CLK_ENABLE(); __HAL_RCC_GPIOB_CLK_ENABLE(); diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 716e18d..facc081 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -809,7 +809,7 @@ static void SendTxData(void) #if defined(YUNHORN_STS_R0_ENABLED)||defined(YUNHORN_STS_R5_ENABLED) PME_ON; LED_ON; - //HAL_Delay(1000); + //HAL_Delay(10); MX_TOF_Init(); MX_TOF_Process(); STS_R0_SENSOR_Read(&r0_data); @@ -1018,7 +1018,8 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams) APP_LOG(TS_OFF, VLEVEL_M, "###### U/L FRAME:JOIN | DR:%d | PWR:%d\r\n", joinParams->Datarate, joinParams->TxPower); } - heart_beat_timer = 1; + //heart_beat_timer = 1; + SendTxData(); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); //STS_SENSOR_Upload_Message(LORAWAN_USER_HTBT_PORT, 12,"Yunhorn88STS"); //STS_SENSOR_Upload_Message(LORAWAN_USER_HTBT_PORT, 12,"Yunhorn88STS"); diff --git a/TOF/App/X-WL55_WLE5_53L0X.c b/TOF/App/X-WL55_WLE5_53L0X.c index 95f447c..6d8e542 100644 --- a/TOF/App/X-WL55_WLE5_53L0X.c +++ b/TOF/App/X-WL55_WLE5_53L0X.c @@ -149,7 +149,7 @@ int XWL55_WLE5_53L0X_I2C2Configure() { XNUCLEO53L1A1_hi2c.Instance = I2C2; //XNUCLEO53L1A1_hi2c.Init.Timing = 0x00300F38; /* set 400KHz fast mode i2c*/ XNUCLEO53L1A1_hi2c.Init.Timing = I2C2_FAST_400K; //UPDATE 2024-07-09 - XNUCLEO53L1A1_hi2c.Init.Timing = 0x2010091A; //0x2010091A = 400K Fast Mode, 0x20303E5D, 100K Standard mode, 0x20000209 Fast Mode Plus, 1Mbps + //XNUCLEO53L1A1_hi2c.Init.Timing = 0x2010091A; //0x2010091A = 400K Fast Mode, 0x20303E5D, 100K Standard mode, 0x20000209 Fast Mode Plus, 1Mbps XNUCLEO53L1A1_hi2c.Init.OwnAddress1 = 0; XNUCLEO53L1A1_hi2c.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT;