Long time no commit

This commit is contained in:
Roland Drabesch
2022-04-06 10:42:16 +02:00
parent 0a72be12ab
commit ec37bb9b9e
225 changed files with 65673 additions and 18510 deletions
+33
View File
@@ -45,6 +45,39 @@
<Prefer32Bit>true</Prefer32Bit>
<LangVersion>7.0</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == '_MANUAL_CONTROL|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\_MANUAL_CONTROL\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<LangVersion>7.0</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\..\packages\NLog.4.5.6\lib\net45\NLog.dll</HintPath>
+62 -56
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Hardware.Interfaces.Ports.PortCore.EventArguments;
using Xylem.Common.Hardware.Interfaces.Ports.SerialPorts;
@@ -21,65 +22,70 @@ namespace IrdaDemo
{
//MeterBatch mb = new MeterBatch();
//var meter = new GenesisMeter();
//meter.SetupFromConfigFile(1, false);
//mb.AddMeter(meter);
//meter.SyncStreamingBuffer(SyncMarkRecord.DecodeEveryPackage);
//Console.ReadLine();
//2018-12-12 16:13:08.5276 | Debug | Slot:0, Port:COM240, Protocol:Request, Type:IrDA - SentData(0F-01-04-03-00-42-46-45-41-43-33-43-39-44-42-32-33)
//2018 - 12 - 12 16:13:08.5366 | Debug | Slot:0, Port: COM240, Protocol: Request, Type: IrDA - DecodeRecord(10 - 00 - 00 - 03 - 00 - 42 - 46 - 45 - 41 - 43 - 33 - 43 - 39 - 44 - 42 - 32 - 33)
Console.WriteLine("Enter Comport Number");
var result = $"COM{Console.ReadLine()}";
Console.WriteLine("Enter Password");
var password = Console.ReadLine();
//Console.WriteLine("Press 1 for PcbID error");
//Console.WriteLine("Press 2 for freeze meter with write/read");
//Console.WriteLine("Press 3 for 00-00-00-1A write error");
////var meter = new GenesisMeter(0,
//// new PortConfig()
//// {BaudRate = 115200, PortName = result, Type = typeof(IrdaSerialPort).ToString()}, null);
//switch (Console.ReadLine())
//for (int i = 1; i <= 10; i++)
//{
// case "1":
// testPcb(result);
// break;
// case "2":
// testWriteRead(result, password);
// break;
// case "3":
testWriteError(result, password);
// break;
// default:
// Console.WriteLine("unknown test number");
// break;
// a.ReadRegister("");
//}
////MeterBatch mb = new MeterBatch();
////var meter = new GenesisMeter();
////meter.SetupFromConfigFile(1, false);
////mb.AddMeter(meter);
////meter.SyncStreamingBuffer(SyncMarkRecord.DecodeEveryPackage);
////Console.ReadLine();
////2018-12-12 16:13:08.5276 | Debug | Slot:0, Port:COM240, Protocol:Request, Type:IrDA - SentData(0F-01-04-03-00-42-46-45-41-43-33-43-39-44-42-32-33)
////2018 - 12 - 12 16:13:08.5366 | Debug | Slot:0, Port: COM240, Protocol: Request, Type: IrDA - DecodeRecord(10 - 00 - 00 - 03 - 00 - 42 - 46 - 45 - 41 - 43 - 33 - 43 - 39 - 44 - 42 - 32 - 33)
//Console.WriteLine("Enter Comport Number");
//var result = $"COM{Console.ReadLine()}";
//Console.WriteLine("Enter Password");
//var password = Console.ReadLine();
////Console.WriteLine("Press 1 for PcbID error");
////Console.WriteLine("Press 2 for freeze meter with write/read");
////Console.WriteLine("Press 3 for 00-00-00-1A write error");
//////var meter = new GenesisMeter(0,
////// new PortConfig()
////// {BaudRate = 115200, PortName = result, Type = typeof(IrdaSerialPort).ToString()}, null);
////switch (Console.ReadLine())
////{
//// case "1":
//// testPcb(result);
//// break;
//// case "2":
//// testWriteRead(result, password);
//// break;
//// case "3":
// testWriteError(result, password);
//// break;
//// default:
//// Console.WriteLine("unknown test number");
//// break;
////}
//var applicationDataPath = Path.Combine(CurrentConfigDir, CurrentConfigFile);
//var currentApplicationFolder =
// Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
// CurrentConfigFile);
//if (File.Exists(currentApplicationFolder))
//{
// Console.WriteLine(currentApplicationFolder);
//}
var applicationDataPath = Path.Combine(CurrentConfigDir, CurrentConfigFile);
var currentApplicationFolder =
Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location),
CurrentConfigFile);
if (File.Exists(currentApplicationFolder))
{
Console.WriteLine(currentApplicationFolder);
}
if (File.Exists(applicationDataPath))
{
Console.WriteLine(applicationDataPath);
}
//if (File.Exists(applicationDataPath))
//{
// Console.WriteLine(applicationDataPath);
//}