Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DCSupplySimulator: remove designated assignments #509

Merged
merged 1 commit into from
Feb 12, 2024
Merged

DCSupplySimulator: remove designated assignments #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 23 additions & 18 deletions modules/simulation/DCSupplySimulator/main/power_supply_DCImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,33 @@ void power_supply_DCImpl::init() {
this->power_supply_thread_handle = std::thread(&power_supply_DCImpl::power_supply_worker, this);
}

static auto get_capabilities_from_config(const Conf& config) {
types::power_supply_DC::Capabilities cap;

cap.bidirectional = config.bidirectional;
cap.current_regulation_tolerance_A = 2.0f;
cap.peak_current_ripple_A = 2.0f;
cap.max_export_voltage_V = static_cast<float>(config.max_voltage);
cap.min_export_voltage_V = static_cast<float>(config.min_voltage);
cap.max_export_current_A = static_cast<float>(config.max_current);
cap.min_export_current_A = static_cast<float>(config.min_current);
cap.max_export_power_W = static_cast<float>(config.max_power);
cap.max_import_voltage_V = static_cast<float>(config.max_voltage);
cap.min_import_voltage_V = static_cast<float>(config.min_voltage);
cap.max_import_current_A = static_cast<float>(config.max_current);
cap.min_import_current_A = static_cast<float>(config.min_current);
cap.max_import_power_W = static_cast<float>(config.max_power);
cap.conversion_efficiency_import = 0.85f;
cap.conversion_efficiency_export = 0.9f;

return cap;
}

void power_supply_DCImpl::ready() {
}

types::power_supply_DC::Capabilities power_supply_DCImpl::handle_getCapabilities() {
types::power_supply_DC::Capabilities Capabilities = {
.bidirectional = this->config.bidirectional,
.current_regulation_tolerance_A = 2.0,
.peak_current_ripple_A = 2.0,
.max_export_voltage_V = static_cast<float>(this->config.max_voltage),
.min_export_voltage_V = static_cast<float>(this->config.min_voltage),
.max_export_current_A = static_cast<float>(this->config.max_current),
.min_export_current_A = static_cast<float>(this->config.min_current),
.max_export_power_W = static_cast<float>(this->config.max_power),
.max_import_voltage_V = static_cast<float>(this->config.max_voltage),
.min_import_voltage_V = static_cast<float>(this->config.min_voltage),
.max_import_current_A = static_cast<float>(this->config.max_current),
.min_import_current_A = static_cast<float>(this->config.min_current),
.max_import_power_W = static_cast<float>(this->config.max_power),
.conversion_efficiency_import = 0.85,
.conversion_efficiency_export = 0.9,
};
return Capabilities;
return get_capabilities_from_config(this->config);
}

void power_supply_DCImpl::handle_setMode(types::power_supply_DC::Mode& value) {
Expand Down
2 changes: 1 addition & 1 deletion modules/simulation/DCSupplySimulator/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ provides:
description: Main interface for the power supply
config:
bidirectional:
description: Set to true to for bidirectional supply
description: Set to true for bidirectional supply
type: boolean
default: true
max_power:
Expand Down
2 changes: 1 addition & 1 deletion modules/simulation/JsDCSupplySimulator/manifest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ provides:
description: Main interface for the power supply
config:
bidirectional:
description: Set to true to for bidirectional supply
description: Set to true for bidirectional supply
type: boolean
default: true
max_power:
Expand Down
Loading