Fix calibration (#1513)

openshwprojects · Jan 17, 2025 · d0a056e · d0a056e
1 parent f4b50fe
commit d0a056e
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/driver/drv_pwrCal.c b/src/driver/drv_pwrCal.c
@@ -1,5 +1,6 @@
 #include "drv_pwrCal.h"
 
+#include <math.h>
 #include "../cmnds/cmd_public.h"
 #include "../logging/logging.h"
 #include "../new_cfg.h"
@@ -33,10 +34,16 @@ static commandResult_t Calibrate(const char *cmd, const char *args, float raw,
 #define VERY_SMALL_VAL 0.001f
 	if (raw > -VERY_SMALL_VAL && raw < VERY_SMALL_VAL) {
 		ADDLOG_ERROR(LOG_FEATURE_ENERGYMETER, "Calibration incorrect - connect load first.");
+		return CMD_RES_ERROR;
 	}
 
 
     *cal = (cal_type == PWR_CAL_MULTIPLY ? real / raw : raw / real);
+    if (isnan(*cal) || ((*cal) > -VERY_SMALL_VAL && (*cal) < VERY_SMALL_VAL))
+    {
+        ADDLOG_ERROR(LOG_FEATURE_ENERGYMETER, "Calibration incorrect - value is zero");
+        return CMD_RES_ERROR;
+    }
     CFG_SetPowerMeasurementCalibrationFloat(cfg_index, *cal);
 
 #ifdef PWRCAL_DEBUG