From 6353946fa25f3d80343f9b6b8026d5a126c5fcf3 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Fri, 12 Jul 2024 14:08:59 +0800 Subject: [PATCH] ---- change i2c timing to standard 100k -- --- Core/Src/i2c.c | 3 ++- Core/Src/main.c | 11 ++++++----- Core/Src/rtc.c | 3 +-- Core/Src/stm32_lpm_if.c | 12 ++++++------ Core/Src/sys_app.c | 2 +- LoRaWAN/App/lora_app.c | 6 +++--- TOF/App/X-WL55_WLE5_53L0X.c | 3 ++- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Core/Src/i2c.c b/Core/Src/i2c.c index 06748de..be0b907 100644 --- a/Core/Src/i2c.c +++ b/Core/Src/i2c.c @@ -45,7 +45,8 @@ void MX_I2C2_Init(void) /* USER CODE END I2C2_Init 1 */ hi2c2.Instance = I2C2; //hi2c2.Init.Timing = 0x20303E5D; //0x2010091A = 400K Fast Mode, 0x20303E5D, 100K Standard mode, 0x20000209 Fast Mode Plus, 1Mbps - hi2c2.Init.Timing = I2C2_FAST_400K; // 2024-07-09 UPDATE + //hi2c2.Init.Timing = I2C2_FAST_400K; // 2024-07-09 UPDATE + hi2c2.Init.Timing = I2C2_STANDARD_100K; // 2024-07-12 UPDATE hi2c2.Init.OwnAddress1 = 0; hi2c2.Init.AddressingMode = I2C_ADDRESSINGMODE_7BIT; hi2c2.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE; diff --git a/Core/Src/main.c b/Core/Src/main.c index c8b4555..c5ab59c 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -112,23 +112,24 @@ int main(void) MX_DMA_Init(); MX_I2C2_Init(); - MX_LoRaWAN_Init(); + //MX_LoRaWAN_Init(); //LED_ON; //HAL_Delay(200); //LED_OFF; -#if 0 +#if 1 if(__HAL_PWR_GET_FLAG(PWR_FLAG_SB) == RESET) { //LED_ON; MX_LoRaWAN_Init(); + //LED_OFF; } else { LED_ON; __HAL_PWR_CLEAR_FLAG(PWR_FLAG_SB); __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WU); - __HAL_PWR_CLEAR_FLAG(PWR_FLAG_WPVD); - HAL_Delay(1000); - SystemApp_Init(); + //__HAL_PWR_CLEAR_FLAG(PWR_FLAG_WPVD); + HAL_Delay(2000); + //SystemApp_Init(); LED_OFF; } #endif diff --git a/Core/Src/rtc.c b/Core/Src/rtc.c index 0b00762..1775cb5 100644 --- a/Core/Src/rtc.c +++ b/Core/Src/rtc.c @@ -69,7 +69,7 @@ void MX_RTC_Init(void) } -#if 0 +#if 1 /** Enable the Alarm A */ sAlarm.BinaryAutoClr = RTC_ALARMSUBSECONDBIN_AUTOCLR_NO; @@ -115,7 +115,6 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle) HAL_NVIC_SetPriority(TAMP_STAMP_LSECSS_SSRU_IRQn, 0, 0); HAL_NVIC_EnableIRQ(TAMP_STAMP_LSECSS_SSRU_IRQn); - HAL_NVIC_SetPriority(RTC_Alarm_IRQn, 0, 0); HAL_NVIC_EnableIRQ(RTC_Alarm_IRQn); diff --git a/Core/Src/stm32_lpm_if.c b/Core/Src/stm32_lpm_if.c index 0261d05..63efd4a 100644 --- a/Core/Src/stm32_lpm_if.c +++ b/Core/Src/stm32_lpm_if.c @@ -154,13 +154,13 @@ void PWR_ExitStopMode(void) ADC interface DAC interface USARTx, TIMx, i2Cx, SPIx SRAM ctrls, DMAx, DMAMux, AES, RNG, HSEM */ - - /* Resume not retained USARTx and DMA */ - vcom_Resume(); //DON'T REMOVE THIS, KKEP LOW POWER - /* USER CODE BEGIN ExitStopMode_2 */ MX_GPIO_Init(); - MX_DMA_Init(); - MX_I2C2_Init(); + //MX_DMA_Init(); + //MX_I2C2_Init(); + /* Resume not retained USARTx and DMA */ + //vcom_Resume(); //DON'T REMOVE THIS, KKEP LOW POWER + /* USER CODE BEGIN ExitStopMode_2 */ + /* USER CODE END ExitStopMode_2 */ } diff --git a/Core/Src/sys_app.c b/Core/Src/sys_app.c index 1d9ec5b..481d16b 100644 --- a/Core/Src/sys_app.c +++ b/Core/Src/sys_app.c @@ -118,7 +118,7 @@ void SystemApp_Init(void) /*Initialize the Sensors */ EnvSensors_Init(); - MX_TOF_Init(); + //MX_TOF_Init(); /*Init low power manager*/ UTIL_LPM_Init(); /* Disable Stand-by mode */ diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index facc081..1b1bc6d 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -815,7 +815,7 @@ static void SendTxData(void) STS_R0_SENSOR_Read(&r0_data); //HAL_Delay(1000); PME_OFF; - LED_OFF; + //LED_OFF; r0_data.battery_Pct = (uint8_t)(99*batteryLevel/254); #endif @@ -908,7 +908,7 @@ static void SendTxData(void) UTIL_TIMER_SetPeriod(&TxTimer, MAX(nextTxIn, TxPeriodicity)); UTIL_TIMER_Start(&TxTimer); } - + LED_OFF; /* USER CODE END SendTxData_1 */ } @@ -1020,7 +1020,7 @@ static void OnJoinRequest(LmHandlerJoinParams_t *joinParams) } //heart_beat_timer = 1; SendTxData(); - UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); + //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 6d8e542..e351610 100644 --- a/TOF/App/X-WL55_WLE5_53L0X.c +++ b/TOF/App/X-WL55_WLE5_53L0X.c @@ -148,7 +148,8 @@ 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 = I2C2_FAST_400K; //UPDATE 2024-07-09 + XNUCLEO53L1A1_hi2c.Init.Timing = I2C2_STANDARD_100K; // UPDATE 2024-07-12 //XNUCLEO53L1A1_hi2c.Init.Timing = 0x2010091A; //0x2010091A = 400K Fast Mode, 0x20303E5D, 100K Standard mode, 0x20000209 Fast Mode Plus, 1Mbps XNUCLEO53L1A1_hi2c.Init.OwnAddress1 = 0;