comparison: main/task_sdcard.c
main/task_sdcard.c
- changeset 6
- e84200edc852
- parent 4
- 6d1f512cd074
- child 13
- 8f01b74bf1dd
equal
deleted
inserted
replaced
| 5:87b86d16b1d6 | 6:e84200edc852 |
|---|---|
| 128 json_log->mlt_sp, json_log->mlt_pv, json_log->mlt_power, json_log->mlt_tempreached, json_log->pump_run); | 128 json_log->mlt_sp, json_log->mlt_pv, json_log->mlt_power, json_log->mlt_tempreached, json_log->pump_run); |
| 129 if (json_log->hlt_sp > 0.0) { | 129 if (json_log->hlt_sp > 0.0) { |
| 130 fprintf(f, "\"HLT_sp\":\"%.3f\",\"HLT_pv\":\"%.3f\",\"HLT_pwm\":\"%d\",", json_log->hlt_sp, json_log->hlt_pv, json_log->hlt_power); | 130 fprintf(f, "\"HLT_sp\":\"%.3f\",\"HLT_pv\":\"%.3f\",\"HLT_pwm\":\"%d\",", json_log->hlt_sp, json_log->hlt_pv, json_log->hlt_power); |
| 131 } | 131 } |
| 132 fprintf(f, "\"Label\":\"%s\"}", json_log->time); | 132 fprintf(f, "\"Label\":\"%s\"}", json_log->time); |
| 133 printf("{\"MLT_sp\":\"%.3f\",\"MLT_pv\":\"%.3f\",\"MLT_pwm\":\"%d\",\"MLT_tr\":\"%d\",\"Pump\":\"%d\",", | 133 // printf("{\"MLT_sp\":\"%.3f\",\"MLT_pv\":\"%.3f\",\"MLT_pwm\":\"%d\",\"MLT_tr\":\"%d\",\"Pump\":\"%d\",", |
| 134 json_log->mlt_sp, json_log->mlt_pv, json_log->mlt_power, json_log->mlt_tempreached, json_log->pump_run); | 134 // json_log->mlt_sp, json_log->mlt_pv, json_log->mlt_power, json_log->mlt_tempreached, json_log->pump_run); |
| 135 if (json_log->hlt_sp > 0.0) { | 135 // if (json_log->hlt_sp > 0.0) { |
| 136 printf("\"HLT_sp\":\"%.3f\",\"HLT_pv\":\"%.3f\",\"HLT_pwm\":\"%d\",", json_log->hlt_sp, json_log->hlt_pv, json_log->hlt_power); | 136 // printf("\"HLT_sp\":\"%.3f\",\"HLT_pv\":\"%.3f\",\"HLT_pwm\":\"%d\",", json_log->hlt_sp, json_log->hlt_pv, json_log->hlt_power); |
| 137 } | 137 // } |
| 138 printf("\"Label\":\"%s\"}\n", json_log->time); | 138 // printf("\"Label\":\"%s\"}\n", json_log->time); |
| 139 fclose(f); | 139 fclose(f); |
| 140 } | 140 } |
| 141 } | 141 } |
| 142 } | 142 } |
| 143 | 143 |
| 184 fprintf(f, ",\n"); | 184 fprintf(f, ",\n"); |
| 185 } | 185 } |
| 186 addcomma = true; | 186 addcomma = true; |
| 187 fprintf(f, "{\"type\":\"line\",\"mode\":\"vertical\",\"scaleID\":\"x-axis-0\",\"value\":\"%s\",\"borderColor\":\"%s\",\"borderWidth\":2,\"label\":{\"backgroundColor\":\"%s\",\"content\":\"%s\",\"position\":\"%s\",\"enabled\":true}}", json_log->time, bordercolor, color, label, pos); | 187 fprintf(f, "{\"type\":\"line\",\"mode\":\"vertical\",\"scaleID\":\"x-axis-0\",\"value\":\"%s\",\"borderColor\":\"%s\",\"borderWidth\":2,\"label\":{\"backgroundColor\":\"%s\",\"content\":\"%s\",\"position\":\"%s\",\"enabled\":true}}", json_log->time, bordercolor, color, label, pos); |
| 188 fclose(f); | 188 fclose(f); |
| 189 printf( "{\"type\":\"line\",\"mode\":\"vertical\",\"scaleID\":\"x-axis-0\",\"value\":\"%s\",\"borderColor\":\"%s\",\"borderWidth\":2,\"label\":{\"backgroundColor\":\"%s\",\"content\":\"%s\",\"position\":\"%s\",\"enabled\":true}}\n", json_log->time, bordercolor, color, label, pos); | |
| 190 } | 189 } |
| 191 } | 190 } |
| 192 } | 191 } |
| 193 | 192 |
| 194 | 193 |
