From 0bc02ffbce600504727ddd593568acb754073eb2 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 13 一月 2025 17:14:04 +0800
Subject: [PATCH] V2.21 解决灯常量BUG
---
Src/main.c | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index cdd23b3..3d1f57d 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -43,7 +43,7 @@
#define NSH1 0x0001
#define GP 0x0002
#define FLASH_HARDWARE_VERSION_MAP (uint32_t)0x08004F00 //硬件版本号和批次信息位置
-#define DEBUG_MODE
+//#define DEBUG_MODE
UART_WakeUpTypeDef Selection;
/* USER CODE END Includes */
@@ -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,7 +235,7 @@
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] = (2<<8)|13;
+ g_com_map[VERSION] = (2<<8)|21;
// g_com_map[VERSION] = (3<<8)|2;
// g_com_map[DEV_ID]=1158;
// g_com_map[GROUP_ID]=1;
@@ -226,6 +244,7 @@
{
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;
@@ -1069,7 +1088,7 @@
{
if(!GET_USERKEY)
{
- LED_TB_ON;
+
key_keeptime+=1;
if(key_keeptime>3)
{
--
Gitblit v1.9.3