From c072f59edc64dbc29e2b55a04b9e9901972bf8de Mon Sep 17 00:00:00 2001 From: Alvise De Faveri <alvise.defaveri@skywarder.eu> Date: Mon, 1 Apr 2019 13:18:03 +0200 Subject: [PATCH] [SBS] Remove hardcoded colors --- sbs | 3 +-- sbs.conf | 56 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/sbs b/sbs index f0518a82c..350d8d188 100755 --- a/sbs +++ b/sbs @@ -1,4 +1,3 @@ #!/bin/bash -python skyward-boardcore/sbs "$@" 2>&1 | sed -e "s,.*warning:.*,$(tput setaf 3)&$(tput sgr0)," -e "s,.*error:.*,$(tput setaf 1)&$(tput sgr0)," -e "s,.*note:.*,$(tput setaf 4)&$(tput sgr0)," - +python skyward-boardcore/sbs "$@" -v diff --git a/sbs.conf b/sbs.conf index d2801805a..e035c54e4 100644 --- a/sbs.conf +++ b/sbs.conf @@ -1,6 +1,6 @@ # Skyward Build System Configuration File # -# Copyright (c) 2015-2018 Skyward Experimental Rocketry +# Copyright (c) 2015-2019 Skyward Experimental Rocketry # Authors: Alain Carlucci, Alvise de' Faveri Tron # # Permission is hereby granted, free of charge, to any person obtaining a copy @@ -78,8 +78,8 @@ SRC_PATH: src SBS_BASE: skyward-boardcore PROJECT_INCLUDES: -Isrc/boards -Iskyward-boardcore/src/shared -PROJECT_SUBDIRS: -PROJECT_LIBS: +PROJECT_SUBDIRS: +PROJECT_LIBS: #-----------------------------------# # List of Sources # @@ -176,13 +176,13 @@ Include: %shared %sensors %logger %ada Defines: -DDEBUG Main: test-sensormanager -[test-ignition-ctrl] -Type: test -BoardId: stm32f429zi_skyward_homeone -BinName: test-ignition-ctrl -Include: %shared %ignition %canbus %canproxy %logger -Defines: -DDEBUG -Main: fsm/test-ignition-ctrl +#[test-ignition-ctrl] +#Type: test +#BoardId: stm32f429zi_skyward_homeone +#BinName: test-ignition-ctrl +#Include: %shared %ignition %canbus %canproxy %logger +#Defines: -DDEBUG +#Main: fsm/test-ignition-ctrl #[test-ignition-board] #Type: test @@ -212,8 +212,8 @@ Main: drivers/test-cutter Type: test BoardId: stm32f429zi_skyward_homeone BinName: hbridge-test -Include: %shared -Defines: -DDEBUG +Include: %shared +Defines: -DDEBUG Main: drivers/hbridge-test [test-tmtc] @@ -221,7 +221,7 @@ Type: test BoardId: stm32f429zi_skyward_homeone BinName: test-tmtc Include: %shared %tmtc %logger %gamma868 -Defines: -DDEBUG +Defines: -DDEBUG Main: test-tmtc [test-canproxy] @@ -229,7 +229,7 @@ Type: test BoardId: stm32f429zi_skyward_homeone BinName: test-canproxy Include: %shared %canproxy %logger %canbus -Defines: -DDEBUG +Defines: -DDEBUG Main: test-canproxy [death-stack-entry] @@ -237,32 +237,32 @@ Type: board BoardId: stm32f429zi_skyward_homeone BinName: death-stack-entry Include: %shared %deathstack %logger %canbus %pwm %gamma868 -Defines: -DDEBUG +Defines: -DDEBUG Main: death-stack-entry [test-deployment] -Type: test -BoardId: stm32f429zi_skyward_homeone -BinName: test-deployment -Include: %deployment %shared %pwm %logger -Defines: -DSTANDALONE_CATCH1_TEST -Main: catch/fsm/test-deployment +Type: test +BoardId: stm32f429zi_skyward_homeone +BinName: test-deployment +Include: %deployment %shared %pwm %logger +Defines: -DSTANDALONE_CATCH1_TEST +Main: catch/fsm/test-deployment [test-logproxy] Type: test BoardId: stm32f429zi_skyward_homeone BinName: test-logproxy Include: %shared %logger %logproxy -Defines: -DDEBUG +Defines: -DDEBUG Main: test-logproxy [test-ignition] -Type: test -BoardId: stm32f429zi_skyward_homeone -BinName: test-ignition -Include: %shared %ignition %logger %canbus %canproxy -Defines: -DSTANDALONE_CATCH1_TEST -Main: catch/fsm/test-ignition +Type: test +BoardId: stm32f429zi_skyward_homeone +BinName: test-ignition +Include: %shared %ignition %logger %canbus %canproxy +Defines: -DSTANDALONE_CATCH1_TEST +Main: catch/fsm/test-ignition [test-ada] Type: test -- GitLab