diff --git a/Controller/Controller/DevicePref.xml b/Controller/Controller/DevicePref.xml index cc84b3c..5137658 100644 --- a/Controller/Controller/DevicePref.xml +++ b/Controller/Controller/DevicePref.xml @@ -1,4 +1,4 @@ - PMCDONAGH-SURF!OldParkland\10.20.158.3 + DESKTOP-AGBV11S!Old_Parkland\10.20.158.3 \ No newline at end of file diff --git a/Controller/Controller/LogicalValues.csv b/Controller/Controller/LogicalValues.csv index aea962b..8a14ee6 100644 --- a/Controller/Controller/LogicalValues.csv +++ b/Controller/Controller/LogicalValues.csv @@ -45,6 +45,8 @@ Controller.Micro820.Micro820._IO_EM_DO_05 FALSE Controller.Micro820.Micro820._IO_EM_DO_06 FALSE Controller.Micro820.Micro820._IO_P1_AI_00 Controller.Micro820.Micro820._IO_P1_AI_01 +Controller.Micro820.Micro820._IO_P1_AI_02 +Controller.Micro820.Micro820._IO_P1_AI_03 Controller.Micro820.Micro820.alarm_DHPressure Controller.Micro820.Micro820.alarm_DHTemperature Controller.Micro820.Micro820.alarm_E300 @@ -226,9 +228,16 @@ Controller.Micro820.Micro820.Control.Pressure_Switch_OK FALSE Controller.Micro820.Micro820.Control.RTrig_AutoMode.CLK Controller.Micro820.Micro820.Control.RTrig_AutoMode.Q Controller.Micro820.Micro820.Control.RTrig_AutoMode.Redge +Controller.Micro820.Micro820.Control.StartCommandTime T#4s Controller.Micro820.Micro820.Control.TEST_started Controller.Micro820.Micro820.Control.Time_Until_Startup_Min Controller.Micro820.Micro820.Control.Time_Until_Startup_Sec +Controller.Micro820.Micro820.Control.UNSTICK_STARTCOMMAND.ET +Controller.Micro820.Micro820.Control.UNSTICK_STARTCOMMAND.IN +Controller.Micro820.Micro820.Control.UNSTICK_STARTCOMMAND.Pdate +Controller.Micro820.Micro820.Control.UNSTICK_STARTCOMMAND.PT +Controller.Micro820.Micro820.Control.UNSTICK_STARTCOMMAND.Q +Controller.Micro820.Micro820.Control.UNSTICK_STARTCOMMAND.Redge Controller.Micro820.Micro820.CurrentTimeRTC.day Controller.Micro820.Micro820.CurrentTimeRTC.day_seconds Controller.Micro820.Micro820.CurrentTimeRTC.Epoch diff --git a/Controller/Controller/Micro820/Micro820/Control.stf b/Controller/Controller/Micro820/Micro820/Control.stf index 835c578..42f8de3 100644 --- a/Controller/Controller/Micro820/Micro820/Control.stf +++ b/Controller/Controller/Micro820/Micro820/Control.stf @@ -257,7 +257,6 @@ IF ((((Start_Button OR Start_Command OR cmd_TimerRun OR (Restart_Allowed AND Res (NOT Stop_Command) AND (cmd_TimerRun OR NOT cfg_TimerModeEnabled) AND Run_Permissive) THEN cmd_Run := TRUE; Restart_Command:= FALSE; - Start_Command := FALSE; IF NOT Start_Time_Set THEN Start_Time := time_CurrentTime; Start_Time_Set := TRUE; @@ -273,6 +272,12 @@ ELSE cmd_Run := FALSE; END_IF; +UNSTICK_STARTCOMMAND(Start_Command, StartCommandTime); +IF UNSTICK_STARTCOMMAND.Q THEN + Start_Command := FALSE; +END_IF; + + IF cmd_Run AND NOT Contactor_Status THEN IF NOT E300_Output_Enable THEN IF E300_Output_Toggled THEN @@ -314,6 +319,9 @@ IF Stop_Command THEN val_TripCount := 0; cmd_TimerRun := FALSE; sts_TimerRunTimeSet := FALSE; + IF NOT Contactor_Status THEN + Stop_Command := FALSE; + END_IF; END_IF; IF (NOT Hand_Mode) AND (NOT Auto_Mode) THEN diff --git a/Controller/Controller/Micro820/Micro820/Header.rtc b/Controller/Controller/Micro820/Micro820/Header.rtc index 292dda1..aa2dae4 100644 Binary files a/Controller/Controller/Micro820/Micro820/Header.rtc and b/Controller/Controller/Micro820/Micro820/Header.rtc differ diff --git a/Controller/Controller/Micro820/Micro820/IDS00103 b/Controller/Controller/Micro820/Micro820/IDS00103 index 1f5494f..c3dbbf8 100644 Binary files a/Controller/Controller/Micro820/Micro820/IDS00103 and b/Controller/Controller/Micro820/Micro820/IDS00103 differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820.err b/Controller/Controller/Micro820/Micro820/MICRO820.err index 88f0d1a..8b29570 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820.err +++ b/Controller/Controller/Micro820/Micro820/MICRO820.err @@ -1,51 +1,51 @@ 0::0046-0003::-------------------- Pre-build resource: MICRO820 Configuration: MICRO820 -------------- 0::0044-0003::Pre-compiling for 2080LC2020QWBI 0::0000-0003::RA_CIP_ELECTRICAL_ENERGY_OBJ -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_CIP_ELECTRICAL_ENERGY_OBJ:0000-0003::RA_E300_OUTPUT_CONTROL -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_E300_OUTPUT_CONTROL:0000-0003::READE300IO -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300IO:0000-0003::READE300CONFIG -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300CONFIG:0000-0003::READE300TRIPRESET -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300TRIPRESET:0000-0003::READE300PARAM -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300PARAM:0000-0003::USINT_TO_UDINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UDINT:0000-0003::USINT_TO_DINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_DINT:0000-0003::USINT_TO_UINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UINT:0000-0003::USINT_TO_SINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_SINT:0000-0003::UDINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UDINT_TO_USINT:0000-0003::DINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\DINT_TO_USINT:0000-0003::UINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UINT_TO_USINT:0000-0003::SINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\SINT_TO_USINT:0000-0003::WRITEE300CONFIG -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300CONFIG:0000-0003::WRITEE300TRIPRESET -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300TRIPRESET:0000-0003::LINEARSCALE -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\LINEARSCALE:0000-0003::EPOCH_TIME -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\EPOCH_TIME:0000-0003::READDOWNHOLEDATA -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READDOWNHOLEDATA:0000-0003::E300DATA -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\E300DATA:0000-0003::CONTROL -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0000-0003::FLOWTOTALIZER -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\FLOWTOTALIZER:0002-0003::MICRO820: 0 error(s), 0 warning(s) +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_CIP_ELECTRICAL_ENERGY_OBJ:0000-0003::RA_E300_OUTPUT_CONTROL +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_E300_OUTPUT_CONTROL:0000-0003::READE300IO +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300IO:0000-0003::READE300CONFIG +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300CONFIG:0000-0003::READE300TRIPRESET +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300TRIPRESET:0000-0003::READE300PARAM +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300PARAM:0000-0003::USINT_TO_UDINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UDINT:0000-0003::USINT_TO_DINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_DINT:0000-0003::USINT_TO_UINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UINT:0000-0003::USINT_TO_SINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_SINT:0000-0003::UDINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UDINT_TO_USINT:0000-0003::DINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\DINT_TO_USINT:0000-0003::UINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UINT_TO_USINT:0000-0003::SINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\SINT_TO_USINT:0000-0003::WRITEE300CONFIG +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300CONFIG:0000-0003::WRITEE300TRIPRESET +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300TRIPRESET:0000-0003::LINEARSCALE +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\LINEARSCALE:0000-0003::EPOCH_TIME +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\EPOCH_TIME:0000-0003::READDOWNHOLEDATA +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READDOWNHOLEDATA:0000-0003::E300DATA +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\E300DATA:0000-0003::CONTROL +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0000-0003::FLOWTOTALIZER +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\FLOWTOTALIZER:0002-0003::MICRO820: 0 error(s), 0 warning(s) 0::0006-0003::-------------------- Build resource: MICRO820 Configuration: MICRO820 -------------- 0::0001-0003::Compiling for 2080LC2020QWBI 0::0000-0003::RA_CIP_ELECTRICAL_ENERGY_OBJ -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_CIP_ELECTRICAL_ENERGY_OBJ:0000-0003::RA_E300_OUTPUT_CONTROL -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_E300_OUTPUT_CONTROL:0000-0003::READE300IO -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300IO:0000-0003::READE300CONFIG -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300CONFIG:0000-0003::READE300TRIPRESET -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300TRIPRESET:0000-0003::READE300PARAM -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300PARAM:0000-0003::USINT_TO_UDINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UDINT:0000-0003::USINT_TO_DINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_DINT:0000-0003::USINT_TO_UINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UINT:0000-0003::USINT_TO_SINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_SINT:0000-0003::UDINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UDINT_TO_USINT:0000-0003::DINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\DINT_TO_USINT:0000-0003::UINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UINT_TO_USINT:0000-0003::SINT_TO_USINT -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\SINT_TO_USINT:0000-0003::WRITEE300CONFIG -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300CONFIG:0000-0003::WRITEE300TRIPRESET -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300TRIPRESET:0000-0003::LINEARSCALE -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\LINEARSCALE:0000-0003::EPOCH_TIME -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\EPOCH_TIME:0000-0003::READDOWNHOLEDATA -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READDOWNHOLEDATA:0000-0003::E300DATA -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\E300DATA:0000-0003::CONTROL -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0000-0003::FLOWTOTALIZER -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\FLOWTOTALIZER:0003-0003::Linking for 2080LC2020QWBI -0:C:\USERS\PATRICK\DOCUMENTS\HENRY_PUMP\IPP_PANEL\CONTROLLER\CONTROLLER\MICRO820\MICRO820\FLOWTOTALIZER:0002-0003::MICRO820: 0 error(s), 0 warning(s) +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_CIP_ELECTRICAL_ENERGY_OBJ:0000-0003::RA_E300_OUTPUT_CONTROL +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\RA_E300_OUTPUT_CONTROL:0000-0003::READE300IO +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300IO:0000-0003::READE300CONFIG +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300CONFIG:0000-0003::READE300TRIPRESET +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300TRIPRESET:0000-0003::READE300PARAM +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READE300PARAM:0000-0003::USINT_TO_UDINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UDINT:0000-0003::USINT_TO_DINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_DINT:0000-0003::USINT_TO_UINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_UINT:0000-0003::USINT_TO_SINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\USINT_TO_SINT:0000-0003::UDINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UDINT_TO_USINT:0000-0003::DINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\DINT_TO_USINT:0000-0003::UINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\UINT_TO_USINT:0000-0003::SINT_TO_USINT +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\SINT_TO_USINT:0000-0003::WRITEE300CONFIG +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300CONFIG:0000-0003::WRITEE300TRIPRESET +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\WRITEE300TRIPRESET:0000-0003::LINEARSCALE +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\LINEARSCALE:0000-0003::EPOCH_TIME +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\EPOCH_TIME:0000-0003::READDOWNHOLEDATA +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\READDOWNHOLEDATA:0000-0003::E300DATA +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\E300DATA:0000-0003::CONTROL +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\CONTROL:0000-0003::FLOWTOTALIZER +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\FLOWTOTALIZER:0003-0003::Linking for 2080LC2020QWBI +0:C:\USERS\PATRI\DOCUMENTS\HENRY_PUMP\E300-IPP\CONTROLLER\CONTROLLER\MICRO820\MICRO820\FLOWTOTALIZER:0002-0003::MICRO820: 0 error(s), 0 warning(s) diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc index fc8a1b1..5fa3fad 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc index 5ebd039..b36b40c 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc index e4d97ce..8e9e94a 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc b/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc index 2700bec..d8b2edc 100644 --- a/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc +++ b/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc @@ -8,9 +8,9 @@ CRC_OLD= CRC_NEW=0x463526FC DAT_ORG=0 DAT_OLD=0 -DAT_NEW=1471974480 +DAT_NEW=1473283229 VER_ORG=0 VER_OLD=0 -VER_NEW=89 +VER_NEW=91 CRC_ALL_OLD= CRC_ALL_NEW=0xA673C34C diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc index b99fb82..3dc3217 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_CONTROL.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc index d15c684..15966dd 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_DINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc index e582c09..a4bc37e 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_E300DATA.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_EPOCH_TIME.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_EPOCH_TIME.xtc index 4a87b8a..84c80b1 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_EPOCH_TIME.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_EPOCH_TIME.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc index 9133597..926a680 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc index bcb04d1..b0160fa 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_CIP_ELECTRICAL_ENERGY_OBJ.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc index 9e6b3d4..394a27f 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_RA_E300_OUTPUT_CONTROL.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc index 258c315..9036d51 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READDOWNHOLEDATA.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc index 4923cb3..2d053d6 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300CONFIG.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc index ca1d964..c50a701 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300IO.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc index d5dd05b..a5eeaa8 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300PARAM.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc index fdc1ee3..043a80b 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_READE300TRIPRESET.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc index 10d85af..3db662e 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc index 9355ecd..00953a2 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UDINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc index f090a12..c69a4b7 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_UINT_TO_USINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc index c454d1a..44675a1 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_DINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc index fd42d39..28c650a 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_SINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc index 531ddff..cf3a8cb 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UDINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc index bcf5934..6353882 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_USINT_TO_UINT.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc index 03a1d91..a3cbfd5 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300CONFIG.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc index ca5002f..501ec8f 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WRITEE300TRIPRESET.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc index 80dd777..dab5240 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc index 80dd777..dab5240 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc index 80dd777..dab5240 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc index 771b2cb..ef1a7aa 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc differ diff --git a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc index 771b2cb..ef1a7aa 100644 Binary files a/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc and b/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc differ diff --git a/Controller/Controller/PrjLibrary.mdb b/Controller/Controller/PrjLibrary.mdb index d1f8876..2501c15 100644 Binary files a/Controller/Controller/PrjLibrary.mdb and b/Controller/Controller/PrjLibrary.mdb differ diff --git a/Controller/Controller/persist.ccwx b/Controller/Controller/persist.ccwx index 926cfc2..a6aa83a 100644 Binary files a/Controller/Controller/persist.ccwx and b/Controller/Controller/persist.ccwx differ diff --git a/Controller/Controller_Backup.zip b/Controller/Controller_Backup.zip index 1e36ff2..4ef6051 100644 Binary files a/Controller/Controller_Backup.zip and b/Controller/Controller_Backup.zip differ diff --git a/WaterWellPanel.v12.ccwsuo b/WaterWellPanel.v12.ccwsuo index bcf303d..8601d88 100644 Binary files a/WaterWellPanel.v12.ccwsuo and b/WaterWellPanel.v12.ccwsuo differ diff --git a/controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALIZER.xtc b/controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALIZER.xtc index 0c31c4c..9f55032 100644 Binary files a/controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALIZER.xtc and b/controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALIZER.xtc differ diff --git a/controller/Controller/RmcVariables b/controller/Controller/RmcVariables index 53b34c8..93a9406 100644 --- a/controller/Controller/RmcVariables +++ b/controller/Controller/RmcVariables @@ -1,2 +1,2 @@ -Controller.Micro820.Micro820._IO_P1_AI_00 -Controller.Micro820.Micro820._IO_P1_AI_01 +Controller.Micro820.Micro820.Control.UNSTICK_STARTCOMMAND +Controller.Micro820.Micro820.Control.StartCommandTime