eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Merge remote-tracking branch 'origin/develop' into mueller/plpcdu-sus-updates

Browse Source
This commit is contained in:
Robin Müller
2022-02-25 11:16:04 +01:00
parent f959ffb6ee 9010f58636
commit 07da61d8c5
8 changed files with 36 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mission/devices/PayloadPcduHandler.h
View File

@ -32,7 +32,8 @@ class SpiCookie;
class PayloadPcduHandler : public DeviceHandlerBase {
public:
static constexpr uint8_t SUBSYSTEM_ID = SUBSYSTEM_ID::PL_PCDU_HANDLER;
static constexpr Event TRANSITION_BACK_TO_OFF = event::makeEvent(SUBSYSTEM_ID, 0, severity::MEDIUM);
static constexpr Event TRANSITION_BACK_TO_OFF =
event::makeEvent(SUBSYSTEM_ID, 0, severity::MEDIUM);
PayloadPcduHandler(object_id_t objectId, object_id_t comIF, CookieIF* cookie, GpioIF* gpioIF,
bool periodicPrintout);
@ -49,7 +50,7 @@ class PayloadPcduHandler : public DeviceHandlerBase {
#endif
private:
enum class States: uint8_t {
enum class States : uint8_t {
PCDU_OFF,
// Solid State Relay, enable battery voltages VBAT0 and VBAT1. This will also switch on
// the ADC

2
mission/devices/devicedefinitions/payloadPcduDefinitions.h
View File

@ -12,7 +12,7 @@ namespace plpcdu {
using namespace max1227;
enum PlPcduAdcChannels: uint8_t {
enum PlPcduAdcChannels : uint8_t {
U_BAT_DIV_6 = 0,
// According to schematic, will be 2.2158V for Vneg = +0V and 0.2446V for Vneg = -6V
// Full Forumula: V_neg = V_post - (R1 + R2) / R1 * (V_pos - V_out) with R1 being 27.4k