sundp
/
STS_O5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

REVISED HALL1/HALL2 DIAGRAM

This commit is contained in:
Yunhorn 2024-04-13 18:02:29 +08:00
parent 082f06d718
commit ca61d74cc1
9 changed files with 22605 additions and 22595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Core/Inc/main.h
View File

@ -112,10 +112,9 @@ void MX_TOF_Init(void);
#ifdef STS_O5 // STS_O5 GPIO PORT PIN DEFINATION
/* --------------------------------------------------*/
/* | HALL-1 (PA-0) VCC-GPIO-PB3 | */
/* | | */
/* | HALL-2 (PA-10) VCC-GPIO-PB-4 | */
/* | | */
/* | HALL-2 (PA-10) VCC-GPIO-PB-4 | */
/* | | */
/* | HALL-1 (PA-0) VCC-GPIO-PB3 | */
/* | | */
/* |------------------------------------------------ */
#define HALL1_Pin GPIO_PIN_0

2
Core/Inc/yunhorn_sts_sensors.h
View File

@ -201,7 +201,7 @@ typedef struct
{
uint8_t lamp_bar_color; /*measured color ID, 0,1,2,3,4,5,6,7,8,9 */
uint8_t workmode; /*work mode, 0,1,2,3,4*/
uint8_t state_sensor1_on_off; /* reedswitch or hall element 0: open, 1: closed */
uint8_t state_sensor1_on_off; /* reedswitch or hall element 1: open, 0: closed */
uint8_t state_sensor2_on_off; /* pcr_sensor_on_off; 1: occupancy, 0: no occupancy */
uint8_t state_sensor3_on_off; /* urinal_sensor_on_off urinal sensor state */
uint8_t state_sensor4_on_off; /* reserved_sensor_on_off sensor state */

4
Core/Src/gpio.c
View File

@ -103,13 +103,13 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOA_CLK_ENABLE();
GPIO_InitStruct.Pin = HALL1_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(HALL1_GPIO_Port, &GPIO_InitStruct);
GPIO_InitStruct.Pin = HALL2_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
HAL_GPIO_Init(HALL2_GPIO_Port, &GPIO_InitStruct);
#else

25
Core/Src/yunhorn_sts_process.c
View File

@ -44,7 +44,7 @@ extern volatile uint8_t sensor_data_ready;
volatile uint8_t sts_reed_hall_result, last_sts_reed_hall_result,sts_reed_hall_changed_flag;
volatile uint32_t event_start_time, event_stop_time;
volatile uint8_t sts_soap_level_state;
extern volatile uint8_t hall1_pin,hall2_pin;
extern volatile uint8_t hall1_pin_read,hall2_pin_read;
extern volatile uint8_t sts_work_mode, sts_service_mask;
volatile uint8_t sts_reed_hall_ext_int = 0;
@ -517,10 +517,7 @@ void STS_SENSOR_Power_ON(uint8_t cnt)
case 0:
case 1:
case 2:
#if (defined(YUNHORN_STS_M7_ENABLED) || defined(YUNHORN_STS_R0_ENABLED))
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_SET);
#endif
PME_ON;
break;
default:
@ -534,10 +531,7 @@ void STS_SENSOR_Power_OFF(uint8_t cnt)
case 0:
case 1:
case 2:
#if (defined(YUNHORN_STS_M7_ENABLED) || defined(YUNHORN_STS_R0_ENABLED))
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET);
#endif
PME_OFF;
break;
default:
break;
@ -550,14 +544,7 @@ void STS_SENSOR_MEMS_Reset(uint8_t cnt)
case 0:
case 1:
case 2:
#if (defined(YUNHORN_STS_M7_ENABLED) || defined(YUNHORN_STS_R0_ENABLED))
HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin, GPIO_PIN_SET);
HAL_Delay(50);
HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin, GPIO_PIN_RESET);
#endif
HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin, GPIO_PIN_SET);
HAL_Delay(50);
HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin, GPIO_PIN_RESET);
HAL_GPIO_TogglePin(MEMS_RESET_GPIO_Port,MEMS_RESET_Pin);
break;
default:
break;
@ -583,8 +570,8 @@ void STS_O5_SENSOR_Read(STS_OO_SensorDataTypeDef *oo_data)
sts_reed_hall_result = (STS_Reed_Hall_State==0)?1:0;
oo_data->state_sensor1_on_off = hall1_pin;
oo_data->state_sensor2_on_off = hall2_pin;
oo_data->state_sensor1_on_off = hall1_pin_read;
oo_data->state_sensor2_on_off = hall2_pin_read;
sensor_data_ready = 1;
}

13
LoRaWAN/App/lora_app.c
View File

@ -51,7 +51,7 @@ volatile uint8_t sts_ac_code[YUNHORN_STS_AC_CODE_SIZE]={0x0};
extern hmac_result_t hmac_result;
volatile uint8_t sts_work_mode =0;
volatile uint8_t sensor_data_ready=0;
volatile uint8_t hall1_pin=0,hall2_pin=0;
volatile uint8_t hall1_pin_read=0,hall2_pin_read=0;
extern volatile uint8_t sts_soap_level_state;
extern volatile uint8_t ToF_EventDetected;
//extern volatile int sts_tof_distance_data[MAX_TOF_COUNT];
@ -635,10 +635,15 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
{
#ifdef STS_O5
case HALL1_Pin:
hall1_pin_read = HALL1_STATE;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
break;
case HALL2_Pin:
hall1_pin = HALL1_STATE;
hall2_pin = HALL2_STATE;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
hall2_pin_read = HALL2_STATE;
UTIL_SEQ_SetTask((1 << CFG_SEQ_Task_LoRaSendOnTxTimerOrButtonEvent), CFG_SEQ_Prio_0);
break;

66
STM32CubeIDE/Release/Application/User/LoRaWAN/App/lora_app.cyclo
View File

@ -1,35 +1,35 @@
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1045:13:OnBeaconStatusChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1087:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1128:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1139:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:936:13:OnTxTimerEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1094:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1006:13:OnJoinRequest 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1106:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1310:13:OnYunhornSTSHeartBeatPeriodicityChanged 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1276:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1164:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1221:13:StoreContext 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:802:13:SendTxData 9
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:975:13:OnTxData 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1460:13:OnYunhornSTSHeartBeatTimerEvent 5
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1203:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1150:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1261:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:966:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1243:13:OnNvmDataChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:952:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:959:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1080:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1050:13:OnBeaconStatusChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1092:13:OnClassChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1133:13:OnTxFrameCtrlChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1144:13:OnPingSlotPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:941:13:OnTxTimerEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1099:13:OnMacProcessNotify 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1011:13:OnJoinRequest 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1111:13:OnTxPeriodicityChanged 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1315:13:OnYunhornSTSHeartBeatPeriodicityChanged 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1281:13:OnRestoreContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1169:13:StopJoin 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1226:13:StoreContext 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:807:13:SendTxData 9
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:980:13:OnTxData 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1465:13:OnYunhornSTSHeartBeatTimerEvent 5
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1208:13:OnStopJoinTimerEvent 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1155:13:OnSystemReset 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1266:13:OnStoreContextRequest 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:971:13:OnJoinTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1248:13:OnNvmDataChange 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:957:13:OnTxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:964:13:OnRxTimerLedEvent 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1085:13:OnSysTimeUpdate 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:632:6:HAL_GPIO_EXTI_Callback 3
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1966:6:STS_SENSOR_Upload_Message 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1953:6:STS_SENSOR_Upload_Config_Invalid_Message 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2014:6:OnStoreSTSCFGContextRequest 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2062:6:OnRestoreSTSCFGContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2125:6:OnRestoreSTSCFGContextProcess 8
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2074:6:STS_REBOOT_CONFIG_Init 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1971:6:STS_SENSOR_Upload_Message 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1958:6:STS_SENSOR_Upload_Config_Invalid_Message 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2019:6:OnStoreSTSCFGContextRequest 4
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2067:6:OnRestoreSTSCFGContextRequest 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2130:6:OnRestoreSTSCFGContextProcess 8
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2079:6:STS_REBOOT_CONFIG_Init 6
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:483:6:LoRaWAN_Init 2
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2193:6:STS_SENSOR_Distance_Test_Process 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2210:6:STS_SENSOR_Function_Test_Process 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1476:6:USER_APP_AUTO_RESPONDER_Parse 45
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:699:13:OnRxData 15
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2198:6:STS_SENSOR_Distance_Test_Process 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:2215:6:STS_SENSOR_Function_Test_Process 1
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:1481:6:USER_APP_AUTO_RESPONDER_Parse 45
D:/ONEDRIVE/STM32WLV13/Projects/NUCLEO-WL55JC/Applications/LoRaWAN/STS_RR_R125/LoRaWAN/App/lora_app.c:704:13:OnRxData 15

BIN
STM32CubeIDE/Release/STS_RR_R125.bin
View File

Binary file not shown.

45075
STM32CubeIDE/Release/STS_RR_R125.list
View File

File diff suppressed because it is too large Load Diff

8
readme.txt
View File

@ -43,3 +43,11 @@ Pre-defines
******************************************************************************
CHANGELOG
2024-04-13 restart from 2uA point
/* --------------------------------------------------*/
/* | HALL-2 (PA-10) VCC-GPIO-PB-4 | */
/* | | */
/* | HALL-1 (PA-0) VCC-GPIO-PB3 | */
/* | | */
/* |------------------------------------------------ */