-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update for Firmware Version V4.0 (#88)
V4.0 for the S7-1500 is available: [Download](https://support.industry.siemens.com/cs/document/109478459/firmware-update-s7-1500-cpus-incl-displays-and-et-200-cpus-(et-200sp-et-200pro)?dti=0&lc=en-DE) Therefore the according [new Web-Api Methods](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#treeId=7a2b693b7e1b49654c384cde0ede92de) shall also be supported by this library. - [x] [WebServer.ReadResponseHeaders](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [WebServer.ChangeResponseHeaders](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [Api.GetSessionInfo](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [WebApp.SetVersion](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [WebApp.SetUrlRedirectMode](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] Technology.BrowseObjects - [x] Technology.Read - [x] [Plc.ReadCpuType](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [Plc.ReadStationName](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [Plc.ReadModuleName](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) Redundancy: - [x] [Redundancy.ReadSystemInformation](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [Redundancy.ReadSystemState](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [Redundancy.RequestChangeSystemState](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#) - [x] [Redundancy.ReadSyncupProgress](https://cache.industry.siemens.com/dl/dl-media/246/109977246/att_1307004/v1/185361597835_en-US/en-US/index.html#)
- Loading branch information
Showing
267 changed files
with
4,557 additions
and
395 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/Webserver.API/Enums/ApiDiagnosticBufferBrowseFilterAttributes.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
namespace Siemens.Simatic.S7.Webserver.API.Enums | ||
{ | ||
/// <summary> | ||
/// Determines the response format for various methods that return data from the PLC. | ||
/// </summary> | ||
public enum ApiPlcDataRepresentation | ||
{ | ||
/// <summary> | ||
/// Should never be the case | ||
/// </summary> | ||
None = 0, | ||
/// <summary> | ||
/// "Simple", comfortable format -- represented in a semi-human-readable format. | ||
/// </summary> | ||
Simple = 1, | ||
/// <summary> | ||
/// The data is represented in big endian format, formatted as a JSON byte array. | ||
/// </summary> | ||
Raw = 2 | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
// Copyright (c) 2023, Siemens AG | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
using Newtonsoft.Json; | ||
using Newtonsoft.Json.Converters; | ||
using System.Runtime.Serialization; | ||
|
||
namespace Siemens.Simatic.S7.Webserver.API.Enums | ||
{ | ||
/// <summary> | ||
/// The pairing status of the R/H system. | ||
/// </summary> | ||
[JsonConverter(typeof(StringEnumConverter))] | ||
public enum ApiPlcRedundancyPairingState | ||
{ | ||
/// <summary> | ||
/// Default value if the pairing status could not be retrieved or was 0. | ||
/// </summary> | ||
[EnumMember(Value = "unknown")] | ||
Unknown = 0, | ||
/// <summary> | ||
/// Redundant connection between both PLCs. | ||
/// </summary> | ||
[EnumMember(Value = "paired")] | ||
Paired = 1, | ||
/// <summary> | ||
/// Only single pairing via port 1 (or 2) is available. | ||
/// </summary> | ||
[EnumMember(Value = "paired_single")] | ||
Paired_single = 2, | ||
/// <summary> | ||
/// There are more than 2 R/H PLCs in the network. Cannot determine partner PLC. | ||
/// </summary> | ||
[EnumMember(Value = "not_paired_too_many_partners")] | ||
Not_paired_too_many_partners = 3, | ||
/// <summary> | ||
/// The partner PLC is not reachable or internal error, represented as unspecified error to the user. | ||
/// </summary> | ||
[EnumMember(Value = "not_paired")] | ||
Not_paired = 4, | ||
/// <summary> | ||
/// The order IDs of both PLCs of the R/H system do not match. | ||
/// </summary> | ||
[EnumMember(Value = "not_paired_order_id_mismatch")] | ||
Not_paired_order_id_mismatch = 5, | ||
/// <summary> | ||
/// The firmware versions of both PLCs of the R/H system do not match. | ||
/// </summary> | ||
[EnumMember(Value = "not_paired_firmware_mismatch")] | ||
Not_paired_firmware_mismatch = 6, | ||
|
||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright (c) 2024, Siemens AG | ||
// | ||
// SPDX-License-Identifier: MIT | ||
using Newtonsoft.Json; | ||
using Newtonsoft.Json.Converters; | ||
using System.Runtime.Serialization; | ||
|
||
namespace Siemens.Simatic.S7.Webserver.API.Enums | ||
{ | ||
/// <summary> | ||
/// The role of the represented PLC in the redundant system. | ||
/// </summary> | ||
[JsonConverter(typeof(StringEnumConverter))] | ||
public enum ApiPlcRedundancyRole | ||
{ | ||
/// <summary> | ||
/// For the tree of the partner PLC, the role may be unknown in case that the partner PLC is not properly paired. | ||
/// </summary> | ||
[EnumMember(Value = "unknown")] | ||
Unknown = 0, | ||
/// <summary> | ||
/// Primary PLC | ||
/// </summary> | ||
[EnumMember(Value = "primary")] | ||
Primary = 1, | ||
/// <summary> | ||
/// Backup PLC | ||
/// </summary> | ||
[EnumMember(Value = "backup")] | ||
Backup = 2 | ||
} | ||
} |
Oops, something went wrong.