takne over defaultcfg
This commit is contained in:
parent
057f3b859e
commit
b9f3c1ee84
|
|
@ -0,0 +1,11 @@
|
|||
#ifndef FSFW_DEFAULTCFG_VERSION_H_
|
||||
#define FSFW_DEFAULTCFG_VERSION_H_
|
||||
|
||||
static const char* FSFW_VERSION_NAME = "fsfw";
|
||||
|
||||
#define FSFW_VERSION 0
|
||||
#define FSFW_SUBVERSION 0
|
||||
|
||||
|
||||
|
||||
#endif /* FSFW_DEFAULTCFG_VERSION_H_ */
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef CONFIG_FSFWCONFIG_H_
|
||||
#define CONFIG_FSFWCONFIG_H_
|
||||
|
||||
#include "version.h"
|
||||
#include <FSFWVersion.h>
|
||||
|
||||
//! Used to determine whether C++ ostreams are used
|
||||
//! Those can lead to code bloat.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
#ifndef CONFIG_OBSWCONFIG_H_
|
||||
#define CONFIG_OBSWCONFIG_H_
|
||||
|
||||
#include "OBSWVersion.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
namespace config {
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
#ifndef CONFIG_VERSION_H_
|
||||
#define CONFIG_VERSION_H_
|
||||
|
||||
/* OBSW versioning can be specified in this file */
|
||||
|
||||
#define OBSW_VERSION 0
|
||||
#define OBSW_SUBVERSION 0
|
||||
|
||||
#endif /* CONFIG_VERSION_H_ */
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
#include "Factory.h"
|
||||
|
||||
/* Config */
|
||||
#include <tmtc/apid.h>
|
||||
#include <objects/systemObjectList.h>
|
||||
#include <devices/logicalAddresses.h>
|
||||
#include <devices/powerSwitcherList.h>
|
||||
#include <tmtc/pusIds.h>
|
||||
#include "../tmtc/apid.h"
|
||||
#include "../tmtc/pusIds.h"
|
||||
#include "../objects/systemObjectList.h"
|
||||
#include "../devices/logicalAddresses.h"
|
||||
#include "../devices/powerSwitcherList.h"
|
||||
|
||||
#include <fsfw/devicehandlers/DeviceHandlerBase.h>
|
||||
#include <fsfw/events/EventManager.h>
|
||||
|
|
@ -13,21 +11,20 @@
|
|||
#include <fsfw/tmtcpacket/pus/TmPacketStored.h>
|
||||
#include <fsfw/tmtcservices/CommandingServiceBase.h>
|
||||
#include <fsfw/tmtcservices/PusServiceBase.h>
|
||||
#include <mission/utility/TmFunnel.h>
|
||||
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
|
||||
/**
|
||||
* Build tasks by using SystemObject Interface (Interface).
|
||||
* Header files of all tasks must be included
|
||||
* Please note that an object has to implement the system object interface
|
||||
* if the nterface validity is checked or retrieved later by using the
|
||||
* get<TargetInterface>(object_id) function from the ObjectManagerIF.
|
||||
* This class should be used to create all system objects required for
|
||||
* the on-board software, using the object ID list from the configuration
|
||||
* folder.
|
||||
*
|
||||
* The objects are registered in the internal object manager automatically.
|
||||
* This is used later to add objects to tasks.
|
||||
*
|
||||
* This file also sets static framework IDs.
|
||||
*
|
||||
* Framework objects are created first.
|
||||
*
|
||||
* @ingroup init
|
||||
*/
|
||||
void Factory::produce(void) {
|
||||
|
|
@ -52,6 +49,6 @@ void Factory::setStaticFrameworkObjectIds() {
|
|||
DeviceHandlerFailureIsolation::powerConfirmationId = objects::NO_OBJECT;
|
||||
|
||||
TmPacketStored::timeStamperId = objects::PUS_TIME;
|
||||
TmFunnel::downlinkDestination = objects::NO_OBJECT;
|
||||
//TmFunnel::downlinkDestination = objects::NO_OBJECT;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,15 +5,12 @@
|
|||
#include <cstddef>
|
||||
|
||||
namespace Factory {
|
||||
size_t calculateStorage(uint8_t numberOfPools, uint16_t* numberOfElements,
|
||||
uint16_t* sizeOfElements);
|
||||
/**
|
||||
* @brief Creates all SystemObject elements which are persistent
|
||||
* during execution.
|
||||
*/
|
||||
void produce();
|
||||
void setStaticFrameworkObjectIds();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,137 +2,15 @@
|
|||
#define CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
|
||||
|
||||
#include <cstdint>
|
||||
#include <fsfw/objectmanager/frameworkObjects.h>
|
||||
|
||||
// The objects will be instantiated in the ID order
|
||||
namespace objects {
|
||||
enum sourceObjects: uint32_t {
|
||||
/* First Byte 0x50-0x52 reserved for PUS Services **/
|
||||
CCSDS_PACKET_DISTRIBUTOR = 0x50000100,
|
||||
PUS_PACKET_DISTRIBUTOR = 0x50000200,
|
||||
/* UDP ID must come after CCSDS Distributor **/
|
||||
UDP_TMTC_BRIDGE = 0x50000300,
|
||||
EMAC_POLLING_TASK = 0x50000400,
|
||||
SERIAL_TMTC_BRIDGE = 0x50000500,
|
||||
SERIAL_RING_BUFFER = 0x50000550,
|
||||
SERIAL_POLLING_TASK = 0x50000600,
|
||||
|
||||
PUS_SERVICE_6_MEM_MGMT = 0x51000500,
|
||||
PUS_SERVICE_20_PARAM_MGMT = 0x51002000,
|
||||
PUS_SERVICE_23_FILE_MGMT = 0x51002300,
|
||||
PUS_SERVICE_201_HEALTH = 0x51020100,
|
||||
|
||||
PUS_TIME = 0x52000001,
|
||||
TM_FUNNEL = 0x52000002,
|
||||
FREERTOS_TASK_MONITOR = 0x53000003,
|
||||
|
||||
CORE_CONTROLLER = 0x40001000,
|
||||
SYSTEM_STATE_TASK = 0x40001005,
|
||||
THERMAL_CONTROLLER = 0x40002000,
|
||||
RS485_CONTROLLER = 0x40005000,
|
||||
|
||||
/* 0x44 ('D') for Device Handlers **/
|
||||
/* Second Byte: ComIF -> 0x00: UART,0x10 SPI,0x20: I2C,30: GPIO,40: PWM */
|
||||
/* Third Byte: Device ID */
|
||||
PCDU_HANDLER = 0x44003200,
|
||||
GPS0_HANDLER = 0x44101F00,
|
||||
GPS1_HANDLER = 0x44202000,
|
||||
|
||||
DLR_PVCH = 0x44104000,
|
||||
GYRO1 = 0x44105000,
|
||||
DLR_IRAS = 0x44106000,
|
||||
|
||||
/* fourth byte decoder output ID */
|
||||
|
||||
// Devices connected to decoder 1
|
||||
SPI_Test_PT1000 = 0x44115400,
|
||||
SPI_Test_Gyro = 0x44115500,
|
||||
PT1000_Syrlinks_DEC1_O1 = 0x44115401,
|
||||
PT1000_Camera_DEC1_O2 = 0x44115402,
|
||||
PT1000_SuS1_DEC1_O3 = 0x44115404,
|
||||
PT1000_SuS2_DEC1_O4 = 0x44115405,
|
||||
PT1000_SuS3_DEC1_O5 = 0x44115406,
|
||||
PT1000_PVHC_DEC1_O6 = 0x44115407,
|
||||
|
||||
// Devices connected to decoder 2
|
||||
PT1000_CCSDS1_DEC2 = 0x44125401,
|
||||
PT1000_MGT1_DEC2 = 0x44125403,
|
||||
PT1000_SuS4_DEC2 = 0x44125404,
|
||||
PT1000_SuS5_DEC2 = 0x44125405,
|
||||
PT1000_SuS6_DEC2 = 0x44125406,
|
||||
PT1000_PVCH_DEC2 = 0x44125407,
|
||||
SuS_ADC1_DEC2 = 0x44020108,
|
||||
|
||||
// Devices connected to decoder 3
|
||||
PT1000_Iridium_DEC3 = 0x44130301,
|
||||
PT1000_CCSDS2_DEC3 = 0x44130302,
|
||||
PT1000_SuS7_DEC3 = 0x44130305,
|
||||
PT1000_SuS8_DEC3 = 0x44130306,
|
||||
PT1000_PVCH_DEC3 = 0x44130307,
|
||||
GYRO2 = 0x44130308,
|
||||
|
||||
// Devices connected to decoder 4
|
||||
PT1000_PLOC_DEC4 = 0x44145401,
|
||||
PT1000_SuS9_DEC4 = 0x44145404,
|
||||
PT1000_SuS10_DEC4 = 0x44145405,
|
||||
PT1000_PVHC_DEC4 = 0x44145406,
|
||||
SuS_ADC_DEC4 = 0x44145407,
|
||||
|
||||
/* 0x49 ('I') for Communication Interfaces **/
|
||||
DUMMY_ECHO_COM_IF = 0x4900AFFE,
|
||||
DUMMY_GPS_COM_IF = 0x49001F00,
|
||||
RS232_DEVICE_COM_IF = 0x49005200,
|
||||
I2C_DEVICE_COM_IF = 0x49005300,
|
||||
GPIO_DEVICE_COM_IF = 0x49005400,
|
||||
SPI_DEVICE_COM_IF = 0x49005600,
|
||||
//SPI_POLLING_TASK = 0x49005410,
|
||||
|
||||
/* 0x4d ('M') for Memory Handlers **/
|
||||
SD_CARD_HANDLER = 0x4D0073AD,
|
||||
FRAM_HANDLER = 0x4D008000,
|
||||
SOFTWARE_IMAGE_HANDLER = 0x4D009000,
|
||||
|
||||
/* Board Specific */
|
||||
AT91_I2C_TEST_TASK = 0x12345678,
|
||||
AT91_UART0_TEST_TASK = 0x87654321,
|
||||
AT91_UART2_TEST_TASK = 0x000123336,
|
||||
AT91_SPI_TEST_TASK = 0x66666666,
|
||||
STM32_TEST_TASK = 0x77777777,
|
||||
LED_TASK = 0x12345777,
|
||||
|
||||
/* Test Task */
|
||||
ARDUINO_0 = 0x01010100,
|
||||
ARDUINO_1 = 0x01010101,
|
||||
ARDUINO_2 = 0x01010102,
|
||||
ARDUINO_3 = 0x01010103,
|
||||
ARDUINO_4 = 0x01010104,
|
||||
TEST_TASK = 0x42694269,
|
||||
DUMMY_HANDLER = 0x4400AFFE,
|
||||
TC_INJECTOR = 0x99000001
|
||||
/* All addresses between start and end are reserved for the FSFW */
|
||||
FSFW_CONFIG_RESERVED_START = PUS_SERVICE_1_VERIFICATION,
|
||||
FSFW_CONFIG_RESERVED_END = TM_STORE
|
||||
};
|
||||
}
|
||||
|
||||
#endif /* BSP_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_ */
|
||||
|
||||
|
||||
/**
|
||||
▄ ▄
|
||||
▌▒█ ▄▀▒▌
|
||||
▌▒▒█ ▄▀▒▒▒▐
|
||||
▐▄▀▒▒▀▀▀▀▄▄▄▀▒▒▒▒▒▐
|
||||
▄▄▀▒░▒▒▒▒▒▒▒▒▒█▒▒▄█▒▐
|
||||
▄▀▒▒▒░░░▒▒▒░░░▒▒▒▀██▀▒▌
|
||||
▐▒▒▒▄▄▒▒▒▒░░░▒▒▒▒▒▒▒▀▄▒▒▌
|
||||
▌░░▌█▀▒▒▒▒▒▄▀█▄▒▒▒▒▒▒▒█▒▐
|
||||
▐░░░▒▒▒▒▒▒▒▒▌██▀▒▒░░░▒▒▒▀▄▌
|
||||
▌░▒▄██▄▒▒▒▒▒▒▒▒▒░░░░░░▒▒▒▒▌
|
||||
▌▒▀▐▄█▄█▌▄░▀▒▒░░░░░░░░░░▒▒▒▐
|
||||
▐▒▒▐▀▐▀▒░▄▄▒▄▒▒▒▒▒▒░▒░▒░▒▒▒▒▌
|
||||
▐▒▒▒▀▀▄▄▒▒▒▄▒▒▒▒▒▒▒▒░▒░▒░▒▒▐
|
||||
▌▒▒▒▒▒▒▀▀▀▒▒▒▒▒▒░▒░▒░▒░▒▒▒▌
|
||||
▐▒▒▒▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▒▄▒▒▐
|
||||
▀▄▒▒▒▒▒▒▒▒▒▒▒░▒░▒░▒▄▒▒▒▒▌
|
||||
▀▄▒▒▒▒▒▒▒▒▒▒▄▄▄▀▒▒▒▒▄▀
|
||||
▀▄▄▄▄▄▄▀▀▀▒▒▒▒▒▄▄▀
|
||||
▒▒▒▒▒▒▒▒▒▒▀▀
|
||||
*/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue