diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-02-19 10:32:48 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-02-19 10:32:48 +0200 |
| commit | 685b1da155bda741a3378a1c19a04ffd110a0a33 (patch) | |
| tree | e38a3740bf4727dfa9368c6010c6cd55d6910ffb /Software/Embedded_SW/Embedded/Main.c | |
| parent | 94fccc66fd2b8b6aed1371546dfd8cef68d5e60d (diff) | |
| parent | bb51ac752b58b3d64e86a8150e7a9b1f5749e379 (diff) | |
| download | Tango-685b1da155bda741a3378a1c19a04ffd110a0a33.tar.gz Tango-685b1da155bda741a3378a1c19a04ffd110a0a33.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Main.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c index 6b5424d74..803a22cc4 100644 --- a/Software/Embedded_SW/Embedded/Main.c +++ b/Software/Embedded_SW/Embedded/Main.c @@ -298,6 +298,7 @@ int main(void) //Turn_the_Blower_On();//Turn on with the Default_Voltage ActivateChiller();//WHS Cooler SSR9 //ActivateHeadMagnet(); + Set_Speed_Sensor_TypeII_Registers(10,5);//set default values #endif I2C_ReadingTask_Init(); //EMAC_initEMAC(); @@ -337,11 +338,6 @@ int main(void) // //test_avi(); //example for shai - - -#ifndef EVALUATION_BOARD - //Set_Speed_Sensor_TypeII_Registers(2,2);//set default values -#endif //Read_Speed_Sensor_TypeII();//must be delay between Set_Speed_Sensor_TypeII_Registers to Read_Speed_Sensor_TypeII //Test_ADS120_Internal_Temperature_Sensor(0); |