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

fix energy double loading

Browse source
This commit is contained in:
Siwat Sirichai 2024-06-28 22:37:44 +07:00
parent 3cd7cdaaef
commit 29209ac08a
2 changed files with 14 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platformio.ini
View file

@ -12,6 +12,6 @@
platform = espressif32 platform = espressif32
board = wt32-eth01 board = wt32-eth01
framework = arduino framework = arduino
lib_deps = siwats/ESPMegaPROR3@^2.9.3 lib_deps = siwats/ESPMegaPROR3@^2.9.4
monitor_speed = 115200 monitor_speed = 115200
build_flags = -DCORE_DEBUG_LEVEL=0 -DSW_VERSION='"ise-final-1.0"' -DBOARD_MODEL='"ESPMegaPRO R3.3b"' build_flags = -DCORE_DEBUG_LEVEL=0 -DSW_VERSION='"ise-final-1.3"' -DBOARD_MODEL='"ESPMegaPRO R3.3b"'

47
src/main.cpp
View file

@ -172,41 +172,6 @@ void setup()
climateCard_daikin.setFRAMAutoSave(true); climateCard_daikin.setFRAMAutoSave(true);
espmega.display->bindClimateCard(&climateCard_daikin); espmega.display->bindClimateCard(&climateCard_daikin);
// Current Transformers
#ifdef ANALOG_ENABLE
espmega.installCard(4, &analogCard);
espmega.installCard(5, &ct1);
ct1.bindFRAM(&espmega.fram, 6000);
ct1.loadEnergy();
ct1.setEnergyAutoSave(true);
espmega.iot->registerCard(5);
espmega.installCard(6, &ct2);
ct2.bindFRAM(&espmega.fram, 6100);
ct2.loadEnergy();
ct2.setEnergyAutoSave(true);
espmega.iot->registerCard(6);
espmega.installCard(7, &ct3);
ct3.bindFRAM(&espmega.fram, 6200);
ct3.loadEnergy();
ct3.setEnergyAutoSave(true);
espmega.iot->registerCard(7);
espmega.installCard(8, &ct4);
ct4.bindFRAM(&espmega.fram, 6300);
ct4.loadEnergy();
ct4.setEnergyAutoSave(true);
espmega.iot->registerCard(8);
espmega.installCard(9, &ct5);
ct5.bindFRAM(&espmega.fram, 6400);
ct5.loadEnergy();
ct5.setEnergyAutoSave(true);
espmega.iot->registerCard(9);
espmega.installCard(10, &ct6);
ct6.bindFRAM(&espmega.fram, 6500);
ct6.loadEnergy();
ct6.setEnergyAutoSave(true);
espmega.iot->registerCard(10);
#endif
// Input callbacks // Input callbacks
// pre-load the input buffers // pre-load the input buffers
ESP_LOGV("ISE IoT OS", "Pre-loading input buffers"); ESP_LOGV("ISE IoT OS", "Pre-loading input buffers");
@ -246,16 +211,28 @@ void setup()
ESP_LOGV("ISE OS", "Analog card available, installing current transformer cards"); ESP_LOGV("ISE OS", "Analog card available, installing current transformer cards");
espmega.installCard(5, &ct1); espmega.installCard(5, &ct1);
ct1.bindFRAM(&espmega.fram, 5010); ct1.bindFRAM(&espmega.fram, 5010);
ct1.loadEnergy();
ct1.setEnergyAutoSave(true);
espmega.installCard(6, &ct2); espmega.installCard(6, &ct2);
ct2.bindFRAM(&espmega.fram, 5020); ct2.bindFRAM(&espmega.fram, 5020);
ct2.loadEnergy();
ct2.setEnergyAutoSave(true);
espmega.installCard(7, &ct3); espmega.installCard(7, &ct3);
ct3.bindFRAM(&espmega.fram, 5030); ct3.bindFRAM(&espmega.fram, 5030);
ct3.loadEnergy();
ct3.setEnergyAutoSave(true);
espmega.installCard(8, &ct4); espmega.installCard(8, &ct4);
ct4.bindFRAM(&espmega.fram, 5040); ct4.bindFRAM(&espmega.fram, 5040);
ct4.loadEnergy();
ct4.setEnergyAutoSave(true);
espmega.installCard(9, &ct5); espmega.installCard(9, &ct5);
ct5.bindFRAM(&espmega.fram, 5050); ct5.bindFRAM(&espmega.fram, 5050);
ct5.loadEnergy();
ct5.setEnergyAutoSave(true);
espmega.installCard(10, &ct5); espmega.installCard(10, &ct5);
ct6.bindFRAM(&espmega.fram, 5060); ct6.bindFRAM(&espmega.fram, 5060);
ct6.loadEnergy();
ct6.setEnergyAutoSave(true);
espmega.iot->registerCard(5); espmega.iot->registerCard(5);
espmega.iot->registerCard(6); espmega.iot->registerCard(6);
espmega.iot->registerCard(7); espmega.iot->registerCard(7);