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

revert

Browse source
This commit is contained in:
reaw55 2024-03-09 19:28:44 +07:00
parent e17b295849
commit 02b14d2187
4 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ise_display.cpp
View file

@ -530,7 +530,7 @@ void ISEDisplay::toggleAC()
ESP_LOGI("ISEDisplay", "User mode AFTER: %d", user_mode);
setACstate(fan_speed, 0, temperature);
}
}
}
void ISEDisplay::changeUserACmode()
{
// Get the current group state

3
src/ise_display.hpp
View file

@ -34,6 +34,7 @@ class ISEDisplay : public ESPMegaDisplay {
void updateTempOutside(float temp_outside);
void updatePMoutside(u_int16_t pm25_outside);
void updatePMinside(u_int16_t pm25_inside);
void updateACState();
void loop();
@ -72,7 +73,7 @@ class ISEDisplay : public ESPMegaDisplay {
u_int8_t lightLevelRow3;
u_int8_t lightLevelRow4;
void updateACState();
void updateuserACmode();
void updateACfanSpeed();
bool calculateLightGroupState();

8
src/main.cpp
View file

@ -35,7 +35,6 @@ AirConditioner ac = {
.fan_speeds = 4,
.fan_speed_names = fan_speed_names,
.getInfraredCode = &getInfraredCode};
/***********************************************
* End Configuration *
***********************************************/
@ -47,7 +46,7 @@ ClimateCard climateCard = ClimateCard(AIR_CONDITIONER_IR_PIN, ac,
AIR_CONDITIONER_SENSOR_TYPE, AIR_CONDITIONER_SENSOR_PIN,
AIR_CONDITIONER_RMT_CHANNEL);
void adc2current(uint16_t adc_value)
float adcToCurrent(uint16_t adc_value)
{
// 16 bit ADC value to current in amps
// ADC Range is 0-65535, It have an input range of 0-3.3V
@ -129,11 +128,11 @@ void setup()
}
espmega.outputs.setState(12, true);
espmega.outputs.setValue(12,4095);
espmega.installCard(2, &climateCard_daikin);
espmega.installCard(2, &climateCard);
climateCard.bindFRAM(&espmega.fram, 5000);
climateCard.loadStateFromFRAM();
climateCard.setFRAMAutoSave(true);
espmega.display->bindclimateCard(&climateCard);
espmega.display->bindClimateCard(&climateCard);
espmega.installCard(4, &ct_light_phase1);
espmega.installCard(5, &ct_light_phase2);
espmega.installCard(6, &ct_socket);
@ -448,6 +447,7 @@ void handlePageChange(uint8_t page)
iseDisplay.updatePMinside(get_pm25_in());
iseDisplay.updateWeather(weather.getValue());
iseDisplay.updateTempOutside(get_temp_out());
iseDisplay.updateACState();
/* iseDisplay.updateACState();
iseDisplay.updateAirPurifierState();