Skip to content

Commit

Permalink
v0.2.1 Alpha
Browse files Browse the repository at this point in the history
  • Loading branch information
lucsoft committed May 24, 2019
1 parent 2325418 commit 42ba789
Show file tree
Hide file tree
Showing 12 changed files with 646 additions and 473 deletions.
61 changes: 15 additions & 46 deletions Mainframe/configs/lucsoft.deviceManager/config.json
Original file line number Diff line number Diff line change
@@ -1,49 +1,18 @@
{
"devices": [
{
"type": 1,
"name": "Schreibtischlampe",
"roomid": "2138791",
"defaultstate": false,
"id":"3472908",
"requires": ["lucsoft.commandManager"],
"stateupdate": "(e,g) => {let lscM = mmang.getModule(\"lucsoft.commandManager\").data.control;if(e){lscM.enableLED();} else {lscM.disableLED();}"
},
{
"type":2,
"name":"Deckenlampe",
"roomid": "2138791",
"defaultstate": false,
"id":"4238749",
"requires": [],
"stateupdate": "(e,g) => {}"
},
{
"type": 5,
"name": "Haustür",
"roomid":"123144",
"defaultstate": true,
"id":"3224523",
"requires": ["lucsoft.serialConnect"],
"stateupdate": "(e,g) => {}"
},
{
"type": 9,
"name":"Bewegungsmelder",
"roomid":"123144",
"defaultstate": true,
"id":"1235462",
"requires": [],
"stateupdate":"(e,g) => {}"
},
{
"type":7,
"name": "PC-Strom",
"roomid": "2138791",
"defaultstate": false,
"id":"1234742",
"requires": [],
"stateupdate":"(e,g) => {}"
"devices": {
"ips": ["192.168.0.97"],
"HSM-1dsf83jjf0": {
"useStatusLEDbyService": true,
"sone": {
"D": {
"type": 1,
"enableService": true,
"fade": "3",
"enableBrightness": true,
"mode": "OUTPUT",
"name": "Schreibtischlampe"
}
}
}
]
}
}
30 changes: 24 additions & 6 deletions Mainframe/lib/modulemanager.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,24 @@ mmang.onModuleSendMesage = (e,msg) => {
};
mmang.onModulesAllCompleted = () => {

};
function deleteModule(moduleName) {
var solvedName = require.resolve(moduleName),
nodeModule = require.cache[solvedName];
if (nodeModule) {
for (var i = 0; i < nodeModule.children.length; i++) {
var child = nodeModule.children[i];
deleteModule(child.filename);
}
delete require.cache[solvedName];
}
}
mmang.closeModule = (id) => {
require.resolve("../modules/" + id + ".js") = null;
mmang.modules.find(x => x.name != id).data = null;
delete require.resolve("../modules/" + id + ".js");
delete require.cache[require.resolve("../modules/" + id + ".js")];
mmang.modules = mmang.modules.find(x => x.name != id);
};
mmang.onModulesInitialized = () => {};
mmang.modules = [];
Expand All @@ -30,12 +48,11 @@ mmang.autoLoad = () => {
const element = f[index];
if(element.endsWith(".js") && element != "lucsoft.Mainframe.js") {
try {

var modulee = require("../modules/" + element);
modulee.cnsl = {sendMessage: (msg) => mmang.onModuleSendMesage(element.slice(0,element.length - 3),msg)};
mmang.modules.push({name: element.slice(0,element.length - 3),disabled:false,id: index, data: modulee});
mmang.onModuleInitializing({name: element.slice(0,element.length - 3),id: index,version: mmang.modules[index].data.version,data: modulee});

var modulee = require("../modules/" + element);
modulee.cnsl = {sendMessage: (msg) => mmang.onModuleSendMesage(element.slice(0,element.length - 3),msg)};
modulee.getModule = (e) => mmang.getModule(e);
mmang.modules.push({name: element.slice(0,element.length - 3),disabled:false,id: index, data: modulee});
mmang.onModuleInitializing({name: element.slice(0,element.length - 3),id: index,version: mmang.modules[index].data.version,data: modulee});
} catch (errorr) {
mmang.errorswhilebooting = true;
mmang.onModuleSendMesage(element.slice(0,element.length - 3), "Failed to Init: " + errorr);
Expand All @@ -57,6 +74,7 @@ mmang.autoLoad = () => {
} catch (error) {
mmang.errorswhilebooting = true;
eg.disabled = true;
mmang.onModuleSendMesage("lucsoft.Mainframe", error);
mmang.onModuleSendMesage("lucsoft.Mainframe", "Error while loading " + eg.name + "! disabling Module... (UPDATE THIS MODULE)");
}
}
Expand Down
4 changes: 3 additions & 1 deletion Mainframe/lib/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ tools.log = (text) => {
tools.logerror = (e,text) => {
tools.log(`[${tc.getTimestamp(new Date())}] <${e} | \x1b[33mERROR\x1b[0m > ${text}`);
}

tools.scale = (num, in_min, in_max, out_min, out_max) => {
return (num - in_min) * (out_max - out_min) / (in_max - in_min) + out_min;
};
tools.getTimestamp = (test) => {
return ((test.getHours() < 10) ? "0"+ test.getHours(): test.getHours()) + ":" + ((test.getMinutes() < 10) ? "0"+ test.getMinutes(): test.getMinutes()) + ":"+ ((test.getSeconds() < 10) ? "0"+ test.getSeconds(): test.getSeconds()) + ":" + ((test.getMilliseconds() < 100) ? (test.getMilliseconds() < 10) ? "00"+ test.getMilliseconds() : "0"+ test.getMilliseconds() : test.getMilliseconds())+ " " + test.getDate()+ "."+ (test.getMonth() + 1) + "." + test.getFullYear();
};
Expand Down
Binary file added Mainframe/lib/web/imgs/HomeSYS2_csh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 42ba789

Please sign in to comment.