fix:删除4G模组tools目录

This commit is contained in:
2026-04-30 17:16:01 +08:00
parent 36fb7fd027
commit 0d7a8564e0
36 changed files with 703 additions and 3205 deletions

View File

@@ -19,14 +19,13 @@ void charger_to_server_0X01(uint8_t stake_index)
load_charger_serial(stake_index,data.charger_serial); // 加载充电桩序列号
data.charger_type = CHARGER_TYPE_DC;
data.gun_num = GUN_NUM;
data.protocol_ver = g_charger_manager.charger_piles[0].login_info.software_ver;
data.protocol_ver = g_charger_manager.charger_piles[stake_index - 1].login_info.protocol_ver;
memcpy(data.software_ver, SOFTWARE_VERSION, strlen(SOFTWARE_VERSION));
data.net_conn_type = NET_CONN_TYPE;
data.tele_factory = TELE_FACTORY;
memcpy(data.sim, iccid_ascii, strlen(iccid_ascii));
printf("Frame Type:0x01 充电桩登录认证(桩->平台)");
pack_and_send_server_data(FRAME_TYPE_0X01, 0, pack_serial, (uint8_t *)&data, sizeof(PACK_DATA_0X01),stake_index);
pack_serial++;
printf("北向:对电桩 %d 发送登录认证,序列号:%s\r\n", stake_index,data.charger_serial);
pack_and_send_server_data(FRAME_TYPE_0X01, stake_index, 0, (uint8_t *)&data, sizeof(PACK_DATA_0X01),stake_index);
}
@@ -37,9 +36,8 @@ void charger_to_server_0X03(uint8_t stake_index,uint8_t gun_index, uint8_t gun_s
load_charger_serial(stake_index,data.charger_serial); // 加载充电桩序列号
data.gun_index = gun_index;
data.gun_status = gun_status;
printf("Frame Type:0x03 充电桩心跳包(桩->平台)");
pack_and_send_server_data(FRAME_TYPE_0X03, 0, pack_serial, (uint8_t *)&data, sizeof(PACK_DATA_0X03),stake_index);
pack_serial++;
printf("北向:对电桩 %d 发送心跳请求,枪号:%d状态%d\r\n", stake_index,gun_index,gun_status);
pack_and_send_server_data(FRAME_TYPE_0X03, stake_index, 0, (uint8_t *)&data, sizeof(PACK_DATA_0X03),stake_index);
}
// 计费模型验证请求
@@ -49,9 +47,8 @@ void charger_to_server_0X05(uint16_t num,uint8_t stake_index)
load_charger_serial(stake_index,data.charger_serial); // 加载充电桩序列号
data.fee_model_no = num;
printf("Frame Type:0x05 计费模型验证请求(桩->平台)");
pack_and_send_server_data(FRAME_TYPE_0X05, 0, pack_serial, (uint8_t *)&data, sizeof(PACK_DATA_0X05),stake_index);
pack_serial++;
printf("北向:对电桩 %d 计费模型验证请求,模型号:%d\r\n", stake_index,num);
pack_and_send_server_data(FRAME_TYPE_0X05, stake_index, 0, (uint8_t *)&data, sizeof(PACK_DATA_0X05),stake_index);
}
// 充电桩计费模型请求
@@ -60,25 +57,22 @@ void charger_to_server_0X09(uint8_t stake_index)
PACK_DATA_0X09 data = {0};
load_charger_serial(stake_index,data.charger_serial); // 加载充电桩序列号
printf("Frame Type:0x09 充电桩计费模型请求(桩->平台)");
pack_and_send_server_data(FRAME_TYPE_0X09, 0, pack_serial, (uint8_t *)&data, sizeof(PACK_DATA_0X09),stake_index);
pack_serial++;
printf("北向:对电桩 %d 计费模型请求,序列号:%s\r\n", stake_index,data.charger_serial);
pack_and_send_server_data(FRAME_TYPE_0X09, stake_index, 0, (uint8_t *)&data, sizeof(PACK_DATA_0X09),stake_index);
}
// 上传实时监测数据
void charger_to_server_0X13(uint8_t stake_index,uint8_t gun_index)
{
PACK_DATA_0X13 data = {0};
load_charger_serial(stake_index,data.charger_serial); // 加载充电桩序列号
// 加载充电桩交易序列号
const unsigned char trade_data[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00
};
PACK_DATA_0X13 data = {0};
load_charger_serial(stake_index,data.charger_serial); // 加载充电桩序列号
data.gun_index = gun_index;
//data.gun_back = getGunBack(All_status[gun_index-1]);
// data.gun_is_insert = getGunIsInsert(All_status[gun_index-1]);
@@ -99,9 +93,8 @@ void charger_to_server_0X13(uint8_t stake_index,uint8_t gun_index)
data.hard_fault = 0;
}
printf("Frame Type:0x13 上传实时监测数据(桩->平台)");
pack_and_send_server_data(FRAME_TYPE_0X13, 1, pack_serial, (uint8_t *)&data, sizeof(PACK_DATA_0X13),stake_index);
pack_serial++;
printf("北向:对电桩 %d 上传实时监测数据,枪号:%d状态%d返回%d是否插入%d\r\n", stake_index,gun_index,data.status,data.gun_back,data.gun_is_insert);
pack_and_send_server_data(FRAME_TYPE_0X13, stake_index, 0, (uint8_t *)&data, sizeof(PACK_DATA_0X13),stake_index);
}
@@ -115,9 +108,8 @@ void charger_to_server_0X33(uint8_t stake_mark,uint8_t gun_index,uint8_t result,
data.result = result;
data.err_code = err_code;
printf("Frame Type:0x33 平台启动回复(桩->平台)");
pack_and_send_server_data(FRAME_TYPE_0X33,0,pack_serial,(uint8_t *)&data,sizeof(PACK_DATA_0X33),stake_mark);
pack_serial++;
printf("北向:对电桩 %d 的平台启动回复,结果:%d错误码%d\r\n", stake_mark,result,err_code);
pack_and_send_server_data(FRAME_TYPE_0X33, stake_mark, 0, (uint8_t *)&data, sizeof(PACK_DATA_0X33), stake_mark);
}
#endif

View File

@@ -214,6 +214,7 @@ void pack_and_send_server_data(uint8_t type, uint8_t encrypt, uint16_t serial, u
{
uint8_t index = 0;
uint16_t crc = 0;
uint16_t current_serial = 0;
uint8_t *buf = NULL;
buf = (uint8_t *)pvPortMalloc(len + 14);
if (!buf)
@@ -221,6 +222,12 @@ void pack_and_send_server_data(uint8_t type, uint8_t encrypt, uint16_t serial, u
return;
}
/* 原子获取全局包序号,避免多任务竞争 */
taskENTER_CRITICAL();
current_serial = pack_serial;
pack_serial++;
taskEXIT_CRITICAL();
buf[index++] = 0x55;
buf[index++] = 0xAA;
buf[index++] = 0x01;
@@ -228,8 +235,8 @@ void pack_and_send_server_data(uint8_t type, uint8_t encrypt, uint16_t serial, u
buf[index++] = SERVER_PACK_START_FLAG;
buf[index++] = len + 4;
buf[index++] = (serial >> 8) & 0xFF;
buf[index++] = serial & 0xFF;
buf[index++] = (current_serial >> 8) & 0xFF;
buf[index++] = current_serial & 0xFF;
buf[index++] = encrypt;
buf[index++] = type;
@@ -244,10 +251,10 @@ void pack_and_send_server_data(uint8_t type, uint8_t encrypt, uint16_t serial, u
buf[index++] = 0xAA;
buf[index++] = 0x55;
for (int i = 4; i < index - 2; i++)
{
printf("%02X", buf[i]);
}
// for (int i = 4; i < index - 2; i++)
// {
// printf("%02X", buf[i]);
// }
Air724_Message_Send(buf, index);
vPortFree(buf);
}
@@ -257,7 +264,8 @@ int get_num_from_string(const char *str, int *num)
int index = 0;
int t = 0;
int flag = 0;
for (int i = 0; i < len; i++)
int i;
for (i = 0; i < len; i++)
{
flag = 0;
while ((str[i] >= '0' && str[i] <= '9') && (i < len))

View File

@@ -12,7 +12,7 @@ void on_cmd_frame_type_0X02(uint8_t stake_index, SERVER_PACK *pack)
{
g_charger_manager.charger_piles[stake_index - 1].is_online = 1;
#ifdef DEBUG
printf("桩ID %d 登陆成功!\r\n", stake_index);
printf("北向:桩ID %d 登陆成功!\r\n", stake_index);
#endif
}
}
@@ -24,7 +24,7 @@ void on_cmd_frame_type_0X04(uint8_t stake_index, SERVER_PACK *pack)
PACK_DATA_0X04 data;
memcpy(&data, pack->data, sizeof(PACK_DATA_0X04));
#ifdef DEBUG
printf("桩ID %d 收到心跳应答!\r\n", stake_index);
printf("北向:桩ID %d 收到心跳应答!\r\n", stake_index);
#endif
}
@@ -36,7 +36,7 @@ void on_cmd_frame_type_0X06(uint8_t stake_index, SERVER_PACK *pack)
if (is_my_charger_serial(stake_index, data.charger_serial))
{
#ifdef DEBUG
printf("接收到计费模型验证应答模型ID%d, 验证结果:%d\r\n", data.fee_model_no, data.result);
printf("北向:接收到计费模型验证应答模型ID%d, 验证结果:%d\r\n", data.fee_model_no, data.result);
#endif
}
}
@@ -54,12 +54,12 @@ void on_cmd_frame_type_0X0A(uint8_t stake_index, SERVER_PACK *pack)
#ifdef DEBUG
printf("接收到计费模型应答,模型ID:%d\r\n", g_charger_manager.fee_model_global.fee_model_no);
printf("北向:接收到计费模型应答,模型ID:%d\r\n", g_charger_manager.fee_model_global.fee_model_no);
printf("尖电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.shark_fee_ratio, g_charger_manager.fee_model_global.shark_service_ratio);
printf("峰电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.peak_fee_ratio, g_charger_manager.fee_model_global.peak_service_ratio);
printf("平电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.flat_fee_ratio, g_charger_manager.fee_model_global.flat_service_ratio);
printf("谷电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.valley_fee_ratio, g_charger_manager.fee_model_global.valley_service_ratio);
printf("计损比例:%d%%\r\n", g_charger_manager.fee_model_global.loss_ratio);
printf("计损比例: %d%% \r\n", g_charger_manager.fee_model_global.loss_ratio);
printf("\n合并后的费率时间段:\r\n");
printf("================================================================\r\n");
@@ -111,7 +111,7 @@ void on_cmd_frame_type_0X0A(uint8_t stake_index, SERVER_PACK *pack)
end_hour = 0;
}
printf("%02d:%02d-%02d:%02d 为 %s费率\r",
printf("%02d:%02d-%02d:%02d 为 %s 费率\r\n",
start_hour, start_min,
end_hour, end_min,
fee_name);
@@ -137,21 +137,12 @@ void on_cmd_frame_type_0X58(uint8_t stake_index, SERVER_PACK *pack)
#ifdef DEBUG
char str[150];
Rs485_Message_Send("t0.txt=\"\"\xff\xff\xff", 12);
printf("接收到计费模型应答,模型ID:%d\r\n", g_charger_manager.fee_model_global.fee_model_no);
printf("北向:接收到计费模型应答,模型ID:%d\r\n", g_charger_manager.fee_model_global.fee_model_no);
printf("尖电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.shark_fee_ratio, g_charger_manager.fee_model_global.shark_service_ratio);
printf("峰电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.peak_fee_ratio, g_charger_manager.fee_model_global.peak_service_ratio);
printf("平电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.flat_fee_ratio, g_charger_manager.fee_model_global.flat_service_ratio);
printf("谷电费率:%d 服务费:%d\r\n", g_charger_manager.fee_model_global.valley_fee_ratio, g_charger_manager.fee_model_global.valley_service_ratio);
printf("计损比例:%d%%\r\n", g_charger_manager.fee_model_global.loss_ratio);
sprintf(str, "t0.txt+=\"尖电费 %d 服务费 %d \r\n峰电费 %d 服务费 %d \r\n平电费 %d 服务费 %d \r\n谷电费 %d 服务费 %d \r\n计损比例 %d%%\r\n\"\xff\xff\xff",
g_charger_manager.fee_model_global.shark_fee_ratio, g_charger_manager.fee_model_global.shark_service_ratio,
g_charger_manager.fee_model_global.peak_fee_ratio, g_charger_manager.fee_model_global.peak_service_ratio,
g_charger_manager.fee_model_global.flat_fee_ratio, g_charger_manager.fee_model_global.flat_service_ratio,
g_charger_manager.fee_model_global.valley_fee_ratio, g_charger_manager.fee_model_global.valley_service_ratio,
g_charger_manager.fee_model_global.loss_ratio);
Rs485_Message_Send(str, strlen(str));
printf("计损比例: %d%% \r\n", g_charger_manager.fee_model_global.loss_ratio);
printf("\n合并后的费率时间段:\r\n");
printf("================================================================\r\n");
@@ -202,17 +193,10 @@ void on_cmd_frame_type_0X58(uint8_t stake_index, SERVER_PACK *pack)
end_hour = 0;
}
printf("%02d:%02d-%02d:%02d 为 %s费率\r",
printf("%02d:%02d-%02d:%02d 为 %s 费率\r",
start_hour, start_min,
end_hour, end_min,
fee_name);
sprintf(str, "t0.txt+=\"%02d:%02d-%02d:%02d 为 %s费率 \r\n\"\xff\xff\xff",
start_hour, start_min,
end_hour, end_min,
fee_name);
Rs485_Message_Send(str, strlen(str));
i = j; // 跳到下一个不同费率段
}
printf("================================================================\r\n");
@@ -227,8 +211,9 @@ void on_cmd_frame_type_0X34(uint8_t stake_index, SERVER_PACK *pack)
uint8_t result = 1;
uint8_t err_code = 0;
memcpy(&data, pack->data, sizeof(PACK_DATA_0X34));
set_trade_serial(data.gun_index, data.trade_serial, stake_index);
set_trade_serial(stake_index,data.gun_index, data.trade_serial);
printf("北向:平台控制充电,桩ID:%d, 枪ID:%d, 金额:%d\r\n", stake_index, data.gun_index, data.remain_money);
if (!is_my_charger_serial(stake_index, data.charger_serial))
{
result = 0;
@@ -257,6 +242,7 @@ void on_cmd_frame_type_0X34(uint8_t stake_index, SERVER_PACK *pack)
// set_charge_start_mode(data.gun_index - 1, CAHRGE_START_MODE_APP);
// update_remain_money_to_gun(data.gun_index - 1, data.remain_money);
// }
charger_to_server_0X33(stake_index, data.gun_index, result, err_code);
}
#if 0