aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Drivers
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-02-07 13:03:22 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-02-07 13:03:22 +0200
commit589bffe306db793987c17cd46f1dcac81f47bdcb (patch)
tree6c9239daec4d1ba7d2a644a9c7153230d51f0691 /Software/Embedded_SW/Embedded/Drivers
parentaf1c7bd1b6122c1387fe6e2749f9847f4be84b16 (diff)
downloadTango-589bffe306db793987c17cd46f1dcac81f47bdcb.tar.gz
Tango-589bffe306db793987c17cd46f1dcac81f47bdcb.zip
remove some warnings
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h2
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c19
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c4
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c2
4 files changed, 9 insertions, 18 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h
index fc3f88057..32a0dd8e0 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Heaters/Head_Heaters.h
@@ -8,7 +8,7 @@
#ifndef DRIVERS_I2C_COMMUNICATION_HEAD_CARD_HEATERS_HEAD_HEATERS_H_
#define DRIVERS_I2C_COMMUNICATION_HEAD_CARD_HEATERS_HEAD_HEATERS_H_
-#warning move to heaters enum
+
typedef enum
{
HEADCARD_HIT_ZN1,
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
index 8670a56b4..f659d965a 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
@@ -74,21 +74,12 @@ void Trigger_Heater_Current_Read(void)
{
I2C_ReadingMessageStruc I2C_ReadingMessage;
uint8_t Heater_i=0;
- uint8_t Heater_Lim=0;
- if(Head_Type == HEAD_TYPE_SYLKO_WITHOUT_CARD)
- Heater_Lim = NUM_OF_CURRENT_HEATERS;
- if(Head_Type == HEAD_TYPE_SYLKO)
- Heater_Lim = HEAD_NUM_OF_ADC;
- if(Head_Type == HEAD_TYPE_STAPLE_SPUN)
- Heater_Lim = HEAD_NUM_OF_ADC;
- // for (Heater_i = 0;Heater_i < Heater_Lim;Heater_i++)//No need - reads all inputs at the same time
- {
- I2C_ReadingMessage.messageId = Heater_Current_Reading;
- I2C_ReadingMessage.parameter = Heater_i;
- if (I2C_ReadingMsgQ != NULL)
- Mailbox_post(I2C_ReadingMsgQ , &I2C_ReadingMessage, BIOS_NO_WAIT);
- }
+ I2C_ReadingMessage.messageId = Heater_Current_Reading;
+ I2C_ReadingMessage.parameter = Heater_i;
+ if (I2C_ReadingMsgQ != NULL)
+ Mailbox_post(I2C_ReadingMsgQ , &I2C_ReadingMessage, BIOS_NO_WAIT);
+
return;
}
diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
index 59405be76..cf54019c5 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
@@ -417,7 +417,7 @@ uint32_t Valve3WayCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
uint32_t Control3WayValvesWithCallback (Valves_t _ValveId, bool direction, callback_fptr callback) //direction: MidTank_Dispenser or Dispenser_Mixer
{
- uint32_t busy = false;
+ //uint32_t busy = false;
//Report("Control3WayValvesWithCallback ",__FILE__,__LINE__,(int)_ValveId,RpWarning,(int)direction,0);
if (Valve3WayControlId[_ValveId] != 0xFF)
{
@@ -432,7 +432,7 @@ uint32_t Control3WayValvesWithCallback (Valves_t _ValveId, bool direction, callb
Report("Add control callback failed",__FILE__,__LINE__,(int)_ValveId,RpWarning,(int)Valve3WayControlId[_ValveId],0);
//else
// Report("Add control callback",__FILE__,__LINE__,(int)_ValveId,RpWarning,(int)Valve3WayControlId[_ValveId],0);
- busy = FPGA_GetDispenserValveBusyOCD(_ValveId,0);
+ /*busy = */FPGA_GetDispenserValveBusyOCD(_ValveId,0);
//Report("Set valve id, dir, busy",__FILE__,_ValveId,(int)direction,RpWarning,(int)busy,0);
EnableDisableDispenserValve(_ValveId, ENABLE);
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
index 37c2280c9..bef2b1727 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
@@ -132,7 +132,7 @@ uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* b
uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize)
{
volatile uint32_t ui32Idx;
- uint32_t status;
+ //uint32_t status;
#ifdef FLASH_DEBUG
Address[RxIndex] = ui32FlashStart;
Size[RxIndex] = ui32FileSize;