Исправлен баг в таймерах, начали делать гаджет для управления кранами…

… + - другие мелкие фиксы
tretyakovsa · Aug 21, 2017 · 924c90f · 924c90f
1 parent b94f2ee
commit 924c90f
Show file tree

Hide file tree

Showing 18 changed files with 50 additions and 3 deletions.
diff --git a/build/build.0x00000_flash_size_1Mb.256Kb_2017.08.21.bin b/build/build.0x00000_flash_size_1Mb.256Kb_2017.08.21.bin
diff --git a/build/spiffs.0xBB000_flash_size_1Mb.256Kb_2017.08.21.bin b/build/spiffs.0xBB000_flash_size_1Mb.256Kb_2017.08.21.bin
diff --git a/data/block-leakag.htm.gz b/data/block-leakag.htm.gz
diff --git a/data/config.modules.json b/data/config.modules.json
@@ -235,5 +235,34 @@
   {
    "type": "MQTT"
   }
+ ],
+ "Leakag": [
+  {
+   "type": "Serial 115200"
+  },
+  {
+   "type": "wifi 20 13"
+  },
+  {
+   "type": "NTP"
+  },
+  {
+   "type": "Upgrade"
+  },
+  {
+   "type": "SSDP"
+  },
+  {
+   "type": "HTTP"
+  },
+  {
+   "type": "DDNS"
+  },
+  {
+   "type": "TIMERS"
+  },
+  {
+   "type": "MQTT"
+  }
  ]
 }
diff --git a/data/css/build.css.gz b/data/css/build.css.gz
diff --git a/data/first-connect.json b/data/first-connect.json
@@ -51,6 +51,7 @@
     "Sonoff-rf":"Sonoff-rf / Sonoff / Wi-Fi Smart socket",
     "RGB":"RGB (WS2811-12/NeoPixel)",
     "Jalousie":"Jalousie",
+    "Leakag":"Leakag",
     "Smart-Room":"Smart-Room"
    }
   },

diff --git a/data/help.htm.gz b/data/help.htm.gz
diff --git a/data/js/build.chart.js.gz b/data/js/build.chart.js.gz
diff --git a/data/lang/lang.en.json.gz b/data/lang/lang.en.json.gz
diff --git a/data/lang/lang.lv.json.gz b/data/lang/lang.lv.json.gz
diff --git a/data/lang/lang.ru.json.gz b/data/lang/lang.ru.json.gz
diff --git a/data/lang/lang.ua.json.gz b/data/lang/lang.ua.json.gz
diff --git a/data/page.htm.gz b/data/page.htm.gz
diff --git a/data/relay.json b/data/relay.json
@@ -149,7 +149,7 @@
   {
    "type": "text",
    "module": "movement",
-   "title": "{{LangPir2}}",
+   "title": "{{LangPir2}} {{LangSoon}}",
    "class": "alert alert-info",
    "style": "width:60%;float:left;"
   },

diff --git a/data/rgb.json b/data/rgb.json
@@ -238,7 +238,7 @@
   {
    "type": "text",
    "module": "movement",
-   "title": "{{LangPir2}}",
+   "title": "{{LangPir2}} {{LangSoon}}",
    "class": "alert alert-info",
    "style": "width:60%;float:left;"
   },

diff --git a/data/timer.htm.gz b/data/timer.htm.gz
diff --git a/dev_data/block-leakag.htm b/dev_data/block-leakag.htm
@@ -0,0 +1,17 @@
+<div class="col-md-6">
+ <div class="block">
+  <h5 class="alert-success"><a href="http://{{ip}}">{{SSDP}}</a></h5>
+  <div class="alert alert-dismissible alert-warning {{g691423-{{ip}}}}">
+   <button class="close" onclick="hide('g691423-{{ip}}',this);" type="button">×</button>
+   <a href="http://{{ip}}/timer.htm" target="_blank" class="close"><i class="popup-img"></i></a>
+   <ul>{{timerList}}</ul>
+  </div>
+  <hr>
+  <input type="button" onclick="ajax('{{ip}}', 'cmd?command=leakagnot', this);" value="{{stateLeakag}}" class="btn btn-block btn-lg btn-primary">
+  <hr>
+  <div class="btn-group btn-block">
+   <a href="http://{{ip}}/page.htm?jalousie" class="btn btn-default" style="width:80%"><i class="set-img"></i>{{LangOptions1}}</a>
+   <a href="http://{{ip}}/page.htm?setup" class="btn btn-default" style="width:20%"><i class="opt-img"></i></a>
+  </div>
+ </div>
+</div>
diff --git a/dev_data/page.htm b/dev_data/page.htm
@@ -233,7 +233,7 @@
                dev_html += ' <div class="btn-group"><a href="#" class="btn btn-default btn-sm dropdown-toggle" onclick="toggle(\'repos-spiffs\');return false">Spiffs <span class="caret"><\/span><\/a><ul class="dropdown-menu hidden" id="repos-spiffs" style="min-width:350px"><li><a href="#" onclick="toggle(\'sonoff-spiffs\');loadBuild(\'sonoff\',\'spiffs\');return false"><b>Sonoff<\/b> (Relay) <span class="caret"><\/span><\/a><a href="https://github.com/tretyakovsa/Sonoff_WiFi_switch/commits/master" style="float:right;margin-top:-27px" target="_blank"><i class="help-img"><\/i> History<\/a><ul class="hidden" id="sonoff-spiffs" style="margin-right:20px"><li><a href="#">'+jsonResponse.LangLoading+'<\/a><\/li><\/ul><\/li><li><a href="#" onclick="toggle(\'rgb-spiffs\');loadBuild(\'rgb\',\'spiffs\');return false""><b>RGB<\/b> (WS2811-12/NeoPixel) <span class="caret"><\/span><\/a><a href="https://github.com/renat2985/rgb/commits/master" style="float:right;margin-top:-27px" target="_blank"><i class="help-img"><\/i> History<\/a><ul class="hidden" id="rgb-spiffs" style="margin-right:20px"><li><a href="#">'+jsonResponse.LangLoading+'<\/a><\/li><\/ul><\/li><\/ul><\/div>';
               }
               dev_html += '<form method="POST" style="float:right" action="/update" enctype="multipart/form-data"><div class="btn-group"><input type="file" class="btn btn-primary btn-xs" name="update" style="height:33px" accept=".bin"><input type="submit" class="btn btn-default btn-sm" value="Download" onclick="this.value=\''+jsonResponse.LangLoading+'\';" style="height:33px"><\/div><\/form><hr>';
-              dev_html += jsonResponse.LangType+': <select class="btn btn-default btn-sx" onchange="send_request(this, \'/configs?set=\'+this.value,\'\')"><option value="RGB">Select Please<\/option><option value="Sonoff-rf">Sonoff-rf / Sonoff / Wi-Fi Smart socket<\/option><option value="RGB">RGB (WS2811-12/NeoPixel)<\/option><option value="Jalousie">Jalousie<\/option><option value="Smart-Room">Smart-Room<\/option><\/select>';
+              dev_html += jsonResponse.LangType+': <select class="btn btn-default btn-sx" onchange="send_request(this, \'/configs?set=\'+this.value,\'\')"><option value="RGB">Select Please<\/option><option value="Sonoff-rf">Sonoff-rf / Sonoff / Wi-Fi Smart socket<\/option><option value="RGB">RGB (WS2811-12/NeoPixel)<\/option><option value="Jalousie">Jalousie<\/option><option value="Leakag">Leakag<\/option><option value="Smart-Room">Smart-Room<\/option><\/select>';
               dev_html += '<\/span><\/span><\/div>';
               document.getElementById('contents').innerHTML += dev_html;
              }