diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-11 17:02:29 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-11 17:02:29 +0300 |
| commit | affbf528aa9dade4eb73a644d152bd018bca23f3 (patch) | |
| tree | 34c8d65eb2b074e8ad0b8c48ab8c328cfe1b9bc6 /Software/Embedded_SW/Embedded/Main.c | |
| parent | 2340225e580d8d04078ada948b5958b1e7ce40e7 (diff) | |
| parent | 00af45baf4efebd5f06450604d276cfe231a3d8e (diff) | |
| download | Tango-affbf528aa9dade4eb73a644d152bd018bca23f3.tar.gz Tango-affbf528aa9dade4eb73a644d152bd018bca23f3.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Main.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c index 09e8b2731..86000f6c0 100644 --- a/Software/Embedded_SW/Embedded/Main.c +++ b/Software/Embedded_SW/Embedded/Main.c @@ -271,6 +271,11 @@ int main(void) Init_All_I2C(); Block_Main_MUX_TCA9548A_0xE4();//unused, same i2c as head and whs cards Check_Head_Type_Via_EEPROM(); + if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) + { + Head_IO_Init();//moved to set 24 to pressure sensor in arc earlier + } + //Trigger_Check_WHS_Type_Via_EEPROM(); Check_WHS_Type_Via_EEPROM(); if ((Head_Type >= HEAD_TYPE_UNKNOWN_WITH_CARD)&&(WHS_Type == WHS_TYPE_NEW)) @@ -287,8 +292,7 @@ int main(void) SysCtlUSBPLLEnable(); - if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) - Head_IO_Init(); + #ifndef EVALUATION_BOARD DeActivateAllSSR(); |