From 8de35a5b7a3720118c88dab7ec6111caf2e153b8 Mon Sep 17 00:00:00 2001 From: Luc Vandenbroucke Date: Thu, 21 Feb 2019 10:11:58 +0100 Subject: [PATCH] first beta test --- EpdBase/EpdBase.cpp | 2 +- eDosStation/App.config | 3 + eDosStation/EntryBadge.xaml | 233 +++++++++++--------- eDosStation/EntryBadge.xaml.cs | 69 +++--- eDosStation/Images/EPD-MK2.png | Bin 0 -> 56897 bytes eDosStation/Images/EPD-N2.png | Bin 0 -> 12798 bytes eDosStation/Properties/Settings.Designer.cs | 12 + eDosStation/Properties/Settings.settings | 3 + eDosStation/Settings.xaml | 8 +- eDosStation/Settings.xaml.cs | 2 + eDosStation/eDosStation.csproj | 47 ++++ eDosStation/eDosStation.csproj.user | 10 + 12 files changed, 253 insertions(+), 136 deletions(-) create mode 100644 eDosStation/Images/EPD-MK2.png create mode 100644 eDosStation/Images/EPD-N2.png diff --git a/EpdBase/EpdBase.cpp b/EpdBase/EpdBase.cpp index 04a37c0..4e4330e 100644 --- a/EpdBase/EpdBase.cpp +++ b/EpdBase/EpdBase.cpp @@ -54,7 +54,7 @@ void EpdBase::Epd2U::Close() void EpdBase::Epd2U::DecodeFunctionFlags() { - EpdType = (FunctionFlags & 0x0300) >> 8; + EpdType = (FunctionFlags & 0x1F00) >> 8; } void EpdBase::Epd2U::DecodeStatus() diff --git a/eDosStation/App.config b/eDosStation/App.config index 98b9049..16e14c1 100644 --- a/eDosStation/App.config +++ b/eDosStation/App.config @@ -29,6 +29,9 @@ Venus + + 0428790A0B4E80 + \ No newline at end of file diff --git a/eDosStation/EntryBadge.xaml b/eDosStation/EntryBadge.xaml index cee648d..44ddbe9 100644 --- a/eDosStation/EntryBadge.xaml +++ b/eDosStation/EntryBadge.xaml @@ -11,7 +11,8 @@ - + + @@ -35,132 +36,148 @@ - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - - - + + + - - - - - + + + + + - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + @@ -174,7 +191,8 @@ -