|
@@ -2392,11 +2392,11 @@ public class MAIN extends WpadScreen {
|
|
|
|
|
|
if (mKnxData.ControlType == false) {
|
|
if (mKnxData.ControlType == false) {
|
|
for (int i = 0; i < 4; i++) {
|
|
for (int i = 0; i < 4; i++) {
|
|
- if (mDimming[(floor*2 - 1)][i] == 0) {
|
|
|
|
|
|
+ if (mDimming[(floor - 1)+3][i] == 0) {
|
|
onoff[i] = 2;
|
|
onoff[i] = 2;
|
|
dimming[i] = 0;
|
|
dimming[i] = 0;
|
|
} else {
|
|
} else {
|
|
- dimming[i] = (byte) mDimming[(floor*2 - 1)][i];
|
|
|
|
|
|
+ dimming[i] = (byte) mDimming[(floor - 1)+3][i];
|
|
onoff[i] = (byte) nOnOff;
|
|
onoff[i] = (byte) nOnOff;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -2438,11 +2438,11 @@ public class MAIN extends WpadScreen {
|
|
|
|
|
|
if (mKnxData.ControlType == false) {
|
|
if (mKnxData.ControlType == false) {
|
|
for (int i = 0; i < 4; i++) {
|
|
for (int i = 0; i < 4; i++) {
|
|
- if (mDimming[(floor*3 - 1)][i] == 0) {
|
|
|
|
|
|
+ if (mDimming[(floor - 1)+6][i] == 0) {
|
|
onoff[i] = 2;
|
|
onoff[i] = 2;
|
|
dimming[i] = 0;
|
|
dimming[i] = 0;
|
|
} else {
|
|
} else {
|
|
- dimming[i] = (byte) mDimming[(floor*3 - 1)][i];
|
|
|
|
|
|
+ dimming[i] = (byte) mDimming[(floor - 1+6)][i];
|
|
onoff[i] = (byte) nOnOff;
|
|
onoff[i] = (byte) nOnOff;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -3020,7 +3020,7 @@ public class MAIN extends WpadScreen {
|
|
|
|
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
- if (mDimming[(floor*2 - 1)][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
|
|
|
|
|
|
+ if (mDimming[(floor - 1)+3][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
|
|
bSceneEvening = false;
|
|
bSceneEvening = false;
|
|
BTN_LIGHT_SCENE_EVENING.setButtonFrontImage();
|
|
BTN_LIGHT_SCENE_EVENING.setButtonFrontImage();
|
|
Log.w(TAG, "[updateLightSceneBTN] evening fail");
|
|
Log.w(TAG, "[updateLightSceneBTN] evening fail");
|
|
@@ -3032,7 +3032,7 @@ public class MAIN extends WpadScreen {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
for (int i = 0; i < 4; i++) {
|
|
for (int i = 0; i < 4; i++) {
|
|
- if (mDimming[(floor*3 - 1)][i] == 0) {
|
|
|
|
|
|
+ if (mDimming[(floor - 1)+6][i] == 0) {
|
|
if(mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.OnOff) {
|
|
if(mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.OnOff) {
|
|
bSceneRelaxing = false;
|
|
bSceneRelaxing = false;
|
|
BTN_LIGHT_SCENE_RELAXING.setButtonFrontImage();
|
|
BTN_LIGHT_SCENE_RELAXING.setButtonFrontImage();
|
|
@@ -3042,7 +3042,7 @@ public class MAIN extends WpadScreen {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else if (!mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.OnOff||
|
|
else if (!mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.OnOff||
|
|
- mDimming[(floor*3 - 1)][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
|
|
|
|
|
|
+ mDimming[(floor - 1)+6][i] != mKnxData.LivingRoom_EnergyMeter.Data.LivingLight[i].Data.Dimming) {
|
|
bSceneRelaxing = false;
|
|
bSceneRelaxing = false;
|
|
BTN_LIGHT_SCENE_RELAXING.setButtonFrontImage();
|
|
BTN_LIGHT_SCENE_RELAXING.setButtonFrontImage();
|
|
Log.w(TAG, "[updateLightSceneBTN] relaxing dimming fail");
|
|
Log.w(TAG, "[updateLightSceneBTN] relaxing dimming fail");
|