Index: AlarmMapping.csv
===================================================================
diff -u -r3f555c49ddd2c983f469709e3c001d0e76159248 -rc306a4de6311e779822e6a2e5e7ac63484513fbe
--- AlarmMapping.csv	(.../AlarmMapping.csv)	(revision 3f555c49ddd2c983f469709e3c001d0e76159248)
+++ AlarmMapping.csv	(.../AlarmMapping.csv)	(revision c306a4de6311e779822e6a2e5e7ac63484513fbe)
@@ -64,7 +64,7 @@
   63,"FPGA reports failure reading arterial pressure sensor."                                                                                      
   64,"FPGA reports failure reading venous pressure sensor."                                                                                        
   65,"HD requests DG command with invalid parameter fault."                                                                                        
-  66,"DG/HD NV data management overall group record CRC invalid."                                                                                  
+  66,"DG non-volatile calibration group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging."                
   67,"HD blood pump occlusion self-test failure alarm."                                                                                            
   68,"HD dialysate inlet pump occlusion self-test failure alarm."                                                                                  
   69,"HD dialysate outlet pump occlusion self-test failure alarm."                                                                                 
@@ -101,10 +101,10 @@
  100,"HD no cartridge self-test timeout."                                                                                                          
  101,"HD dry self-test timeout."                                                                                                                   
  102,"Real-time clock communication error."                                                                                                        
- 103,"Manufacturing record CRC failure."                                                                                                           
+ 103,"HD non-volatile calibration group invalid record CRC."                                                                                       
  104,"Air trap level sensors reporting illegal combination of air/fluid."                                                                          
- 105,"DG/HD NV data management individual record CRC invalid."                                                                                     
- 106,"DG/HD NV data management individual record time invalid."                                                                                    
+ 105,"DG non-volatile system group invalid record CRC."                                                                                            
+ 106,"DG non-volatile service group invalid record CRC      TODO remove this alarm after DEN-9480 fwcommon was merged into staging."               
  107,"HD reports DG restarted fault."                                                                                                              
  108,"HD syringe pump ADC error."                                                                                                                  
  109,"HD syringe pump volume check error."                                                                                                         
@@ -153,16 +153,16 @@
  152,"Inlet water pressure too low."                                                                                                               
  153,"HD prime completed high priority alarm."                                                                                                     
  154,"EEPROM operations (read, write, erase) failure."                                                                                             
- 155,"Service record CRC failure."                                                                                                                 
+ 155,"DG non-volatile service invalid record CRC         TODO remove this alarm after DEN-9480 fwcommon was merged into staging."                  
  156,"HW usage data (treatment time in HD and total consumed water in DG) failure."                                                                
- 157,"Calibration record CRC failure."                                                                                                             
+ 157,"Calibration record CRC failure                     TODO remove this alarm after DEN-9480 fwcommon was merged into staging."                  
  158,"Blood pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed."                                      
  159,"Dialysate inlet pump failed flow vs motor speed check.\nMismatch with flow rate and rate implied by motor speed."                            
  160,"Blood pump rotor speed too high."                                                                                                            
  161,"Blood flow sensor signal strength too low."                                                                                                  
  162,"Dialysate flow sensor signal strength too low."                                                                                              
  163,"HD sees primary load cell for reservoir 1 change too much too fast."                                                                         
- 164,"HD sees primary load cell for reservoir 1 change too much too fast."                                                                         
+ 164,"HD sees primary load cell for reservoir 2 change too much too fast."                                                                         
  165,"HD in treatment rinseback operation timeout."                                                                                                
  166,"HD in treatment re-circ sub-mode for too long."                                                                                              
  167,"HD cartridge door opened alarm."                                                                                                             
@@ -268,4 +268,19 @@
  267,"UI POST Bluetooth failure."                                                                                                                  
  268,"UI POST Ethernet failure."                                                                                                                   
  269,"UI POST Sound failure."                                                                                                                      
- 270,"Total number of alarms."                                                                                                                     
+ 270,"HD Watchdog POST failure."                                                                                                                   
+ 271,"HD Watchdog POST failure."                                                                                                                   
+ 272,"HD Fan RPM out of range."                                                                                                                    
+ 273,"HD measured blood pump flow rate is out of range."                                                                                           
+ 274,"HD measured dialysate inlet pump flow rate is out of range."                                                                                 
+ 275,"HD arterial pressure sensor is reading out of range."                                                                                        
+ 276,"HD venous pressure sensor is reading out of range."                                                                                          
+ 277,"HD BP occlusion sensor is reading out of range."                                                                                             
+ 278,"HD DPi occlusion sensor is reading out of range."                                                                                            
+ 279,"HD DPo occlusion sensor is reading out of range."                                                                                            
+ 280,"HD arterial pressure sensor read timeout error."                                                                                             
+ 281,"Acid concentration bottle low volume alarm."                                                                                                 
+ 282,"Bicarbonate concentration bottle low volume alarm."                                                                                          
+ 283,"DG load cells weight out of range."                                                                                                          
+ 284,"DG scheduled runs group invalid record CRC.\nTODO remove this alarm after DEN-9480 fwcommon was merged into staging."                        
+ 285,"Total number of alarms."