Add 8000 dev

graynet-dev · Mar 8, 2020 · 087ac7e · 087ac7e
1 parent 4028a1a
commit 087ac7e
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 16 deletions.
diff --git a/modules/okbit/okbit.class.php b/modules/okbit/okbit.class.php
@@ -48,27 +48,37 @@
 	*255/FF - поиск всех Шлюзов и ethernet устройств по широковещательному запросу
 	**/
 
+define ('OKBIT_DEVICES_CODES', serialize (array('6001' =>	'МУС-8',
+						'6002' => 	'МОС-6',
+						'6003' => 	'УМА-8',
+						'6004' => 	'МДВ-4',
+						'6005' => 	'МДН-6',
+						'6007' => 	'IRM',
+						'6008' => 	'FAM-6'
+						)));
 
 
 define ('OKBIT_GATE_CODES', serialize (array(	'6000' =>	'GATE Ethernet-RS485',
-												'7001' =>	'ESP Lamp',
-												'7002' =>	'ESP Climatic',
-												'7003' =>	'ESP Rele',
-												'7004' =>	'ESP LED RGB',
-												'7005' =>	'ESP Dimmer',
-												'7006' =>	'ESP Sensor',
-												'7007' =>	'ESP Thermostat'
-												)));
+						'7001' =>	'ESP Lamp',
+						'7002' =>	'ESP Climatic',
+						'7003' =>	'ESP Rele',
+						'7004' =>	'ESP LED RGB',
+						'7005' =>	'ESP Dimmer',
+						'7006' =>	'ESP Sensor',
+						'7007' =>	'ESP Thermostat',
+						'8000' =>	'GATE Ethernet-aHomeBus',
+						)));
 
 
-define ('OKBIT_DEVICES_CODES', serialize (array('6001' =>	'МУС-8',
-												'6002' => 	'МОС-6',
-												'6003' => 	'УМА-8',
-												'6004' => 	'МДВ-4',
-												'6005' => 	'МДН-6',
-												'6007' => 	'IRM',
-												'6008' => 	'FAM-6'
-												)));
+define ('OKBIT_AHOMEBUS_CODES', serialize (array('8001' =>	'МУС-8',
+						'8002' => 	'МОС-6',
+						'8003' => 	'УМА-8',
+						'8004' => 	'МДВ-4',
+						'8005' => 	'МД6',
+						'8006' => 	'XXX',
+						'8007' => 	'IRM',
+						'8008' => 	'FAM-6'
+						)));
 
 
 
@@ -89,6 +99,16 @@
 define ('DATA_7006', 'Status1,Status1');
 define ('DATA_7007', 'ST_Relay,Mode,Temp,SetTemp,Hysteresis,Set');
 
+define ('DATA_8001', 'Lamp1,Lamp2,Lamp3,Lamp4,Lamp5,Lamp6,Lamp7,Lamp8');	
+define ('DATA_8002', 'S1,S2,S3,S4,S5,S6');													
+define ('DATA_8003', 'IND1,IND2,IND3,IND4,INA1,INA2,INA3,INA4');	
+define ('DATA_8004', 'Lamp1,Level1,Lamp2,Level2,Lamp3,Level3,Lamp4,Level4');
+define ('DATA_8005', 'IND1,IND2,IND3,IND4,INA1,INA2,INA3,INA4');
+define ('DATA_8006', 'IND1,IND2,IND3,IND4,INA1,INA2,INA3,INA4');	
+define ('DATA_8007', 'IND1,IND2,IND3,IND4,INA1,INA2,INA3,INA4');
+define ('DATA_8008', 'IND1,IND2,IND3,IND4,INA1,INA2,INA3,INA4');
+
+
 class okbit extends module {
 
 	public $sock;

diff --git a/templates/okbit/okbit_gate_edit.html b/templates/okbit/okbit_gate_edit.html
@@ -53,6 +53,7 @@
 					<option value="7005" [#if MOD="7005"#] selected[#endif#]>ESP Dimmer</option>
 					<option value="7006" [#if MOD="7006"#] selected[#endif#]>ESP Sensor</option>
 					<option value="7007" [#if MOD="7007"#] selected[#endif#]>ESP Thermostat</option>
+					<option value="8000" [#if MOD="8000"#] selected[#endif#]>GATE Ethernet-aHomeBus</option>
 
 				</select>
 			</div>

diff --git a/templates/okbit/okbit_gate_edit_else.html b/templates/okbit/okbit_gate_edit_else.html
@@ -48,6 +48,7 @@
 													<option value="7005" [#if MOD="7005"#] selected[#endif#]>ESP Dimmer</option>
 													<option value="7006" [#if MOD="7006"#] selected[#endif#]>ESP Sensor</option>
 													<option value="7007" [#if MOD="7007"#] selected[#endif#]>ESP Thermostat</option>
+													<option value="8000" [#if MOD="8000"#] selected[#endif#]>GATE Ethernet-aHomeBus</option>
 
 												</select>
 											</div>
@@ -156,6 +157,7 @@ <h4 class="modal-title">Тест настроек 2</h4>
 													<option value="7005" [#if MOD="7005"#] selected[#endif#]>ESP Dimmer</option>
 													<option value="7006" [#if MOD="7006"#] selected[#endif#]>ESP Sensor</option>
 													<option value="7007" [#if MOD="7007"#] selected[#endif#]>ESP Thermostat</option>
+													<option value="8000" [#if MOD="8000"#] selected[#endif#]>GATE Ethernet-aHomeBus</option>
 
 												</select>
 											</div>

diff --git a/templates/okbit/okbit_gate_search_admin.html b/templates/okbit/okbit_gate_search_admin.html
@@ -114,6 +114,8 @@
 								<a href="?data_source=okbit_gate&view_mode=bind_gate&id=[#ID#]" title="<#LANG_OKBIT_APP_BIND_GATE#>" onclick="return partLoad(this.href);" class="btn btn-default [#if STATUS==0#]disabled[#endif#]"><i class="glyphicon glyphicon-ok-sign"></i></a>
 
 								[#if MOD==6000#]<a href="?data_source=okbit_device&view_mode=search_okbit_devices&parent_title=[#TITLE#]&parent_id=[#ID#]"  title="<#LANG_OKBIT_APP_DEVICES_IN_GATE#>" class="btn btn-default"><i class="glyphicon glyphicon-th-list"></i></a>[#endif#]
+								[#if MOD==8000#]<a href="?data_source=okbit_device&view_mode=search_okbit_devices&parent_title=[#TITLE#]&parent_id=[#ID#]"  title="<#LANG_OKBIT_APP_DEVICES_IN_GATE#>" class="btn btn-default"><i class="glyphicon glyphicon-th-list"></i></a>[#endif#]
+
 
 								<a href="?data_source=okbit_gate&view_mode=edit_okbit_gate&id=[#ID#]" title="<#LANG_OKBIT_APP_EDIT#>" class="btn btn-default"> <i class="glyphicon glyphicon-pencil"></i></a>