admin/chargeflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refact 3

Browse Source
This commit is contained in:
PlxEV
2025-06-08 16:55:50 +01:00
parent b457a39997
commit 03de00b93f
249 changed files with 93 additions and 19015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/ocpp/CMakeLists.txt
View File

@@ -5,4 +5,4 @@ set(srcs
idf_component_register(SRCS "${srcs}"
INCLUDE_DIRS "include"
PRIV_REQUIRES nvs_flash
REQUIRES config esp_wifi evse ade7758 mongoose MicroOcpp MicroOcppMongoose)
REQUIRES config esp_wifi evse mongoose MicroOcpp MicroOcppMongoose)

26
components/ocpp/src/ocpp.c
View File

@@ -6,7 +6,6 @@
#include "evse_state.h"
#include "esp_wifi.h"
#include "meter.h"
#include "orno_modbus.h"
#include "nvs.h"
@@ -149,22 +148,12 @@ bool setEvseReadyInput()
// return false;
}
#include "meter.h"
#include "esp_log.h"
#define TAG "ocpp_input" // ou o nome adequado do seu módulo
float setPowerMeterInput()
{
ESP_LOGI(TAG, "PowerMeterInput");
if (!meter_is_running()) {
ESP_LOGW(TAG, "Meter not running, returning fallback value.");
return 0.0f;
}
MeterData data = meter_getData();
return data.wattA + data.wattB + data.wattC;
//MeterData data = meter_getData();
//return data.wattA + data.wattB + data.wattC;
return 0.0f;
}
float setEnergyMeterInput()
@@ -187,6 +176,7 @@ float setCurrentInput()
{
ESP_LOGI(TAG, "CurrentInput");
/*
if (!meter_is_running()) {
ESP_LOGW(TAG, "Meter not running, returning fallback.");
return 0.0f;
@@ -194,12 +184,15 @@ float setCurrentInput()
MeterData data = meter_getData();
return data.irmsA;
*/
return 0;
}
float setVoltageInput()
{
ESP_LOGI(TAG, "VoltageInput");
/*
if (!meter_is_running()) {
ESP_LOGW(TAG, "Meter not running, returning fallback.");
return 0.0f;
@@ -207,6 +200,8 @@ float setVoltageInput()
MeterData data = meter_getData();
return data.vrmsA;
*/
return 0.0f;
}
float setTemperatureInput()
@@ -219,7 +214,8 @@ float setPowerInput()
{
ESP_LOGI(TAG, "PowerInput");
// return (float)orno_modbus_get_meter_state().activepower;
return meter_getData().wattA + meter_getData().wattB + meter_getData().wattC;
//return meter_getData().wattA + meter_getData().wattB + meter_getData().wattC;
return 0;
}
void setSmartChargingCurrentOutput(float limit)