diff --git a/Wetterstation/Settings.Designer.cs b/Wetterstation/Settings.Designer.cs
index 32844da0441a8667d50cda3f72779edc905acabd..8f437302dceeeecdb295885b03e08ecce86fb608 100644
--- a/Wetterstation/Settings.Designer.cs
+++ b/Wetterstation/Settings.Designer.cs
@@ -48,71 +48,72 @@
this.lbFrontendId = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
- this.label3 = new System.Windows.Forms.Label();
this.txtPlz = new System.Windows.Forms.Label();
- this.tbLngCode = new System.Windows.Forms.TextBox();
this.lbLngCode = new System.Windows.Forms.Label();
- this.lbNodeMcu1 = new System.Windows.Forms.Label();
- this.lbNodeMcu2 = new System.Windows.Forms.Label();
- this.tbNodeMcu1 = new System.Windows.Forms.TextBox();
- this.tbNodeMcu2 = new System.Windows.Forms.TextBox();
+ this.tbLngCode = new System.Windows.Forms.TextBox();
+ this.lbNode1 = new System.Windows.Forms.Label();
+ this.lbNode1SensorInnen = new System.Windows.Forms.Label();
+ this.tbNode1 = new System.Windows.Forms.TextBox();
+ this.tbNode1SensorInnen = new System.Windows.Forms.TextBox();
+ this.tbNode1SensorAussen = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// tbHost
//
- this.tbHost.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbHost.Location = new System.Drawing.Point(10, 42);
- this.tbHost.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbHost.MaximumSize = new System.Drawing.Size(399, 26);
- this.tbHost.MinimumSize = new System.Drawing.Size(399, 24);
+ this.tbHost.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbHost.Location = new System.Drawing.Point(11, 52);
+ this.tbHost.Margin = new System.Windows.Forms.Padding(5);
+ this.tbHost.MaximumSize = new System.Drawing.Size(531, 26);
+ this.tbHost.MinimumSize = new System.Drawing.Size(250, 25);
this.tbHost.Name = "tbHost";
- this.tbHost.Size = new System.Drawing.Size(399, 25);
+ this.tbHost.Size = new System.Drawing.Size(250, 25);
this.tbHost.TabIndex = 1;
//
// tbPort
//
- this.tbPort.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbPort.Location = new System.Drawing.Point(10, 92);
- this.tbPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbPort.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbPort.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbPort.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbPort.Location = new System.Drawing.Point(11, 114);
+ this.tbPort.Margin = new System.Windows.Forms.Padding(5);
+ this.tbPort.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbPort.MinimumSize = new System.Drawing.Size(250, 25);
this.tbPort.Name = "tbPort";
- this.tbPort.Size = new System.Drawing.Size(399, 25);
+ this.tbPort.Size = new System.Drawing.Size(250, 25);
this.tbPort.TabIndex = 2;
//
// lbUser
//
this.lbUser.AutoSize = true;
this.lbUser.BackColor = System.Drawing.Color.Transparent;
- this.lbUser.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbUser.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbUser.ForeColor = System.Drawing.Color.White;
- this.lbUser.Location = new System.Drawing.Point(10, 123);
- this.lbUser.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbUser.Location = new System.Drawing.Point(12, 151);
+ this.lbUser.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbUser.Name = "lbUser";
- this.lbUser.Size = new System.Drawing.Size(77, 16);
+ this.lbUser.Size = new System.Drawing.Size(85, 16);
this.lbUser.TabIndex = 7;
this.lbUser.Text = "MQTT User";
//
// tbUser
//
- this.tbUser.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbUser.Location = new System.Drawing.Point(10, 142);
- this.tbUser.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbUser.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbUser.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbUser.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbUser.Location = new System.Drawing.Point(11, 175);
+ this.tbUser.Margin = new System.Windows.Forms.Padding(5);
+ this.tbUser.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbUser.MinimumSize = new System.Drawing.Size(250, 25);
this.tbUser.Name = "tbUser";
- this.tbUser.Size = new System.Drawing.Size(399, 25);
+ this.tbUser.Size = new System.Drawing.Size(250, 25);
this.tbUser.TabIndex = 3;
//
// tbPasswort
//
- this.tbPasswort.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbPasswort.Location = new System.Drawing.Point(10, 192);
- this.tbPasswort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbPasswort.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbPasswort.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbPasswort.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbPasswort.Location = new System.Drawing.Point(11, 236);
+ this.tbPasswort.Margin = new System.Windows.Forms.Padding(5);
+ this.tbPasswort.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbPasswort.MinimumSize = new System.Drawing.Size(250, 25);
this.tbPasswort.Name = "tbPasswort";
- this.tbPasswort.Size = new System.Drawing.Size(399, 25);
+ this.tbPasswort.Size = new System.Drawing.Size(250, 25);
this.tbPasswort.TabIndex = 4;
this.tbPasswort.UseSystemPasswordChar = true;
//
@@ -120,12 +121,12 @@
//
this.lbPasswort.AutoSize = true;
this.lbPasswort.BackColor = System.Drawing.Color.Transparent;
- this.lbPasswort.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbPasswort.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbPasswort.ForeColor = System.Drawing.Color.White;
- this.lbPasswort.Location = new System.Drawing.Point(10, 173);
- this.lbPasswort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbPasswort.Location = new System.Drawing.Point(8, 213);
+ this.lbPasswort.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbPasswort.Name = "lbPasswort";
- this.lbPasswort.Size = new System.Drawing.Size(112, 16);
+ this.lbPasswort.Size = new System.Drawing.Size(124, 16);
this.lbPasswort.TabIndex = 10;
this.lbPasswort.Text = "MQTT Passswort";
//
@@ -133,108 +134,108 @@
//
this.lbFrontend.AutoSize = true;
this.lbFrontend.BackColor = System.Drawing.Color.Transparent;
- this.lbFrontend.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbFrontend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbFrontend.ForeColor = System.Drawing.Color.White;
- this.lbFrontend.Location = new System.Drawing.Point(10, 223);
- this.lbFrontend.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbFrontend.Location = new System.Drawing.Point(306, 28);
+ this.lbFrontend.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbFrontend.Name = "lbFrontend";
- this.lbFrontend.Size = new System.Drawing.Size(144, 16);
+ this.lbFrontend.Size = new System.Drawing.Size(158, 16);
this.lbFrontend.TabIndex = 11;
this.lbFrontend.Text = "MQTT Topic Frontend";
//
// tbTopicFrontend
//
- this.tbTopicFrontend.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbTopicFrontend.Location = new System.Drawing.Point(10, 242);
- this.tbTopicFrontend.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbTopicFrontend.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbTopicFrontend.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbTopicFrontend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTopicFrontend.Location = new System.Drawing.Point(309, 53);
+ this.tbTopicFrontend.Margin = new System.Windows.Forms.Padding(5);
+ this.tbTopicFrontend.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbTopicFrontend.MinimumSize = new System.Drawing.Size(250, 25);
this.tbTopicFrontend.Name = "tbTopicFrontend";
- this.tbTopicFrontend.Size = new System.Drawing.Size(399, 25);
+ this.tbTopicFrontend.Size = new System.Drawing.Size(250, 25);
this.tbTopicFrontend.TabIndex = 5;
//
// lbBackend
//
this.lbBackend.AutoSize = true;
this.lbBackend.BackColor = System.Drawing.Color.Transparent;
- this.lbBackend.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbBackend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbBackend.ForeColor = System.Drawing.Color.White;
- this.lbBackend.Location = new System.Drawing.Point(10, 273);
- this.lbBackend.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbBackend.Location = new System.Drawing.Point(306, 89);
+ this.lbBackend.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbBackend.Name = "lbBackend";
- this.lbBackend.Size = new System.Drawing.Size(142, 16);
+ this.lbBackend.Size = new System.Drawing.Size(154, 16);
this.lbBackend.TabIndex = 13;
this.lbBackend.Text = "MQTT Topic Backend";
//
// tbTopicBackend
//
- this.tbTopicBackend.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbTopicBackend.Location = new System.Drawing.Point(9, 292);
- this.tbTopicBackend.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbTopicBackend.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbTopicBackend.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbTopicBackend.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTopicBackend.Location = new System.Drawing.Point(309, 114);
+ this.tbTopicBackend.Margin = new System.Windows.Forms.Padding(5);
+ this.tbTopicBackend.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbTopicBackend.MinimumSize = new System.Drawing.Size(250, 25);
this.tbTopicBackend.Name = "tbTopicBackend";
- this.tbTopicBackend.Size = new System.Drawing.Size(399, 25);
+ this.tbTopicBackend.Size = new System.Drawing.Size(250, 25);
this.tbTopicBackend.TabIndex = 6;
//
// lbQos
//
this.lbQos.AutoSize = true;
this.lbQos.BackColor = System.Drawing.Color.Transparent;
- this.lbQos.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbQos.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbQos.ForeColor = System.Drawing.Color.White;
- this.lbQos.Location = new System.Drawing.Point(10, 323);
- this.lbQos.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbQos.Location = new System.Drawing.Point(306, 151);
+ this.lbQos.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbQos.Name = "lbQos";
- this.lbQos.Size = new System.Drawing.Size(73, 16);
+ this.lbQos.Size = new System.Drawing.Size(80, 16);
this.lbQos.TabIndex = 15;
this.lbQos.Text = "MQTT Qos";
//
// tbQos
//
- this.tbQos.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbQos.Location = new System.Drawing.Point(10, 342);
- this.tbQos.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbQos.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbQos.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbQos.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbQos.Location = new System.Drawing.Point(309, 175);
+ this.tbQos.Margin = new System.Windows.Forms.Padding(5);
+ this.tbQos.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbQos.MinimumSize = new System.Drawing.Size(250, 25);
this.tbQos.Name = "tbQos";
- this.tbQos.Size = new System.Drawing.Size(399, 25);
+ this.tbQos.Size = new System.Drawing.Size(250, 25);
this.tbQos.TabIndex = 7;
//
// lbTimeout
//
this.lbTimeout.AutoSize = true;
this.lbTimeout.BackColor = System.Drawing.Color.Transparent;
- this.lbTimeout.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbTimeout.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbTimeout.ForeColor = System.Drawing.Color.White;
- this.lbTimeout.Location = new System.Drawing.Point(10, 373);
- this.lbTimeout.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbTimeout.Location = new System.Drawing.Point(306, 213);
+ this.lbTimeout.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbTimeout.Name = "lbTimeout";
- this.lbTimeout.Size = new System.Drawing.Size(101, 16);
+ this.lbTimeout.Size = new System.Drawing.Size(108, 16);
this.lbTimeout.TabIndex = 17;
this.lbTimeout.Text = "MQTT Timeout";
//
// tbTimeout
//
- this.tbTimeout.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbTimeout.Location = new System.Drawing.Point(10, 392);
- this.tbTimeout.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbTimeout.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbTimeout.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbTimeout.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbTimeout.Location = new System.Drawing.Point(309, 236);
+ this.tbTimeout.Margin = new System.Windows.Forms.Padding(5);
+ this.tbTimeout.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbTimeout.MinimumSize = new System.Drawing.Size(250, 25);
this.tbTimeout.Name = "tbTimeout";
- this.tbTimeout.Size = new System.Drawing.Size(399, 25);
+ this.tbTimeout.Size = new System.Drawing.Size(250, 25);
this.tbTimeout.TabIndex = 8;
//
// lbPlz
//
this.lbPlz.AutoSize = true;
this.lbPlz.BackColor = System.Drawing.Color.Transparent;
- this.lbPlz.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbPlz.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbPlz.ForeColor = System.Drawing.Color.White;
- this.lbPlz.Location = new System.Drawing.Point(10, 473);
- this.lbPlz.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbPlz.Location = new System.Drawing.Point(306, 275);
+ this.lbPlz.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbPlz.Name = "lbPlz";
- this.lbPlz.Size = new System.Drawing.Size(27, 16);
+ this.lbPlz.Size = new System.Drawing.Size(30, 16);
this.lbPlz.TabIndex = 19;
this.lbPlz.Text = "Ort";
//
@@ -242,33 +243,33 @@
//
this.tbCity.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.tbCity.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
- this.tbCity.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbCity.Location = new System.Drawing.Point(10, 492);
- this.tbCity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbCity.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbCity.MinimumSize = new System.Drawing.Size(399, 20);
+ this.tbCity.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbCity.Location = new System.Drawing.Point(309, 299);
+ this.tbCity.Margin = new System.Windows.Forms.Padding(5);
+ this.tbCity.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbCity.MinimumSize = new System.Drawing.Size(250, 25);
this.tbCity.Name = "tbCity";
- this.tbCity.Size = new System.Drawing.Size(399, 25);
+ this.tbCity.Size = new System.Drawing.Size(250, 25);
this.tbCity.TabIndex = 10;
this.tbCity.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbCity_KeyDown);
//
// btnSave
//
- this.btnSave.Location = new System.Drawing.Point(109, 651);
+ this.btnSave.Location = new System.Drawing.Point(608, 293);
+ this.btnSave.Margin = new System.Windows.Forms.Padding(4);
this.btnSave.Name = "btnSave";
- this.btnSave.Size = new System.Drawing.Size(191, 32);
+ this.btnSave.Size = new System.Drawing.Size(250, 35);
this.btnSave.TabIndex = 11;
- this.btnSave.Text = "Save Settings";
+ this.btnSave.Text = "Speichern";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.Button1_Click);
//
// lbFrontendId
//
this.lbFrontendId.AutoSize = true;
- this.lbFrontendId.Location = new System.Drawing.Point(9, 5);
- this.lbFrontendId.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.lbFrontendId.Location = new System.Drawing.Point(12, 6);
this.lbFrontendId.Name = "lbFrontendId";
- this.lbFrontendId.Size = new System.Drawing.Size(35, 13);
+ this.lbFrontendId.Size = new System.Drawing.Size(46, 17);
this.lbFrontendId.TabIndex = 24;
this.lbFrontendId.Text = "label1";
//
@@ -276,12 +277,12 @@
//
this.label1.AutoSize = true;
this.label1.BackColor = System.Drawing.Color.Transparent;
- this.label1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label1.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label1.ForeColor = System.Drawing.Color.White;
- this.label1.Location = new System.Drawing.Point(10, 73);
- this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label1.Location = new System.Drawing.Point(8, 89);
+ this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(75, 16);
+ this.label1.Size = new System.Drawing.Size(81, 16);
this.label1.TabIndex = 25;
this.label1.Text = "MQTT Port";
//
@@ -289,129 +290,142 @@
//
this.label2.AutoSize = true;
this.label2.BackColor = System.Drawing.Color.Transparent;
- this.label2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label2.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.White;
- this.label2.Location = new System.Drawing.Point(10, 23);
- this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.label2.Location = new System.Drawing.Point(8, 28);
+ this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(76, 16);
+ this.label2.Size = new System.Drawing.Size(84, 16);
this.label2.TabIndex = 26;
this.label2.Text = "MQTT Host";
//
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.BackColor = System.Drawing.Color.Transparent;
- this.label3.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.label3.ForeColor = System.Drawing.Color.White;
- this.label3.Location = new System.Drawing.Point(12, 622);
- this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(95, 18);
- this.label3.TabIndex = 27;
- this.label3.Text = "Postleitzahl:";
- //
// txtPlz
//
this.txtPlz.AutoSize = true;
- this.txtPlz.Location = new System.Drawing.Point(113, 625);
- this.txtPlz.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+ this.txtPlz.Location = new System.Drawing.Point(344, 274);
this.txtPlz.Name = "txtPlz";
- this.txtPlz.Size = new System.Drawing.Size(21, 13);
+ this.txtPlz.Size = new System.Drawing.Size(27, 17);
this.txtPlz.TabIndex = 28;
this.txtPlz.Text = "Plz";
this.txtPlz.Click += new System.EventHandler(this.TxtPlz_Click);
//
- // tbLngCode
- //
- this.tbLngCode.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbLngCode.Location = new System.Drawing.Point(10, 442);
- this.tbLngCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
- this.tbLngCode.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbLngCode.MinimumSize = new System.Drawing.Size(399, 20);
- this.tbLngCode.Name = "tbLngCode";
- this.tbLngCode.Size = new System.Drawing.Size(399, 25);
- this.tbLngCode.TabIndex = 9;
- //
// lbLngCode
//
this.lbLngCode.AutoSize = true;
this.lbLngCode.BackColor = System.Drawing.Color.Transparent;
- this.lbLngCode.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbLngCode.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lbLngCode.ForeColor = System.Drawing.Color.White;
- this.lbLngCode.Location = new System.Drawing.Point(10, 423);
- this.lbLngCode.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lbLngCode.Location = new System.Drawing.Point(8, 274);
+ this.lbLngCode.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.lbLngCode.Name = "lbLngCode";
- this.lbLngCode.Size = new System.Drawing.Size(109, 16);
+ this.lbLngCode.Size = new System.Drawing.Size(121, 16);
this.lbLngCode.TabIndex = 29;
this.lbLngCode.Text = "Landeskennung";
//
- // lbNodeMcu1
- //
- this.lbNodeMcu1.AutoSize = true;
- this.lbNodeMcu1.BackColor = System.Drawing.Color.Transparent;
- this.lbNodeMcu1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbNodeMcu1.ForeColor = System.Drawing.Color.White;
- this.lbNodeMcu1.Location = new System.Drawing.Point(10, 523);
- this.lbNodeMcu1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lbNodeMcu1.Name = "lbNodeMcu1";
- this.lbNodeMcu1.Size = new System.Drawing.Size(74, 16);
- this.lbNodeMcu1.TabIndex = 30;
- this.lbNodeMcu1.Text = "NodeMcu1";
- //
- // lbNodeMcu2
- //
- this.lbNodeMcu2.AutoSize = true;
- this.lbNodeMcu2.BackColor = System.Drawing.Color.Transparent;
- this.lbNodeMcu2.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.lbNodeMcu2.ForeColor = System.Drawing.Color.White;
- this.lbNodeMcu2.Location = new System.Drawing.Point(10, 573);
- this.lbNodeMcu2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
- this.lbNodeMcu2.Name = "lbNodeMcu2";
- this.lbNodeMcu2.Size = new System.Drawing.Size(74, 16);
- this.lbNodeMcu2.TabIndex = 31;
- this.lbNodeMcu2.Text = "NodeMcu2";
- //
- // tbNodeMcu1
- //
- this.tbNodeMcu1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
- this.tbNodeMcu1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
- this.tbNodeMcu1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbNodeMcu1.Location = new System.Drawing.Point(10, 542);
- this.tbNodeMcu1.Margin = new System.Windows.Forms.Padding(4);
- this.tbNodeMcu1.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbNodeMcu1.MinimumSize = new System.Drawing.Size(399, 20);
- this.tbNodeMcu1.Name = "tbNodeMcu1";
- this.tbNodeMcu1.Size = new System.Drawing.Size(399, 25);
- this.tbNodeMcu1.TabIndex = 32;
- //
- // tbNodeMcu2
- //
- this.tbNodeMcu2.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
- this.tbNodeMcu2.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
- this.tbNodeMcu2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.tbNodeMcu2.Location = new System.Drawing.Point(10, 592);
- this.tbNodeMcu2.Margin = new System.Windows.Forms.Padding(4);
- this.tbNodeMcu2.MaximumSize = new System.Drawing.Size(399, 25);
- this.tbNodeMcu2.MinimumSize = new System.Drawing.Size(399, 20);
- this.tbNodeMcu2.Name = "tbNodeMcu2";
- this.tbNodeMcu2.Size = new System.Drawing.Size(399, 25);
- this.tbNodeMcu2.TabIndex = 33;
+ // tbLngCode
+ //
+ this.tbLngCode.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbLngCode.Location = new System.Drawing.Point(11, 299);
+ this.tbLngCode.Margin = new System.Windows.Forms.Padding(5);
+ this.tbLngCode.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbLngCode.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbLngCode.Name = "tbLngCode";
+ this.tbLngCode.Size = new System.Drawing.Size(250, 25);
+ this.tbLngCode.TabIndex = 9;
+ //
+ // lbNode1
+ //
+ this.lbNode1.AutoSize = true;
+ this.lbNode1.BackColor = System.Drawing.Color.Transparent;
+ this.lbNode1.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbNode1.ForeColor = System.Drawing.Color.White;
+ this.lbNode1.Location = new System.Drawing.Point(605, 28);
+ this.lbNode1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbNode1.Name = "lbNode1";
+ this.lbNode1.Size = new System.Drawing.Size(116, 16);
+ this.lbNode1.TabIndex = 30;
+ this.lbNode1.Text = "Sensor Node Id";
+ //
+ // lbNode1SensorInnen
+ //
+ this.lbNode1SensorInnen.AutoSize = true;
+ this.lbNode1SensorInnen.BackColor = System.Drawing.Color.Transparent;
+ this.lbNode1SensorInnen.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lbNode1SensorInnen.ForeColor = System.Drawing.Color.White;
+ this.lbNode1SensorInnen.Location = new System.Drawing.Point(605, 89);
+ this.lbNode1SensorInnen.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.lbNode1SensorInnen.Name = "lbNode1SensorInnen";
+ this.lbNode1SensorInnen.Size = new System.Drawing.Size(102, 16);
+ this.lbNode1SensorInnen.TabIndex = 31;
+ this.lbNode1SensorInnen.Text = "Sensor innen";
+ //
+ // tbNode1
+ //
+ this.tbNode1.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNode1.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNode1.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNode1.Location = new System.Drawing.Point(608, 53);
+ this.tbNode1.Margin = new System.Windows.Forms.Padding(5);
+ this.tbNode1.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbNode1.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbNode1.Name = "tbNode1";
+ this.tbNode1.Size = new System.Drawing.Size(250, 25);
+ this.tbNode1.TabIndex = 32;
+ //
+ // tbNode1SensorInnen
+ //
+ this.tbNode1SensorInnen.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNode1SensorInnen.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNode1SensorInnen.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNode1SensorInnen.Location = new System.Drawing.Point(608, 114);
+ this.tbNode1SensorInnen.Margin = new System.Windows.Forms.Padding(5);
+ this.tbNode1SensorInnen.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbNode1SensorInnen.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorInnen.Name = "tbNode1SensorInnen";
+ this.tbNode1SensorInnen.Size = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorInnen.TabIndex = 33;
+ //
+ // tbNode1SensorAussen
+ //
+ this.tbNode1SensorAussen.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+ this.tbNode1SensorAussen.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+ this.tbNode1SensorAussen.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.tbNode1SensorAussen.Location = new System.Drawing.Point(608, 175);
+ this.tbNode1SensorAussen.Margin = new System.Windows.Forms.Padding(5);
+ this.tbNode1SensorAussen.MaximumSize = new System.Drawing.Size(531, 25);
+ this.tbNode1SensorAussen.MinimumSize = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorAussen.Name = "tbNode1SensorAussen";
+ this.tbNode1SensorAussen.Size = new System.Drawing.Size(250, 25);
+ this.tbNode1SensorAussen.TabIndex = 35;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.BackColor = System.Drawing.Color.Transparent;
+ this.label3.Font = new System.Drawing.Font("Arial", 7.8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.label3.ForeColor = System.Drawing.Color.White;
+ this.label3.Location = new System.Drawing.Point(605, 151);
+ this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(105, 16);
+ this.label3.TabIndex = 34;
+ this.label3.Text = "Sensor außen";
//
// Settings
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.ScrollBar;
- this.ClientSize = new System.Drawing.Size(425, 690);
- this.Controls.Add(this.tbNodeMcu2);
- this.Controls.Add(this.tbNodeMcu1);
- this.Controls.Add(this.lbNodeMcu2);
- this.Controls.Add(this.lbNodeMcu1);
+ this.ClientSize = new System.Drawing.Size(874, 339);
+ this.Controls.Add(this.tbNode1SensorAussen);
+ this.Controls.Add(this.label3);
+ this.Controls.Add(this.tbNode1SensorInnen);
+ this.Controls.Add(this.tbNode1);
+ this.Controls.Add(this.lbNode1SensorInnen);
+ this.Controls.Add(this.lbNode1);
this.Controls.Add(this.tbLngCode);
this.Controls.Add(this.lbLngCode);
this.Controls.Add(this.txtPlz);
- this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.label1);
this.Controls.Add(this.lbFrontendId);
@@ -433,7 +447,7 @@
this.Controls.Add(this.tbPort);
this.Controls.Add(this.tbHost);
this.Location = new System.Drawing.Point(500, 0);
- this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "Settings";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "Settings";
@@ -444,6 +458,7 @@
}
#endregion
+
private System.Windows.Forms.TextBox tbHost;
private System.Windows.Forms.TextBox tbPort;
private System.Windows.Forms.Label lbUser;
@@ -464,13 +479,14 @@
private System.Windows.Forms.Label lbFrontendId;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2;
- private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label txtPlz;
- private System.Windows.Forms.TextBox tbLngCode;
private System.Windows.Forms.Label lbLngCode;
- private System.Windows.Forms.Label lbNodeMcu1;
- private System.Windows.Forms.Label lbNodeMcu2;
- private System.Windows.Forms.TextBox tbNodeMcu1;
- private System.Windows.Forms.TextBox tbNodeMcu2;
+ private System.Windows.Forms.TextBox tbLngCode;
+ private System.Windows.Forms.Label lbNode1;
+ private System.Windows.Forms.Label lbNode1SensorInnen;
+ private System.Windows.Forms.TextBox tbNode1;
+ private System.Windows.Forms.TextBox tbNode1SensorInnen;
+ private System.Windows.Forms.TextBox tbNode1SensorAussen;
+ private System.Windows.Forms.Label label3;
}
}
\ No newline at end of file
diff --git a/Wetterstation/Settings.cs b/Wetterstation/Settings.cs
index 6e39b21117a3b1df08a8844ef9a3b808063ee77c..986cc075b5116c255f678e65bcc3296304761047 100644
--- a/Wetterstation/Settings.cs
+++ b/Wetterstation/Settings.cs
@@ -35,6 +35,9 @@ namespace Wetterstation
tbCity.Text = WeatherstationSettings.city;
txtPlz.Text = WeatherstationSettings.plz;
tbLngCode.Text = WeatherstationSettings.lngCode;
+ tbNode1.Text = WeatherstationSettings.node1Id;
+ tbNode1SensorInnen.Text = WeatherstationSettings.node1Innen;
+ tbNode1SensorAussen.Text = WeatherstationSettings.node1Aussen;
}
private String generateId()
@@ -116,6 +119,9 @@ namespace Wetterstation
mqttSettings.plz = txtPlz.Text;
mqttSettings.city = tbCity.Text;
mqttSettings.lngCode = tbLngCode.Text;
+ mqttSettings.node1Id = tbNode1.Text;
+ mqttSettings.node1Innen = tbNode1SensorInnen.Text;
+ mqttSettings.node1Aussen = tbNode1SensorAussen.Text;
Console.WriteLine("Speichere Settings ");
SqliteDataAccess.SaveWeatherstationSettings(mqttSettings);
diff --git a/Wetterstation/SettingsModel.cs b/Wetterstation/SettingsModel.cs
index 4ab9657db4f36043cc2426d3713a9fb8dee7f7a4..47362f4eaec1787fb323f874913e533bda3624ee 100644
--- a/Wetterstation/SettingsModel.cs
+++ b/Wetterstation/SettingsModel.cs
@@ -25,5 +25,11 @@
public string city { get; set; }
public string lngCode { get; set; }
+
+ public string node1Id { get; set; }
+
+ public string node1Innen { get; set; }
+
+ public string node1Aussen { get; set; }
}
}
diff --git a/Wetterstation/SqliteDataAccess.cs b/Wetterstation/SqliteDataAccess.cs
index f94a9750732cfffba853a4fd5783352effd98b24..ea115f0dba1d49b2e12cb4d2e325c0eeecdfd00a 100644
--- a/Wetterstation/SqliteDataAccess.cs
+++ b/Wetterstation/SqliteDataAccess.cs
@@ -35,7 +35,10 @@ namespace Wetterstation
"frontendId = @frontendId, " +
"lngCode = @lngCode, " +
"plz = @plz, " +
- "city = @city;",
+ "city = @city, " +
+ "node1Id = @node1Id, " +
+ "node1Innen = @node1Innen, " +
+ "node1Aussen = @node1IdAussen;",
mqttSettings);
}
}
diff --git a/Wetterstation/frontend.db b/Wetterstation/frontend.db
index c80ebb9c6818e01761d660126550e2db0fb072a6..08d6dbe1be64593955f2e646d8ca5cdf2d4edf5d 100644
Binary files a/Wetterstation/frontend.db and b/Wetterstation/frontend.db differ