diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-03-05 16:43:50 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2020-03-05 16:43:50 +0200 |
| commit | 937b2a545fc7405f4673377b209caf22f00375b7 (patch) | |
| tree | 2ad1eedef4cf0cf428f4a312648f0d453865b1f0 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 60988675685060adfc98b2d071c3e1df1e10fd87 (diff) | |
| parent | 1834b13df30bcf71aab363f9e504c4e79b3f2224 (diff) | |
| download | Tango-937b2a545fc7405f4673377b209caf22f00375b7.tar.gz Tango-937b2a545fc7405f4673377b209caf22f00375b7.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c | 5 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c index eeb0051f5..946eae0ec 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c @@ -32,6 +32,9 @@ #include "drivers/motors/motor.h" #include "drivers/Flash_ram/MCU_E2Prom.h" #include "Drivers/I2C_Communication/I2C.h" +#include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h> +#include <Drivers/I2C_Communication/I2C_Task.h> + #include "PMR/Stubs/StubHeatingTestRequest.pb-c.h" #include "PMR/Stubs/StubHeatingTestResponse.pb-c.h" #include "PMR/Stubs/StubHeatingTestPollRequest.pb-c.h" @@ -201,7 +204,7 @@ } else { - //WHS_Start_Blower_Control_Closed_Loop(2.5); + WHS_Set_SetPoint_Q_value(headairflow/2); Turn_the_Blower_On();//Turn on with the Default_Voltage if (BlowerCfg.heatingvoltage) Control_Voltage_To_Blower(BlowerCfg.heatingvoltage); diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 8cd917a8d..91f655171 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -459,6 +459,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) //read value is the dancer angle int i,index=MAX_THREAD_MOTORS_NUM,len; + //int len; int DancerId; int32_t TranslatedReadValue, avreageSampleValue = 0;//,avreageMotorSampleValue = 0; //double tempcalcspeed = 0; @@ -786,6 +787,7 @@ uint32_t HandleJobThreadControlParameters(ThreadParameters* ThreadParams) if(ThreadParams->bypassrockers) Thread_Rockers_Bypass = true; + return OK; } //******************************************************************************************************************** uint32_t ThreadPrepareState(void *JobDetails) @@ -1187,7 +1189,7 @@ char Endstr[150]; if (PoolerSpeedControlId != 0xFF) { if(RemoveControlCallback(PoolerSpeedControlId,PoolerThreadLengthCBFunction)!=OK) - ReportWithPackageFilter(ThreadFilter,"Remove Control Failed.",__FILE__,__LINE__,(int)Motor_i,RpError,(int)PoolerSpeedControlId,0); + ReportWithPackageFilter(ThreadFilter,"Remove Control Failed.",__FILE__,__LINE__,(int)PoolerThreadLengthCBFunction,RpError,(int)PoolerSpeedControlId,0); PoolerSpeedControlId = 0xFF; } |