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

Merge branch 'main' of https://git.siwatsystem.com/ise-senior-iot/ise-iot-oop

Browse source
This commit is contained in:
reaw55 2024-03-13 10:58:21 +07:00
commit d859d61462
4 changed files with 42 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
platformio.ini
View file

@ -12,8 +12,8 @@
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.8
monitor_speed = 115200 monitor_speed = 115200
build_flags = -DCORE_DEBUG_LEVEL=0 build_flags = -DCORE_DEBUG_LEVEL=5
upload_port = COM4 upload_port = COM4
monitor_port = COM4 monitor_port = COM4

7
src/ise_display_definitions.hpp
View file

@ -1,13 +1,6 @@
#pragma once #pragma once
//start definition //start definition
#define CT_RMS_VOLTAGE 220.0
#define CT_PIN_LIGHT_PHASE1 0
#define CT_PIN_LIGHT_PHASE2 1
#define CT_PIN_SOCKET 2
#define CT_PIN_AC_PHASE1 3
#define CT_PIN_AC_PHASE2 4
#define CT_PIN_AC_PHASE3 5
/* /*
tentetive pin mapping tentetive pin mapping

42
src/main.cpp
View file

@ -1,5 +1,7 @@
#include <main.hpp> #include <main.hpp>
bool analogCardAvailable = false;
RemoteVariable pm25_in = RemoteVariable(); RemoteVariable pm25_in = RemoteVariable();
RemoteVariable pm25_out = RemoteVariable(); RemoteVariable pm25_out = RemoteVariable();
RemoteVariable temp_out = RemoteVariable(); RemoteVariable temp_out = RemoteVariable();
@ -128,23 +130,39 @@ void setup()
} }
espmega.outputs.setState(12, true); espmega.outputs.setState(12, true);
espmega.outputs.setValue(12,4095); espmega.outputs.setValue(12,4095);
ESP_LOGD("ISE OS", "Setting up climate cards");
espmega.installCard(2, &climateCard); 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); ESP_LOGD("ISE OS", "Installing current transformer cards");
espmega.installCard(5, &ct_light_phase2); analogCardAvailable = espmega.installCard(4, &analogCard);
espmega.installCard(6, &ct_socket); if (analogCardAvailable || CT_FORCE_ENABLE) {
espmega.installCard(7, &ct_ac_phase1); ESP_LOGV("ISE OS", "Analog card available, installing current transformer cards");
espmega.installCard(8, &ct_ac_phase2); espmega.installCard(5, &ct_light_phase1);
espmega.installCard(9, &ct_ac_phase3); ct_light_phase1.bindFRAM(&espmega.fram, 5010);
espmega.iot->registerCard(4); espmega.installCard(6, &ct_light_phase2);
espmega.iot->registerCard(5); ct_light_phase2.bindFRAM(&espmega.fram, 5020);
espmega.iot->registerCard(6); espmega.installCard(7, &ct_socket);
espmega.iot->registerCard(7); ct_socket.bindFRAM(&espmega.fram, 5030);
espmega.iot->registerCard(8); espmega.installCard(8, &ct_ac_phase1);
espmega.iot->registerCard(9); ct_ac_phase1.bindFRAM(&espmega.fram, 5040);
espmega.installCard(9, &ct_ac_phase2);
ct_ac_phase2.bindFRAM(&espmega.fram, 5050);
espmega.installCard(10, &ct_ac_phase3);
ct_ac_phase3.bindFRAM(&espmega.fram, 5060);
espmega.iot->registerCard(4);
espmega.iot->registerCard(5);
espmega.iot->registerCard(6);
espmega.iot->registerCard(7);
espmega.iot->registerCard(8);
espmega.iot->registerCard(9);
} else {
ESP_LOGE("ISE OS", "Analog card not available, current transformer cards cannot and will not be installed.");
}
ESP_LOGD("ISE OS", "Registering Current Transformer Cards with IoT Module");
// auto binded_display_update_on_pm25_out = std::bind(&display_update,0,std::placeholders::_1); // auto binded_display_update_on_pm25_out = std::bind(&display_update,0,std::placeholders::_1);
// auto binded_display_update_on_pm25_in = std::bind(&display_update,1,std::placeholders::_1); // auto binded_display_update_on_pm25_in = std::bind(&display_update,1,std::placeholders::_1);
// auto binded_display_update_on_temp_out = std::bind(&display_update,2,std::placeholders::_1); // auto binded_display_update_on_temp_out = std::bind(&display_update,2,std::placeholders::_1);

10
src/main.hpp
View file

@ -22,6 +22,16 @@ SET_LOOP_TASK_STACK_SIZE(32*1024);
#define AIR_CONDITIONER_IR_PIN 5 #define AIR_CONDITIONER_IR_PIN 5
#define AIR_CONDITIONER_RMT_CHANNEL RMT_CHANNEL_0 #define AIR_CONDITIONER_RMT_CHANNEL RMT_CHANNEL_0
// CT Configuration
#define CT_FORCE_ENABLE false
#define CT_RMS_VOLTAGE 220.0
#define CT_PIN_LIGHT_PHASE1 0
#define CT_PIN_LIGHT_PHASE2 1
#define CT_PIN_SOCKET 2
#define CT_PIN_AC_PHASE1 3
#define CT_PIN_AC_PHASE2 4
#define CT_PIN_AC_PHASE3 5
void handleMqttMessage(char *topic, char *payload); void handleMqttMessage(char *topic, char *payload);
void subscribeToMqttTopics(); void subscribeToMqttTopics();
void handlePageChange(uint8_t page); void handlePageChange(uint8_t page);