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

revised LED, BUT, PROB GPIO settings

This commit is contained in:
Yunhorn 2023-07-27 15:35:29 +08:00
parent 0f3e43ceb5
commit 3559ebc2d4
6 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Core/Inc/main.h
View File

@ -60,25 +60,33 @@ void Error_Handler(void);
#define RTC_N_PREDIV_S 10 #define RTC_N_PREDIV_S 10
#define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1) #define RTC_PREDIV_S ((1<<RTC_N_PREDIV_S)-1)
#define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1) #define RTC_PREDIV_A ((1<<(15-RTC_N_PREDIV_S))-1)
#if defined(STM32WL55xx)
#define LED1_Pin GPIO_PIN_15 #define LED1_Pin GPIO_PIN_15
#define LED1_GPIO_Port GPIOB #define LED1_GPIO_Port GPIOB
#define LED2_Pin GPIO_PIN_9 #define LED2_Pin GPIO_PIN_9
#define LED2_GPIO_Port GPIOB #define LED2_GPIO_Port GPIOB
#define BUT1_Pin GPIO_PIN_0 #define LED3_Pin GPIO_PIN_11
#define BUT1_GPIO_Port GPIOA #define LED3_GPIO_Port GPIOB
#define BUT1_EXTI_IRQn EXTI0_IRQn
#define PROB2_Pin GPIO_PIN_13 #define PROB2_Pin GPIO_PIN_13
#define PROB2_GPIO_Port GPIOB #define PROB2_GPIO_Port GPIOB
#define PROB1_Pin GPIO_PIN_12 #define PROB1_Pin GPIO_PIN_12
#define PROB1_GPIO_Port GPIOB #define PROB1_GPIO_Port GPIOB
#define BUT3_Pin GPIO_PIN_6 #endif
#define BUT3_GPIO_Port GPIOC
#define BUT3_EXTI_IRQn EXTI9_5_IRQn #define BUT1_Pin GPIO_PIN_0
#define BUT1_GPIO_Port GPIOA
#define BUT1_EXTI_IRQn EXTI0_IRQn
#define BUT2_Pin GPIO_PIN_1 #define BUT2_Pin GPIO_PIN_1
#define BUT2_GPIO_Port GPIOA #define BUT2_GPIO_Port GPIOA
#define BUT2_EXTI_IRQn EXTI1_IRQn #define BUT2_EXTI_IRQn EXTI1_IRQn
#define LED3_Pin GPIO_PIN_11
#define LED3_GPIO_Port GPIOB #if defined(STM32WL55xx)
#define BUT3_Pin GPIO_PIN_6
#define BUT3_GPIO_Port GPIOC
#define BUT3_EXTI_IRQn EXTI9_5_IRQn
#endif
#define USARTx_RX_Pin GPIO_PIN_3 #define USARTx_RX_Pin GPIO_PIN_3
#define USARTx_RX_GPIO_Port GPIOA #define USARTx_RX_GPIO_Port GPIOA
#define USARTx_TX_Pin GPIO_PIN_2 #define USARTx_TX_Pin GPIO_PIN_2

14
Core/Src/main.c
View File

@ -34,6 +34,16 @@
#include "sys_app.h" #include "sys_app.h"
#include "acc_hal_integration.h" #include "acc_hal_integration.h"
#include "example_bring_up.h"
#include "example_multiple_service_usage.h"
#include "example_detector_distance.h"
#include "example_detector_presence.h"
#include "example_detector_distance_recorded.h"
#include "example_service_sparse.h"
#include "ref_app_wave_to_exit.h"
#include "ref_app_smart_presence.h"
#include "ref_app_tank_level.h"
#include "ref_app_parking.h"
#include "acc_detector_presence.h" #include "acc_detector_presence.h"
/* USER CODE END Includes */ /* USER CODE END Includes */
@ -105,6 +115,10 @@ int main(void)
STS_Lamp_Bar_Self_Test_Simple(); STS_Lamp_Bar_Self_Test_Simple();
/* USER CODE END 2 */ /* USER CODE END 2 */
/* Infinite loop */ /* Infinite loop */

4
Core/Src/sts_lamp_bar.c
View File

@ -25,7 +25,7 @@
#include "sys_app.h" #include "sys_app.h"
#include "stm32_systime.h" #include "stm32_systime.h"
#include "sts_lamp_bar.h" #include "sts_lamp_bar.h"
#include "ref_app_smart_presence.h"
#include "yunhorn_sts_sensors.h" #include "yunhorn_sts_sensors.h"
#define ONE_PULSE (36) #define ONE_PULSE (36)
@ -192,7 +192,7 @@ void STS_YunhornSTSEventP3_Process(void)
} }
/* /*
* STS SOAP Level detection Process, STS_CAP_Sensor_Detection Process * STS P4 Process, STS_CAP_Sensor_Detection Process
* STS_CAP_SWITCH(ON) Boost Voltage to 5V, then hold for 1000 ms * STS_CAP_SWITCH(ON) Boost Voltage to 5V, then hold for 1000 ms
* HAL_Delay(1000) (ms) * HAL_Delay(1000) (ms)
* STS_CAP_Read_Data() Read STS_CAP_DATA state * STS_CAP_Read_Data() Read STS_CAP_DATA state

7
Core/Src/yunhorn_sts_presence_sensor.c
View File

@ -38,14 +38,14 @@
//#include "yunhorn_sts_rss_sensor.h" //#include "yunhorn_sts_rss_sensor.h"
extern volatile uint8_t sts_ac_code[20]; extern volatile uint8_t sts_ac_code[20];
volatile uint32_t rfac_timer; volatile uint32_t rfac_timer;
extern volatile uint8_t sensor_data_ready;
volatile STS_OO_SensorStatusDataTypeDef sts_o6_sensorData; volatile STS_OO_SensorStatusDataTypeDef sts_o6_sensorData;
volatile STS_PRESENCE_SENSOR_Event_Status_t sts_o6_event_status; volatile STS_PRESENCE_SENSOR_Event_Status_t sts_o6_event_status;
volatile float sts_distance_rss_distance; volatile float sts_distance_rss_distance;
extern volatile float sts_presence_rss_distance, sts_presence_rss_score; extern volatile float sts_presence_rss_distance, sts_presence_rss_score;
volatile uint8_t sts_rss_config_updated_flag = 0; volatile uint8_t sts_rss_config_updated_flag = 0;
extern volatile uint8_t mems_int1_detected, link_wakeup, link_sleep; extern volatile uint8_t mems_int1_detected, link_wakeup, link_sleep;
volatile uint32_t event_start_time, event_stop_time; volatile uint32_t event_start_time, event_stop_time, sensor_data_ready;
extern volatile STS_OO_RSS_SensorTuneDataTypeDef sts_presence_rss_config; extern volatile STS_OO_RSS_SensorTuneDataTypeDef sts_presence_rss_config;
extern volatile sts_cfg_nvm_t sts_cfg_nvm; extern volatile sts_cfg_nvm_t sts_cfg_nvm;
extern volatile uint8_t sts_fall_detection_acc_threshold, sts_fall_detection_depth_threshold, sts_occupancy_overtime_threshold; extern volatile uint8_t sts_fall_detection_acc_threshold, sts_fall_detection_depth_threshold, sts_occupancy_overtime_threshold;
@ -120,6 +120,7 @@ void STS_YunhornSTSEventRFAC_Process(void)
if ((rfac_timer >= STS_BURN_IN_RFAC) && (rfac_timer < (STS_BURN_IN_RFAC +3))) if ((rfac_timer >= STS_BURN_IN_RFAC) && (rfac_timer < (STS_BURN_IN_RFAC +3)))
{ {
APP_LOG(TS_OFF, VLEVEL_H, "\r\n -------------------RFAC Process\r\n"); APP_LOG(TS_OFF, VLEVEL_H, "\r\n -------------------RFAC Process\r\n");
//STS_SENSOR_Upload_Message(LORAWAN_USER_APP_CTRL_REPLY_PORT, 4, "RFAC");
STS_SENSOR_Upload_Message(YUNHORN_STS_O6_USER_APP_CTRL_REPLY_PORT, 4, "RFAC"); STS_SENSOR_Upload_Message(YUNHORN_STS_O6_USER_APP_CTRL_REPLY_PORT, 4, "RFAC");
} }
if ((rfac_timer > (STS_BURN_IN_RFAC + 2))) if ((rfac_timer > (STS_BURN_IN_RFAC + 2)))
@ -182,7 +183,7 @@ void STS_FallDetection_LampBarProcess(void)
APP_LOG(TS_OFF, VLEVEL_L, "\r\n <<<<<<<<<<<<<< Fall Rise state=%d, send buf size = %d \r\n", APP_LOG(TS_OFF, VLEVEL_L, "\r\n <<<<<<<<<<<<<< Fall Rise state=%d, send buf size = %d \r\n",
sts_fall_rising_detected_result, i ) sts_fall_rising_detected_result, i )
STS_SENSOR_Upload_Message((LORAWAN_USER_APP_PORT+2), i, (char*)buf); STS_SENSOR_Upload_Message((LORAWAN_USER_APP_PORT+2), i, buf);
sts_fall_rising_detected_result = STS_PRESENCE_NONE; sts_fall_rising_detected_result = STS_PRESENCE_NONE;

4
STM32CubeIDE/.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="686453894977928153" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="333084530483839563" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="686453894977928153" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="333084530483839563" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

10
STM32CubeIDE/Release/Application/User/Core/subdir.mk
View File

File diff suppressed because one or more lines are too long