Index: firmware/App/Controllers/Voltages.h =================================================================== diff -u -r9f2e4e5933d2e418b75f91e3db5df69c71878d43 -r850f74b97895fd0f6c4728541ac2582f7b5c5a0b --- firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision 9f2e4e5933d2e418b75f91e3db5df69c71878d43) +++ firmware/App/Controllers/Voltages.h (.../Voltages.h) (revision 850f74b97895fd0f6c4728541ac2582f7b5c5a0b) @@ -5,7 +5,7 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file PresOccl.h +* @file Voltages.h * * @author (last) Sean Nash * @date (last) 15-Apr-2021 @@ -22,8 +22,8 @@ /** * @defgroup Voltages Voltages - * @brief Pressure & Occlusion controller/monitor module. Monitors the - * blood line pressure sensors and pump occlusion sensors. + * @brief Voltages monitor module. Monitors the various system voltages + * to ensure they are in expected range. * * @addtogroup Voltages * @{ Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -rf19f3deed8f9ee103482fa0232df44f8a73eae30 -r850f74b97895fd0f6c4728541ac2582f7b5c5a0b --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 850f74b97895fd0f6c4728541ac2582f7b5c5a0b) @@ -40,7 +40,7 @@ INT_ADC_24V_ACTUATORS_REG, // 3 INT_ADC_1_2V_PROCESSOR, // 4 INT_ADC_5V_SENSORS, // 5 - INT_ADC_NOT_USED, // 6 + INT_ADC_DUMMY, // 6 INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT, // 7 INT_ADC_PRIMARY_ALARM_CURRENT_HG, // 8 INT_ADC_NOT_USED, // 9 @@ -74,14 +74,15 @@ 0.009420, // V - INT_ADC_24V_ACTUATORS_REG 0.000733, // V - INT_ADC_1_2V_PROCESSOR 0.001465, // V - INT_ADC_5V_SENSORS - 0.073240, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_HG + 0.007326, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_HG 0.001221, // V - INT_ADC_BOARD_THERMISTOR 0.000733, // V - INT_ADC_FPGA_ADC_REF 0.001465, // V - INT_ADC_3_3V 0.001465, // V - INT_ADC_5V_LOGIC - 0.073240, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_LG + 0.073260, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_LG 0.007106, // V - INT_ADC_24V_ACTUATORS - 0.073240, // mA - INT_ADC_BACKUP_ALARM_CURRENT + 0.073260, // mA - INT_ADC_BACKUP_ALARM_CURRENT + 0.000000, // V - INT_ADC_DUMMY }; // ********** private data ********** Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r9f2e4e5933d2e418b75f91e3db5df69c71878d43 -r850f74b97895fd0f6c4728541ac2582f7b5c5a0b --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 9f2e4e5933d2e418b75f91e3db5df69c71878d43) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 850f74b97895fd0f6c4728541ac2582f7b5c5a0b) @@ -59,6 +59,7 @@ INT_ADC_PRIMARY_ALARM_CURRENT_LG, ///< Internal ADC channel for primary alarm audio current low gain INT_ADC_24V_ACTUATORS, ///< Internal ADC channel for 24V to actuators INT_ADC_BACKUP_ALARM_CURRENT, ///< Internal ADC channel for backup alarm audio current + INT_ADC_DUMMY, ///< Internal ADC channel - not used, needed to get even number of channels NUM_OF_INT_ADC_CHANNELS ///< Number of used internal ADC channels. } INT_ADC_CHANNEL_T; Index: firmware/App/Modes/ModeTreatmentParams.c =================================================================== diff -u -rd4e699aba5ad4e197ef97cba4bc6ebebf210d1b3 -r850f74b97895fd0f6c4728541ac2582f7b5c5a0b --- firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision d4e699aba5ad4e197ef97cba4bc6ebebf210d1b3) +++ firmware/App/Modes/ModeTreatmentParams.c (.../ModeTreatmentParams.c) (revision 850f74b97895fd0f6c4728541ac2582f7b5c5a0b) @@ -61,7 +61,7 @@ { CRITICAL_DATA_TYPE_U32, {.uInt=100}, {.uInt=300}, {.uInt=100} }, // TREATMENT_PARAM_SALINE_BOLUS_VOLUME { CRITICAL_DATA_TYPE_U32, {.uInt=0}, {.uInt=2}, {.uInt=0} }, // TREATMENT_PARAM_ACID_CONCENTRATE { CRITICAL_DATA_TYPE_U32, {.uInt=0}, {.uInt=0}, {.uInt=0} }, // TREATMENT_PARAM_BICARB_CONCENTRATE - { CRITICAL_DATA_TYPE_U32, {.uInt=0}, {.uInt=3}, {.uInt=0} }, // TREATMENT_PARAM_DIALYZER_TYPE + { CRITICAL_DATA_TYPE_U32, {.uInt=0}, {.uInt=4}, {.uInt=0} }, // TREATMENT_PARAM_DIALYZER_TYPE { CRITICAL_DATA_TYPE_U32, {.uInt=0}, {.uInt=60}, {.uInt=30} }, // TREATMENT_PARAM_BP_MEAS_INTERVAL { CRITICAL_DATA_TYPE_U32, {.uInt=50}, {.uInt=150}, {.uInt=75} }, // TREATMENT_PARAM_RINSEBACK_FLOW_RATE { CRITICAL_DATA_TYPE_S32, {.sInt=-300}, {.sInt=0}, {.sInt=-300} }, // TREATMENT_PARAM_ART_PRESSURE_LOW_LIMIT Index: firmware/HD.dil =================================================================== diff -u -rf19f3deed8f9ee103482fa0232df44f8a73eae30 -r850f74b97895fd0f6c4728541ac2582f7b5c5a0b --- firmware/HD.dil (.../HD.dil) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) +++ firmware/HD.dil (.../HD.dil) (revision 850f74b97895fd0f6c4728541ac2582f7b5c5a0b) @@ -1,4 +1,4 @@ -# RM46L852PGE 04/16/21 19:37:46 +# RM46L852PGE 04/21/21 08:43:45 # ARCH=RM46L852PGE # @@ -5553,7 +5553,7 @@ DRIVER.ADC.VAR.ADC2_GROUP2_RAM_PARITY_ENA.VALUE=0 DRIVER.ADC.VAR.ADC1_GROUP1_PIN3_ENABLE.VALUE=0x00000008 DRIVER.ADC.VAR.ADC1_GROUP0_CHANNEL_TOTAL_TIME.VALUE=0.000000 -DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=19 +DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=20 DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_SAMPLE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=20 @@ -5638,11 +5638,11 @@ DRIVER.ADC.VAR.ADC2_GROUP0_SAMPLE_PRESCALER.VALUE=2 DRIVER.ADC.VAR.ADC1_GROUP0_DISCHARGE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP2_PIN3_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN6_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN6_ENABLE.VALUE=0x00000040 DRIVER.ADC.VAR.ADC2_RAMBASE.VALUE=0xFF3A0000 DRIVER.ADC.VAR.ADC2_GROUP0_BND.VALUE=8 DRIVER.ADC.VAR.ADC1_PORT_BIT0_DOUT.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_SCAN_TIME.VALUE=870.954 +DRIVER.ADC.VAR.ADC1_GROUP1_SCAN_TIME.VALUE=919.340 DRIVER.ADC.VAR.ADC1_GROUP0_RESOLUTION.VALUE=12_BIT DRIVER.ADC.VAR.ADC2_GROUP2_FIFO_SIZE.VALUE=16 DRIVER.ADC.VAR.ADC2_GROUP1_PIN7_ENABLE.VALUE=0x00000000 @@ -5739,7 +5739,7 @@ DRIVER.ADC.VAR.ADC1_GROUP0_PIN6_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_SCAN_TIME.VALUE=0.000 DRIVER.ADC.VAR.ADC2_GROUP1_HW_TRIGGER_SOURCE.VALUE=EVENT -DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=72.581134 +DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=76.403740 DRIVER.ADC.VAR.ADC1_GROUP0_EXTENDED_SAMPLE_TIME.VALUE=503.22 DRIVER.ADC.VAR.ADC1_GROUP0_HW_TRIGGER_SOURCE_ALT.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP1_PIN14_ENABLE.VALUE=0x00000000 @@ -5772,7 +5772,7 @@ DRIVER.ADC.VAR.ADC1_GROUP0_ID_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC1_GROUP2_SCAN_TIME.VALUE=0.000 -DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=19 +DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=20 DRIVER.ADC.VAR.ADC1_GROUP1_TRIGGER_EDGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_ALT_TRIG_COMP.VALUE=1 DRIVER.ADC.VAR.ADC1_GROUP0_CONTINUOUS_ENABLE.VALUE=0x00000000 Index: firmware/source/adc.c =================================================================== diff -u -rf19f3deed8f9ee103482fa0232df44f8a73eae30 -r850f74b97895fd0f6c4728541ac2582f7b5c5a0b --- firmware/source/adc.c (.../adc.c) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) +++ firmware/source/adc.c (.../adc.c) (revision 850f74b97895fd0f6c4728541ac2582f7b5c5a0b) @@ -238,7 +238,7 @@ 0x00000008U | 0x00000010U | 0x00000020U | - 0x00000000U | + 0x00000040U | 0x00000080U | 0x00000100U | 0x00000000U | @@ -334,7 +334,7 @@ static const uint32 s_adcFiFoSize[2U][3U] = { {0U, - 19U, + 20U, 32U}, {16U, 16U,