PowLu/BR_YKC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix:删除4G模组tools目录

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

99
Core/User/Task/ChargerTask.c
View File

@@ -89,7 +89,7 @@ void UDP_ParseTask_Function(void const *argument)
}
else
{
printf("Missing 'code' field\r\n");
printf("Missing 'code' field from \r\n");
cJSON_Delete(root);
}
vPortFree(msg.data);
@@ -145,9 +145,10 @@ void UDPTask_Function(void const *argument)
{
memcpy(msg.data, playload, playload_len);
msg.data[playload_len] = '\0';
// 队列满,释放数据内存
if (xQueueSend(UDP_Message_Queue, &msg, 0) != pdPASS)
{
vPortFree(msg.data);
vPortFree(msg.data);
}
}
}
@@ -178,6 +179,70 @@ void local_on_cmd_callback_power_on(uint8_t stake_index, cJSON *json_pack)
g_charger_manager.charger_piles[stake_index - 1].is_udp_online = true; // 设置桩为本地在线状态
cJSON *root = NULL;
uint8_t *str = NULL;
root = cJSON_CreateObject();
if (root == NULL)
{
printf("Failed to create JSON object for stake %d\r\n", stake_index);
return;
}
/* 添加一条字符串类型的JSON数据(添加一个链表节点) */
cJSON_AddNumberToObject(root, "id", stake_index);
cJSON_AddStringToObject(root, "cmd", "online");
cJSON_AddStringToObject(root, "type", "response");
str = cJSON_Print(root);
udp_send_response(stake_index, str, strlen(str));
free(str);
cJSON_Delete(root);
printf("南向：对电桩 %d 上电回复成功\r\n", stake_index);
}
/**
* @brief 解析充电桩心跳指令
* @note 回复心跳应答
* @param stake_index 桩索引
* @param json_pack json数据包
*/
void local_on_cmd_callback_heartbeat_response(uint8_t stake_index, cJSON *json_pack)
{
if (stake_index > 6)
{
return;
}
//心跳unpack
cJSON *gun_array = cJSON_GetObjectItem(json_pack, "gun");
// 直接判断 type 字段
if (gun_array == NULL || gun_array->type != cJSON_Array)
{
printf(" └── [error] 缺少 gun 数组\r\n");
return;
}
int gun_count = cJSON_GetArraySize(gun_array);
for (int i = 0; i < gun_count; i++)
{
cJSON *gun = cJSON_GetArrayItem(gun_array, i);
if (!gun) continue;
cJSON *id = cJSON_GetObjectItem(gun, "id");
cJSON *state = cJSON_GetObjectItem(gun, "state");
if (!id || !state) continue;
// if (id->valueint == 1) pile->gun1_state = state->valueint;
// if (id->valueint == 2) pile->gun2_state = state->valueint;
printf(" └── [info] 桩%d 枪%d state=%d\r\n", stake_index, id->valueint, state->valueint);
}
//心跳回复组包
cJSON *root = NULL;
char *str = NULL;
root = cJSON_CreateObject();
@@ -189,29 +254,15 @@ void local_on_cmd_callback_power_on(uint8_t stake_index, cJSON *json_pack)
/* 添加一条字符串类型的JSON数据(添加一个链表节点) */
cJSON_AddNumberToObject(root, "id", stake_index);
cJSON_AddStringToObject(root, "cmd", "power_on");
cJSON_AddNumberToObject(root, "code", 1);
cJSON_AddStringToObject(root, "cmd", "heartbeat");
cJSON_AddStringToObject(root, "type", "response");
str = cJSON_Print(root);
udp_send_response(stake_index, str, strlen(str));
free(str);
cJSON_Delete(root);
printf("电桩 %d 上电报文\r\n", stake_index);
}
/**
* @brief 解析充电桩计费模型请求指令
* @note 获取云快充下发的计费模型，回复给充电桩
* @param stake_index 桩索引
* @param json_pack json数据包
*/
void local_on_cmd_callback_get_billing_model(uint8_t stake_index, cJSON *json_pack)
{
if (stake_index > 6)
{
return;
}
printf("南向：对电桩 %d 心跳回复成功\r\n", stake_index);
}
@@ -220,13 +271,17 @@ void handle_udp_downlink(uint8_t id, const char *cmd, cJSON *json_pack)
{
if (cmd == NULL)
return;
if (strcmp(cmd, "power_on") == 0)
// 处理上电指令
if (strcmp(cmd, "online") == 0)
{
printf("南向：收到电桩 %d 上电指令\r\n", id);
local_on_cmd_callback_power_on(id, json_pack);
}
else if (strcmp(cmd, "get_billing_model") == 0)
// 处理心跳指令
else if (strcmp(cmd, "heartbeat") == 0)
{
local_on_cmd_callback_get_billing_model(id, json_pack);
printf("南向：收到电桩 %d 心跳指令\r\n", id);
local_on_cmd_callback_heartbeat_response(id, json_pack);
}
else
{

29
Core/User/Task/DatalinkTask.c
View File

@@ -45,7 +45,6 @@ void DownLinkTask_Function(void const *argument)
while (1)
{
/*---------------------------------------------------获取任务运行状态---------------------------------------------------*/
TaskRunTimeStat.DownLinkTask.threads_runtime = GetTask_RunTime(DownLinkTaskID);
TaskRunTimeStat.DownLinkTask.threads_counter = GetTask_Beatcnt(DownLinkTaskID);
TaskRunTimeStat.DownLinkTask.threads_freestack = Get_Free_Stack(DownLinkTaskID);
@@ -74,22 +73,30 @@ void DownLinkTask_Function(void const *argument)
memcpy(frame.data, ykc_downlink_frame + HEADER_LENGTH, frame.len - 4);
frame.crc = (ykc_downlink_frame[HEADER_LENGTH + frame.len] << 8) | ykc_downlink_frame[HEADER_LENGTH + frame.len + 1];
printf("Raw Bytes: ");
for (int i = 0; i < ykc_downlink_frame_len; i++)
{
printf("%02X ", ykc_downlink_frame[i]);
if ((i + 1) % 16 == 0) // 每16字节换行
{
printf("\r");
}
}
printf("\r");
// printf("Raw Bytes: ");
// for (int i = 0; i < ykc_downlink_frame_len; i++)
// {
// printf("%02X ", ykc_downlink_frame[i]);
// if ((i + 1) % 16 == 0) // 每16字节换行
// {
// printf("\r");
// }
// }
// printf("\r");
handle_ykc_downlink(charger_index, &frame);
vPortFree(frame.data);
}
break;
case 0x83:
{
if (air724_rx_msg[3] == 0x01)
printf("4G：Socket %d 通道连接成功\r\n", air724_rx_msg[4]);
if (air724_rx_msg[3] == 0x02)
printf("4G：Socket %d 通道断开成功\r\n", air724_rx_msg[4]);
}
break;
}
}
}

56
Core/User/Task/HeartBeatTask.c
View File

@@ -13,34 +13,6 @@
void HeartBeat_Sign(void);
/**
* @brief 发送显示数据
* @note 发送显示数据，包括充电桩的连接状态和工作状态
*/
void Send_Display_Data(void)
{
#ifdef DEBUG
char str[128];
sprintf(str, "t1.bco=%s\xff\xff\xfft2.bco=%s\xff\xff\xfft3.bco=%s\xff\xff\xfft4.bco=%s\xff\xff\xfft5.bco=%s\xff\xff\xfft6.bco=%s\xff\xff\xff",
g_charger_manager.charger_piles[0].is_udp_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[1].is_udp_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[2].is_udp_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[3].is_udp_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[4].is_udp_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[5].is_udp_online ? "GREEN" : "RED");
Rs485_Message_Send(str, strlen(str));
sprintf(str, "t7.bco=%s\xff\xff\xfft8.bco=%s\xff\xff\xfft9.bco=%s\xff\xff\xfft10.bco=%s\xff\xff\xfft11.bco=%s\xff\xff\xfft12.bco=%s\xff\xff\xff",
g_charger_manager.charger_piles[0].is_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[1].is_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[2].is_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[3].is_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[4].is_online ? "GREEN" : "RED",
g_charger_manager.charger_piles[5].is_online ? "GREEN" : "RED");
Rs485_Message_Send(str, strlen(str));
#endif
}
/**
* @funNm : HeartbeatTask_Function
@@ -69,13 +41,30 @@ void HeartbeatTask_Function(void const *argument)
* @param : none
* @retval: void
*/
static uint32_t last_heartbeat_tick[MAX_CHARGER_COUNT] = {0};
void HeartBeat_Sign(void)
{
if (g_charger_manager.charger_piles[0].is_online)
int i;
uint32_t now = HAL_GetTick();
bool any_online = false;
/* 6路桩独立心跳，互不影响 */
for (i = 0; i < MAX_CHARGER_COUNT; i++)
{
if (g_charger_manager.charger_piles[i].is_online)
{
any_online = true;
if ((now - last_heartbeat_tick[i]) >= 8000)
{
last_heartbeat_tick[i] = now;
charger_to_server_0X03(i + 1, 1, 0);
}
}
}
if (any_online)
{
RUN_EVERY(8000, tick_A, {
charger_to_server_0X03(1, 1, 0);
});
RUN_EVERY(100, tick_B, {
System_Mode_Led_Toggle();
});
@@ -90,7 +79,4 @@ void HeartBeat_Sign(void)
RUN_EVERY(1000, tick_D, {
System_Run_Led_Toggle();
});
RUN_EVERY(500, tick_E, {
Send_Display_Data();
});
}

47
Core/User/Task/YkcTask.c
View File

@@ -28,6 +28,8 @@ void YkcTask_Function(void const *argument)
{
init_chargers(); /* 初始化桩结构体*/
ulTaskNotifyTake(pdTRUE, portMAX_DELAY); /* 等待桩通讯协议层完成*/
osDelay(5000);
// send_server_address_to_air724();
while (1)
{
TaskRunTimeStat.YkcTask.threads_runtime = GetTask_RunTime(YkcTaskID);
@@ -36,36 +38,59 @@ void YkcTask_Function(void const *argument)
switch (SETP)
{
case 0:
case 0:
{
if (g_charger_manager.charger_piles[1 - 1].is_udp_online)
{
uint8_t open_cmd[] = { 0x55, 0xAA, 0x3, 0x01, 0x01, 0xAA, 0x55};
Air724_Message_Send(open_cmd, sizeof(open_cmd));
osDelay(3000);
SETP = 1;
}
else
{
printf("网关：等待桩上电指令\r\n");
osDelay(1000);
SETP = 0;
}
}
break;
case 1:
{
if (!g_charger_manager.charger_piles[1 - 1].is_online)
{
charger_to_server_0X01(1);
}
else
{
SETP = 1;
}
}
break;
case 1:
{
if (!g_charger_manager.charger_piles[1 - 1].get_model)
charger_to_server_0X09(1); // 桩1计费模型请求
else
SETP = 2;
}
osDelay(5000);
}
break;
case 2:
{
if (!g_charger_manager.charger_piles[1 - 1].get_model)
charger_to_server_0X09(1); // 桩1计费模型请求
else
SETP = 3;
osDelay(3000);
}
break;
case 3:
{
charger_to_server_0X13(1, 1); // 上传状态
osDelay(15000);
}
break;
default:
break;
}
osDelay(2000);
//osDelay(2000);
}
}

0
Core/User/Task/新建 文本文档 (2).txt
View File

0
Core/User/Task/新建 文本文档.txt
View File