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

revise PME_ON PME_OFF

This commit is contained in:
Yunhorn 2024-04-15 10:48:32 +08:00
parent b55df885b9
commit 1df8c3bcf2
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/Inc/main.h
View File

@ -73,6 +73,15 @@ void Error_Handler(void);
#define PROB1_GPIO_Port GPIOB
//#endif
#define MEMS_POWER_Pin GPIO_PIN_4 // PMU_ENABLE
#define MEMS_POWER_GPIO_Port GPIOB // PMU_ENABLE
#define MEMS_RESET_Pin GPIO_PIN_4
#define MEMS_RESET_GPIO_Port GPIOB
#define PME_ON HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_SET )
#define PME_OFF HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET )
#ifdef STS_O7
#define HALL1_Pin GPIO_PIN_0 // DOOR CONTACT
@ -83,6 +92,9 @@ void Error_Handler(void);
#define HALL2_GPIO_Port GPIOA
#define HALL2_EXTI_IRQn EXTI1_IRQn
#define HALL1_STATE HAL_GPIO_ReadPin(HALL1_GPIO_Port, HALL1_Pin)
#define HALL2_STATE HAL_GPIO_ReadPin(HALL2_GPIO_Port, HALL2_Pin)
#else
#define BUT1_Pin GPIO_PIN_0

6
Core/Inc/yunhorn_sts_prd_conf.h
View File

@ -237,12 +237,6 @@
#define CFG_CMD_RSS_SIMPLE_SIZE (STS_O7_CFG_CMD_SHORT_LEN)
#define CFG_CMD_MODE_COLOR_LENGTH (STS_MODE_COLOR_CMD_LEN)
#define MEMS_POWER_Pin GPIO_PIN_4 // PMU_ENABLE
#define MEMS_POWER_GPIO_Port GPIOB // PMU_ENABLE
#define MEMS_RESET_Pin GPIO_PIN_4
#define MEMS_RESET_GPIO_Port GPIOB
#define PRESENCE_SENSOR_SPI_HANDLE hspi1
#define PRESENCE_SENSOR_TIM_HANDLE htim2
#define PRESENCE_SENSOR_I2C_HANDLE hi2c1

8
Core/Src/yunhorn_sts_presence_sensor.c
View File

@ -505,7 +505,7 @@ void STS_SENSOR_Power_ON(uint8_t cnt)
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_SET);
#endif
#ifdef YUNHORN_STS_O7_ENABLED
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_SET);
PME_ON;
#endif
break;
default:
@ -523,7 +523,7 @@ void STS_SENSOR_Power_OFF(uint8_t cnt)
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET);
#endif
#ifdef YUNHORN_STS_O7_ENABLED
HAL_GPIO_WritePin(MEMS_POWER_GPIO_Port, MEMS_POWER_Pin, GPIO_PIN_RESET);
PME_OFF;
#endif
break;
default:
@ -541,9 +541,7 @@ void STS_SENSOR_MEMS_Reset(uint8_t cnt)
HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin, GPIO_PIN_SET);
#endif
#ifdef YUNHORN_STS_O7_ENABLED
HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin, GPIO_PIN_RESET);
HAL_Delay(100);
HAL_GPIO_WritePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin, GPIO_PIN_SET);
HAL_GPIO_TogglePin(MEMS_RESET_GPIO_Port, MEMS_RESET_Pin);
#endif
break;
default:

BIN
STM32CubeIDE/Release/STS_O7.bin
View File

Binary file not shown.