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

14 files changed, 50 insertions, 34 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
index b44af40fa..c130b0275 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/TemperatureSensor.c
@@ -213,7 +213,7 @@ int TemperatureListString(char* str)
                         TempSensorResponse[HEAD_PT100_ZONE_3_0X82_0].Temperature_C_mult_by_100/100,
                         TempSensorResponse[HEAD_PT100_AIR_HEATER_1_0X8C_0].Temperature_C_mult_by_100/100, TempSensorResponse[HEAD_PT100_AIR_HEATER_2_0X8C_1].Temperature_C_mult_by_100/100,
                         TempSensorResponse[HEAD_PT100_MIXER_0X8E_0].Temperature_C_mult_by_100/100,  TempSensorResponse[TEMP_SENSE_ANALOG_DRYER_TEMP1].Temperature_C_mult_by_100/100,
-                        (int)(GetWHSAirFlow(HEAD_FLOW_METER)*100),(int)(PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0)*100),(int)(PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0)*100));
+                        (int)(GetWHSAirFlow(HEAD_FLOW_METER)*100),(int)(PressureSensorGetPressure(HEAD_FAN_RIGHT)*100),(int)(PressureSensorGetPressure(HEAD_FAN_LEFT)*100));
     }
     else
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index b159897aa..9d9c36623 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -532,10 +532,10 @@ void CopyTemperaturesToMonitor(void)
         DiagnosticsMonitor.n_headzone12temperature =
                 HeaterCounterIndex[HEATER_TYPE__HeaterZone12];
 
-        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
-        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
-        headblower1airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
-        headblower2airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
+        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
+        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
+        headblower1airflow = PressureSensorGetPressure(HEAD_FAN_RIGHT);
+        headblower2airflow = PressureSensorGetPressure(HEAD_FAN_LEFT);
         DiagnosticsMonitor.headblower1airflow = &headblower1airflow;
         DiagnosticsMonitor.headblower2airflow = &headblower2airflow;
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
index 59a0aee51..f3ab7a851 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_Blowers.c
@@ -50,15 +50,17 @@
 #define MAX_ALLOWED_PWM 255
 #define ARC_ALARM_LIMIT 3
 
-#define PRESSURE_SENSOR_CP  0.269
-#define PRESSURE_SENSOR_B   0.45
+#define PRESSURE_SENSOR_CP      0.269
+#define PRESSURE_SENSOR_B       0.45
+#define V0_DEFAULT_VALUE        1050
+#define FAN_MIN_RPM_THRESHOLD   3200
 extern uint16_t Head_Fan_Tach[2];
 extern uint8_t Head_Fan_PWM_Command[2];
 
 uint32_t    PressureSensorV0[2] = {0, 0};
 uint8_t     HeadBlowersCloseLoopTime[2] = {2, 2};
 uint8_t     HeadBlowersEnable = 1;
-uint8_t     BlowerIdToSensorId[2] = {HEAD_PT100_ZONE_5_0X84_0, HEAD_PT100_ZONE_7_0X86_0}; //HEAD_FAN_RIGHT, HEAD_FAN_LEFT
+uint8_t     BlowerIdToSensorId[2] = {HEAD_PT100_ZONE_7_0X86_0, HEAD_PT100_ZONE_5_0X84_0}; //HEAD_FAN_RIGHT, HEAD_FAN_LEFT
 
 typedef struct
 {
@@ -181,11 +183,16 @@ int HeadBlowerSensorIdToFanId(uint8_t sensorId)
         return HEAD_FAN_LEFT;
 }
 
+int HeadBlowerFanIdToBlowerId(uint8_t FanId)
+{
+    return BlowerIdToSensorId[FanId];
+}
+
 bool HeadBlowerFlowControl(double Q_value, uint8_t blowerId)
 {
     double currentFlow = 0.0;
 
-    currentFlow = PressureSensorGetPressure(BlowerIdToSensorId[blowerId]);
+    currentFlow = PressureSensorGetPressure(blowerId);
     HeadBlowerPidFunc(Q_value,currentFlow, blowerId);
     return OK;
 }
@@ -270,7 +277,7 @@ void ArcHeadAlarms(void)
         count4 = (count4 < 0)?(0):(count4);
     }
 
-    currentFlow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
+    currentFlow = PressureSensorGetPressure(HEAD_FAN_RIGHT);
     if (currentFlow > 5.0) {
         if (++count5 == ARC_ALARM_LIMIT)
             AlarmHandlingSetAlarm(EVENT_TYPE__DYEING_HEAD_BLOWER_1_FLOW_TOO_HIGH, true);
@@ -290,7 +297,7 @@ void ArcHeadAlarms(void)
         count6 = (count6 < 0)?(0):(count6);
     }
 
-    currentFlow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
+    currentFlow = PressureSensorGetPressure(HEAD_FAN_LEFT);
     if (currentFlow > 5.0) {
         if (++count7 == ARC_ALARM_LIMIT)
             AlarmHandlingSetAlarm(EVENT_TYPE__DYEING_HEAD_BLOWER_2_FLOW_TOO_HIGH, true);
@@ -348,8 +355,13 @@ void HeadBlowersCfg()
 uint32_t PressureSensorInit(int blowerId)
 {
     uint32_t V0;
-    V0 = MillisecGetTemperatures(BlowerIdToSensorId[blowerId]);
-    V0 /= 10;
+
+    if (HeadBlowersGetRPM(blowerId) < FAN_MIN_RPM_THRESHOLD) {
+        V0 = MillisecGetTemperatures(BlowerIdToSensorId[blowerId]);
+        V0 /= 10;
+    } else {
+        V0 = V0_DEFAULT_VALUE;
+    }
     return V0;
 }
 
@@ -369,12 +381,12 @@ int HeadBlowersGetPWM(uint8_t blowerId)
     return Head_Fan_PWM_Command[blowerId];
 }
 
-double PressureSensorGetPressure(uint8_t SensorId)
+double PressureSensorGetPressure(uint8_t FanId)
 {
     double V0, Vm, Q;
-    int FanId;
+    int SensorId;
 
-    FanId = HeadBlowerSensorIdToFanId(SensorId);
+    SensorId = BlowerIdToSensorId[FanId];
     V0 = PressureSensorV0[FanId];
     Vm = (double)(MillisecGetTemperatures(SensorId));
     Vm /= 10.0;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
index a23abf559..ee60a75cc 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_ex.h
@@ -44,7 +44,7 @@ uint32_t HeatersEnd(void);
 void HeatersControlStart(void);
 void HeatersControlStop(void);
 uint32_t Heaters_Init(void);
-double PressureSensorGetPressure(uint8_t SensorId);
+double PressureSensorGetPressure(uint8_t FanId);
 int HeadBlowersGetRPM(uint8_t fanId);
 uint32_t PressureSensorInit();
 void HeadBlowersInit();
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index 25fb8e962..9c5fe9822 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -567,8 +567,8 @@ uint32_t Waste_PrepareCallbak(uint32_t IfIndex, uint32_t ReadValue)
 {
     bool ready = false, headready = false,whsready = false;
     double HeadFlow = GetWHSAirFlow(HEAD_FLOW_METER);
-    double HeadIn_Flow =  PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
-    double HeadOut_Flow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
+    double HeadIn_Flow =  PressureSensorGetPressure(HEAD_FAN_RIGHT);
+    double HeadOut_Flow = PressureSensorGetPressure(HEAD_FAN_LEFT);
     if ((HeadFlow<(headairflow*(1+AllowedRangeForWasteBlowerDeviation)))
             &&(HeadFlow>(headairflow*(1-AllowedRangeForWasteBlowerDeviation))))
     {
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index d5e125337..dfdbd91af 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -472,14 +472,14 @@ uint32_t InitSequenceArcAirflowCalibration(void)
         V0[0] = PressureSensorInit(0);
         V0[1] = PressureSensorInit(1);
         ReportWithPackageFilter(InitFilter,"read pressure sensor v0[0],v0[1]", __FILE__,__LINE__, (int)V0[0], RpMessage, (int)V0[1], 0);
-        if (V0[0] > 1000) {
+        if ((V0[0] > 1000) && (V0[0] < 1200)) {
             MCU_E2PromProgram(EEPROM_PRESSURE_SENSOR_V0_0, V0[0]);
             ReportWithPackageFilter(InitFilter,"store pressure sensor v0[0]", __FILE__,__LINE__, (int)V0[0], RpMessage, 0, 0);
         } else {
             MCU_E2PromRead(EEPROM_PRESSURE_SENSOR_V0_0, &V0[0]);
             ReportWithPackageFilter(InitFilter,"load from EEPROM", __FILE__,__LINE__, (int)V0[0], RpMessage, 0, 0);
         }
-        if (V0[1] > 1000) {
+        if ((V0[1] > 1000) && (V0[1] < 1200)) {
             MCU_E2PromProgram(EEPROM_PRESSURE_SENSOR_V0_1, V0[1]);
             ReportWithPackageFilter(InitFilter,"store pressure sensor v0[1]", __FILE__,__LINE__, (int)V0[1], RpMessage, 0, 0);
         } else {
@@ -499,7 +499,7 @@ uint32_t InitSequenceInitialBlowerActivation(void)
 {
     WHS_enable_control_loop(false);
     Turn_the_Blower_On();//Turn on with the Default_Voltage
-    Control_Voltage_To_Blower(1); //stop the blower    
+    Control_Voltage_To_Blower(1); //stop the blower
     HeadBlowersInit();
 	Task_sleep (1000);
 	
diff --git a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
index 3b2172443..dc6557505 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip
@@ -29,10 +29,10 @@
     <ROW Property="ExtractFilesFirst" Value="1"/>
     <ROW Property="LogoIcon" Value="externalui.ico" MultiBuildValue="DefaultBuild:machine_full_0UZ_icon.ico_1" Type="1" MsiKey="LogoIcon"/>
     <ROW Property="Manufacturer" Value="Twine Solutions LTD"/>
-    <ROW Property="ProductCode" Value="1033:{60135750-CBB3-42F2-BCFC-9C43156DCA8A} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{29B2755A-3E0C-4E63-8713-274456E8C843} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango FSE"/>
-    <ROW Property="ProductVersion" Value="1.1.0.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.1.1.0" Type="32"/>
     <ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{0E13CB0D-89F7-465E-9F56-F1CBD6773E6E}"/>
@@ -779,7 +779,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\FSE\Release" PackageFileName="Tango FSE v1.1.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Tango FSE v1.1.0"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\FSE\Release" PackageFileName="Tango FSE v1.1.1" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Tango FSE v1.1.1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
index 13f3dae11..a9fca2e1a 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip
@@ -16,10 +16,10 @@
     <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
     <ROW Property="ARPNOREPAIR" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{730EA73A-6350-443D-9767-230B8178CB4E} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{7577BEBE-247C-415C-BE01-3BA0BEF8CBBD} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Machine Studio"/>
-    <ROW Property="ProductVersion" Value="4.2.0.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="4.2.1.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{CBEE5CAE-7C5A-4280-98DE-AA98113764E4}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -873,7 +873,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.2.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.2.0"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\Machine Studio\Release" PackageFileName="Machine Studio Installer_v4.2.1" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="Machine Studio Installer_v4.2.1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index 5fe5afe5a..9453b5c13 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index 872e4b938..76614c76c 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{89DF366A-2C79-4626-BA98-249E464D5997} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{CE4F6CA8-3FB0-4C08-9948-21DC430EB452} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.2.0.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.2.1.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -529,7 +529,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.2.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.2.0"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.2.1" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.2.1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
index dd4a2d6c4..c77ff4e85 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 03c55f1c8..a6b7f8ce9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("4.2.0.0")]
+[assembly: AssemblyVersion("4.2.1.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 186cda159..aad563fc1 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
index 83579d776..2bec38f82 100644
--- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
+++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs
@@ -1384,7 +1384,11 @@ namespace Tango.Integration.Operation
             if (Status == MachineStatuses.Upgrading) return;
 
             Status = MachineStatuses.Disconnected;
-            MachineStatus.State = MachineState.Ready;
+
+            if (MachineStatus != null)
+            {
+                MachineStatus.State = MachineState.Ready;
+            }
 
             SessionLogger.EndSession();