Add extracted tools: CitrineOS, OpenOCPP, ShapeShifter
- CitrineOS core extracted (CSMS OCPP 2.0.1) - OpenOCPP extracted (firmware OCPP 1.6J/2.0.1) - ShapeShifter library installed (pip install -e) - ShapeShifter specification extracted - EVerest extracted TODO updated with progress
This commit is contained in:
@@ -0,0 +1,16 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// Copyright 2020 - 2025 Pionix GmbH and Contributors to EVerest
|
||||
|
||||
#include "Acrel_DJSF1352_RN.hpp"
|
||||
|
||||
namespace module {
|
||||
|
||||
void Acrel_DJSF1352_RN::init() {
|
||||
invoke_init(*p_main);
|
||||
}
|
||||
|
||||
void Acrel_DJSF1352_RN::ready() {
|
||||
invoke_ready(*p_main);
|
||||
}
|
||||
|
||||
} // namespace module
|
||||
@@ -0,0 +1,63 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// Copyright 2020 - 2025 Pionix GmbH and Contributors to EVerest
|
||||
#ifndef ACREL_DJSF1352_RN_HPP
|
||||
#define ACREL_DJSF1352_RN_HPP
|
||||
|
||||
//
|
||||
// AUTO GENERATED - MARKED REGIONS WILL BE KEPT
|
||||
// template version 2
|
||||
//
|
||||
|
||||
#include "ld-ev.hpp"
|
||||
|
||||
// headers for provided interface implementations
|
||||
#include <generated/interfaces/powermeter/Implementation.hpp>
|
||||
|
||||
// headers for required interface implementations
|
||||
#include <generated/interfaces/serial_communication_hub/Interface.hpp>
|
||||
|
||||
// ev@4bf81b14-a215-475c-a1d3-0a484ae48918:v1
|
||||
// insert your custom include headers here
|
||||
// ev@4bf81b14-a215-475c-a1d3-0a484ae48918:v1
|
||||
|
||||
namespace module {
|
||||
|
||||
struct Conf {};
|
||||
|
||||
class Acrel_DJSF1352_RN : public Everest::ModuleBase {
|
||||
public:
|
||||
Acrel_DJSF1352_RN() = delete;
|
||||
Acrel_DJSF1352_RN(const ModuleInfo& info, std::unique_ptr<powermeterImplBase> p_main,
|
||||
std::unique_ptr<serial_communication_hubIntf> r_serial_comm_hub, Conf& config) :
|
||||
ModuleBase(info), p_main(std::move(p_main)), r_serial_comm_hub(std::move(r_serial_comm_hub)), config(config){};
|
||||
|
||||
const std::unique_ptr<powermeterImplBase> p_main;
|
||||
const std::unique_ptr<serial_communication_hubIntf> r_serial_comm_hub;
|
||||
const Conf& config;
|
||||
|
||||
// ev@1fce4c5e-0ab8-41bb-90f7-14277703d2ac:v1
|
||||
// insert your public definitions here
|
||||
// ev@1fce4c5e-0ab8-41bb-90f7-14277703d2ac:v1
|
||||
|
||||
protected:
|
||||
// ev@4714b2ab-a24f-4b95-ab81-36439e1478de:v1
|
||||
// insert your protected definitions here
|
||||
// ev@4714b2ab-a24f-4b95-ab81-36439e1478de:v1
|
||||
|
||||
private:
|
||||
friend class LdEverest;
|
||||
void init();
|
||||
void ready();
|
||||
|
||||
// ev@211cfdbe-f69a-4cd6-a4ec-f8aaa3d1b6c8:v1
|
||||
// insert your private definitions here
|
||||
// ev@211cfdbe-f69a-4cd6-a4ec-f8aaa3d1b6c8:v1
|
||||
};
|
||||
|
||||
// ev@087e516b-124c-48df-94fb-109508c7cda9:v1
|
||||
// insert other definitions here
|
||||
// ev@087e516b-124c-48df-94fb-109508c7cda9:v1
|
||||
|
||||
} // namespace module
|
||||
|
||||
#endif // ACREL_DJSF1352_RN_HPP
|
||||
@@ -0,0 +1,21 @@
|
||||
#
|
||||
# AUTO GENERATED - MARKED REGIONS WILL BE KEPT
|
||||
# template version 3
|
||||
#
|
||||
|
||||
# module setup:
|
||||
# - ${MODULE_NAME}: module name
|
||||
ev_setup_cpp_module()
|
||||
|
||||
# ev@bcc62523-e22b-41d7-ba2f-825b493a3c97:v1
|
||||
# insert your custom targets and additional config variables here
|
||||
# ev@bcc62523-e22b-41d7-ba2f-825b493a3c97:v1
|
||||
|
||||
target_sources(${MODULE_NAME}
|
||||
PRIVATE
|
||||
"main/powermeterImpl.cpp"
|
||||
)
|
||||
|
||||
# ev@c55432ab-152c-45a9-9d2e-7281d50c69c3:v1
|
||||
# insert other things like install cmds etc here
|
||||
# ev@c55432ab-152c-45a9-9d2e-7281d50c69c3:v1
|
||||
@@ -0,0 +1,116 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// Copyright 2020 - 2025 Pionix GmbH and Contributors to EVerest
|
||||
|
||||
#include "powermeterImpl.hpp"
|
||||
#include <fmt/core.h>
|
||||
#include <thread>
|
||||
#include <utils/date.hpp>
|
||||
|
||||
namespace module {
|
||||
namespace main {
|
||||
|
||||
void powermeterImpl::init() {
|
||||
this->init_default_values();
|
||||
}
|
||||
|
||||
void powermeterImpl::ready() {
|
||||
std::thread t([this] {
|
||||
while (true) {
|
||||
read_powermeter_values();
|
||||
sleep(1);
|
||||
}
|
||||
});
|
||||
t.detach();
|
||||
}
|
||||
|
||||
types::powermeter::TransactionStartResponse
|
||||
powermeterImpl::handle_start_transaction(types::powermeter::TransactionReq& value) {
|
||||
types::powermeter::TransactionStartResponse r;
|
||||
r.status = types::powermeter::TransactionRequestStatus::NOT_SUPPORTED;
|
||||
return r;
|
||||
}
|
||||
|
||||
types::powermeter::TransactionStopResponse powermeterImpl::handle_stop_transaction(std::string& transaction_id) {
|
||||
types::powermeter::TransactionStopResponse r;
|
||||
r.status = types::powermeter::TransactionRequestStatus::NOT_SUPPORTED;
|
||||
return r;
|
||||
}
|
||||
|
||||
void powermeterImpl::init_default_values() {
|
||||
this->pm_last_values.timestamp = Everest::Date::to_rfc3339(date::utc_clock::now());
|
||||
this->pm_last_values.meter_id = std::string(this->mod->info.id);
|
||||
|
||||
this->pm_last_values.energy_Wh_import.total = 0.0f;
|
||||
|
||||
types::units::Power pwr;
|
||||
pwr.total = 0.0f;
|
||||
this->pm_last_values.power_W = pwr;
|
||||
|
||||
types::units::Voltage volt;
|
||||
volt.DC = 0.0f;
|
||||
this->pm_last_values.voltage_V = volt;
|
||||
|
||||
types::units::Current amp;
|
||||
amp.DC = 0.0f;
|
||||
this->pm_last_values.current_A = amp;
|
||||
}
|
||||
|
||||
void powermeterImpl::read_powermeter_values() {
|
||||
// read power data
|
||||
auto power_data_response =
|
||||
mod->r_serial_comm_hub->call_modbus_read_holding_registers(config.powermeter_device_id, 0x0000, 20);
|
||||
process_power_data_message(power_data_response);
|
||||
|
||||
this->pm_last_values.timestamp = Everest::Date::to_rfc3339(date::utc_clock::now());
|
||||
|
||||
this->publish_powermeter(this->pm_last_values);
|
||||
}
|
||||
|
||||
void powermeterImpl::process_power_data_message(const types::serial_comm_hub_requests::Result message) {
|
||||
if (message.status_code == types::serial_comm_hub_requests::StatusCodeEnum::Success) {
|
||||
types::units::Voltage volt;
|
||||
volt.DC = message.value.value()[DC_VOLTAGE] * pow(10.0, (message.value.value()[DC_VOLT_DECIMAL_POINT] - 3));
|
||||
this->pm_last_values.voltage_V = volt;
|
||||
|
||||
types::units::Current amp;
|
||||
amp.DC = (int16_t)(message.value.value()[DC_CURRENT]) *
|
||||
pow(10.0, (message.value.value()[DC_CURR_DECIMAL_POINT] - 3));
|
||||
this->pm_last_values.current_A = amp;
|
||||
|
||||
types::units::Power power;
|
||||
power.total =
|
||||
(int16_t)(message.value.value()[POWER]) * pow(10.0, (message.value.value()[POWER_DECIMAL_POINT] - 3));
|
||||
this->pm_last_values.power_W = power;
|
||||
|
||||
types::units::Energy energy_in;
|
||||
energy_in.total = float(uint32_t(message.value.value()[TOTAL_POS_ACT_ENERGY_HIGH] << 16) |
|
||||
uint32_t(message.value.value()[TOTAL_POS_ACT_ENERGY_LOW]));
|
||||
this->pm_last_values.energy_Wh_import = energy_in;
|
||||
|
||||
types::units::Energy energy_out;
|
||||
energy_out.total = float(uint32_t(message.value.value()[TOTAL_REV_ACT_ENERGY_HIGH] << 16) |
|
||||
uint32_t(message.value.value()[TOTAL_REV_ACT_ENERGY_LOW]));
|
||||
this->pm_last_values.energy_Wh_export = energy_out;
|
||||
} else {
|
||||
// error: message sending failed
|
||||
output_error_with_content(message);
|
||||
}
|
||||
}
|
||||
|
||||
void powermeterImpl::output_error_with_content(const types::serial_comm_hub_requests::Result& response) {
|
||||
std::stringstream ss;
|
||||
|
||||
if (response.value.has_value()) {
|
||||
for (size_t i = 0; i < response.value.value().size(); i++) {
|
||||
if (i != 0)
|
||||
ss << ", ";
|
||||
ss << "0x" << std::setfill('0') << std::setw(2) << std::hex << int(response.value.value()[i]);
|
||||
}
|
||||
}
|
||||
|
||||
EVLOG_debug << "received error response: " << status_code_enum_to_string(response.status_code) << " (" << ss.str()
|
||||
<< ")\n";
|
||||
}
|
||||
|
||||
} // namespace main
|
||||
} // namespace module
|
||||
@@ -0,0 +1,103 @@
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
// Copyright 2020 - 2025 Pionix GmbH and Contributors to EVerest
|
||||
#ifndef MAIN_POWERMETER_IMPL_HPP
|
||||
#define MAIN_POWERMETER_IMPL_HPP
|
||||
|
||||
//
|
||||
// AUTO GENERATED - MARKED REGIONS WILL BE KEPT
|
||||
// template version 3
|
||||
//
|
||||
|
||||
#include <generated/interfaces/powermeter/Implementation.hpp>
|
||||
|
||||
#include "../Acrel_DJSF1352_RN.hpp"
|
||||
|
||||
// ev@75ac1216-19eb-4182-a85c-820f1fc2c091:v1
|
||||
// insert your custom include headers here
|
||||
// ev@75ac1216-19eb-4182-a85c-820f1fc2c091:v1
|
||||
|
||||
namespace module {
|
||||
namespace main {
|
||||
|
||||
struct Conf {
|
||||
int powermeter_device_id;
|
||||
};
|
||||
|
||||
class powermeterImpl : public powermeterImplBase {
|
||||
public:
|
||||
powermeterImpl() = delete;
|
||||
powermeterImpl(Everest::ModuleAdapter* ev, const Everest::PtrContainer<Acrel_DJSF1352_RN>& mod, Conf& config) :
|
||||
powermeterImplBase(ev, "main"), mod(mod), config(config){};
|
||||
|
||||
// ev@8ea32d28-373f-4c90-ae5e-b4fcc74e2a61:v1
|
||||
// insert your public definitions here
|
||||
// ev@8ea32d28-373f-4c90-ae5e-b4fcc74e2a61:v1
|
||||
|
||||
protected:
|
||||
// command handler functions (virtual)
|
||||
virtual types::powermeter::TransactionStartResponse
|
||||
handle_start_transaction(types::powermeter::TransactionReq& value) override;
|
||||
virtual types::powermeter::TransactionStopResponse handle_stop_transaction(std::string& transaction_id) override;
|
||||
|
||||
// ev@d2d1847a-7b88-41dd-ad07-92785f06f5c4:v1
|
||||
// insert your protected definitions here
|
||||
// ev@d2d1847a-7b88-41dd-ad07-92785f06f5c4:v1
|
||||
|
||||
private:
|
||||
const Everest::PtrContainer<Acrel_DJSF1352_RN>& mod;
|
||||
const Conf& config;
|
||||
|
||||
virtual void init() override;
|
||||
virtual void ready() override;
|
||||
|
||||
// ev@3370e4dd-95f4-47a9-aaec-ea76f34a66c9:v1
|
||||
|
||||
enum PmRegisters {
|
||||
DC_VOLTAGE,
|
||||
DC_VOLT_DECIMAL_POINT,
|
||||
DC_CURRENT,
|
||||
DC_CURR_DECIMAL_POINT,
|
||||
BROKEN_WIRE_DETECT,
|
||||
INTERNAL_TEMP,
|
||||
RESERVED_1,
|
||||
RESERVED_2,
|
||||
POWER,
|
||||
POWER_DECIMAL_POINT,
|
||||
RESERVED_3,
|
||||
RESERVED_4,
|
||||
TOTAL_POS_ACT_ENERGY_HIGH,
|
||||
TOTAL_POS_ACT_ENERGY_LOW,
|
||||
TOTAL_REV_ACT_ENERGY_HIGH,
|
||||
TOTAL_REV_ACT_ENERGY_LOW,
|
||||
VOLTAGE_TRANSFORM_RATIO,
|
||||
PRIMARY_RATED_CURRENT,
|
||||
SWITCH_IO_STATUS,
|
||||
ALARM_STATUS
|
||||
};
|
||||
|
||||
enum CurrRateRegisters {
|
||||
SHARP,
|
||||
PEAK,
|
||||
SHOULDER,
|
||||
OFF_PEAK
|
||||
};
|
||||
|
||||
types::powermeter::Powermeter pm_last_values;
|
||||
|
||||
std::thread output_thread;
|
||||
|
||||
void init_default_values();
|
||||
void read_powermeter_values();
|
||||
void process_power_data_message(const types::serial_comm_hub_requests::Result message);
|
||||
void output_error_with_content(const types::serial_comm_hub_requests::Result& response);
|
||||
// ev@3370e4dd-95f4-47a9-aaec-ea76f34a66c9:v1
|
||||
};
|
||||
|
||||
// ev@3d7da0ad-02c2-493d-9920-0bbbd56b9876:v1
|
||||
// insert other definitions here
|
||||
// ev@3d7da0ad-02c2-493d-9920-0bbbd56b9876:v1
|
||||
|
||||
} // namespace main
|
||||
} // namespace module
|
||||
|
||||
#endif // MAIN_POWERMETER_IMPL_HPP
|
||||
@@ -0,0 +1,24 @@
|
||||
description: Driver module for powermeters of manufacturer Acrel. Supports DJSF1352.
|
||||
provides:
|
||||
main:
|
||||
description: Provides an Acrel DC powermeter
|
||||
interface: powermeter
|
||||
config:
|
||||
powermeter_device_id:
|
||||
description: The powermeter's address on the serial bus
|
||||
type: integer
|
||||
minimum: 0
|
||||
maximum: 255
|
||||
default: 1
|
||||
requires:
|
||||
serial_comm_hub:
|
||||
interface: serial_communication_hub
|
||||
min_connections: 1
|
||||
max_connections: 1
|
||||
enable_external_mqtt: false
|
||||
metadata:
|
||||
license: https://opensource.org/licenses/Apache-2.0
|
||||
authors:
|
||||
- Lars Dieckmann
|
||||
- Jan Christoph Habig
|
||||
- Florin Mihut
|
||||
Reference in New Issue
Block a user