sc/828F
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xx

Browse Source
This commit is contained in:
sc committed 2026-01-26 01:49:05 +08:00
1 parent 541738319d
commit 83f6dde860
12 files changed
+68 -22
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/data/DATA_comm.c
+5 -7
View File
@@ -408,20 +408,20 @@ void pasre_DAT(const char *api, const char *json_str)
}
else if (strcmp(api, "SC830") == 0)
{//当前信息
cJSON_AddItemToObject(dat,"ERR",cJSON_CreateBool(MACHINE_ERR));
cJSON_AddItemToObject(dat,"LOCK",cJSON_CreateBool(MACHINE_LOCK));
cJSON_AddItemToObject(dat,"ERR",cJSON_CreateNumber(MACHINE_ERR));
cJSON_AddItemToObject(dat,"LOCK",cJSON_CreateNumber(MACHINE_LOCK));
cJSON_AddItemToObject(dat,"Status",cJSON_CreateString(Message));
cJSON_AddItemToObject(dat,"Work",cJSON_CreateString(Work));
cJSON_AddItemToObject(dat,"ReDye",cJSON_CreateNumber(Redye));
cJSON_AddItemToObject(dat,"Process",cJSON_CreateString(Process));
cJSON_AddItemToObject(dat,"Step",cJSON_CreateString(Step));
cJSON_AddItemToObject(dat,"User",cJSON_CreateBool(MACHINE_USER));
cJSON_AddItemToObject(dat,"UserB",cJSON_CreateString("False"));
cJSON_AddItemToObject(dat,"User",cJSON_CreateNumber(MACHINE_USER));
cJSON_AddItemToObject(dat,"UserB",cJSON_CreateNumber(0));
cJSON_AddItemToObject(dat,"InfoS",cJSON_CreateNumber(UserInfoStart));
cJSON_AddItemToObject(dat,"Info",cJSON_CreateString(Info));
cJSON_AddItemToObject(dat,"RUN",cJSON_CreateNumber(RUN));
cJSON_AddItemToObject(dat,"STEPID",cJSON_CreateNumber(STEPID));
cJSON_AddItemToObject(dat,"CALL",cJSON_CreateBool(MACHINE_CALL));
cJSON_AddItemToObject(dat,"CALL",cJSON_CreateNumber(MACHINE_CALL));
cJSON_AddItemToObject(dat,"MST",cJSON_CreateNumber(MST));
cJSON_AddItemToObject(dat,"MTT",cJSON_CreateNumber(MTT));
cJSON_AddItemToObject(dat,"MTL",cJSON_CreateNumber(MTL));
@@ -431,8 +431,6 @@ void pasre_DAT(const char *api, const char *json_str)
cJSON_AddItemToObject(dat,"STLA",cJSON_CreateNumber(STLA));
cJSON_AddItemToObject(dat,"STTB",cJSON_CreateNumber(STTB));
cJSON_AddItemToObject(dat,"STLB",cJSON_CreateNumber(STLB));
cJSON_AddItemToObject(dat,"STTC",cJSON_CreateNumber(STTC));
cJSON_AddItemToObject(dat,"STLC",cJSON_CreateNumber(STLC));
}
else if (strcmp(api, "SC831") == 0)
{//当前步骤信息
applications/data/Variable.c
+5 -5
View File
@@ -21,11 +21,11 @@ char machine_name[16];
char machine_ID[3];
// 状态标志
char MACHINE_ERR = 0;
char MACHINE_LOCK = 0;
char MACHINE_AUTO = 0;
char MACHINE_CALL = 0;
char MACHINE_USER = 0;
rt_bool_t MACHINE_ERR = 0;
rt_bool_t MACHINE_LOCK = 0;
rt_bool_t MACHINE_AUTO =0;
rt_bool_t MACHINE_CALL = 0;
rt_bool_t MACHINE_USER = 0;
// 字符串变量（RAM 中可修改）
char Work[25]="SC----------";
applications/data/Variable.h
+5 -5
View File
@@ -22,11 +22,11 @@ extern char machine_name[16];
extern char machine_ID[3];
// ===== 布尔变量 =====
extern char MACHINE_ERR;
extern char MACHINE_LOCK;
extern char MACHINE_AUTO;
extern char MACHINE_CALL;
extern char MACHINE_USER;
extern rt_bool_t MACHINE_ERR;
extern rt_bool_t MACHINE_LOCK;
extern rt_bool_t MACHINE_AUTO;
extern rt_bool_t MACHINE_CALL;
extern rt_bool_t MACHINE_USER;
// ===== 字符串 =====
extern char Work[25];