aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/General
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-06-14 17:26:35 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-06-14 17:26:35 +0300
commit2a307f7c34e33a02fb605cd6bb4fa913cc17b805 (patch)
treea348b1f8968ff4b3765ccc01572aea5c822eadaa /Software/Embedded_SW/Embedded/Modules/General
parent1b5906087017b5092dd51cc1a639a95e7f41701d (diff)
downloadTango-2a307f7c34e33a02fb605cd6bb4fa913cc17b805.tar.gz
Tango-2a307f7c34e33a02fb605cd6bb4fa913cc17b805.zip
new powerstep parameters, better handling of FPGA loading and tension parameters
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/process.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index 7bf72ba8c..59264e1cf 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -31,8 +31,8 @@ double dyeingspeed = 0;
double dryerbufferlength = 0;
double mininkuptake = 0;
double feedertension = 0;
-double pullertension = 5000;
-double windertension = 5000;
+double pullertension = 0;
+double windertension = 0;
double headairflow = 5.0;
double dryerairflow = 5.0;
double pressurebuildup = 0;
@@ -128,6 +128,9 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
else
{
ProcessParams->headairflow = headairflow;
+ ProcessParams->feedertension = feedertension;
+ ProcessParams->windertension = windertension;
+ ProcessParams->pullertension = pullertension;
ReportWithPackageFilter(InitFilter,"HandleProcessParameters temp off blower on",__FILE__,(int)__LINE__,(int)ProcessParams->headairflow,RpWarning,(int)ProcessParametersKeep.headairflow,0);
}
}
@@ -381,7 +384,7 @@ uint32_t LoadProcessParamsFromFile(void)
}
uint32_t ProcessParamsInit(void)
{
- FRESULT Fresult = FR_OK;
+ FRESULT Fresult = FR_NOT_READY;
uint32_t Bytes;
memcpy(&Bytes,(void *)PROCESS_PARAMETERS_MAP_IN_FLASH,sizeof(Bytes));
@@ -406,6 +409,13 @@ uint32_t ProcessParamsInit(void)
}
}
}
+ if (Fresult == FR_NOT_READY) //process params not ready
+ {
+ MCU_E2PromProgram(EEPROM_WINDER_TENSION_POSITION,&Bytes);
+ windertension = Bytes;
+ MCU_E2PromProgram(EEPROM_PULLER_TENSION_POSITION,&Bytes);
+ pullertension = Bytes;
+ }
return Fresult;
}