From 4dff73eb68764974aa56bc6949a48d4f4e52787b Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Tue, 4 Aug 2026 12:35:00 +0200 Subject: [PATCH] 1.4.0 - 2022-01-09 - Cleanup --- .gitignore | 3 + CONTRIBUTING.md | 92 ++++++++++++ Changelog.md | 37 +++++ ConnectorDataGpsd.sln | 49 ++++++ ConnectorDataGpsd/ConnectorDataGpsd.csproj | 42 ++++++ ConnectorDataGpsd/Gpsd.cs | 145 ++++++++++++++++++ LICENSE | 165 +++++++++++++++++++++ README.md | 11 ++ 8 files changed, 544 insertions(+) create mode 100644 .gitignore create mode 100644 CONTRIBUTING.md create mode 100644 Changelog.md create mode 100644 ConnectorDataGpsd.sln create mode 100644 ConnectorDataGpsd/ConnectorDataGpsd.csproj create mode 100644 ConnectorDataGpsd/Gpsd.cs create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b12efd3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.vs +ConnectorDataGpsd/bin +ConnectorDataGpsd/obj \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..20ec6e2 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,92 @@ +# Contributing + +When contributing to this repository, please first discuss the change you wish to make via issue, +email, or any other method with the owners of this repository before making a change. + +Please note we have a code of conduct, please follow it in all your interactions with the project. + +## Pull Request Process + +1. Ensure any install or build dependencies are removed before the end of the layer when doing a + build. +2. Update the README.md with details of changes to the interface, this includes new environment + variables, exposed ports, useful file locations and container parameters. +3. Increase the version numbers in any examples files and the README.md to the new version that this + Pull Request would represent. The versioning scheme we use is [SemVer](http://semver.org/). +4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you + do not have permission to do that, you may request the second reviewer to merge it for you. + +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +### Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at git ATTTT blubbfish.net. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +### Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ \ No newline at end of file diff --git a/Changelog.md b/Changelog.md new file mode 100644 index 0000000..5a7281b --- /dev/null +++ b/Changelog.md @@ -0,0 +1,37 @@ +# Changelog + +## 1.4.0 - 2022-01-09 - Cleanup +### New Features +* On first startup, not try to disconnect first +### Bugfixes +* Fixing nullpointer exception +### Changes +* Cleanup project and fixes version numbers + +## 1.3.0 - 2021-01-09 - Default netcore +### New Features +* Create toString, so in logfiles the used Server is visible +* add changelog.md +### Bugfixes +### Changes +* Netcore is now the default projekt + +## 1.2.0 - 2019-11-28 - Add netcore +### New Features +* add Licence, readme.md and contribute.md +* add netcore version +### Bugfixes +### Changes +* Using newer C# language version + +## 1.1.0 - 2019-05-27 - Rewrite Module to reconnect itselfs, so you dont need to watch over the the state of the connection +### New Features +* Keep the connection alive and reconnect internally +### Bugfixes +### Changes + +## 1.0.0.0 - 2019-02-14 - Init +### New Features +* Init release +### Bugfixes +### Changes \ No newline at end of file diff --git a/ConnectorDataGpsd.sln b/ConnectorDataGpsd.sln new file mode 100644 index 0000000..d04af20 --- /dev/null +++ b/ConnectorDataGpsd.sln @@ -0,0 +1,49 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31112.23 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConnectorDataGpsd", "ConnectorDataGpsd\ConnectorDataGpsd.csproj", "{AEF063F8-48DD-48A4-93B2-190241D64A2E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils-IoT", "..\Utils-IoT\Utils-IoT\Utils-IoT.csproj", "{0CA55DE8-A382-495D-BE43-7ECC90259907}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Utils", "..\Utils\Utils\Utils.csproj", "{814988F9-206C-41E2-8DC7-064D58C704A4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "litjson", "..\..\Librarys\litjson\litjson\litjson.csproj", "{29D0EB6A-5325-4E03-A0FD-8357AAC30892}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GPSDLib", "..\..\Librarys\GPSDLib\GPSDLib\GPSDLib.csproj", "{825BE1DC-2A8E-4A54-B82C-AC63435067BB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {AEF063F8-48DD-48A4-93B2-190241D64A2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AEF063F8-48DD-48A4-93B2-190241D64A2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AEF063F8-48DD-48A4-93B2-190241D64A2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AEF063F8-48DD-48A4-93B2-190241D64A2E}.Release|Any CPU.Build.0 = Release|Any CPU + {0CA55DE8-A382-495D-BE43-7ECC90259907}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0CA55DE8-A382-495D-BE43-7ECC90259907}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0CA55DE8-A382-495D-BE43-7ECC90259907}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0CA55DE8-A382-495D-BE43-7ECC90259907}.Release|Any CPU.Build.0 = Release|Any CPU + {814988F9-206C-41E2-8DC7-064D58C704A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {814988F9-206C-41E2-8DC7-064D58C704A4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {814988F9-206C-41E2-8DC7-064D58C704A4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {814988F9-206C-41E2-8DC7-064D58C704A4}.Release|Any CPU.Build.0 = Release|Any CPU + {29D0EB6A-5325-4E03-A0FD-8357AAC30892}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29D0EB6A-5325-4E03-A0FD-8357AAC30892}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29D0EB6A-5325-4E03-A0FD-8357AAC30892}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29D0EB6A-5325-4E03-A0FD-8357AAC30892}.Release|Any CPU.Build.0 = Release|Any CPU + {825BE1DC-2A8E-4A54-B82C-AC63435067BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {825BE1DC-2A8E-4A54-B82C-AC63435067BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {825BE1DC-2A8E-4A54-B82C-AC63435067BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {825BE1DC-2A8E-4A54-B82C-AC63435067BB}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {188FF102-B685-43FF-8CA3-D7229128867C} + EndGlobalSection +EndGlobal diff --git a/ConnectorDataGpsd/ConnectorDataGpsd.csproj b/ConnectorDataGpsd/ConnectorDataGpsd.csproj new file mode 100644 index 0000000..e04dc67 --- /dev/null +++ b/ConnectorDataGpsd/ConnectorDataGpsd.csproj @@ -0,0 +1,42 @@ + + + + netcoreapp3.1 + BlubbFish.Utils.IoT.Connector.Data + ConnectorDataGpsd + BlubbFish + BlubbFish + 1.0.0 + Copyright © BlubbFish 2025 - 18.02.2025 + ADataBackend Connector that connects to gpsd using GPSDLib + LICENSE + http://git.blubbfish.net/vs_utils/ConnectorDataGpsd + http://git.blubbfish.net/vs_utils/ConnectorDataGpsd.git + git + + 1.0.0 Init + + de-DE + Gpsd.Data.Connector.IoT.Utils.BlubbFish + + + + + + + + + + + + + + + + + True + + + + + \ No newline at end of file diff --git a/ConnectorDataGpsd/Gpsd.cs b/ConnectorDataGpsd/Gpsd.cs new file mode 100644 index 0000000..c8f3f76 --- /dev/null +++ b/ConnectorDataGpsd/Gpsd.cs @@ -0,0 +1,145 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; + +using BlubbFish.Utils.IoT.Events; + +using Ghostware.GPSDLib; +using Ghostware.GPSDLib.Models; + +namespace BlubbFish.Utils.IoT.Connector.Data { + public class Gpsd : ADataBackend, IDisposable { + private GpsdService client; + private Thread connectionWatcher; + private Boolean connectionWatcherRunning; + private Boolean firstStart = true; + private Task gpsThread; + + public override Boolean IsConnected => this.gpsThread != null && this.gpsThread.Status == TaskStatus.Running; + + public Gpsd(Dictionary settings) : base(settings) { + Console.WriteLine("BlubbFish.Utils.IoT.Connector.Data.Gpsd(" + this.ToString() + ")"); + Int32 port = 2947; + if(!this.settings.ContainsKey("name")) { + throw new ArgumentException("Field \"name\" is missing"); + } + if(this.settings.ContainsKey("port")) { + port = Int32.Parse(this.settings["port"]); + } + this.client = new GpsdService(this.settings["server"], port) { + ReadFrequenty = 100 + }; + this.ConnectionWatcher(); + } + + public override String ToString() { + String ret = "gpsd://"; + ret += this.settings["server"]; + if(this.settings.ContainsKey("port")) { + ret += ":" + this.settings["port"]; + } + return ret; + } + + #region ConectionManage + private void ConnectionWatcher() { + this.connectionWatcher = new Thread(this.ConnectionWatcherRunner); + this.connectionWatcherRunning = true; + this.connectionWatcher.Start(); + } + + private void ConnectionWatcherRunner() { + while(this.connectionWatcherRunning) { + try { + if(!this.IsConnected) { + this.Reconnect(); + Thread.Sleep(1000); + } + Thread.Sleep(10); + } catch(Exception) { } + } + } + + private void Reconnect() { + if(!this.firstStart) { + if(this.IsConnected) { + this.Disconnect(true); + } else { + this.Disconnect(false); + } + } else { + this.firstStart = false; + } + this.Connect(); + } + + private void Disconnect(Boolean complete) { + Console.WriteLine("BlubbFish.Utils.IoT.Connector.Data.Mqtt.Disconnect(" + this.ToString() + ")"); + this.client.OnLocationChanged -= this.Client_OnLocationChanged; + this.client.StopGpsReading(); + if(complete) { + _ = this.client.Disconnect(); + } + } + + private void Connect() { + Console.WriteLine("BlubbFish.Utils.IoT.Connector.Data.Mqtt.Connect(" + this.ToString() + ")"); + try { + _ = this.client.Connect(); + } catch { } + this.client.OnLocationChanged += this.Client_OnLocationChanged; + this.gpsThread = this.client.StartGpsReadingAsync(); + this.gpsThread.Start(); + } + + private async void Client_OnLocationChanged(Object sender, Tuple e) => await Task.Run(() => this.NotifyClientIncomming(new GpsEvent() { + BatteryLevel = 4, + CorrectInterface = true, + Gps = new GpsEvent.LoraDataGps() { + Latitude = e.Item1.Latitude, + Longitude = e.Item1.Longitude, + Fix = e.Item1.Mode == 3, + Height = e.Item1.Altitute, + Hdop = e.Item2 != null ? e.Item2.Hdop : 0 + }, + Hash = e.Item1.Time + this.settings["name"] + e.Item1.Latitude + e.Item1.Longitude, + Name = this.settings["name"], + Receivedtime = e.Item1.Time, + Rssi = e.Item1.Track, + Snr = e.Item1.Speed + })); + #endregion + + public override void Send(String topic, String data) { + } + + #region IDisposable Support + private Boolean disposedValue = false; + + protected virtual void Dispose(Boolean disposing) { + if(!this.disposedValue) { + if(disposing) { + try { + this.connectionWatcherRunning = false; + while(this.connectionWatcher != null && this.connectionWatcher.IsAlive) { + Thread.Sleep(10); + } + this.connectionWatcher = null; + this.Disconnect(true); + } catch(Exception) { } + } + this.client = null; + this.disposedValue = true; + } + } + + public override void Dispose() { + this.Dispose(true); + GC.SuppressFinalize(this); + } + #endregion + + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f0156c5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,165 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..e86fbf3 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# BlubbFish.Utils.IoT.Connector.Data.Mqtt (ConnectorDataMqtt) +Library that connects to Mqtt using M2Mqtt + +Maybe you find this Repo on Github. This is a mirror from [here](https://git.blubbfish.net/vs_utils/ConnectorDataMqtt). + +## Linking to +### Internal +* BlubbFish.Utils.IoT ([Utils-IoT](http://git.blubbfish.net/vs_utils/Utils-IoT)) + +### External +* M2Mqtt ([Used Fork](https://github.com/blubbfish/mqtt), [Original](https://github.com/eclipse/paho.mqtt.m2mqtt)) \ No newline at end of file