diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-03-30 12:14:42 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-03-30 12:14:42 +0300 |
| commit | 955f10b298e16981412e7675da9c5a0c187cd106 (patch) | |
| tree | a8beb1c1cf3012bf98b70d9a3c823662f030c944 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 2980ba8d1a13f68fef90c40e3a2814cc4db7bc58 (diff) | |
| download | Tango-955f10b298e16981412e7675da9c5a0c187cd106.tar.gz Tango-955f10b298e16981412e7675da9c5a0c187cd106.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 0e95f4053..a5421e60a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -118,7 +118,6 @@ static GateMutex_Handle gateMillisecDB; uint32_t Millisec_timerBase = TIMER1_BASE; //Timer handle /******************** Functions ********************************************/ -void CalculateVOCAlarms(void); //********************************************************************** /******************** CODE ********************************************/ //********************************************************************** @@ -151,7 +150,7 @@ void MillisecInit(void) System_abort("Could not create USB Wait gate"); } - ROM_SysCtlPeripheralEnable(SYSCTL_PERIPH_TIMER0); + ROM_SysCtlPeripheralEnable(SYSCTL_PERIPH_TIMER1); ROM_TimerConfigure(Millisec_timerBase, TIMER_CFG_PERIODIC); // 32 bits Timer //TimerIntRegister(Millisec_timerBase, TIMER_A, Timer0Isr); // Registering isr ROM_TimerEnable(Millisec_timerBase, TIMER_A); @@ -637,7 +636,9 @@ uint32_t MillisecLowLoop(uint32_t tick) if (Hundred_msTick) { Speed_Data = Calculate_Speed_Sensor_Velocity(); +#ifndef EVALUATION_BOARD Read_Buttons_Reg(); +#endif //Ink_Cart_Led(); /////////////////////////////////////////////////////////////////// @@ -749,7 +750,8 @@ uint32_t MillisecLowLoop(uint32_t tick) MotorGetStatusFromFPGA(Motor_i); }*/ midtankDisplay = 1-midtankDisplay; - Gas_PPM_Info = Calculate_Gas_Power_Consumption(); + if (WHS_Type == WHS_TYPE_UNKNOWN) + Gas_PPM_Info = Calculate_Gas_Power_Consumption(); //Trigger_WHS_MAX11614_Read_allADC(); #ifdef CONTROL_DEBUG ResetControlTime(); |