fixes in waste/ink

15 files changed, 66 insertions, 94 deletions

diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index 0abb4bac3..a6c87f9aa 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -21,8 +21,8 @@
 #define NO_INITIAL_HEATING
 #define MAX_STRING_LEN              255 //Embedded  version + filter.c
 
-#define WATCHDOG
-#define FPGA_WATCHDOG
+//#define WATCHDOG
+//#define FPGA_WATCHDOG
 //#define Use_Head_Card //for real card only
 //#define Test_headCard_With_DispCard_I2C4_Add0xE2_DispID_0
 
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index df89a85b3..301d0d6c3 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -21,8 +21,6 @@
 #include "Common/utilities/idle_task.h"
 #include "Drivers/ADC_Sampling/ADC.h"
 
-#include <ti/sysbios/hal/Seconds.h>
-#include <time.h>
 #include "drivers/Heater/Heater.h"
 #include "drivers/Motors/Motor.h"
 
@@ -276,21 +274,7 @@ int main(void)
     #ifndef EVALUATION_BOARD
         Init_Machine_Leds();
     #endif
-/* shai add time : */
-#define STARTTIME 63731536552
-        time_t t;
-        struct tm *ltm;
-        char *curTime;
 
-        Seconds_set(STARTTIME);
-
-        t = time(NULL);
-        ltm = localtime(&t);
-        curTime = asctime(ltm);
-        System_printf("Time(GMT): %s\n", curTime);
- //  https://www.epochconverter.com/seconds-days-since-y0
-
-/* end time   */
 #ifndef EVALUATION_BOARD
    WHS_init();
     //IDS_ModuleInit();
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 6f80fdffb..6688fb42d 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -260,13 +260,14 @@ AlarmHandlingItemStruc  HardCodedAlarmItem[MAX_SYSTEM_ALARMS]={
 
      {eOneSecond,ALARM_SOURCE_TYPE__TemperatureAlarm,TEMP_SENSE_AN_ENCLOSURETEMP1,  0,40,true,DEBUG_LOG_CATEGORY__Warning,0xFF,0,EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE      },
      {eOneSecond,ALARM_SOURCE_TYPE__TemperatureAlarm,TEMP_SENSE_AN_ENCLOSURETEMP2,  1,40,true,DEBUG_LOG_CATEGORY__Warning,0xFF,0,EVENT_TYPE__MACHINE_INTERNAL_OVERTEMPERATURE      },
-
-     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor1_EC    ,1,false,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_1_OPEN},
-     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor2_PPC    ,1,false,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_2_OPEN},
-     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor3_DH_DRYER    ,1,false,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_3_OPEN},
-     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor4_MIDTANKS    ,1,false,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_4_OPEN},
-     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,RearDoor      ,1,false,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__REAR_COVER_OPEN     },
-     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,CartridgesDoor,1,false,true,DEBUG_LOG_CATEGORY__Warning,0xFF,5,EVENT_TYPE__CARTRIDGES_COVER_OPEN},
+/*
+     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor1_EC      ,1,true,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_1_OPEN},
+     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor2_PPC     ,1,true,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_2_OPEN},
+     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor3_DH_DRYER,1,true,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_3_OPEN},
+     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,FrontDoor4_MIDTANKS,1,true,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__FRONT_COVER_4_OPEN},
+     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,RearDoor           ,1,true,true,DEBUG_LOG_CATEGORY__Error,  0xFF,5,EVENT_TYPE__REAR_COVER_OPEN     },
+*/
+     {eHundredMillisecond,ALARM_SOURCE_TYPE__CoversAlarm,CartridgesDoor     ,1,true,true,DEBUG_LOG_CATEGORY__Warning,0xFF,5,EVENT_TYPE__CARTRIDGES_COVER_OPEN},
 
 
      {eOneSecond,ALARM_SOURCE_TYPE__TemperatureAlarm,MIXER_PT100,   HARDWARE_PID_CONTROL_TYPE__MixerHeater        ,9,false,DEBUG_LOG_CATEGORY__Warning,0xFF,0,EVENT_TYPE__MIXER_UNDERTEMPERATURE_A},
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index fa94614fd..cdb8950e4 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -536,7 +536,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
     {
         Speed_Data = Calculate_Speed_Sensor_Velocity();
         Read_Buttons_Reg();
-        Ink_Cart_Led();
+        //Ink_Cart_Led();
         for (Sensor_i = 0;Sensor_i < MAX_TEMPERATURE_SENSOR_ID;Sensor_i++)
         {
             MillisecUpdateTemperatures (Sensor_i,TemperatureSensorRead(Sensor_i));
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c
index a88f67d5e..07214d240 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c
@@ -158,7 +158,7 @@ uint32_t ControlActivityLed( uint32_t Parameter1)
 {
     static bool flag = false;
     static uint8_t counter;
-    const uint8_t Blink_Freq = 3;//odd number
+    const uint8_t Blink_Freq = 7;//odd number
 
     if (flag==true)
     {
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.h b/Software/Embedded_SW/Embedded/Modules/Control/control.h
index ca76ec8e1..450646a68 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/control.h
+++ b/Software/Embedded_SW/Embedded/Modules/Control/control.h
@@ -47,7 +47,6 @@ int         SafeRemoveHighControlCallback(uint32_t deviceId , ControlCBFunction
 uint32_t    TemplateDataReadCBFunction (uint32_t deviceId, uint32_t Parameter1);
 uint32_t    GetControlDevice_i(void);
 uint32_t    GetControlLowDevice_i(void);
-ControlCBFunction GetControlCallbackFuncPtr(uint32_t ControlId);
 
 ControlCBFunction GetControlCallbackFuncPtr(uint32_t ControlId);
 
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 8e185750f..4789db31f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -272,7 +272,7 @@ void HeatersControlStart(void)
         ReportWithPackageFilter(HeatersFilter,"HeatersControlStart ", __FILE__,__LINE__,0, RpMessage, 0, 0);
         HeatersRestart = true;
         HeatersStartControlTimer();
-        for (i = 0; i< MAX_INTERNAL_ALARMS;i++)
+        for (i = 0; i< (MAX_INTERNAL_ALARMS-1);i++)
         {
             if (ControlIdtoInternalId [i] == 0xFF)
             {
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index d18833ca6..e307eb3c5 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -110,6 +110,10 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
     {
         PowerOffInit();
     }
+    else if(request->amount == 0xCC)
+    {
+        ResponseDemo(request->delay);
+    }
     else
     {
         response.has_progress = true;
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 0ac23baf5..0ed0f5318 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -90,6 +90,8 @@ uint32_t InternalWinderConfigMessage(HardwareWinder* request)
 
     return status;
 }
+char ScrewStr[150];
+
 uint32_t InternalWindingConfigMessage(JobSpool* request)
 {
     uint32_t status = PASSED;
@@ -100,6 +102,9 @@ uint32_t InternalWindingConfigMessage(JobSpool* request)
     InternalWinderCfg.SpoolBottomBackingRate =  request->bottombackingrate;
     InternalWinderCfg.NumberOfRotationPerPassage = 3.1415926*2;//request->rotationsperpassage;
     InternalWinderCfg.diameter = request->diameter;
+    usnprintf(ScrewStr, 150, "WindingConfig start,offset,head,tail {, %d, %d, %d, %d, %d}",InternalWinderCfg.startoffsetpulses,(int)InternalWinderCfg.segmentoffsetpulses,
+              (int)InternalWinderCfg.spoolbackingrate,(int)InternalWinderCfg.SpoolBottomBackingRate);
+    Report(ScrewStr,__FILE__,__LINE__,(int)InternalWinderCfg.diameter,RpWarning,(int)(InternalWinderCfg.NumberOfRotationPerPassage*1000), 0);
 
     return status;
 }
@@ -257,7 +262,7 @@ InternalWinderCfg.segmentoffsetpulses
   
 numOfSteps = InternalWinderCfg.startoffsetpulses*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].microstep;
 */
-char ScrewStr[150];
+
 //char TempScrewStr[100];
 double WinderReferenceSpeed=0;
 double  TotalWinderSpeed=0;
@@ -267,6 +272,8 @@ int flipflop = 0;
 uint32_t motspeed;
 float speedf;
 int WinderCalculation = 0;
+float WinderRunAverage = 0.0,WinderRunSum = 0.0;
+int WinderRunSamples = 0;
 uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
 {
     //uint32_t Steps;
@@ -274,6 +281,8 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
     double screw_horizontal_speed = 0;
     double RotationsPerSecond;
     double Averagewinderspeed = 0;
+    int WinderRun;
+
 
 //    {
 //        TotalWinderSpeed-=WinderMotorSpeed[WinderMotorSpeedCounter];
@@ -312,14 +321,15 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
     //double calcsteps = (ScrewRunningTime/SYS_CLK_FREQ)*ScrewSpeed;
 #ifdef READ_SCREW_ENCODER
      WinderRun = abs(ScrewLocationRun[1] - ScrewLocationRun[0]);
-     if (WinderRun < 50000)
+     if ((WinderRun < 50000)&&(Add100 == false))
      {
          WinderRunSum+=WinderRun;
          WinderRunSamples++;
          WinderRunAverage = WinderRunSum/WinderRunSamples;
-         if ((fabs(WinderRun-WinderRunAverage)>=50)||(WinderRunSamples%50 == 0))
+         if ((fabs(WinderRun-WinderRunAverage)>=30)||(WinderRunSamples%100 == 0))
          {
-             usnprintf(ScrewStr, 150, "curr,sum,avg,samples {Winder Encoder:, %d, %d, %d, %d }",WinderRun,(int)WinderRunSum,(int)WinderRunAverage,(int)WinderRunSamples);
+             usnprintf(ScrewStr, 150, "curr,sum,avg,samples {Winder Encoder:, %d, %d, %d, %d, %d}",WinderRun,(int)WinderRunSum,(int)WinderRunAverage,(int)WinderRunSamples,
+                       (int)(100*WinderRun/ScrewNumberOfSteps));
              Report(ScrewStr,__FILE__,__LINE__,CalculationDirectionChangeCounter,RpWarning,ScrewLocationStart, 0);
          }
      }
@@ -343,7 +353,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
         {
             ScrewNumberOfSteps--;
             WindingConeLocation--;
-  //          ReportWithPackageFilter(ThreadFilter,"Head Backing",__FILE__,__LINE__,CalculationDirectionChangeCounter,RpWarning,ScrewNumberOfSteps, 0);
+            ReportWithPackageFilter(ThreadFilter,"Head Backing",__FILE__,__LINE__,CalculationDirectionChangeCounter,RpWarning,ScrewNumberOfSteps, 0);
         }
     }
     else //next time going back
@@ -351,7 +361,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag)
         if ((CalculationDirectionChangeCounter/2)%InternalWinderCfg.SpoolBottomBackingRate == 0)
         {
             ScrewNumberOfSteps++;
-    //        Report("Bottom Backing ",__FILE__,__LINE__,CalculationDirectionChangeCounter,RpWarning,ScrewNumberOfSteps, 0);
+            Report("Bottom Backing ",__FILE__,__LINE__,CalculationDirectionChangeCounter,RpWarning,ScrewNumberOfSteps, 0);
         }
     }
    /* if (WinderMotorSpeedRollOver)
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h
index 5242aa3b1..39894ce2d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h
@@ -27,10 +27,14 @@ typedef unsigned char U8;
 
 typedef enum
 {
-    CYAN = 1,
+    BLACK,
+    CYAN,
     MAGENTA,
     YELLOW,
-    BLACK
+    TRANSPARENT,
+    SP_1,
+    CLEANER,
+    LUBRICANT
 } CMYK_color;
 
 typedef enum
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index c7054e3bb..5dedfda85 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -188,44 +188,10 @@ bool IFS_TimeOutAlarm()
 bool MidTankValvesAction(bool action) //Cartridge_MidTank_ON of Cartridge_MidTank_OFF
 {
     bool ret =  false;
-    switch (WHS_info.Ink.cart_color) //todo enter the correct color from RFID
-    {
-        case CYAN :
 
-            Valve_Set( VALVE_2W_CART_MID_1, action);     //Cartridge_MidTank_ON Cartridge_MidTank_OFF
-            Valve_Set( VALVE_2W_MID_AIR_1 , action);
-            break;
-        case MAGENTA :
-            Valve_Set( VALVE_2W_CART_MID_5, action);
-            Valve_Set( VALVE_2W_MID_AIR_5 , action);
-           break;
-        case YELLOW :
-            Valve_Set( VALVE_2W_CART_MID_2, action);
-            Valve_Set( VALVE_2W_MID_AIR_2 , action);
-            break;
-        case BLACK :
-            Valve_Set( VALVE_2W_CART_MID_6, action);
-            Valve_Set( VALVE_2W_MID_AIR_6 , action);
-           break;
-        case 5 :
-            Valve_Set( VALVE_2W_CART_MID_3, action);
-            Valve_Set( VALVE_2W_MID_AIR_3 , action);
-           break;
-        case 6 :
-            Valve_Set( VALVE_2W_CART_MID_7, action);
-            Valve_Set( VALVE_2W_MID_AIR_7 , action);
-           break;
-        case 7 :
-            Valve_Set( VALVE_2W_CART_MID_4, action);
-            Valve_Set( VALVE_2W_MID_AIR_4 , action);
-            break;
-        case 8 :
-            Valve_Set( VALVE_2W_CART_MID_8, action);
-            Valve_Set( VALVE_2W_MID_AIR_8 , action);
-           break;
-        default: //wrong color
-            break;
-    }
+    Valve_Set(IDS_Id_to_AirValve[WHS_info.Ink.cart_color], action );   //Atm_MidTank_OFF/ON
+    Valve_Set(IDS_Id_to_CartrideValve[WHS_info.Ink.cart_color], action );   //Atm_MidTank_OFF/ON
+
     ret = true;
     return ret;
 }
@@ -279,7 +245,7 @@ uint32_t ReadCartridgeData(cartridge_name cart_name)
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
     size_t container_size = message_container__pack(&responseContainer, container_buffer);
     my_free(responseContainer.data.data);
-    SendChars((char*)container_buffer, container_size);
+    //SendChars((char*)container_buffer, container_size);
 
     return OK;
 }
@@ -870,8 +836,8 @@ bool WasteTankCBFunction()
                 // is power down in process??  //todo
                 if ( !PowerOffInProcessGetState() ) // not in power down proccess
                 {
-                    //Pannel_Leds(CART_1, MODE_ON);
-                    cart1.color = BLINK;
+                    Pannel_Leds(CART_1, MODE_ON);
+                    //cart1.color = BLINK;
                     //Pannel_Leds(CART_2, MODE_ON);
 //                    cart2.color = fastBILNK;
                     RdCartridgeParam(INK_cartridge); //todo
@@ -1068,8 +1034,11 @@ bool WasteTankCBFunction()
             Disable_MidTank_Pressure_Reading(WHS_info.Ink.cart_color);
             WHS_info.Cartridge_Ink_TimeOut_device_Id = RemoveControlCallback(WHS_info.Cartridge_Ink_TimeOut_device_Id, WasteTankCBFunction );
             REPORT_MSG(WHS_full," ------------ Change cartridge status to Fail ----------------- ");
-            REPORT_MSG(WHS_full," ------------ Display Mid-tank # filling fail ----------------- ");
+
             MidTankValvesAction(Cartridge_MidTank_OFF);
+            cart1.color = fastBILNK;
+            REPORT_MSG(WHS_full," ------------ Display Mid-tank # filling fail ----------------- ");
+            REPORT_MSG(WHS_full," ------------ call customer support ----------------- ");
             IFS_TimeOutAlarm();
             break;
 
@@ -1149,7 +1118,7 @@ WHS_sensor CartridgeInkTimeOutCallBackFunction()
 
     if (WHS_info.Ink.time_out) WHS_info.Ink.time_out += 1;
     Read_MidTank_Pressure_Sensor(WHS_info.Ink.cart_color);
-    if (Get_MidTank_Pressure_Sensor(WHS_info.Ink.time_out) >= WHS_info.MidTank_capacity  + CARTRIDGE_CAPATICY)
+    if (Get_MidTank_Pressure_Sensor(WHS_info.Ink.cart_color) >= WHS_info.MidTank_capacity  + CARTRIDGE_CAPATICY)
     {
         WHS_info.Ink.time_out = 0;
         WHS_info.event = IFS_MidTankFull;
@@ -1168,7 +1137,7 @@ WHS_sensor CartridgeInkTimeOutCallBackFunction()
         MidTankValvesAction(Cartridge_MidTank_OFF);
     }
 
-    if (WHS_info.Ink.time_out == (CARTRIDGE_INK_TIMEOUT+1))
+    if (WHS_info.Ink.time_out == (CARTRIDGE_INK_TIMEOUT+1)) //need to open the valve for second chance
         {
             MidTankValvesAction(Cartridge_MidTank_ON);
         }
diff --git a/Software/Embedded_SW/Embedded/debug_w_pmr/makefile b/Software/Embedded_SW/Embedded/debug_w_pmr/makefile
index 1aeadfc1c..a4d6309cb 100644
--- a/Software/Embedded_SW/Embedded/debug_w_pmr/makefile
+++ b/Software/Embedded_SW/Embedded/debug_w_pmr/makefile
@@ -302,6 +302,7 @@ ORDERED_OBJS += \
 "./Communication/PMR/Stubs/StubValveRequest.pb-c.obj" \
 "./Communication/PMR/Stubs/StubValveResponse.pb-c.obj" \
 "./Drivers/ADC_Sampling/ADC.obj" \
+"./Drivers/ADC_Sampling/ADC_VOC_Sensor.obj" \
 "./Drivers/FPGA/FPGA.obj" \
 "./Drivers/FPGA/FPGA_SPI_Comm.obj" \
 "./Drivers/FPGA/FPGA_SSI_Comm.obj" \
@@ -720,10 +721,10 @@ clean:
 	-$(RM) "Communication\PMR\Stubs\StubHeaterResponse.pb-c.obj" "Communication\PMR\Stubs\StubHeatingTestPollRequest.pb-c.obj" "Communication\PMR\Stubs\StubHeatingTestPollResponse.pb-c.obj" "Communication\PMR\Stubs\StubHeatingTestRequest.pb-c.obj" "Communication\PMR\Stubs\StubHeatingTestResponse.pb-c.obj" "Communication\PMR\Stubs\StubI2CReadBytesRequest.pb-c.obj" "Communication\PMR\Stubs\StubI2CReadBytesResponse.pb-c.obj" "Communication\PMR\Stubs\StubI2CRequest.pb-c.obj" "Communication\PMR\Stubs\StubI2CResponse.pb-c.obj" "Communication\PMR\Stubs\StubI2CWriteBytesRequest.pb-c.obj" "Communication\PMR\Stubs\StubI2CWriteBytesResponse.pb-c.obj" "Communication\PMR\Stubs\StubIntADCReadRequest.pb-c.obj" "Communication\PMR\Stubs\StubIntADCReadResponse.pb-c.obj" "Communication\PMR\Stubs\StubJobRequest.pb-c.obj" "Communication\PMR\Stubs\StubJobResponse.pb-c.obj" "Communication\PMR\Stubs\StubL6470DriverRequest.pb-c.obj" "Communication\PMR\Stubs\StubL6470DriverResponse.pb-c.obj" "Communication\PMR\Stubs\StubMidTankPressureSensorRequest.pb-c.obj" 
 	-$(RM) "Communication\PMR\Stubs\StubMidTankPressureSensorResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorHomeMarkRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorHomeMarkResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorInitRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorInitResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorMovRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorMovResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorPositionRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorPositionResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunStepTickRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorRunStepTickResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorSpeedRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorSpeedResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorStatusRequest.pb-c.obj" 
 	-$(RM) "Communication\PMR\Stubs\StubMotorStatusResponse.pb-c.obj" "Communication\PMR\Stubs\StubMotorStopRequest.pb-c.obj" "Communication\PMR\Stubs\StubMotorStopResponse.pb-c.obj" "Communication\PMR\Stubs\StubOptLimitSwitchRequest.pb-c.obj" "Communication\PMR\Stubs\StubOptLimitSwitchResponse.pb-c.obj" "Communication\PMR\Stubs\StubReadEmbeddedVersionRequest.pb-c.obj" "Communication\PMR\Stubs\StubReadEmbeddedVersionResponse.pb-c.obj" "Communication\PMR\Stubs\StubRealTimeUsageRequest.pb-c.obj" "Communication\PMR\Stubs\StubRealTimeUsageResponse.pb-c.obj" "Communication\PMR\Stubs\StubSpeedSensorRequest.pb-c.obj" "Communication\PMR\Stubs\StubSpeedSensorResponse.pb-c.obj" "Communication\PMR\Stubs\StubSteperMotorRequest.pb-c.obj" "Communication\PMR\Stubs\StubSteperMotorResponse.pb-c.obj" "Communication\PMR\Stubs\StubTempSensorRequest.pb-c.obj" "Communication\PMR\Stubs\StubTempSensorResponse.pb-c.obj" "Communication\PMR\Stubs\StubTivaReadRegRequest.pb-c.obj" "Communication\PMR\Stubs\StubTivaReadRegResponse.pb-c.obj" 
-	-$(RM) "Communication\PMR\Stubs\StubTivaWriteRegRequest.pb-c.obj" "Communication\PMR\Stubs\StubTivaWriteRegResponse.pb-c.obj" "Communication\PMR\Stubs\StubValveRequest.pb-c.obj" "Communication\PMR\Stubs\StubValveResponse.pb-c.obj" "Drivers\ADC_Sampling\ADC.obj" "Drivers\FPGA\FPGA.obj" "Drivers\FPGA\FPGA_SPI_Comm.obj" "Drivers\FPGA\FPGA_SSI_Comm.obj" "Drivers\FPGA\FPGA_GPIO\FPGA_GPIO.obj" "Drivers\FPGA\FPGA_INTERRUPTS\FPGA_Interrupts.obj" "Drivers\FPGA\Full_Vme\FPGA_Programming_Up.obj" "Drivers\FPGA\Full_Vme\ispvme\hardware.obj" "Drivers\FPGA\Full_Vme\ispvme\ispvm_ui.obj" "Drivers\FPGA\Full_Vme\ispvme\ivm_core.obj" "Drivers\FPGA\Motors_Driver\L6470.obj" "Drivers\Flash_Memory\FATFS\Control_File_System.obj" "Drivers\Flash_Memory\FATFS\cc932.obj" "Drivers\Flash_Memory\FATFS\fatfs_port_mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\ff.obj" "Drivers\Flash_Memory\FATFS\mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\spi_flash.obj" "Drivers\Flash_Memory\Flash_Memory.obj" "Drivers\Heater\ADS1220.obj" "Drivers\Heater\Heater.obj" 
-	-$(RM) "Drivers\Heater\TemperatureSensor.obj" "Drivers\I2C_Communication\ADC_MUX\ADC_MUX.obj" "Drivers\I2C_Communication\DAC\Blower.obj" "Drivers\I2C_Communication\Dispenser_Card\EEPROM\Dispenser_EEPROM.obj" "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.obj" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.obj" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.obj" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.obj" "Drivers\I2C_Communication\Head_Card\Heaters\Head_Heaters.obj" "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.obj" "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.obj" "Drivers\I2C_Communication\Head_Card\PT100\PT100_ADC.obj" "Drivers\I2C_Communication\I2C.obj" "Drivers\I2C_Communication\I2C_Comm.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\NFC_I2C.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\Test_NFC.obj" "Drivers\I2C_Communication\RFID_NFC\PN7150\PN7150.obj" "Drivers\I2C_Communication\Thermo_K\MCP9600.obj" "Drivers\Motors\Motor.obj" 
-	-$(RM) "Drivers\Motors\MotorActions.obj" "Drivers\On_Chip_Flash\Flashstore.obj" "Drivers\SPI\SPI_Comm.obj" "Drivers\SSI_Comm\Dancer\Dancer.obj" "Drivers\SSI_Comm\SSI_Comm.obj" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.obj" "Drivers\USB_Communication\USBCDCD.obj" "Drivers\Uart_Comm\Uart.obj" "Drivers\Valves\Valve.obj" "Drivers\flash_ram\FlashProgram.obj" "Drivers\flash_ram\MCU_E2Prom.obj" "Modules\AlarmHandling\AlarmHandling.obj" "Modules\Control\DriverWithCallbackExample.obj" "Modules\Control\MillisecTask.obj" "Modules\Control\PIDAlgo.obj" "Modules\Control\control.obj" "Modules\Diagnostics\DiagnosticActions.obj" "Modules\Diagnostics\Diagnostics.obj" "Modules\Diagnostics\DiagnosticsHoming.obj" "Modules\Diagnostics\DiagnosticsJogging.obj" "Modules\General\GeneralHardware.obj" "Modules\General\Safety.obj" "Modules\General\buttons.obj" "Modules\General\process.obj" "Modules\Heaters\Heaters_bit.obj" "Modules\Heaters\Heaters_init.obj" "Modules\Heaters\Heaters_maint.obj" "Modules\Heaters\Heaters_print.obj" 
-	-$(RM) "Modules\IDS\IDS_BIT.obj" "Modules\IDS\IDS_Cleaning.obj" "Modules\IDS\IDS_dispenser.obj" "Modules\IDS\IDS_init.obj" "Modules\IDS\IDS_maint.obj" "Modules\IDS\IDS_print.obj" "Modules\IFS\ifs.obj" "Modules\Stubs_Handler\Calculate.obj" "Modules\Stubs_Handler\Progress.obj" "Modules\Stubs_Handler\StubRealTimeUsage.obj" "Modules\Stubs_Handler\Stub_Cartridge.obj" "Modules\Stubs_Handler\Stub_Dancer.obj" "Modules\Stubs_Handler\Stub_Dispenser.obj" "Modules\Stubs_Handler\Stub_ExtFlash.obj" "Modules\Stubs_Handler\Stub_FPGARWReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadVersion.obj" "Modules\Stubs_Handler\Stub_GPIO.obj" "Modules\Stubs_Handler\Stub_HW_Version.obj" "Modules\Stubs_Handler\Stub_Heater.obj" "Modules\Stubs_Handler\Stub_I2C.obj" "Modules\Stubs_Handler\Stub_IntADC.obj" "Modules\Stubs_Handler\Stub_L6470.obj" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.obj" "Modules\Stubs_Handler\Stub_Motor.obj" "Modules\Stubs_Handler\Stub_OptLimitSwitch.obj" 
+	-$(RM) "Communication\PMR\Stubs\StubTivaWriteRegRequest.pb-c.obj" "Communication\PMR\Stubs\StubTivaWriteRegResponse.pb-c.obj" "Communication\PMR\Stubs\StubValveRequest.pb-c.obj" "Communication\PMR\Stubs\StubValveResponse.pb-c.obj" "Drivers\ADC_Sampling\ADC.obj" "Drivers\ADC_Sampling\ADC_VOC_Sensor.obj" "Drivers\FPGA\FPGA.obj" "Drivers\FPGA\FPGA_SPI_Comm.obj" "Drivers\FPGA\FPGA_SSI_Comm.obj" "Drivers\FPGA\FPGA_GPIO\FPGA_GPIO.obj" "Drivers\FPGA\FPGA_INTERRUPTS\FPGA_Interrupts.obj" "Drivers\FPGA\Full_Vme\FPGA_Programming_Up.obj" "Drivers\FPGA\Full_Vme\ispvme\hardware.obj" "Drivers\FPGA\Full_Vme\ispvme\ispvm_ui.obj" "Drivers\FPGA\Full_Vme\ispvme\ivm_core.obj" "Drivers\FPGA\Motors_Driver\L6470.obj" "Drivers\Flash_Memory\FATFS\Control_File_System.obj" "Drivers\Flash_Memory\FATFS\cc932.obj" "Drivers\Flash_Memory\FATFS\fatfs_port_mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\ff.obj" "Drivers\Flash_Memory\FATFS\mx66l51235f.obj" "Drivers\Flash_Memory\FATFS\spi_flash.obj" "Drivers\Flash_Memory\Flash_Memory.obj" 
+	-$(RM) "Drivers\Heater\ADS1220.obj" "Drivers\Heater\Heater.obj" "Drivers\Heater\TemperatureSensor.obj" "Drivers\I2C_Communication\ADC_MUX\ADC_MUX.obj" "Drivers\I2C_Communication\DAC\Blower.obj" "Drivers\I2C_Communication\Dispenser_Card\EEPROM\Dispenser_EEPROM.obj" "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.obj" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.obj" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.obj" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.obj" "Drivers\I2C_Communication\Head_Card\Heaters\Head_Heaters.obj" "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.obj" "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.obj" "Drivers\I2C_Communication\Head_Card\PT100\PT100_ADC.obj" "Drivers\I2C_Communication\I2C.obj" "Drivers\I2C_Communication\I2C_Comm.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\NFC_I2C.obj" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\Test_NFC.obj" "Drivers\I2C_Communication\RFID_NFC\PN7150\PN7150.obj" "Drivers\I2C_Communication\Thermo_K\MCP9600.obj" 
+	-$(RM) "Drivers\Motors\Motor.obj" "Drivers\Motors\MotorActions.obj" "Drivers\On_Chip_Flash\Flashstore.obj" "Drivers\SPI\SPI_Comm.obj" "Drivers\SSI_Comm\Dancer\Dancer.obj" "Drivers\SSI_Comm\SSI_Comm.obj" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.obj" "Drivers\USB_Communication\USBCDCD.obj" "Drivers\Uart_Comm\Uart.obj" "Drivers\Valves\Valve.obj" "Drivers\flash_ram\FlashProgram.obj" "Drivers\flash_ram\MCU_E2Prom.obj" "Modules\AlarmHandling\AlarmHandling.obj" "Modules\Control\DriverWithCallbackExample.obj" "Modules\Control\MillisecTask.obj" "Modules\Control\PIDAlgo.obj" "Modules\Control\control.obj" "Modules\Diagnostics\DiagnosticActions.obj" "Modules\Diagnostics\Diagnostics.obj" "Modules\Diagnostics\DiagnosticsHoming.obj" "Modules\Diagnostics\DiagnosticsJogging.obj" "Modules\General\GeneralHardware.obj" "Modules\General\Safety.obj" "Modules\General\buttons.obj" "Modules\General\process.obj" "Modules\Heaters\Heaters_bit.obj" "Modules\Heaters\Heaters_init.obj" "Modules\Heaters\Heaters_maint.obj" 
+	-$(RM) "Modules\Heaters\Heaters_print.obj" "Modules\IDS\IDS_BIT.obj" "Modules\IDS\IDS_Cleaning.obj" "Modules\IDS\IDS_dispenser.obj" "Modules\IDS\IDS_init.obj" "Modules\IDS\IDS_maint.obj" "Modules\IDS\IDS_print.obj" "Modules\IFS\ifs.obj" "Modules\Stubs_Handler\Calculate.obj" "Modules\Stubs_Handler\Progress.obj" "Modules\Stubs_Handler\StubRealTimeUsage.obj" "Modules\Stubs_Handler\Stub_Cartridge.obj" "Modules\Stubs_Handler\Stub_Dancer.obj" "Modules\Stubs_Handler\Stub_Dispenser.obj" "Modules\Stubs_Handler\Stub_ExtFlash.obj" "Modules\Stubs_Handler\Stub_FPGARWReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.obj" "Modules\Stubs_Handler\Stub_FPGAReadVersion.obj" "Modules\Stubs_Handler\Stub_GPIO.obj" "Modules\Stubs_Handler\Stub_HW_Version.obj" "Modules\Stubs_Handler\Stub_Heater.obj" "Modules\Stubs_Handler\Stub_I2C.obj" "Modules\Stubs_Handler\Stub_IntADC.obj" "Modules\Stubs_Handler\Stub_L6470.obj" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.obj" "Modules\Stubs_Handler\Stub_Motor.obj" "Modules\Stubs_Handler\Stub_OptLimitSwitch.obj" 
 	-$(RM) "Modules\Stubs_Handler\Stub_ReadEmbeddedVersion.obj" "Modules\Stubs_Handler\Stub_SpeedSensor.obj" "Modules\Stubs_Handler\Stub_Status.obj" "Modules\Stubs_Handler\Stub_SteperMotor.obj" "Modules\Stubs_Handler\Stub_TempSensor.obj" "Modules\Stubs_Handler\Stub_TivaReg.obj" "Modules\Stubs_Handler\Stub_Valve.obj" "Modules\Stubs_Handler\User_Leds.obj" "Modules\Stubs_Handler\temperature_sensor.obj" "Modules\Thread\ThreadLoad.obj" "Modules\Thread\Thread_BIT.obj" "Modules\Thread\Thread_Winder.obj" "Modules\Thread\Thread_init.obj" "Modules\Thread\Thread_maint.obj" "Modules\Thread\Thread_print.obj" "Modules\Waste\Waste_BIT.obj" "Modules\Waste\Waste_init.obj" "Modules\Waste\Waste_maint.obj" "Modules\Waste\Waste_print.obj" "StateMachines\Initialization\InitSequence.obj" "StateMachines\Initialization\PowerIdle.obj" "StateMachines\Initialization\PowerOffSequence.obj" "StateMachines\Printing\JobSTM.obj" "StateMachines\Printing\PrintingSTM.obj" 
 	-$(RM) "Main.d" "delay.d" "Common\SWUpdate\FileSystem.d" "Common\SWUpdate\FirmwareUpgrade.d" "Common\SW_Info\SW_Info.d" "Common\Software_CRC\sw_crc.d" "Common\Sys_PinOut_Config\MCU_MAIN_pinout.d" "Common\Sys_PinOut_Config\Pin.d" "Common\Sys_PinOut_Config\Pin_config.d" "Common\Utilities\Update.d" "Common\Utilities\Utils.d" "Common\Utilities\idle_task.d" "Common\Utilities\ustdlib.d" "Common\protobuf-c\protobuf-c.d" "Common\report\distributor.d" "Common\report\filter.d" "Common\report\reportInit.d" "Communication\CommunicationTask.d" "Communication\Connection.d" "Communication\Container.d" "Communication\PMR\Common\ErrorCode.pb-c.d" "Communication\PMR\Common\ErrorResponse.pb-c.d" "Communication\PMR\Common\MessageContainer.pb-c.d" "Communication\PMR\Common\MessageType.pb-c.d" "Communication\PMR\Connection\ConnectRequest.pb-c.d" "Communication\PMR\Connection\ConnectResponse.pb-c.d" "Communication\PMR\Connection\DeviceInformation.pb-c.d" "Communication\PMR\Connection\DisconnectRequest.pb-c.d" "Communication\PMR\Connection\DisconnectResponse.pb-c.d" 
 	-$(RM) "Communication\PMR\Connection\KeepAliveRequest.pb-c.d" "Communication\PMR\Connection\KeepAliveResponse.pb-c.d" "Communication\PMR\Debugging\DebugDistributor.pb-c.d" "Communication\PMR\Debugging\DebugLogCategory.pb-c.d" "Communication\PMR\Debugging\SetupDebugDisributorsRequest.pb-c.d" "Communication\PMR\Debugging\SetupDebugDisributorsResponse.pb-c.d" "Communication\PMR\Debugging\StartDebugLogRequest.pb-c.d" "Communication\PMR\Debugging\StartDebugLogResponse.pb-c.d" "Communication\PMR\Debugging\StopDebugLogRequest.pb-c.d" "Communication\PMR\Debugging\StopDebugLogResponse.pb-c.d" "Communication\PMR\Diagnostics\Cartridge.pb-c.d" "Communication\PMR\Diagnostics\CartridgeAction.pb-c.d" "Communication\PMR\Diagnostics\CartridgeSlot.pb-c.d" "Communication\PMR\Diagnostics\CartridgeTagContent.pb-c.d" "Communication\PMR\Diagnostics\CartridgeValidationRequest.pb-c.d" "Communication\PMR\Diagnostics\CartridgeValidationResponse.pb-c.d" "Communication\PMR\Diagnostics\DataFileFrame.pb-c.d" "Communication\PMR\Diagnostics\DiagnosticsMonitors.pb-c.d" 
@@ -740,12 +741,12 @@ clean:
 	-$(RM) "Communication\PMR\Stubs\StubGPIOReadBitResponse.pb-c.d" "Communication\PMR\Stubs\StubGPIOReadByteRequest.pb-c.d" "Communication\PMR\Stubs\StubGPIOReadByteResponse.pb-c.d" "Communication\PMR\Stubs\StubGPIOWriteBitRequest.pb-c.d" "Communication\PMR\Stubs\StubGPIOWriteBitResponse.pb-c.d" "Communication\PMR\Stubs\StubGPIOWriteByteRequest.pb-c.d" "Communication\PMR\Stubs\StubGPIOWriteByteResponse.pb-c.d" "Communication\PMR\Stubs\StubHWVersionRequest.pb-c.d" "Communication\PMR\Stubs\StubHWVersionResponse.pb-c.d" "Communication\PMR\Stubs\StubHeaterRequest.pb-c.d" "Communication\PMR\Stubs\StubHeaterResponse.pb-c.d" "Communication\PMR\Stubs\StubHeatingTestPollRequest.pb-c.d" "Communication\PMR\Stubs\StubHeatingTestPollResponse.pb-c.d" "Communication\PMR\Stubs\StubHeatingTestRequest.pb-c.d" "Communication\PMR\Stubs\StubHeatingTestResponse.pb-c.d" "Communication\PMR\Stubs\StubI2CReadBytesRequest.pb-c.d" "Communication\PMR\Stubs\StubI2CReadBytesResponse.pb-c.d" "Communication\PMR\Stubs\StubI2CRequest.pb-c.d" 
 	-$(RM) "Communication\PMR\Stubs\StubI2CResponse.pb-c.d" "Communication\PMR\Stubs\StubI2CWriteBytesRequest.pb-c.d" "Communication\PMR\Stubs\StubI2CWriteBytesResponse.pb-c.d" "Communication\PMR\Stubs\StubIntADCReadRequest.pb-c.d" "Communication\PMR\Stubs\StubIntADCReadResponse.pb-c.d" "Communication\PMR\Stubs\StubJobRequest.pb-c.d" "Communication\PMR\Stubs\StubJobResponse.pb-c.d" "Communication\PMR\Stubs\StubL6470DriverRequest.pb-c.d" "Communication\PMR\Stubs\StubL6470DriverResponse.pb-c.d" "Communication\PMR\Stubs\StubMidTankPressureSensorRequest.pb-c.d" "Communication\PMR\Stubs\StubMidTankPressureSensorResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorHomeMarkRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorHomeMarkResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorInitRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorInitResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorMovRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorMovResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorPositionRequest.pb-c.d" 
 	-$(RM) "Communication\PMR\Stubs\StubMotorPositionResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorRunRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorRunResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorRunStepTickRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorRunStepTickResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorSpeedRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorSpeedResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorStatusRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorStatusResponse.pb-c.d" "Communication\PMR\Stubs\StubMotorStopRequest.pb-c.d" "Communication\PMR\Stubs\StubMotorStopResponse.pb-c.d" "Communication\PMR\Stubs\StubOptLimitSwitchRequest.pb-c.d" "Communication\PMR\Stubs\StubOptLimitSwitchResponse.pb-c.d" "Communication\PMR\Stubs\StubReadEmbeddedVersionRequest.pb-c.d" "Communication\PMR\Stubs\StubReadEmbeddedVersionResponse.pb-c.d" "Communication\PMR\Stubs\StubRealTimeUsageRequest.pb-c.d" 
-	-$(RM) "Communication\PMR\Stubs\StubRealTimeUsageResponse.pb-c.d" "Communication\PMR\Stubs\StubSpeedSensorRequest.pb-c.d" "Communication\PMR\Stubs\StubSpeedSensorResponse.pb-c.d" "Communication\PMR\Stubs\StubSteperMotorRequest.pb-c.d" "Communication\PMR\Stubs\StubSteperMotorResponse.pb-c.d" "Communication\PMR\Stubs\StubTempSensorRequest.pb-c.d" "Communication\PMR\Stubs\StubTempSensorResponse.pb-c.d" "Communication\PMR\Stubs\StubTivaReadRegRequest.pb-c.d" "Communication\PMR\Stubs\StubTivaReadRegResponse.pb-c.d" "Communication\PMR\Stubs\StubTivaWriteRegRequest.pb-c.d" "Communication\PMR\Stubs\StubTivaWriteRegResponse.pb-c.d" "Communication\PMR\Stubs\StubValveRequest.pb-c.d" "Communication\PMR\Stubs\StubValveResponse.pb-c.d" "Drivers\ADC_Sampling\ADC.d" "Drivers\FPGA\FPGA.d" "Drivers\FPGA\FPGA_SPI_Comm.d" "Drivers\FPGA\FPGA_SSI_Comm.d" "Drivers\FPGA\FPGA_GPIO\FPGA_GPIO.d" "Drivers\FPGA\FPGA_INTERRUPTS\FPGA_Interrupts.d" "Drivers\FPGA\Full_Vme\FPGA_Programming_Up.d" "Drivers\FPGA\Full_Vme\ispvme\hardware.d" 
-	-$(RM) "Drivers\FPGA\Full_Vme\ispvme\ispvm_ui.d" "Drivers\FPGA\Full_Vme\ispvme\ivm_core.d" "Drivers\FPGA\Motors_Driver\L6470.d" "Drivers\Flash_Memory\FATFS\Control_File_System.d" "Drivers\Flash_Memory\FATFS\cc932.d" "Drivers\Flash_Memory\FATFS\fatfs_port_mx66l51235f.d" "Drivers\Flash_Memory\FATFS\ff.d" "Drivers\Flash_Memory\FATFS\mx66l51235f.d" "Drivers\Flash_Memory\FATFS\spi_flash.d" "Drivers\Flash_Memory\Flash_Memory.d" "Drivers\Heater\ADS1220.d" "Drivers\Heater\Heater.d" "Drivers\Heater\TemperatureSensor.d" "Drivers\I2C_Communication\ADC_MUX\ADC_MUX.d" "Drivers\I2C_Communication\DAC\Blower.d" "Drivers\I2C_Communication\Dispenser_Card\EEPROM\Dispenser_EEPROM.d" "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.d" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.d" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.d" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.d" "Drivers\I2C_Communication\Head_Card\Heaters\Head_Heaters.d" "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.d" 
-	-$(RM) "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.d" "Drivers\I2C_Communication\Head_Card\PT100\PT100_ADC.d" "Drivers\I2C_Communication\I2C.d" "Drivers\I2C_Communication\I2C_Comm.d" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\NFC_I2C.d" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\Test_NFC.d" "Drivers\I2C_Communication\RFID_NFC\PN7150\PN7150.d" "Drivers\I2C_Communication\Thermo_K\MCP9600.d" "Drivers\Motors\Motor.d" "Drivers\Motors\MotorActions.d" "Drivers\On_Chip_Flash\Flashstore.d" "Drivers\SPI\SPI_Comm.d" "Drivers\SSI_Comm\Dancer\Dancer.d" "Drivers\SSI_Comm\SSI_Comm.d" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.d" "Drivers\USB_Communication\USBCDCD.d" "Drivers\Uart_Comm\Uart.d" "Drivers\Valves\Valve.d" "Drivers\flash_ram\FlashProgram.d" "Drivers\flash_ram\MCU_E2Prom.d" "Modules\AlarmHandling\AlarmHandling.d" "Modules\Control\DriverWithCallbackExample.d" "Modules\Control\MillisecTask.d" "Modules\Control\PIDAlgo.d" "Modules\Control\control.d" "Modules\Diagnostics\DiagnosticActions.d" 
-	-$(RM) "Modules\Diagnostics\Diagnostics.d" "Modules\Diagnostics\DiagnosticsHoming.d" "Modules\Diagnostics\DiagnosticsJogging.d" "Modules\General\GeneralHardware.d" "Modules\General\Safety.d" "Modules\General\buttons.d" "Modules\General\process.d" "Modules\Heaters\Heaters_bit.d" "Modules\Heaters\Heaters_init.d" "Modules\Heaters\Heaters_maint.d" "Modules\Heaters\Heaters_print.d" "Modules\IDS\IDS_BIT.d" "Modules\IDS\IDS_Cleaning.d" "Modules\IDS\IDS_dispenser.d" "Modules\IDS\IDS_init.d" "Modules\IDS\IDS_maint.d" "Modules\IDS\IDS_print.d" "Modules\IFS\ifs.d" "Modules\Stubs_Handler\Calculate.d" "Modules\Stubs_Handler\Progress.d" "Modules\Stubs_Handler\StubRealTimeUsage.d" "Modules\Stubs_Handler\Stub_Cartridge.d" "Modules\Stubs_Handler\Stub_Dancer.d" "Modules\Stubs_Handler\Stub_Dispenser.d" "Modules\Stubs_Handler\Stub_ExtFlash.d" "Modules\Stubs_Handler\Stub_FPGARWReg.d" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.d" "Modules\Stubs_Handler\Stub_FPGAReadVersion.d" "Modules\Stubs_Handler\Stub_GPIO.d" "Modules\Stubs_Handler\Stub_HW_Version.d" 
-	-$(RM) "Modules\Stubs_Handler\Stub_Heater.d" "Modules\Stubs_Handler\Stub_I2C.d" "Modules\Stubs_Handler\Stub_IntADC.d" "Modules\Stubs_Handler\Stub_L6470.d" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.d" "Modules\Stubs_Handler\Stub_Motor.d" "Modules\Stubs_Handler\Stub_OptLimitSwitch.d" "Modules\Stubs_Handler\Stub_ReadEmbeddedVersion.d" "Modules\Stubs_Handler\Stub_SpeedSensor.d" "Modules\Stubs_Handler\Stub_Status.d" "Modules\Stubs_Handler\Stub_SteperMotor.d" "Modules\Stubs_Handler\Stub_TempSensor.d" "Modules\Stubs_Handler\Stub_TivaReg.d" "Modules\Stubs_Handler\Stub_Valve.d" "Modules\Stubs_Handler\User_Leds.d" "Modules\Stubs_Handler\temperature_sensor.d" "Modules\Thread\ThreadLoad.d" "Modules\Thread\Thread_BIT.d" "Modules\Thread\Thread_Winder.d" "Modules\Thread\Thread_init.d" "Modules\Thread\Thread_maint.d" "Modules\Thread\Thread_print.d" "Modules\Waste\Waste_BIT.d" "Modules\Waste\Waste_init.d" "Modules\Waste\Waste_maint.d" "Modules\Waste\Waste_print.d" "StateMachines\Initialization\InitSequence.d" 
-	-$(RM) "StateMachines\Initialization\PowerIdle.d" "StateMachines\Initialization\PowerOffSequence.d" "StateMachines\Printing\JobSTM.d" "StateMachines\Printing\PrintingSTM.d" 
+	-$(RM) "Communication\PMR\Stubs\StubRealTimeUsageResponse.pb-c.d" "Communication\PMR\Stubs\StubSpeedSensorRequest.pb-c.d" "Communication\PMR\Stubs\StubSpeedSensorResponse.pb-c.d" "Communication\PMR\Stubs\StubSteperMotorRequest.pb-c.d" "Communication\PMR\Stubs\StubSteperMotorResponse.pb-c.d" "Communication\PMR\Stubs\StubTempSensorRequest.pb-c.d" "Communication\PMR\Stubs\StubTempSensorResponse.pb-c.d" "Communication\PMR\Stubs\StubTivaReadRegRequest.pb-c.d" "Communication\PMR\Stubs\StubTivaReadRegResponse.pb-c.d" "Communication\PMR\Stubs\StubTivaWriteRegRequest.pb-c.d" "Communication\PMR\Stubs\StubTivaWriteRegResponse.pb-c.d" "Communication\PMR\Stubs\StubValveRequest.pb-c.d" "Communication\PMR\Stubs\StubValveResponse.pb-c.d" "Drivers\ADC_Sampling\ADC.d" "Drivers\ADC_Sampling\ADC_VOC_Sensor.d" "Drivers\FPGA\FPGA.d" "Drivers\FPGA\FPGA_SPI_Comm.d" "Drivers\FPGA\FPGA_SSI_Comm.d" "Drivers\FPGA\FPGA_GPIO\FPGA_GPIO.d" "Drivers\FPGA\FPGA_INTERRUPTS\FPGA_Interrupts.d" "Drivers\FPGA\Full_Vme\FPGA_Programming_Up.d" 
+	-$(RM) "Drivers\FPGA\Full_Vme\ispvme\hardware.d" "Drivers\FPGA\Full_Vme\ispvme\ispvm_ui.d" "Drivers\FPGA\Full_Vme\ispvme\ivm_core.d" "Drivers\FPGA\Motors_Driver\L6470.d" "Drivers\Flash_Memory\FATFS\Control_File_System.d" "Drivers\Flash_Memory\FATFS\cc932.d" "Drivers\Flash_Memory\FATFS\fatfs_port_mx66l51235f.d" "Drivers\Flash_Memory\FATFS\ff.d" "Drivers\Flash_Memory\FATFS\mx66l51235f.d" "Drivers\Flash_Memory\FATFS\spi_flash.d" "Drivers\Flash_Memory\Flash_Memory.d" "Drivers\Heater\ADS1220.d" "Drivers\Heater\Heater.d" "Drivers\Heater\TemperatureSensor.d" "Drivers\I2C_Communication\ADC_MUX\ADC_MUX.d" "Drivers\I2C_Communication\DAC\Blower.d" "Drivers\I2C_Communication\Dispenser_Card\EEPROM\Dispenser_EEPROM.d" "Drivers\I2C_Communication\Dispenser_Card\I2C_Dispenser_Card_Mux.d" "Drivers\I2C_Communication\Dispenser_Card\IO_Ports\Dispenser_IO.d" "Drivers\I2C_Communication\Head_Card\EEPROM\Head_EEPROM.d" "Drivers\I2C_Communication\Head_Card\Fan\Head_Fan.d" "Drivers\I2C_Communication\Head_Card\Heaters\Head_Heaters.d" 
+	-$(RM) "Drivers\I2C_Communication\Head_Card\I2C_Head_Mux.d" "Drivers\I2C_Communication\Head_Card\IO_Ports\Head_IO.d" "Drivers\I2C_Communication\Head_Card\PT100\PT100_ADC.d" "Drivers\I2C_Communication\I2C.d" "Drivers\I2C_Communication\I2C_Comm.d" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\NFC_I2C.d" "Drivers\I2C_Communication\RFID_NFC\NFC_I2C\Test_NFC.d" "Drivers\I2C_Communication\RFID_NFC\PN7150\PN7150.d" "Drivers\I2C_Communication\Thermo_K\MCP9600.d" "Drivers\Motors\Motor.d" "Drivers\Motors\MotorActions.d" "Drivers\On_Chip_Flash\Flashstore.d" "Drivers\SPI\SPI_Comm.d" "Drivers\SSI_Comm\Dancer\Dancer.d" "Drivers\SSI_Comm\SSI_Comm.d" "Drivers\SSI_Comm\Speed_Sensor\Speed_Sensor.d" "Drivers\USB_Communication\USBCDCD.d" "Drivers\Uart_Comm\Uart.d" "Drivers\Valves\Valve.d" "Drivers\flash_ram\FlashProgram.d" "Drivers\flash_ram\MCU_E2Prom.d" "Modules\AlarmHandling\AlarmHandling.d" "Modules\Control\DriverWithCallbackExample.d" "Modules\Control\MillisecTask.d" "Modules\Control\PIDAlgo.d" "Modules\Control\control.d" 
+	-$(RM) "Modules\Diagnostics\DiagnosticActions.d" "Modules\Diagnostics\Diagnostics.d" "Modules\Diagnostics\DiagnosticsHoming.d" "Modules\Diagnostics\DiagnosticsJogging.d" "Modules\General\GeneralHardware.d" "Modules\General\Safety.d" "Modules\General\buttons.d" "Modules\General\process.d" "Modules\Heaters\Heaters_bit.d" "Modules\Heaters\Heaters_init.d" "Modules\Heaters\Heaters_maint.d" "Modules\Heaters\Heaters_print.d" "Modules\IDS\IDS_BIT.d" "Modules\IDS\IDS_Cleaning.d" "Modules\IDS\IDS_dispenser.d" "Modules\IDS\IDS_init.d" "Modules\IDS\IDS_maint.d" "Modules\IDS\IDS_print.d" "Modules\IFS\ifs.d" "Modules\Stubs_Handler\Calculate.d" "Modules\Stubs_Handler\Progress.d" "Modules\Stubs_Handler\StubRealTimeUsage.d" "Modules\Stubs_Handler\Stub_Cartridge.d" "Modules\Stubs_Handler\Stub_Dancer.d" "Modules\Stubs_Handler\Stub_Dispenser.d" "Modules\Stubs_Handler\Stub_ExtFlash.d" "Modules\Stubs_Handler\Stub_FPGARWReg.d" "Modules\Stubs_Handler\Stub_FPGAReadBackReg.d" "Modules\Stubs_Handler\Stub_FPGAReadVersion.d" 
+	-$(RM) "Modules\Stubs_Handler\Stub_GPIO.d" "Modules\Stubs_Handler\Stub_HW_Version.d" "Modules\Stubs_Handler\Stub_Heater.d" "Modules\Stubs_Handler\Stub_I2C.d" "Modules\Stubs_Handler\Stub_IntADC.d" "Modules\Stubs_Handler\Stub_L6470.d" "Modules\Stubs_Handler\Stub_MidTankPressureSensor.d" "Modules\Stubs_Handler\Stub_Motor.d" "Modules\Stubs_Handler\Stub_OptLimitSwitch.d" "Modules\Stubs_Handler\Stub_ReadEmbeddedVersion.d" "Modules\Stubs_Handler\Stub_SpeedSensor.d" "Modules\Stubs_Handler\Stub_Status.d" "Modules\Stubs_Handler\Stub_SteperMotor.d" "Modules\Stubs_Handler\Stub_TempSensor.d" "Modules\Stubs_Handler\Stub_TivaReg.d" "Modules\Stubs_Handler\Stub_Valve.d" "Modules\Stubs_Handler\User_Leds.d" "Modules\Stubs_Handler\temperature_sensor.d" "Modules\Thread\ThreadLoad.d" "Modules\Thread\Thread_BIT.d" "Modules\Thread\Thread_Winder.d" "Modules\Thread\Thread_init.d" "Modules\Thread\Thread_maint.d" "Modules\Thread\Thread_print.d" "Modules\Waste\Waste_BIT.d" "Modules\Waste\Waste_init.d" "Modules\Waste\Waste_maint.d" 
+	-$(RM) "Modules\Waste\Waste_print.d" "StateMachines\Initialization\InitSequence.d" "StateMachines\Initialization\PowerIdle.d" "StateMachines\Initialization\PowerOffSequence.d" "StateMachines\Printing\JobSTM.d" "StateMachines\Printing\PrintingSTM.d" 
 	-@echo 'Finished clean'
 	-@echo ' '
 
diff --git a/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk b/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk
index 64d3e319c..43bb2f104 100644
--- a/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk
+++ b/Software/Embedded_SW/Embedded/debug_w_pmr/subdir_rules.mk
@@ -22,14 +22,14 @@ configPkg/: build-306001487
 Main.obj: ../Main.c $(GEN_OPTS) | $(GEN_HDRS)
 	@echo 'Building file: "$<"'
 	@echo 'Invoking: ARM Compiler'
-	"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl" -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Common/protobuf-c" --include_path="C:/TFS/Software/Embedded_SW/Embedded" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Hardware" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Printing" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Common" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Debugging" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Common" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Modules" --include_path="C:/ti/TivaWare_C_Series-2.1.2.111" --include_path="C:/ti/xdctools_3_32_00_06_core/include" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08" --include_path="C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include" --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi --preproc_with_compile --preproc_dependency="Main.d_raw" $(GEN_OPTS__FLAG) "$<"
+	"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl" -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common/protobuf-c" --include_path="C:/Tango/Software/Embedded_SW/Embedded" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Hardware" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Printing" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Debugging" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Modules" --include_path="C:/ti/TivaWare_C_Series-2.1.2.111" --include_path="C:/ti/xdctools_3_32_00_06_core/include" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08" --include_path="C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include" --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi --preproc_with_compile --preproc_dependency="Main.d_raw" $(GEN_OPTS__FLAG) "$<"
 	@echo 'Finished building: "$<"'
 	@echo ' '
 
 delay.obj: ../delay.c $(GEN_OPTS) | $(GEN_HDRS)
 	@echo 'Building file: "$<"'
 	@echo 'Invoking: ARM Compiler'
-	"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl" -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Common/protobuf-c" --include_path="C:/TFS/Software/Embedded_SW/Embedded" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Hardware" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Printing" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Common" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Debugging" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication/PMR" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Communication" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Common" --include_path="C:/TFS/Software/Embedded_SW/Embedded/Modules" --include_path="C:/ti/TivaWare_C_Series-2.1.2.111" --include_path="C:/ti/xdctools_3_32_00_06_core/include" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08" --include_path="C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include" --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi --preproc_with_compile --preproc_dependency="delay.d_raw" $(GEN_OPTS__FLAG) "$<"
+	"C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/bin/armcl" -mv7M4 --code_state=16 --float_support=FPv4SPD16 -me -Ooff --opt_for_speed=0 --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/ndk_2_25_00_09/packages/ti/ndk/inc/bsd" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common/protobuf-c" --include_path="C:/Tango/Software/Embedded_SW/Embedded" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Hardware" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Printing" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Debugging" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication/PMR" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Communication" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Common" --include_path="C:/Tango/Software/Embedded_SW/Embedded/Modules" --include_path="C:/ti/TivaWare_C_Series-2.1.2.111" --include_path="C:/ti/xdctools_3_32_00_06_core/include" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/TivaWare_C_Series-2.1.1.71b" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/bios_6_45_01_29/packages/ti/sysbios/posix" --include_path="C:/ti/tirtos_tivac_2_16_00_08/products/tidrivers_tivac_2_16_00_08" --include_path="C:/ti/ccsv7/tools/compiler/ti-cgt-arm_16.9.6.LTS/include" --define=ENABLE_LFN --define=DEBUG_TEST_FUNCTIONS --define=TARGET_IS_TM4C129_RA0 --define=ccs="ccs" --define=ccs --define=TIVAWARE --define=PART_TM4C129XNCZAD -g --gcc --diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number --abi=eabi --preproc_with_compile --preproc_dependency="delay.d_raw" $(GEN_OPTS__FLAG) "$<"
 	@echo 'Finished building: "$<"'
 	@echo ' '
 
diff --git a/Software/Embedded_SW/Embedded/src/makefile.libs b/Software/Embedded_SW/Embedded/src/makefile.libs
index 6d9bf810f..f262762ef 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:\TFS\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:\TFS\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/sysbios.aem4f b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f
index d8a5dc617..a2cbc5c41 100644
--- a/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f
+++ b/Software/Embedded_SW/Embedded/src/sysbios/sysbios.aem4f