[1.3.0] New Gateway
This commit is contained in:
parent
c4c8f6164b
commit
c96941b048
@ -1,5 +1,13 @@
|
|||||||
# Changelogs
|
# Changelogs
|
||||||
|
|
||||||
|
## 1.3.0 - New Gateway
|
||||||
|
### New Features
|
||||||
|
* Implement Lora-Gateway-Data 1.1.0 Format
|
||||||
|
### Bugfixes
|
||||||
|
### Changes
|
||||||
|
* Refactoring
|
||||||
|
* Make requests.conf not needed anymore.
|
||||||
|
|
||||||
## 1.2.10
|
## 1.2.10
|
||||||
### New Features
|
### New Features
|
||||||
* Posibility to display sensor data on map
|
* Posibility to display sensor data on map
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
@ -10,15 +10,17 @@
|
|||||||
<Description>Displays Items with Coordinates from Mqtt on a Map</Description>
|
<Description>Displays Items with Coordinates from Mqtt on a Map</Description>
|
||||||
<Company>Fraunhofer FIT</Company>
|
<Company>Fraunhofer FIT</Company>
|
||||||
<PackageId>LoraMap.IoT.Fit.Fraunhofer</PackageId>
|
<PackageId>LoraMap.IoT.Fit.Fraunhofer</PackageId>
|
||||||
<Copyright>Copyright © Fraunhofer FIT, BlubbFish 2018 - 11.12.2019</Copyright>
|
<Copyright>Copyright © Fraunhofer FIT, BlubbFish 2018 - 20.01.2020</Copyright>
|
||||||
<Authors>BlubbFish</Authors>
|
<Authors>BlubbFish</Authors>
|
||||||
<Version>1.2.10</Version>
|
<Version>1.3.0</Version>
|
||||||
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
<PackageLicenseFile>LICENSE</PackageLicenseFile>
|
||||||
<PackageProjectUrl>https://github.com/MONICA-Project/lora-map</PackageProjectUrl>
|
<PackageProjectUrl>https://github.com/MONICA-Project/lora-map</PackageProjectUrl>
|
||||||
<RepositoryUrl>https://github.com/MONICA-Project/lora-map.git</RepositoryUrl>
|
<RepositoryUrl>https://github.com/MONICA-Project/lora-map.git</RepositoryUrl>
|
||||||
<RepositoryType>git</RepositoryType>
|
<RepositoryType>git</RepositoryType>
|
||||||
<NeutralLanguage>de-DE</NeutralLanguage>
|
<NeutralLanguage>de-DE</NeutralLanguage>
|
||||||
<PackageReleaseNotes>1.2.10 Refactoring is the thing
|
<PackageReleaseNotes>
|
||||||
|
1.3.0 New Gateway
|
||||||
|
1.2.10 Refactoring is the thing
|
||||||
1.2.9 The PüMa Release
|
1.2.9 The PüMa Release
|
||||||
1.2.8 Improving the UI
|
1.2.8 Improving the UI
|
||||||
1.2.7 Reorganise a lot of things, add Support for Cameradata
|
1.2.7 Reorganise a lot of things, add Support for Cameradata
|
||||||
@ -59,9 +61,6 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Update="config-example\requests.conf.example">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</None>
|
|
||||||
<None Update="config-example\settings.conf.example">
|
<None Update="config-example\settings.conf.example">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</None>
|
</None>
|
||||||
|
@ -12,16 +12,11 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
|
|||||||
_ = Console.ReadLine();
|
_ = Console.ReadLine();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if(!InIReader.ConfigExist("requests")) {
|
|
||||||
Helper.WriteError("requests.ini not found!");
|
|
||||||
_ = Console.ReadLine();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
InIReader ini = InIReader.GetInstance("settings");
|
InIReader ini = InIReader.GetInstance("settings");
|
||||||
Dictionary<String, String> backenddata = ini.GetSection("mqtt");
|
Dictionary<String, String> backenddata = ini.GetSection("mqtt");
|
||||||
backenddata.Add("topic", "lora/#;camera/#;sfn/#");
|
backenddata.Add("topic", "lora/#;camera/#;sfn/#");
|
||||||
ADataBackend b = (ADataBackend)ABackend.GetInstance(backenddata, ABackend.BackendType.Data);
|
ADataBackend b = (ADataBackend)ABackend.GetInstance(backenddata, ABackend.BackendType.Data);
|
||||||
_ = new Server(b, ini.GetSection("webserver"), InIReader.GetInstance("requests"));
|
_ = new Server(b, ini.GetSection("webserver"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ namespace Fraunhofer.Fit.IoT.LoraMap {
|
|||||||
private readonly Object lockDensy = new Object();
|
private readonly Object lockDensy = new Object();
|
||||||
private readonly Object lockSensor = new Object();
|
private readonly Object lockSensor = new Object();
|
||||||
|
|
||||||
public Server(ADataBackend backend, Dictionary<String, String> settings, InIReader requests) : base(backend, settings, requests) {
|
public Server(ADataBackend backend, Dictionary<String, String> settings) : base(backend, settings, null) {
|
||||||
this.logger.SetPath(settings["loggingpath"]);
|
this.logger.SetPath(settings["loggingpath"]);
|
||||||
this.CheckJsonFiles();
|
this.CheckJsonFiles();
|
||||||
this.admin = new AdminModel(settings);
|
this.admin = new AdminModel(settings);
|
||||||
|
@ -1,2 +0,0 @@
|
|||||||
[js/map.js]
|
|
||||||
start_location=50.7, 7.2
|
|
Loading…
Reference in New Issue
Block a user