Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

20 files changed, 288 insertions, 111 deletions

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 0ad2fe8ec..c0a38b329 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index cd8857066..0c38380d4 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
index c55b1fe1f..0af8fb729 100644
--- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
+++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
@@ -20,7 +20,7 @@ typedef struct
 } TangoVersion_t;
 
 
-TangoVersion_t _gTangoVersion = {1,4,6,29}; 
+TangoVersion_t _gTangoVersion = {1,4,6,30};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c
index acbaa5e54..0e3cecf99 100644
--- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c
+++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c
@@ -72,7 +72,8 @@ float CalculateDispenserPressure (int DispenserId)
     if(data<Bits_Min)
     {
         data = Bits_Min;//40mA 0Bar
-        Report("Dispenser - Reading wrong data from ADC",__FILE__,__LINE__,DispenserId,RpWarning,(int)data,0);
+        //if (isDispenserInConfig(DispenserId))
+        //    Report("Dispenser - Reading wrong data from ADC",__FILE__,__LINE__,DispenserId,RpWarning,(int)data,0);
     }
 
     temp = a[DispenserId] * data + b[DispenserId];
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
index 27e2dd038..f50689d61 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
@@ -364,6 +364,7 @@ double GetWHSAirFlow(uint8_t OR_Id)
                 //Q_value =  get_Q(value-orf3V0Value);
                 Q_value =  get_CurrentQ(DRIER_FLOW_METER);
             }
+            //Q_value = get_average_Q(HEAD_FLOW_METER);
             break;
         case NU_FLOW_METER:
             get_orf_2(&value);
diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
index 84369a03e..0d6cd35c7 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Motors/MotorActions.c
@@ -670,6 +670,7 @@ uint32_t MotorMovetoLimitSwitch (TimerMotors_t MotorId,bool direction, uint32_t
         {
             HoldRightDancer = true;
         }
+        //Report("MotorMovetoLimitSwitch RDANCER",__FILE__,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RDANCER].directionthreadwize,direction,RpMessage,HoldRightDancer,0);
     }
 
     MotorTimeout[MotorId] = 0;
@@ -699,6 +700,8 @@ uint32_t MotorMoveToBreakSensorCallBackFunction(uint32_t IfIndex, uint32_t Limit
         return 0xFFFFFFFF;
     }
     MotorId = (TimerMotors_t)(IfIndex&0xFF);
+    MotorTimeout[MotorId]+=MotorTimeLag[MotorId];
+
 
     if (MotorControlId[MotorId] == 0xFF)
         return ERROR;
@@ -721,6 +724,21 @@ uint32_t MotorMoveToBreakSensorCallBackFunction(uint32_t IfIndex, uint32_t Limit
                MotorCallback[MotorId](MotorId,LimitSwitch);
        }
    }
+   if ((MotorTimeout[MotorId]>=MotorTimeLimit[MotorId])&&(MotorTimeLimit[MotorId]>0)) //timeout
+   {
+       SafeRemoveHighControlCallback(MotorControlId[MotorId], MotorControlCallback[MotorId] );
+       MotorControlCallback[MotorId] = 0;
+       MotorControlId[MotorId] = 0xFF;
+       MotorStop(MotorId,Hard_Hiz);  //TODO in run time limit switch just reverse direction
+
+       //possibly: start regular control (speed etc)
+       //uint32_t ControlId = AddControlCallback(NULL,ControlCBFunction Callback,  eOneMillisecond, (IfTypeMotors*0x100+MotorId), deviceId, Parameter );
+
+       //call the module callback
+       if (MotorCallback[MotorId])
+           MotorCallback[MotorId](MotorId,NO_LIMIT);
+
+   }
    return OK;
 }
 uint32_t MotorMovetoBreakSensor (TimerMotors_t MotorId,bool direction, uint32_t Freq,  callback_fptr callback,uint32_t timeout)
diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.h b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.h
index b2261979a..e281f1d83 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.h
+++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.h
@@ -1,4 +1,4 @@
-//void Init_U0();
+void Init_U0();
 void test_Uart();
 
 //uint32_t Uart_Tx(char *buffer,size_t length);
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 0762db00e..0dc70efaa 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -825,12 +825,12 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
     ACTIVITY_GREEN_LED_OFF;
     if (n_segments == 0)
     {
-        ReportWithPackageFilter(AlarmFilter,"no segments in the job", __FILE__,__LINE__,0, DEBUG_LOG_CATEGORY__Warning, AlarmItem[Alarm_i].DeviceId, 0);
+        ReportWithPackageFilter(AlarmFilter,"no segments in the job", __FILE__,__LINE__,0, DEBUG_LOG_CATEGORY__Warning, 222, 0);
         return JOB_OK;
     }
     if (AlarmItem == NULL)
     {
-        ReportWithPackageFilter(AlarmFilter,"missing alarm file", __FILE__,__LINE__,0, DEBUG_LOG_CATEGORY__Warning, AlarmItem[Alarm_i].DeviceId, 0);
+        ReportWithPackageFilter(AlarmFilter,"missing alarm file", __FILE__,__LINE__,0, DEBUG_LOG_CATEGORY__Warning, 223, 0);
         usnprintf(AlarmReasonStr, 100, "No alarm file in the machine",111);
         return JOB_UNSPECIFIED_ERROR;
     }
diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt
index 8a76e6ee4..6e176581e 100644
--- a/Software/Embedded_SW/Embedded/Software Release Notes.txt
+++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt
@@ -1,18 +1,25 @@
 Embedded SW Release note - Version 1.4.6.30 - Pack 2+
 =============================================================
+fix bug in SW update
 fix firmware update when no files
-add main CPU EEPROM Read/Write from stub
-support new FPGA - different clocks (EMC)
 remove ADC interrupt - polling only
-read air flow from arc head - prepare
 fix head identification on head hw failure
 improve WHS air flow control
 fix FlashInitAndLoad() (although not in use)
-fix (?) dryer heating. lots of logs added, VAC control - histeresys added
-start blower increase a bit later to solve the temerature alarms preventing jobs
+fix (?) dryer heating. lots of logs added, VAC control - hysteresis added
+start blower increase a bit later to solve the temperature alarms preventing jobs
 maximal pressure buildup 2.5
 prevent job when head/drier wide open
 thread load - skip head lid and actuators according to head type
+thread load - fix error messages
+thread load - support "try" message from PPC on problem
+drivers:
+	add main CPU EEPROM Read/Write from stub
+	new dispenser pressure sensors (based on EEPROM)
+	EMC support - external clock / internal clock in motors
+	read air flow in arc head
+
+
 
 Embedded SW Release note - Version 1.4.6.29 - Pack 2
 =============================================================
diff --git a/Software/Embedded_SW/Embedded/src/makefile.libs b/Software/Embedded_SW/Embedded/src/makefile.libs
index f262762ef..ae6999352 100644
--- a/Software/Embedded_SW/Embedded/src/makefile.libs
+++ b/Software/Embedded_SW/Embedded/src/makefile.libs
@@ -1,6 +1,6 @@
 #
 # This file was generated based on the configuration script:
-#     C:\Tango\Software\Embedded_SW\Embedded\Embedded.cfg
+#     C:\tango\Software\Embedded_SW\Embedded\Embedded.cfg
 #
 # This makefile may be included in other makefiles that need to build
 # the libraries containing the compiled source files generated as
@@ -14,7 +14,7 @@
 #
 # The absolute path to the generated source directory (at the time the
 # sources were generated) is:
-#    C:\Tango\Software\Embedded_SW\Embedded\src
+#    C:\tango\Software\Embedded_SW\Embedded\src
 #
 GEN_SRC_DIR ?= ../src
 
diff --git a/Software/Embedded_SW/Embedded/src/sysbios/makefile b/Software/Embedded_SW/Embedded/src/sysbios/makefile
index 0f63ec463..a8280a913 100644
--- a/Software/Embedded_SW/Embedded/src/sysbios/makefile
+++ b/Software/Embedded_SW/Embedded/src/sysbios/makefile
@@ -1,29 +1,29 @@
 
-XOPTS = -I"C:/TI/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/TI/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M4F
+XOPTS = -I"C:/ti/xdctools_3_32_00_06_core/packages/" -Dxdc_target_types__=C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/targets/arm/elf/std.h -Dxdc_target_name__=M4F
 
-vpath % C:/TI/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/
-vpath %.c C:/TI/xdctools_3_32_00_06_core/packages/
+vpath % C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/
+vpath %.c C:/ti/xdctools_3_32_00_06_core/packages/
 
 CCOPTS    = --endian=little -mv7M4 --abi=eabi --float_support=fpv4spd16 -q -ms  --program_level_compile -g  -Dxdc_FILE=__FILE__  -Dti_sysbios_knl_Task_minimizeLatency__D=FALSE -Dti_sysbios_knl_Clock_stopCheckNext__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_enableException__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_disablePriority__D=32U -Dti_sysbios_family_arm_m3_Hwi_numSparseInterrupts__D=0U -Dti_sysbios_hal_Core_numCores__D=1
 
-XDC_ROOT  = C:/TI/xdctools_3_32_00_06_core/packages/
+XDC_ROOT  = C:/ti/xdctools_3_32_00_06_core/packages/
 
-BIOS_ROOT = C:/TI/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/
+BIOS_ROOT = C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/
 
 BIOS_DEFS =  -Dti_sysbios_BIOS_swiEnabled__D=TRUE -Dti_sysbios_BIOS_taskEnabled__D=TRUE -Dti_sysbios_BIOS_clockEnabled__D=TRUE -Dti_sysbios_BIOS_runtimeCreatesEnabled__D=TRUE -Dti_sysbios_hal_Hwi_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Swi_DISABLE_ALL_HOOKS -Dti_sysbios_BIOS_smpEnabled__D=FALSE -Dti_sysbios_Build_useHwiMacros -Dti_sysbios_knl_Swi_numPriorities__D=16 -Dti_sysbios_knl_Task_deleteTerminatedTasks__D=FALSE -Dti_sysbios_knl_Task_numPriorities__D=16 -Dti_sysbios_knl_Task_checkStackFlag__D=TRUE -Dti_sysbios_knl_Task_initStackFlag__D=TRUE -Dti_sysbios_knl_Task_DISABLE_ALL_HOOKS -Dti_sysbios_knl_Clock_TICK_SOURCE=ti_sysbios_knl_Clock_TickSource_TIMER -Dti_sysbios_knl_Clock_TICK_MODE=ti_sysbios_knl_Clock_TickMode_PERIODIC -Dti_sysbios_hal_Core_delegate_getId=ti_sysbios_hal_CoreNull_getId__E -Dti_sysbios_hal_Core_delegate_interruptCore=ti_sysbios_hal_CoreNull_interruptCore__E -Dti_sysbios_hal_Core_delegate_lock=ti_sysbios_hal_CoreNull_lock__E -Dti_sysbios_hal_Core_delegate_unlock=ti_sysbios_hal_CoreNull_unlock__E -Dti_sysbios_hal_Core_numCores__D=1 -Dti_sysbios_hal_CoreNull_numCores__D=1 -Dti_sysbios_utils_Load_taskEnabled__D=TRUE -Dti_sysbios_utils_Load_swiEnabled__D=FALSE -Dti_sysbios_utils_Load_hwiEnabled__D=FALSE -Dti_sysbios_family_arm_m3_Hwi_dispatcherSwiSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherTaskSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherAutoNestingSupport__D=TRUE -Dti_sysbios_family_arm_m3_Hwi_dispatcherIrpTrackingSupport__D=TRUE -Dti_sysbios_knl_Semaphore_supportsEvents__D=FALSE -Dti_sysbios_knl_Semaphore_supportsPriority__D=TRUE
 
-BIOS_INC  = -I"C:/TI/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/"
+BIOS_INC  = -I"C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/"
 
-TARGET_INC = -I"C:/TI/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/"
+TARGET_INC = -I"C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/"
 
 INCS = $(BIOS_INC) $(TARGET_INC)  
 
-CC = C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
-ASM = C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armcl -c $(CCOPTS) -I C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/include
-AR = C:/TI/ccsv7/tools/compiler/ti-cgt-arm_16.9.4.LTS/bin/armar rq
+CC = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/include
+ASM = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/bin/armcl -c $(CCOPTS) -I C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/include
+AR = C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.2.LTS/bin/armar rq
 
-DEL = C:/TI/xdctools_3_32_00_06_core/packages/../bin/rm -f
-CP = C:/TI/xdctools_3_32_00_06_core/packages/../bin/cp -f
+DEL = C:/ti/xdctools_3_32_00_06_core/packages/../bin/rm -f
+CP = C:/ti/xdctools_3_32_00_06_core/packages/../bin/cp -f
 
 define RM
 	$(if $(wildcard $1),$(DEL) $1,:)
diff --git a/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f
index 096dffc03..2921f9dfb 100644
--- a/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f
+++ b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f
diff --git a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto
index cd691fa52..28ebc5bc3 100644
--- a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto
+++ b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto
@@ -282,4 +282,10 @@ message DiagnosticsMonitors
     //Waste Level (Min = 0, Max = 9, PPF = 1)
     repeated double WasteLevel = 88;
 
+    //Head Blower 1 Air Flow (Min = 0, Max = 100, PPF = 1)
+    repeated double HeadBlower1AirFlow = 89;
+
+    //Head Blower 2 Air Flow (Min = 0, Max = 100, PPF = 1)
+    repeated double HeadBlower2AirFlow = 90;
+
 }
diff --git a/Software/PMR/Messages/Hardware/HardwareBlowerType.proto b/Software/PMR/Messages/Hardware/HardwareBlowerType.proto
index 9fbbd5715..2a5b79621 100644
--- a/Software/PMR/Messages/Hardware/HardwareBlowerType.proto
+++ b/Software/PMR/Messages/Hardware/HardwareBlowerType.proto
@@ -28,4 +28,10 @@ enum HardwareBlowerType
     //WHS Blower 2
     WHSBlower2 = 3;
 
+    //WHS Small Fans
+    WHSSmallFans = 4;
+
+    //WHS Large Fans
+    WHSLargeFans = 5;
+
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs
index 6cb412c7f..c8787f68a 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/HardwareBlowerTypes.cs
@@ -43,5 +43,17 @@ namespace Tango.BL.Enumerations
         [Description("WHS Blower 2")]
         WHSBlower2 = 3,
 
+        /// <summary>
+        /// (WHS Small Fans)
+        /// </summary>
+        [Description("WHS Small Fans")]
+        WHSSmallFans = 4,
+
+        /// <summary>
+        /// (WHS Large Fans)
+        /// </summary>
+        [Description("WHS Large Fans")]
+        WHSLargeFans = 5,
+
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
index ba7dc99ff..cb523ca82 100644
--- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
+++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs
@@ -248,6 +248,18 @@ namespace Tango.BL.Enumerations
         HeadAirFlow = 13,
 
         /// <summary>
+        /// (Head Blower 1 Air Flow)
+        /// </summary>
+        [Description("Head Blower 1 Air Flow")]
+        HeadBlower1AirFlow = 403,
+
+        /// <summary>
+        /// (Head Blower 2 Air Flow)
+        /// </summary>
+        [Description("Head Blower 2 Air Flow")]
+        HeadBlower2AirFlow = 404,
+
+        /// <summary>
         /// (Head Blower Voltage 1)
         /// </summary>
         [Description("Head Blower Voltage 1")]
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
index 456b84acf..1dbec9290 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs
@@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChlEaWFnbm9zdGljc01vbml0b3JzLnByb3RvEhVUYW5nby5QTVIuRGlhZ25v",
-            "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIrgVChNEaWFnbm9zdGljc01vbml0",
+            "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIvAVChNEaWFnbm9zdGljc01vbml0",
             "b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD",
             "KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl",
             "bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY",
@@ -84,12 +84,13 @@ namespace Tango.PMR.Diagnostics {
             "Eh8KF0hlYWRDb3ZlckhlYXRlcjJDdXJyZW50GFMgAygBEiMKG0hlYWRDb3Zl",
             "ckhlYXRlcjJUZW1wZXJhdHVyZRhUIAMoARIZChFXSFNCbG93ZXIyVm9sdGFn",
             "ZRhVIAMoARIRCglHYXNTZW5zb3IYViADKAESFwoPSW5jb21pbmdWb2x0YWdl",
-            "GFcgAygBEhIKCldhc3RlTGV2ZWwYWCADKAFCIQofY29tLnR3aW5lLnRhbmdv",
-            "LnBtci5kaWFnbm9zdGljc2IGcHJvdG8z"));
+            "GFcgAygBEhIKCldhc3RlTGV2ZWwYWCADKAESGgoSSGVhZEJsb3dlcjFBaXJG",
+            "bG93GFkgAygBEhoKEkhlYWRCbG93ZXIyQWlyRmxvdxhaIAMoAUIhCh9jb20u",
+            "dHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DoubleArrayReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow" }, null, null, null)
           }));
     }
     #endregion
@@ -208,6 +209,8 @@ namespace Tango.PMR.Diagnostics {
       gasSensor_ = other.gasSensor_.Clone();
       incomingVoltage_ = other.incomingVoltage_.Clone();
       wasteLevel_ = other.wasteLevel_.Clone();
+      headBlower1AirFlow_ = other.headBlower1AirFlow_.Clone();
+      headBlower2AirFlow_ = other.headBlower2AirFlow_.Clone();
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1359,6 +1362,32 @@ namespace Tango.PMR.Diagnostics {
       get { return wasteLevel_; }
     }
 
+    /// <summary>Field number for the "HeadBlower1AirFlow" field.</summary>
+    public const int HeadBlower1AirFlowFieldNumber = 89;
+    private static readonly pb::FieldCodec<double> _repeated_headBlower1AirFlow_codec
+        = pb::FieldCodec.ForDouble(714);
+    private readonly pbc::RepeatedField<double> headBlower1AirFlow_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Blower 1 Air Flow (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadBlower1AirFlow {
+      get { return headBlower1AirFlow_; }
+    }
+
+    /// <summary>Field number for the "HeadBlower2AirFlow" field.</summary>
+    public const int HeadBlower2AirFlowFieldNumber = 90;
+    private static readonly pb::FieldCodec<double> _repeated_headBlower2AirFlow_codec
+        = pb::FieldCodec.ForDouble(722);
+    private readonly pbc::RepeatedField<double> headBlower2AirFlow_ = new pbc::RepeatedField<double>();
+    /// <summary>
+    ///Head Blower 2 Air Flow (Min = 0, Max = 100, PPF = 1)
+    /// </summary>
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<double> HeadBlower2AirFlow {
+      get { return headBlower2AirFlow_; }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as DiagnosticsMonitors);
@@ -1460,6 +1489,8 @@ namespace Tango.PMR.Diagnostics {
       if(!gasSensor_.Equals(other.gasSensor_)) return false;
       if(!incomingVoltage_.Equals(other.incomingVoltage_)) return false;
       if(!wasteLevel_.Equals(other.wasteLevel_)) return false;
+      if(!headBlower1AirFlow_.Equals(other.headBlower1AirFlow_)) return false;
+      if(!headBlower2AirFlow_.Equals(other.headBlower2AirFlow_)) return false;
       return true;
     }
 
@@ -1554,6 +1585,8 @@ namespace Tango.PMR.Diagnostics {
       hash ^= gasSensor_.GetHashCode();
       hash ^= incomingVoltage_.GetHashCode();
       hash ^= wasteLevel_.GetHashCode();
+      hash ^= headBlower1AirFlow_.GetHashCode();
+      hash ^= headBlower2AirFlow_.GetHashCode();
       return hash;
     }
 
@@ -1652,6 +1685,8 @@ namespace Tango.PMR.Diagnostics {
       gasSensor_.WriteTo(output, _repeated_gasSensor_codec);
       incomingVoltage_.WriteTo(output, _repeated_incomingVoltage_codec);
       wasteLevel_.WriteTo(output, _repeated_wasteLevel_codec);
+      headBlower1AirFlow_.WriteTo(output, _repeated_headBlower1AirFlow_codec);
+      headBlower2AirFlow_.WriteTo(output, _repeated_headBlower2AirFlow_codec);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -1745,6 +1780,8 @@ namespace Tango.PMR.Diagnostics {
       size += gasSensor_.CalculateSize(_repeated_gasSensor_codec);
       size += incomingVoltage_.CalculateSize(_repeated_incomingVoltage_codec);
       size += wasteLevel_.CalculateSize(_repeated_wasteLevel_codec);
+      size += headBlower1AirFlow_.CalculateSize(_repeated_headBlower1AirFlow_codec);
+      size += headBlower2AirFlow_.CalculateSize(_repeated_headBlower2AirFlow_codec);
       return size;
     }
 
@@ -1841,6 +1878,8 @@ namespace Tango.PMR.Diagnostics {
       gasSensor_.Add(other.gasSensor_);
       incomingVoltage_.Add(other.incomingVoltage_);
       wasteLevel_.Add(other.wasteLevel_);
+      headBlower1AirFlow_.Add(other.headBlower1AirFlow_);
+      headBlower2AirFlow_.Add(other.headBlower2AirFlow_);
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -2285,6 +2324,16 @@ namespace Tango.PMR.Diagnostics {
             wasteLevel_.AddEntriesFrom(input, _repeated_wasteLevel_codec);
             break;
           }
+          case 714:
+          case 713: {
+            headBlower1AirFlow_.AddEntriesFrom(input, _repeated_headBlower1AirFlow_codec);
+            break;
+          }
+          case 722:
+          case 721: {
+            headBlower2AirFlow_.AddEntriesFrom(input, _repeated_headBlower2AirFlow_codec);
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
index ab463a914..8f338b083 100644
--- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareBlowerType.cs
@@ -23,9 +23,10 @@ namespace Tango.PMR.Hardware {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChhIYXJkd2FyZUJsb3dlclR5cGUucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy",
-            "ZSpZChJIYXJkd2FyZUJsb3dlclR5cGUSEQoNRGVmYXVsdEJsb3dlchAAEg8K",
+            "ZSp9ChJIYXJkd2FyZUJsb3dlclR5cGUSEQoNRGVmYXVsdEJsb3dlchAAEg8K",
             "C0hlYWRCbG93ZXIxEAESDwoLSGVhZEJsb3dlcjIQAhIOCgpXSFNCbG93ZXIy",
-            "EANCHgocY29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z"));
+            "EAMSEAoMV0hTU21hbGxGYW5zEAQSEAoMV0hTTGFyZ2VGYW5zEAVCHgocY29t",
+            "LnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareBlowerType), }, null));
@@ -51,6 +52,14 @@ namespace Tango.PMR.Hardware {
     ///WHS Blower 2
     /// </summary>
     [pbr::OriginalName("WHSBlower2")] Whsblower2 = 3,
+    /// <summary>
+    ///WHS Small Fans
+    /// </summary>
+    [pbr::OriginalName("WHSSmallFans")] WhssmallFans = 4,
+    /// <summary>
+    ///WHS Large Fans
+    /// </summary>
+    [pbr::OriginalName("WHSLargeFans")] WhslargeFans = 5,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserEEpromData.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserEEpromData.cs
index 2be7cdb89..9e2fc56f1 100644
--- a/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserEEpromData.cs
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubDispenserEEpromData.cs
@@ -27,17 +27,17 @@ namespace Tango.PMR.Stubs {
             "KA0SEwoLVGFibGVMZW5ndGgYAiABKA0SFAoMVGFibGV2ZXJzaW9uGAMgASgN",
             "EhQKDERpc3BlbnNlclBfThgEIAEoCRIOCgZQQ0JTX04YBSABKAkSFQoNUENC",
             "UGFydE51bWJlchgGIAEoCRIUCgxEaXNwZW5zZXJTX04YByABKAkSFwoPTWlu",
-            "aW1hbFByZXNzdXJlGAggASgNEhcKD01heGltYWxQcmVzc3VyZRgJIAEoDRIR",
-            "CglNaW5pbWFsTVYYCiABKA0SEQoJTWF4aW1hbE1WGAsgASgNEhMKC1RvdGFs",
-            "Q3ljbGVzGAwgASgNEhIKCkJ1YmJsZVNpemUYDSABKA0SHAoUQVZHX05sX3N0",
-            "ZXBWYWx1ZV8xXzQYDiABKA0SHAoUQVZHX05sX3N0ZXBWYWx1ZV8yXzQYDyAB",
-            "KA0SHAoUQVZHX05sX3N0ZXBWYWx1ZV8zXzQYECABKA0SHAoUQVZHX05sX3N0",
-            "ZXBWYWx1ZV80XzQYESABKA0SEgoKU1dfUmVzZXJ2ZRgSIAEoDRIXCg9TcGFy",
+            "aW1hbFByZXNzdXJlGAggASgFEhcKD01heGltYWxQcmVzc3VyZRgJIAEoBRIR",
+            "CglNaW5pbWFsTVYYCiABKAUSEQoJTWF4aW1hbE1WGAsgASgFEhMKC1RvdGFs",
+            "Q3ljbGVzGAwgASgNEhIKCkJ1YmJsZVNpemUYDSABKAUSHAoUQVZHX05sX3N0",
+            "ZXBWYWx1ZV8xXzQYDiABKAUSHAoUQVZHX05sX3N0ZXBWYWx1ZV8yXzQYDyAB",
+            "KAUSHAoUQVZHX05sX3N0ZXBWYWx1ZV8zXzQYECABKAUSHAoUQVZHX05sX3N0",
+            "ZXBWYWx1ZV80XzQYESABKAUSEgoKU1dfUmVzZXJ2ZRgSIAEoBRIXCg9TcGFy",
             "ZTFfcHJlc3N1cmUYEyABKAUSFwoPU3BhcmUyX3ByZXNzdXJlGBQgASgFEhsK",
             "E01vdG9yUHVsc2VzUGVyQ3ljbGUYFSABKA0SDQoFQ29sb3IYFiABKA0SFQoN",
-            "UHJlc3N1cmVTbG9wZRgXIAEoDRIWCg5Qcm9kdWN0aW9uRGF0ZRgYIAEoCRIT",
-            "CgtBVFNsb2NhdGlvbhgZIAEoDRIOCgZTcGFyZTEYGiABKA0SDgoGU3BhcmUy",
-            "GBsgASgNEhIKCkFUU0NoYW5uZWwYHCABKA0SEQoJVW5pdEVtcHR5GB0gASgI",
+            "UHJlc3N1cmVTbG9wZRgXIAEoBRIWCg5Qcm9kdWN0aW9uRGF0ZRgYIAEoCRIT",
+            "CgtBVFNsb2NhdGlvbhgZIAEoDRIOCgZTcGFyZTEYGiABKAUSDgoGU3BhcmUy",
+            "GBsgASgFEhIKCkFUU0NoYW5uZWwYHCABKA0SEQoJVW5pdEVtcHR5GB0gASgI",
             "EhcKD0RyeVJ1blBhc3NfRmFpbBgeIAEoCBIVCg1GbG93UGFzc19GYWlsGB8g",
             "ASgIEhAKCENoZWNrU3VtGCAgASgNQhsKGWNvbS50d2luZS50YW5nby5wbXIu",
             "c3R1YnNiBnByb3RvMw=="));
@@ -193,9 +193,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "MinimalPressure" field.</summary>
     public const int MinimalPressureFieldNumber = 8;
-    private uint minimalPressure_;
+    private int minimalPressure_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint MinimalPressure {
+    public int MinimalPressure {
       get { return minimalPressure_; }
       set {
         minimalPressure_ = value;
@@ -204,9 +204,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "MaximalPressure" field.</summary>
     public const int MaximalPressureFieldNumber = 9;
-    private uint maximalPressure_;
+    private int maximalPressure_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint MaximalPressure {
+    public int MaximalPressure {
       get { return maximalPressure_; }
       set {
         maximalPressure_ = value;
@@ -215,9 +215,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "MinimalMV" field.</summary>
     public const int MinimalMVFieldNumber = 10;
-    private uint minimalMV_;
+    private int minimalMV_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint MinimalMV {
+    public int MinimalMV {
       get { return minimalMV_; }
       set {
         minimalMV_ = value;
@@ -226,9 +226,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "MaximalMV" field.</summary>
     public const int MaximalMVFieldNumber = 11;
-    private uint maximalMV_;
+    private int maximalMV_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint MaximalMV {
+    public int MaximalMV {
       get { return maximalMV_; }
       set {
         maximalMV_ = value;
@@ -248,9 +248,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "BubbleSize" field.</summary>
     public const int BubbleSizeFieldNumber = 13;
-    private uint bubbleSize_;
+    private int bubbleSize_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint BubbleSize {
+    public int BubbleSize {
       get { return bubbleSize_; }
       set {
         bubbleSize_ = value;
@@ -259,9 +259,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "AVG_Nl_stepValue_1_4" field.</summary>
     public const int AVGNlStepValue14FieldNumber = 14;
-    private uint aVGNlStepValue14_;
+    private int aVGNlStepValue14_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint AVGNlStepValue14 {
+    public int AVGNlStepValue14 {
       get { return aVGNlStepValue14_; }
       set {
         aVGNlStepValue14_ = value;
@@ -270,9 +270,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "AVG_Nl_stepValue_2_4" field.</summary>
     public const int AVGNlStepValue24FieldNumber = 15;
-    private uint aVGNlStepValue24_;
+    private int aVGNlStepValue24_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint AVGNlStepValue24 {
+    public int AVGNlStepValue24 {
       get { return aVGNlStepValue24_; }
       set {
         aVGNlStepValue24_ = value;
@@ -281,9 +281,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "AVG_Nl_stepValue_3_4" field.</summary>
     public const int AVGNlStepValue34FieldNumber = 16;
-    private uint aVGNlStepValue34_;
+    private int aVGNlStepValue34_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint AVGNlStepValue34 {
+    public int AVGNlStepValue34 {
       get { return aVGNlStepValue34_; }
       set {
         aVGNlStepValue34_ = value;
@@ -292,9 +292,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "AVG_Nl_stepValue_4_4" field.</summary>
     public const int AVGNlStepValue44FieldNumber = 17;
-    private uint aVGNlStepValue44_;
+    private int aVGNlStepValue44_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint AVGNlStepValue44 {
+    public int AVGNlStepValue44 {
       get { return aVGNlStepValue44_; }
       set {
         aVGNlStepValue44_ = value;
@@ -303,9 +303,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "SW_Reserve" field.</summary>
     public const int SWReserveFieldNumber = 18;
-    private uint sWReserve_;
+    private int sWReserve_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint SWReserve {
+    public int SWReserve {
       get { return sWReserve_; }
       set {
         sWReserve_ = value;
@@ -358,9 +358,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "PressureSlope" field.</summary>
     public const int PressureSlopeFieldNumber = 23;
-    private uint pressureSlope_;
+    private int pressureSlope_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint PressureSlope {
+    public int PressureSlope {
       get { return pressureSlope_; }
       set {
         pressureSlope_ = value;
@@ -391,9 +391,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "Spare1" field.</summary>
     public const int Spare1FieldNumber = 26;
-    private uint spare1_;
+    private int spare1_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint Spare1 {
+    public int Spare1 {
       get { return spare1_; }
       set {
         spare1_ = value;
@@ -402,9 +402,9 @@ namespace Tango.PMR.Stubs {
 
     /// <summary>Field number for the "Spare2" field.</summary>
     public const int Spare2FieldNumber = 27;
-    private uint spare2_;
+    private int spare2_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint Spare2 {
+    public int Spare2 {
       get { return spare2_; }
       set {
         spare2_ = value;
@@ -589,19 +589,19 @@ namespace Tango.PMR.Stubs {
       }
       if (MinimalPressure != 0) {
         output.WriteRawTag(64);
-        output.WriteUInt32(MinimalPressure);
+        output.WriteInt32(MinimalPressure);
       }
       if (MaximalPressure != 0) {
         output.WriteRawTag(72);
-        output.WriteUInt32(MaximalPressure);
+        output.WriteInt32(MaximalPressure);
       }
       if (MinimalMV != 0) {
         output.WriteRawTag(80);
-        output.WriteUInt32(MinimalMV);
+        output.WriteInt32(MinimalMV);
       }
       if (MaximalMV != 0) {
         output.WriteRawTag(88);
-        output.WriteUInt32(MaximalMV);
+        output.WriteInt32(MaximalMV);
       }
       if (TotalCycles != 0) {
         output.WriteRawTag(96);
@@ -609,27 +609,27 @@ namespace Tango.PMR.Stubs {
       }
       if (BubbleSize != 0) {
         output.WriteRawTag(104);
-        output.WriteUInt32(BubbleSize);
+        output.WriteInt32(BubbleSize);
       }
       if (AVGNlStepValue14 != 0) {
         output.WriteRawTag(112);
-        output.WriteUInt32(AVGNlStepValue14);
+        output.WriteInt32(AVGNlStepValue14);
       }
       if (AVGNlStepValue24 != 0) {
         output.WriteRawTag(120);
-        output.WriteUInt32(AVGNlStepValue24);
+        output.WriteInt32(AVGNlStepValue24);
       }
       if (AVGNlStepValue34 != 0) {
         output.WriteRawTag(128, 1);
-        output.WriteUInt32(AVGNlStepValue34);
+        output.WriteInt32(AVGNlStepValue34);
       }
       if (AVGNlStepValue44 != 0) {
         output.WriteRawTag(136, 1);
-        output.WriteUInt32(AVGNlStepValue44);
+        output.WriteInt32(AVGNlStepValue44);
       }
       if (SWReserve != 0) {
         output.WriteRawTag(144, 1);
-        output.WriteUInt32(SWReserve);
+        output.WriteInt32(SWReserve);
       }
       if (Spare1Pressure != 0) {
         output.WriteRawTag(152, 1);
@@ -649,7 +649,7 @@ namespace Tango.PMR.Stubs {
       }
       if (PressureSlope != 0) {
         output.WriteRawTag(184, 1);
-        output.WriteUInt32(PressureSlope);
+        output.WriteInt32(PressureSlope);
       }
       if (ProductionDate.Length != 0) {
         output.WriteRawTag(194, 1);
@@ -661,11 +661,11 @@ namespace Tango.PMR.Stubs {
       }
       if (Spare1 != 0) {
         output.WriteRawTag(208, 1);
-        output.WriteUInt32(Spare1);
+        output.WriteInt32(Spare1);
       }
       if (Spare2 != 0) {
         output.WriteRawTag(216, 1);
-        output.WriteUInt32(Spare2);
+        output.WriteInt32(Spare2);
       }
       if (ATSChannel != 0) {
         output.WriteRawTag(224, 1);
@@ -714,37 +714,37 @@ namespace Tango.PMR.Stubs {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(DispenserSN);
       }
       if (MinimalPressure != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MinimalPressure);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(MinimalPressure);
       }
       if (MaximalPressure != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MaximalPressure);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(MaximalPressure);
       }
       if (MinimalMV != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MinimalMV);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(MinimalMV);
       }
       if (MaximalMV != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(MaximalMV);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(MaximalMV);
       }
       if (TotalCycles != 0) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TotalCycles);
       }
       if (BubbleSize != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(BubbleSize);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(BubbleSize);
       }
       if (AVGNlStepValue14 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(AVGNlStepValue14);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(AVGNlStepValue14);
       }
       if (AVGNlStepValue24 != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(AVGNlStepValue24);
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(AVGNlStepValue24);
       }
       if (AVGNlStepValue34 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(AVGNlStepValue34);
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(AVGNlStepValue34);
       }
       if (AVGNlStepValue44 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(AVGNlStepValue44);
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(AVGNlStepValue44);
       }
       if (SWReserve != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(SWReserve);
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(SWReserve);
       }
       if (Spare1Pressure != 0) {
         size += 2 + pb::CodedOutputStream.ComputeInt32Size(Spare1Pressure);
@@ -759,7 +759,7 @@ namespace Tango.PMR.Stubs {
         size += 2 + pb::CodedOutputStream.ComputeUInt32Size(Color);
       }
       if (PressureSlope != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(PressureSlope);
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(PressureSlope);
       }
       if (ProductionDate.Length != 0) {
         size += 2 + pb::CodedOutputStream.ComputeStringSize(ProductionDate);
@@ -768,10 +768,10 @@ namespace Tango.PMR.Stubs {
         size += 2 + pb::CodedOutputStream.ComputeUInt32Size(ATSlocation);
       }
       if (Spare1 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(Spare1);
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Spare1);
       }
       if (Spare2 != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(Spare2);
+        size += 2 + pb::CodedOutputStream.ComputeInt32Size(Spare2);
       }
       if (ATSChannel != 0) {
         size += 2 + pb::CodedOutputStream.ComputeUInt32Size(ATSChannel);
@@ -931,19 +931,19 @@ namespace Tango.PMR.Stubs {
             break;
           }
           case 64: {
-            MinimalPressure = input.ReadUInt32();
+            MinimalPressure = input.ReadInt32();
             break;
           }
           case 72: {
-            MaximalPressure = input.ReadUInt32();
+            MaximalPressure = input.ReadInt32();
             break;
           }
           case 80: {
-            MinimalMV = input.ReadUInt32();
+            MinimalMV = input.ReadInt32();
             break;
           }
           case 88: {
-            MaximalMV = input.ReadUInt32();
+            MaximalMV = input.ReadInt32();
             break;
           }
           case 96: {
@@ -951,27 +951,27 @@ namespace Tango.PMR.Stubs {
             break;
           }
           case 104: {
-            BubbleSize = input.ReadUInt32();
+            BubbleSize = input.ReadInt32();
             break;
           }
           case 112: {
-            AVGNlStepValue14 = input.ReadUInt32();
+            AVGNlStepValue14 = input.ReadInt32();
             break;
           }
           case 120: {
-            AVGNlStepValue24 = input.ReadUInt32();
+            AVGNlStepValue24 = input.ReadInt32();
             break;
           }
           case 128: {
-            AVGNlStepValue34 = input.ReadUInt32();
+            AVGNlStepValue34 = input.ReadInt32();
             break;
           }
           case 136: {
-            AVGNlStepValue44 = input.ReadUInt32();
+            AVGNlStepValue44 = input.ReadInt32();
             break;
           }
           case 144: {
-            SWReserve = input.ReadUInt32();
+            SWReserve = input.ReadInt32();
             break;
           }
           case 152: {
@@ -991,7 +991,7 @@ namespace Tango.PMR.Stubs {
             break;
           }
           case 184: {
-            PressureSlope = input.ReadUInt32();
+            PressureSlope = input.ReadInt32();
             break;
           }
           case 194: {
@@ -1003,11 +1003,11 @@ namespace Tango.PMR.Stubs {
             break;
           }
           case 208: {
-            Spare1 = input.ReadUInt32();
+            Spare1 = input.ReadInt32();
             break;
           }
           case 216: {
-            Spare2 = input.ReadUInt32();
+            Spare2 = input.ReadInt32();
             break;
           }
           case 224: {
diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubMainCardEEpromWriteResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubMainCardEEpromWriteResponse.cs
index ff074d202..012fe37e4 100644
--- a/Software/Visual_Studio/Tango.PMR/Stubs/StubMainCardEEpromWriteResponse.cs
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubMainCardEEpromWriteResponse.cs
@@ -7,7 +7,7 @@ using pb = global::Google.Protobuf;
 using pbc = global::Google.Protobuf.Collections;
 using pbr = global::Google.Protobuf.Reflection;
 using scg = global::System.Collections.Generic;
-namespace Tango.PMR.EmbeddedParameters {
+namespace Tango.PMR.Stubs {
 
   /// <summary>Holder for reflection information generated from StubMainCardEEpromWriteResponse.proto</summary>
   public static partial class StubMainCardEEpromWriteResponseReflection {
@@ -22,14 +22,14 @@ namespace Tango.PMR.EmbeddedParameters {
     static StubMainCardEEpromWriteResponseReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "CiVTdHViTWFpbkNhcmRFRXByb21Xcml0ZVJlc3BvbnNlLnByb3RvEhxUYW5n",
-            "by5QTVIuRW1iZWRkZWRQYXJhbWV0ZXJzIiEKH1N0dWJNYWluQ2FyZEVFcHJv",
-            "bVdyaXRlUmVzcG9uc2VCKAomY29tLnR3aW5lLnRhbmdvLnBtci5lbWJlZGRl",
-            "ZHBhcmFtZXRlcnNiBnByb3RvMw=="));
+            "CiVTdHViTWFpbkNhcmRFRXByb21Xcml0ZVJlc3BvbnNlLnByb3RvEg9UYW5n",
+            "by5QTVIuU3R1YnMiQAofU3R1Yk1haW5DYXJkRUVwcm9tV3JpdGVSZXNwb25z",
+            "ZRIPCgdBZGRyZXNzGAEgASgFEgwKBERhdGEYAiABKAVCGwoZY29tLnR3aW5l",
+            "LnRhbmdvLnBtci5zdHVic2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.StubMainCardEEpromWriteResponse), global::Tango.PMR.EmbeddedParameters.StubMainCardEEpromWriteResponse.Parser, null, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubMainCardEEpromWriteResponse), global::Tango.PMR.Stubs.StubMainCardEEpromWriteResponse.Parser, new[]{ "Address", "Data" }, null, null, null)
           }));
     }
     #endregion
@@ -43,7 +43,7 @@ namespace Tango.PMR.EmbeddedParameters {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.EmbeddedParameters.StubMainCardEEpromWriteResponseReflection.Descriptor.MessageTypes[0]; }
+      get { return global::Tango.PMR.Stubs.StubMainCardEEpromWriteResponseReflection.Descriptor.MessageTypes[0]; }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -60,6 +60,8 @@ namespace Tango.PMR.EmbeddedParameters {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public StubMainCardEEpromWriteResponse(StubMainCardEEpromWriteResponse other) : this() {
+      address_ = other.address_;
+      data_ = other.data_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -67,6 +69,28 @@ namespace Tango.PMR.EmbeddedParameters {
       return new StubMainCardEEpromWriteResponse(this);
     }
 
+    /// <summary>Field number for the "Address" field.</summary>
+    public const int AddressFieldNumber = 1;
+    private int address_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int Address {
+      get { return address_; }
+      set {
+        address_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "Data" field.</summary>
+    public const int DataFieldNumber = 2;
+    private int data_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int Data {
+      get { return data_; }
+      set {
+        data_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as StubMainCardEEpromWriteResponse);
@@ -80,12 +104,16 @@ namespace Tango.PMR.EmbeddedParameters {
       if (ReferenceEquals(other, this)) {
         return true;
       }
+      if (Address != other.Address) return false;
+      if (Data != other.Data) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
+      if (Address != 0) hash ^= Address.GetHashCode();
+      if (Data != 0) hash ^= Data.GetHashCode();
       return hash;
     }
 
@@ -96,11 +124,25 @@ namespace Tango.PMR.EmbeddedParameters {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
+      if (Address != 0) {
+        output.WriteRawTag(8);
+        output.WriteInt32(Address);
+      }
+      if (Data != 0) {
+        output.WriteRawTag(16);
+        output.WriteInt32(Data);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
+      if (Address != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Address);
+      }
+      if (Data != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Data);
+      }
       return size;
     }
 
@@ -109,6 +151,12 @@ namespace Tango.PMR.EmbeddedParameters {
       if (other == null) {
         return;
       }
+      if (other.Address != 0) {
+        Address = other.Address;
+      }
+      if (other.Data != 0) {
+        Data = other.Data;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -119,6 +167,14 @@ namespace Tango.PMR.EmbeddedParameters {
           default:
             input.SkipLastField();
             break;
+          case 8: {
+            Address = input.ReadInt32();
+            break;
+          }
+          case 16: {
+            Data = input.ReadInt32();
+            break;
+          }
         }
       }
     }