aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Main.c
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2021-01-05 22:46:20 +0200
committerShlomo Hecht <shlomo@twine-s.com>2021-01-05 22:46:20 +0200
commit6605bbc97d768eadf072b592b2fc62c297adfd92 (patch)
tree15e699efcf849a12219198121698653c91a20bcb /Software/Embedded_SW/Embedded/Main.c
parente8578185b85e3957adc627c414d9ab3cc9bda463 (diff)
parent5775356f93e5251d42c298c64d4a0583f49dcbd7 (diff)
downloadTango-6605bbc97d768eadf072b592b2fc62c297adfd92.tar.gz
Tango-6605bbc97d768eadf072b592b2fc62c297adfd92.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.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index 5d7def1d6..f8c119713 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -400,7 +400,10 @@ int main(void)
if(Assy_ID > 4)//Bit2 = 1 for BTSR
{
- InitConsole_BTSR_UART4(ui32SysClock);
+ // Configure the GPIO Pin PR0 for BTSR RS485 UART - Set as output to change to uart4 RS485 Direction:
+ ROM_GPIOPinTypeGPIOOutput(GPIO_PORTR_BASE, GPIO_PIN_0);
+ ROM_GPIOPinWrite(GPIO_PORTR_BASE, GPIO_PIN_0, 1);//RX 1 (remove the error CAB ERR on the BTSR screen?)
+ InitConsole_BTSR_UART4(ui32SysClock);
#ifdef USE_UART4_FOR_BTSR
BTSR_Init();
@@ -409,8 +412,15 @@ int main(void)
else
{
#ifdef FORCE_BTSR_CARD_0023
+
+ // Configure the GPIO Pin PR0 for BTSR RS485 UART - Set as output to change to uart4 RS485 Direction:
+ ROM_GPIOPinTypeGPIOOutput(GPIO_PORTR_BASE, GPIO_PIN_0);
+ ROM_GPIOPinWrite(GPIO_PORTR_BASE, GPIO_PIN_0, 1);//RX 1 (remove the error CAB ERR on the BTSR screen?)
InitConsole_BTSR_UART4(ui32SysClock);
- BTSR_Init();
+
+ #ifdef USE_UART4_FOR_BTSR
+ BTSR_Init();
+ #endif
#endif
ReportWithPackageFilter(ThreadFilter,"HW does NOT support BTSR",__FILE__,__LINE__,(int)Brd_ID,RpError,(int)Assy_ID,0);