Merge pull request #107 from mcrossley/master

v3.10.3 final changes b3120

CumulusMX/GW1000Station.cs

@@ -468,7 +468,7 @@ private Discovery DiscoverGW1000()
 					client.EnableBroadcast = true;
 					client.Send(sendBytes, sendBytes.Length, sendEp);
 
-					string[] namesToCheck = { "GW1000A", "WH2650A", "EasyWeather", "AMBWeather" };
+					string[] namesToCheck = { "GW1000A", "WH2650A", "EasyWeather", "AMBWeather", "WS1900A" };
 
 					do
 					{
@@ -501,6 +501,10 @@ private Discovery DiscoverGW1000()
 									}
 								}
 							}
+							else
+							{
+								cumulus.LogDebugMessage($"Discovered an unsupported device: Name={name}, IP={ipAddr}, MAC={macHex}");
+							}
 						}
 						catch { }
 					} while (DateTime.Now < endTime);

CumulusMX/Properties/AssemblyInfo.cs

@@ -6,7 +6,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Cumulus MX")]
-[assembly: AssemblyDescription("Version 3.10.3 - Build 3119")]
+[assembly: AssemblyDescription("Version 3.10.3 - Build 3120")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Cumulus MX")]
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.10.3.3119")]
-[assembly: AssemblyFileVersion("3.10.3.3119")]
+[assembly: AssemblyVersion("3.10.3.3120")]
+[assembly: AssemblyFileVersion("3.10.3.3120")]

CumulusMX/StationSettings.cs

@@ -153,6 +153,11 @@ internal string GetStationAlpacaFormData()
 				pressoffset = cumulus.EwOptions.PressOffset
 			};
 
+			var wmr928 = new JsonStationSettingsWMR928()
+			{
+				comportname = cumulus.ComportName
+			};
+
 			var imetAdvanced = new JsonStationSettingsImetAdvanced()
 			{
 				syncstationclock = cumulus.StationOptions.SyncTime,
@@ -376,6 +381,7 @@ internal string GetStationAlpacaFormData()
 				fineoffset = fineoffset,
 				easyw = easyweather,
 				imet = imet,
+				wmr928 = wmr928,
 				Options = options,
 				Forecast = forecast,
 				Solar = solar,
@@ -864,6 +870,22 @@ internal string UpdateStationConfig(IHttpContext context)
 					context.Response.StatusCode = 500;
 				}
 
+				// WMR928
+				try
+				{
+					if (settings.wmr928 != null)
+					{
+						cumulus.ComportName = settings.wmr928.comportname ?? cumulus.ComportName;
+					}
+				}
+				catch (Exception ex)
+				{
+					var msg = "Error processing WMR928 settings: " + ex.Message;
+					cumulus.LogMessage(msg);
+					errorMsg += msg + "\n\n";
+					context.Response.StatusCode = 500;
+				}
+
 				// Units
 				try
 				{
@@ -1076,6 +1098,7 @@ internal class JsonStationSettingsData
 		public JsonStationSettingsFineOffset fineoffset { get; set; }
 		public JsonStationSettingsEasyWeather easyw { get; set; }
 		public JsonStationSettingsImet imet { get; set; }
+		public JsonStationSettingsWMR928 wmr928 { get; set; }
 		public JsonStationSettingsOptions Options { get; set; }
 		public JsonStationSettingsForecast Forecast { get; set; }
 		public JsonStationSettingsSolar Solar { get; set; }
@@ -1215,6 +1238,12 @@ internal class JSonStationSettingsGw1000Conn
 		public string macaddress { get; set; }
 	}
 
+	internal class JsonStationSettingsWMR928
+	{
+		public string comportname { get; set; }
+	}
+
+
 	internal class JsonStationSettingsImet
 	{
 		public string comportname { get; set; }

Updates.txt

@@ -1,4 +1,4 @@
-3.10.3 - b3119
+3.10.3 - b3120
 ——————————————
 - Fix: Problem with setpagedata.js in "/legacy-webfiles"
 - Fix: Ecowitt GW1000 and clone auto-discovery extended to WH2650 and Ambient clones
@@ -7,17 +7,20 @@
 - Fix: Blake-Larsen sunshine recorder, the SRsunshine.dat file was using user locale decode, it should always use dot decimal
 - Fix: MQTT only read the Update template file at start-up or if the filename was changed. It now reads the file at every update
 - Fix: Davis WLL was not calculating chill hours and heating/cooling degree days on catch-up
+- Fix: Add missing COM port setting for OS WM918/WMR928 stations
 
 - New: Adds Records Began Date to - Station Settings|General|Advanced
 - New: Adds support for GW1000 firmware 1.6.6
 - New: Default web site - You can now use the "data-cmxdata" attribute on any HTML element, not just spans. BUT note, ALL the innerHTML will get replaced with the JSON data.
 - New: Two new web tags that HTML encode the station description strings - <#locationenc>, <#longlocationenc>
+- New: Adds a NOAA Reports page to the default web site
 - New: Adds support for the EcoWitt WH35 8 channel leaf wetness sensor
 	- Note that only channels 1-4 will be displayed on the dashboard
 	- Extends the leaf wetness web tags with <#LeafWetness5> to <#LeafWetness8> added
 	- samplestrings.ini adds leaf wetness captions 5-8
 - New: Experimental - Enables Battery Low alarm for WMR100/WMR928 stations
 
+- Changed: The Default web site menu system has been rewritten. It is now all defined in the file menu.js
 
 
 3.10.2 - b3117