From 17922965f401aa9dab8d7022d8f88bd81ccf0646 Mon Sep 17 00:00:00 2001 From: YunHorn Technology Date: Wed, 25 Sep 2024 22:03:29 +0800 Subject: [PATCH 1/3] -- STS R4 WIP --- Core/Inc/main.h | 16 ++++- Core/Src/gpio.c | 23 +++++++ Core/Src/stm32wlxx_it.c | 6 +- LoRaWAN/App/lora_app.c | 34 ++++++++-- STM32CubeIDE/.cproject | 5 +- .../Release/Application/User/Core/subdir.mk | 38 +++++------ .../Application/User/LoRaWAN/App/subdir.mk | 8 +-- .../Application/User/LoRaWAN/Target/subdir.mk | 2 +- .../Application/User/STS/Core/Src/subdir.mk | 6 +- .../Application/User/STS/TOF/App/subdir.mk | 6 +- .../Application/User/STS/TOF/Target/subdir.mk | 2 +- .../User/STS/TOF/vl53l0x/subdir.mk | 14 ++-- .../Drivers/BSP/STM32WLxx_Nucleo/subdir.mk | 4 +- STM32CubeIDE/Release/Drivers/CMSIS/subdir.mk | 2 +- .../Drivers/STM32WLxx_HAL_Driver/subdir.mk | 48 +++++++------- .../Release/Middlewares/LoRaWAN/subdir.mk | 66 +++++++++---------- .../Release/Middlewares/SubGHz_Phy/subdir.mk | 6 +- STM32CubeIDE/Release/Utilities/subdir.mk | 16 ++--- STS/Core/Inc/yunhorn_sts_prd_conf.h | 4 +- STS/Core/Inc/yunhorn_sts_sensors.h | 17 +++++ STS/Core/Src/yunhorn_sts_process.c | 53 ++++++++++----- STS/TOF/App/app_tof_vl53l0x_range.c | 4 +- 22 files changed, 240 insertions(+), 140 deletions(-) diff --git a/Core/Inc/main.h b/Core/Inc/main.h index c8bf8fc..8867416 100644 --- a/Core/Inc/main.h +++ b/Core/Inc/main.h @@ -111,8 +111,9 @@ void Error_Handler(void); #define PME_OFF HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET ) #define PME_TOGGLE HAL_GPIO_TogglePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin) +#if (defined(TOF_1)||defined(TOF_2)||defined(STS_R1)||defined(STS_R5)||defined(STS_R1D)) #define VL53L0 -#ifndef VL53L0 +#elif defined(STS_P2) #define VL53LX 1 #endif @@ -210,6 +211,19 @@ void Error_Handler(void); #define I2C2_FAST_PLUS_1M 0x00000000 #endif + +#if defined(STS_R4) +/* IF_SOAP_IN, MEMS_IF_3, PA10 */ +#define SOAP_STATUS_Pin GPIO_PIN_10 +#define SOAP_STATUS_GPIO_Port GPIOA + +/* IF_SENSOR_ON_OFF, MEMS_IF_1, PB3 */ +#define SOAP_SWITCH_Pin GPIO_PIN_5 // 2024-04-08 WAS GPIO_PIN_3 +#define SOAP_SWITCH_GPIO_Port GPIOB + +#define SOAP_DATA HAL_GPIO_ReadPin(SOAP_STATUS_GPIO_Port,SOAP_STATUS_Pin) +#endif + /* USER CODE END Private defines */ #ifdef __cplusplus diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c index 7f58d4d..499979c 100644 --- a/Core/Src/gpio.c +++ b/Core/Src/gpio.c @@ -113,6 +113,29 @@ void MX_GPIO_Init(void) HAL_NVIC_EnableIRQ(TOF_C_INT_EXTI_IRQn); #endif + +/* ============== SOAP LEVEL DETECTION ========================= */ + +#if defined(STS_R4) + + HAL_GPIO_WritePin(SOAP_SWITCH_GPIO_Port, SOAP_SWITCH_Pin, GPIO_PIN_RESET); + + /*Configure GPIO pins : PAPin PAPin */ + GPIO_InitStruct.Pin = SOAP_STATUS_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_INPUT; + GPIO_InitStruct.Pull = GPIO_NOPULL; + //GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + HAL_GPIO_Init(SOAP_STATUS_GPIO_Port, &GPIO_InitStruct); + + GPIO_InitStruct.Pin = SOAP_SWITCH_Pin; + GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; + GPIO_InitStruct.Pull = GPIO_PULLDOWN; + GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; + HAL_GPIO_Init(SOAP_SWITCH_GPIO_Port, &GPIO_InitStruct); + +#endif +/* ============== SOAP LEVEL DETECTION ========================= */ + /* EXTI interrupt init*/ HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0); HAL_NVIC_EnableIRQ(EXTI0_IRQn); diff --git a/Core/Src/stm32wlxx_it.c b/Core/Src/stm32wlxx_it.c index d10854e..372d3a1 100644 --- a/Core/Src/stm32wlxx_it.c +++ b/Core/Src/stm32wlxx_it.c @@ -60,10 +60,10 @@ extern SUBGHZ_HandleTypeDef hsubghz; extern DMA_HandleTypeDef hdma_usart2_tx; extern UART_HandleTypeDef huart2; /* USER CODE BEGIN EV */ -#if defined(VL53LX)||defined(VL53L0) +//#if defined(VL53LX)||defined(VL53L0) extern DMA_HandleTypeDef hdma_i2c2_rx; extern DMA_HandleTypeDef hdma_i2c2_tx; -#endif +//#endif /* USER CODE END EV */ /******************************************************************************/ @@ -250,7 +250,7 @@ void EXTI3_IRQHandler(void) /* USER CODE BEGIN EXTI3_IRQn 0 */ /* USER CODE END EXTI3_IRQn 0 */ -#ifdef STM32WLE5xx +#if defined(VL53LX)||defined(VL53L0) HAL_GPIO_EXTI_IRQHandler(TOF_INT_EXTI_PIN); #endif /* USER CODE BEGIN EXTI3_IRQn 1 */ diff --git a/LoRaWAN/App/lora_app.c b/LoRaWAN/App/lora_app.c index 51b1d45..45821b5 100644 --- a/LoRaWAN/App/lora_app.c +++ b/LoRaWAN/App/lora_app.c @@ -522,6 +522,9 @@ void LoRaWAN_Init(void) #ifdef STS_P2 UTIL_TIMER_Create(&YunhornSTSWakeUpScanTimer, STS_TOFScanPeriod_msec, UTIL_TIMER_PERIODIC, (void*)OnYunhornSTSWakeUpScanTimerEvent, NULL); UTIL_TIMER_Start(&YunhornSTSWakeUpScanTimer); +#endif +#ifdef STS_R4 + UTIL_SEQ_RegTask((1 << CFG_SEQ_Task_YunhornSTSEventP6), UTIL_SEQ_RFU, STS_YunhornSTSEventP6_Process); #endif //UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_PERIODIC, OnYunhornSTSHeartBeatTimerEvent, NULL); UTIL_TIMER_Create(&YunhornSTSHeartBeatTimer, 1000*STS_HeartBeatTimerPeriod_sec, UTIL_TIMER_ONESHOT, OnYunhornSTSHeartBeatTimerEvent, NULL); @@ -543,16 +546,19 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); } break; +#ifndef STS_R4 case BUT2_Pin: UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStopJoinEvent), CFG_SEQ_Prio_0); break; +#endif case BUT3_Pin: UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaStoreContextEvent), CFG_SEQ_Prio_0); break; +#if (defined(VL53L0)||defined(VL53LX)) case TOF_INT_EXTI_PIN: ToF_EventDetected = 1; break; - +#endif default: break; } @@ -738,6 +744,8 @@ static void SendTxData(void) sts_people_count_sensor_data_t sts_p2_sensor_data={0x0}; #elif defined(STS_R1)||defined(STS_R1D)||defined(STS_R2)||defined(STS_R5) sts_tof_range_data_t sts_rr_sensor_data={0x0,0x0,0x0}; +#elif defined(STS_R4) + sts_r_sensor_data_t sts_r4_sensor_data={0}; #endif if (LmHandlerIsBusy() == false) @@ -757,6 +765,11 @@ static void SendTxData(void) #endif /* CAYENNE_LPP */ EnvSensors_Read(&sensor_data); +#ifdef STS_R4 + //UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP6), CFG_SEQ_Prio_0); + //STS_YunhornSTSEventP6_Process(); + STS_R4_sensor_read(&sts_r4_sensor_data); +#endif #ifdef VL53LX STS_people_count_sensor_Read(&sts_p2_sensor_data); @@ -777,6 +790,11 @@ static void SendTxData(void) #endif //VL53L0 +#ifdef STS_R4 + AppData.Port = YUNHORN_STS_R4_LORA_APP_DATA_PORT; /* STS-R4 Data Port */ +#endif + + AppData.Buffer[i++] = AppLedStateOn; AppData.Buffer[i++] = (uint8_t) sts_mtmcode1; AppData.Buffer[i++] = (uint8_t) sts_mtmcode2; @@ -899,10 +917,15 @@ static void SendTxData(void) #endif // VL53L1X #endif //STS_P2 + +/* STS-R4 SOAP LEVEL SENSOR */ +#ifdef STS_R4 + AppData.Buffer[i++] = 2; + AppData.Buffer[i++] = (uint8_t)(sts_r4_sensor_data.measure_tech & 0xFF); + AppData.Buffer[i++] = (uint8_t)(sts_r4_sensor_data.on_off_event & 0xFF); +#endif //STS_R4 AppData.BufferSize = i; - - if ((JoinLedTimer.IsRunning) && (LmHandlerJoinStatus() == LORAMAC_HANDLER_SET)) { UTIL_TIMER_Stop(&JoinLedTimer); @@ -939,6 +962,7 @@ static void OnTxTimerEvent(void *context) /* USER CODE BEGIN OnTxTimerEvent_1 */ /* USER CODE END OnTxTimerEvent_1 */ + UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventP6), CFG_SEQ_Prio_0); UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0); /*Wait for next tx slot*/ @@ -1320,7 +1344,7 @@ static void OnYunhornSTSHeartBeatTimerEvent(void *context) // UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_YunhornSTSEventRFAC), CFG_SEQ_Prio_0); UTIL_TIMER_Stop(&YunhornSTSHeartBeatTimer); - uint8_t appHeartBeatDataPort, appHeartBeatBufferSize, appHeartBeatDataBuffer[32]; + uint8_t appHeartBeatDataPort=2, appHeartBeatBufferSize=2, appHeartBeatDataBuffer[32]={0x0}; if ((rfac_timer <(STS_BURN_IN_RFAC+3))&&(sts_cfg_nvm.ac[0]==0x0)&&(sts_cfg_nvm.ac[19]==0x0)) { @@ -1346,6 +1370,8 @@ static void OnYunhornSTSHeartBeatTimerEvent(void *context) appHeartBeatDataPort = YUNHORN_STS_R1D_LORA_APP_HTBT_PORT; #elif defined(STS_R5) appHeartBeatDataPort = YUNHORN_STS_R5_LORA_APP_HTBT_PORT; +#elif defined(STS_R4) + appHeartBeatDataPort = YUNHORN_STS_R4_LORA_APP_HTBT_PORT; #endif appHeartBeatBufferSize = 2; diff --git a/STM32CubeIDE/.cproject b/STM32CubeIDE/.cproject index f826144..27a9d57 100644 --- a/STM32CubeIDE/.cproject +++ b/STM32CubeIDE/.cproject @@ -133,10 +133,7 @@