ise-senior-iot/ise-iot-oop-v2
2
0
Fork 0
Code Pull requests Activity

change code to be definition reliant

Browse source
This commit is contained in:
reaw55 2024-02-24 16:53:42 +07:00
parent affdc4ddfc
commit 8fcd1b1ad7
3 changed files with 64 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ise_display.cpp
View file

@ -274,9 +274,13 @@ void ISEDisplay::handlePWMChange(uint8_t pin, bool state, uint16_t value)
// NEED to switch case for different page
uint8_t current_page = this->currentPage;
//uint8_t first_pin = *(light_array);
//uint8_t last_pin = *(light_array + 7);
if (current_page == PAGE_STANDBY)
{
if ((pin >= 0 && pin <= 3) ||(pin >= 8 && pin <= 11))
if (LIGHT_ROW1_COLUMN1 || LIGHT_ROW1_COLUMN2 || LIGHT_ROW2_COLUMN1 || LIGHT_ROW2_COLUMN2 || LIGHT_ROW3_COLUMN1 || LIGHT_ROW3_COLUMN2 || LIGHT_ROW4_COLUMN1 || LIGHT_ROW4_COLUMN2) //change
{
// Light
updateLightGroupStatePageStandby();
@ -285,7 +289,7 @@ void ISEDisplay::handlePWMChange(uint8_t pin, bool state, uint16_t value)
}
else if (current_page == PAGE_DASHBOARD)
{
if ((pin >= 0 && pin <= 3) ||(pin >= 8 && pin <= 11))
if (LIGHT_ROW1_COLUMN1 || LIGHT_ROW1_COLUMN2 || LIGHT_ROW2_COLUMN1 || LIGHT_ROW2_COLUMN2 || LIGHT_ROW3_COLUMN1 || LIGHT_ROW3_COLUMN2 || LIGHT_ROW4_COLUMN1 || LIGHT_ROW4_COLUMN2) //change
{
// Light
updateLightGroupStatePageDashboard();
@ -716,6 +720,8 @@ bool ISEDisplay::calculateLightGroupState()
{
// Check if all lights are on
bool lightOn = false;
// uint_8 first_pin = *(light_array);
// uint_8 last_pin = *(light_array + 7);
for (uint8_t i = 1; i <= 4; i++)
{
if (getLightLevel(i) != 0)