From ac55307242da6846c2b8fe4b710fb90feaa30978 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 11 十二月 2024 17:15:39 +0800
Subject: [PATCH] PCA的INT脚加速度计清0判断成功,INT脚中断正常

---
 keil/include/main/main.c |   55 ++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 5559cc6..ceb56f5 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -61,8 +61,9 @@
 #include "HIDO_ATLite.h"
 #include "HIDO_Timer.h"
 #include "TCPClient.h"
+#include "PCA9555.h"
 
-//#define DEBUG_MODE
+#define DEBUG_MODE
 extern int simple_main(void);
 extern int temp_main(void);
 #define TEST_UART_POLL_MODE 0
@@ -98,6 +99,11 @@
 uint8_t recev_error_num,send_messgae_count,send_flag,control_state,power_low_flag;
 uint8_t flag_4g_usart_rx_state = 1;  //4G 串口RX当前是 RX状态,不是GPIO状态
 int input_5v_flag,air780e_flag1,air780e_flag2,air780e_flag3,air780e_flag4;
+extern uint8_t pca9555writedata_config[10];//暂存寄存器所有配置的数组
+extern uint8_t pca9555writedata_output[10];//暂存输出高低电平配置的数组
+extern uint8_t pca9555writedata_input[10];//暂存输入寄存器所有配置的数组
+extern uint8_t pca9555writedata_polarity[10];//暂存输入极性反转寄存器所有配置的数组
+uint8_t temp_pca9555writedata_input[10];//暂存上一次输入寄存器所有配置的数组
 typedef enum
 {		UN_BIND=0,
         LINK_SUCCESS,
@@ -208,6 +214,7 @@
 uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count,enbale_blink_flag;
 int need_open_gps_count;
 uint32_t keystarttime,keystarttime2;
+extern uint32_t get_in_num,get_out_num;
 void MotorPoll(void)
 {
     if(UWB_work_state==UN_BIND) {
@@ -321,6 +328,9 @@
         second_count = 0;
         MinuteTask();
     }
+		TagListUpdate_person_num_car();
+		in_table_log();
+		
 //		if(!power_low_flag)
 //		Gps_change();
 //		else{
@@ -362,15 +372,24 @@
 uint8_t tt=1;
 uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
 uint8_t uwb_enable_flag=0;
+void check_input_change(void)
+{
+	uint16_t gpio_state;
+	gpio_state=(uint16_t)pca9555writedata_input[0]<<8|pca9555writedata_input[1];
+	if(WAKE_UP_POSITION&gpio_state)
+	{
+		nomove_count=0;
+	}
+}
 static void sleep_timer_callback(void *dev, uint32_t time)
 {
-    IO_control_init();
+    //IO_control_init();
 		if(enbale_blink_flag)
 	{
 	green_charge_state=0;
 	charge_red_on();
 	}
-	 UWBPoll();
+	 
 	charge_state_change();//充电状态判断
 if(secondtask_count++%2==0)
     {
@@ -380,7 +399,7 @@
     }
 		if(enbale_blink_flag)
 	{
-		delay_us(5000);
+		//delay_us(5000);
 	green_charge_state=0;
 	charge_red_off();
 	}		
@@ -396,6 +415,11 @@
 static void move_handler(enum IO_PIN_T pin)
 {
     nomove_count=0;
+}
+static void pca_handler(enum IO_PIN_T pin)
+{
+	PCA9555_readdata(PCA9555_DEVICE_ADDR,pca9555writedata_input);//读输入寄存器的值
+	check_input_change();
 }
 uint8_t flag_4G_recdata;
 void _4gUsart_handler(enum IO_PIN_T pin)
@@ -527,7 +551,7 @@
     board_clock_run();
     boot_deinit();
     board_pins_config();
-    board_debug_console_open(TRACE_PORT_UART1);
+   board_debug_console_open(TRACE_PORT_UART1);
     // Reset reason
     reset_cause_get();
     reset_cause_clear();
@@ -570,17 +594,17 @@
 		
     IIC2_Init();
     Accelerometer_Init();
-    IO_control_init();
-    io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
-    gpio_pin_set_dir(SCL_PIN , GPIO_DIR_IN, 0);
-    io_pull_set(SCL_PIN , IO_PULL_UP, IO_PULL_UP_LEVEL4);
+		PCA9555_init();
+    //IO_control_init();
+//    io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
+//    gpio_pin_set_dir(SCL_PIN , GPIO_DIR_IN, 0);
+//    io_pull_set(SCL_PIN , IO_PULL_UP, IO_PULL_UP_LEVEL4);
     //gps_air780_power_change(0,1);//开启gps,4G 
 //加速度计初始化必须在IO_control_init之前因为复用SDA引脚
 		gpio_pin_clr(ADC_GND_ENABLE);
    
 		   Program_Init();
     //uart_open(UART_ID1, &test_uart_cfg);
- 
    // uart1_change_from_gps_to_debug();   
     //Uart1GpsRecDebugSend();   
     uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
@@ -589,16 +613,17 @@
     power_init();
       //AIR780E_Reset(); //4G模块重启,耗时1.5秒,这个是无法同步的关键
     sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
-    //sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试
-    sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
+    sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试
+    //sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
  //   board_5V_input_init(voltage_input_handler);
 		 adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
     board_acceleration_detection_init(move_handler);
-//		 LOG_INFO(TRACE_MODULE_APP, "测试进入app");
-		board_4GUsart_detection_init(_4gUsart_handler);
+		pca_input_detection_init(pca_handler);//pca检测输入
+		//		 LOG_INFO(TRACE_MODULE_APP, "测试进入app");
+		//board_4GUsart_detection_init(_4gUsart_handler);
     while (1)
     { test4=gpio_pin_get_val(SCL_PIN);
-		
+			//UWBPoll();
 //			if(!power_low_flag)//确认是否休眠下才开启功能
 //			{
 //        if(flag_TCP_reconnectting||IfTCPConnected())

--
Gitblit v1.9.3