add float output with cal command

This commit is contained in:
TT 2016-10-16 14:29:01 +09:00
parent f22830cdb0
commit 09c99564f6
2 changed files with 7 additions and 5 deletions

View file

@ -524,6 +524,8 @@
/* Port-specific settings (override port settings defaulted in chcore.h). */
/*===========================================================================*/
#define CHPRINTF_USE_FLOAT TRUE
#endif /* _CHCONF_H_ */
/** @} */

10
main.c
View file

@ -641,11 +641,11 @@ static void cmd_cal(BaseSequentialStream *chp, int argc, char *argv[])
cal_status = 0;
return;
} else if (strcmp(cmd, "data") == 0) {
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_LOAD][0][0]*10000, (int)cal_data[CAL_LOAD][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_OPEN][0][0]*10000, (int)cal_data[CAL_OPEN][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_SHORT][0][0]*10000, (int)cal_data[CAL_SHORT][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_THRU][0][0]*10000, (int)cal_data[CAL_THRU][0][1]*10000);
chprintf(chp, "%d %d\r\n", (int)cal_data[CAL_ISOLN][0][0]*10000, (int)cal_data[CAL_ISOLN][0][1]*10000);
chprintf(chp, "%f %f\r\n", cal_data[CAL_LOAD][0][0], cal_data[CAL_LOAD][0][1]);
chprintf(chp, "%f %f\r\n", cal_data[CAL_OPEN][0][0], cal_data[CAL_OPEN][0][1]);
chprintf(chp, "%f %f\r\n", cal_data[CAL_SHORT][0][0], cal_data[CAL_SHORT][0][1]);
chprintf(chp, "%f %f\r\n", cal_data[CAL_THRU][0][0], cal_data[CAL_THRU][0][1]);
chprintf(chp, "%f %f\r\n", cal_data[CAL_ISOLN][0][0], cal_data[CAL_ISOLN][0][1]);
return;
} else {
chprintf(chp, "usage: cal [load|open|short|thru|isoln|done|reset|on|off]\r\n");