diff --git a/GPSFlowSkid/Controller/Controller/DevicePref.xml b/GPSFlowSkid/Controller/Controller/DevicePref.xml index b719f06..8b46366 100644 --- a/GPSFlowSkid/Controller/Controller/DevicePref.xml +++ b/GPSFlowSkid/Controller/Controller/DevicePref.xml @@ -1,4 +1,5 @@ - PATRICKMCDO8E0A!HenryPump\107.84.231.186 + SHOPPC!AB_ETHIP-1\192.168.1.10 + SHOPPC!AB_ETHIP-1\192.168.1.10 \ No newline at end of file diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Header.rtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Header.rtc index 52d6f1a..9233c21 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Header.rtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/Header.rtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IDS00103 b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IDS00103 index 6933b89..905e191 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IDS00103 and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/IDS00103 differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc index c904c10..b2019bb 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc index 2e17254..5b24892 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc index 485f7f6..30208a5 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc new file mode 100644 index 0000000..a9ff1ec --- /dev/null +++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc @@ -0,0 +1,11 @@ +[MEMORY] +Offset0=0x1C84 +Offset1=0x2484 +Offset2=0x2484 +Offset3=0x2484 +Memory Usage Estimate(Code)=0x27CC +Memory Usage Estimate(Data)=0x5050 +Memory Usage Estimate(Retain)=0x34 +Memory Usage Estimate(RetainBlocks)=0x5 +Memory Usage Estimate(Temporary variables)=0xBC8 +Offset4=0x414 diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc similarity index 83% rename from GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc rename to GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc index 26a762e..bbf2e10 100644 --- a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc +++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc @@ -8,9 +8,9 @@ CRC_OLD= CRC_NEW=0x8FB7D22C DAT_ORG=0 DAT_OLD=0 -DAT_NEW=1534444545 +DAT_NEW=1534450523 VER_ORG=0 VER_OLD=0 -VER_NEW=40 +VER_NEW=41 CRC_ALL_OLD= CRC_ALL_NEW=0xCC8A266A diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc new file mode 100644 index 0000000..026d3de --- /dev/null +++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc @@ -0,0 +1,9 @@ +[MEMORY] +Memory Usage Estimate(Temporary variables)=0xBC8 +Biggest online change user variable memory block size=0x800 +Currently added user variables=0x0 +Total data size=0x284C +User variables size=0x1C84 +Maximum size for temporary variables=0x2BC8 +Memory Usage Estimate(Data)=0x504C +Free memory for user variables=0x800 diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc index 1c3d226..8a51765 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc index 8d542bf..016c014 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc index 7383739..f983e66 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc index a445293..a0f8ec0 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PANELVIEWTIMER.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PANELVIEWTIMER.xtc index f4fb06e..d0f0015 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PANELVIEWTIMER.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PANELVIEWTIMER.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc index 966ffb8..1bafd9d 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc index a93535b..b95bc09 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc index 29fbdd1..0699ae9 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc index 8355bec..f8ab4ce 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc index 2b3f9ee..7d4a3e7 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc index 715624a..f5aec6f 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc new file mode 100644 index 0000000..c46b71a Binary files /dev/null and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc new file mode 100644 index 0000000..c46b71a Binary files /dev/null and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc index d174a1b..c46b71a 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc new file mode 100644 index 0000000..d65d67c Binary files /dev/null and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc index 2406927..d65d67c 100644 Binary files a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc and b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc differ diff --git a/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MdfConf.s.txt b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MdfConf.s.txt new file mode 100644 index 0000000..276c213 --- /dev/null +++ b/GPSFlowSkid/Controller/Controller/Micro820/Micro820/MdfConf.s.txt @@ -0,0 +1,75 @@ +[__DEFIO_CPXDVC] +Nb = 2 +NotMDF = 0, 1, AB_, OPTIMUS_, IO_Base +MDF = -1 +RIdx = 0 +NotMDF = 101, 1, AB_, OPTIMUS_, IOUP_Analog +MDF = -1 +RIdx = 0 + + +[__DEFIO_SPLDVC] +Nb = 6 +NotMDF = 0, 0, 1, AB_, OPTIMUS_, digitOut_Base +MDF = -1 +RIdx = 0, 0 +NotMDF = 0, 1, 1, AB_, OPTIMUS_, digitIn_Base +MDF = -1 +RIdx = 0, 0 +NotMDF = 0, 2, 1, AB_, OPTIMUS_, analogIn_Base +MDF = -1 +RIdx = 0, 0 +NotMDF = 0, 3, 1, AB_, OPTIMUS_, analogOut_Base +MDF = -1 +RIdx = 0, 0 +NotMDF = 101, 0, 1, AB_, OPTIMUS_, analogOut_UP +MDF = -1 +RIdx = 0, 1 +NotMDF = 101, 1, 1, AB_, OPTIMUS_, analogIn_UP +MDF = -1 +RIdx = 0, 1 + + +[__DEFIO_CHAN] +RIdx = 0, 0, 0 +Nb = 7 +MDF = 1\1, 1, 0, 0, -1, _IO_EM_DO_00 +MDF = 1\1, 1, 0, 1, -1, _IO_EM_DO_01 +MDF = 1\1, 1, 0, 2, -1, _IO_EM_DO_02 +MDF = 1\1, 1, 0, 3, -1, _IO_EM_DO_03 +MDF = 1\1, 1, 0, 4, -1, _IO_EM_DO_04 +MDF = 1\1, 1, 0, 5, -1, _IO_EM_DO_05 +MDF = 1\1, 1, 0, 6, -1, _IO_EM_DO_06 +RIdx = 0, 0, 1 +Nb = 12 +MDF = 1\1, 1, 0, 0, -1, _IO_EM_DI_00 +MDF = 1\1, 1, 0, 1, -1, _IO_EM_DI_01 +MDF = 1\1, 1, 0, 2, -1, _IO_EM_DI_02 +MDF = 1\1, 1, 0, 3, -1, _IO_EM_DI_03 +MDF = 1\1, 1, 0, 4, -1, _IO_EM_DI_04 +MDF = 1\1, 1, 0, 5, -1, _IO_EM_DI_05 +MDF = 1\1, 1, 0, 6, -1, _IO_EM_DI_06 +MDF = 1\1, 1, 0, 7, -1, _IO_EM_DI_07 +MDF = 1\1, 1, 0, 8, -1, _IO_EM_DI_08 +MDF = 1\1, 1, 0, 9, -1, _IO_EM_DI_09 +MDF = 1\1, 1, 0, 10, -1, _IO_EM_DI_10 +MDF = 1\1, 1, 0, 11, -1, _IO_EM_DI_11 +RIdx = 0, 0, 2 +Nb = 4 +MDF = 1\1, 1, 0, 0, -1, _IO_EM_AI_00 +MDF = 1\1, 1, 0, 1, -1, _IO_EM_AI_01 +MDF = 1\1, 1, 0, 2, -1, _IO_EM_AI_02 +MDF = 1\1, 1, 0, 3, -1, _IO_EM_AI_03 +RIdx = 0, 0, 3 +Nb = 1 +MDF = 1\1, 1, 0, 0, -1, _IO_EM_AO_00 +RIdx = 0, 1, 4 +Nb = 0 +RIdx = 0, 1, 5 +Nb = 2 +MDF = 1\1, 0, 0, 0, -1, _IO_P1_AI_00 +MDF = 1\1, 0, 0, 1, -1, _IO_P1_AI_01 + + +[__READONLY_VALUES] +Nb = 0 diff --git a/GPSFlowSkid/Controller/Controller/PrjLibrary.mdb b/GPSFlowSkid/Controller/Controller/PrjLibrary.mdb index d06f1be..77a6264 100644 Binary files a/GPSFlowSkid/Controller/Controller/PrjLibrary.mdb and b/GPSFlowSkid/Controller/Controller/PrjLibrary.mdb differ diff --git a/GPSFlowSkid/Controller/Controller/RmcVariables b/GPSFlowSkid/Controller/Controller/RmcVariables deleted file mode 100644 index dcc298a..0000000 --- a/GPSFlowSkid/Controller/Controller/RmcVariables +++ /dev/null @@ -1,4 +0,0 @@ -Controller.Micro820.Micro820.PanelViewTimer.PanelViewTON -Controller.Micro820.Micro820.panelviewOn -Controller.Micro820.Micro820.panelviewTimeOn -Controller.Micro820.Micro820.cfg_SolarEnabled diff --git a/GPSFlowSkid/Controller/Controller/persist.ccwx b/GPSFlowSkid/Controller/Controller/persist.ccwx index 36c8e2c..4034303 100644 Binary files a/GPSFlowSkid/Controller/Controller/persist.ccwx and b/GPSFlowSkid/Controller/Controller/persist.ccwx differ diff --git a/GPSFlowSkid/Controller/Controller_Backup.zip b/GPSFlowSkid/Controller/Controller_Backup.zip index 34a8d57..f90ab73 100644 Binary files a/GPSFlowSkid/Controller/Controller_Backup.zip and b/GPSFlowSkid/Controller/Controller_Backup.zip differ diff --git a/GPSFlowSkid/GPSFlowSkid.v12.ccwsuo b/GPSFlowSkid/GPSFlowSkid.v12.ccwsuo index 1283fee..f4e0fdf 100644 Binary files a/GPSFlowSkid/GPSFlowSkid.v12.ccwsuo and b/GPSFlowSkid/GPSFlowSkid.v12.ccwsuo differ diff --git a/GPSFlowSkid/PVc Project/Library.pvc b/GPSFlowSkid/PVc Project/Library.pvc index 51bbbb7..4a2d5d7 100644 --- a/GPSFlowSkid/PVc Project/Library.pvc +++ b/GPSFlowSkid/PVc Project/Library.pvc @@ -1 +1 @@ -PV800_GPSFlowSkid;2711R-T4T;\\Mac\Home\GitHub\Henry-Pump\MaxWaterSystem\GPS-Flow-Skid\GPSFlowSkid\PVc Project +PV800_GPSFlowSkid;2711R-T4T;C:\Users\shop\Documents\GitHub\GPS-Flow-Skid\GPSFlowSkid\PVc Project diff --git a/GPSFlowSkid/PVc Project/PV800_GPSFlowSkid.cha b/GPSFlowSkid/PVc Project/PV800_GPSFlowSkid.cha index b14a723..b4b3763 100644 Binary files a/GPSFlowSkid/PVc Project/PV800_GPSFlowSkid.cha and b/GPSFlowSkid/PVc Project/PV800_GPSFlowSkid.cha differ