Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ build:platform_build --incompatible_enable_cc_toolchain_resolution --crosstool_t
build:bbb-platform --config=platform_build --platforms=//bazel/platforms:bbb
build:adaptive -c opt --copt=-O3

build:ut --define build_mode=ut
test:ut --define build_mode=ut

build --action_env=BAZEL_CXXOPTS="-std=c++20" --config=adaptive --define srp_platform=external/srp_platform
test --test_output=all --action_env=BAZEL_CXXOPTS="-std=c++20"
test --test_output=all --action_env=BAZEL_CXXOPTS="-std=c++20" --config=ut
coverage --instrument_test_targets --experimental_cc_coverage --combined_report=lcov --instrumentation_filter="[:],-external/[:]" --coverage_report_generator=@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main
2 changes: 2 additions & 0 deletions .github/workflows/lint_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
pull_request:
branches:
- master
merge_group:

jobs:
cpplint:
name: CppLint Check
Expand Down
11 changes: 9 additions & 2 deletions BUILD
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
config_setting(
name = "sim",
define_values = {
"build_mode": "sim"
},
"build_mode": "sim",
},
)

config_setting(
name = "ut",
define_values = {
"build_mode": "ut",
},
)
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ load("//third_party:deps.bzl", "deps")
deps()

load("//bazel/libs:third_party_repositories.bzl", "include_srp_platform", "include_srp_mavlink", "include_gtest_mock", "include_json")
include_srp_platform("0.0.6SQF")
include_srp_platform("0.0.6SQFU")
load("@srp_platform//:download.bzl", "download")
download()

Expand Down
7 changes: 3 additions & 4 deletions apps/fc/gps_service/gps_app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,9 @@ std::optional<GPSDataStructure> GPSApp::ParseGPSData(const std::vector<uint8_t>&
return std::nullopt;
}
auto someip_data = GetSomeIPData(res.value());
// TODO(matikrajek42@gmail.com) uncoment afer basn advice
// ara::log::LogDebug() << "GPS latitude: " << someip_data.latitude
// << ", longtitude: " << someip_data.longitude << ",height(M):"
// << res.value().height << "satelite_nr: " << res.value().satellite_nr;
ara::log::LogDebug() << "GPS latitude: " << someip_data.latitude
<< ", longtitude: " << someip_data.longitude << ",height(M):"
<< res.value().height << "satelite_nr: " << res.value().satellite_nr;
return someip_data;
}

Expand Down
2 changes: 1 addition & 1 deletion core/gpio/gpio_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ namespace {
}

GpioDriver::GpioDriver(std::unique_ptr<IFileHandler> file): file_(std::move(file))
// , gpio_logger_{ara::log::LoggingMenager::GetInstance()->CreateLogger("gpio", "", ara::log::LogLevel::kInfo)}
, gpio_logger_{ara::log::LoggingMenager::GetInstance()->CreateLogger("gpio", "", ara::log::LogLevel::kInfo)}
{}

GpioDriver::~GpioDriver() {}
Expand Down
2 changes: 1 addition & 1 deletion core/gpio/gpio_driver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace gpio {
class GpioDriver: public IGpioDriver{
protected:
std::unique_ptr<IFileHandler> file_;
// ara::log::Logger gpio_logger_;
ara::log::Logger gpio_logger_;

public:
explicit GpioDriver(std::unique_ptr<IFileHandler> file);
Expand Down
27 changes: 13 additions & 14 deletions core/gpio/sim_gpio_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,19 @@ namespace {
constexpr std::string kGpioPath = "/sys/class/gpio";
}

GpioDriver::GpioDriver(std::unique_ptr<IFileHandler> file):file_(std::move(file)) {
// gpio_logger_{ara::log::LoggingMenager::GetInstance()->CreateLogger("GPIO", "", ara::log::LogLevel::kDebug)},
}
GpioDriver::GpioDriver(std::unique_ptr<IFileHandler> file):file_(std::move(file)),
gpio_logger_{ara::log::LoggingMenager::GetInstance()->CreateLogger("GPIO", "", ara::log::LogLevel::kDebug)} {}

GpioDriver::~GpioDriver() {}

core::ErrorCode GpioDriver::unregisterPin(const uint16_t& pinNumber) {
// ara::log::LogInfo() << "Unregister PIN with ID:" << pinNumber;
ara::log::LogInfo() << "Unregister PIN with ID:" << pinNumber;
return core::ErrorCode::kOk;
}

core::ErrorCode GpioDriver::initializePin(const uint16_t& pinNumber, const direction_t& direction) {
// ara::log::LogInfo() << "Initialize PIN with ID:" << pinNumber
// << "direction:" << ((direction == direction_t::IN) ? "IN" : "OUT");
ara::log::LogInfo() << "Initialize PIN with ID:" << pinNumber
<< "direction:" << ((direction == direction_t::IN) ? "IN" : "OUT");
return core::ErrorCode::kOk;
}

Expand All @@ -45,28 +44,28 @@ std::string GpioDriver::getEndpointPath(const uint16_t& pinNumber, const std::st
}

core::ErrorCode GpioDriver::setValue(const uint16_t& pinNumber , const uint8_t& value) {
// ara::log::LogInfo() << "SET VALUE PIN with ID:" << pinNumber
// << "value:" << std::to_string(static_cast<uint16_t>(value));
ara::log::LogInfo() << "SET VALUE PIN with ID:" << pinNumber
<< "value:" << std::to_string(static_cast<uint16_t>(value));
return core::ErrorCode::kOk;
}

core::ErrorCode GpioDriver::setDirection(const uint16_t& pinNumber , const direction_t& direction) {
// ara::log::LogInfo() << "SET DIRECTION PIN with ID:" << pinNumber
// << "direction:" << ((direction == direction_t::IN) ? "IN" : "OUT");
ara::log::LogInfo() << "SET DIRECTION PIN with ID:" << pinNumber
<< "direction:" << ((direction == direction_t::IN) ? "IN" : "OUT");
return ErrorCode::kOk;
}

uint8_t GpioDriver::getValue(const uint16_t& pinNumber) {
const uint8_t value = 1;
// ara::log::LogInfo() << "GET VALUE PIN with ID:" << pinNumber
// << "VALUE:" << value;
ara::log::LogInfo() << "GET VALUE PIN with ID:" << pinNumber
<< "VALUE:" << value;
return value;
}

direction_t GpioDriver::getDirection(const uint16_t& pinNumber) {
const direction_t direction = direction_t::IN;
// ara::log::LogInfo() << "GET VALUE PIN with ID:" << pinNumber
// << "VALUE:" << ((direction == direction_t::IN) ? "IN" : "OUT");
ara::log::LogInfo() << "GET VALUE PIN with ID:" << pinNumber
<< "VALUE:" << ((direction == direction_t::IN) ? "IN" : "OUT");
return direction;
}

Expand Down
24 changes: 23 additions & 1 deletion tools/coverage/coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@ else
fi

# Uruchomienie bazel coverage i ukrycie wyjścia
bazel coverage --nocache_test_results `bazel query 'kind(cc_test, //...)'` -s \
bazel coverage `bazel query 'kind(cc_test, //...)'` -s \
--instrument_test_targets \
--experimental_cc_coverage \
--combined_report=lcov \
--instrumentation_filter="[:]" \
--coverage_report_generator=@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main

if [ $? -ne 0 ]; then
echo "❌ Bazel coverage failed. Please inspect the failing tests above."
exit 1
fi

python3 tools/coverage/remove_external.py

# Uruchomienie polecenia lcov i zapisanie wyniku do zmiennej
Expand All @@ -32,4 +37,21 @@ function_coverage=$(echo "$output" | grep "functions..:" | awk '{print $2}' | se
echo "Pokrycie linii: $line_coverage%"
echo "Pokrycie funkcji: $function_coverage%"

# Wymagania
required_line_coverage=65
required_function_coverage=65

# Sprawdzenie wymagań dla floatów
if ! awk -v val="$line_coverage" -v req="$required_line_coverage" 'BEGIN {exit !(val >= req)}'; then
echo "❌ Błąd: pokrycie linii (${line_coverage}%) jest mniejsze niż wymagane ${required_line_coverage}%."
exit 1
fi

if ! awk -v val="$function_coverage" -v req="$required_function_coverage" 'BEGIN {exit !(val >= req)}'; then
echo "❌ Błąd: pokrycie funkcji (${function_coverage}%) jest mniejsze niż wymagane ${required_function_coverage}%."
exit 1
fi

echo "✅ Pokrycie spełnia wymagania."
exit 0

2 changes: 1 addition & 1 deletion tools/coverage/generate_html.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
export GCOV=/usr/bin/gcov-13
bazel coverage --nocache_test_results `bazel query 'kind(cc_test, //...)'` -s \
bazel coverage --nocache_test_results --config=ut `bazel query 'kind(cc_test, //...)'` -s \
--instrument_test_targets \
--experimental_cc_coverage \
--combined_report=lcov \
Expand Down
2 changes: 1 addition & 1 deletion tools/ut/unittest.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
bazel test --nocache_test_results --test_output=all `bazel query 'kind(cc_test, //...)'`
bazel test --nocache_test_results --test_output=all `bazel query 'kind(cc_test, //...)'`