Merge branch 'meier_eiveobsw' into meier/acuHkTable

This commit is contained in:
2021-02-14 11:40:49 +01:00
23 changed files with 396 additions and 125 deletions

View File

@ -6,7 +6,8 @@
#ifndef FSFWCONFIG_OBSWCONFIG_H_
#define FSFWCONFIG_OBSWCONFIG_H_
#define OBSW_ADD_TEST_CODE 0
#define TEST_LIBGPIOD 0
#define ADD_TEST_TAST 0
// These defines should be disabled for mission code but are useful for
// debugging.
@ -14,7 +15,7 @@
#define TE0720 0
#define P60DOCK_DEBUG 1
#define P60DOCK_DEBUG 0
#define PDU1_DEBUG 0
#define PDU2_DEBUG 0
#define ACU_DEBUG 0

View File

@ -5,7 +5,15 @@
namespace gpioIds {
enum gpioId_t {
HEATER_0
HEATER_0,
HEATER_1,
HEATER_2,
HEATER_3,
HEATER_4,
HEATER_5,
HEATER_6,
HEATER_7,
Test_ID
};
}

View File

@ -3,7 +3,14 @@
namespace heaterSwitches {
enum switcherList: uint8_t {
PAYLOAD_CAMERA,
HEATER_0,
HEATER_1,
HEATER_2,
HEATER_3,
HEATER_4,
HEATER_5,
HEATER_6,
HEATER_7,
NUMBER_OF_SWITCHES
};
}

View File

@ -50,6 +50,7 @@ namespace objects {
/* 0x54 ('T') for test handlers */
TEST_TASK = 0x54694269,
LIBGPIOD_TEST = 0x54123456,
SPI_TEST = 0x54000010,
DUMMY_INTERFACE = 0x5400CAFE,
DUMMY_HANDLER = 0x5400AFFE,