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

CT card didn't inherit ExpansionCard, crap

Browse source
This commit is contained in:
Siwat Sirichai 2024-02-27 01:02:50 +07:00
parent 7e3b0b992a
commit 581a5b4fd0
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ise_display_definitions.hpp
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
//start definition //start definition
#define CT_RMS_VOLTAGE 220 #define CT_RMS_VOLTAGE 220.0
#define CT_PIN_LIGHT_PHASE1 0 #define CT_PIN_LIGHT_PHASE1 0
#define CT_PIN_LIGHT_PHASE2 1 #define CT_PIN_LIGHT_PHASE2 1
#define CT_PIN_SOCKET 2 #define CT_PIN_SOCKET 2

28
src/main.cpp
View file

@ -7,14 +7,14 @@ RemoteVariable weather = RemoteVariable();
RemoteVariable pm_switch = RemoteVariable(); RemoteVariable pm_switch = RemoteVariable();
RemoteVariable pm_fan_speed = RemoteVariable(); RemoteVariable pm_fan_speed = RemoteVariable();
AnalogCard AnalogCard = AnalogCard(); AnalogCard analogCard = AnalogCard();
float *voltage = CT_RMS_VOLTAGE; float voltage = CT_RMS_VOLTAGE;
CurrentTransformerCard ct_light_phase1 = CurrentTransformerCard(&AnalogCard, CT_PIN_AC_PHASE1, &voltage, &adcToCurrent, 1000); 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_light_phase2 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
CurrentTransformerCard ct_socket = CurrentTransformerCard(&AnalogCard, CT_PIN_SOCKET, &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_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_phase2 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE2, &voltage, &adcToCurrent, 1000);
CurrentTransformerCard ct_ac_phase3 = CurrentTransformerCard(&AnalogCard, CT_PIN_AC_PHASE3, &voltage, &adcToCurrent, 1000); CurrentTransformerCard ct_ac_phase3 = CurrentTransformerCard(&analogCard, CT_PIN_AC_PHASE3, &voltage, &adcToCurrent, 1000);
const char *mode_names[] = {"off", "cool", "fan_only", "dry"}; const char *mode_names[] = {"off", "cool", "fan_only", "dry"};
const char *fan_speed_names[] = {"auto", "high", "medium", "low"}; const char *fan_speed_names[] = {"auto", "high", "medium", "low"};
@ -139,12 +139,12 @@ void setup()
espmega.installCard(7, &ct_ac_phase1); espmega.installCard(7, &ct_ac_phase1);
espmega.installCard(8, &ct_ac_phase2); espmega.installCard(8, &ct_ac_phase2);
espmega.installCard(9, &ct_ac_phase3); espmega.installCard(9, &ct_ac_phase3);
espmega->iot.registerCard(4); espmega.iot->registerCard(4);
espmega->iot.registerCard(5); espmega.iot->registerCard(5);
espmega->iot.registerCard(6); espmega.iot->registerCard(6);
espmega->iot.registerCard(7); espmega.iot->registerCard(7);
espmega->iot.registerCard(8); espmega.iot->registerCard(8);
espmega->iot.registerCard(9); espmega.iot->registerCard(9);
// 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);

2
src/main.hpp
View file

@ -46,4 +46,4 @@ 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 adc2current(uint16_t adc_value); float adcToCurrent(uint16_t adc_value);