fix: LaserTimerMinutes持久化存储到Flash
1. AppPara_T新增LaserTimerMinutes字段,上电从Flash加载 2. 首次使用默认10分钟,laser time修改后SAVE_APP_PARA保存 3. 断电重启后保留上次设定值
This commit is contained in:
@@ -785,6 +785,8 @@ static void DebugLaserConfig(int argc, char *argv[])
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
SGCP.LaserTimerMinutes = (uint8_t)min;
|
SGCP.LaserTimerMinutes = (uint8_t)min;
|
||||||
|
App.Para.LaserTimerMinutes = (uint8_t)min;
|
||||||
|
SAVE_APP_PARA((uint32_t *)&App.Para);
|
||||||
DBG_LOG("Laser timer set to %d minute(s).\r\n", SGCP.LaserTimerMinutes);
|
DBG_LOG("Laser timer set to %d minute(s).\r\n", SGCP.LaserTimerMinutes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -259,6 +259,7 @@ typedef struct {
|
|||||||
RS485Para_t Rs485Ch1;
|
RS485Para_t Rs485Ch1;
|
||||||
RS485Para_t Rs485Ch2;
|
RS485Para_t Rs485Ch2;
|
||||||
uint32_t FactoryFlag;//出厂标志位
|
uint32_t FactoryFlag;//出厂标志位
|
||||||
|
uint8_t LaserTimerMinutes; //激光定时关闭分钟数
|
||||||
LoraPara_t Lora;
|
LoraPara_t Lora;
|
||||||
}AppPara_T, *pAppPara;
|
}AppPara_T, *pAppPara;
|
||||||
//#define APP_PARA_ADDRESS (0x0001FC00)
|
//#define APP_PARA_ADDRESS (0x0001FC00)
|
||||||
|
|||||||
+4
-4
@@ -1,4 +1,4 @@
|
|||||||
|
|
||||||
/******************************************************************************
|
/******************************************************************************
|
||||||
* Include files
|
* Include files
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
@@ -196,9 +196,9 @@ static void AppInit(void)
|
|||||||
App.Login_LPTimer0 = true;
|
App.Login_LPTimer0 = true;
|
||||||
//LPTimer0_ON((App.Nonce % 1200) + 300);//定时30s+随机2分钟,最小间隙100ms
|
//LPTimer0_ON((App.Nonce % 1200) + 300);//定时30s+随机2分钟,最小间隙100ms
|
||||||
LPTimer0_ON(50);//5秒后注册
|
LPTimer0_ON(50);//5秒后注册
|
||||||
SGCP.LaserTimerMinutes = 10; //激光定时关闭默认10分钟
|
if(App.Para.LaserTimerMinutes == 0)
|
||||||
SGCP.LaserTimerCount = 0;
|
App.Para.LaserTimerMinutes = 10;
|
||||||
App.Upload45S10SCount = 0;
|
SGCP.LaserTimerMinutes = App.Para.LaserTimerMinutes;
|
||||||
App.UploadFlag = false;
|
App.UploadFlag = false;
|
||||||
App.Upload_LPTimer0 = false;
|
App.Upload_LPTimer0 = false;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user