Skip to content

Commit

Permalink
🔀️ Merge branch 'ladislas/feature/upgrade-arm-gcc-13.2Rel1' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ladislas committed Jul 2, 2024
2 parents 8fe199a + 334b7a9 commit a22fae5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ runs:
- name: Add toolchain version to env
shell: bash
run: |
TOOLCHAIN_VERSION=$(arm-none-eabi-gcc --version | grep -Po '(?<=gcc \().*(?= \(re)' | sed 's/)/ -/g')
TOOLCHAIN_VERSION=$(arm-none-eabi-gcc --version | grep -Po '(?<=gcc \().*' | sed 's/))/)/g')
echo "TOOLCHAIN_VERSION=$TOOLCHAIN_VERSION" >> $GITHUB_ENV
#
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/ci-functional_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,16 @@ concurrency:
jobs:
run_functional_tests:
name: Build & Test
runs-on: self-hosted
runs-on: robot

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup
run: |
brew update && brew upgrade
brew install --force --overwrite arm-gcc-bin@10
brew link --force --overwrite arm-gcc-bin@10
which arm-none-eabi-gcc
arm-none-eabi-gcc --version
python3 -m pip install -U --user -r ./tools/config/mbed_requirements.txt --break-system-packages
env:
PIP_BREAK_SYSTEM_PACKAGES: 1
Expand Down
2 changes: 1 addition & 1 deletion config/arm_gnu_toolchain_url
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.10/gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
1 change: 1 addition & 0 deletions include/interface/drivers/Network.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#pragma once

#include <cstdint>
#include <functional>
#include <string>
#include <vector>
Expand Down
2 changes: 1 addition & 1 deletion libs/BLEKit/tests/BLEServiceMonitoring_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ TEST_F(BLEServiceMonitoringTest, setNegotiatedMtu)

auto spy_callback = [&actual_negotiated_mtu](const BLEServiceMonitoring::data_to_send_handle_t &handle) {
actual_negotiated_mtu =
utils::memory::combineBytes({high : std::get<1>(handle)[0], low : std::get<1>(handle)[1]});
utils::memory::combineBytes({.high = std::get<1>(handle)[0], .low = std::get<1>(handle)[1]});
};

service_monitoring.onDataReadyToSend(spy_callback);
Expand Down
2 changes: 1 addition & 1 deletion libs/SerialNumberKit/source/SerialNumberFormater.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void SerialNumberFormater::setDateOfTestFromEpoch(std::span<char> content, std::

std::time_t epoch = std::atoll(content.data());

localtime_r(&epoch, &local_time);
gmtime_r(&epoch, &local_time);
std::strftime(epoch_c_array.data(), std::size(epoch_c_array), "%y%m", &local_time);

std::copy(epoch_c_array.begin(), epoch_c_array.begin() + std::size(date_of_test), date_of_test.begin());
Expand Down
12 changes: 8 additions & 4 deletions tests/functional/tests/deep_sleep_mbed_hal/suite_mbed_hal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,18 @@ suite suite_mbed_hal = [] {
// ? Give time to test to finish UART transmission before entering deep sleep mode
utils::sleep::busy_wait(utils::sleep::SERIAL_FLUSH_TIME_MS);

auto can_deep_sleep = sleep_manager_can_deep_sleep();
expect(can_deep_sleep) << "deep sleep not possible";
{
auto can_deep_sleep_test_check = sleep_manager_can_deep_sleep_test_check();
expect(can_deep_sleep_test_check) << "deep sleep not possible";
}

const timestamp_t wakeup_time = lp_ticker_read() + utils::sleep::us_to_ticks(20000, lp_ticker_freq);
lp_ticker_set_interrupt(wakeup_time);

auto can_deep_sleep_test_check = sleep_manager_can_deep_sleep_test_check();
expect(can_deep_sleep_test_check);
{
auto can_deep_sleep_test_check = sleep_manager_can_deep_sleep_test_check();
expect(can_deep_sleep_test_check) << "deep sleep not possible";
}

auto us_ticks_before_sleep = us_ticker_read(); // NOLINT

Expand Down

0 comments on commit a22fae5

Please sign in to comment.