luc/eDosStation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

write settings (gebeurt 2x ?)

Browse source
This commit is contained in:
Luc Vandenbroucke 2022-09-06 13:08:23 +02:00
parent 5cb5e62e57
commit 78fcb4545b
5 changed files with 44 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
EpdBase3/Epd3Base.cpp
View file

@ -1253,6 +1253,7 @@ int Epd3Base::Epd3U::WriteConfig(void)
//Unmanaged%20HtmlFiles/_display_ids.html
numItems = 9;
enables = new DisplayAttributeMap_t[9]{
{ 0,0x7FFF,0xFFFF },
{ 1,0x7FFF,0xFFE1 },
{ 2,0x7FFF,0xFEFF },
@ -1288,11 +1289,36 @@ int Epd3Base::Epd3U::WriteConfig(void)
token = BeginWriteDisplayEnablePermissions_R3(epdComsHandle, AccessLevel_t::Admin, permissions, numDisplays, nullptr);
r = Commit3(epdComsHandle);
r = EndWriteDisplayEnablePermissions_R3(epdComsHandle, token);
}
if (!r) {
//AlarmConfiguration
uint8_t alarmConfigLen = 14;
alarmConfigIds = new AlarmConfig_t[14]{
{ (AlarmIds)6,0,0x0000,0x1884,61 },
{ (AlarmIds)8,0,0x0000,0x9884,61 },
{ (AlarmIds)5,0,0x0000,0x9CA4,61 },
{ (AlarmIds)4,0,0x0000,0x9CC7,61 },
{ (AlarmIds)9,0,0x0000,0x9CA5,61 },
{ (AlarmIds)7,0,0x0000,0x1884,60 },
{ (AlarmIds)0,0,0x0000,0x9CC1,60 },
{ (AlarmIds)1,0,0x0000,0x1884,60 },
{ (AlarmIds)2,0,0x0000,0x9CC7,60 },
{ (AlarmIds)3,0,0x0000,0x1885,60 },
{ (AlarmIds)0,1,0x0000,0x9CC1,60 },
{ (AlarmIds)1,1,0x0000,0x1884,60 },
{ (AlarmIds)2,1,0x0000,0x9CC7,60 },
{ (AlarmIds)3,1,0x0000,0x1885,60 },
};
token = BeginWriteAlarmConfiguration_R3(epdComsHandle, alarmConfigIds, alarmConfigLen, nullptr);
r = Commit3(epdComsHandle);
r = EndWriteAlarmConfiguration_R3(epdComsHandle, token);
}
return r;
}
int Epd3Base::Epd3U::SetChirp(float Sensitivity)

7
EpdBase3/Epd3Base.h
View file

@ -231,8 +231,11 @@ namespace Epd3Base {
QuickAccessDisplay_t* displayIds;
uint8_t numDisplays;
EncryptionKey EC;
uint8_t ECLen;
AlarmConfig_t* alarmConfigIds;
uint16_t alarmConfigLen = 20;
EncryptionKey EC { 0xE7 ,0xD3 ,0xE7 ,0x69 ,0xF3 ,0xF5 ,0x93 ,0xDA ,0xDC ,0xB8 ,0x63 ,0x4C ,0xC5 ,0xB0 ,0x9F ,0xC9 ,0x0D ,0xD3 ,0xA6 ,0x1C ,0x4A ,0x06 ,0xA7 ,0x9C ,0xB0 ,0x92 ,0x36 ,0x62 ,0xFE ,0x6F ,0xAE ,0x6B };
uint8_t ECLen=32;
//Functions
int OpenDev(DiscoveryId DeviceID);

2
MK3/MK3Base.cpp
View file

@ -1152,7 +1152,7 @@ WORD MK3::Epd2U::SetSettings()
if (r) goto error;
//AlarmConfiguration
uint8_t alarmConfigLen = 14;
alarmConfigLen = 14;
alarmConfigIds = new AlarmConfig_t[14]{
{ (AlarmIds)6,0,0x0000,0x1884,61 },
{ (AlarmIds)8,0,0x0000,0x9884,61 },

6
TestEPD3Dll/Program.cs
View file

@ -21,6 +21,12 @@ namespace TestEPD3Dll
x.Connect(false);
x.ECIn = System.Security.Cryptography.SHA256.Create().ComputeHash(System.Text.Encoding.UTF8.GetBytes("Administrator"));
System.Diagnostics.Debug.Write("byte EC[] {");
for (int i = 0; i < 32; i++)
System.Diagnostics.Debug.Write($" ,0x{x.ECIn[i]:X2}");
System.Diagnostics.Debug.WriteLine(" };");
//rv= x.SetChirp(5);

4
eDosStation/Properties/AssemblyInfo.cs
View file

@ -51,5 +51,5 @@ using System.Windows;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.11.0.0")]
[assembly: AssemblyFileVersion("2.11.0.0")]
[assembly: AssemblyVersion("2.13.1.0")]
[assembly: AssemblyFileVersion("2.13.1.0")]