some fixes

This commit is contained in:
Robin Müller 2020-10-20 17:44:27 +02:00
parent 247c9f2947
commit 1940a2acf0
3 changed files with 4 additions and 406 deletions

View File

@ -2,137 +2,15 @@
#define CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_ #define CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_
#include <cstdint> #include <cstdint>
#include <fsfw/objectmanager/frameworkObjects.h>
// The objects will be instantiated in the ID order // The objects will be instantiated in the ID order
namespace objects { namespace objects {
enum sourceObjects: uint32_t { enum sourceObjects: uint32_t {
/* First Byte 0x50-0x52 reserved for PUS Services **/ /* All addresses between start and end are reserved for the FSFW */
CCSDS_PACKET_DISTRIBUTOR = 0x50000100, FSFW_CONFIG_RESERVED_START = PUS_SERVICE_1_VERIFICATION,
PUS_PACKET_DISTRIBUTOR = 0x50000200, FSFW_CONFIG_RESERVED_END = TM_STORE
/* 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
}; };
} }
#endif /* BSP_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_ */ #endif /* BSP_CONFIG_OBJECTS_SYSTEMOBJECTLIST_H_ */
/**
*/

View File

@ -1,271 +0,0 @@
/**
* @brief Auto-generated object translation file. Contains 86 translations.
* Generated on: 2020-08-25 00:57:14
**/
#include "translateObjects.h"
const char *AT91_UART2_TEST_TASK_STRING = "AT91_UART2_TEST_TASK";
const char *ARDUINO_0_STRING = "ARDUINO_0";
const char *ARDUINO_1_STRING = "ARDUINO_1";
const char *ARDUINO_2_STRING = "ARDUINO_2";
const char *ARDUINO_3_STRING = "ARDUINO_3";
const char *ARDUINO_4_STRING = "ARDUINO_4";
const char *AT91_I2C_TEST_TASK_STRING = "AT91_I2C_TEST_TASK";
const char *LED_TASK_STRING = "LED_TASK";
const char *TEST_TASK_STRING = "TEST_TASK";
const char *PCDU_HANDLER_STRING = "PCDU_HANDLER";
const char *DUMMY_HANDLER_STRING = "DUMMY_HANDLER";
const char *SuS_ADC1_DEC2_STRING = "SuS_ADC1_DEC2";
const char *GPS0_HANDLER_STRING = "GPS0_HANDLER";
const char *DLR_PVCH_STRING = "DLR_PVCH";
const char *GYRO1_STRING = "GYRO1";
const char *DLR_IRAS_STRING = "DLR_IRAS";
const char *SPI_Test_PT1000_STRING = "SPI_Test_PT1000";
const char *PT1000_Syrlinks_DEC1_O1_STRING = "PT1000_Syrlinks_DEC1_O1";
const char *PT1000_Camera_DEC1_O2_STRING = "PT1000_Camera_DEC1_O2";
const char *PT1000_SuS1_DEC1_O3_STRING = "PT1000_SuS1_DEC1_O3";
const char *PT1000_SuS2_DEC1_O4_STRING = "PT1000_SuS2_DEC1_O4";
const char *PT1000_SuS3_DEC1_O5_STRING = "PT1000_SuS3_DEC1_O5";
const char *PT1000_PVHC_DEC1_O6_STRING = "PT1000_PVHC_DEC1_O6";
const char *SPI_Test_Gyro_STRING = "SPI_Test_Gyro";
const char *PT1000_CCSDS1_DEC2_STRING = "PT1000_CCSDS1_DEC2";
const char *PT1000_MGT1_DEC2_STRING = "PT1000_MGT1_DEC2";
const char *PT1000_SuS4_DEC2_STRING = "PT1000_SuS4_DEC2";
const char *PT1000_SuS5_DEC2_STRING = "PT1000_SuS5_DEC2";
const char *PT1000_SuS6_DEC2_STRING = "PT1000_SuS6_DEC2";
const char *PT1000_PVCH_DEC2_STRING = "PT1000_PVCH_DEC2";
const char *PT1000_Iridium_DEC3_STRING = "PT1000_Iridium_DEC3";
const char *PT1000_CCSDS2_DEC3_STRING = "PT1000_CCSDS2_DEC3";
const char *PT1000_SuS7_DEC3_STRING = "PT1000_SuS7_DEC3";
const char *PT1000_SuS8_DEC3_STRING = "PT1000_SuS8_DEC3";
const char *PT1000_PVCH_DEC3_STRING = "PT1000_PVCH_DEC3";
const char *GYRO2_STRING = "GYRO2";
const char *PT1000_PLOC_DEC4_STRING = "PT1000_PLOC_DEC4";
const char *PT1000_SuS9_DEC4_STRING = "PT1000_SuS9_DEC4";
const char *PT1000_SuS10_DEC4_STRING = "PT1000_SuS10_DEC4";
const char *PT1000_PVHC_DEC4_STRING = "PT1000_PVHC_DEC4";
const char *SuS_ADC_DEC4_STRING = "SuS_ADC_DEC4";
const char *GPS1_HANDLER_STRING = "GPS1_HANDLER";
const char *DUMMY_GPS_COM_IF_STRING = "DUMMY_GPS_COM_IF";
const char *RS232_DEVICE_COM_IF_STRING = "RS232_DEVICE_COM_IF";
const char *I2C_DEVICE_COM_IF_STRING = "I2C_DEVICE_COM_IF";
const char *GPIO_DEVICE_COM_IF_STRING = "GPIO_DEVICE_COM_IF";
const char *SPI_POLLING_TASK_STRING = "SPI_POLLING_TASK";
const char *SPI_DEVICE_COM_IF_STRING = "SPI_DEVICE_COM_IF";
const char *DUMMY_ECHO_COM_IF_STRING = "DUMMY_ECHO_COM_IF";
const char *SD_CARD_HANDLER_STRING = "SD_CARD_HANDLER";
const char *CCSDS_PACKET_DISTRIBUTOR_STRING = "CCSDS_PACKET_DISTRIBUTOR";
const char *PUS_PACKET_DISTRIBUTOR_STRING = "PUS_PACKET_DISTRIBUTOR";
const char *UDP_TMTC_BRIDGE_STRING = "UDP_TMTC_BRIDGE";
const char *EMAC_POLLING_TASK_STRING = "EMAC_POLLING_TASK";
const char *SERIAL_TMTC_BRIDGE_STRING = "SERIAL_TMTC_BRIDGE";
const char *SERIAL_RING_BUFFER_STRING = "SERIAL_RING_BUFFER";
const char *SERIAL_POLLING_TASK_STRING = "SERIAL_POLLING_TASK";
const char *PUS_SERVICE_1_STRING = "PUS_SERVICE_1";
const char *PUS_SERVICE_2_STRING = "PUS_SERVICE_2";
const char *PUS_SERVICE_3_STRING = "PUS_SERVICE_3";
const char *PUS_SERVICE_3_PSB_STRING = "PUS_SERVICE_3_PSB";
const char *PUS_SERVICE_5_STRING = "PUS_SERVICE_5";
const char *PUS_SERVICE_6_STRING = "PUS_SERVICE_6";
const char *PUS_SERVICE_8_STRING = "PUS_SERVICE_8";
const char *PUS_SERVICE_9_STRING = "PUS_SERVICE_9";
const char *PUS_SERVICE_17_STRING = "PUS_SERVICE_17";
const char *PUS_SERVICE_20_STRING = "PUS_SERVICE_20";
const char *PUS_SERVICE_23_STRING = "PUS_SERVICE_23";
const char *PUS_SERVICE_200_STRING = "PUS_SERVICE_200";
const char *PUS_SERVICE_201_STRING = "PUS_SERVICE_201";
const char *PUS_TIME_STRING = "PUS_TIME";
const char *PUS_FUNNEL_STRING = "PUS_FUNNEL";
const char *FREERTOS_TASK_MONITOR_STRING = "FREERTOS_TASK_MONITOR";
const char *HEALTH_TABLE_STRING = "HEALTH_TABLE";
const char *MODE_STORE_STRING = "MODE_STORE";
const char *EVENT_MANAGER_STRING = "EVENT_MANAGER";
const char *INTERNAL_ERROR_REPORTER_STRING = "INTERNAL_ERROR_REPORTER";
const char *TC_STORE_STRING = "TC_STORE";
const char *TM_STORE_STRING = "TM_STORE";
const char *IPC_STORE_STRING = "IPC_STORE";
const char *AT91_SPI_TEST_TASK_STRING = "AT91_SPI_TEST_TASK";
const char *STM32_TEST_TASK_STRING = "STM32_TEST_TASK";
const char *AT91_UART0_TEST_TASK_STRING = "AT91_UART0_TEST_TASK";
const char *TC_INJECTOR_STRING = "TC_INJECTOR";
const char *NO_OBJECT_STRING = "NO_OBJECT";
const char* translateObject(object_id_t object){
switch((object&0xFFFFFFFF)){
case 0x000123336:
return AT91_UART2_TEST_TASK_STRING;
case 0x01010100:
return ARDUINO_0_STRING;
case 0x01010101:
return ARDUINO_1_STRING;
case 0x01010102:
return ARDUINO_2_STRING;
case 0x01010103:
return ARDUINO_3_STRING;
case 0x01010104:
return ARDUINO_4_STRING;
case 0x12345678:
return AT91_I2C_TEST_TASK_STRING;
case 0x12345777:
return LED_TASK_STRING;
case 0x42694269:
return TEST_TASK_STRING;
case 0x44003200:
return PCDU_HANDLER_STRING;
case 0x4400AFFE:
return DUMMY_HANDLER_STRING;
case 0x44020108:
return SuS_ADC1_DEC2_STRING;
case 0x44101F00:
return GPS0_HANDLER_STRING;
case 0x44104000:
return DLR_PVCH_STRING;
case 0x44105000:
return GYRO1_STRING;
case 0x44106000:
return DLR_IRAS_STRING;
case 0x44115400:
return SPI_Test_PT1000_STRING;
case 0x44115401:
return PT1000_Syrlinks_DEC1_O1_STRING;
case 0x44115402:
return PT1000_Camera_DEC1_O2_STRING;
case 0x44115404:
return PT1000_SuS1_DEC1_O3_STRING;
case 0x44115405:
return PT1000_SuS2_DEC1_O4_STRING;
case 0x44115406:
return PT1000_SuS3_DEC1_O5_STRING;
case 0x44115407:
return PT1000_PVHC_DEC1_O6_STRING;
case 0x44115500:
return SPI_Test_Gyro_STRING;
case 0x44125401:
return PT1000_CCSDS1_DEC2_STRING;
case 0x44125403:
return PT1000_MGT1_DEC2_STRING;
case 0x44125404:
return PT1000_SuS4_DEC2_STRING;
case 0x44125405:
return PT1000_SuS5_DEC2_STRING;
case 0x44125406:
return PT1000_SuS6_DEC2_STRING;
case 0x44125407:
return PT1000_PVCH_DEC2_STRING;
case 0x44130301:
return PT1000_Iridium_DEC3_STRING;
case 0x44130302:
return PT1000_CCSDS2_DEC3_STRING;
case 0x44130305:
return PT1000_SuS7_DEC3_STRING;
case 0x44130306:
return PT1000_SuS8_DEC3_STRING;
case 0x44130307:
return PT1000_PVCH_DEC3_STRING;
case 0x44130308:
return GYRO2_STRING;
case 0x44145401:
return PT1000_PLOC_DEC4_STRING;
case 0x44145404:
return PT1000_SuS9_DEC4_STRING;
case 0x44145405:
return PT1000_SuS10_DEC4_STRING;
case 0x44145406:
return PT1000_PVHC_DEC4_STRING;
case 0x44145407:
return SuS_ADC_DEC4_STRING;
case 0x44202000:
return GPS1_HANDLER_STRING;
case 0x49001F00:
return DUMMY_GPS_COM_IF_STRING;
case 0x49005200:
return RS232_DEVICE_COM_IF_STRING;
case 0x49005300:
return I2C_DEVICE_COM_IF_STRING;
case 0x49005400:
return GPIO_DEVICE_COM_IF_STRING;
case 0x49005410:
return SPI_POLLING_TASK_STRING;
case 0x49005600:
return SPI_DEVICE_COM_IF_STRING;
case 0x4900AFFE:
return DUMMY_ECHO_COM_IF_STRING;
case 0x4D0073AD:
return SD_CARD_HANDLER_STRING;
case 0x50000100:
return CCSDS_PACKET_DISTRIBUTOR_STRING;
case 0x50000200:
return PUS_PACKET_DISTRIBUTOR_STRING;
case 0x50000300:
return UDP_TMTC_BRIDGE_STRING;
case 0x50000400:
return EMAC_POLLING_TASK_STRING;
case 0x50000500:
return SERIAL_TMTC_BRIDGE_STRING;
case 0x50000550:
return SERIAL_RING_BUFFER_STRING;
case 0x50000600:
return SERIAL_POLLING_TASK_STRING;
case 0x51000100:
return PUS_SERVICE_1_STRING;
case 0x51000200:
return PUS_SERVICE_2_STRING;
case 0x51000300:
return PUS_SERVICE_3_STRING;
case 0x51000310:
return PUS_SERVICE_3_PSB_STRING;
case 0x51000400:
return PUS_SERVICE_5_STRING;
case 0x51000500:
return PUS_SERVICE_6_STRING;
case 0x51000800:
return PUS_SERVICE_8_STRING;
case 0x51000900:
return PUS_SERVICE_9_STRING;
case 0x51001700:
return PUS_SERVICE_17_STRING;
case 0x51002000:
return PUS_SERVICE_20_STRING;
case 0x51002300:
return PUS_SERVICE_23_STRING;
case 0x51020000:
return PUS_SERVICE_200_STRING;
case 0x51020100:
return PUS_SERVICE_201_STRING;
case 0x52000001:
return PUS_TIME_STRING;
case 0x52000002:
return PUS_FUNNEL_STRING;
case 0x53000000:
return PUS_SERVICE_1_STRING;
case 0x53000003:
return FREERTOS_TASK_MONITOR_STRING;
case 0x53010000:
return HEALTH_TABLE_STRING;
case 0x53010100:
return MODE_STORE_STRING;
case 0x53030000:
return EVENT_MANAGER_STRING;
case 0x53040000:
return INTERNAL_ERROR_REPORTER_STRING;
case 0x534f0100:
return TC_STORE_STRING;
case 0x534f0200:
return TM_STORE_STRING;
case 0x534f0300:
return IPC_STORE_STRING;
case 0x66666666:
return AT91_SPI_TEST_TASK_STRING;
case 0x77777777:
return STM32_TEST_TASK_STRING;
case 0x87654321:
return AT91_UART0_TEST_TASK_STRING;
case 0x99000001:
return TC_INJECTOR_STRING;
case 0xFFFFFFFF:
return NO_OBJECT_STRING;
default:
return "UNKNOWN_OBJECT";
}
return 0;
}

View File

@ -1,9 +0,0 @@
#ifndef CONFIG_OBJECTS_TRANSLATEOBJECTS_H_
#define CONFIG_OBJECTS_TRANSLATEOBJECTS_H_
#include <fsfw/objectmanager/ObjectManagerIF.h>
const char* translateObject(object_id_t object);
#endif /* CONFIG_OBJECTS_TRANSLATEOBJECTS_H_ */