Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Nck Changes and BugFixes to master #96

Merged
merged 38 commits into from
Apr 19, 2018
Merged

Merge Nck Changes and BugFixes to master #96

merged 38 commits into from
Apr 19, 2018

Commits on Jun 30, 2016

  1. Merge remote-tracking branch 'refs/remotes/dotnetprojects/master'

    @Nick135
    Nick135 committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    31c53f0 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2016

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into dotnet… 

    …projects/master
    @Nick135
    Nick135 committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    9425dba View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/dotnetprojects/master'

    @Nick135
    Nick135 committed Jul 16, 2016
    Configuration menu
    Copy the full SHA
    f9b3c70 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2016

  1. Merge remote-tracking branch 'refs/remotes/dotnetprojects/master'

    @Nick135
    Nick135 committed Aug 10, 2016
    Configuration menu
    Copy the full SHA
    6bbc819 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2016

  1. Merge remote-tracking branch 'refs/remotes/dotnetprojects/master'

    @Nick135
    Nick135 committed Sep 13, 2016
    Configuration menu
    Copy the full SHA
    44c2b6f View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2016

  1. Merge remote-tracking branch 'refs/remotes/origin/master' into dotnet… 

    …projects/master
    @Nick135
    Nick135 committed Oct 20, 2016
    Configuration menu
    Copy the full SHA
    fc96c8e View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2016

  1. Merge remote-tracking branch 'refs/remotes/origin/master'

    @Nick135
    Nick135 committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    f6b707b View commit details
    Browse the repository at this point in the history

  2. public string UploadFromNC(string fullFileName, bool F_XFER = true) 

    Optionale Angabe ob der PI-Dienst "F_XFER" ausgeführt werden soll.
Default ist "True", womit die Änderung abwärtskompatibel ist
    @Nick135
    Nick135 committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    394ad8d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/pr/1' 

    # Conflicts:
#	compiled/DotNetSiemensPLCToolBoxLibrary.dll
#	compiled/JFK-ProtokollerConfigurationTool.exe
#	compiled/JFK-ProtokollerLibrary.dll
#	compiled/JFK-ProtokollerService.exe
#	compiled/Kopplungstester.exe
#	compiled/ToolboxForSiemensPLCs.exe
#	compiled/WPFToolboxForSiemensPLCs.exe
#	compiled/WPFVarTab.exe
#	compiled/en/DotNetSiemensPLCToolBoxLibrary.resources.dll
#	compiled/es/DotNetSiemensPLCToolBoxLibrary.resources.dll
    @Nick135
    Nick135 committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    3b69834 View commit details
    Browse the repository at this point in the history

  4. dlls aktualisiert

    @Nick135
    Nick135 committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    18a2e9b View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'refs/remotes/origin/master' into dotnet… 

    …projects/master
    @Nick135
    Nick135 committed Oct 22, 2016
    Configuration menu
    Copy the full SHA
    8630ed9 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2016

  1. String in NCK immer als CharArray 

    Bis auf weiteres soll jeder String in der NCK als CharArray gelesen
werden!
    @Nick135
    Nick135 committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    50fdc4c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2016

  1. Added Toolreader, Bugfix NCKTag

    @metathron
    metathron committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    5674712 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/master' into pr/2 

    # Conflicts:
#	.gitignore
    @Nick135
    Nick135 committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    0af491a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refs/heads/pr/2'

    @Nick135
    Nick135 committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    57486ba View commit details
    Browse the repository at this point in the history

  4. Added Workpiececount to Toolread example

    @metathron
    metathron committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    19a630e View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2016

  1. Compare and Fix last pull request

    @Nick135
    Nick135 committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    0f8a055 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/pr/3' 

    # Conflicts:
#	.gitignore
#	compiled/DotNetSiemensPLCToolBoxLibrary.dll
#	compiled/JFK-ProtokollerConfigurationTool.exe
#	compiled/JFK-ProtokollerLibrary.dll
#	compiled/JFK-ProtokollerService.exe
#	compiled/Kopplungstester.exe
#	compiled/ToolboxForSiemensPLCs.exe
#	compiled/WPFToolboxForSiemensPLCs.exe
#	compiled/WPFVarTab.exe
#	compiled/en/DotNetSiemensPLCToolBoxLibrary.resources.dll
#	compiled/es/DotNetSiemensPLCToolBoxLibrary.resources.dll
    @Nick135
    Nick135 committed Dec 8, 2016
    Configuration menu
    Copy the full SHA
    90761df View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2016

  1. BugFix for CharArray by NCK v2.6 + 

    - BugFix for CharArray by NCK v2.6
- Add:
BinaryUploadFromNC
ReadValue(NC_Var address)
    @Nick135
    Nick135 committed Dec 15, 2016
    Configuration menu
    Copy the full SHA
    953482c View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2017

  1. Merge branch 'refs/heads/pr/4' 

    # Conflicts:
#	DotNetSiemensPLCToolBoxLibrary.sln
#	LibNoDaveConnectionLibrary/Communication/PLCConnection.cs
#	compiled/DotNetSiemensPLCToolBoxLibrary.dll
#	compiled/JFK-ProtokollerConfigurationTool.exe
#	compiled/JFK-ProtokollerLibrary.dll
#	compiled/JFK-ProtokollerService.exe
#	compiled/ToolboxForSiemensPLCs.exe
#	compiled/WPFVarTab.exe
#	compiled/en/DotNetSiemensPLCToolBoxLibrary.resources.dll
#	compiled/es/DotNetSiemensPLCToolBoxLibrary.resources.dll
    @Nick135
    Nick135 committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    fe4ffea View commit details
    Browse the repository at this point in the history

  2. Bug fix from Merge and compiled

    @Nick135
    Nick135 committed Jan 16, 2017
    Configuration menu
    Copy the full SHA
    a2e1615 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2017

  1. PLCNckTag erweitert + DatenType DateTime

    @Nick135
    Nick135 committed Jan 30, 2017
    Configuration menu
    Copy the full SHA
    6df079b View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2017

  1. BigFix Pointeradresse 

    BugFix, wenn die Pointeradresse falsch (kein Leerzeichen zwischen
Datentyp und Zugriffslänge) geschrieben wurde
    @Nick135
    Nick135 committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    5552c88 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Add Datablock DBR 

    Adressangabe "DBR" für Float -Werte hinzugefügt.
z.B. DBx.DBRy
    @Nick135
    Nick135 committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    c151e70 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2017

  1. Nck: TagDataType.DateTime | compiled 

    TagDataType.DateTime von der NC darf nicht (nochmal) gedreht (Endian)
werden.
    @Nick135
    Nick135 committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    779659a View commit details
    Browse the repository at this point in the history

Commits on May 4, 2017

  1. Alarm_S, SZLDatasets, NC_Var, PI-Service 

    - Methode zum Auslesen der Alarm_S hinzugefügt
- SZLDatasets "xy32_4Dataset" hinzugefügt
- class NC_Var erweitert und NckTagEditor angepasst
- PI_Service: Übergabeparameter paramCount entfernt
    @Nick135
    Nick135 committed May 4, 2017
    Configuration menu
    Copy the full SHA
    fe29960 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2017

  1. BugFix PLCNckTag.ToString()

    @Nick135
    Nick135 committed May 8, 2017
    Configuration menu
    Copy the full SHA
    b261927 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2017

  1. Merge branch 'refs/heads/pr/5' 

    # Conflicts:
#	LibNoDaveConnectionLibrary/Communication/PLCConnection.cs
#	LibNoDaveConnectionLibrary/Communication/PLCTag.cs
#	ToolBoxLibUnitTests/ConnectionWrapper.cs
#	compiled/DotNetSiemensPLCToolBoxLibrary.dll
#	compiled/JFK-ProtokollerConfigurationTool.exe
#	compiled/JFK-ProtokollerLibrary.dll
#	compiled/JFK-ProtokollerService.exe
#	compiled/Kopplungstester.exe
#	compiled/ToolboxForSiemensPLCs.exe
#	compiled/WPFToolboxForSiemensPLCs.exe
#	compiled/WPFVarTab.exe
#	compiled/en/DotNetSiemensPLCToolBoxLibrary.resources.dll
#	compiled/es/DotNetSiemensPLCToolBoxLibrary.resources.dll
    @Nick135
    Nick135 committed May 31, 2017
    Configuration menu
    Copy the full SHA
    6fdaf9f View commit details
    Browse the repository at this point in the history

  2. compiled / bugFix after merge

    @Nick135
    Nick135 committed May 31, 2017
    Configuration menu
    Copy the full SHA
    d1f4b7b View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2017

  1. Ignore compiled folder

    @Nick135
    Nick135 committed Jul 22, 2017
    Configuration menu
    Copy the full SHA
    4dab706 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. PlcNckTag Konstruktor erweitert

    @Nick135
    Nick135 committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    cc4eae0 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2017

  1. Enum NCK_Area + PLCNckTagTypeConverter hinzugefügt

    @Nick135
    Nick135 committed Sep 26, 2017
    Configuration menu
    Copy the full SHA
    da196f3 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2017

  1. BigFix NckArea (System.Xml.Serialization.XmlIgnore)

    @Nick135
    Nick135 committed Sep 27, 2017
    Configuration menu
    Copy the full SHA
    6d1b47d View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2017

  1. daveGetNcFile and daveGetNcFileSize added

    @Nick135
    Nick135 committed Nov 21, 2017
    Configuration menu
    Copy the full SHA
    98bd792 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2018

  1. libNoDave BugFix Read Int from NC-Drive

    @Nick135
    Nick135 committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    2436d0d View commit details
    Browse the repository at this point in the history

  2. Vorbereitung für Merge

    @Nick135
    Nick135 committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    9239c23 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'refs/remotes/dotnetprojects/master' 

    # Conflicts:

#	DotNetSiemensPLCToolBoxLibrary.TIAV13/DotNetSiemensPLCToolBoxLibrary.TIAV13.csproj
#	DotNetSiemensPLCToolBoxLibrary.TIAV13/Properties/AssemblyInfo.cs
#	DotNetSiemensPLCToolBoxLibrary.TIAV13/Step7ProjectV11.cs

#	DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/DotNetSiemensPLCToolBoxLibrary.TIAV14SP1.csproj
#	DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/Properties/AssemblyInfo.cs
#	DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/Step7ProjectV14SP1.cs
#	DotNetSiemensPLCToolBoxLibrary.TIAV14SP1/Step7ProjectV14SP1Tia.cs

#	DotNetSiemensPLCToolBoxLibrary.TIAV15/DotNetSiemensPLCToolBoxLibrary.TIAV15.csproj
#	DotNetSiemensPLCToolBoxLibrary.TIAV15/Properties/AssemblyInfo.cs
#	DotNetSiemensPLCToolBoxLibrary.TIAV15/Step7ProjectV15.cs
#	DotNetSiemensPLCToolBoxLibrary.TIAV15/Step7ProjectV15Tia.cs
#	DotNetSiemensPLCToolBoxLibrary.sln
#	LibNoDaveConnectionLibrary/Communication/PLCConnection.cs
#	LibNoDaveConnectionLibrary/Communication/PLCException.cs
#	LibNoDaveConnectionLibrary/DotNetSiemensPLCToolBoxLibrary.csproj
#	TiaGitHandler/Program.cs
#	TiaGitHandler/TiaGitHandler.csproj
#	externalDlls/libnodave/nodave.h
#	externalDlls/libnodave_jfkmod.dll
#	externalDlls/libnodave_jfkmod64.dll
#	externalDlls/siemens/V13/Siemens.Engineering.Hmi.dll
#	externalDlls/siemens/V13/Siemens.Engineering.dll
    @Nick135
    Nick135 committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    86da34f View commit details
    Browse the repository at this point in the history

  4. BugFix after Merge

    @Nick135
    Nick135 committed Apr 7, 2018
    Configuration menu
    Copy the full SHA
    e9f6386 View commit details
    Browse the repository at this point in the history