diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-05-14 13:40:46 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-05-14 13:40:46 +0300 |
| commit | 597bb4759dde2fa5dedda1bd005cc6fcf3a14158 (patch) | |
| tree | ac21802276172d4ac7faf59cfbbb7c89c991a977 /Software/Embedded_SW/Embedded/Modules | |
| parent | f912e09f0c0b84518ca8ce99c6240257df90310a (diff) | |
| parent | c0e1d90d4a3a02d943f778e8116dfde3bd8c9004 (diff) | |
| download | Tango-597bb4759dde2fa5dedda1bd005cc6fcf3a14158.tar.gz Tango-597bb4759dde2fa5dedda1bd005cc6fcf3a14158.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c index 1fc637029..499f227a9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Dancer.c @@ -57,7 +57,7 @@ void Stub_DancerPositionRequest(MessageContainer* requestContainer) if(Dancer_Id < NUM_OF_ROTENC) { - FPGA_SSI_Transnit(Dancer_Id); + FPGA_SSI_Transmit(Dancer_Id); SysCtlDelay(1000); FPGA_SSI_Receive(Dancer_Id); diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 48c985321..4477835d0 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -210,6 +210,8 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) { DancerId = ThreadMotorIdToDancerId[index]; TranslatedReadValue = ReadValue - DancersCfg[DancerId].zeropoint; + if (index == POOLER_MOTOR) + TranslatedReadValue = (-1*TranslatedReadValue); MotorSamples[index][MotorSamplePointer[index]] = TranslatedReadValue;//(-1 * TranslatedReadValue); MotorSamplePointer[index]++; if (MotorSamplePointer[index] >= MotorsControl[index].pvinputfilterfactormode) MotorSamplePointer[index] = 0; |