SW tweaks #112

Merged
meierj merged 11 commits from mueller/sw-tweaks into develop 2021-11-26 09:14:04 +01:00
17 changed files with 36 additions and 23 deletions
Showing only changes of commit 9ddea586ea - Show all commits

9
Justfile Normal file
View File

@ -0,0 +1,9 @@
python_script := './cmake/scripts/cmake-build-cfg.py'
default: q7s-debug-make
q7s-debug-make:
{{python_script}} -o linux -g make -b debug -t "arm/q7s" -l build-Debug-Q7S
q7s-debug-ninja:
{{python_script}} -o linux -g ninja -b debug -t "arm/q7s" -l build-Debug-Q7S

View File

@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
exit 1 exit 1
fi fi
build_generator="Unix Makefiles" build_generator="make"
os_fsfw="host" os_fsfw="host"
builddir="build-Debug-Host" builddir="build-Debug-Host"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then

View File

@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
exit 1 exit 1
fi fi
build_generator="Unix Makefiles" build_generator="make"
os_fsfw="host" os_fsfw="host"
builddir="build-Release-Host" builddir="build-Release-Host"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then

View File

@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
exit 1 exit 1
fi fi
build_generator="Ninja" build_generator="ninja"
os_fsfw="host" os_fsfw="host"
builddir="build-Debug-Host" builddir="build-Debug-Host"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then

View File

@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
exit 1 exit 1
fi fi
build_generator="Unix Makefiles" build_generator="make"
os_fsfw="linux" os_fsfw="linux"
builddir="build-Debug-Host" builddir="build-Debug-Host"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then

View File

@ -15,7 +15,7 @@ if [ "${counter}" -ge 5 ];then
exit 1 exit 1
fi fi
build_generator="Ninja" build_generator="ninja"
os_fsfw="linux" os_fsfw="linux"
builddir="build-Debug-Host" builddir="build-Debug-Host"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then

View File

@ -18,13 +18,11 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/q7s" tgt_bsp="arm/q7s"
build_dir="build-Debug-Q7S" build_dir="build-Debug-Q7S"
build_generator="" build_generator="make"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles"
python="py" python="py"
# Could be other OS but this works for now. # Could be other OS but this works for now.
else else
build_generator="Unix Makefiles"
python="python3" python="python3"
fi fi

View File

@ -18,13 +18,11 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/q7s" tgt_bsp="arm/q7s"
build_dir="build-Debug-Q7S" build_dir="build-Debug-Q7S"
build_generator="" build_generator="make"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles"
python="py" python="py"
# Could be other OS but this works for now. # Could be other OS but this works for now.
else else
build_generator="Unix Makefiles"
python="python3" python="python3"
fi fi

View File

@ -18,7 +18,7 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/q7s" tgt_bsp="arm/q7s"
build_dir="build-Debug-Q7S" build_dir="build-Debug-Q7S"
build_generator="Ninja" build_generator="ninja"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
python="py" python="py"
# Could be other OS but this works for now. # Could be other OS but this works for now.

View File

@ -18,7 +18,7 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/q7s" tgt_bsp="arm/q7s"
build_dir="build-Release-Q7S" build_dir="build-Release-Q7S"
build_generator="Ninja" build_generator="ninja"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
python="py" python="py"
# Could be other OS but this works for now. # Could be other OS but this works for now.

View File

@ -18,14 +18,12 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/raspberrypi" tgt_bsp="arm/raspberrypi"
build_generator="" build_generator="make"
build_dir="build-Debug-RPi" build_dir="build-Debug-RPi"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
build_generator="MinGW Makefiles"
python="py" python="py"
# Could be other OS but this works for now. # Could be other OS but this works for now.
else else
build_generator="Unix Makefiles"
python="python3" python="python3"
fi fi

View File

@ -17,7 +17,7 @@ fi
os_fsfw="linux" os_fsfw="linux"
tgt_bsp="arm/raspberrypi" tgt_bsp="arm/raspberrypi"
build_generator="Ninja" build_generator="ninja"
build_dir="build-Debug-RPi" build_dir="build-Debug-RPi"
if [ "${OS}" = "Windows_NT" ]; then if [ "${OS}" = "Windows_NT" ]; then
python="py" python="py"

View File

@ -29,7 +29,9 @@ def main():
"Information)", default="debug" "Information)", default="debug"
) )
parser.add_argument("-l", "--builddir", type=str, help="Specify build directory.") parser.add_argument("-l", "--builddir", type=str, help="Specify build directory.")
parser.add_argument("-g", "--generator", type=str, help="CMake Generator") parser.add_argument(
"-g", "--generator", type=str, help="CMake Generator", choices=['make', 'ninja']
)
parser.add_argument( parser.add_argument(
"-d", "--defines", "-d", "--defines",
help="Additional custom defines passed to CMake (supply without -D prefix!)", help="Additional custom defines passed to CMake (supply without -D prefix!)",
@ -56,7 +58,15 @@ def main():
if args.generator is None: if args.generator is None:
generator_cmake_arg = "" generator_cmake_arg = ""
else: else:
generator_cmake_arg = f"-G \"{args.generator}\"" if args.generator == 'make':
if os.name == 'nt':
generator_cmake_arg = '-G "MinGW Makefiles"'
else:
generator_cmake_arg = '-G "Unix Makefiles"'
elif args.generator == 'ninja':
generator_cmake_arg = '-G Ninja'
else:
generator_cmake_arg = args.generator
if args.buildtype == "debug": if args.buildtype == "debug":
cmake_build_type = "Debug" cmake_build_type = "Debug"

View File

@ -2,4 +2,4 @@
#include "tmtc/apid.h" #include "tmtc/apid.h"
#include "fsfw/tmtcpacket/SpacePacket.h" #include "fsfw/tmtcpacket/SpacePacket.h"
const uint16_t common::TC_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW); constexpr uint16_t common::PUS_PACKET_ID = spacepacket::getTcSpacePacketIdFromApid(apid::EIVE_OBSW);

2
fsfw

@ -1 +1 @@
Subproject commit eba2f87b36429fc814f9d4768c68fd2827f4c410 Subproject commit e29606a2d07ff2fcad77e99493ec3765816e646b

View File

@ -110,7 +110,7 @@ void ObjectFactory::produceGenericObjects() {
tmtcBridge->setMaxNumberOfPacketsStored(50); tmtcBridge->setMaxNumberOfPacketsStored(50);
auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE); auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE);
// TCP is stream based. Use packet ID as start marker when parsing for space packets // TCP is stream based. Use packet ID as start marker when parsing for space packets
tcpServer->setSpacePacketParsingOptions({common::TC_PACKET_ID}); tcpServer->setSpacePacketParsingOptions({common::PUS_PACKET_ID});
sif::info << "Created TCP server for TMTC commanding with listener port " sif::info << "Created TCP server for TMTC commanding with listener port "
<< tcpServer->getTcpPort() << std::endl; << tcpServer->getTcpPort() << std::endl;
#endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */ #endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */

2
tmtc

@ -1 +1 @@
Subproject commit b2cc2354d410b0bc0d80c481bfd37afc580e63cf Subproject commit edcaf2e9c323cbda2ef331e93cc04985f44c6855