diff --git a/templates/skeletons/makefile.tmplt b/templates/skeletons/makefile.tmplt index c079845a9f15b24de097f71b94a6975fb3fae937..79f920c05a52e7d17d57bf81df845a45ce415894 100644 --- a/templates/skeletons/makefile.tmplt +++ b/templates/skeletons/makefile.tmplt @@ -182,7 +182,8 @@ dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN} ${CP_FILES} cp -f @_LOWER:Function_Names_@/GUI/wrappers/*.py binaries/@_LOWER:Function_Names_@_GUI cp -f @_LOWER:Function_Names_@/GUI/wrappers/*.ui binaries/@_LOWER:Function_Names_@_GUI @@-- Compute the error codes - @echo "errCodes = ${shell taste-asn1-errCodes binaries/@_LOWER:Function_Names_@_GUI/dataview-uniq.h}" >> binaries/@_LOWER:Function_Names_@_GUI/datamodel.py + echo "errCodes = \\" >> binaries/@_LOWER:Function_Names_@_GUI/datamodel.py + taste-asn1-errCodes binaries/@_LOWER:Function_Names_@_GUI/dataview-uniq.h >> binaries/@_LOWER:Function_Names_@_GUI/datamodel.py @@-- If system contains the PeekPoke component, copy the relevant code in the gui folder @@IF@@ @_LOWER:Function_Names_@ = taste_probe_console @# Peek-Poke function is placed in the gui folder @@ -196,7 +197,7 @@ dataview/C/built: ${DATAVIEW_UNIQ} ${DATAVIEW_ACN} ${CP_FILES} # User can edit at will the customisable user widgets python module: cp -u $(shell taste-config --prefix)/share/AutoGUI/UserWidgets.py binaries/@_LOWER:Function_Names_@_GUI @@-- Copy InterfaceView.aadl, it is needed to replay MSC scenarios - # Interface view must be placed in the gui folder to allow replaying MSCs + # Interface view must be placed in the gui folder to allow replaying MSCs cp -u ../InterfaceView.aadl binaries/@_LOWER:Function_Names_@_GUI @@END_IF@@ @@-- End of GUI-specifics @@END_TABLE@@ diff --git a/test/Demo_Bright_Ascension/Makefile b/test/Demo_Bright_Ascension/Makefile index e81ae0e1e2b9a4f791b9cd7ff2a45195c4330100..a2b649fea44629a90694888d20583abaf9905984 100644 --- a/test/Demo_Bright_Ascension/Makefile +++ b/test/Demo_Bright_Ascension/Makefile @@ -1,3 +1,5 @@ +export OBSW_DEMONSTRATOR_USER_LDFLAGS=-lzmq + KAZOO=../../kazoo all: c @@ -29,10 +31,10 @@ c: test-parse-c # Polyorb_HI_C output cp pus_parameter_service_handler/pus_parameter_service_handler.c work/pus_parameter_service_handler/C/src cp pus_protocol_handling/pus_protocol_handling.c work/pus_protocol_handling/C/src cp pus_service_dispatch/pus_service_dispatch.c work/pus_service_dispatch/C/src - #cp pus_spp_handling/pus_spp_handling.c work/pus_spp_handling/C/src - #cp space_link_rx/space_link_rx.c work/space_link_rx/C/src - #cp space_link_tx/space_link_tx.c work/space_link_tx/C/src - #cp space_packet_routing/space_packet_routing.c work/space_packet_routing/C/src + cp pus_spp_handling/pus_spp_handling.c work/pus_spp_handling/Blackbox_C/src + cp space_link_rx/space_link_rx.c work/space_link_rx/Blackbox_C/src + cp space_link_tx/space_link_tx.c work/space_link_tx/Blackbox_C/src + cp space_packet_routing/space_packet_routing.c work/space_packet_routing/Blackbox_C/src #cp spp_packet_service/spp_packet_service.c work/spp_packet_service/C/src cp thermal_manager/thermal_manager.c work/thermal_manager/C/src cp thermal_manager_container/thermal_manager_container.c work/thermal_manager_container/C/src diff --git a/test/Demo_Bright_Ascension/pus_spp_handling/pus_spp_handling.c b/test/Demo_Bright_Ascension/pus_spp_handling/pus_spp_handling.c index 2db9daa37f7b09041732c88a60782fa90d366d6e..1900edfc987fee620697e73c815ff6d57b2c7a33 100644 --- a/test/Demo_Bright_Ascension/pus_spp_handling/pus_spp_handling.c +++ b/test/Demo_Bright_Ascension/pus_spp_handling/pus_spp_handling.c @@ -8,7 +8,7 @@ #define HEADER_LEN 7 -void init_pus_spp_handling() +void pus_spp_handling_startup() { /* Write your initialization code here, but do not make any call to a required interface!! */ @@ -16,7 +16,7 @@ void init_pus_spp_handling() //TODO CRC table } -void pus_spp_handling_pus_spacePacketIndication(void *IN_telemetry, size_t size_IN_telemetry) +void pus_spp_handling_pus_spacePacketIndication(const char *IN_telemetry, size_t size_IN_telemetry) { /* * Write your code here! @@ -26,10 +26,10 @@ void pus_spp_handling_pus_spacePacketIndication(void *IN_telemetry, size_t size_ //TODO Check CRC - vm_pus_spp_handling_pus_packetIndication(IN_telemetry, size_IN_telemetry); + vm_pus_spp_handling_pus_packetindication(IN_telemetry, size_IN_telemetry); } -void pus_spp_handling_pus_packetRequest(void *IN_telemetry, size_t size_IN_telemetry) +void pus_spp_handling_pus_packetRequest(const char *IN_telemetry, size_t size_IN_telemetry) { /* * Write your code here! @@ -54,6 +54,6 @@ void pus_spp_handling_pus_packetRequest(void *IN_telemetry, size_t size_IN_telem //tm[size_IN_telemetry-2] = (0xFF00 & crc) >> 8; // tm[size_IN_telemetry-1] = 0x00FF & crc; - vm_pus_spp_handling_pus_spacePacketRequest(IN_telemetry, size_IN_telemetry); + vm_pus_spp_handling_pus_spacepacketrequest(IN_telemetry, size_IN_telemetry); } diff --git a/test/Demo_Bright_Ascension/space_link_rx/space_link_rx.c b/test/Demo_Bright_Ascension/space_link_rx/space_link_rx.c index 90f84546c355659bbc71fa027f270cce738546e1..47a3eff22a3021343bb7df8e0d830fa95408aebe 100644 --- a/test/Demo_Bright_Ascension/space_link_rx/space_link_rx.c +++ b/test/Demo_Bright_Ascension/space_link_rx/space_link_rx.c @@ -16,7 +16,7 @@ static void* sock; /* #define MAX_SP_LEN 65542 */ #define MAX_SP_LEN 256 -void init_space_link_rx() +void space_link_rx_startup() { /* Write your initialization code here, but do not make any call to a required interface!! */ @@ -87,7 +87,7 @@ void space_link_rx_pollSocket() printFlag=1; - vm_space_link_rx_packetReceiveIndication(rxBuf, nBytes); + vm_space_link_rx_packetreceiveindication(rxBuf, nBytes); } } diff --git a/test/Demo_Bright_Ascension/space_link_tx/space_link_tx.c b/test/Demo_Bright_Ascension/space_link_tx/space_link_tx.c index f7d69e84c67d2e128e45465309851dc6c382c040..2f3bb574940fefc9206da2a21b0cb38e795c4c3b 100644 --- a/test/Demo_Bright_Ascension/space_link_tx/space_link_tx.c +++ b/test/Demo_Bright_Ascension/space_link_tx/space_link_tx.c @@ -13,7 +13,7 @@ static void *context; static void* sock; -void init_space_link_tx() +void space_link_tx_startup() { /* Write your initialization code here, but do not make any call to a required interface!! */ @@ -41,7 +41,7 @@ void init_space_link_tx() } -void space_link_tx_packetSendRequest(void *IN_rawpacket, size_t IN_rawpacket_size) +void space_link_tx_packetSendRequest(const char *IN_rawpacket, size_t IN_rawpacket_size) { //Lazy init spacelink tx as taste inits only one blackbox func. diff --git a/test/Demo_Bright_Ascension/space_packet_routing/space_packet_routing.c b/test/Demo_Bright_Ascension/space_packet_routing/space_packet_routing.c index 884e842c6bf5319b639da10749d66fc545bfc312..456defa0e72f0ff3be6f055737ef3b4410ba2ad9 100644 --- a/test/Demo_Bright_Ascension/space_packet_routing/space_packet_routing.c +++ b/test/Demo_Bright_Ascension/space_packet_routing/space_packet_routing.c @@ -10,14 +10,14 @@ #define MO_HEADERS_LEN asn1SccT_MO_tc_sp_REQUIRED_BYTES_FOR_ACN_ENCODING -void init_space_packet_routing() +void space_packet_routing_startup() { /* Write your initialization code here, but do not make any call to a required interface!! */ } -void space_packet_routing_packetIndication(void *IN_apid, size_t IN_apid_size, void *IN_rawpacket, size_t IN_rawpacket_size) +void space_packet_routing_packetIndication(const char *IN_apid, size_t IN_apid_size, const char *IN_rawpacket, size_t IN_rawpacket_size) { uint16_t apid = *(uint16_t*)IN_apid; int i; @@ -29,7 +29,7 @@ void space_packet_routing_packetIndication(void *IN_apid, size_t IN_apid_size, v if (apid >= 2000) { // Destined for PUS stack - vm_space_packet_routing_pus_spacePacketIndication(IN_rawpacket, IN_rawpacket_size); + vm_space_packet_routing_pus_spacepacketindication(IN_rawpacket, IN_rawpacket_size); } else { @@ -49,16 +49,16 @@ void space_packet_routing_packetIndication(void *IN_apid, size_t IN_apid_size, v msgBody.nCount = IN_rawpacket_size - MO_HEADERS_LEN; memcpy(msgBody.arr, pMalBodyStart, msgBody.nCount); - vm_space_packet_routing_mo_packetIndication(IN_rawpacket, + vm_space_packet_routing_mo_packetindication(IN_rawpacket, MO_HEADERS_LEN, &msgBody, sizeof(msgBody)); } } -void space_packet_routing_mo_packetRequest(void *IN_headers, +void space_packet_routing_mo_packetRequest(const char *IN_headers, size_t IN_headers_size, - void *IN_bodies, + const char *IN_bodies, size_t IN_bodies_size) { // Buffer large enough for concatenated packet parts @@ -77,14 +77,14 @@ void space_packet_routing_mo_packetRequest(void *IN_headers, memcpy(acnBuffer, IN_headers, IN_headers_size); memcpy(acnBuffer + IN_headers_size, bodies->arr, bodies->nCount); - vm_space_packet_routing_packetRequest(&acnBuffer, IN_headers_size + bodies->nCount); + vm_space_packet_routing_packetrequest(&acnBuffer, IN_headers_size + bodies->nCount); } -void space_packet_routing_pus_spacePacketRequest(void *IN_telemetry, size_t IN_telemetry_size) +void space_packet_routing_pus_spacePacketRequest(const char *IN_telemetry, size_t IN_telemetry_size) { - vm_space_packet_routing_packetRequest(IN_telemetry, IN_telemetry_size); + vm_space_packet_routing_packetrequest(IN_telemetry, IN_telemetry_size); }