diff --git a/.cproject b/.cproject
index 317b301..faab14c 100644
--- a/.cproject
+++ b/.cproject
@@ -113,7 +113,7 @@
diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c
index a0d3a7c..cd45e72 100644
--- a/APP/peripheral_main.c
+++ b/APP/peripheral_main.c
@@ -104,9 +104,9 @@ int main(void)
#endif
#ifdef DEBUG
- BSP_UART3_Init();
+ BSP_UART3_Init();
- logDebug("%s", TxBuff);
+ logDebug("%s", TxBuff);
#endif
logDebug("Start @ChipID=%02X\n", R8_CHIP_ID);
logDebug("%s\n", VER_LIB);
@@ -128,8 +128,8 @@ int main(void)
BSP_VBAT_Init();
logDebug("VBAT init ok\n");
-// BSP_Ml307r_Init();
-// logDebug("BSP_M1307r ok\n");
+ // BSP_Ml307r_Init();
+ // logDebug("BSP_M1307r ok\n");
BSP_KEY_Init(app_task_handler);
diff --git a/IoT_SCV_CH584M1.wvproj b/IoT_SCV_CH584M1.wvproj
index 80b2667..055391c 100644
--- a/IoT_SCV_CH584M1.wvproj
+++ b/IoT_SCV_CH584M1.wvproj
@@ -150,7 +150,7 @@
"do_not_search_system_directories": false,
"preprocess_only": false,
"defined_symbols": [
- "CLK_OSC32K=0",
+ "CLK_OSC32K=1",
"DEBUG=3"
],
"undefined_symbols": []
diff --git a/bsp/src/bsp_adc.c b/bsp/src/bsp_adc.c
index d757c16..307d185 100644
--- a/bsp/src/bsp_adc.c
+++ b/bsp/src/bsp_adc.c
@@ -48,7 +48,7 @@ uint16_t VBAT_ProcessEvent(uint8_t task_id, uint16_t events)
logDebug("adc_vbat =%d \n", adc_vbat);
vbat = (adc_vbat/1024.0-1)*1.05;
logDebug("vbat =%f \n", vbat);
- tmos_start_task(vbat_task_id, VBAT_EVT_START, MS1_TO_SYSTEM_TIME(1000*10)); //1000*60
+ tmos_start_task(vbat_task_id, VBAT_EVT_START, MS1_TO_SYSTEM_TIME(1000*300)); //1000*60
return (events ^ VBAT_EVT_START);
}
return 0;
diff --git a/bsp/src/bsp_bmp390.c b/bsp/src/bsp_bmp390.c
index 4d4b77c..babf4b7 100644
--- a/bsp/src/bsp_bmp390.c
+++ b/bsp/src/bsp_bmp390.c
@@ -372,16 +372,11 @@ void Lower_IO_Deinit(void)
ADC_DisablePower();
// BMP390
- //片选低电平有效，初始为输出拉高
- // CSB3: PA0 | CSB2: PA3 | CSB1: PA5
- //GPIOA_SetBits(GPIO_Pin_0 | GPIO_Pin_3 | GPIO_Pin_5);
- // GPIOA_ModeCfg(GPIO_Pin_0 | GPIO_Pin_3 | GPIO_Pin_5, GPIO_ModeIN_PD); //GPIO_ModeOut_PP_5mA
- //中断引脚推挽和高电平有效模式
// INT1: PA2 | INT2: PA6 | INT3: PA12
GPIOA_ModeCfg(GPIO_Pin_2 | GPIO_Pin_6 | GPIO_Pin_12, GPIO_ModeIN_PD);
// spi初始化
- GPIOA_ModeCfg(GPIO_Pin_13 | GPIO_Pin_14, GPIO_ModeIN_PD); //GPIO_ModeOut_PP_5mA
- GPIOA_ModeCfg(GPIO_Pin_15, GPIO_ModeIN_PD); //GPIO_ModeIN_PU
+ GPIOA_ModeCfg(GPIO_Pin_13 | GPIO_Pin_14, GPIO_ModeIN_PD);
+ GPIOA_ModeCfg(GPIO_Pin_15, GPIO_ModeIN_PD);
//4G
// 关闭3.8V供电
@@ -403,23 +398,16 @@ void Lower_IO_Deinit(void)
GPIOB_ModeCfg(COIL_A | COIL_B, GPIO_ModeIN_PD);
// UART3
-/***************************************
- // 禁用UART3中断
- GPIOPinRemap(DISABLE, RB_PIN_UART3);
- UART3_INTCfg(DISABLE, RB_IER_LINE_STAT | RB_IER_RECV_RDY | RB_IER_THR_EMPTY);
- PFIC_DisableIRQ(UART3_IRQn);
-
- // 将UART3的TX和RX引脚配置为输入上拉模式以降低功耗
- GPIOB_ModeCfg(GPIO_Pin_21 | GPIO_Pin_20, GPIO_ModeIN_PD);
+ // GPIOB_ModeCfg(GPIO_Pin_21 | GPIO_Pin_20, GPIO_ModeIN_PD);
+ // // 关闭UART3时钟
+ // sys_safe_access_enable();
+ // R8_SLP_CLK_OFF0 |= RB_SLP_CLK_UART3;
+ // sys_safe_access_disable();
+ // // 关闭shell和日志系统
+ // shell.write = NULL; // 禁用shell输出
- // 关闭UART3时钟
- sys_safe_access_enable();
- R8_SLP_CLK_OFF0 |= RB_SLP_CLK_UART3; // 设置UART3时钟关闭标志
- sys_safe_access_disable();
-
- // 关闭shell和日志系统
- shell.write = NULL; // 禁用shell输出
-*************************************************/
+ // 关闭外部低速晶振
+ GPIOA_ModeCfg(GPIO_Pin_10 | GPIO_Pin_11, GPIO_ModeIN_PD);
}
void PRESS_LowPower(void)
@@ -629,7 +617,7 @@ BMP390_ProcessEvent(uint8_t task_id, uint16_t events)
P[2] = (uint32_t)(data.pressure / 100);
//printf("%d, %d, %d\r\n",T[0],T[1],T[2]);
- printf("%d, %d, %d, %d, %d, %d, %d \r\n",T[0],T[1],T[2],P[0],P[1],P[2],P[0]-P[1]);
+ // printf("%d, %d, %d, %d, %d, %d, %d \r\n",T[0],T[1],T[2],P[0],P[1],P[2],P[0]-P[1]);
}
tmos_start_task(press_task_id, BMP390_IN_START, MS1_TO_SYSTEM_TIME(500)); //100
//tmos_start_task(press_task_id, BMP390_ATOM_START, MS1_TO_SYSTEM_TIME(1000));
@@ -740,10 +728,11 @@ uint16_t Check_ProcessEvent(uint8_t task_id, uint16_t events)
{
if (events & CHECK_EVT_START)
{
+ // logDebug("fault_state = %d \r\n",fault_state);
if(!fault_state)
{
//超压检测
- if(P[0] - P[2] >= 8000)
+ if(P[0] - P[2] >= 80) //8000
{
VALVE_CLOSE();
fault_state = 1;
@@ -751,7 +740,7 @@ uint16_t Check_ProcessEvent(uint8_t task_id, uint16_t events)
logDebug("motor high close");
}
//欠压检测
- if(P[0] - P[2] <= 800)
+ if(P[0] - P[2] <= 80) //800
{
VALVE_CLOSE();
fault_state = 2;
@@ -759,7 +748,7 @@ uint16_t Check_ProcessEvent(uint8_t task_id, uint16_t events)
logDebug("motor low close");
}
//过流检测
- if( P[0] - P[1] >= 700)
+ if( P[0] - P[1] >= 7) //700
{
VALVE_CLOSE();
fault_state = 3;
@@ -811,20 +800,20 @@ void GPIOA_IRQHandler(void)
R16_PA_INT_IF = GPIO_Pin_6;
flag = 1;
tmos_set_event(press_task_id, BMP390_EVT_READ);
- logDebug("INT2 \r\n");
+ // logDebug("INT2 \r\n");
}
else if (R16_PA_INT_IF & GPIO_Pin_12)
{
R16_PA_INT_IF = GPIO_Pin_12;
flag = 2;
tmos_set_event(press_task_id, BMP390_EVT_READ);
- logDebug("INT3 \r\n");
+ // logDebug("INT3 \r\n");
}
else if (R16_PA_INT_IF & GPIO_Pin_2)
{
R16_PA_INT_IF = GPIO_Pin_2;
flag = 3;
tmos_set_event(press_task_id, BMP390_EVT_READ);
- logDebug("INT1 \r\n");
+ // logDebug("INT1 \r\n");
}
}
diff --git a/common/letter-shell-master/src/log.h b/common/letter-shell-master/src/log.h
index 14f6100..e9cf349 100644
--- a/common/letter-shell-master/src/log.h
+++ b/common/letter-shell-master/src/log.h
@@ -35,7 +35,7 @@ extern "C" {
#endif
#ifndef LOG_ENABLE
- #define LOG_ENABLE 1 /**< 浣胯兘log */
+ #define LOG_ENABLE 0 /**< 浣胯兘log */
#endif
#if LOG_USING_LOCK == 1