代码暂存 打开4G及蓝牙参数优化

This commit is contained in:
常正强 2025-05-19 14:28:47 +08:00
parent dc9559625f
commit a68193b154
4 changed files with 21 additions and 19 deletions

View File

@ -39,35 +39,35 @@
*/ */
// How often to perform periodic event // How often to perform periodic event
#define SBP_PERIODIC_EVT_PERIOD 1600 #define SBP_PERIODIC_EVT_PERIOD (1600 * 60) // (160 = 100ms)
// How often to perform read rssi event // How often to perform read rssi event
#define SBP_READ_RSSI_EVT_PERIOD 3200 #define SBP_READ_RSSI_EVT_PERIOD (1600 * 3) // (160 = 100ms)
// Parameter update delay // Parameter update delay
#define SBP_PARAM_UPDATE_DELAY 6400 #define SBP_PARAM_UPDATE_DELAY (1600 * 1)
// PHY update delay // PHY update delay
#define SBP_PHY_UPDATE_DELAY 2400 #define SBP_PHY_UPDATE_DELAY (1600 * 2)
// What is the advertising interval when device is discoverable (units of 625us, 80=50ms) // What is the advertising interval when device is discoverable (units of 625us, 80=50ms)
#define DEFAULT_ADVERTISING_INTERVAL (160 * 15) //160 * 10 #define DEFAULT_ADVERTISING_INTERVAL (160 * 8)
// Limited discoverable mode advertises for 30.72s, and then stops // Limited discoverable mode advertises for 30.72s, and then stops
// General discoverable mode advertises indefinitely // General discoverable mode advertises indefinitely
#define DEFAULT_DISCOVERABLE_MODE GAP_ADTYPE_FLAGS_GENERAL #define DEFAULT_DISCOVERABLE_MODE GAP_ADTYPE_FLAGS_GENERAL
// Minimum connection interval (units of 1.25ms, 6=7.5ms) // Minimum connection interval (units of 1.25ms, 6=7.5ms)
#define DEFAULT_DESIRED_MIN_CONN_INTERVAL (200) //100 #define DEFAULT_DESIRED_MIN_CONN_INTERVAL (80 * 4) // (80 = 100ms)
// Maximum connection interval (units of 1.25ms, 100=125ms) // Maximum connection interval (units of 1.25ms, 100=125ms)
#define DEFAULT_DESIRED_MAX_CONN_INTERVAL (800) //400 #define DEFAULT_DESIRED_MAX_CONN_INTERVAL (80 * 5)
// Slave latency to use parameter update // Slave latency to use parameter update
#define DEFAULT_DESIRED_SLAVE_LATENCY 10 //5 #define DEFAULT_DESIRED_SLAVE_LATENCY 0
// Supervision timeout value (units of 10ms, 100=1s) // Supervision timeout value (units of 10ms, 100=1s)
#define DEFAULT_DESIRED_CONN_TIMEOUT 400 //200 #define DEFAULT_DESIRED_CONN_TIMEOUT (100 * 2)
// Company Identifier: WCH // Company Identifier: WCH
#define WCH_COMPANY_ID 0x07D7 #define WCH_COMPANY_ID 0x07D7

View File

@ -111,8 +111,8 @@ int main(void)
BSP_VBAT_Init(); BSP_VBAT_Init();
logDebug("VBAT init ok\n"); logDebug("VBAT init ok\n");
// BSP_Ml307r_Init(); BSP_Ml307r_Init();
// logDebug("BSP_M1307r ok\n"); logDebug("BSP_M1307r ok\n");
ShowRestartReason(); ShowRestartReason();
IWDG_Init(5000); IWDG_Init(5000);

View File

@ -387,8 +387,9 @@ void Lower_IO_Deinit(void)
GPIOB_ModeCfg(ENABLE_3_8_V, GPIO_ModeIN_PD); GPIOB_ModeCfg(ENABLE_3_8_V, GPIO_ModeIN_PD);
// 将控制引脚设为下拉,减少漏电流 // 将控制引脚设为下拉,减少漏电流
GPIOB_ModeCfg(ML307_PWR_PIN | ML307_RST_PIN, GPIO_ModeIN_PD); GPIOB_ModeCfg(ML307_PWR_PIN | ML307_RST_PIN, GPIO_ModeIN_PD);
// UART引脚设为下拉 // UARTÒý½Å
GPIOB_ModeCfg(ML307_UART_TX_PIN | ML307_UART_RX_PIN, GPIO_ModeIN_PU); GPIOB_ModeCfg(ML307_UART_TX_PIN, GPIO_ModeIN_PD);
GPIOB_ModeCfg(ML307_UART_RX_PIN, GPIO_ModeIN_PU);
// SIM卡检测引脚配置为下拉输入 // SIM卡检测引脚配置为下拉输入
GPIOB_ModeCfg(USIM_DECT_PIN, GPIO_ModeIN_PD); GPIOB_ModeCfg(USIM_DECT_PIN, GPIO_ModeIN_PD);
@ -790,11 +791,12 @@ uint16_t Check_ProcessEvent(uint8_t task_id, uint16_t events)
{ {
VALVE_STOP(); VALVE_STOP();
logDebug("motor STOP"); logDebug("motor STOP");
// if(fault_state == 4) DelayMs(1500);
// { if(fault_state == 4)
// IotFlag_t.Valve_Close_flag = 1; {
// Iot_Send_Data(); IotFlag_t.Valve_Close_flag = 1;
// } Iot_Send_Data();
}
return (events ^ MOTOR_STOP_EVT); return (events ^ MOTOR_STOP_EVT);
} }
return 0; return 0;

View File

@ -519,7 +519,7 @@ static int BSP_Module_Connect_CtWing_Handle(at_env_t *e)
{ {
case 0: case 0:
logDebug("create device...\r\n"); logDebug("create device...\r\n");
e->println(e, "AT+MIPOPEN=0,\"TCP\",\"112.125.89.8\",47766,,1"); // 8.135.10.183,32994 e->println(e, "AT+MIPOPEN=0,\"TCP\",\"112.125.89.8\",45663,,1"); // 8.135.10.183,32994
e->reset_timer(e); e->reset_timer(e);
e->state++; e->state++;
break; break;