Skip to content
Snippets Groups Projects
Commit 28a59542 authored by Dennis Eisold's avatar Dennis Eisold
Browse files

Merge branch 'master' into 'master' 

Master

See merge request wetterstation/frontend!38
parents 01a78b3c 54497e5f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 6260 additions and 64 deletions
Wetterstation/Form1.Designer.cs
+ 81
− 23
View file @ 28a59542
This diff is collapsed.
Wetterstation/Form1.cs
+ 23
− 3
View file @ 28a59542
......@@ -154,8 +154,6 @@ namespace Wetterstation
{
// Handle message received
var message = System.Text.Encoding.Default.GetString(e.Message);
//System.Console.WriteLine("Message received: " + message);
Console.WriteLine("With Topic: " + e.Topic);
if (e.Topic.Equals(WeatherstationSettings.mqtt_topic_frontend + WeatherstationSettings.frontendId + "/weather"))
{
......@@ -238,6 +236,7 @@ namespace Wetterstation
public void updateFormWeather(String message)
{
Console.WriteLine("Entered updateFormWeather");
Console.WriteLine(message);
try
{
dynamic weatherData = JsonConvert.DeserializeObject(message.ToString());
......@@ -246,23 +245,37 @@ namespace Wetterstation
lbAussenTemp.Invoke(new Action(() => { lbAussenTemp.Text = Math.Round((double)weatherData.temp, 1) + " °C"; }));
lbTempOutMin.Invoke(new Action(() => { lbTempOutMin.Text = weatherData.tempMin + " °C"; }));
lbTempOutMax.Invoke(new Action(() => { lbTempOutMax.Text = weatherData.tempMax + " °C"; }));
owm.Temperatures = Math.Round((double)weatherData.temp, 1);
pbTendenzTempOut.Invoke(new Action(() => { pbTendenzTempOut.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), owm.tempTendenz()); }));
}
if(!node1Out.humidity)
{
lbLuftfeuchtAussen.Invoke(new Action(() => { lbLuftfeuchtAussen.Text = weatherData.humidity + " %"; }));
}
if(!node1Out.windSpeed)
{
lbWindSpeed.Invoke(new Action(() => { lbWindSpeed.Text = weatherData.windSpeed + " ms"; }));
}
if (!node1Out.windDegre)
{
lbWindricht.Invoke(new Action(() => { lbWindricht.Text = weatherData.windDeg + " °"; }));
pbKompassrose.Invoke(new Action(() => { pbKompassrose.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("WindRose_neu"), (int)weatherData.windDeg); }));
}
if (!node1Out.pressure && !node1In.pressure)
{
lbLuftdruck.Invoke(new Action(() => { lbLuftdruck.Text = weatherData.pressure + " mbar"; }));
owm.Pressures = weatherData.pressure;
pbTendenzPressure.Invoke(new Action(() => { pbTendenzPressure.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), owm.pressureTendenz()); }));
}
if(!node1Out.rain)
{
lbRain1h.Invoke(new Action(() => { lbRain1h.Text = weatherData.rain1h + " L/h"; }));
}
lbRain3h.Invoke(new Action(() => { lbRain3h.Text = weatherData.rain3h + " L/h"; }));
if (!node1Out.snow)
{
lbSnow1h.Invoke(new Action(() => { lbSnow1h.Text = weatherData.snow1h + " mm/h"; }));
}
lbSnow3h.Invoke(new Action(() => { lbSnow3h.Text = weatherData.snow3h + " mm/h"; }));
}
catch (Exception ignored) { }
......@@ -319,6 +332,7 @@ namespace Wetterstation
public void updateFormSensors(String message)
{
Console.WriteLine("Entered updateFormSensors");
Console.WriteLine(message);
try
{
dynamic weatherData = JsonConvert.DeserializeObject(message.ToString());
......@@ -340,8 +354,10 @@ namespace Wetterstation
lbInnenTemp.Invoke(new Action(() => { lbInnenTemp.Text = Math.Round((double)weatherData[0]["temperature"], 1) + " °C"; }));
lbTempInMin.Invoke(new Action(() => { lbTempInMin.Text = node1In.tempMin + " °C"; }));
lbTempInMax.Invoke(new Action(() => { lbTempInMax.Text = node1In.tempMax + " °C"; }));
node1In.Temperatures = weatherData[0]["temperature"];
pbTendenzTempIn.Invoke(new Action(() => { pbTendenzTempIn.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), node1In.tempTendenz()); }));
}
if (weatherData[0]["client"] == WeatherstationSettings.node1Id && weatherData[0]["sensor"] == WeatherstationSettings.node1Innen && weatherData[0]["himidity"] != null)
if (weatherData[0]["client"] == WeatherstationSettings.node1Id && weatherData[0]["sensor"] == WeatherstationSettings.node1Innen && weatherData[0]["humidity"] != null)
{
node1In.humidity = true;
lbLuftFeuchtInnen.Invoke(new Action(() => { lbLuftFeuchtInnen.Text = weatherData[0]["humidity"] + " %"; }));
......@@ -350,6 +366,8 @@ namespace Wetterstation
{
node1In.pressure = true;
lbLuftdruck.Invoke(new Action(() => { lbLuftdruck.Text = weatherData[0]["pressure"] + " hPa"; }));
node1In.Pressures = weatherData[0]["pressure"];
pbTendenzPressure.Invoke(new Action(() => { pbTendenzPressure.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), node1In.pressureTendenz()); }));
}
if (weatherData[0]["client"] == WeatherstationSettings.node1Id && weatherData[0]["sensor"] == WeatherstationSettings.node1Aussen && weatherData[0]["temperature"] != null)
{
......@@ -359,6 +377,8 @@ namespace Wetterstation
lbAussenTemp.Invoke(new Action(() => { lbAussenTemp.Text = Math.Round((double)weatherData[0]["temperature"], 1) + " °C"; }));
lbTempOutMin.Invoke(new Action(() => { lbTempOutMin.Text = node1Out.tempMin + " °C"; }));
lbTempOutMax.Invoke(new Action(() => { lbTempOutMax.Text = node1Out.tempMax + " °C"; }));
node1Out.Temperatures = weatherData[0]["temperature"];
pbTendenzTempOut.Invoke(new Action(() => { pbTendenzTempOut.Image = RotateImage((Bitmap)global::Wetterstation.Properties.Resources.ResourceManager.GetObject("Tendenz"), node1Out.tempTendenz()); }));
}
if (weatherData[0]["client"] == WeatherstationSettings.node1Id && weatherData[0]["sensor"] == WeatherstationSettings.node1Aussen && weatherData[0]["humidity"] != null)
{
......
Wetterstation/Form1.resx
+ 6076
− 0
View file @ 28a59542
This diff is collapsed.
Wetterstation/Properties/Resources.Designer.cs
+ 8
− 28
View file @ 28a59542
......@@ -273,29 +273,9 @@ namespace Wetterstation.Properties {
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap pfeil_oben {
get {
object obj = ResourceManager.GetObject("pfeil_oben", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap pfeil_quer {
get {
object obj = ResourceManager.GetObject("pfeil_quer", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap pfeil_unten {
internal static System.Drawing.Bitmap saturn {
get {
object obj = ResourceManager.GetObject("pfeil_unten", resourceCulture);
object obj = ResourceManager.GetObject("saturn", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
......@@ -303,9 +283,9 @@ namespace Wetterstation.Properties {
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap saturn {
internal static System.Drawing.Bitmap Strand {
get {
object obj = ResourceManager.GetObject("saturn", resourceCulture);
object obj = ResourceManager.GetObject("Strand", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
......@@ -313,9 +293,9 @@ namespace Wetterstation.Properties {
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Strand {
internal static System.Drawing.Bitmap Systemknopf {
get {
object obj = ResourceManager.GetObject("Strand", resourceCulture);
object obj = ResourceManager.GetObject("Systemknopf", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
......@@ -323,9 +303,9 @@ namespace Wetterstation.Properties {
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap Systemknopf {
internal static System.Drawing.Bitmap Tendenz {
get {
object obj = ResourceManager.GetObject("Systemknopf", resourceCulture);
object obj = ResourceManager.GetObject("Tendenz", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
......
Wetterstation/Properties/Resources.resx
+ 1
− 7
View file @ 28a59542
......@@ -127,9 +127,6 @@
<data name="Strand" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Strand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pfeil_oben" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_oben.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="_50n_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\50n@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
......@@ -208,10 +205,7 @@
<data name="_04d_2x" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\04d@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pfeil_unten" type="System.Resources.ResXFileRef, System.Windows.Forms">
<data name="Tendenz" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_unten.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="pfeil_quer" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pfeil_quer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
Wetterstation/Resources/Tendenz.bmp 0 → 100644
+ 0
− 0
View file @ 28a59542
Wetterstation/Resources/Tendenz.bmp

3.3 KiB

Wetterstation/Sensor.cs
+ 70
− 3
View file @ 28a59542
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Wetterstation
{
......@@ -20,5 +17,75 @@ namespace Wetterstation
public bool snow { get; set; }
public double tempMin { get; set; }
public double tempMax { get; set; }
private List<double> _temperatures;
private List<double> _pressures;
public double Temperatures
{
set
{
if (_temperatures.Count == 10)
{
_temperatures.RemoveAt(0);
}
_temperatures.Add(value);
}
}
public double Pressures
{
set
{
if (_pressures.Count == 10)
{
_pressures.RemoveAt(0);
}
_pressures.Add(value);
}
}
public float tempTendenz()
{
int up = 0;
int down = 0;
double oldTemp = 0;
foreach (double temp in _temperatures)
{
if (temp > oldTemp)
{
up++;
oldTemp = temp;
}
else
{
down++;
oldTemp = temp;
}
}
if (up > down) return 180;
else return 0;
}
public float pressureTendenz()
{
int up = 0;
int down = 0;
double oldPressure = 0;
foreach (double pressure in _pressures)
{
if (pressure > oldPressure)
{
up++;
oldPressure = pressure;
}
else
{
down++;
oldPressure = pressure;
}
}
if (up > down) return 180;
else return 0;
}
}
}
Wetterstation/Wetterstation.csproj
+ 1
− 0
View file @ 28a59542
......@@ -108,6 +108,7 @@
<Compile Include="Settings.Designer.cs">
<DependentUpon>Settings.cs</DependentUpon>
</Compile>
<None Include="Resources\Tendenz.bmp" />
<None Include="Resources\pfeil_quer.png" />
<None Include="Resources\pfeil_oben.png" />
<None Include="Resources\pfeil_unten.png" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment