diff --git a/chconf.h b/chconf.h index 807a309..b4dc069 100644 --- a/chconf.h +++ b/chconf.h @@ -524,6 +524,8 @@ /* Port-specific settings (override port settings defaulted in chcore.h). */ /*===========================================================================*/ +#define CHPRINTF_USE_FLOAT TRUE + #endif /* _CHCONF_H_ */ /** @} */ diff --git a/main.c b/main.c index 3cf7a58..af16942 100644 --- a/main.c +++ b/main.c @@ -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");