Version 1.4.6.21

5 files changed, 92 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject
index 7bb123cf0..b4548f69d 100644
--- a/Software/Embedded_SW/Embedded/.cproject
+++ b/Software/Embedded_SW/Embedded/.cproject
@@ -170,7 +170,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry excluding="Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp|Drivers/I2C_Communication/RFID_NFC/NFC_I2C|Drivers/I2C_Communication/RFID_NFC/PN7150|Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+						<entry excluding="Drivers/Uart_Comm/WHS_Controller_Comm/Modbus|Drivers/I2C_Communication/RFID_NFC/NFC_I2C|Drivers/I2C_Communication/RFID_NFC/PN7150|Drivers/I2C_Communication/Head_Card/ADC/Head_ADC_old.c|src|EmbParam.cfg" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/mb.c b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/mb.c
index 1e5e541b2..640575d3c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/mb.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/mb.c
@@ -42,7 +42,7 @@
 #include "Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/include/mbconfig.h"
 #include "Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/include/mbfunc.h"
 /* ----------------------- Platform includes --------------------------------*/
-//#include "port.h"
+#include "include/mbport.h"
 //
 ///* ----------------------- Modbus includes ----------------------------------*/
 //#include "mb.h"
diff --git a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp/mbtcp.c b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp/mbtcp.c
index 5a75fda67..175065ea5 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp/mbtcp.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Uart_Comm/WHS_Controller_Comm/Modbus/tcp/mbtcp.c
@@ -32,14 +32,14 @@
 #include "string.h"
 
 /* ----------------------- Platform includes --------------------------------*/
-#include "port.h"
+#include "../include/mbport.h"
 
 /* ----------------------- Modbus includes ----------------------------------*/
-#include "mb.h"
-#include "mbconfig.h"
+#include "../include/mb.h"
+#include "../include/mbconfig.h"
 #include "mbtcp.h"
-#include "mbframe.h"
-#include "mbport.h"
+#include "../include/mbframe.h"
+#include "../include/mbport.h"
 
 #if MB_TCP_ENABLED > 0
 
diff --git a/Software/Stubs Collection/stubs/Scripts/Jig_Tester/DispenserEEpromRead.cs b/Software/Stubs Collection/stubs/Scripts/Jig_Tester/DispenserEEpromRead.cs
new file mode 100644
index 000000000..902ac5843
--- /dev/null
+++ b/Software/Stubs Collection/stubs/Scripts/Jig_Tester/DispenserEEpromRead.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Text;
+using System.Linq;
+using System.Drawing;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Tango.PMR.Diagnostics;
+using Tango.Stubs;
+
+public void OnExecute(StubManager stubManager)
+{
+
+DispenserEEpromRequest dispenserEEpromRequest = new DispenserEEpromRequest();
+dispenserEEpromRequest.DispenserId = 4;
+dispenserEEpromRequest.BurnRequest = false;
+
+
+dispenserEEpromRequest.DispenserEEprom = dispenserEEprom;
+
+
+	var response = stubManager.Run<DispenserEEpromResponse>(dispenserEEpromRequest);
+
+}
\ No newline at end of file
diff --git a/Software/Stubs Collection/stubs/Scripts/Jig_Tester/DispenserEEpromWrite.cs b/Software/Stubs Collection/stubs/Scripts/Jig_Tester/DispenserEEpromWrite.cs
new file mode 100644
index 000000000..a1830796b
--- /dev/null
+++ b/Software/Stubs Collection/stubs/Scripts/Jig_Tester/DispenserEEpromWrite.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Text;
+using System.Linq;
+using System.Drawing;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Tango.PMR.Diagnostics;
+using Tango.Stubs;
+
+public void OnExecute(StubManager stubManager)
+{
+
+DispenserEEpromRequest dispenserEEpromRequest = new DispenserEEpromRequest();
+dispenserEEpromRequest.DispenserId = 4;
+dispenserEEpromRequest.BurnRequest = true;
+
+DispenserEEprom dispenserEEprom = new DispenserEEprom();
+dispenserEEprom.Header = 0;
+dispenserEEprom.TableLength = 0;
+dispenserEEprom.Tableversion = 0;
+dispenserEEprom.DispenserPN = null;
+dispenserEEprom.PCBSN = null;
+dispenserEEprom.PCBPartNumber = null;
+dispenserEEprom.DispenserSN = null;
+dispenserEEprom.MinimalPressure = 0;
+dispenserEEprom.MaximalPressure = 0;
+dispenserEEprom.MinimalMV = 0;
+dispenserEEprom.MaximalMV = 0;
+dispenserEEprom.TotalCycles = 0;
+dispenserEEprom.BubbleSize = 0;
+dispenserEEprom.AVGNlStepValue14 = 0;
+dispenserEEprom.AVGNlStepValue24 = 0;
+dispenserEEprom.AVGNlStepValue34 = 0;
+dispenserEEprom.AVGNlStepValue44 = 0;
+dispenserEEprom.SWReserve = 0;
+dispenserEEprom.Spare1Pressure = 0;
+dispenserEEprom.Spare2Pressure = 0;
+dispenserEEprom.MotorPulsesPerCycle = 0;
+dispenserEEprom.Color = 0;
+dispenserEEprom.PressureSlope = 0;
+dispenserEEprom.ProductionDate = null;
+dispenserEEprom.ATSlocation = 0;
+dispenserEEprom.Spare1 = 0;
+dispenserEEprom.Spare2 = 0;
+dispenserEEprom.ATSChannel = 0;
+dispenserEEprom.UnitEmpty = false;
+dispenserEEprom.DryRunPassFail = false;
+dispenserEEprom.FlowPassFail = false;
+dispenserEEprom.CheckSum = false;
+
+dispenserEEpromRequest.DispenserEEprom = dispenserEEprom;
+
+
+	var response = stubManager.Run<DispenserEEpromResponse>(dispenserEEpromRequest);
+
+}
\ No newline at end of file