Skip to content
Snippets Groups Projects
Commit be2f6594 authored by philip.schell's avatar philip.schell
Browse files

[1.8.2] Bugfix, create also an event for sending normal loradata when update panic

parent a58f8f38
No related branches found
No related tags found
No related merge requests found
...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices; ...@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Lora")] [assembly: AssemblyProduct("Lora")]
[assembly: AssemblyCopyright("Copyright © 2018 - 14.04.2019")] [assembly: AssemblyCopyright("Copyright © 2018 - 22.04.2019")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
...@@ -31,8 +31,8 @@ using System.Runtime.InteropServices; ...@@ -31,8 +31,8 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden, // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben: // indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.8.1")] [assembly: AssemblyVersion("1.8.2")]
[assembly: AssemblyFileVersion("1.8.1")] [assembly: AssemblyFileVersion("1.8.2")]
/* /*
* 1.1.0 Now awaiing Battery as Double and fix the sending twise issue * 1.1.0 Now awaiing Battery as Double and fix the sending twise issue
...@@ -47,4 +47,5 @@ using System.Runtime.InteropServices; ...@@ -47,4 +47,5 @@ using System.Runtime.InteropServices;
* 1.7.0 Add Parsing for new Statusformat and Panic Packet * 1.7.0 Add Parsing for new Statusformat and Panic Packet
* 1.8.0 Add field that indicates when the last gps position was recieved, change all times to UTC * 1.8.0 Add field that indicates when the last gps position was recieved, change all times to UTC
* 1.8.1 Add Hostname to MQTT, so you can see from witch device the data is recieved * 1.8.1 Add Hostname to MQTT, so you can see from witch device the data is recieved
* 1.8.2 Bugfix, create also an event for sending normal loradata when update panic
*/ */
...@@ -68,11 +68,10 @@ namespace Fraunhofer.Fit.Iot.Lora.Trackers { ...@@ -68,11 +68,10 @@ namespace Fraunhofer.Fit.Iot.Lora.Trackers {
this.BatteryLevel = (((Single)data[20]) + 230) / 100; this.BatteryLevel = (((Single)data[20]) + 230) / 100;
this.Gps.SetUpdate(lat, lon, height, hdop, hour, minute, second, day, month, year); this.Gps.SetUpdate(lat, lon, height, hdop, hour, minute, second, day, month, year);
//Console.WriteLine("lat: " + lat + " lon: " + lon + " hdop: " + hdop + " heigt: " + height + " hh:mm:ss: " + hour + ":" + minute + ":" + second + " DD.MM.YY: " + day + "." + month + "." + year + " bat: " + this.BatteryLevel); //Console.WriteLine("lat: " + lat + " lon: " + lon + " hdop: " + hdop + " heigt: " + height + " hh:mm:ss: " + hour + ":" + minute + ":" + second + " DD.MM.YY: " + day + "." + month + "." + year + " bat: " + this.BatteryLevel);
if (dataType == ParseType.Update) { if (dataType == ParseType.Panic) {
this.DataUpdate?.Invoke(this, new DataUpdateEvent(this));
} else if(dataType == ParseType.Panic) {
this.PanicUpdate?.Invoke(this, new PanicUpdateEvent(this)); this.PanicUpdate?.Invoke(this, new PanicUpdateEvent(this));
} }
this.DataUpdate?.Invoke(this, new DataUpdateEvent(this));
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment