From 2a2aa76ac915572ae3f551b099a4be5bc47e0a05 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 09 四月 2025 16:14:20 +0800
Subject: [PATCH] V2.59
---
Src/main.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 9 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 9ba9bc0..f7fe6db 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -103,7 +103,7 @@
void LedTask(void);
uint32_t dev_id;
uint16_t heartbeat_timer,poll_timer,sync_timer;
-uint8_t aRxBuffer[1],group_id;
+uint8_t aRxBuffer[1],group_id = 1;
uint8_t bat_percent=0,g_start_send_flag;
uint16_t tyncpoll_time,lpsettime;
uint16_t slottime,max_slotpos;
@@ -154,14 +154,30 @@
GPIO_InitStruct.Pull = GPIO_NOPULL;
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
}
+
+typedef enum { unused,
+ none1,
+ STBY_RC,
+ STBY_XOSC,
+ FS,
+ RX,
+ TX
+ } LoraChipModeEnum;
uint16_t hardware_version,hardware_pici,hardware_type;
uint8_t state5v = 1;
extern uint8_t du_flag;
extern uint8_t xie_flag;
+RadioStatus_t radiostatus;
uint16_t motor_keeptime;
void IdleTask(void)
{
-
+// radiostatus = SX126xGetStatus();
+// if(radiostatus.Fields.ChipMode!=RX&&radiostatus.Fields.ChipMode!=TX)
+// {
+// Radio.Standby();
+// SwitchLoraSettings(UWB_CHANNEL_FRQ+group_id,UWB_CHANNEL_SF,0);
+// Radio.Rx(0);
+// }
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
UART_CheckReceive();
@@ -187,6 +203,8 @@
state5v=0;
UsartDeInit();
}
+ LED_TB_OFF;
+ LED_TR_OFF;
LED2_TR_OFF;
LED2_TB_OFF;
// }
@@ -217,14 +235,16 @@
hardware_pici = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type = STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = (1<<8)|18;
+ g_com_map[VERSION] = (2<<8)|59;
+// g_com_map[VERSION] = (3<<8)|2;
// g_com_map[DEV_ID]=1158;
- g_com_map[GROUP_ID]=0;
+// g_com_map[GROUP_ID]=1;
// g_com_map[COM_INTERVAL] = 1000;
if(g_com_map[COM_INTERVAL]<1000)
{
g_com_map[COM_INTERVAL] = 1000;
}
+ // g_com_map[ACTIVE_INDEX] =0;
g_com_map[STATIONARY_TIME] = 10;
g_com_map[LORA_POWER] = 22;
g_com_map[POWER] = 67;
@@ -232,6 +252,7 @@
module_power = g_com_map[POWER];
// g_com_map[IMU_ENABLE] = 0;
imu_enable=g_com_map[IMU_ENABLE];
+
motor_enable=g_com_map[MOTOR_ENABLE];
group_id=g_com_map[GROUP_ID];
@@ -453,6 +474,7 @@
BeepTask();
}
}
+uint8_t oneflag;
/* USER CODE END 0 */
/**
@@ -510,6 +532,8 @@
HAL_UART_Receive_IT(&hlpuart1, (uint8_t *)GPSRxBuffer, 1);
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_2, GPIO_PIN_SET); //开GPS电源
LoraInit();
+ // Beep_On();
+
#ifdef _USE_BAR
BarInit();
#endif
@@ -537,14 +561,29 @@
IdleTask();
// if(g_com_map[LORA_SEND_INDEX])
// {
+
Lora_Send_Poll();
+
// }
LoraUp_Poll();
+
+ if(sleep_flag&&oneflag==0)
+ {
+ oneflag=1;
+ Radio.Standby();
+ Radio.Sleep();
+ LedOff_task();
+ }
#ifndef DEBUG_MODE
if(beep_flag==0)
{
if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin)&&motor_keeptime==0)
+ {
+// sleep_flag=0;
+// LoraUp_Poll();
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+ }
+//
}
#endif
@@ -568,7 +607,7 @@
/** Configure LSE Drive Capability
*/
HAL_PWR_EnableBkUpAccess();
- __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_LOW);
+ __HAL_RCC_LSEDRIVE_CONFIG(RCC_LSEDRIVE_HIGH);
/** Initializes the CPU, AHB and APB busses clocks
*/
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSI
@@ -1058,11 +1097,13 @@
SystemClock_Config();
HAL_IWDG_Refresh(&hiwdg);
anjian_num=0;
+// if(++g_com_map[GROUP_ID]>2)
+// g_com_map[GROUP_ID] = 0;
if(active_flag==0) //未激活状态
{
if(!GET_USERKEY)
{
- LED_TB_ON;
+
key_keeptime+=1;
if(key_keeptime>3)
{
@@ -1103,10 +1144,10 @@
{
if(sleep_flag==0)
{
- Radio.Standby();
- Radio.Sleep();
+// Radio.Standby();
+// Radio.Sleep();
sleep_flag = 1;
- LedOff_task();
+// LedOff_task();
}
}
#endif
--
Gitblit v1.9.3