From 071a25b7bb2c03a6ae29fec70bd415ea89092dc4 Mon Sep 17 00:00:00 2001
From: Ronen Sberlo <ronen.s@twine-s.com>
Date: Wed, 23 Dec 2020 10:49:42 +0200
Subject: fix cartridge ink progress bar

---
 Software/Embedded_SW/Embedded/Modules/IFS/ifs.c | 4 +++-
 Software/Embedded_SW/Embedded/Modules/IFS/ifs.h | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'Software/Embedded_SW')

diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index 469e82aa8..2c67a623b 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -157,6 +157,7 @@ bool CartridgeInkFull()
 int GetCartridgeFillPercent()
 {
     double MidTank_Pressure = 0;
+    double percent;
 #ifdef IFS_DEBUG
     static int percent = 0;
     if (midTankState == MidTankStateFilling) {
@@ -169,7 +170,8 @@ int GetCartridgeFillPercent()
     return percent;
 #else
     MidTank_Pressure = Read_MidTank_Pressure_Sensor(midTankCartColor);
-    return (((MidTank_Pressure - midTankCapacity)* 100) / CARTRIDGE_CAPATICY);
+    percent = (((MidTank_Pressure - midTankCapacity)* 100) / CARTRIDGE_CAPATICY);
+    return percent;
 #endif
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
index 0f95fb2e2..7d68621e9 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
@@ -13,7 +13,7 @@
 
 #define CARTRIDGE_INK_TIMEOUT           420
 #define MidTank_Pressure_EMPTY          0.3
-#define CARTRIDGE_CAPATICY              1500
+#define CARTRIDGE_CAPATICY              1.5
 
 typedef enum{
     MidTankStateIdle,
-- 
cgit v1.3.1