aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-08-17 10:05:52 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-08-17 10:05:52 +0300
commit17aa17776eed59ef62d800654ab238ae59be49db (patch)
tree1ed85608875a603099746b4804cbf4840fbf36c3 /Software/Embedded_SW/Embedded
parent7d232db20da74279dbb691beae2e771c290c038e (diff)
downloadTango-17aa17776eed59ef62d800654ab238ae59be49db.tar.gz
Tango-17aa17776eed59ef62d800654ab238ae59be49db.zip
warning removals
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c2
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c4
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c2
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c6
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h4
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c1
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c14
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c2
-rw-r--r--Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c1
10 files changed, 22 insertions, 16 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c
index 0118e029e..5bac56231 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c
@@ -483,7 +483,7 @@ uint32_t Read_Head_MixChip_Heaters_Current(HEATERS_CURRENT Heater_ID) //0-5
if (Heater_ID>=NUM_OF_CURRENT_HEATERS)
return ERROR;
- #warning need to change the hardware://there is overflow in Dyer Head zone 4 with resistor 0.05
+ //#warning need to change the hardware://there is overflow in Dyer Head zone 4 with resistor 0.05
const double Resistor[NUM_OF_CURRENT_HEATERS] = {0.025, 0.025, 0.025, 0.025, 0.020, 0.025};
if (Heaters_Current_Read_Enable[Heater_ID] == false)
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
index d9f5385f6..9023f8250 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
@@ -106,8 +106,8 @@ uint32_t Dispenser_EEPROM_Read_Data(uint8_t Dispenser_ID)//0..7
uint32_t test_disp_eeprom(uint8_t Dispenser_ID , uint8_t EEprom_Add)//0..7
{
uint32_t status= OK;
- uint32_t i;
-/*
+/* uint32_t i;
+
Dispenser_struct[Dispenser_ID].Write_Disp_EEPROM.bytes.Dispebser_Data.SN = 0x12345678;
Dispenser_struct[Dispenser_ID].Write_Disp_EEPROM.bytes.Nl_Pulse_Value = 0xAB;
Dispenser_struct[Dispenser_ID].Write_Disp_EEPROM.bytes.Flow_Pass_Fail = 0xCD;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c
index 3e5ed6ab5..6c2d54111 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c
@@ -267,8 +267,6 @@ bool WHS_PT100_Read(TEMPERATURE_SENSOR_ID_ENUM SensorId)
break;
}
- #warning what to do with the data ??????? //- see TempSensorResponse[SensorId].Temperature_C_mult_by_100
-
return Status;
}
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
index 002bfa25f..764ef0d44 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
@@ -465,7 +465,7 @@ bool WHS_Set_Blower_Control_Closed_Loop(double Q_value)
close_loop_time = 15;
if (midtank_cleared < NUM_OF_MIDTANKS)
{
-#warning open waiting midtank both valves for 15 seconds
+//#warning open waiting midtank both valves for 15 seconds
Valve_Set(IDS_Id_to_AirValve[midtank_cleared], Atm_MidTank_ON ); //Atm_MidTank_OFF/ON
Valve_Set(IDS_Id_to_CartrideValve[midtank_cleared], Atm_MidTank_ON ); //Atm_MidTank_OFF/ON
}
@@ -475,7 +475,7 @@ bool WHS_Set_Blower_Control_Closed_Loop(double Q_value)
{
if (midtank_cleared < NUM_OF_MIDTANKS)
{
-#warning close waiting midtank both valves for 15 seconds
+//#warning close waiting midtank both valves for 15 seconds
Valve_Set(IDS_Id_to_AirValve[midtank_cleared], Atm_MidTank_OFF ); //Atm_MidTank_OFF/ON
Valve_Set(IDS_Id_to_CartrideValve[midtank_cleared], Atm_MidTank_OFF ); //Atm_MidTank_OFF/ON
midtank_cleared = NUM_OF_MIDTANKS;
@@ -613,7 +613,7 @@ char whs_str[150];
uint32_t WHS_Pid_Testing_Func(double setParam,double measuredParam)
{
float calculated_speed;
- float avreageSampleValue = 0;
+ //float avreageSampleValue = 0;
int i;
/*WhsBlowerSamples[WhsBlowerSamplesPointer] = measuredParam;//(-1 * TranslatedReadValue);
diff --git a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h
index 6598b88c2..4f864eaca 100644
--- a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h
+++ b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h
@@ -17,8 +17,8 @@ uint32_t Read_Dryer_Status(HardwareDancerType DancerId);
void Loop_SSI();
-void test_dancer_responce_RTFU(bool motor_direction);
-void test_dancer_responce_RTFU();
+//void test_dancer_responce_RTFU(bool motor_direction);
+void test_dancer_responce_RTFU(void);
extern bool test_dancer_direction, test_dancer_flag;
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
index e2d0443b4..3389d941c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c
@@ -245,7 +245,6 @@ void MainCardEEpromReadRequestFunc(MessageContainer* requestContainer)
uint32_t status = PASSED;
MessageContainer responseContainer;
- int32_t EEdata = 0;
StubMainCardEEpromReadRequest* request = stub_main_card_eeprom_read_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 08e9f7bbe..af7d3bdf0 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -1220,8 +1220,11 @@ uint32_t IDSCheckSegmentData(void *SegmentDetails, int SegmentId)
uint32_t status = OK;
JobDescriptionFileBrushStop * tFileBrushStop;
int Brush_i;
+ Task_Stat statbuf;
//check and close previous segment
+ RemoveControlCallback(BrushStopControlId,IDSBrushStopRestartCallback);
+ BrushStopControlId = 0xFF;
if (PrevSegment)
{
if (JobBrushStopId<PrevSegment->brushstopscount) //we did not finish reading the brushstops of the previous segment
@@ -1241,6 +1244,10 @@ uint32_t IDSCheckSegmentData(void *SegmentDetails, int SegmentId)
}
else
{
+ Task_stat(Task_self(),&statbuf);
+ Report("Unhandled BrushStopRead Error",__FILE__,statbuf.used,(int)statbuf.stackSize,RpWarning,(int)statbuf.stackHeap,0);
+ //JobEndReason = JOB_OUT_OF_DYE;
+ //SegmentReady(Module_IDS,ModuleFail);
Report("Unhandled brushstops ERROR",__FILE__,__LINE__,(int)tFileBrushStop,RpWarning,(int)PrevSegment->brushstopscount,0);
status = ERROR;
break;
@@ -1527,7 +1534,7 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue)
Task_Stat statbuf;
if(BrushStopStartTime+BrushStopLength+100 < msec_millisecondCounter )
{
- Report("!!!!!!!!!!!!Overtime!",__FILE__,msec_millisecondCounter,(int)BrushStopStartTime,RpWarning,(int)BrushStopLength,0);
+ Report("!!!!!!!!!!!!Overtime!",__FILE__,msec_millisecondCounter,(int)BrushStopStartTime,RpWarning,(int)BrushStopLength,0);
}
if(++BrushStopCounter < BrushStopTime)
@@ -1537,6 +1544,11 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue)
BrushStopCounter = 0;
BrushStopStartTime = msec_millisecondCounter;
+ if (BrushStopControlId == 0xFF)
+ {
+ Report("!!!BrushStopControlId = 0xFF",__FILE__,msec_millisecondCounter,(int)BrushStopStartTime,RpWarning,(int)BrushStopLength,0);
+ return OK;
+ }
if (JobEndSequence == true)
{
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index 6ce7ebfea..931400aaa 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -1469,7 +1469,7 @@ uint32_t ThreadLoadingReport(void)
uint32_t TryThreadLoadingFunc(MessageContainer* requestContainer)
{
- TryThreadLoadingRequest *request = continue_thread_loading_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+ TryThreadLoadingRequest *request = try_thread_loading_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
TryThreadLoadingResponse Cresponse = TRY_THREAD_LOADING_RESPONSE__INIT;
MessageContainer responseContainer;
MessageState = 2;
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index c0e51a143..222b618d2 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -526,6 +526,4 @@ uint32_t Waste_Prepare(void)
//PrepareReady(Module_Waste,ModuleFail);
return JOB_OTHER_ALARM;
}
- return;
-
}
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index f39bf9f01..31872d932 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -142,7 +142,6 @@ FRESULT RewindJobFile()
FRESULT CloseJobFile()
{
Fresult = f_close(JobRequestFileHandle);
-#warning trying not to hold the semaphore and enable the PPC/MS to work on several files simultaneously
readbBytes = 0;
ImmediateRead = 0;