diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-29 11:29:09 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-29 11:29:09 +0300 |
| commit | 28ca94e156f65ccd59ba2ca0398931952d7a8ebe (patch) | |
| tree | 761690e60afe4b6071fa67ce011e245c05f02255 /Software/Embedded_SW/Embedded | |
| parent | 36354a67f9bfe02babfcd459c04482629c3ddc11 (diff) | |
| download | Tango-28ca94e156f65ccd59ba2ca0398931952d7a8ebe.tar.gz Tango-28ca94e156f65ccd59ba2ca0398931952d7a8ebe.zip | |
move milisectask_init to main - so motors are set to Hiz on init
Diffstat (limited to 'Software/Embedded_SW/Embedded')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Main.c | 10 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c index 3fe9a5580..e893496d5 100644 --- a/Software/Embedded_SW/Embedded/Main.c +++ b/Software/Embedded_SW/Embedded/Main.c @@ -164,7 +164,6 @@ int main(void) CommunicationTaskInit(); utilsInit(ui32SysClock); - MotorsInit(); // init_graphics(ui32SysClock); // clear(); @@ -195,12 +194,13 @@ int main(void) #endif //EMAC_initEMAC(); ControlInit(); + MillisecInit(); Heaters_Init(); - //LoadManual(); - //Semaphore_post(sdCardSem); + ControlStart(); + MotorsInit(); + RegisterReceiveCallback(&receive_callback); - //StartUSB(ui32SysClock); // Enable interrupts to the processor. // @@ -209,8 +209,6 @@ int main(void) IDLE_TASK_package_init(); - ControlStart(); - BIOS_start(); diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 2a23dd87c..725384061 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -415,7 +415,7 @@ void MillisecTask(UArg arg0, UArg arg1) //uint16_t length; //Clock_setTimeout(HostKAClock, 1000); //Clock_start(HostKAClock); - MillisecInit(); + //MillisecInit(); Millisecond_Task_Handle = Task_self(); while(1) { |