Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 49 additions & 0 deletions akit/src/main/native/include/akit/LoggedPowerDistribution.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#pragma once
#include "akit/LogTable.h"
#include "akit/conduit/ConduitApi.h"

namespace akit {

class LoggedPowerDistribution {
public:
static LoggedPowerDistribution& getInstance() {
if (!instance)
instance = std::make_unique<LoggedPowerDistribution>();
return instance;
}

static LoggedPowerDistribution& getInstance(int moduleID, HAL_PowerDistributionType moduleType) {
if (!instance) instance = std::make_unique<LoggedPowerDistribution>(moduleID, moduleType);
return instance;
}

void saveToLog(LogTable table) {
conduit::ConduitApi& inst = conduit::ConduitApi::getInstance();
table.put("Temperature", inst.getPDPTemperature());
table.put("Voltage", inst.getPDPVoltage());
std::array<double, 24> currents;
for (int i = 0; i < currents.size(); i++)
currents[i] = inst.getPDPChannelCurrent(i);
table.put("ChannelCurrent", currents);
table.put("TotalCurrent", inst.getPDPTotalCurrent());
table.put("TotalPower", inst.getPDPTotalPower());
table.put("TotalEnergy", inst.getPDPTotalEnergy());

table.put("ChannelCount", inst.getPDPChannelCount());
table.put("Faults", inst.getPDPFaults());
table.put("StickyFaults", inst.getPDPStickyFaults());
}

private:
LoggedPowerDistribution() : LoggedPowerDistribution{HAL_DEFAULT_POWER_DISTRIBUTION_MODULE, HAL_PowerDistributionType_kAutomatic} {}

LoggedPowerDistribution(int moduleID, HAL_PowerDistributionType moduleType) : moduleID{moduleID}, moduleType{moduleType} {
conduit::ConduitApi::getInstance().configurePowerDistribution(moduleID, moduleType);
}

static std::unique_ptr<LoggedPowerDistribution> instance;
int moduleID;
HAL_PowerDistributionType moduleType;
}

}
7 changes: 6 additions & 1 deletion akit/src/main/native/include/akit/conduit/ConduitApi.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#pragma once
#include <array>
#include <hal/PowerDistribution.h>
#include "conduit/wpilibio.h"
#include "conduit_schema_generated.h"

Expand Down Expand Up @@ -119,6 +120,10 @@ class ConduitApi {
return inputs.pdp().total_energy();
}

double getPDPTotalPower() {
return inputs.pdp().total_power();
}

double getFPGAVersion() {
return inputs.sys().fpga_version();
}
Expand Down Expand Up @@ -251,7 +256,7 @@ class ConduitApi {
return inputs.sys().epoch_time();
}

void configurePowerDistribution(int moduleID, int type) {
void configurePowerDistribution(int moduleID, HAL_PowerDistributionType type) {
// FIXME: Unimplemented
}

Expand Down