diff --git a/Pioneer Ghost Meters/Controller/Controller/LogicalValues.csv b/Pioneer Ghost Meters/Controller/Controller/LogicalValues.csv index 73bdb17..6a91637 100644 --- a/Pioneer Ghost Meters/Controller/Controller/LogicalValues.csv +++ b/Pioneer Ghost Meters/Controller/Controller/LogicalValues.csv @@ -43,6 +43,8 @@ Controller.Micro820.Micro820._IO_EM_DO_03 Controller.Micro820.Micro820._IO_EM_DO_04 Controller.Micro820.Micro820._IO_EM_DO_05 Controller.Micro820.Micro820._IO_EM_DO_06 +Controller.Micro820.Micro820._IO_P1_AI_00 +Controller.Micro820.Micro820._IO_P1_AI_01 Controller.Micro820.Micro820.cfg_Flowmeter_ModbusNode 20 Controller.Micro820.Micro820.cfg_FlowRate_Register 40201 Controller.Micro820.Micro820.cfg_FlowTotalizerA_Register 40203 @@ -2215,6 +2217,12 @@ Controller.Micro820.Micro820.FlowMeterMb.mbs_Units_MSG.TargetCfg.Addr 40205 Controller.Micro820.Micro820.FlowMeterMb.mbs_Units_MSG.TargetCfg.Node 20 Controller.Micro820.Micro820.FlowMeterMb.mbs_Units_TargetCfg.Addr 40205 Controller.Micro820.Micro820.FlowMeterMb.mbs_Units_TargetCfg.Node 20 +Controller.Micro820.Micro820.FlowMeterMb.ModbusErrorTimer.ET +Controller.Micro820.Micro820.FlowMeterMb.ModbusErrorTimer.IN +Controller.Micro820.Micro820.FlowMeterMb.ModbusErrorTimer.Pdate +Controller.Micro820.Micro820.FlowMeterMb.ModbusErrorTimer.PT +Controller.Micro820.Micro820.FlowMeterMb.ModbusErrorTimer.Q +Controller.Micro820.Micro820.FlowMeterMb.ModbusErrorTimer.Redge Controller.Micro820.Micro820.FlowMeterMb.ModbusTimer.ET Controller.Micro820.Micro820.FlowMeterMb.ModbusTimer.IN Controller.Micro820.Micro820.FlowMeterMb.ModbusTimer.Pdate @@ -2230,7 +2238,9 @@ Controller.Micro820.Micro820.FlowMeterMb.Wait_To_Reset_TON.PT Controller.Micro820.Micro820.FlowMeterMb.Wait_To_Reset_TON.Q Controller.Micro820.Micro820.FlowMeterMb.Wait_To_Reset_TON.Redge Controller.Micro820.Micro820.FlowMeterMb.WRITECOIL_CMD +Controller.Micro820.Micro820.ModbusErrorDuration Controller.Micro820.Micro820.ModbusScanRate +Controller.Micro820.Micro820.PressureAnalog.val_AI00_uA Controller.Micro820.Micro820.skid_Latitude Controller.Micro820.Micro820.skid_Longitude Controller.Micro820.Micro820.SolarPanelMb.mbs_Cancel @@ -2504,6 +2514,12 @@ Controller.Micro820.Micro820.SolarPanelMb.mbs_SolarPanel_MSG.TargetCfg.Node 20 Controller.Micro820.Micro820.SolarPanelMb.mbs_SolarPanel_TargetCfg.Addr 40203 Controller.Micro820.Micro820.SolarPanelMb.mbs_SolarPanel_TargetCfg.Node 20 Controller.Micro820.Micro820.SolarPanelMb.mbs_TriggerType +Controller.Micro820.Micro820.SolarPanelMb.ModbusErrorTimer.ET +Controller.Micro820.Micro820.SolarPanelMb.ModbusErrorTimer.IN +Controller.Micro820.Micro820.SolarPanelMb.ModbusErrorTimer.Pdate +Controller.Micro820.Micro820.SolarPanelMb.ModbusErrorTimer.PT +Controller.Micro820.Micro820.SolarPanelMb.ModbusErrorTimer.Q +Controller.Micro820.Micro820.SolarPanelMb.ModbusErrorTimer.Redge Controller.Micro820.Micro820.SolarPanelMb.ModbusTimer.ET Controller.Micro820.Micro820.SolarPanelMb.ModbusTimer.IN Controller.Micro820.Micro820.SolarPanelMb.ModbusTimer.Pdate @@ -2525,6 +2541,7 @@ Controller.Micro820.Micro820.val_FlowTotalizerBUnits Controller.Micro820.Micro820.val_FlowTotalizerC Controller.Micro820.Micro820.val_FlowTotalizerCUnits Controller.Micro820.Micro820.val_FlowUnits +Controller.Micro820.Micro820.val_PressureReading Controller.Micro820.Micro820.val_SolarAmbientTemperature Controller.Micro820.Micro820.val_SolarArrayCurrent Controller.Micro820.Micro820.val_SolarArrayVoltage diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Compile_LINEARSCALE.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Compile_PRESSUREANALOG.ict b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Compile_PRESSUREANALOG.ict new file mode 100644 index 0000000..7e6cc76 --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Compile_PRESSUREANALOG.ict @@ -0,0 +1 @@ +COMPILED diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DefProg.cnf b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DefProg.cnf index acac3d5..e339c36 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DefProg.cnf and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DefProg.cnf differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DwlOrder.txt b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DwlOrder.txt index 2b14577..a37e81c 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DwlOrder.txt +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/DwlOrder.txt @@ -1,8 +1,10 @@ FLOWMETERMB WATCHDOG SOLARPANELMB +PRESSUREANALOG WORDSTOREAL FLOWRATEUNITS FLOWTOTALUNITS WORDTOFLOAT16 REVERSEUINT +LINEARSCALE diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa index 3e7f70b..f1c1616 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FBS_INPUTS_ASSIGNATION.ipa @@ -1,9 +1,13 @@ MODBUSTIMER.IN@FLOWMETERMB,__TMPB__TON__IN,BOOL MODBUSTIMER.PT@FLOWMETERMB,MODBUSSCANRATE,TIME +MODBUSERRORTIMER.IN@FLOWMETERMB,__TMPB__TON__IN,BOOL +MODBUSERRORTIMER.PT@FLOWMETERMB,MODBUSERRORDURATION,TIME WAIT_TO_RESET_TON.IN@FLOWMETERMB,CMD_CLEARRESETTOTALIZER@FLOWMETERMB,BOOL WAIT_TO_RESET_TON.PT@FLOWMETERMB,PAR_TIMETOWAITTOCLEARRESETTOTALIZER@FLOWMETERMB,TIME MODBUSTIMER.IN@SOLARPANELMB,__TMPB__TON__IN,BOOL MODBUSTIMER.PT@SOLARPANELMB,MODBUSSCANRATE,TIME +MODBUSERRORTIMER.IN@SOLARPANELMB,__TMPB__TON__IN,BOOL +MODBUSERRORTIMER.PT@SOLARPANELMB,MODBUSERRORDURATION,TIME MBS_FLOWRATE_MSG.IN@FLOWMETERMB,__TMPB__MSG_MODBUS__IN,BOOL MBS_FLOWRATE_MSG.CANCEL@FLOWMETERMB,MBS_CANCEL@FLOWMETERMB,BOOL MBS_FLOWRATE_MSG.LOCALCFG@FLOWMETERMB,,MODBUSLOCPARA diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.ic b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.ic index d9e74b7..28283ee 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.ic +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.ic @@ -189,6 +189,9 @@ __TMPB4 := MBS_FLOWTOTALIZERC_MSG [ __CDINT0000000D ] __TMPB1 := __TMPB1 _OR __TMPB4 __TMPB5 := MBS_STATUS_MSG [ __CDINT0000000D ] __TMPB1 := __TMPB1 _OR __TMPB5 +__TMPB__TON__IN := __TMPB1 +__FBL_RET := _PUSHCALLFB TON MODBUSERRORTIMER +__TMPB1 := MODBUSERRORTIMER [ __CDINT00000004 ] STS_FLOWMETERMODBUSERROR := __TMPB1 __TMPUIN1 := VAL_STATUS0 + VAL_STATUS1 __TMPUIN1 := __TMPUIN1 + VAL_STATUS2 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.rtc index 49b61f9..380b4ed 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWMETERMB.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.rtc index 7fa806c..d6287a7 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWRATEUNITS.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.rtc index 6f024b8..949e017 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FLOWTOTALUNITS.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FlowMeterMb.stf b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FlowMeterMb.stf index 20efb4e..dafccc9 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FlowMeterMb.stf +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/FlowMeterMb.stf @@ -84,7 +84,8 @@ IF mbs_Status_MSG.Q THEN val_Status2 := ANY_TO_UINT(mbs_Status_Data[3]); END_IF; -sts_FlowmeterModbusError := mbs_FlowRate_MSG.Error OR mbs_FlowTotalizerA_MSG.Error OR mbs_FlowTotalizerB_MSG.Error OR mbs_FlowTotalizerC_MSG.Error OR mbs_Status_MSG.Error; +ModbusErrorTimer(mbs_FlowRate_MSG.Error OR mbs_FlowTotalizerA_MSG.Error OR mbs_FlowTotalizerB_MSG.Error OR mbs_FlowTotalizerC_MSG.Error OR mbs_Status_MSG.Error, ModbusErrorDuration); +sts_FlowmeterModbusError := ModbusErrorTimer.Q; IF (val_Status0 + val_Status1 + val_Status2) = 0 THEN val_StatusString := 'OK'; diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc index 172cf80..ccebbea 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/GlobalVariable.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Header.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Header.rtc index c61660e..a9c41db 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Header.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Header.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Hierarchy.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Hierarchy.rtc index f49171a..564bd5c 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Hierarchy.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/Hierarchy.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IDS00103 b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IDS00103 index c153027..5c8b143 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IDS00103 and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IDS00103 differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IO.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IO.rtc index 350cd69..32c008d 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IO.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/IO.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LINEARSCALE.ic b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LINEARSCALE.ic new file mode 100644 index 0000000..bca3734 --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LINEARSCALE.ic @@ -0,0 +1,10 @@ +__TMPR1 := EU_MAX - EU_MIN +__TMPR2 := RAW_MAX - RAW_MIN +__TMPR1 := __TMPR1 / __TMPR2 +M := __TMPR1 +__TMPR1 := M * RAW_MAX +__TMPR2 := EU_MAX - __TMPR1 +B := __TMPR2 +__TMPR1 := M * RAW_INP +__TMPR1 := __TMPR1 + B +LINEARSCALE := __TMPR1 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc new file mode 100644 index 0000000..0ca6ad4 Binary files /dev/null and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LINEARSCALE.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LinearScale.AcfMlge b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LinearScale.AcfMlge new file mode 100644 index 0000000..0cd9ea9 --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LinearScale.AcfMlge @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LinearScale.stf b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LinearScale.stf new file mode 100644 index 0000000..59ef19f --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/LinearScale.stf @@ -0,0 +1,6 @@ +FUNCTION LinearScale +m := (EU_Max - EU_Min) / (Raw_Max - Raw_Min); +b := EU_Max - m * Raw_Max; + +LinearScale := m * Raw_Inp + b; +END_FUNCTION \ No newline at end of file diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820.icp b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820.icp index b0bf9bf..12c4811 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820.icp +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820.icp @@ -1,8 +1,10 @@ WATCHDOG(149): WORDTOFLOAT16(153):F,REVERSEUINT(154); REVERSEUINT(154): +PRESSUREANALOG(155):F,LINEARSCALE(156); FLOWRATEUNITS(150): FLOWMETERMB(147):F,WORDSTOREAL(148);F,FLOWRATEUNITS(150);F,FLOWTOTALUNITS(151); -SOLARPANELMB(152):F,WORDTOFLOAT16(153); +LINEARSCALE(156): WORDSTOREAL(148): FLOWTOTALUNITS(151): +SOLARPANELMB(152):F,WORDTOFLOAT16(153); diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc index e0748e2..b61d6e5 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Conf.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc index 4137a9a..648018e 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Constants.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc index 5b07a22..19ab312 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_DwlOrder.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc index 4aa4927..781d1c0 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.mtc @@ -1,10 +1,10 @@ [MEMORY] -Offset0=0x1C00 -Offset1=0x2400 -Offset2=0x2400 -Offset3=0x2400 -Memory Usage Estimate(Code)=0x247C -Memory Usage Estimate(Data)=0x4F9C +Offset0=0x1C64 +Offset1=0x2464 +Offset2=0x2464 +Offset3=0x2464 +Memory Usage Estimate(Code)=0x26C4 +Memory Usage Estimate(Data)=0x5030 Memory Usage Estimate(Retain)=0x34 -Memory Usage Estimate(Temporary variables)=0xB98 +Memory Usage Estimate(Temporary variables)=0xBC8 Offset4=0x414 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc index 4aa4927..781d1c0 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_LinkInfo.s.mtc @@ -1,10 +1,10 @@ [MEMORY] -Offset0=0x1C00 -Offset1=0x2400 -Offset2=0x2400 -Offset3=0x2400 -Memory Usage Estimate(Code)=0x247C -Memory Usage Estimate(Data)=0x4F9C +Offset0=0x1C64 +Offset1=0x2464 +Offset2=0x2464 +Offset3=0x2464 +Memory Usage Estimate(Code)=0x26C4 +Memory Usage Estimate(Data)=0x5030 Memory Usage Estimate(Retain)=0x34 -Memory Usage Estimate(Temporary variables)=0xB98 +Memory Usage Estimate(Temporary variables)=0xBC8 Offset4=0x414 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc index 57c3886..49e9520 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MdfLinkReport.s.mtc @@ -5,12 +5,12 @@ ON_LINE=N TBL_CONF=Y CRC_ORG=0x0 CRC_OLD= -CRC_NEW=0x978BA04B +CRC_NEW=0xF767B173 DAT_ORG=0 DAT_OLD=0 -DAT_NEW=1517372534 +DAT_NEW=1517442743 VER_ORG=0 VER_OLD=0 -VER_NEW=31 +VER_NEW=36 CRC_ALL_OLD= -CRC_ALL_NEW=0x672665CF +CRC_ALL_NEW=0xEDEFD638 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc index 1b46546..d441b26 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.mtc @@ -1,9 +1,9 @@ [MEMORY] -Memory Usage Estimate(Temporary variables)=0xB98 +Memory Usage Estimate(Temporary variables)=0xBC8 Biggest online change user variable memory block size=0x800 Currently added user variables=0x0 -Total data size=0x2798 -User variables size=0x1C00 -Maximum size for temporary variables=0x2B98 -Memory Usage Estimate(Data)=0x4F98 +Total data size=0x282C +User variables size=0x1C64 +Maximum size for temporary variables=0x2BC8 +Memory Usage Estimate(Data)=0x502C Free memory for user variables=0x800 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc index 1b46546..d441b26 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_MiscLinkInfo.s.mtc @@ -1,9 +1,9 @@ [MEMORY] -Memory Usage Estimate(Temporary variables)=0xB98 +Memory Usage Estimate(Temporary variables)=0xBC8 Biggest online change user variable memory block size=0x800 Currently added user variables=0x0 -Total data size=0x2798 -User variables size=0x1C00 -Maximum size for temporary variables=0x2B98 -Memory Usage Estimate(Data)=0x4F98 +Total data size=0x282C +User variables size=0x1C64 +Maximum size for temporary variables=0x2BC8 +Memory Usage Estimate(Data)=0x502C Free memory for user variables=0x800 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.ipa b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.ipa index 7ba7051..8d4cc54 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.ipa +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.ipa @@ -4,6 +4,7 @@ ,MBS_FLOWTOTALIZERB_MSG@FLOWMETERMB,MSG_MODBUS,IN,__TMPB__MSG_MODBUS__IN,BOOL,CANCEL,MBS_CANCEL@FLOWMETERMB,BOOL,LOCALCFG,,MODBUSLOCPARA,TARGETCFG,,MODBUSTARPARA,LOCALADDR,,MODBUSLOCADDR,__ADI_LOCALADDR,,UINT ,MBS_FLOWTOTALIZERC_MSG@FLOWMETERMB,MSG_MODBUS,IN,__TMPB__MSG_MODBUS__IN,BOOL,CANCEL,MBS_CANCEL@FLOWMETERMB,BOOL,LOCALCFG,,MODBUSLOCPARA,TARGETCFG,,MODBUSTARPARA,LOCALADDR,,MODBUSLOCADDR,__ADI_LOCALADDR,,UINT ,MBS_STATUS_MSG@FLOWMETERMB,MSG_MODBUS,IN,__TMPB__MSG_MODBUS__IN,BOOL,CANCEL,MBS_CANCEL@FLOWMETERMB,BOOL,LOCALCFG,,MODBUSLOCPARA,TARGETCFG,,MODBUSTARPARA,LOCALADDR,,MODBUSLOCADDR,__ADI_LOCALADDR,,UINT +,MODBUSERRORTIMER@FLOWMETERMB,TON,IN,__TMPB__TON__IN,BOOL,PT,MODBUSERRORDURATION,TIME ,MBS_RESETTOTALIZER_MSG@FLOWMETERMB,MSG_MODBUS,IN,CMD_RESETTOTALIZER@FLOWMETERMB,BOOL,CANCEL,MBS_CANCEL@FLOWMETERMB,BOOL,LOCALCFG,,MODBUSLOCPARA,TARGETCFG,,MODBUSTARPARA,LOCALADDR,,MODBUSLOCADDR,__ADI_LOCALADDR,,UINT ,WAIT_TO_RESET_TON@FLOWMETERMB,TON,IN,CMD_CLEARRESETTOTALIZER@FLOWMETERMB,BOOL,PT,PAR_TIMETOWAITTOCLEARRESETTOTALIZER@FLOWMETERMB,TIME ,MBS_CLEARRESETTOTALIZER_MSG@FLOWMETERMB,MSG_MODBUS,IN,__TMPB__MSG_MODBUS__IN,BOOL,CANCEL,MBS_CANCEL@FLOWMETERMB,BOOL,LOCALCFG,,MODBUSLOCPARA,TARGETCFG,,MODBUSTARPARA,LOCALADDR,,MODBUSLOCADDR,__ADI_LOCALADDR,,UINT diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc index 0429e58..ac400a2 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWMETERMB.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc index fc4ae09..de80f00 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWRATEUNITS.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc index 16c3bc3..eb638e1 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_FLOWTOTALUNITS.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.ipa b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.ipa new file mode 100644 index 0000000..e69de29 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc new file mode 100644 index 0000000..dd11d12 Binary files /dev/null and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_LINEARSCALE.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.ipa b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.ipa new file mode 100644 index 0000000..e69de29 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc new file mode 100644 index 0000000..4f114b4 Binary files /dev/null and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_PRESSUREANALOG.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc index 9999c64..1eec1fd 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_REVERSEUINT.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.ipa b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.ipa index ed144af..0cd4c07 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.ipa +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.ipa @@ -1,2 +1,3 @@ ,MODBUSTIMER@SOLARPANELMB,TON,IN,__TMPB__TON__IN,BOOL,PT,MODBUSSCANRATE,TIME ,MBS_SOLARPANEL_MSG@SOLARPANELMB,MSG_MODBUS,IN,__TMPB__MSG_MODBUS__IN,BOOL,CANCEL,MBS_CANCEL@SOLARPANELMB,BOOL,LOCALCFG,,MODBUSLOCPARA,TARGETCFG,,MODBUSTARPARA,LOCALADDR,,MODBUSLOCADDR,__ADI_LOCALADDR,,UINT +,MODBUSERRORTIMER@SOLARPANELMB,TON,IN,__TMPB__TON__IN,BOOL,PT,MODBUSERRORDURATION,TIME diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc index 6a2d1b5..177d932 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_SOLARPANELMB.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc index dad40d0..161b975 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WATCHDOG.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc index 0c7188b..54afca4 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDSTOREAL.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc index 30bce15..8cd1c57 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_Pou_WORDTOFLOAT16.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc index 6edfb04..0b032cb 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsComplement.ttc @@ -1,62 +1,66 @@ [BEGIN FB INPUTS] -I1=micro820.micro820.flowmetermb/modbustimer.in,0x2401,BOOL -I2=micro820.micro820.flowmetermb/modbustimer.pt,0x52C,TIME -I3=micro820.micro820.flowmetermb/wait_to_reset_ton.in,0x45C,BOOL -I4=micro820.micro820.flowmetermb/wait_to_reset_ton.pt,0x530,TIME -I5=micro820.micro820.solarpanelmb/modbustimer.in,0x2401,BOOL -I6=micro820.micro820.solarpanelmb/modbustimer.pt,0x52C,TIME -I7=micro820.micro820.flowmetermb/mbs_flowrate_msg.in,0x2402,BOOL -I8=micro820.micro820.flowmetermb/mbs_flowrate_msg.cancel,0x45A,BOOL -I9=micro820.micro820.flowmetermb/mbs_flowrate_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I10=micro820.micro820.flowmetermb/mbs_flowrate_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I11=micro820.micro820.flowmetermb/mbs_flowrate_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I12=micro820.micro820.flowmetermb/mbs_flowrate_msg.__adi_localaddr,0xFFFFFFFF,UINT -I13=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.in,0x2402,BOOL -I14=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.cancel,0x45A,BOOL -I15=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I16=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I17=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I18=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.__adi_localaddr,0xFFFFFFFF,UINT -I19=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.in,0x2402,BOOL -I20=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.cancel,0x45A,BOOL -I21=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I22=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I23=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I24=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.__adi_localaddr,0xFFFFFFFF,UINT -I25=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.in,0x2402,BOOL -I26=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.cancel,0x45A,BOOL -I27=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I28=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I29=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I30=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.__adi_localaddr,0xFFFFFFFF,UINT -I31=micro820.micro820.flowmetermb/mbs_status_msg.in,0x2402,BOOL -I32=micro820.micro820.flowmetermb/mbs_status_msg.cancel,0x45A,BOOL -I33=micro820.micro820.flowmetermb/mbs_status_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I34=micro820.micro820.flowmetermb/mbs_status_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I35=micro820.micro820.flowmetermb/mbs_status_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I36=micro820.micro820.flowmetermb/mbs_status_msg.__adi_localaddr,0xFFFFFFFF,UINT -I37=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.in,0x45B,BOOL -I38=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.cancel,0x45A,BOOL -I39=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I40=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I41=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I42=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.__adi_localaddr,0xFFFFFFFF,UINT -I43=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.in,0x2402,BOOL -I44=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.cancel,0x45A,BOOL -I45=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I46=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I47=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I48=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.__adi_localaddr,0xFFFFFFFF,UINT -I49=micro820.micro820.flowmetermb/mbs_units_msg.in,0x2402,BOOL -I50=micro820.micro820.flowmetermb/mbs_units_msg.cancel,0x45A,BOOL -I51=micro820.micro820.flowmetermb/mbs_units_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I52=micro820.micro820.flowmetermb/mbs_units_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I53=micro820.micro820.flowmetermb/mbs_units_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I54=micro820.micro820.flowmetermb/mbs_units_msg.__adi_localaddr,0xFFFFFFFF,UINT -I55=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.in,0x2402,BOOL -I56=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.cancel,0x45D,BOOL -I57=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA -I58=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA -I59=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR -I60=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.__adi_localaddr,0xFFFFFFFF,UINT +I1=micro820.micro820.flowmetermb/modbustimer.in,0x2465,BOOL +I2=micro820.micro820.flowmetermb/modbustimer.pt,0x55C,TIME +I3=micro820.micro820.flowmetermb/modbuserrortimer.in,0x2465,BOOL +I4=micro820.micro820.flowmetermb/modbuserrortimer.pt,0x560,TIME +I5=micro820.micro820.flowmetermb/wait_to_reset_ton.in,0x464,BOOL +I6=micro820.micro820.flowmetermb/wait_to_reset_ton.pt,0x564,TIME +I7=micro820.micro820.solarpanelmb/modbustimer.in,0x2465,BOOL +I8=micro820.micro820.solarpanelmb/modbustimer.pt,0x55C,TIME +I9=micro820.micro820.solarpanelmb/modbuserrortimer.in,0x2465,BOOL +I10=micro820.micro820.solarpanelmb/modbuserrortimer.pt,0x560,TIME +I11=micro820.micro820.flowmetermb/mbs_flowrate_msg.in,0x2466,BOOL +I12=micro820.micro820.flowmetermb/mbs_flowrate_msg.cancel,0x462,BOOL +I13=micro820.micro820.flowmetermb/mbs_flowrate_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I14=micro820.micro820.flowmetermb/mbs_flowrate_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I15=micro820.micro820.flowmetermb/mbs_flowrate_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I16=micro820.micro820.flowmetermb/mbs_flowrate_msg.__adi_localaddr,0xFFFFFFFF,UINT +I17=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.in,0x2466,BOOL +I18=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.cancel,0x462,BOOL +I19=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I20=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I21=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I22=micro820.micro820.flowmetermb/mbs_flowtotalizera_msg.__adi_localaddr,0xFFFFFFFF,UINT +I23=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.in,0x2466,BOOL +I24=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.cancel,0x462,BOOL +I25=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I26=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I27=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I28=micro820.micro820.flowmetermb/mbs_flowtotalizerb_msg.__adi_localaddr,0xFFFFFFFF,UINT +I29=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.in,0x2466,BOOL +I30=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.cancel,0x462,BOOL +I31=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I32=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I33=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I34=micro820.micro820.flowmetermb/mbs_flowtotalizerc_msg.__adi_localaddr,0xFFFFFFFF,UINT +I35=micro820.micro820.flowmetermb/mbs_status_msg.in,0x2466,BOOL +I36=micro820.micro820.flowmetermb/mbs_status_msg.cancel,0x462,BOOL +I37=micro820.micro820.flowmetermb/mbs_status_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I38=micro820.micro820.flowmetermb/mbs_status_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I39=micro820.micro820.flowmetermb/mbs_status_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I40=micro820.micro820.flowmetermb/mbs_status_msg.__adi_localaddr,0xFFFFFFFF,UINT +I41=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.in,0x463,BOOL +I42=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.cancel,0x462,BOOL +I43=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I44=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I45=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I46=micro820.micro820.flowmetermb/mbs_resettotalizer_msg.__adi_localaddr,0xFFFFFFFF,UINT +I47=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.in,0x2466,BOOL +I48=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.cancel,0x462,BOOL +I49=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I50=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I51=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I52=micro820.micro820.flowmetermb/mbs_clearresettotalizer_msg.__adi_localaddr,0xFFFFFFFF,UINT +I53=micro820.micro820.flowmetermb/mbs_units_msg.in,0x2466,BOOL +I54=micro820.micro820.flowmetermb/mbs_units_msg.cancel,0x462,BOOL +I55=micro820.micro820.flowmetermb/mbs_units_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I56=micro820.micro820.flowmetermb/mbs_units_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I57=micro820.micro820.flowmetermb/mbs_units_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I58=micro820.micro820.flowmetermb/mbs_units_msg.__adi_localaddr,0xFFFFFFFF,UINT +I59=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.in,0x2466,BOOL +I60=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.cancel,0x465,BOOL +I61=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.localcfg,0xFFFFFFFF,MODBUSLOCPARA +I62=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.targetcfg,0xFFFFFFFF,MODBUSTARPARA +I63=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.localaddr,0xFFFFFFFF,MODBUSLOCADDR +I64=micro820.micro820.solarpanelmb/mbs_solarpanel_msg.__adi_localaddr,0xFFFFFFFF,UINT [END] diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc index 9469a5b..01ef0e3 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.d.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc index 9469a5b..01ef0e3 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.s.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc index 9469a5b..01ef0e3 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsDebug.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc index 9c4b8fd..573452f 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.s.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc index 9c4b8fd..573452f 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MICRO820_SymbolsTarget.xtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.s.txt b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.s.txt index 8440965..276c213 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.s.txt +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.s.txt @@ -1,12 +1,15 @@ [__DEFIO_CPXDVC] -Nb = 1 +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 = 4 +Nb = 6 NotMDF = 0, 0, 1, AB_, OPTIMUS_, digitOut_Base MDF = -1 RIdx = 0, 0 @@ -19,6 +22,12 @@ 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] @@ -54,6 +63,12 @@ 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] diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.txt b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.txt index 8440965..276c213 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.txt +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/MdfConf.txt @@ -1,12 +1,15 @@ [__DEFIO_CPXDVC] -Nb = 1 +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 = 4 +Nb = 6 NotMDF = 0, 0, 1, AB_, OPTIMUS_, digitOut_Base MDF = -1 RIdx = 0, 0 @@ -19,6 +22,12 @@ 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] @@ -54,6 +63,12 @@ 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] diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.dop b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.dop new file mode 100644 index 0000000..b7c2c42 --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.dop @@ -0,0 +1 @@ +PRESSUREANALOG(155):F,LINEARSCALE(156); \ No newline at end of file diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.ic b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.ic new file mode 100644 index 0000000..911f999 --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.ic @@ -0,0 +1,16 @@ +_PUSH_PAR _IO_P1_AI_00 +__TMPR5 := _CALL ANY_TO_UINT +_PUSH_PAR __TMPR1 +_PUSH_PAR __TMPR2 +_PUSH_PAR __TMPR3 +_PUSH_PAR __TMPR4 +_PUSH_PAR __TMPR5 +__TMPR6 := _CALL LINEARSCALE +VAL_AI00_UA := __TMPR6 +_PUSH_PAR __TMPR3 +_PUSH_PAR __TMPR4 +_PUSH_PAR __TMPR7 +_PUSH_PAR __TMPR8 +_PUSH_PAR VAL_AI00_UA +__TMPR5 := _CALL LINEARSCALE +VAL_PRESSUREREADING := __TMPR5 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.rtc new file mode 100644 index 0000000..76366cb Binary files /dev/null and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PRESSUREANALOG.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PressureAnalog.AcfMlge b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PressureAnalog.AcfMlge new file mode 100644 index 0000000..6c09cd5 --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PressureAnalog.AcfMlge @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PressureAnalog.stf b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PressureAnalog.stf new file mode 100644 index 0000000..f5ee6ab --- /dev/null +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/PressureAnalog.stf @@ -0,0 +1,4 @@ +PROGRAM PressureAnalog +val_AI00_uA := LinearScale(13107.0, 65535.0, 4000.0, 20000.0, ANY_TO_REAL(_IO_P1_AI_00)); +val_PressureReading := LinearScale(4000.0, 20000.0, 0.0, 600.0, val_AI00_uA); +END_PROGRAM \ No newline at end of file diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/REVERSEUINT.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/REVERSEUINT.rtc index 7a2cca3..9d31736 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/REVERSEUINT.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/REVERSEUINT.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.ic b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.ic index 362074a..ff86f91 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.ic +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.ic @@ -58,12 +58,16 @@ __TMPI1 := __TMPI1 * __CDINT00000002 __TMPUIN1 := MBS_SOLARPANEL_DATA [ __TMPI1 ] _PUSH_PAR __TMPUIN1 __TMPR1 := _CALL WORDTOFLOAT16 +__TMPR1 := __TMPR1 * __TMPR2 +__TMPR1 := __TMPR1 + __TMPR3 VAL_SOLARBATTERYTEMPERATURE := __TMPR1 __TMPI1 := __CDINT0000001D - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000002 __TMPUIN1 := MBS_SOLARPANEL_DATA [ __TMPI1 ] _PUSH_PAR __TMPUIN1 __TMPR1 := _CALL WORDTOFLOAT16 +__TMPR1 := __TMPR1 * __TMPR2 +__TMPR1 := __TMPR1 + __TMPR3 VAL_SOLARAMBIENTTEMPERATURE := __TMPR1 __TMPI1 := __CDINT00000022 - __CDINT00000001 __TMPI1 := __TMPI1 * __CDINT00000002 @@ -81,6 +85,9 @@ _GOTO __LAB2 __LAB1 : __LAB2 : __TMPB1 := MBS_SOLARPANEL_MSG [ __CDINT0000000D ] +__TMPB__TON__IN := __TMPB1 +__FBL_RET := _PUSHCALLFB TON MODBUSERRORTIMER +__TMPB1 := MODBUSERRORTIMER [ __CDINT00000004 ] STS_SOLARMODBUSERROR := __TMPB1 __TMPB1 := TEMP_CHARGESTATE = __UINT_NULL _IF _NOT __TMPB1 _GOTO __LAB3 diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.rtc index fcddf6b..b1d6c21 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SOLARPANELMB.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SolarPanelMb.stf b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SolarPanelMb.stf index 9f67791..ba52102 100644 --- a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SolarPanelMb.stf +++ b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/SolarPanelMb.stf @@ -19,13 +19,14 @@ IF mbs_SolarPanel_MSG.Q THEN val_SolarArrayVoltage := WordToFloat16(mbs_SolarPanel_Data[20]); val_SolarLoadVoltage := WordToFloat16(mbs_SolarPanel_Data[21]); val_SolarLoadCurrent := WordToFloat16(mbs_SolarPanel_Data[23]); - val_SolarBatteryTemperature := WordToFloat16(mbs_SolarPanel_Data[28]); - val_SolarAmbientTemperature := WordToFloat16(mbs_SolarPanel_Data[29]); + val_SolarBatteryTemperature := WordToFloat16(mbs_SolarPanel_Data[28]) * 1.8 + 32.0; + val_SolarAmbientTemperature := WordToFloat16(mbs_SolarPanel_Data[29]) * 1.8 + 32.0; temp_ChargeState := ANY_TO_UINT(mbs_SolarPanel_Data[34]); temp_ArrayFault := ANY_TO_UINT(mbs_SolarPanel_Data[35]); END_IF; -sts_SolarModbusError := mbs_SolarPanel_MSG.Error; +ModbusErrorTimer(mbs_SolarPanel_MSG.Error, ModbusErrorDuration); +sts_SolarModbusError := ModbusErrorTimer.Q; (* Map Charge State *) IF temp_ChargeState = 0 THEN diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WATCHDOG.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WATCHDOG.rtc index 4d69976..0e7b953 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WATCHDOG.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WATCHDOG.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDSTOREAL.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDSTOREAL.rtc index 7a604dc..8c190de 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDSTOREAL.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDSTOREAL.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDTOFLOAT16.rtc b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDTOFLOAT16.rtc index 38dd1ff..18c9aa7 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDTOFLOAT16.rtc and b/Pioneer Ghost Meters/Controller/Controller/Micro820/Micro820/WORDTOFLOAT16.rtc differ diff --git a/Pioneer Ghost Meters/Controller/Controller/PrjLibrary.mdb b/Pioneer Ghost Meters/Controller/Controller/PrjLibrary.mdb index 5445f9a..8c47ac5 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/PrjLibrary.mdb and b/Pioneer Ghost Meters/Controller/Controller/PrjLibrary.mdb differ diff --git a/Pioneer Ghost Meters/Controller/Controller/persist.ccwx b/Pioneer Ghost Meters/Controller/Controller/persist.ccwx index 1764ecd..3f971ba 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller/persist.ccwx and b/Pioneer Ghost Meters/Controller/Controller/persist.ccwx differ diff --git a/Pioneer Ghost Meters/Controller/Controller_Backup.zip b/Pioneer Ghost Meters/Controller/Controller_Backup.zip index 3faea47..34a8d57 100644 Binary files a/Pioneer Ghost Meters/Controller/Controller_Backup.zip and b/Pioneer Ghost Meters/Controller/Controller_Backup.zip differ diff --git a/Pioneer Ghost Meters/Controller/Embedded/ExtendedInfo.xml b/Pioneer Ghost Meters/Controller/Embedded/ExtendedInfo.xml index 8e9682d..6a8e143 100644 --- a/Pioneer Ghost Meters/Controller/Embedded/ExtendedInfo.xml +++ b/Pioneer Ghost Meters/Controller/Embedded/ExtendedInfo.xml @@ -1,11 +1,16 @@  + + + + + \ No newline at end of file diff --git a/Pioneer Ghost Meters/Controller/LogicalValues/ExtendedInfo.xml b/Pioneer Ghost Meters/Controller/LogicalValues/ExtendedInfo.xml index 7d5db6d..d369c51 100644 --- a/Pioneer Ghost Meters/Controller/LogicalValues/ExtendedInfo.xml +++ b/Pioneer Ghost Meters/Controller/LogicalValues/ExtendedInfo.xml @@ -2,6 +2,7 @@ + \ No newline at end of file diff --git a/Pioneer Ghost Meters/Controller/MLGE/ExtendedInfo.xml b/Pioneer Ghost Meters/Controller/MLGE/ExtendedInfo.xml index 73d32b4..bb916c1 100644 --- a/Pioneer Ghost Meters/Controller/MLGE/ExtendedInfo.xml +++ b/Pioneer Ghost Meters/Controller/MLGE/ExtendedInfo.xml @@ -18,9 +18,15 @@ FlowRateUnits.AcfMlge + + PressureAnalog.AcfMlge + FlowMeterMb.AcfMlge + + LinearScale.AcfMlge + Watchdog.AcfMlge diff --git a/Pioneer Ghost Meters/PVc Project/PV800_PioneerFracMeter.cha b/Pioneer Ghost Meters/PVc Project/PV800_PioneerFracMeter.cha index bedaecd..45c686d 100644 Binary files a/Pioneer Ghost Meters/PVc Project/PV800_PioneerFracMeter.cha and b/Pioneer Ghost Meters/PVc Project/PV800_PioneerFracMeter.cha differ diff --git a/Pioneer Ghost Meters/Pioneer Ghost Meters.v12.ccwsuo b/Pioneer Ghost Meters/Pioneer Ghost Meters.v12.ccwsuo index 5b3ed6a..bda207d 100644 Binary files a/Pioneer Ghost Meters/Pioneer Ghost Meters.v12.ccwsuo and b/Pioneer Ghost Meters/Pioneer Ghost Meters.v12.ccwsuo differ diff --git a/README.md b/README.md index 404b39c..0e1e472 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ All devices need to be configured with the following Modbus Parameters: -- Baud Rate: 19200 -- Parity: Even -- Stop Bits: 1 +- Baud Rate: 9600 +- Parity: None +- Stop Bits: 2 ### Modbus Addresses