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

rebase and reverse ct

Browse source
This commit is contained in:
Siwat Sirichai 2024-03-10 00:28:37 +07:00
parent e17b295849
commit 03d8dc9c8b
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platformio.ini
View file

@ -12,7 +12,7 @@
platform = espressif32 platform = espressif32
board = wt32-eth01 board = wt32-eth01
framework = arduino framework = arduino
lib_deps = siwats/ESPMegaPROR3@^2.3.6 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 = COM32

7
src/main.cpp
View file

@ -35,7 +35,6 @@ AirConditioner ac = {
.fan_speeds = 4, .fan_speeds = 4,
.fan_speed_names = fan_speed_names, .fan_speed_names = fan_speed_names,
.getInfraredCode = &getInfraredCode}; .getInfraredCode = &getInfraredCode};
/*********************************************** /***********************************************
* End Configuration * * End Configuration *
***********************************************/ ***********************************************/
@ -47,7 +46,7 @@ ClimateCard climateCard = ClimateCard(AIR_CONDITIONER_IR_PIN, ac,
AIR_CONDITIONER_SENSOR_TYPE, AIR_CONDITIONER_SENSOR_PIN, AIR_CONDITIONER_SENSOR_TYPE, AIR_CONDITIONER_SENSOR_PIN,
AIR_CONDITIONER_RMT_CHANNEL); AIR_CONDITIONER_RMT_CHANNEL);
void adc2current(uint16_t adc_value) float adcToCurrent(uint16_t adc_value)
{ {
// 16 bit ADC value to current in amps // 16 bit ADC value to current in amps
// ADC Range is 0-65535, It have an input range of 0-3.3V // 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.setState(12, true);
espmega.outputs.setValue(12,4095); espmega.outputs.setValue(12,4095);
espmega.installCard(2, &climateCard_daikin); espmega.installCard(2, &climateCard);
climateCard.bindFRAM(&espmega.fram, 5000); climateCard.bindFRAM(&espmega.fram, 5000);
climateCard.loadStateFromFRAM(); climateCard.loadStateFromFRAM();
climateCard.setFRAMAutoSave(true); climateCard.setFRAMAutoSave(true);
espmega.display->bindclimateCard(&climateCard); espmega.display->bindClimateCard(&climateCard);
espmega.installCard(4, &ct_light_phase1); espmega.installCard(4, &ct_light_phase1);
espmega.installCard(5, &ct_light_phase2); espmega.installCard(5, &ct_light_phase2);
espmega.installCard(6, &ct_socket); espmega.installCard(6, &ct_socket);