marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vergessen

Browse Source
This commit is contained in:
Roland Drabesch
2022-06-21 12:54:26 +02:00
parent 482e69803d
commit 768d4e110a
28 changed files with 612 additions and 776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionCheckShippingState.cs
+1 -1
View File
@@ -136,7 +136,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
Meter.WriteLog($"totalUsed at EOL {totalUsed}");
if (totalUsed > 15)
if (totalUsed > 10)
{
base.currentProcessState = ProductionProcessState.Error;
UserControl.lblText.Content = $"Batterie über 15% entladen";
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessFinalParameterizationVakoCsd.cs
+15 -40
View File
@@ -117,53 +117,31 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
foreach (var item in myJsonResponse.Where(m => m.Source == ProgrammingSource.Vako))
{
if (!item.RegisterName.Contains("GENESISFLOW_DisplayPow10")
&& !item.RegisterName.ToLower().Contains("apparrangement")
)
if (item.RegisterName.ToLower().Contains("SENSUSRADIO_EncryptionKey".ToLower()))
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.ToArray(), true, true));
}
else if (!item.RegisterName.ToLower().Contains("apparrangement"))
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.Reverse().ToArray(), true, true));
}
if (item.RegisterName.Contains("pulse"))
{
}
if (item.RegisterName.Contains("GENESISFLOW_DisplayPow10"))
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, 253, true, true));
}
}
overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_AlarmEnableMask", new byte[] { 0x00, 0x00, 0x80, 0x53 }.Reverse().ToArray(), true, false)); ;
overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_AlarmBroadcastMask", new byte[] { 0x00, 0x00, 0x1f, 0xdc }.Reverse().ToArray(), true, false));
overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_AlarmVisualMask", new byte[] { 0x00, 0x00, 0x1f, 0xdc }.Reverse().ToArray(), true, false));
foreach (var item in myJsonResponse.Where(m => m.Source == ProgrammingSource.Csd))
{
if (!item.RegisterName.Contains("GENESISFLOW_DisplayPow10")
&& !item.RegisterName.ToLower().Contains("apparrangement")
&& !item.RegisterName.ToLower().Contains("SENSUSRADIO_EncryptionKey")
)
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.Reverse().ToArray(), true, true));
}
if (item.RegisterName.Contains("SENSUSRADIO_EncryptionKey"))
if (item.RegisterName.ToLower().Contains("SENSUSRADIO_EncryptionKey".ToLower()))
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.ToArray(), true, true));
}
if (item.RegisterName.Contains("pulse"))
else if (!item.RegisterName.ToLower().Contains("apparrangement"))
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, item.RegisterValue.Reverse().ToArray(), true, true));
}
if (item.RegisterName.Contains("GENESISFLOW_DisplayPow10"))
{
overAllResult.Add(_currentGenesis_WriteRegister(item.RegisterName, 253, true, true));
}
}
overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_ResetAccumulators",
@@ -187,11 +165,8 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
overAllResult.Add(_currentGenesis_WriteRegister("PERIODICLOG_ResetCounter",
(new Byte[] { 0x00, 0x00, 0x00, 0x00 }).Reverse().ToArray(), true, false));
overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_AlarmEnableMask", new byte[] { 0x00, 0x00, 0x80, 0x53 }.Reverse().ToArray(), true, false)); ;
overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_AlarmBroadcastMask", new byte[] { 0x00, 0x00, 0x1f, 0xdc }.Reverse().ToArray(), true, false));
overAllResult.Add(_currentGenesis_WriteRegister("CUSTOMER_AlarmVisualMask", new byte[] { 0x00, 0x00, 0x1f, 0xdc }.Reverse().ToArray(), true, false));
overAllResult.Add(_currentGenesis_WriteRegister("GENESISFLOW_SealDisplay",
@@ -213,7 +188,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
}
else
{
if (cTask.Result.Item1.ToLower().Contains("Metersize".ToLower()) || cTask.Result.Item1.ToLower() == "SENSUSRADIO_MetroRadioLifeTimeCounter".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_LeakFlowThreshold".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_ExcessFlowVolumeThreshold".ToLower())
if (cTask.Result.Item1.ToLower().Contains("Metersize".ToLower()) || cTask.Result.Item1.ToLower() == "SENSUSRADIO_MetroRadioLifeTimeCounter".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_LeakFlowThreshold".ToLower() || cTask.Result.Item1.ToLower() == "CUSTOMER_ExcessFlowVolumeThreshold".ToLower())
{
base.NewStatus($"Warnung!Schreiben des Parameter {cTask.Result.Item1} war nicht erfolgreich");
}
Common/ProductionUiCordonel/ProductionProcesses/Actions/ProductionProcessShippingMode.cs
+1 -1
View File
@@ -50,7 +50,7 @@ namespace ProductionUiCordonel.ProductionProcesses.Actions
var useRadio = true;
if (useRadio)
{
if (Meter.StoreAllConfigurations())
if (Meter.StoreAllConfigurations())
{
var writeList = new List<bool>();