From 4d160664a9f6df6f9c0ccea710d9393e75825936 Mon Sep 17 00:00:00 2001 From: petervanv <58996467+petervanv@users.noreply.github.com> Date: Sat, 30 May 2020 23:58:38 +0200 Subject: [PATCH 1/4] Dutch language update 0.5.48 --- translate/translate.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/translate/translate.json b/translate/translate.json index d7801cd6..b51b4968 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -508,6 +508,7 @@ }, { "en": ", for this link to work you must download MeshCentral Router run it and click the install button.", + "nl": ", om deze link te laten werken, moet u MeshCentral Router downloaden, het uitvoeren en op de installatieknop klikken.", "xloc": [ "default.handlebars->25->664" ] @@ -24994,6 +24995,7 @@ }, { "en": "Start MeshCentral Router", + "nl": "Start MeshCentral Router", "xloc": [ "default.handlebars->25->663" ] @@ -31280,4 +31282,4 @@ ] } ] -} \ No newline at end of file +} From 5ad469e8b43b7c62aff8c46c64518257ae20d4e4 Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Sun, 31 May 2020 11:24:34 -0700 Subject: [PATCH 2/4] Hooked up power events --- agents/meshcore.js | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/agents/meshcore.js b/agents/meshcore.js index 17c7037b..36920ef8 100644 --- a/agents/meshcore.js +++ b/agents/meshcore.js @@ -251,6 +251,35 @@ function createMeshCore(agent) { return (svc); } + if (require('identifiers').isBatteryPowered && require('identifiers').isBatteryPowered()) + { + require('MeshAgent')._battLevelChanged = function _battLevelChanged(val) + { + _battLevelChanged.self.SendCommand({ action: 'battery', state: _battLevelChanged.self._currentPowerState, level: val }); + }; + require('MeshAgent')._battLevelChanged.self = require('MeshAgent'); + require('MeshAgent')._powerChanged = function _powerChanged(val) + { + _powerChanged.self._currentPowerState = (val == 'AC' ? 'ac' : 'dc'); + _powerChanged.self.SendCommand({ action: 'battery', state: (val == 'AC' ? 'ac' : 'dc') }); + }; + require('MeshAgent')._powerChanged.self = require('MeshAgent'); + require('MeshAgent').on('Connected', function (status) + { + if (status == 0) + { + require('power-monitor').removeListener('acdc', this._powerChanged); + require('power-monitor').removeListener('batteryLevel', this._battLevelChanged); + } + else + { + require('power-monitor').on('acdc', this._powerChanged); + require('power-monitor').on('batteryLevel', this._battLevelChanged); + } + }); + } + + /* function borderController() { this.container = null; From 3582adfbe3ea1224ae58daad380bab85b82bbeea Mon Sep 17 00:00:00 2001 From: Bryan Roe Date: Sun, 31 May 2020 11:26:29 -0700 Subject: [PATCH 3/4] No longer needed, as it is now part of the agent --- agents/modules_meshcore/power-monitor.js | 34 ------------------------ 1 file changed, 34 deletions(-) delete mode 100644 agents/modules_meshcore/power-monitor.js diff --git a/agents/modules_meshcore/power-monitor.js b/agents/modules_meshcore/power-monitor.js deleted file mode 100644 index ab70bbbc..00000000 --- a/agents/modules_meshcore/power-monitor.js +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2018-2020 Intel Corporation - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -function powerMonitor() -{ - this._ObjectID = 'power-monitor'; - require('events').EventEmitter.call(this, true) - .createEvent('changed') - .createEvent('sx') - .createEvent('batteryLevel') - .createEvent('acdc') - .createEvent('display'); - - this._i = setImmediate(function (self) - { - require('user-sessions'); // This is needed because this is where the Windows Messages are processed for these events - delete self._i; - }, this); -} - -module.exports = new powerMonitor(); \ No newline at end of file From 0dfa92c1fdfa3cc8a46071dd4759cd88fbe190a7 Mon Sep 17 00:00:00 2001 From: petervanv <58996467+petervanv@users.noreply.github.com> Date: Sun, 31 May 2020 22:11:04 +0200 Subject: [PATCH 4/4] Dutch language update 0.5.49 --- translate/translate.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/translate/translate.json b/translate/translate.json index ba230d3f..a7a1d641 100644 --- a/translate/translate.json +++ b/translate/translate.json @@ -8349,6 +8349,7 @@ }, { "en": "Device is battery powered, {0}%", + "nl": "Apparaat werkt op batterijen, {0}%", "xloc": [ "default.handlebars->25->465" ] @@ -8547,6 +8548,7 @@ }, { "en": "Device is plugged-in", + "nl": "Apparaat is aangesloten", "xloc": [ "default.handlebars->25->464" ]