Merge branch 'master' of github.com:domoticz/domoticz

Author: gizmocuz

hardware/BleBox.cpp

@@ -766,6 +766,50 @@ namespace http {
 			pHardware->RemoveAllNodes();
 		}
 
+		void CWebServer::Cmd_BleBoxAutoSearchingNodes(WebEmSession & session, const request& req, Json::Value &root)
+		{
+			if (session.rights != 2)
+			{
+				session.reply_status = reply::forbidden;
+				return; //Only admin user allowed
+			}
+
+			std::string hwid = request::findValue(&req, "idx");
+			std::string ipmask = request::findValue(&req, "ipmask");
+			if (
+				(hwid == "") ||
+				(ipmask == "")
+				)
+				return;
+			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardwareByIDType(hwid, HTYPE_BleBox);
+			if (pBaseHardware == NULL)
+				return;
+			BleBox *pHardware = reinterpret_cast<BleBox*>(pBaseHardware);
+
+			root["status"] = "OK";
+			root["title"] = "BleBoxAutoSearchingNodes";
+		/*	pHardware->xyz();*/ // TODO
+		}
+
+		void CWebServer::Cmd_BleBoxUpdateFirmware(WebEmSession & session, const request& req, Json::Value &root)
+		{
+			if (session.rights != 2)
+			{
+				session.reply_status = reply::forbidden;
+				return; //Only admin user allowed
+			}
+
+			std::string hwid = request::findValue(&req, "idx");
+			CDomoticzHardwareBase *pBaseHardware = m_mainworker.GetHardwareByIDType(hwid, HTYPE_BleBox);
+			if (pBaseHardware == NULL)
+				return;
+			BleBox *pHardware = reinterpret_cast<BleBox*>(pBaseHardware);
+
+			root["status"] = "OK";
+			root["title"] = "BleBoxUpdateFirmware";
+			pHardware->UpdateFirmware();
+		}
+
 	}
 }
 
@@ -926,3 +970,12 @@ void BleBox::ReloadNodes()
 	LoadNodes();
 }
 
+void BleBox::UpdateFirmware()
+{
+	std::map<const std::string, const int>::const_iterator itt;
+	for (itt = m_devices.begin(); itt != m_devices.end(); ++itt)
+	{
+		Json::Value root = SendCommand(itt->first, "/api/ota/update");
+	}
+}
+

hardware/BleBox.h

@@ -31,6 +31,7 @@ class BleBox : public CDomoticzHardwareBase
 	void RemoveAllNodes();
 	void SetSettings(const int pollIntervalsec);
 	void Restart();
+	void UpdateFirmware();
 
 private:
 	volatile bool m_stoprequested;

main/WebServer.cpp

@@ -405,6 +405,8 @@ namespace http {
 			RegisterCommandCode("bleboxupdatenode", boost::bind(&CWebServer::Cmd_BleBoxUpdateNode, this, _1, _2, _3));
 			RegisterCommandCode("bleboxremovenode", boost::bind(&CWebServer::Cmd_BleBoxRemoveNode, this, _1, _2, _3));
 			RegisterCommandCode("bleboxclearnodes", boost::bind(&CWebServer::Cmd_BleBoxClearNodes, this, _1, _2, _3));
+			RegisterCommandCode("bleboxautosearchingnodes", boost::bind(&CWebServer::Cmd_BleBoxAutoSearchingNodes, this, _1, _2, _3));
+			RegisterCommandCode("bleboxupdatefirmware", boost::bind(&CWebServer::Cmd_BleBoxUpdateFirmware, this, _1, _2, _3));
 
 			RegisterCommandCode("lmssetmode", boost::bind(&CWebServer::Cmd_LMSSetMode, this, _1, _2, _3));
 			RegisterCommandCode("lmsgetnodes", boost::bind(&CWebServer::Cmd_LMSGetNodes, this, _1, _2, _3));

main/WebServer.h

@@ -258,7 +258,9 @@ class CWebServer : public session_store, public boost::enable_shared_from_this<C
 	void Cmd_BleBoxUpdateNode(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_BleBoxRemoveNode(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_BleBoxClearNodes(WebEmSession & session, const request& req, Json::Value &root);
-
+	void Cmd_BleBoxAutoSearchingNodes(WebEmSession & session, const request& req, Json::Value &root);
+	void Cmd_BleBoxUpdateFirmware(WebEmSession & session, const request& req, Json::Value &root);
+	
 	void Cmd_GetTimerPlans(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_AddTimerPlan(WebEmSession & session, const request& req, Json::Value &root);
 	void Cmd_UpdateTimerPlan(WebEmSession & session, const request& req, Json::Value &root);

www/app/HardwareController.js

@@ -2884,6 +2884,41 @@ define(['app'], function (app) {
             });
         }
 
+        BleBoxAutoSearchingNodes = function () {
+
+            var ipmask = $("#hardwarecontent #bleboxsettingstable #ipmask").val();
+            if (ipmask == "") {
+                ShowNotify($.t('Please enter a mask!'), 2500, true);
+                return;
+            }
+
+            $.ajax({
+                url: "json.htm?type=command&param=bleboxautosearchingnodes" +
+                    "&idx=" + $.devIdx +
+                    "&ipmask=" + ipmask,
+                async: false,
+                dataType: 'json',
+                success: function (data) {
+                    RefreshBleBoxNodeTable();
+                }
+            });
+        }
+
+        BleBoxUpdateFirmware = function () {
+
+            ShowNotify($.t('Please wait. Updating ....!'), 2500, true);
+
+            $.ajax({
+                url: "json.htm?type=command&param=bleboxupdatefirmware" +
+                    "&idx=" + $.devIdx,
+                async: false,
+                dataType: 'json',
+                success: function (data) {
+                    RefreshBleBoxNodeTable();
+                }
+            });
+        }
+
         BleBoxUpdateNode = function (nodeid) {
             if ($('#updelclr #nodedelete').attr("class") == "btnstyle3-dis") {
                 return;
@@ -3016,6 +3051,7 @@ define(['app'], function (app) {
 
             $("#hardwarecontent #bleboxsettingstable #pollinterval").val(Mode1);
             $("#hardwarecontent #bleboxsettingstable #pingtimeout").val(Mode2);
+            $("#hardwarecontent #bleboxsettingstable #ipmask").val("192.168.1.*");
 
             var oTable = $('#bleboxnodestable').dataTable({
                 "sDom": '<"H"lfrC>t<"F"ip>',
@@ -5201,7 +5237,7 @@ define(['app'], function (app) {
                 $("#hardwarecontent #divhttppoller").hide();
                 if (text.indexOf("Open Weather Map") >= 0)
                 {
-                    $("#hardwarecontent #hardwareparamsunderground #location").val("lat=53.40&lon=14.58");
+                    $("#hardwarecontent #hardwareparamsunderground #location").val(data["Password"]);
                 }
             }
             else if (text.indexOf("Philips Hue") >= 0)

www/views/hardware.html

@@ -632,6 +632,14 @@ <h1 data-i18n="Settings">Settings</h1>
             <td></td>
             <td><a class="btn-danger sub-tabs-apply" onclick="SetBleBoxSettings();" data-i18n="Apply Settings">Apply Settings</a></td>
         </tr>
+        <tr>
+            <td align="left" style="width:110px">
+                <a align="left" class="btnstyle3" id="autosearching" data-i18n="AutoSearching" onclick="BleBoxAutoSearchingNodes();">Auto Searching on:</a>
+            </td>
+            <td>
+                <input type="text" id="ipmask" style="width: 120px; padding: .2em;" class="text ui-widget-content ui-corner-all" />
+            </td>            
+        </tr>
     </table>
     <div class="page-header-small">
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
@@ -657,7 +665,10 @@ <h1 data-i18n="Nodes">Nodes</h1>
         <tr>
             <td>
                 <a class="btnstyle3-dis" id="nodeupdate" data-i18n="Update">Update</a>&nbsp;&nbsp;&nbsp;
-                <a class="btnstyle3-dis" id="nodedelete" data-i18n="Delete">Delete</a>
+                <a class="btnstyle3-dis" id="nodedelete" data-i18n="Delete">Delete</a>&nbsp;&nbsp;&nbsp;
+            </td>
+            <td align="right" style="width:200px">
+                <a align="left" class="btnstyle3" id="updatefirmware" data-i18n="Update devices firmware" onclick="BleBoxUpdateFirmware();">Update devices firmware</a>
             </td>
             <td align="right">
                 <a class="btnstyle3" id="nodelistrefresh" data-i18n="Clear" onclick="BleBoxClearNodes();">Clear</a>