Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add conf x avviare OSAI

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-11-19 18:33:07 +01:00
parent f7326a6936
commit 0759cbcda9
7 changed files with 150 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CncLib/CNC/CNC.Runtime.vb
+6 -3
View File
@@ -1,7 +1,7 @@
Namespace CNC
Public Class Runtime
Public Shared NC As CncLib.CNC.CNC
Public Class Runtime
Public Shared NC As CncLib.CNC.CNC
Public Shared Sub CreateNC(tipoNC As CNC.NcType, ipTarget As String, ipPort As String)
@@ -25,9 +25,12 @@
NC = New FANUC(0, ipFanuc, portIpFanuc, CncScreenHssb)
Case NC_OSAI
'If Config.Settings.Settings.OsaiCommType = 1 Then 'SOAP
NC = New OSAI_OPEN(ipTarget)
Case NC_OSAI_cndex
NC = New OSAI(ipTarget)
Case NC_SIEMENS
'Try
' NC = New SIEMENS
CncLib/CNC/CNC/CNC.CNC.vb
+1
View File
@@ -16,6 +16,7 @@ Namespace CNC
FANUC = 1
OSAI = 2
SIEMENS = 3
OSAI_cndex = 4
End Enum
Public Enum Memo
CncLib/Modules/General.vb
+66 -65
View File
@@ -1,83 +1,84 @@
Module General
Public Const MASK_BIT0 = &H1&
Public Const MASK_BIT1 = &H2&
Public Const MASK_BIT2 = &H4&
Public Const MASK_BIT3 = &H8&
Public Const MASK_BIT4 = &H10&
Public Const MASK_BIT5 = &H20&
Public Const MASK_BIT6 = &H40&
Public Const MASK_BIT7 = &H80&
Public Const MASK_BIT8 = &H100&
Public Const MASK_BIT9 = &H200&
Public Const MASK_BIT10 = &H400&
Public Const MASK_BIT11 = &H800&
Public Const MASK_BIT12 = &H1000&
Public Const MASK_BIT13 = &H2000&
Public Const MASK_BIT14 = &H4000&
Public Const MASK_BIT15 = &H8000&
Public Const MASK_BIT0 = &H1&
Public Const MASK_BIT1 = &H2&
Public Const MASK_BIT2 = &H4&
Public Const MASK_BIT3 = &H8&
Public Const MASK_BIT4 = &H10&
Public Const MASK_BIT5 = &H20&
Public Const MASK_BIT6 = &H40&
Public Const MASK_BIT7 = &H80&
Public Const MASK_BIT8 = &H100&
Public Const MASK_BIT9 = &H200&
Public Const MASK_BIT10 = &H400&
Public Const MASK_BIT11 = &H800&
Public Const MASK_BIT12 = &H1000&
Public Const MASK_BIT13 = &H2000&
Public Const MASK_BIT14 = &H4000&
Public Const MASK_BIT15 = &H8000&
Public Const LOW_ORDER = 0
Public Const HIGH_ORDER = 1
Public Const LOW_ORDER = 0
Public Const HIGH_ORDER = 1
'Costanti globali
Public Const NC_DEMO = 0
Public Const NC_FANUC = 1
Public Const NC_OSAI = 2
Public Const NC_SIEMENS = 3
'Costanti globali
Public Const NC_DEMO = 0
Public Const NC_FANUC = 1
Public Const NC_OSAI = 2
Public Const NC_SIEMENS = 3
Public Const NC_OSAI_cndex = 4
Public Const HSSB_DEFAULT_NODE = 0
Public Const HSSB_DEFAULT_NODE = 0
Public Const MEM_BOOL = 1
Public Const MEM_BYTE = 2
Public Const MEM_WORD = 3
Public Const MEM_INT = 4
Public Const MEM_DWORD = 5
Public Const MEM_DINT = 6
Public Const MEM_SINGLE = 7
Public Const MEM_DOUBLE = 8
Public Const MEM_BOOL = 1
Public Const MEM_BYTE = 2
Public Const MEM_WORD = 3
Public Const MEM_INT = 4
Public Const MEM_DWORD = 5
Public Const MEM_DINT = 6
Public Const MEM_SINGLE = 7
Public Const MEM_DOUBLE = 8
Public Const MEM_F_R = 5
Public Const MEM_F_D = 9
Public Const MEM_F_R = 5
Public Const MEM_F_D = 9
Public Const MEM_S_DB = 0
Public Const MEM_S_M = -1
Public Const MEM_S_R = -2
Public Const MEM_S_E = -3
Public Const MEM_S_A = -4
Public Const MEM_S_DB = 0
Public Const MEM_S_M = -1
Public Const MEM_S_R = -2
Public Const MEM_S_E = -3
Public Const MEM_S_A = -4
'Variabili globali
'Public nDebug As Integer
'Public szLanguage As String
'Public nTypeNC As Integer
'Variabili globali
'Public nDebug As Integer
'Public szLanguage As String
'Public nTypeNC As Integer
'Fanuc
'Public bHssb As Boolean
Public Hssb_node As Long
'Public szIpFanuc As String
'Public nPortIpFanuc As Integer
''Public nReturn As Integer
'Public bSerie30 As Boolean
'Public bMultiProcess As Boolean
'Fanuc
'Public bHssb As Boolean
Public Hssb_node As Long
'Public szIpFanuc As String
'Public nPortIpFanuc As Integer
''Public nReturn As Integer
'Public bSerie30 As Boolean
'Public bMultiProcess As Boolean
'Osai
'Public szNcName As String 'Nome del CN in rete
'Osai
'Public szNcName As String 'Nome del CN in rete
Public nTop As Integer
Public nLeft As Integer
Public nHeight As Integer
Public nWidth As Integer
Public nTop As Integer
Public nLeft As Integer
Public nHeight As Integer
Public nWidth As Integer
''' <summary>
''' Sostituisce il carattere | con un carattere speciale di ritorno a capo
''' </summary>
Public Function ReplaceNewLine(ByVal strWord As String) As String
Dim strModifiedWord As String = strWord
''' <summary>
''' Sostituisce il carattere | con un carattere speciale di ritorno a capo
''' </summary>
Public Function ReplaceNewLine(ByVal strWord As String) As String
Dim strModifiedWord As String = strWord
strModifiedWord = strModifiedWord.Replace("|", vbNewLine)
strModifiedWord = strModifiedWord.Replace("|", vbNewLine)
Return strModifiedWord
End Function
Return strModifiedWord
End Function
End Module
IOB-WIN/DATA/CONF/MAIN.ini
+8 -2
View File
@@ -10,8 +10,14 @@ MPURL=/MP/IO
CMDREBO=/IOB/sendRebootGateway?GWIP=
CMDIOB2CALL=/IOB/getIob2call?GWIP=
[IOB]
STARTLIST=4000
[IOB]
; OSAI
STARTLIST=OSAI
; KAWASAKI
;STARTLIST=4000
; SIEMENS TORRI
;STARTLIST=3013
MAXCNC=4
;STARTLIST=3001,3002,3003,3004,3005
IOB-WIN/DATA/CONF/OSAI.ini
+57
View File
@@ -0,0 +1,57 @@
;Configurazione IOB-WIN
[IOB]
CNCTYPE=KAWASAKI
[MACHINE]
VENDOR=KAWASAKI
MODEL=E-CONTROLLER
[CNC]
; TEST OSAI su VirtSAM
IP=192.168.157.2
;PORT=8193
[SERVER]
MPIP=SRV-MAPO
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
CMDALIVE=/IOB
CMDENABLED=/IOB/enabled/
CMDADV1=?valore=
CMDREBO=/sendReboot.aspx?idxMacchina=
[MEMORY]
BITRED=Y8.4
BITYELLOW=Y8.5
BITGREEN=Y8.6
AREAD_START=0
AREAD_SIZE=9999
AREAY_START=0
AREAY_SIZE=64
[BLINK]
;MAX_COUNTER_BLINK = 30
MAX_COUNTER_BLINK = 15
;bit0 = 0
;bit1 = 0
;bit2 = 1
;bit3 = 1
;bit4 = 1
;bit5 = 0
;bit6 = 0
;bit7 = 0
BLINK_FILT=0
;BLINK_FILT=28
[OPTPAR]
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
; attenzione memoria sempre base BYTE (1604 DW --> 6416...)
PZCOUNT_MODE=BIT
PZ_CAD_MADDR=1602
PZ_REQ_MADDR=1603
PZ_DONE_MADDR=1604
PZ_GTOT_MADDR=1605
[BRANCH]
NAME=master
IOB-WIN/IOB-WIN.csproj
+3
View File
@@ -205,6 +205,9 @@
<None Include="DATA\CONF\3012.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\OSAI.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\LVF_545.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
IOB-WIN/IobOSAI.cs
+9 -3
View File
@@ -343,10 +343,10 @@ namespace IOB_WIN
// Creo oggetto connessione NC
parentForm.commPlcActive = true;
Runtime.CreateNC(CNC.NcType.FANUC, IOBConf.cncIpAddr, IOBConf.cncPort);
Runtime.CreateNC(CNC.NcType.OSAI, IOBConf.cncIpAddr, IOBConf.cncPort);
parentForm.commPlcActive = false;
// aggiungo referenza obj FANUC
// aggiungo referenza obj OSAI
OSAI_ref = (OSAI)Runtime.NC;
if (utils.CRB("verbose"))
{
@@ -362,6 +362,12 @@ namespace IOB_WIN
tryDisconnect();
lgInfo("OSAI: tryConnect");
tryConnect();
// provo a leggere la GetNcInfo
CncLib.OPENcontrol.GETINFO1DATA outData = new CncLib.OPENcontrol.GETINFO1DATA();
bool fatto = OSAI_ref.O_GetNcInfo1(ref outData);
if (utils.CRB("enableContapezzi"))
{
lgInfo("OSAI: inizio gestione contapezzi");
@@ -746,7 +752,7 @@ namespace IOB_WIN
B_input += 1 << i;
}
}
}
}
}
}
// log opzionale!