diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-07-24 09:15:08 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-07-24 09:15:08 +0300 |
| commit | 7aaa8cb0c4b3c39c7583af89fcee5ea24e7b60ce (patch) | |
| tree | 3c28da76209e999558e31b549a22cbfad4374e05 /Software/Embedded_SW/Embedded | |
| parent | 330ceb91550c91a42cabc2b536c282dcc4186b6e (diff) | |
| parent | cf743ba7e969541d729365f4a76e59c7c83d7d58 (diff) | |
| download | Tango-7aaa8cb0c4b3c39c7583af89fcee5ea24e7b60ce.tar.gz Tango-7aaa8cb0c4b3c39c7583af89fcee5ea24e7b60ce.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded')
3 files changed, 6 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c index 54346a4e6..73d5564cc 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c +++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/Uart.c @@ -90,7 +90,8 @@ void Init_U0(void) System_abort("Can't create UART Hwi"); } - ROM_UARTIntEnable(UART0_BASE, /*UART_INT_TX |*/ UART_INT_RX ); + ROM_UARTIntEnable(UART0_BASE, /*UART_INT_TX |*/ 0x7F2);//UART_INT_RX ); + //???? trying to clear all uart problems ??? ROM_UARTEnable(UART0_BASE); diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 4c25aa508..42c31bf9a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -523,7 +523,7 @@ void EightMilliSecondHeatersInterrupt(UArg arg0) ROM_TimerIntClear(Heater_timerBase, TIMER_TIMA_TIMEOUT); // Clear the timer interrupt - ROM_IntMasterDisable(); + //ROM_IntMasterDisable(); HeatersControlMessageStruc Message; //bool retcode = false; @@ -544,7 +544,7 @@ void EightMilliSecondHeatersInterrupt(UArg arg0) // // Enable all interrupts. // - ROM_IntMasterEnable(); + //ROM_IntMasterEnable(); return ; } diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c index a3ffe0c66..dfd74b7fc 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c @@ -366,7 +366,7 @@ static uint32_t DistanceToSpoolState(void *JobDetails) //******************************************************************************************************************** uint32_t EndState(void *JobDetails, char *Message) { - ROM_IntMasterDisable(); + //ROM_IntMasterDisable(); SendJobProgress(0.0,0,true,Message); DiagnosticsStop(); if (Configured[Module_Winder]) @@ -402,7 +402,7 @@ uint32_t EndState(void *JobDetails, char *Message) //EndWaiting[Module_Thread] = ModuleWaiting; ThreadEndState(CurrentJob); } - ROM_IntMasterEnable(); + //ROM_IntMasterEnable(); JobMessageStruc JobMessage; bool retcode = false; |