Skip to content

Commit

Permalink
Merge pull request #65 from christianrauch/workflow_dispatch
Browse files Browse the repository at this point in the history
update runner and workflow dispatch
  • Loading branch information
christianrauch authored Dec 29, 2024
2 parents 3c575d6 + b9eb62d commit 58f832d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch:

env:
BUILD_TYPE: Release
Expand All @@ -17,14 +18,14 @@ jobs:
fail-fast: false
matrix:
config:
- { name: "Linux", os: ubuntu-latest, test: ON }
- { name: "Windows", os: windows-latest, test: OFF }
- { name: "macOS", os: macos-latest, test: OFF }
- { name: "Linux", os: ubuntu-24.04, test: ON }
- { name: "Windows", os: windows-2025, test: OFF }
- { name: "macOS", os: macos-15, test: OFF }

steps:
- name: install Linux dependencies
if: runner.os == 'Linux'
run: sudo apt install -y --no-install-recommends ninja-build libasio-dev clang-format-12 libgtest-dev
run: sudo apt install -y --no-install-recommends ninja-build libasio-dev clang-format-18 libgtest-dev

- name: install Microsoft Visual C++ (Windows)
uses: ilammy/msvc-dev-cmd@v1
Expand All @@ -43,7 +44,7 @@ jobs:
if: runner.os == 'macOS'
run: brew install ninja asio

- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Clang-Format Style Check
if: runner.os == 'Linux'
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5)
cmake_minimum_required(VERSION 3.16)
project(msp VERSION 3.4.0 LANGUAGES CXX)

set(PROJECT_DESCRIPTION "Implementation of the MultiWii Serial Protocol (MSP) for MultiWii and Cleanflight flight controller")
Expand Down
2 changes: 1 addition & 1 deletion format_source_files.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
find . -regex '.*\.\(cpp\|hpp\)' -exec clang-format-12 -style=file -i {} \;
find . -regex '.*\.\(cpp\|hpp\)' -exec clang-format-18 -style=file -i {} \;
2 changes: 1 addition & 1 deletion inc/msp/ByteVector.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class ByteVector : public std::vector<uint8_t> {
if(count > unpacking_remaining()) return false;
bool rc = true;
val.clear();
int8_t tmp;
int8_t tmp = {};
for(size_t i = 0; i < count; ++i) {
rc &= unpack(tmp);
val += tmp;
Expand Down
1 change: 1 addition & 0 deletions inc/msp/Value.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef VALUE_HPP
#define VALUE_HPP

#include <cstdint>
#include <iostream>
#include <utility>

Expand Down
2 changes: 1 addition & 1 deletion inc/msp/msp_msg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -3320,7 +3320,7 @@ struct ActiveBoxes : public Message {
if(box_conf() & (1 << (iaux * 3 + ip)))
aux_sp[iaux].insert(SwitchPosition(ip));
} // each position (L,M,H)
} // each aux switch
} // each aux switch
box_pattern.push_back(aux_sp);
} // each box
return rc;
Expand Down

0 comments on commit 58f832d

Please sign in to comment.