Adds toggle for disabling Solar Panel

- Enabled by default

GPSFlowSkid/Controller/Controller/LogicalValues.csv

@@ -56,6 +56,7 @@ Controller.Micro820.Micro820.cfg_FlowTotalizerC_Register,
 Controller.Micro820.Micro820.cfg_ResetTotalizerA_Coil,
 Controller.Micro820.Micro820.cfg_ResetTotalizerB_Coil,
 Controller.Micro820.Micro820.cfg_ResetTotalizerC_Coil,
+Controller.Micro820.Micro820.cfg_SolarEnabled,
 Controller.Micro820.Micro820.cfg_SolarPanel_ModbusNode,
 Controller.Micro820.Micro820.cfg_SolarPanel_Register,
 Controller.Micro820.Micro820.cfg_Status_Register,

GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc

@@ -3,7 +3,7 @@ Offset0=0x1C84
 Offset1=0x2484
 Offset2=0x2484
 Offset3=0x2484
-Memory Usage Estimate(Code)=0x27C4
+Memory Usage Estimate(Code)=0x27CC
 Memory Usage Estimate(Data)=0x5050
 Memory Usage Estimate(Retain)=0x34
 Memory Usage Estimate(RetainBlocks)=0x5

GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.mtc

@@ -5,12 +5,12 @@ ON_LINE=N
 TBL_CONF=Y
 CRC_ORG=0x0
 CRC_OLD=
-CRC_NEW=0x6244562C
+CRC_NEW=0x8FB7D22C
 DAT_ORG=0
 DAT_OLD=0
-DAT_NEW=1533577974
+DAT_NEW=1534444545
 VER_ORG=0
 VER_OLD=0
-VER_NEW=38
+VER_NEW=40
 CRC_ALL_OLD=
-CRC_ALL_NEW=0x303850A9
+CRC_ALL_NEW=0xCC8A266A

GPSFlowSkid/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc

@@ -1,7 +1,7 @@
 [BEGIN FB INPUTS]
 I1=micro820.micro820.flowmetermb/modbustimer.in,0x2485,BOOL
 I2=micro820.micro820.flowmetermb/modbustimer.pt,0x560,TIME
-I3=micro820.micro820.flowmetermb/wait_to_reset_ton.in,0x465,BOOL
+I3=micro820.micro820.flowmetermb/wait_to_reset_ton.in,0x466,BOOL
 I4=micro820.micro820.flowmetermb/wait_to_reset_ton.pt,0x56C,TIME
 I5=micro820.micro820.flowmetermb/modbuserrortimer.in,0x2485,BOOL
 I6=micro820.micro820.flowmetermb/modbuserrortimer.pt,0x564,TIME
@@ -12,55 +12,55 @@ I10=micro820.micro820.solarpanelmb/modbuserrortimer.pt,0x564,TIME
 I11=micro820.micro820.panelviewtimer/panelviewton.in,0x461,BOOL
 I12=micro820.micro820.panelviewtimer/panelviewton.pt,0x568,TIME
 I13=micro820.micro820.flowmetermb/mbs_flowrate_msg.in,0x2486,BOOL
-I14=micro820.micro820.flowmetermb/mbs_flowrate_msg.cancel,0x463,BOOL
+I14=micro820.micro820.flowmetermb/mbs_flowrate_msg.cancel,0x464,BOOL
 I15=micro820.micro820.flowmetermb/mbs_flowrate_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I16=micro820.micro820.flowmetermb/mbs_flowrate_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I17=micro820.micro820.flowmetermb/mbs_flowrate_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I18=micro820.micro820.flowmetermb/mbs_flowrate_msg.__adi_localaddr,0xFFFFFFFF,UINT
 I19=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.in,0x2486,BOOL
-I20=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.cancel,0x463,BOOL
+I20=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.cancel,0x464,BOOL
 I21=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I22=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I23=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I24=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.__adi_localaddr,0xFFFFFFFF,UINT
 I25=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.in,0x2486,BOOL
-I26=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.cancel,0x463,BOOL
+I26=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.cancel,0x464,BOOL
 I27=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I28=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I29=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I30=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.__adi_localaddr,0xFFFFFFFF,UINT
 I31=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.in,0x2486,BOOL
-I32=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.cancel,0x463,BOOL
+I32=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.cancel,0x464,BOOL
 I33=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I34=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I35=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I36=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.__adi_localaddr,0xFFFFFFFF,UINT
 I37=micro820.micro820.flowmetermb/mbs_status_msg.in,0x2486,BOOL
-I38=micro820.micro820.flowmetermb/mbs_status_msg.cancel,0x463,BOOL
+I38=micro820.micro820.flowmetermb/mbs_status_msg.cancel,0x464,BOOL
 I39=micro820.micro820.flowmetermb/mbs_status_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I40=micro820.micro820.flowmetermb/mbs_status_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I41=micro820.micro820.flowmetermb/mbs_status_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I42=micro820.micro820.flowmetermb/mbs_status_msg.__adi_localaddr,0xFFFFFFFF,UINT
-I43=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.in,0x464,BOOL
-I44=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.cancel,0x463,BOOL
+I43=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.in,0x465,BOOL
+I44=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.cancel,0x464,BOOL
 I45=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I46=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I47=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I48=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.__adi_localaddr,0xFFFFFFFF,UINT
 I49=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.in,0x2486,BOOL
-I50=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.cancel,0x463,BOOL
+I50=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.cancel,0x464,BOOL
 I51=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I52=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I53=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I54=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.__adi_localaddr,0xFFFFFFFF,UINT
 I55=micro820.micro820.flowmetermb/mbs_units_msg.in,0x2486,BOOL
-I56=micro820.micro820.flowmetermb/mbs_units_msg.cancel,0x463,BOOL
+I56=micro820.micro820.flowmetermb/mbs_units_msg.cancel,0x464,BOOL
 I57=micro820.micro820.flowmetermb/mbs_units_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I58=micro820.micro820.flowmetermb/mbs_units_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I59=micro820.micro820.flowmetermb/mbs_units_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR
 I60=micro820.micro820.flowmetermb/mbs_units_msg.__adi_localaddr,0xFFFFFFFF,UINT
 I61=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.in,0x2486,BOOL
-I62=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.cancel,0x466,BOOL
+I62=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.cancel,0x467,BOOL
 I63=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA
 I64=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA
 I65=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR

GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.ic

@@ -1,6 +1,7 @@
 _STEP 2 0 1
 __TMPB1 := MODBUSTIMER [ __CDINT00000004 ]
 __TMPB1 := _NOT __TMPB1 
+__TMPB1 := __TMPB1 _AND CFG_SOLARENABLED 
 __TMPB__TON__IN := __TMPB1 
 __FBL_RET := _PUSHCALLFB TON  MODBUSTIMER 
 _STEP 2 0 6

GPSFlowSkid/Controller/Controller/Micro820/Micro820/SOLARPANELMB.otc

@@ -1,52 +1,52 @@
 50
 
 0, 1
-26, 6
-34, 7
-42, 9
-50, 10
-58, 11
-66, 12
-74, 13
-168, 15
-182, 16
-200, 17
-218, 18
-236, 19
-254, 20
-272, 21
-306, 22
-340, 23
-360, 24
-384, 30
-398, 31
-412, 32
-426, 33
-454, 35
-482, 37
-510, 39
-538, 41
-566, 43
-594, 45
-622, 47
-636, 49
-646, 53
-660, 54
-674, 56
-680, 57
-694, 58
-710, 59
-724, 60
-754, 62
-784, 64
-814, 66
-844, 68
-874, 70
-904, 72
-934, 74
-964, 76
-994, 78
-1024, 80
-1036, 83
-1072, 87
-1098, 88
+34, 6
+42, 7
+50, 9
+58, 10
+66, 11
+74, 12
+82, 13
+176, 15
+190, 16
+208, 17
+226, 18
+244, 19
+262, 20
+280, 21
+314, 22
+348, 23
+368, 24
+392, 30
+406, 31
+420, 32
+434, 33
+462, 35
+490, 37
+518, 39
+546, 41
+574, 43
+602, 45
+630, 47
+644, 49
+654, 53
+668, 54
+682, 56
+688, 57
+702, 58
+718, 59
+732, 60
+762, 62
+792, 64
+822, 66
+852, 68
+882, 70
+912, 72
+942, 74
+972, 76
+1002, 78
+1032, 80
+1044, 83
+1080, 87
+1106, 88

GPSFlowSkid/Controller/Controller/Micro820/Micro820/SolarPanelMb.AcfMlge

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Root Version="6">
+<Root Version="7">
   <LanguageContainerStyle CommentTextColor="Green" CommentFont="Courier New, 10pt" PonctuationTextColor="Black" PonctuationFont="Courier New, 10pt" IdentifierTextColor="Black" IdentifierFont="Courier New, 10pt" OperatorTextColor="Black" OperatorFont="Courier New, 10pt" ReservedWordTextColor="Fuchsia" ReservedWordFont="Courier New, 10pt" PouTextColor="BlueViolet" PouFont="Courier New, 10pt" NumberTextColor="Firebrick" NumberFont="Courier New, 10pt" StringTextColor="Gray" StringFont="Courier New, 10pt" EditorTextAreaBackgroundColor="White" EditorFont="Courier New, 10pt" Index="0" />
 </Root>

GPSFlowSkid/Controller/Controller/Micro820/Micro820/SolarPanelMb.stf

@@ -1,5 +1,5 @@
 PROGRAM SolarPanelMb
-ModbusTimer(NOT ModbusTimer.Q, ModbusScanRate);
+ModbusTimer(NOT ModbusTimer.Q AND cfg_SolarEnabled, ModbusScanRate);
 
 (* ============== *)
 (* FLOW RATE      *)

GPSFlowSkid/Controller/Controller/RmcVariables

@@ -1,3 +1,4 @@
 Controller.Micro820.Micro820.PanelViewTimer.PanelViewTON
 Controller.Micro820.Micro820.panelviewOn
 Controller.Micro820.Micro820.panelviewTimeOn
+Controller.Micro820.Micro820.cfg_SolarEnabled