aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-07-26 16:34:16 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-07-26 16:34:16 +0300
commit5accee4df85cc47b5700ad32090451ded2a121fa (patch)
tree11dc6229de126d5c9fc8135bfeacd88151e6ed77 /Software/Embedded_SW/Embedded/Drivers
parent4ff8fc0265f11be7b73548e36c7ee3d1debfb8e4 (diff)
downloadTango-5accee4df85cc47b5700ad32090451ded2a121fa.tar.gz
Tango-5accee4df85cc47b5700ad32090451ded2a121fa.zip
warning removed. diagnostics stops when the commtx mailbox is full.
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c1
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
index c36850b85..7ccba0545 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Heater/Heater.c
@@ -37,7 +37,6 @@ uint32_t HeaterActive = 0;
static GPIOIntPortMap portMap[MAX_HEATERS_NUM] =
{
-#warning temporarily moving SSR2 before SSR1 due to hardware changes
{DRYER_SSR2_CTRL, false}, // HARDWARE_PID_CONTROL_TYPE__DryerHeater1000w
{DRYER_SSR1_CTRL, false}, // HARDWARE_PID_CONTROL_TYPE__DryerHeater1000w
//{DRYER_SSR2_CTRL, false},// HARDWARE_PID_CONTROL_TYPE__DryerHeater200w1
diff --git a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.h b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.h
index b1fb14f08..687d24679 100644
--- a/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.h
+++ b/Software/Embedded_SW/Embedded/Drivers/USB_Communication/USBCDCD.h
@@ -77,7 +77,7 @@ void USBCDC_close(void);
void USBCDCD_hwiHandler(UArg arg0);
-uint32_t SendChars(char* buffer,size_t length);
+//bool SendChars(char* buffer,size_t length);
#ifdef __cplusplus
}
#endif