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

remove ct

Browse source
This commit is contained in:
reaw55 2024-03-09 20:06:35 +07:00
parent 6eea08ca18
commit 962df16430
4 changed files with 9 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platformio.ini
View file

@ -15,5 +15,5 @@ framework = arduino
lib_deps = siwats/ESPMegaPROR3@^2.3.7 lib_deps = siwats/ESPMegaPROR3@^2.3.7
monitor_speed = 115200 monitor_speed = 115200
build_flags = -DCORE_DEBUG_LEVEL=0 build_flags = -DCORE_DEBUG_LEVEL=0
upload_port = COM32 upload_port = COM4
monitor_port = COM32 monitor_port = COM4

5
src/ise_display.hpp
View file

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

35
src/main.cpp
View file

@ -7,15 +7,6 @@ RemoteVariable weather = RemoteVariable();
RemoteVariable pm_switch = RemoteVariable(); RemoteVariable pm_switch = RemoteVariable();
RemoteVariable pm_fan_speed = RemoteVariable(); RemoteVariable pm_fan_speed = RemoteVariable();
AnalogCard analogCard = AnalogCard();
float voltage = CT_RMS_VOLTAGE;
CurrentTransformerCard ct_light_phase1 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE1, &voltage, &adcToCurrent, 1000);
CurrentTransformerCard ct_light_phase2 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
CurrentTransformerCard ct_socket = CurrentTransformerCard(&analogCard, CT_PIN_SOCKET, &voltage, &adcToCurrent, 1000);
CurrentTransformerCard ct_ac_phase1 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE1, &voltage, &adcToCurrent, 1000);
CurrentTransformerCard ct_ac_phase2 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
CurrentTransformerCard ct_ac_phase3 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE3, &voltage, &adcToCurrent, 1000);
const char *mode_names_daikin[] = {"off", "cool", "fan_only", "dry"}; const char *mode_names_daikin[] = {"off", "cool", "fan_only", "dry"};
const char *mode_names_york[] = {"off", "cool", "fan_only"}; const char *mode_names_york[] = {"off", "cool", "fan_only"};
const char *fan_speed_names[] = {"auto", "high", "medium", "low"}; const char *fan_speed_names[] = {"auto", "high", "medium", "low"};
@ -60,14 +51,7 @@ ClimateCard climateCard_york = ClimateCard(AIR_CONDITIONER_YORK_IR_PIN, ac_york,
AC_SENSOR_TYPE_NONE, 0, AC_SENSOR_TYPE_NONE, 0,
AIR_CONDITIONER_RMT_CHANNEL1); AIR_CONDITIONER_RMT_CHANNEL1);
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
// However, it have a resistor network that map 0-3.3V to 0-12V
// The current transformer output 0-10V with 0V as 0A and 10V as 50A
return (adc_value / 65535.0) * 12.0 / 10.0 * 50.0;
}
void handleMqttMessage(char *topic, char *payload) void handleMqttMessage(char *topic, char *payload)
{ {
@ -149,19 +133,6 @@ void setup()
climateCard_daikin.setFRAMAutoSave(true); climateCard_daikin.setFRAMAutoSave(true);
//espmega.display->bindclimateCard(&climateCard_daikin); //espmega.display->bindclimateCard(&climateCard_daikin);
espmega.installCard(4, &ct_light_phase1);
espmega.installCard(5, &ct_light_phase2);
espmega.installCard(6, &ct_socket);
espmega.installCard(7, &ct_ac_phase1);
espmega.installCard(8, &ct_ac_phase2);
espmega.installCard(9, &ct_ac_phase3);
espmega.iot->registerCard(4);
espmega.iot->registerCard(5);
espmega.iot->registerCard(6);
espmega.iot->registerCard(7);
espmega.iot->registerCard(8);
espmega.iot->registerCard(9);
espmega.installCard(10, &climateCard_daikin); espmega.installCard(10, &climateCard_daikin);
climateCard_york.bindFRAM(&espmega.fram, 5000); climateCard_york.bindFRAM(&espmega.fram, 5000);
climateCard_york.loadStateFromFRAM(); climateCard_york.loadStateFromFRAM();
@ -471,8 +442,8 @@ void handlePageChange(uint8_t page)
iseDisplay.updatePMinside(get_pm25_in()); iseDisplay.updatePMinside(get_pm25_in());
iseDisplay.updateWeather(weather.getValue()); iseDisplay.updateWeather(weather.getValue());
iseDisplay.updateTempOutside(get_temp_out()); iseDisplay.updateTempOutside(get_temp_out());
iseDisplay.updateACState();
/* iseDisplay.updateACState(); /*
iseDisplay.updateAirPurifierState(); iseDisplay.updateAirPurifierState();
iseDisplay.updateLightGroupStatePageStandby(); iseDisplay.updateLightGroupStatePageStandby();
iseDisplay.updateLightGroupStatePageDashboard(); iseDisplay.updateLightGroupStatePageDashboard();

3
src/main.hpp
View file

@ -48,5 +48,4 @@ void pm25inupdatedisplay(char* value);
void tempoutupdatedisplay(char* value); void tempoutupdatedisplay(char* value);
void weatherupdatedisplay(char* value); void weatherupdatedisplay(char* value);
void pmfanspeedupdatedisplay(char* value); void pmfanspeedupdatedisplay(char* value);
void pmswitchupdatedisplay(char* value); void pmswitchupdatedisplay(char* value);
float adcToCurrent(uint16_t adc_value);