Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r766708fceb0bdf1af8c7897df29d4f5036bfd3db -r5745d7d31c95432d5458433ec10b755174e58e6f --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 766708fceb0bdf1af8c7897df29d4f5036bfd3db) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 5745d7d31c95432d5458433ec10b755174e58e6f) @@ -35,29 +35,29 @@ const INT_ADC_CHANNEL_T ADC_CHANNEL_NUM_TO_CHANNEL_ID[ MAX_ADC_CHANNELS ] = { INT_ADC_DIAL_IN_PUMP_SPEED, // 0 - INT_ADC_NOT_USED, // 1 - INT_ADC_NOT_USED, // 2 - INT_ADC_NOT_USED, // 3 - INT_ADC_NOT_USED, // 4 - INT_ADC_NOT_USED, // 5 + INT_ADC_HEATER_TEMP_1, // 1 + INT_ADC_REFIN_1, // 2 + INT_ADC_REFIN_2, // 3 + INT_ADC_1_2V_PROCESSOR, // 4 + INT_ADC_5V_SENSORS, // 5 INT_ADC_NOT_USED, // 6 INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT, // 7 - INT_ADC_NOT_USED, // 8 + INT_ADC_PRIMARY_ALARM_CURRENT_HG, // 8 INT_ADC_NOT_USED, // 9 - INT_ADC_NOT_USED, // 10 - INT_ADC_NOT_USED, // 11 - INT_ADC_NOT_USED, // 12 - INT_ADC_NOT_USED, // 13 - INT_ADC_NOT_USED, // 14 + INT_ADC_HEATER_TEMP_2, // 10 + INT_ADC_FPGA_ADC_REF, // 11 + INT_ADC_3_3V, // 12 + INT_ADC_5V_LOGIC, // 13 + INT_ADC_PRIMARY_ALARM_CURRENT_LG, // 14 INT_ADC_NOT_USED, // 15 INT_ADC_BLOOD_PUMP_SPEED, // 16 INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, // 17 INT_ADC_DIAL_OUT_PUMP_SPEED, // 18 INT_ADC_DIAL_OUT_PUMP_MOTOR_CURRENT,// 19 INT_ADC_NOT_USED, // 20 INT_ADC_NOT_USED, // 21 - INT_ADC_NOT_USED, // 22 - INT_ADC_NOT_USED // 23 + INT_ADC_24V_ACTUATORS, // 22 + INT_ADC_BACKUP_ALARM_CURRENT // 23 }; // ********** private data ********** Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -rd91a24c730aeb5cd7e3eba9ef4eca78e442911f8 -r5745d7d31c95432d5458433ec10b755174e58e6f --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision d91a24c730aeb5cd7e3eba9ef4eca78e442911f8) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 5745d7d31c95432d5458433ec10b755174e58e6f) @@ -39,14 +39,27 @@ /// Enumeration of internal ADC channels that are used. typedef enum Int_ADC_Channels { - INT_ADC_NOT_USED = 0, ///< Not used. - INT_ADC_BLOOD_PUMP_SPEED, ///< Internal ADC channel for blood pump speed. - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for blood pump current. - INT_ADC_DIAL_IN_PUMP_SPEED, ///< Internal ADC channel for dialysate inlet pump speed. - INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for dialysate inlet pump current. - INT_ADC_DIAL_OUT_PUMP_SPEED, ///< Internal ADC channel for dialysate outlet pump speed. - INT_ADC_DIAL_OUT_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for dialysate outlet pump current. - NUM_OF_INT_ADC_CHANNELS ///< Number of used internal ADC channels. + INT_ADC_NOT_USED = 0, ///< Not used + INT_ADC_BLOOD_PUMP_SPEED, ///< Internal ADC channel for blood pump speed + INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for blood pump current + INT_ADC_DIAL_IN_PUMP_SPEED, ///< Internal ADC channel for dialysate inlet pump speed + INT_ADC_DIAL_IN_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for dialysate inlet pump current + INT_ADC_DIAL_OUT_PUMP_SPEED, ///< Internal ADC channel for dialysate outlet pump speed + INT_ADC_DIAL_OUT_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for dialysate outlet pump current + INT_ADC_HEATER_TEMP_1, ///< Internal ADC channel for trimmer heater temperature (primary) + INT_ADC_REFIN_1, ///< Internal ADC channel for reference voltage to LCA1 & LCB1 (primary load cell ADC channels) + INT_ADC_REFIN_2, ///< Internal ADC channel for reference voltage to LCA2 & LCB2 (redundant load cell ADC channels) + INT_ADC_1_2V_PROCESSOR, ///< Internal ADC channel for 1.2V to processor + INT_ADC_5V_SENSORS, ///< Internal ADC channel for 5V to sensors + INT_ADC_PRIMARY_ALARM_CURRENT_HG, ///< Internal ADC channel for primary alarm audio current HG + INT_ADC_HEATER_TEMP_2, ///< Internal ADC channel for trimmer heater temperature (redundant) + INT_ADC_FPGA_ADC_REF, ///< Internal ADC channel for FPGA ADC reference voltage + INT_ADC_3_3V, ///< Internal ADC channel for 3.3V + INT_ADC_5V_LOGIC, ///< Internal ADC channel for 5V to logic + INT_ADC_PRIMARY_ALARM_CURRENT_LG, ///< Internal ADC channel for primary alarm audio current LG + INT_ADC_24V_ACTUATORS, ///< Internal ADC channel for 24V to actuators + INT_ADC_BACKUP_ALARM_CURRENT, ///< Internal ADC channel for backup alarm audio current + NUM_OF_INT_ADC_CHANNELS ///< Number of used internal ADC channels } INT_ADC_CHANNEL_T; // ********** public function prototypes ********** Index: firmware/App/HDCommon.h =================================================================== diff -u -rd5b22405ec6269a9fc9f56f8a27651b71a878282 -r5745d7d31c95432d5458433ec10b755174e58e6f --- firmware/App/HDCommon.h (.../HDCommon.h) (revision d5b22405ec6269a9fc9f56f8a27651b71a878282) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision 5745d7d31c95432d5458433ec10b755174e58e6f) @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 5 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 9012 +#define HD_VERSION_BUILD 9013 // ********** development build switches ********** @@ -40,7 +40,7 @@ // #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 DISABLE_AIR_TRAP_LEVELING 1 // Disable air trap level control + #define DISABLE_AIR_TRAP_LEVELING 1 // Disable air trap level control // #define DISABLE_3WAY_VALVES 1 // Disable 3-way valves // #define TST_3WAY_VALVES_ALWAYS_OPEN 1 // After POST and homing, open all 4 valves #define DISABLE_ACCELS 1 // Disable accelerometer POST and monitoring Index: firmware/App/Services/WatchdogMgmt.c =================================================================== diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -r5745d7d31c95432d5458433ec10b755174e58e6f --- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision a2bc96881a5fc3d8f779246b2abebf15a8de9384) +++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision 5745d7d31c95432d5458433ec10b755174e58e6f) @@ -164,7 +164,10 @@ // Waiting here for w.d. test period to prevent this task from checking in - watchdog should expire } if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH ) - { + { + // TODO - verify 24V is down + // TODO - verify backup alarm audio current + // TODO - user needs to verify backup alarm audio and LED? watchdogSelfTestStatus = SELF_TEST_STATUS_PASSED; } else Index: firmware/HD.dil =================================================================== diff -u -r890646a3e8079ada85b3d2ad056bf75b7e055054 -r5745d7d31c95432d5458433ec10b755174e58e6f --- firmware/HD.dil (.../HD.dil) (revision 890646a3e8079ada85b3d2ad056bf75b7e055054) +++ firmware/HD.dil (.../HD.dil) (revision 5745d7d31c95432d5458433ec10b755174e58e6f) @@ -1,4 +1,4 @@ -# RM46L852PGE 03/02/21 13:50:46 +# RM46L852PGE 04/14/21 14:02:15 # ARCH=RM46L852PGE # @@ -5536,7 +5536,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_8_ID.VALUE=8 DRIVER.ADC.VAR.ADC2_GROUP1_DISCHARGE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC1_GROUP1_PIN21_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN13_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN13_ENABLE.VALUE=0x00002000 DRIVER.ADC.VAR.ADC1_GROUP1_ACTUAL_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC2_GROUP1_RESOLUTION.VALUE=12_BIT DRIVER.ADC.VAR.ADC2_GROUP0_PIN3_ENABLE.VALUE=0x00000000 @@ -5551,7 +5551,7 @@ DRIVER.ADC.VAR.ADC2_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=300.00 DRIVER.ADC.VAR.ADC2_GROUP2_PIN0_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_RAM_PARITY_ENA.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN3_ENABLE.VALUE=0x00000000 +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=6 DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_ENABLE.VALUE=0x00000000 @@ -5577,7 +5577,7 @@ DRIVER.ADC.VAR.ADC2_GROUP2_PIN12_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN18_ENABLE.VALUE=0x00040000 DRIVER.ADC.VAR.ADC2_GROUP0_PIN8_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN11_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN11_ENABLE.VALUE=0x00000800 DRIVER.ADC.VAR.ADC1_BND.VALUE=2 DRIVER.ADC.VAR.ADC2_GROUP0_PIN1_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN23_ENABLE.VALUE=0x00000000 @@ -5586,12 +5586,12 @@ DRIVER.ADC.VAR.ADC1_GROUP1_SAMPLE_PRESCALER.VALUE=0 DRIVER.ADC.VAR.ADC2_PORT_BIT0_PULDIS.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP2_PIN5_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN8_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN8_ENABLE.VALUE=0x00000100 DRIVER.ADC.VAR.ADC1_GROUP1_ID_ENABLE.VALUE=0x00000020 DRIVER.ADC.VAR.ADC1_GROUP1_EXTENDED_SAMPLE_TIME.VALUE=503.22 DRIVER.ADC.VAR.ADC1_GROUP0_CONVERSION_TIME.VALUE=3.271 DRIVER.ADC.VAR.ADC2_GROUP0_RESOLUTION.VALUE=12_BIT -DRIVER.ADC.VAR.ADC1_GROUP1_PIN1_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN1_ENABLE.VALUE=0x00000002 DRIVER.ADC.VAR.ADC1_GROUP1_RESOLUTION.VALUE=12_BIT DRIVER.ADC.VAR.ADC2_GROUP1_TRIGGER_EDGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_CONVERSION_TIME.VALUE=1.300 @@ -5642,7 +5642,7 @@ 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=241.932 +DRIVER.ADC.VAR.ADC1_GROUP1_SCAN_TIME.VALUE=870.954 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 @@ -5665,16 +5665,16 @@ DRIVER.ADC.VAR.ADC1_GROUP2_CONTINUOUS_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP0_PIN10_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP1_PINS.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN22_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN14_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN22_ENABLE.VALUE=0x00400000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN14_ENABLE.VALUE=0x00004000 DRIVER.ADC.VAR.ADC2_GROUP0_PIN4_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN18_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_PIN8_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_TRIGGER_EDGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN11_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP2_PIN1_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_FIFO_SIZE.VALUE=32 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN4_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN4_ENABLE.VALUE=0x00000010 DRIVER.ADC.VAR.ADC1_RAMBASE.VALUE=0xFF3E0000 DRIVER.ADC.VAR.ADC1_BASE.VALUE=0xFFF7C000 DRIVER.ADC.VAR.ADC1_PORT_BIT0_DIR.VALUE=0 @@ -5711,7 +5711,7 @@ DRIVER.ADC.VAR.ADC2_GROUP0_PIN9_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_PRESCALE.VALUE=9 DRIVER.ADC.VAR.ADC1_GROUP1_PIN20_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN12_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN12_ENABLE.VALUE=0x00001000 DRIVER.ADC.VAR.ADC1_GROUP0_RAM_PARITY_ENA.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP0_SAMPLE_TIME.VALUE=300.00 DRIVER.ADC.VAR.ADC2_BASE.VALUE=0xFFF7C200 @@ -5725,7 +5725,7 @@ DRIVER.ADC.VAR.ADC1_GROUP1_CONTINUOUS_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_PORT_BIT0_PDR.VALUE=0 DRIVER.ADC.VAR.ADC1_GROUP1_SAMPLE_TIME.VALUE=300.00 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN2_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN2_ENABLE.VALUE=0x00000004 DRIVER.ADC.VAR.ADC1_GROUP1_CONVERSION_TIME.VALUE=3.271 DRIVER.ADC.VAR.ADC1_GROUP0_FIFO_SIZE.VALUE=0 DRIVER.ADC.VAR.ADC1_PORT_BIT0_PULL.VALUE=2 @@ -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=22.887252 +DRIVER.ADC.VAR.ADC1_GROUP1_CHANNEL_TOTAL_TIME.VALUE=72.581134 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 @@ -5757,7 +5757,7 @@ DRIVER.ADC.VAR.ADC1_GROUP1_PIN17_ENABLE.VALUE=0x00020000 DRIVER.ADC.VAR.ADC2_GROUP1_ACTUAL_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC2_GROUP0_PIN7_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN10_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN10_ENABLE.VALUE=0x00000400 DRIVER.ADC.VAR.ADC2_GROUP2_ACTUAL_DISCHARGE_TIME.VALUE=0.00 DRIVER.ADC.VAR.ADC2_GROUP0_PIN0_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_PIN22_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=6 +DRIVER.ADC.VAR.ADC1_GROUP1_PINS.VALUE=19 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 @@ -5791,7 +5791,7 @@ DRIVER.ADC.VAR.ADC1_GROUP2_PIN1_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP0_PIN11_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_SCAN_TIME.VALUE=0.000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN23_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN23_ENABLE.VALUE=0x00800000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN15_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_HW_TRIGGER_SOURCE.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP0_PIN5_ENABLE.VALUE=0x00000000 @@ -5808,7 +5808,7 @@ DRIVER.ADC.VAR.ADC2_GROUP1_CHANNEL_TOTAL_TIME.VALUE=0.000000 DRIVER.ADC.VAR.ADC2_GROUP2_PIN2_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP0_CONTINUOUS_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_PIN5_ENABLE.VALUE=0x00000000 +DRIVER.ADC.VAR.ADC1_GROUP1_PIN5_ENABLE.VALUE=0x00000020 DRIVER.ADC.VAR.ADC1_GROUP2_ACTUAL_SAMPLE_TIME.VALUE=503.22 DRIVER.ADC.VAR.ADC1_GROUP0_SCAN_TIME.VALUE=0.000 DRIVER.ADC.VAR.ADC2_GROUP1_PIN6_ENABLE.VALUE=0x00000000 Index: firmware/source/adc.c =================================================================== diff -u -rbf7c3835ce5a7bcbc47c305fb2fe5490d0899db8 -r5745d7d31c95432d5458433ec10b755174e58e6f --- firmware/source/adc.c (.../adc.c) (revision bf7c3835ce5a7bcbc47c305fb2fe5490d0899db8) +++ firmware/source/adc.c (.../adc.c) (revision 5745d7d31c95432d5458433ec10b755174e58e6f) @@ -233,29 +233,30 @@ 0x00000000U | 0x00000000U, 0x00000001U | + 0x00000002U | + 0x00000004U | + 0x00000008U | + 0x00000010U | + 0x00000020U | 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | 0x00000080U | + 0x00000100U | 0x00000000U | + 0x00000400U | + 0x00000800U | + 0x00001000U | + 0x00002000U | + 0x00004000U | 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | - 0x00000000U | 0x00010000U | 0x00020000U | 0x00040000U | 0x00080000U | 0x00000000U | 0x00000000U | + 0x00400000U | + 0x00800000U, 0x00000000U | - 0x00000000U, 0x00000000U | 0x00000000U | 0x00000000U | @@ -278,7 +279,6 @@ 0x00000000U | 0x00000000U | 0x00000000U | - 0x00000000U | 0x00000000U}, {0x00000000U | 0x00000000U |