diff --git a/frmMain.frm b/frmMain.frm index ca6ab25..a3d6353 100644 --- a/frmMain.frm +++ b/frmMain.frm @@ -135,49 +135,49 @@ Begin VB.Form frmMain TabCaption(0) = "Basis Test" TabPicture(0) = "frmMain.frx":08CA Tab(0).ControlEnabled= 0 'False - Tab(0).Control(0)= "BasicIOTimer" - Tab(0).Control(1)= "Frame34" - Tab(0).Control(2)= "Frame33" - Tab(0).Control(3)= "Frame32" - Tab(0).Control(4)= "Frame31" + Tab(0).Control(0)= "Frame30" + Tab(0).Control(1)= "Frame28" + Tab(0).Control(2)= "ImageList" + Tab(0).Control(3)= "BasicTimeOutTimer" + Tab(0).Control(4)= "BasicRunTimer" Tab(0).Control(5)= "Frame29" - Tab(0).Control(6)= "BasicRunTimer" - Tab(0).Control(7)= "BasicTimeOutTimer" - Tab(0).Control(8)= "ImageList" - Tab(0).Control(9)= "Frame28" - Tab(0).Control(10)= "Frame30" + Tab(0).Control(6)= "Frame31" + Tab(0).Control(7)= "Frame32" + Tab(0).Control(8)= "Frame33" + Tab(0).Control(9)= "Frame34" + Tab(0).Control(10)= "BasicIOTimer" Tab(0).ControlCount= 11 TabCaption(1) = "I/O Test" TabPicture(1) = "frmMain.frx":08E6 Tab(1).ControlEnabled= 0 'False - Tab(1).Control(0)= "TxSocket" - Tab(1).Control(1)= "RxSocket" - Tab(1).Control(2)= "TestFrame(7)" - Tab(1).Control(3)= "TestFrame(6)" - Tab(1).Control(4)= "TestFrame(3)" - Tab(1).Control(5)= "TestFrame(11)" - Tab(1).Control(6)= "TestFrame(8)" - Tab(1).Control(7)= "TestFrame(10)" - Tab(1).Control(8)= "TestFrame(9)" - Tab(1).Control(9)= "TestFrame(4)" - Tab(1).Control(10)= "TestFrame(5)" - Tab(1).Control(11)= "TestFrame(1)" - Tab(1).Control(12)= "TestFrame(2)" - Tab(1).Control(13)= "TestFrame(0)" + Tab(1).Control(0)= "TestFrame(0)" + Tab(1).Control(1)= "TestFrame(2)" + Tab(1).Control(2)= "TestFrame(1)" + Tab(1).Control(3)= "TestFrame(5)" + Tab(1).Control(4)= "TestFrame(4)" + Tab(1).Control(5)= "TestFrame(9)" + Tab(1).Control(6)= "TestFrame(10)" + Tab(1).Control(7)= "TestFrame(8)" + Tab(1).Control(8)= "TestFrame(11)" + Tab(1).Control(9)= "TestFrame(3)" + Tab(1).Control(10)= "TestFrame(6)" + Tab(1).Control(11)= "TestFrame(7)" + Tab(1).Control(12)= "RxSocket" + Tab(1).Control(13)= "TxSocket" Tab(1).ControlCount= 14 TabCaption(2) = "PA Test" TabPicture(2) = "frmMain.frx":0902 Tab(2).ControlEnabled= 0 'False - Tab(2).Control(0)= "TestFrame(20)" - Tab(2).Control(1)= "TestFrame(19)" - Tab(2).Control(2)= "TestFrame(18)" - Tab(2).Control(3)= "TestFrame(17)" - Tab(2).Control(4)= "TestFrame(16)" - Tab(2).Control(5)= "TestFrame(12)" - Tab(2).Control(6)= "TestFrame(14)" - Tab(2).Control(7)= "TestFrame(15)" - Tab(2).Control(8)= "TestFrame(13)" - Tab(2).Control(9)= "Frame40" + Tab(2).Control(0)= "Frame40" + Tab(2).Control(1)= "TestFrame(13)" + Tab(2).Control(2)= "TestFrame(15)" + Tab(2).Control(3)= "TestFrame(14)" + Tab(2).Control(4)= "TestFrame(12)" + Tab(2).Control(5)= "TestFrame(16)" + Tab(2).Control(6)= "TestFrame(17)" + Tab(2).Control(7)= "TestFrame(18)" + Tab(2).Control(8)= "TestFrame(19)" + Tab(2).Control(9)= "TestFrame(20)" Tab(2).ControlCount= 10 TabCaption(3) = "-" TabPicture(3) = "frmMain.frx":091E @@ -195,44 +195,44 @@ Begin VB.Form frmMain TabCaption(6) = "Flash / EEPROM" TabPicture(6) = "frmMain.frx":0972 Tab(6).ControlEnabled= 0 'False - Tab(6).Control(0)= "Frame35" - Tab(6).Control(1)= "Frame25" + Tab(6).Control(0)= "IOBoxTypeSelection" + Tab(6).Control(1)= "Frame5" Tab(6).Control(2)= "Frame6" - Tab(6).Control(3)= "Frame5" - Tab(6).Control(4)= "IOBoxTypeSelection" + Tab(6).Control(3)= "Frame25" + Tab(6).Control(4)= "Frame35" Tab(6).ControlCount= 5 TabCaption(7) = "Config H0501" TabPicture(7) = "frmMain.frx":098E Tab(7).ControlEnabled= 0 'False - Tab(7).Control(0)= "Frame3" - Tab(7).Control(1)= "Frame4" - Tab(7).Control(2)= "Frame7" - Tab(7).Control(3)= "frmDeur" - Tab(7).Control(4)= "frmVerlichting" - Tab(7).Control(5)= "frmOverig" + Tab(7).Control(0)= "frmOverig" + Tab(7).Control(1)= "frmVerlichting" + Tab(7).Control(2)= "frmDeur" + Tab(7).Control(3)= "Frame7" + Tab(7).Control(4)= "Frame4" + Tab(7).Control(5)= "Frame3" Tab(7).ControlCount= 6 TabCaption(8) = "Config H0502" TabPicture(8) = "frmMain.frx":09AA Tab(8).ControlEnabled= 0 'False - Tab(8).Control(0)= "Frame10" + Tab(8).Control(0)= "H0502Frame2" Tab(8).Control(1)= "H0502Frame1" - Tab(8).Control(2)= "H0502Frame2" + Tab(8).Control(2)= "Frame10" Tab(8).ControlCount= 3 TabCaption(9) = "Config H0503" TabPicture(9) = "frmMain.frx":09C6 Tab(9).ControlEnabled= 0 'False - Tab(9).Control(0)= "Frame20" - Tab(9).Control(1)= "H0503Frame2" - Tab(9).Control(2)= "H0503Frame1" - Tab(9).Control(3)= "Frame11" + Tab(9).Control(0)= "Frame11" + Tab(9).Control(1)= "H0503Frame1" + Tab(9).Control(2)= "H0503Frame2" + Tab(9).Control(3)= "Frame20" Tab(9).ControlCount= 4 TabCaption(10) = "Config H0504" TabPicture(10) = "frmMain.frx":09E2 Tab(10).ControlEnabled= 0 'False - Tab(10).Control(0)= "Frame15" - Tab(10).Control(1)= "H0504Frametig" - Tab(10).Control(2)= "H0504Frame1" - Tab(10).Control(3)= "H0504Frame2" + Tab(10).Control(0)= "H0504Frame2" + Tab(10).Control(1)= "H0504Frame1" + Tab(10).Control(2)= "H0504Frametig" + Tab(10).Control(3)= "Frame15" Tab(10).ControlCount= 4 TabCaption(11) = "Config H0408" TabPicture(11) = "frmMain.frx":09FE @@ -257,12 +257,12 @@ Begin VB.Form frmMain TabCaption(13) = "Chat" TabPicture(13) = "frmMain.frx":0A36 Tab(13).ControlEnabled= 0 'False - Tab(13).Control(0)= "txtChatIn" + Tab(13).Control(0)= "Label7" Tab(13).Control(1)= "txtChatMain" - Tab(13).Control(2)= "Label7" + Tab(13).Control(2)= "txtChatIn" Tab(13).ControlCount= 3 - Begin SocketWrenchCtrl.Socket RxSocket - Left = -63840 + Begin SocketWrenchCtrl.Socket TxSocket + Left = -63360 Top = 8160 _Version = 65536 _ExtentX = 741 @@ -270,7 +270,7 @@ Begin VB.Form frmMain _StockProps = 0 AutoResolve = -1 'True Backlog = 5 - Binary = -1 'True + Binary = 0 'False Blocking = -1 'True Broadcast = 0 'False BufferSize = 0 @@ -293,8 +293,8 @@ Begin VB.Form frmMain Type = 1 Urgent = 0 'False End - Begin SocketWrenchCtrl.Socket TxSocket - Left = -63360 + Begin SocketWrenchCtrl.Socket RxSocket + Left = -63840 Top = 8160 _Version = 65536 _ExtentX = 741 @@ -302,7 +302,7 @@ Begin VB.Form frmMain _StockProps = 0 AutoResolve = -1 'True Backlog = 5 - Binary = 0 'False + Binary = -1 'True Blocking = -1 'True Broadcast = 0 'False BufferSize = 0 @@ -14421,6 +14421,16 @@ Begin VB.Form frmMain TabIndex = 1716 Top = 3000 Width = 3855 + Begin VB.CheckBox H0408chkSpeedGate + Caption = "Speedgate" + Height = 255 + Index = 0 + Left = 2160 + TabIndex = 1757 + ToolTipText = "0x00E" + Top = 1080 + Width = 1455 + End Begin VB.VScrollBar H0408StopVertragingstijdScroll Height = 255 LargeChange = 5 @@ -22368,6 +22378,7 @@ Private Sub H0408ToEeprom_Click() EE(&HB) = DecToEE(H0408cmbType(4).ListIndex) 'Open Bij Brand EE(&HC) = DecToEE(H0408chkAlarmUseStop(0).Value) 'gebruik stop bij alarm open EE(&HD) = DecToEE(H0408StopVertragingstijdScroll.Value) 'vertraging na stop + EE(&HE) = DecToEE(H0408chkSpeedGate(0).Value) 'Gebruik speedgate routines EE(&H16) = DecToEE(H0408vScroll(1).Value) 'SluitStand Timer EE(&H17) = DecToEE(H0408vScroll(4).Value) 'Puls Tijd @@ -24103,19 +24114,27 @@ Sub DecodeDataFromFile() H0408StopVertragingstijdScroll.Value = EEToDec(EE(&HD)) 'Stop delay time 'Invert sluiten - If EE(&HA) = "00" Or EE(&HB) = "FF" Then + If EE(&HA) = "00" Or EE(&HA) = "FF" Then H0408chkInvertClose(0).Value = 0 Else H0408chkInvertClose(0).Value = 1 End If 'Gebruik stop bij alarm open - If EE(&HC) = "00" Or EE(&HB) = "FF" Then + If EE(&HC) = "00" Or EE(&HC) = "FF" Then H0408chkAlarmUseStop(0).Value = 0 Else H0408chkAlarmUseStop(0).Value = 1 End If + 'Gebruik speedgate routines + If EE(&HE) = "00" Or EE(&HE) = "FF" Then + H0408chkSpeedGate(0).Value = 0 + Else + H0408chkSpeedGate(0).Value = 1 + End If + + If EE(&H4) = "FF" Then 'Uitbredings PCB H0408cmbType(3).ListIndex = 0 Else