mod clipman#1

Author: cysn

kocom.conf

@@ -8,10 +8,10 @@
 # socket_server (required when type=socket) : address of remote serial server (eg. 192.168.1.100)
 # socket_port (required when type=socket) : port number of remote serial server (eg. 5050)
 #------------
-#type = serial
-#serial_port = /dev/ttyUSB0
-type = socket
-socket_server = 192.168.219.118
+type = serial
+serial_port = /dev/ttyUSB0
+#type = socket
+#socket_server = 192.168.219.118
 socket_port = 8899
 
 
@@ -25,11 +25,11 @@ socket_port = 8899
 # mqtt_username (required when mqtt_allow_anonymous=False) : mqtt username
 # mqtt_password (required when mqtt_allow_anonymous=False) : mqtt password
 #------------
-mqtt_server = 192.168.219.130
+mqtt_server = 172.30.32.1
 mqtt_port = 1883
 mqtt_allow_anonymous = False
-mqtt_username = admin
-mqtt_password = admin3844
+mqtt_username = id
+mqtt_password = pw
 
 
 [Device]
@@ -41,7 +41,8 @@ mqtt_password = admin3844
 #  * supported devicetypes : light, gas, fan, thermo, elevator
 #  * supported roomnames : myhome, livingroom, bedroom, room1, room2
 #------------
-enabled = light, fan, thermo_livingroom, thermo_bedroom, thermo_room1, thermo_room2, elevator
+#enabled = light, fan, thermo_livingroom, thermo_bedroom, thermo_room1, thermo_room2, elevator
+enabled = light_livingroom, fan, thermo_livingroom, thermo_bedroom, thermo_room1, thermo_room2, thermo_room3, elevator
 
 
 [Elevator]
@@ -89,5 +90,5 @@ show_mqtt_publish = True
 # init_fan_mode (required) : Low, Medium, High
 # light_count (required) : Light Count
 init_temp = 23
-init_fan_mode = Medium
+init_fan_mode = Low
 light_count = 2

kocom.py

@@ -40,13 +40,13 @@
 seq_t_dic = {'c':1, 'd':2, 'e':3, 'f':4}
 device_t_dic = {'01':'wallpad', '0e':'light', '2c':'gas', '36':'thermo', '3b': 'plug', '44':'elevator', '48':'fan'}
 cmd_t_dic = {'00':'state', '01':'on', '02':'off', '3a':'query'}
-room_t_dic = {'00':'livingroom', '01':'bedroom', '02':'room1', '03':'room2'}
+room_t_dic = {'00':'livingroom', '01':'bedroom', '02':'room1', '03':'room2', '04':'room3'}
 
 type_h_dic = {v: k for k, v in type_t_dic.items()}
 seq_h_dic = {v: k for k, v in seq_t_dic.items()}
 device_h_dic = {v: k for k, v in device_t_dic.items()}
 cmd_h_dic = {v: k for k, v in cmd_t_dic.items()}
-room_h_dic = {'livingroom':'00', 'myhome':'00', 'bedroom':'01', 'room1':'02', 'room2':'03'}
+room_h_dic = {'livingroom':'00', 'myhome':'00', 'bedroom':'01', 'room1':'02', 'room2':'03', 'room3':'04'}
 
 # mqtt functions ----------------------------