diff --git a/databases/modbus_config.js b/databases/modbus_config.js
index b73116a..d63430f 100644
--- a/databases/modbus_config.js
+++ b/databases/modbus_config.js
@@ -1,5 +1,4 @@
-const timeoutInterval = 150000;
-
+const timeoutInterval = 300000;
const deviceConfig = [
{
device: "em340",
@@ -111,4 +110,4 @@ const deviceConfig = [
}
];
-module.exports = { timeoutInterval, deviceConfig };
\ No newline at end of file
+module.exports = { timeoutInterval, deviceConfig };
diff --git a/databases/notifications.table b/databases/notifications.table
index a0590d3..b207fe7 100644
--- a/databases/notifications.table
+++ b/databases/notifications.table
@@ -31,7 +31,4 @@ key:string|weight:string|sk:string|en:string
+|voltage_on_phase_restored|NOTICE|Napätie na fáze č. ${phase} bolo obnovené|Voltage on phase no. ${phase} has been restored|...............
+|flow_start|NOTICE|FLOW bol spustený|FLOW has been started |...............
+|twilight_sensor_nok|ERROR|Sensor súmraku neodpovedá|Twilight sensor is not responding|...............
-+|twilight_sensor_ok|NOTICE|Sensor súmraku znovu odpovedá|Twilight sensor is responding again|...............
-+|lamps_have_turned_on|NOTICE|Lampy sa zapli|Lamps have turned on|...............
-+|lamps_have_turned_off|NOTICE|Lampy sa vypli|Lamps have turned off|...............
-+|flow_restart|NOTICE|Restart flowu|Flow has been restarted|...............
++|twilight_sensor_ok|NOTICE|Sensor súmraku znovu odpovedá|Twilight sensor is responding again|...............
\ No newline at end of file
diff --git a/flow/cmd_manager.js b/flow/cmd_manager.js
index 48b4987..3c18f1d 100644
--- a/flow/cmd_manager.js
+++ b/flow/cmd_manager.js
@@ -19,15 +19,15 @@ exports.html = `
@(Watch messages that include any of the following strings)
-
-
-
@(Tag people if message includes something)
-
-
-
`;
-
-exports.readme = `# Slack Filter`;
-
-exports.install = function(instance) {
- var running = false;
- instance["savedSlackMessages"] = [];
- var timer = null;
-
- instance.on('data', function(response) {
- if (!running) return;
- let value = response.data;
- if (typeof value !== 'object') return;
-
- let can = false
- var k = Object.keys(value);
- var interested = JSON.parse(instance.options.types);
- var msg_incl = JSON.parse(instance.options.message_includes);
- var tags = JSON.parse(instance.options.tag_on_include);
-
- if (k.length <= 0) return;
- if (value[k[0]].length <= 0) return;
- if (!Object.prototype.hasOwnProperty.call(value[k[0]][0], 'values')) return;
- if (!Object.prototype.hasOwnProperty.call(value[k[0]][0]['values'], '_event')) return;
- if (!Object.prototype.hasOwnProperty.call(value[k[0]][0]['values']['_event'], 'type')) return;
- if (!Object.prototype.hasOwnProperty.call(value[k[0]][0]['values']['_event'], 'source')) return;
- if (!Object.prototype.hasOwnProperty.call(value[k[0]][0]['values']['_event']['source'], 'func')) return;
- if (!Object.prototype.hasOwnProperty.call(value[k[0]][0]['values']['_event'], 'message')) return;
- if (!Object.prototype.hasOwnProperty.call(value[k[0]][0]['values']['_event'], 'message_data')) return;
-
- let icon = ':totaljs:';
- let type = value[k[0]][0]['values']['_event']['type'];
- let source = value[k[0]][0]['values']['_event']['source']['func'];
- let message = value[k[0]][0]['values']['_event']['message'];
- let message_data = value[k[0]][0]['values']['_event']['message_data'];
- let tag = '';
-
- switch(type){
- case 'debug':
- icon = ':beetle:';
- break;
- case 'info':
- icon = ':speech_balloon:';
- break;
- case 'notice':
- icon = ':speech_balloon:';
- break;
- case 'warning':
- icon = ':exclamation:';
- break;
- case 'alert':
- icon = ':warning:';
- break;
- case 'error':
- icon = ':no_entry:';
- break;
- case 'emergency':
- icon = ':fire:';
- break;
- case 'critical':
- icon = ':fire:';
- break;
- }
-
- // Check if this message includes one of the strings we are watching for
- for (const msg of msg_incl){
- if (message.includes(msg)){
- if (msg == 'is responding again') icon = ':large_green_circle:';
- can = true;
- break;
- }
- }
- // Check if message is one of the types we are watching for
- if (interested.includes(type)){
- can = true;
- }
-
- if (!can) return;
-
-
- // Check for each person tags based on what the message includes
- for (const person of tags){
- for (const msg of person.includes){
- if (message.includes(msg)){
- tag += '<@'+person.user_id+'> ';
- break; // Break out from this person checks as they are already tagged now
- }
- }
- }
- // Now that all people are tagged add new line symbol
- if (tag != '') tag += '\n';
-
- let send_data = tag+instance.options.name+' '+type.toUpperCase()+'\n*Source*: '+source+'\n*Message*: '+message;
- if (message_data) {
- send_data += '\nData: '+message_data;
- }
-
- let ignore_msg = false
- if (message.includes('Configuration of dimming profile to node no')){
- for (let i = 0; i < FLOW["savedSlackMessages"].length; i++){
- if (FLOW["savedSlackMessages"][i].message == message){
- ignore_msg = true;
- break;
- }
- }
- if (!ignore_msg){
- FLOW["savedSlackMessages"].push({message, 'dateandtime': Date.now()});
- if (timer === null){
- timer = setTimeout(checkSavedMessages, 60*60000);
- }
- }
- }
-
- if (!ignore_msg){
- instance.send2({'msg':send_data,'bot_name':instance.options.name+' '+type.toUpperCase(),'bot_icon':icon,'channel':instance.options.slack_channel});
- }
- });
-
- function checkSavedMessages(){
- var d = Date.now();
- d = d - 86400000; // older then 24hr
- var a = [];
- //Remove msgs older then 24hr
- for (let i = 0; i < FLOW["savedSlackMessages"].length; i++){
- if (FLOW["savedSlackMessages"][i].dateandtime > d){
- a.push(FLOW["savedSlackMessages"][i]);
- }
- }
- FLOW["savedSlackMessages"] = a;
-
- if (FLOW["savedSlackMessages"].length > 0) {
- timer = setTimeout(checkSavedMessages, 60*60000);
- } else {
- timer = null;
- }
- }
-
- instance.reconfigure = function() {
- try {
- if (!FLOW["savedSlackMessages"]){
- FLOW["savedSlackMessages"] = [];
- }
-
- if (instance.options.name) {
- instance.status('Running');
- running = true;
- } else {
- instance.status('Please enter name', 'red');
- running = false;
- }
- } catch (e) {
- instance.error('Citysys connector: ' + e.message);
- }
- };
-
- instance.on('options', instance.reconfigure);
- instance.reconfigure();
-};
\ No newline at end of file