diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-03-22 14:10:55 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-03-22 14:10:55 +0200 |
| commit | e4498de8bf54d586d5af7d119b7c33ad4c0031b5 (patch) | |
| tree | 293b3a93022a6b3029bd58fcf6345fbbb6d42929 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 8c658845bdf60c9864d1c968b9420d40a789ca9d (diff) | |
| parent | aba5eee57b12b0859286df5681d44615e837efa4 (diff) | |
| download | Tango-e4498de8bf54d586d5af7d119b7c33ad4c0031b5.tar.gz Tango-e4498de8bf54d586d5af7d119b7c33ad4c0031b5.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
3 files changed, 4 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c index fbea57f7d..f37759943 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.c @@ -1,7 +1,7 @@ #include "PIDAlgo.h" -float PIDAlgorithmCalculation(uint32_t _setPoint,uint32_t _mesuredParam , PID_Config_Params *params, float *_pre_error, float *_integral) +float PIDAlgorithmCalculation(float _setPoint,float _mesuredParam , PID_Config_Params *params, float *_pre_error, float *_integral) { float error; float derivative; diff --git a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.h b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.h index 5f8f4dfe6..03c363131 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.h +++ b/Software/Embedded_SW/Embedded/Modules/Control/PIDAlgo.h @@ -13,6 +13,6 @@ typedef struct float Kd; float Ki; }PID_Config_Params; -float PIDAlgorithmCalculation(uint32_t _setPoint,uint32_t _mesuredParam , PID_Config_Params *params, float *_pre_error, float *_integral); +float PIDAlgorithmCalculation(float _setPoint,float _mesuredParam , PID_Config_Params *params, float *_pre_error, float *_integral); #endif /* MODULES_PIDALGO_H_ */ diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 1d9686124..c0f4c3a65 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -150,6 +150,8 @@ void ControlStart(void) { ControlRestart = true; ROM_TimerLoadSet(Control_timerBase, TIMER_A,120000+(ControlPhaseDelay*120)/*one millisecond*/); + TimerEnable(Control_timerBase, TIMER_A); + ADCAcquireStart(0,1); } |