diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-16 17:11:31 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-10-16 17:11:31 +0300 |
| commit | 73f790b35fce16f59b969eb8258e485c2fd3fbd3 (patch) | |
| tree | 067639ceb14ef10698dcc6978ac3f396fd185f2f /Software/Embedded_SW/Embedded/Modules | |
| parent | 657bfe0fa9204f593ffe7c0c37f4027a6b7c1af5 (diff) | |
| download | Tango-73f790b35fce16f59b969eb8258e485c2fd3fbd3.tar.gz Tango-73f790b35fce16f59b969eb8258e485c2fd3fbd3.zip | |
remove file writing in dispenser data
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 7 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 2a67a9e58..574cc2573 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -998,6 +998,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue) //Heaters OFF until coming into the proportional band HeaterRecalculateSharedHeatersParams(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain,0); HeaterRecalculateSharedHeatersParams(HARDWARE_PID_CONTROL_TYPE__DryerHeaterSecondary,0); + ReportWithPackageFilter(HeatersFilter, "AC OverHeat - turned off",__FILE__,readValue,HeaterReady[index],RpError, HeaterAtTemp[index],0); return OK; } if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100)) @@ -1195,7 +1196,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue) DeActivateHeater(index); HeaterRecalculateHeaterParams(index, 0); //Heaters OFF until coming into the proportional band - //ReportWithPackageFilter(HeatersFilter,"DC HEATER Over temperature ", __FILE__,__LINE__,index, RpMessage, readValue, 0); + ReportWithPackageFilter(HeatersFilter,"HEATER Over temperature ", __FILE__,__LINE__,index, RpMessage, readValue, 0); return OK; } if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100)) diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c index 8f1c0d565..b9ab97714 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c @@ -248,7 +248,7 @@ void IDS_Dispenser_Content_Init (void) StoredDispenserData = (DispenserRunningData*)(DISPENSERS_MAP_IN_FLASH+4); havedata = true; } - else + /*else { Fresult = FileRead(DispenserStorePath, &Bytes, &buffer); if (Fresult == FR_OK) @@ -256,7 +256,7 @@ void IDS_Dispenser_Content_Init (void) StoredDispenserData = (DispenserRunningData*)buffer; havedata = true; } - } + }*/ if (havedata == true) { for(i=0;i<MAX_SYSTEM_DISPENSERS;i++) @@ -302,12 +302,12 @@ uint32_t IDS_Dispenser_Store_Data (void) ReadAppAndProgram(DISPENSERS_MAP_IN_FLASH, 4,&response_size); ReadAppAndProgram(DISPENSERS_MAP_IN_FLASH+4, response_size, IDS_Dispenser_Data); - Status = FileWrite(IDS_Dispenser_Data,response_size,DispenserStorePath,BIOS_NO_WAIT); + /*Status = FileWrite(IDS_Dispenser_Data,response_size,DispenserStorePath,BIOS_NO_WAIT); if (Status == FR_OK) { DispenserDataUpdated = false; REPORT_MSG(msec_millisecondCounter - timing, "Updating dispensers file - time"); - } + }*/ } return Status; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 3b5d2a3e9..bf0f361fd 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -327,7 +327,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) #ifdef READ_SCREW_ENCODER int WinderRun; WinderRun = abs(ScrewLocationRun[1] - ScrewLocationRun[0]); - if ((WinderRun < 30000)&&(ScrewDirectionChangeCounter >= 30)) + if ((WinderRun < 30000)&&(WinderMotorSpeedRollOver == true)) { WinderRunSamples++; WinderRunSum+=WinderRun; |
