Index: firmware/App/HDCommon.h =================================================================== diff -u -r708c23e585468515a8467d0056d712b2846b56da -r85b9b8c296b53a034da675bf76948a5075f5c1b0 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 708c23e585468515a8467d0056d712b2846b56da) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 85b9b8c296b53a034da675bf76948a5075f5c1b0) @@ -39,7 +39,7 @@ // #define TASK_TIMING_OUTPUT_ENABLED 1 // Re-purposes alarm lamp pins for task timing #define DISABLE_ALARM_AUDIO 1 // Disable alarm audio #define SKIP_POST 1 // Skip POST tests - all pass - #define DONT_SKIP_NV_POST 1 // Do not skip NV Data POST +// #define DONT_SKIP_NV_POST 1 // Do not skip NV Data POST // #define USE_LIBRARY_TIME_FUNCTIONS 1 // Use the C library functions mktime() and gmtime() for epoch<=>date conversions #define DISABLE_AIR_TRAP_LEVELING_ALARM 1 // Disable air trap level control alarms // #define DISABLE_3WAY_VALVES 1 // Disable 3-way valves @@ -64,20 +64,20 @@ #define ALARMS_DEBUG 1 // Triggered alarms sent to debug UART #define ALARM_VOLUME_DEFAULT_LOW 1 // Set default alarm volume to lowest // #define TEMP_UI_ALARM_SILENCE_FIX 1 // Temporary UI fix for handling alarm silence request msg -// #define SKIP_PRIMING 1 // Skip Pre-treatment Prime + #define SKIP_PRIMING 1 // Skip Pre-treatment Prime #define SKIP_WET_SELF_TESTS 1 // Skip Pre-treatment prime wet self-tests - #define V2_0_SYSTEM 1 // Build for v2.0 system +// #define V2_0_SYSTEM 1 // Build for v2.0 system #define SKIP_SAMPLE_WATER 1 // Skip pre-treatment sample water #define SKIP_CONSUMABLE_TESTS 1 // Skip pre-treatment consumable Self-tests #define SKIP_DRY_SELF_TESTS 1 // Skip pre-treatment dry self-tests -// #define SKIP_UI_INTERACTION 1 // Skip UI interaction. + #define SKIP_UI_INTERACTION 1 // Skip UI interaction. #define DISABLE_BATT_COMM 1 // Disable battery communication. #define SKIP_AIR_BUBBLE_CHECK 1 // Skip air bubble detector self-test. #define DISABLE_OCCLUSION_SELF_TEST 1 // Skip occlusion sensor self-test. -// #define SKIP_CARTRIDGE_REMOVAL 1 // Skip cartridge removal check -// #define SKIP_EMPTY_RES_CHECK 1 // Skip reservoir empty check -// #define DISABLE_FPGA_COUNTER_CHECKS 1 // Disable alarms associated with FPGA read/error counters -// #define DISABLE_VOLTAGE_MONITOR 1 // Disable voltage monitoring/alarms + #define SKIP_CARTRIDGE_REMOVAL 1 // Skip cartridge removal check + #define SKIP_EMPTY_RES_CHECK 1 // Skip reservoir empty check + #define DISABLE_FPGA_COUNTER_CHECKS 1 // Disable alarms associated with FPGA read/error counters + #define DISABLE_VOLTAGE_MONITOR 1 // Disable voltage monitoring/alarms #define ALLOW_1_MIN_TREATMENT_DURATION 1 // Allow user to change treatment duration to as low as 1 minute #define DISABLE_SYRINGE_PUMP_ALARMS 1 // Disable some syringe pump alarms that are triggering intermittently #define NO_PUMP_FLOW_LIMITS 1 // Allow any commanded flow rate for peristaltic pumps Index: firmware/HD.dil =================================================================== diff -u -rf0c52f6adff7b61132953890a74f1c462b31eedf -r85b9b8c296b53a034da675bf76948a5075f5c1b0 --- firmware/HD.dil (.../HD.dil) (revision f0c52f6adff7b61132953890a74f1c462b31eedf) +++ firmware/HD.dil (.../HD.dil) (revision 85b9b8c296b53a034da675bf76948a5075f5c1b0) @@ -1,4 +1,4 @@ -# RM46L852PGE 04/21/21 08:43:45 +# RM46L852PGE 06/18/21 09:42:59 # ARCH=RM46L852PGE # @@ -7020,12 +7020,12 @@ DRIVER.I2C.VAR.I2C_DATACOUNT.VALUE=8 DRIVER.I2C.VAR.I2C_ADDRMODE.VALUE=7BIT_AMODE DRIVER.I2C.VAR.I2C_PORT_BIT0_FUN.VALUE=0 -DRIVER.I2C.VAR.I2C_PORT_BIT0_PDR.VALUE=1 +DRIVER.I2C.VAR.I2C_PORT_BIT0_PDR.VALUE=0 DRIVER.I2C.VAR.I2C_BC_VALUE.VALUE=0x0003 DRIVER.I2C.VAR.I2C_PORT_BIT1_FUN.VALUE=0 DRIVER.I2C.VAR.I2C_RM_ENA.VALUE=1 DRIVER.I2C.VAR.I2C_BC.VALUE=8_BIT -DRIVER.I2C.VAR.I2C_PORT_BIT1_PDR.VALUE=1 +DRIVER.I2C.VAR.I2C_PORT_BIT1_PDR.VALUE=0 DRIVER.I2C.VAR.I2C_TXRX_VALUE.VALUE=0 DRIVER.I2C.VAR.I2C_SCDLVL.VALUE=0 DRIVER.I2C.VAR.I2C_PORT_BIT0_PSL.VALUE=1 Index: firmware/include/i2c.h =================================================================== diff -u -rd2d9f19fd458bad756c2468ea10fceb0c11d4200 -r85b9b8c296b53a034da675bf76948a5075f5c1b0 --- firmware/include/i2c.h (.../i2c.h) (revision d2d9f19fd458bad756c2468ea10fceb0c11d4200) +++ firmware/include/i2c.h (.../i2c.h) (revision 85b9b8c296b53a034da675bf76948a5075f5c1b0) @@ -193,8 +193,8 @@ #define I2C_FUN_CONFIGVALUE 0U #define I2C_DIR_CONFIGVALUE ((uint32)((uint32)0U << 1U) \ | (uint32)((uint32)0U)) -#define I2C_ODR_CONFIGVALUE ((uint32)((uint32)1U << 1U) \ - | (uint32)((uint32)1U)) +#define I2C_ODR_CONFIGVALUE ((uint32)((uint32)0U << 1U) \ + | (uint32)((uint32)0U)) #define I2C_PD_CONFIGVALUE ((uint32)((uint32)0U << 1U) \ | (uint32)((uint32)0U)) #define I2C_PSL_CONFIGVALUE ((uint32)((uint32)1U << 1U) \ Index: firmware/source/i2c.c =================================================================== diff -u -rd2d9f19fd458bad756c2468ea10fceb0c11d4200 -r85b9b8c296b53a034da675bf76948a5075f5c1b0 --- firmware/source/i2c.c (.../i2c.c) (revision d2d9f19fd458bad756c2468ea10fceb0c11d4200) +++ firmware/source/i2c.c (.../i2c.c) (revision 85b9b8c296b53a034da675bf76948a5075f5c1b0) @@ -127,8 +127,8 @@ | (uint32)(0U); /* scl pin */ /** - set i2c pins open drain enable */ - i2cREG1->PDR = (uint32)((uint32)1U << 1U) /* sda pin */ - | (uint32)(1U); /* scl pin */ + i2cREG1->PDR = (uint32)((uint32)0U << 1U) /* sda pin */ + | (uint32)(0U); /* scl pin */ /** - set i2c pins pullup/pulldown enable */ i2cREG1->PDIS = (uint32)((uint32)0U << 1U) /* sda pin */ Index: firmware/source/sys_main.c =================================================================== diff -u -r73de7677269d01fb809caa4140f8d265dd2ed424 -r85b9b8c296b53a034da675bf76948a5075f5c1b0 --- firmware/source/sys_main.c (.../sys_main.c) (revision 73de7677269d01fb809caa4140f8d265dd2ed424) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 85b9b8c296b53a034da675bf76948a5075f5c1b0) @@ -77,6 +77,7 @@ #include "DialOutFlow.h" #include "FluidLeak.h" #include "FPGA.h" +#include "Integrity.h" #include "InternalADC.h" #include "Interrupts.h" #include "MsgQueues.h"