Merge pull request #213 from makers-for-life/fix-bugs-from-sonar

Fix various bugs found by Sonar
makers-for-life · Apr 29, 2020 · f6624a9 · f6624a9
2 parents 3175437 + ae33cb0
commit f6624a9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/software/firmware/srcs/integration_test.cpp b/src/software/firmware/srcs/integration_test.cpp
@@ -366,8 +366,13 @@ void loop() {
             waitForInMs(10000);
 
             char msg[SCREEN_LINE_LENGTH + 1];
-            (void)snprintf(msg, SCREEN_LINE_LENGTH + 1, "Moyenne : %3d mmH2O",
-                           pressureOffsetSum / pressureOffsetCount);
+            int32_t mean;
+            if (pressureOffsetCount != 0) {
+                mean = pressureOffsetSum / pressureOffsetCount;
+            } else {
+                mean = 0;
+            }
+            (void)snprintf(msg, SCREEN_LINE_LENGTH + 1, "Moyenne : %3dl mmH2O", mean);
             displayLine(msg, 1);
             (void)snprintf(msg, SCREEN_LINE_LENGTH + 1, "Fuite : %3d mmH2O",
                            maxOffsetValue - minOffsetValue);
@@ -433,7 +438,7 @@ void loop() {
         updateBatterySample();
         if ((millis() - last_time) >= 200) {
             char msg[SCREEN_LINE_LENGTH + 1];
-            (void)snprintf(msg, SCREEN_LINE_LENGTH + 1, "Batterie : %2u.%1u V", getBatteryLevel(),
+            (void)snprintf(msg, SCREEN_LINE_LENGTH + 1, "Batterie : %2ul.%1ul V", getBatteryLevel(),
                            (getBatteryLevelX10() - (10u * getBatteryLevel())));
             displayLine(msg, 3);
             last_time = millis();

diff --git a/src/software/firmware/srcs/respirator.cpp b/src/software/firmware/srcs/respirator.cpp
@@ -192,7 +192,11 @@ void setup(void) {
     waitForInMs(3000);
 
     resetScreen();
-    pressureOffset = pressureOffsetSum / static_cast<int32_t>(pressureOffsetCount);
+    if (pressureOffsetCount != 0u) {
+        pressureOffset = pressureOffsetSum / static_cast<int32_t>(pressureOffsetCount);
+    } else {
+        pressureOffset = 0;
+    }
     DBG_DO({
         Serial.print("pressure offset = ");
         Serial.print(pressureOffsetSum);