|
@@ -981,8 +981,8 @@ public class ServiceMain extends Service {
|
|
|
///////////////////////////////////////////
|
|
///////////////////////////////////////////
|
|
|
|
|
|
|
|
// 0. 로딩여부 판단
|
|
// 0. 로딩여부 판단
|
|
|
- if(mModelType != Version.MODEL_TYPE.IHN_1020GL) return;
|
|
|
|
|
- if(Get_HDCIntLightType()) return;
|
|
|
|
|
|
|
+ int [] Get_BatchSW_Info = ServiceMain.dataBaseLoader.data.wallpadDeviceSet.Get_BatchSW_Info;
|
|
|
|
|
+ if (Get_BatchSW_Info[0] == WallpadDeviceSet.DO_NOT_USE || Get_BatchSW_Info[1] != WallpadDeviceSet.BATCH_TYPE_HDC_BATCHSWITCH) return;
|
|
|
|
|
|
|
|
// 1. Class 생성
|
|
// 1. Class 생성
|
|
|
allLightHDC_Controller = new AllLightHDC_Controller();
|
|
allLightHDC_Controller = new AllLightHDC_Controller();
|
|
@@ -2222,7 +2222,8 @@ public class ServiceMain extends Service {
|
|
|
"</portmap> <drivermap> " +
|
|
"</portmap> <drivermap> " +
|
|
|
|
|
|
|
|
// COM2 - Ctrl_Module1 EtcLivingLight_Controller
|
|
// COM2 - Ctrl_Module1 EtcLivingLight_Controller
|
|
|
- "<driver name = \"BatchLight_Driver\" module =\"Ctrl_Module1\" startaddr = \"0x11\" endaddr = \"0x11\" option = \"null\" />"+
|
|
|
|
|
|
|
+ "<driver name = \"AllLightHDC_Driver\" module =\"Ctrl_Module1\" startaddr = \"0x11\" endaddr = \"0x11\" option = \"null\" />"+
|
|
|
|
|
+// "<driver name = \"BatchLight_Driver\" module =\"Ctrl_Module1\" startaddr = \"0x11\" endaddr = \"0x11\" option = \"null\" />"+
|
|
|
"<driver name = \"Light_Driver\" module =\"Ctrl_Module1\" startaddr = \"0x11\" endaddr = \"0x12\" option = \"null\" />"+
|
|
"<driver name = \"Light_Driver\" module =\"Ctrl_Module1\" startaddr = \"0x11\" endaddr = \"0x12\" option = \"null\" />"+
|
|
|
"<driver name = \"EtcLivingLight_Controller\" module =\"Ctrl_Module1\" startaddr = \"0x16\" endaddr = \"0x16\" option = \"null\" />"+
|
|
"<driver name = \"EtcLivingLight_Controller\" module =\"Ctrl_Module1\" startaddr = \"0x16\" endaddr = \"0x16\" option = \"null\" />"+
|
|
|
"<driver name = \"Ventilation_Driver\" module =\"Ctrl_Module1\" startaddr = \"0x61\" endaddr = \"0x68\" option = \"null\" />"+
|
|
"<driver name = \"Ventilation_Driver\" module =\"Ctrl_Module1\" startaddr = \"0x61\" endaddr = \"0x68\" option = \"null\" />"+
|