Update for 3.7 release

CHANGELOG.md

@@ -4,12 +4,13 @@ NOTE TO OPENLUUP USERS: All current versions of Reactor REQUIRE openLuup 2020.04
 
 **DEPRECATION NOTICE:** The expression functions `arraypush()`, `arraypop()`, `arrayunshift()` and `arrayshift()` have been made first-class functions in the LuaXP module under the names `push()`, `pop()`, `unshift()` and `shift()` respectively. The `array...()` versions are now deprecated, and will be removed from a future release. Please convert to the new functions, which for all practical purposes are identical (so you just need to change the names in your expressions and it's done).
 
-## Version 3.7 (20186) 
+## Version 3.7 (20190)
 
 * Enhancement: Tools tab now has a "Device Repair" section that appears when missing/suspect devices are detected. This tool should be especially handy for migrating ReactorSensors between systems, or after device replacements, etc.
 * Added `RepairDevice` action (in master service ID) to repair broken device IDs on any device.
 * Detect duplicate master devices (prevent startup of duplicates).
 * Fix an issue with backup/restore not marking success on ALTUI (apparent ALTUI oddness, same as 20049-02).
+* Remove device ID on Logic Summary link on master device; shouldn't be there/copy-paste error.
 * Hotfix 20185-01: Fix crash generating Logic Summary when activity delay uses variable reference.
 * Hotfix 20169-01: (openLuup only) fix error logged when cleaning state variables on RS (non-critical).
 * Hotfix 20145-01: Fix field redraw/reload problem with "not between" operator on date/time conditions.

J_ReactorSensor_UI7.js

@@ -17,11 +17,11 @@ var ReactorSensor = (function(api, $) {
 	/* unique identifier for this plugin... */
 	var uuid = '21b5725a-6dcd-11e8-8342-74d4351650de';
 
-	var pluginVersion = '3.7-20186';
+	var pluginVersion = '3.7-20190';
 
 	var DEVINFO_MINSERIAL = 482;
 
-	var _UIVERSION = 20130;     /* must coincide with Lua core */
+	var _UIVERSION = 20190;     /* must coincide with Lua core */
 
 	var _CDATAVERSION = 20045;  /* must coincide with Lua core */
 

J_Reactor_UI7.js

@@ -17,9 +17,9 @@ var Reactor = (function(api, $) {
 	/* unique identifier for this plugin... */
 	var uuid = '72acc6ea-f24d-11e8-bd87-74d4351650de';
 
-	var pluginVersion = '3.7-20186';
+	var pluginVersion = '3.7-20190';
 
-	var _UIVERSION = 20130;     /* must coincide with Lua core */
+	var _UIVERSION = 20190;     /* must coincide with Lua core */
 
 	var _DOCURL = "https://www.toggledbits.com/static/reactor/docs/3.6/";
 
@@ -116,7 +116,7 @@ var Reactor = (function(api, $) {
 			' &bull; <a href="/cgi-bin/cmh/log.sh?Device=LuaUPnP" target="_blank">Log&nbsp;File</a>' +
 			' &bull; <a href="' + api.getDataRequestURL() + '?id=lr_Reactor&action=status" target="_blank">Plugin&nbsp;Status</a>' +
 			' &bull; <a href="' + api.getDataRequestURL() + '?id=lr_Reactor&action=files" target="_blank">Plugin&nbsp;Files</a>' +
-			' &bull; <a href="' + api.getDataRequestURL() + '?id=lr_Reactor&action=summary&device=' + api.getCpanelDeviceId() + '" target="_blank">Logic&nbsp;Summary</a>' +
+			' &bull; <a href="' + api.getDataRequestURL() + '?id=lr_Reactor&action=summary" target="_blank">Logic&nbsp;Summary</a>' +
 			' &bull; <a href="' + api.getDataRequestURL() + '?id=lr_Reactor&action=clearstate" target="_blank">Clear&nbsp;Data</a>' +
 			'</div>';
 		return html;

L_Reactor.lua

@@ -11,13 +11,13 @@ local debugMode = false
 
 local _PLUGIN_ID = 9086
 local _PLUGIN_NAME = "Reactor"
-local _PLUGIN_VERSION = "3.7-20186"
+local _PLUGIN_VERSION = "3.7-20190"
 local _PLUGIN_URL = "https://www.toggledbits.com/reactor"
 local _DOC_URL = "https://www.toggledbits.com/static/reactor/docs/3.6/"
 
-local _CONFIGVERSION	= 20179
+local _CONFIGVERSION	= 20190
 local _CDATAVERSION		= 20045	-- must coincide with JS
-local _UIVERSION		= 20130	-- must coincide with JS
+local _UIVERSION		= 20190	-- must coincide with JS
 	  _SVCVERSION		= 20185	-- must coincide with impl file (not local)
 
 local MYSID = "urn:toggledbits-com:serviceId:Reactor"
@@ -3847,8 +3847,8 @@ local function processCondition( cond, grp, cdata, tdev )
 
 	-- Preserve the result of the condition eval. We are edge-triggered,
 	-- so only save changes, with timestamp.
-	cs.statechanged = state ~= cs.laststate
-	if cs.statechanged then
+cs.statechanged = nil -- DEVELOPMENT
+	if state ~= cs.laststate then
 		D("processCondition() recording %1 state change", cond.id)
 		-- ??? At certain times, Vera gets a time that is in the future, or so it appears. It looks like the TZ offset isn't applied, randomly.
 		-- Maybe if call is during ntp update, don't know. Investigating... This log message helps detection and analysis.
@@ -4044,7 +4044,7 @@ local function processCondition( cond, grp, cdata, tdev )
 					local holdoff = cs.pulseuntil + condopt.pulsebreak
 					D("processCondition() pulse repeat, break until %1", holdoff)
 					addEvent{ dev=tdev,
-						msg="%(cname)s end of pulse, in repeat break, %(dly)s more",
+						msg="%(cname)s end of pulse (repeat mode); break %(dly)s more",
 						cname=(cond.type or "group")=="group" and ("Group "..(cond.name or cond.id)) or ("Condition "..cond.id),
 						cond=cond.id, delay=holdoff-now }
 					if now >= holdoff then
@@ -4070,7 +4070,7 @@ local function processCondition( cond, grp, cdata, tdev )
 				else
 					-- One-shot pulse (no repeat).
 					addEvent{ dev=tdev,
-						msg="%(cname)s end of pulse, one-shot hold",
+						msg="%(cname)s end of pulse (one-shot mode)",
 						cname=(cond.type or "group")=="group" and ("Group "..(cond.name or cond.id)) or ("Condition "..cond.id),
 						cond=cond.id }
 					cs.pulseuntil = state and cs.pulseuntil or nil

README.md

@@ -52,4 +52,4 @@ My branching strategy for Reactor includes four branches, as follows:
 Reactor currently is copyrighted and all rights are reserved. Although the source code is visible for public
 review, it is not an open source project at this time and the release of derivative works is not permitted.
 
-Please refer to [the full license in the Reactor documentation](https://www.toggledbits.com/static/reactor/docs/3.6/Installation/).
+Please refer to [the full license in the Reactor documentation](https://www.toggledbits.com/static/reactor/docs/Installation/).