Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Noe 2024-04-10 16:32:21 +02:00
parent 1338a5ecf3 78ae53f763
commit 7a5c5845bf
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
csharp/App/SaliMax/src/Program.cs
View File

@ -471,9 +471,6 @@ internal static class Program
: salimaxAlarmsState; // this will be replaced by LedState : salimaxAlarmsState; // this will be replaced by LedState
int.TryParse(s3Bucket?.Split("-")[0], out var installationId); int.TryParse(s3Bucket?.Split("-")[0], out var installationId);
//record.Log.SalimaxAlarms = bAlarmList;
//record.Log.SalimaxWarnings = bWarningList;
var returnedStatus = new StatusMessage var returnedStatus = new StatusMessage
{ {

2
csharp/Lib/Protocols/Modbus/Clients/ModbusClient.cs
View File

@ -28,7 +28,7 @@ public abstract class ModbusClient
public abstract MbData ReadWriteRegisters (UInt16 readAddress, public abstract MbData ReadWriteRegisters (UInt16 readAddress,
UInt16 nbToRead, UInt16 nbToRead,
UInt16 writeAddress, UInt16 writeAddress,
UInt16s registersToWrite); UInt16s registersToWrite);
protected ModbusClient(Channel channel, Byte slaveId, Endian endian = Endian.Little) protected ModbusClient(Channel channel, Byte slaveId, Endian endian = Endian.Little)
{ {