aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-10-18 12:13:43 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-10-18 12:13:43 +0300
commit694fca0ac0aa6e65cd17b0cf30a71214f14c0579 (patch)
tree54cf258a24c590a0e2a296d211d9864160b1bc14 /Software/Embedded_SW
parentea706238b6023018388e08dcdb779ea8e72f9970 (diff)
downloadTango-694fca0ac0aa6e65cd17b0cf30a71214f14c0579.tar.gz
Tango-694fca0ac0aa6e65cd17b0cf30a71214f14c0579.zip
make chunk smaller (3500) due to rt problem.
Diffstat (limited to 'Software/Embedded_SW')
-rw-r--r--Software/Embedded_SW/Embedded/.cproject4
-rw-r--r--Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Waste/Waste.h4
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c4
-rw-r--r--Software/Embedded_SW/Embedded/embeddedparametersbuild.cs4
6 files changed, 10 insertions, 10 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject
index ab125b40a..42646c2ff 100644
--- a/Software/Embedded_SW/Embedded/.cproject
+++ b/Software/Embedded_SW/Embedded/.cproject
@@ -269,7 +269,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="Embedded.cfg|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+ <entry excluding="EmbParam.cfg|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
@@ -441,7 +441,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="Embedded.cfg|Drivers/Uart_Comm/Uart.c|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+ <entry excluding="EmbParam.cfg|Drivers/Uart_Comm/Uart.c|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/L6470|Pin.c|ADCLogger.c|Flashstore.c|Profile.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index caad43712..6c019f150 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -53,7 +53,7 @@ FIL *UploadFileHandle = 0; //the system supports a single active file
FIL *DownloadFileHandle = 0; //the system supports a single active file
char FileHandleChar[5];
char ErrorMsg[100];
-#define MAX_CHUNK_LENGTH 5500
+#define MAX_CHUNK_LENGTH 3500
int32_t FileLength = 0;
int32_t FileReceivedLength = 0;
int32_t FileSentLength = 0;
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 061f6b3a3..ce5a56c3d 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -145,7 +145,7 @@ uint32_t HWConfigurationInit(void)
IDS_Dispenser_Content_Init();
//ProcessParamsInit();
Buttons_Init();
- WHS_init();
+ WHS_init();
ADC_MUX_Init();
GeneralHwReady = true;
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h
index a2b3cace2..4518f0ded 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste.h
@@ -126,8 +126,8 @@ typedef enum
typedef enum
{
- VALVE_DIR_WAST_CARTRIDGE1 = 0,
- VALVE_DIR_WAST_CARTRIDGE2
+ VALVE_DIR_WASTE_CARTRIDGE1 = 0,
+ VALVE_DIR_WASTE_CARTRIDGE2
} valve_cartridge_name;
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
index ce9b708c5..ddf1a5ee1 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c
@@ -448,8 +448,8 @@ bool SetValveDirection()
* */
bool ret = notOK;
//if (WHS_info.WHS_valve != no_waste_cartridge)
- if (WHS_info.active_cartridge == waste_cartridge1) WHS_info.WHS_valve = VALVE_DIR_WAST_CARTRIDGE1;
- else WHS_info.WHS_valve = VALVE_DIR_WAST_CARTRIDGE2;
+ if (WHS_info.active_cartridge == waste_cartridge1) WHS_info.WHS_valve = VALVE_DIR_WASTE_CARTRIDGE1;
+ else WHS_info.WHS_valve = VALVE_DIR_WASTE_CARTRIDGE2;
{
Valve_Set(VALVE_WASTE_TANK, WHS_info.WHS_valve);
ret = OK;
diff --git a/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs b/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs
index 75df79664..3b2ff042b 100644
--- a/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs
+++ b/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs
@@ -62,7 +62,7 @@ configurationParameters.DispenserPresegmentWFCF = 40;
configurationParameters.IDSPreSegmentWFCFTimeBeforeSegment = 30000;
//flag: start heaters according to saved process parameters upon init?
-configurationParameters.StartHeatingOnInitSequence = true;
+configurationParameters.StartHeatingOnInitSequence = false;
// current test for the heaters - alarm thresholds
configurationParameters.CurrentAlarmLowLimit = 0.80;
@@ -123,7 +123,7 @@ configurationParameters.GeneralParameters.Add(SetDiagnosticMode);
/*8*/
Double SetAutoFill = new Double();
-SetAutoFill = 3.0;
+SetAutoFill = 0.0;
configurationParameters.GeneralParameters.Add(SetAutoFill);
File.WriteAllBytes("C:/temp/EmbParam.cfg",configurationParameters.ToBytes());