Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r8c5ca1982c53f4702c6f019ce9bcfedb9e513548 -r3ea4def3a3a69a00fb96b6089dbd097fa80041de --- firmware/App/Monitors/Level.c (.../Level.c) (revision 8c5ca1982c53f4702c6f019ce9bcfedb9e513548) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision 3ea4def3a3a69a00fb96b6089dbd097fa80041de) @@ -28,9 +28,9 @@ */ // ********** private definitions ********** -#define FPGA_LEVEL_LOW 4 ///< Floater low level status -#define FPGA_LEVEL_MEDIUM 5 ///< Floater medium level status -#define FPGA_LEVEL_HIGH 7 ///< Floater high level status +#define FPGA_LEVEL_LOW 2 ///< Floater low level status +#define FPGA_LEVEL_MEDIUM 3 ///< Floater medium level status +#define FPGA_LEVEL_HIGH 1 ///< Floater high level status #define LEVEL_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the level data is published on the CAN bus. #define LEVEL_DEBOUNCE_TIME_MS ( MS_PER_SECOND / 10 ) ///< Level debounce time in milliseconds. #define DATA_PUBLISH_COUNTER_START_COUNT 7 ///< Data publish counter start count. @@ -117,6 +117,7 @@ else { // Handle invalid level - alarm + currentLevelStatus = LEVEL_STATE_ILLEGAL ; } break; @@ -233,6 +234,7 @@ data.floaterLevel = (U32)getLevelStatus( FLOATER_LEVEL ); data.bicarbLevel = (U32)getLevelStatus( BICARB_LEVEL ); data.spentDialysateLevel = (U32)getLevelStatus( SPENT_DIALYSATE_LEVEL ); + //data.spentDialysateLevel = (U32)getFPGAFloater1Status(); levelsDataPublicationCounter = 0;