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

显示信息添加

Browse Source
This commit is contained in:
sc committed 2026-01-12 01:06:40 +08:00
1 parent 0f55442fc6
commit d0495cd3fc
7 files changed
+52 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/data/DATA_comm.c
+8 -2
View File
@@ -442,9 +442,15 @@ void pasre_DAT(const char *api, const char *json_str)
else if (strcmp(api, "SC832") == 0)
{//当前细节信息
cJSON_AddItemToObject(dat,"Pump",cJSON_CreateNumber(Pump));//泵
cJSON_AddItemToObject(dat,"TC",cJSON_CreateNumber(TC));//温度比例
cJSON_AddItemToObject(dat,"TC",cJSON_CreateNumber(TC_H));//温度比例
cJSON_AddItemToObject(dat,"TCL",cJSON_CreateNumber(TC_L));//温度比例
cJSON_AddItemToObject(dat,"Fan",cJSON_CreateNumber(Fan));//风机
cJSON_AddItemToObject(dat,"Pull",cJSON_CreateNumber(Pull));//提布
cJSON_AddItemToObject(dat,"Pull",cJSON_CreateNumber(Pull1));//提布
cJSON_AddItemToObject(dat,"Pull2",cJSON_CreateNumber(Pull2));//提布
cJSON_AddItemToObject(dat,"Pull3",cJSON_CreateNumber(Pull3));//提布
cJSON_AddItemToObject(dat,"Pull4",cJSON_CreateNumber(Pull4));//提布
cJSON_AddItemToObject(dat,"Pull5",cJSON_CreateNumber(Pull5));//提布
cJSON_AddItemToObject(dat,"Pull6",cJSON_CreateNumber(Pull6));//提布
cJSON_AddItemToObject(dat,"Swing",cJSON_CreateNumber(Swing));//摆布
cJSON_AddItemToObject(dat,"STA",cJSON_CreateNumber(STA));//料1
cJSON_AddItemToObject(dat,"STB",cJSON_CreateNumber(STB));//料2
applications/data/SC828_DATA_table.c
+24 -5
View File
@@ -310,8 +310,10 @@ void DATA_INSTRUCTION_START(char p[25]){
rt_snprintf(step_table[i].StepID_S2, 3,"000");
rt_snprintf(step_table[i].StepID_S3, 3,"000");
}
Pump = 0;TC = 0;Fan = 0;Pull = 0;Swing = 0;
STA = 0;STB = 0;STC = 0;Time = 0;StepN = 0;
Pump = 0;TC_H = 0;TC_L = 0;Fan = 0;
Swing = 0;Pull1 = 0;Pull2 = 0;Pull3 = 0;
Pull4 = 0;Pull5 = 0;Pull6 = 0;StepN = 0;
STA = 0;STB = 0;STC = 0;Time = 0;
P6 = 0;P7 = 0;P8 = 0;P9 = 0;P10 = 0;
P1 = 0;P2 =0;P3 =0;P4 =0;P5 =0;
P1S1 =0;P2S1 =0;P3S1 =0;P4S1 =0;
@@ -353,8 +355,10 @@ void DATA_INSTRUCTION_STOP(){
rt_snprintf(step_table[i].StepID_S2, 3,"000");
rt_snprintf(step_table[i].StepID_S3, 3,"000");
}
Pump = 0;TC = 0;Fan = 0;Pull = 0;Swing = 0;
STA = 0;STB = 0;STC = 0;Time = 0;StepN = 0;
Pump = 0;TC_H = 0;TC_L = 0;Fan = 0;
Swing = 0;Pull1 = 0;Pull2 = 0;Pull3 = 0;
Pull4 = 0;Pull5 = 0;Pull6 = 0;StepN = 0;
STA = 0;STB = 0;STC = 0;Time = 0;
P6 = 0;P7 = 0;P8 = 0;P9 = 0;P10 = 0;
P1 = 0;P2 =0;P3 =0;P4 =0;P5 =0;
P1S1 =0;P2S1 =0;P3S1 =0;P4S1 =0;
@@ -396,6 +400,7 @@ void table_thread_entry(void *parameter)
{
rt_thread_delay(1000);
//Ai输入
MTT = get_ai_value(4001)/10.0f;
MUT = get_ai_value(4002)/10.0f;
STTA = get_ai_value(4003)/10.0f;
@@ -407,7 +412,21 @@ void table_thread_entry(void *parameter)
STLC = get_ai_value(4010);
MTH = get_ai_value(4022);
//Ao输出
get_ao_value(5001,TC_H);
get_ao_value(5002,TC_L);
get_ao_value(5003,Fan);
get_ao_value(5004,Pump);
get_ao_value(5005,STA);
get_ao_value(5006,STB);
get_ao_value(5007,STC);
get_ao_value(5008,Swing);
get_ao_value(5009,Pull1);
get_ao_value(5010,Pull2);
get_ao_value(5011,Pull3);
get_ao_value(5012,Pull4);
get_ao_value(5013,Pull5);
get_ao_value(5014,Pull6);
}
}
applications/data/Variable.c
+8 -2
View File
@@ -56,9 +56,15 @@ float STLC = 0.0f;//料c水位
// 控制输出
unsigned int Pump = 0;//主泵
unsigned int TC = 0;//温度比例
unsigned int TC_H = 0;//温度比例
unsigned int TC_L = 0;//温度比例
unsigned int Fan = 0;//风机
unsigned int Pull = 0;//提布
unsigned int Pull1 = 0;//提布
unsigned int Pull2= 0;//提布
unsigned int Pull3 = 0;//提布
unsigned int Pull4 = 0;//提布
unsigned int Pull5 = 0;//提布
unsigned int Pull6 = 0;//提布
unsigned int Swing = 0;//摆布
unsigned int STA = 0;//料a比例
unsigned int STB = 0;
applications/data/Variable.h
+8 -2
View File
@@ -42,9 +42,15 @@ extern unsigned int UserInfoStart;
extern unsigned int RUN;
extern unsigned int STEPID;
extern unsigned int Pump;
extern unsigned int TC;
extern unsigned int TC_H;//温度比例
extern unsigned int TC_L;//温度比例
extern unsigned int Fan;
extern unsigned int Pull;
extern unsigned int Pull1;
extern unsigned int Pull2;
extern unsigned int Pull3;
extern unsigned int Pull4;
extern unsigned int Pull5;
extern unsigned int Pull6;
extern unsigned int Swing;
extern unsigned int STA;
extern unsigned int STB;