diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-12-17 14:37:38 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-12-17 14:37:38 +0200 |
| commit | 8a7e65715ef393a08cc39d1b5d4a3da22799c852 (patch) | |
| tree | f71065b4c0000aafad1356ff2ab6b17f8287476b /Software/Embedded_SW/Embedded/Main.c | |
| parent | c653fa2077b6118c2ace3b7bcc8bc91c9a9ed4f5 (diff) | |
| parent | 3ed7e9cc55e10888d84aa53abcb5e765a317ddb1 (diff) | |
| download | Tango-8a7e65715ef393a08cc39d1b5d4a3da22799c852.tar.gz Tango-8a7e65715ef393a08cc39d1b5d4a3da22799c852.zip | |
merge conflicts
Diffstat (limited to 'Software/Embedded_SW/Embedded/Main.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c index 6eb7a2850..f07937db0 100644 --- a/Software/Embedded_SW/Embedded/Main.c +++ b/Software/Embedded_SW/Embedded/Main.c @@ -229,8 +229,10 @@ int main(void) PortFunctionInit(); - MCU_E2PromInit(); +#ifndef EVALUATION_BOARD + MCU_E2PromInit(); +#endif #ifdef EVALUATION_BOARD Init_EVB(); #endif @@ -321,7 +323,9 @@ int main(void) Head_IO_Init(); #endif +#ifndef EVALUATION_BOARD Main_EEPROM_Read_Main_Card_SN(); +#endif // Enable interrupts to the processor. // @@ -329,7 +333,6 @@ int main(void) IDLE_TASK_package_init(); - Start_InitSequence(); PowerIdleInit(); BIOS_start(); |