diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-03 10:34:30 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-03 10:34:30 +0300 |
| commit | 565d4cfcfc382e1ab63fd8fc6bbb3bb4562d16d9 (patch) | |
| tree | 2702bfde463b063457467aa6412f082252a66d21 /Software/Embedded_SW/Embedded/Modules | |
| parent | f3d8c7d9b695f96126b133544595370df0c23a9c (diff) | |
| download | Tango-565d4cfcfc382e1ab63fd8fc6bbb3bb4562d16d9.tar.gz Tango-565d4cfcfc382e1ab63fd8fc6bbb3bb4562d16d9.zip | |
Add FPGA _GPI for limit switches
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
3 files changed, 4 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 79f7f86d8..c2cba7a4f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -233,7 +233,7 @@ uint32_t MillisecLoop(uint32_t tick) //gather Motor data from FPGA #ifndef EVALUATION_BOARD FPGA_GetBusy(); //load the busy motor information to all motors - FPGA_Read_limit_Switches(); + //Read_FPGA_GPI_Rgisters();//FPGA_Read_limit_Switches(); #endif temp += MotorActivity; diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h index 0453cc2c8..a5182af75 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h @@ -153,7 +153,7 @@ typedef enum LS_LLOADMOTOR_UP, LS_LSPARE2, LS_RDANCER_DOWN, - LS_RLOADRAM_DOWN, + LS_RLOADRAM_DOWN, //F1_LS_RDANCER_LONG LS_RDANCER_UP, LS_RLOADRAM_UP, LS_RLOADMOTOR_DOWN, diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_IntADC.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_IntADC.c index 7b935a098..85d7468bc 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_IntADC.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_IntADC.c @@ -49,8 +49,8 @@ void Stub_IntADCReadRequest(MessageContainer* requestContainer) ADC_TriggerCollection(); SysCtlDelay(10000); -// ADC0SS0Handler(); -// SysCtlDelay(100000); + ADC0SS0Handler(); + SysCtlDelay(100000); data = ADC_GetReading(request->adc_device); |