Skip to content
This repository was archived by the owner on Jan 30, 2024. It is now read-only.

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ldittmar81
ldittmar81 committed Mar 20, 2019
1 parent a72ca06 commit 43fbc2b
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 43 deletions.
26 changes: 12 additions & 14 deletions admin/index_m.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<head>
<!-- these 4 files always have to be included -->
<link rel="stylesheet" type="text/css" href="../../lib/css/materialize.css">
<link rel="stylesheet" type="text/css" href="lib/css/nouislider.min.css"/>
<link rel="stylesheet" type="text/css" href="../../css/adapter.css"/>

<script type="text/javascript" src="../../lib/js/jquery-3.2.1.min.js"></script>
Expand All @@ -11,7 +10,6 @@
<!-- these files always have to be included -->
<script type="text/javascript" src="../../js/translate.js"></script>
<script type="text/javascript" src="../../lib/js/materialize.js"></script>
<script type="text/javascript" src="lib/js/nouislider.min.js"></script>
<script type="text/javascript" src="../../js/adapter-settings.js"></script>
<script type="text/javascript" src="words.js"></script>
<style>
Expand Down Expand Up @@ -130,12 +128,12 @@
</div>

<div class="row">
<div class="input-field col s6">
<div class="input-field col m4">
<input class="value" id="documentation" type="checkbox" />
<label for="documentation" class="translate">Show documentations</label>
<span class="translate"></span>
</div>
<div class="input-field col s6">
<div class="input-field col m8">
<select class="value" multiple id="doc_langs">
<option class="translate" value="" disabled selected>Select the desired languages for the documentations</option>
<option class="translate" value="de">German</option>
Expand Down Expand Up @@ -186,37 +184,37 @@
<label for="noCurrentSysData" class="translate">Don't load current system data</label>
<span class="translate"></span>
</div>
<div class="input-field col m4 l2">
<div class="col m4 l2">
<p class="range-field">
<input class="value" id="cpuSpeed" type="range" min="2" max="10" />
<input class="value" id="cpuSpeed" type="range" min="0" max="10" />
</p>
<label for="cpuSpeed" class="translate">Load CPU data every x seconds</label>
<span class="translate"></span>
</div>
<div class="input-field col m4 l2">
<div class="col m4 l2">
<p class="range-field">
<input class="value" id="menSpeed" type="range" min="2" max="10" />
<input class="value" id="menSpeed" type="range" min="0" max="10" />
</p>
<label for="menSpeed" class="translate">Load memory data every x seconds</label>
<span class="translate"></span>
</div>
<div class="input-field col m4 l2">
<div class="col m4 l2">
<p class="range-field">
<input class="value" id="diskSpeed" type="range" min="2" max="10" />
<input class="value" id="diskSpeed" type="range" min="0" max="10" />
</p>
<label for="diskSpeed" class="translate">Load disk data every x seconds</label>
<span class="translate"></span>
</div>
<div class="input-field col m4 l2">
<div class="col m4 l2">
<p class="range-field">
<input class="value" id="batterySpeed" type="range" min="2" max="10" />
<input class="value" id="batterySpeed" type="range" min="0" max="10" />
</p>
<label for="batterySpeed" class="translate">Load battery data every x seconds</label>
<span class="translate"></span>
</div>
<div class="input-field col m4 l2">
<div class="col m4 l2">
<p class="range-field">
<input class="value" id="networkSpeed" type="range" min="2" max="10" />
<input class="value" id="networkSpeed" type="range" min="0" max="10" />
</p>
<label for="networkSpeed" class="translate">Load network data every x seconds</label>
<span class="translate"></span>
Expand Down
6 changes: 0 additions & 6 deletions admin/lib/css/nouislider.min.css
View file

This file was deleted.

1 change: 0 additions & 1 deletion admin/lib/js/nouislider.min.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion admin/tab_m.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ <h2 id="forumTitle">ioBroker Forum <small id="forumTime"></small></h2>

<p class="h4 alert alert-info">
<span class="translate">No guarantee can be given for the correctness and completeness of external links.</span>
<br>
<br/><br/>
<span class="translate">If links are missing or wrong, please send us an e-mail to</span>:&nbsp;
<a href="mailto:iobroker@lmdsoft.de?subject=Info-Dokumentation" class="translate">Adapter care team</a>
</p>
Expand Down
20 changes: 10 additions & 10 deletions io-package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
"common": {
"name": "System",
"role": "info",
"icon": ""
"icon": "lib/img/icons/system.png"
},
"native": {}
},
Expand Down Expand Up @@ -280,7 +280,7 @@
"common": {
"name": "CPU",
"role": "info",
"icon": ""
"icon": "lib/img/icons/cpu.png"
},
"native": {}
},
Expand Down Expand Up @@ -357,7 +357,7 @@
"native": {}
},
{
"_id": "sysinfo.cpu.currentLoad.currentload_sytem",
"_id": "sysinfo.cpu.currentLoad.currentload_system",
"type": "state",
"common": {
"name": "CPU load system in %",
Expand Down Expand Up @@ -441,7 +441,7 @@
"native": {}
},
{
"_id": "sysinfo.cpu.currentLoad.raw_currentload_sytem",
"_id": "sysinfo.cpu.currentLoad.raw_currentload_system",
"type": "state",
"common": {
"name": "CPU load system raw values",
Expand Down Expand Up @@ -553,7 +553,7 @@
"common": {
"name": "Memory",
"role": "info",
"icon": ""
"icon": "lib/img/icons/memory.png"
},
"native": {}
},
Expand Down Expand Up @@ -668,7 +668,7 @@
"common": {
"name": "OS",
"role": "info",
"icon": ""
"icon": "lib/img/icons/os.png"
},
"native": {}
},
Expand Down Expand Up @@ -696,7 +696,7 @@
"common": {
"name": "Disks",
"role": "info",
"icon": ""
"icon": "lib/img/icons/disk.png"
},
"native": {}
},
Expand Down Expand Up @@ -733,7 +733,7 @@
"common": {
"name": "Network",
"role": "info",
"icon": ""
"icon": "lib/img/icons/network.png"
},
"native": {}
},
Expand All @@ -752,7 +752,7 @@
"common": {
"name": "Battery",
"role": "info",
"icon": ""
"icon": "lib/img/icons/battery.png"
},
"native": {}
},
Expand Down Expand Up @@ -833,7 +833,7 @@
"_id": "sysinfo.battery.timeremaining",
"type": "state",
"common": {
"name": "minutes left (if discharging)",
"name": "Minutes left (if discharging)",
"type": "number",
"role": "value",
"read": true,
Expand Down
22 changes: 11 additions & 11 deletions main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const updateSysinfo = function () {
setState('cpu', 'currentLoad', key, typeof data[key], data[key]);
}
});
if (!adapter.config.noCurrentSysData) {
if (!adapter.config.noCurrentSysData && adapter.config.cpuSpeed !== 0) {
let speed = adapter.config.cpuSpeed;
if (!speed) {
speed = 2;
Expand All @@ -188,7 +188,7 @@ const updateSysinfo = function () {
setState('cpu', 'temperature', key, typeof data[key], data[key]);
}
});
if (!adapter.config.noCurrentSysData) {
if (!adapter.config.noCurrentSysData && adapter.config.cpuSpeed !== 0) {
let speed = adapter.config.cpuSpeed;
if (!speed) {
speed = 2;
Expand All @@ -206,7 +206,7 @@ const updateSysinfo = function () {
Object.keys(data).forEach(function (key) {
setState('memory', 'info', key, typeof data[key], data[key]);
});
if (!adapter.config.noCurrentSysData) {
if (!adapter.config.noCurrentSysData && adapter.config.memSpeed !== 0) {
let speed = adapter.config.memSpeed;
if (!speed) {
speed = 2;
Expand Down Expand Up @@ -243,7 +243,7 @@ const updateSysinfo = function () {
.then(data => {
if (data.length > 0) {
Object.keys(data).forEach(function (key) {
createChannel('disks', 'diskLayout', 'dev' + key);
createChannel('disks', 'blockDevices', 'dev' + key);
Object.keys(data[key]).forEach(function (key2) {
if ((typeof data[key][key2] === 'string' && data[key][key2].length) || typeof data[key][key2] !== 'string') {
setState('disks', 'blockDevices.dev' + key, key2, typeof data[key][key2], data[key][key2]);
Expand Down Expand Up @@ -274,7 +274,7 @@ const updateSysinfo = function () {
if (data.length > 0) {
Object.keys(data).forEach(function (key) {
fsUsed[key] = [];
createChannel('disks', 'diskLayout', 'fs' + key);
createChannel('disks', 'fsSize', 'fs' + key);
Object.keys(data[key]).forEach(function (key2) {
if ((typeof data[key][key2] === 'string' && data[key][key2].length) || typeof data[key][key2] !== 'string') {
setState('disks', 'fsSize.fs' + key, key2, typeof data[key][key2], data[key][key2]);
Expand All @@ -284,7 +284,7 @@ const updateSysinfo = function () {
}
});
});
if (!adapter.config.noCurrentSysData) {
if (!adapter.config.noCurrentSysData && adapter.config.diskSpeed !== 0) {
let speed = adapter.config.diskSpeed;
if (!speed) {
speed = 5;
Expand Down Expand Up @@ -321,7 +321,7 @@ const updateSysinfo = function () {
setState('battery', null, key, typeof data[key], data[key]);
}
});
if (!adapter.config.noCurrentSysData) {
if (!adapter.config.noCurrentSysData && adapter.config.batterySpeed !== 0) {
let speed = adapter.config.batterySpeed;
if (!speed) {
speed = 5;
Expand Down Expand Up @@ -367,14 +367,14 @@ const updateCurrentCPUTempInfos = function () {

sistm.cpuTemperature()
.then(data => {
adapter.setState('sysinfo.cpu.temperature.main', {val: data['main'], ack: true});
cpuTemp.push(data['main']);
adapter.setState('sysinfo.cpu.temperature.main', {val: data.main, ack: true});
cpuTemp.push(data.main);
if (cpuTemp.length > 30) {
cpuTemp.shift();
}
adapter.setState('sysinfo.cpu.temperature.main_hist', {val: cpuTemp.toString(), ack: true});
adapter.setState('sysinfo.cpu.temperature.cores', {val: data['cores'], ack: true});
adapter.setState('sysinfo.cpu.temperature.max', {val: data['max'], ack: true});
adapter.setState('sysinfo.cpu.temperature.cores', {val: data.cores, ack: true});
adapter.setState('sysinfo.cpu.temperature.max', {val: data.max, ack: true});
})
.catch(error => adapter.log.error(error));

Expand Down

0 comments on commit 43fbc2b

Please sign in to comment.