aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-03-19 15:57:34 +0200
committerShlomo Hecht <shlomo@twine-s.com>2018-03-19 15:57:34 +0200
commit102fcff171fb309a92b65df755285f7f4e0654ff (patch)
tree0defb603be4a132d5c86ca847071bba6dbe9fd35 /Software/Embedded_SW
parent8357cc0350ad2b92c69fd20b8dac7e87014f0e34 (diff)
downloadTango-102fcff171fb309a92b65df755285f7f4e0654ff.tar.gz
Tango-102fcff171fb309a92b65df755285f7f4e0654ff.zip
compilation warning fixes
Diffstat (limited to 'Software/Embedded_SW')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c6
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
index 2c9e6e154..91ab3d145 100644
--- a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
+++ b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.c
@@ -858,11 +858,9 @@ void USBCDCD_Reinit(void)
//-----------------------------------------------------------
void USBCDC_close(void)
{
- tick = UsersysTickGet();
+// USBDCompositeTerm(USBDComposite);
- USBDCompositeTerm(USBDComposite);
-
- USBCDCD_Reinit();
+// USBCDCD_Reinit();
}
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 398f9463b..614250a38 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -99,7 +99,7 @@ void HeatersStartControlTimer (void)
ROM_IntEnable(INT_TIMER2A);
ROM_TimerIntEnable(Heater_timerBase, TIMER_TIMA_TIMEOUT);
Report("HeatersStartControlTimer ", __FILE__,__LINE__,0, RpMessage, 0, 0);
- return OK;
+ return;
}
/**************************************************************************************