Compare commits

...

3 Commits

Author SHA1 Message Date
Jesse Vincent cb340e9637
Let clang-format 14 do its thing.
2 years ago
Jesse Vincent da42157c64
Run everything on the latest 22.04 ubuntu image
2 years ago
Jesse Vincent 02e614db3e
Update to clang-format 14
2 years ago

@ -5,10 +5,10 @@ on: [push, pull_request]
env: env:
LC_ALL: C LC_ALL: C
ARDUINO_DIRECTORIES_USER: ${{ github.workspace }}/.arduino/user ARDUINO_DIRECTORIES_USER: ${{ github.workspace }}/.arduino/user
CLANG_FORMAT_CMD: clang-format-12 CLANG_FORMAT_CMD: clang-format-14
jobs: jobs:
smoke-sketches: smoke-sketches:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Cache arduino dep downloads - name: Cache arduino dep downloads
@ -19,7 +19,7 @@ jobs:
- run: make setup - run: make setup
- run: KALEIDOSCOPE_TEMP_PATH=${{ github.workspace}}/.kaleidoscope-temp make -j $(nproc) smoke-sketches - run: KALEIDOSCOPE_TEMP_PATH=${{ github.workspace}}/.kaleidoscope-temp make -j $(nproc) smoke-sketches
run-google-tests: run-google-tests:
runs-on: ubuntu-20.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Cache arduino dep downloads - name: Cache arduino dep downloads
@ -33,27 +33,27 @@ jobs:
- run: make setup - run: make setup
- run: KALEIDOSCOPE_CCACHE=1 make -j $(nproc) --output-sync=recurse simulator-tests - run: KALEIDOSCOPE_CCACHE=1 make -j $(nproc) --output-sync=recurse simulator-tests
check-code-style: check-code-style:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: KALEIDOSCOPE_CODE_FORMATTER=clang-format-12 make check-code-style - run: KALEIDOSCOPE_CODE_FORMATTER=clang-format-14 make check-code-style
check-shellcheck: check-shellcheck:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: make shellcheck - run: make shellcheck
check-cpplint: check-cpplint:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: make cpplint - run: make cpplint
find-filename-conflicts: find-filename-conflicts:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: make find-filename-conflicts - run: make find-filename-conflicts
publish-arduino-package-on-every-commit: publish-arduino-package-on-every-commit:
runs-on: ubuntu-latest runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/master' if: github.ref == 'refs/heads/master'
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

@ -24,7 +24,9 @@
#include "kaleidoscope/device/dygma/raise/RaiseSide.h" #include "kaleidoscope/device/dygma/raise/RaiseSide.h"
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
#include "kaleidoscope/device/Base.h" #include "kaleidoscope/device/Base.h"
#include "kaleidoscope/driver/bootloader/samd/Bossac.h" #include "kaleidoscope/driver/bootloader/samd/Bossac.h"

@ -34,7 +34,9 @@ struct cRGB {
}; };
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
#include "kaleidoscope/device/ATmega32U4Keyboard.h" #include "kaleidoscope/device/ATmega32U4Keyboard.h"
#include "kaleidoscope/driver/bootloader/avr/HalfKay.h" #include "kaleidoscope/driver/bootloader/avr/HalfKay.h"

@ -28,7 +28,9 @@ struct cRGB {
}; };
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
#include "kaleidoscope/device/ATmega32U4Keyboard.h" #include "kaleidoscope/device/ATmega32U4Keyboard.h"
#include "kaleidoscope/driver/bootloader/avr/Caterina.h" #include "kaleidoscope/driver/bootloader/avr/Caterina.h"

@ -33,7 +33,9 @@
// IWYU pragma: no_include "kaleidoscope/KeyAddr.h" // IWYU pragma: no_include "kaleidoscope/KeyAddr.h"
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
struct cRGB { struct cRGB {
uint8_t b; uint8_t b;

@ -35,7 +35,9 @@ struct cRGB {
uint8_t r; uint8_t r;
}; };
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
#endif #endif
#define LED_BANKS 4 #define LED_BANKS 4

@ -22,7 +22,9 @@
#include <Arduino.h> #include <Arduino.h>
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
struct cRGB { struct cRGB {
uint8_t b; uint8_t b;

@ -35,7 +35,9 @@ struct cRGB {
uint8_t r; uint8_t r;
}; };
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
#endif #endif
#define LED_BANKS 4 #define LED_BANKS 4

@ -34,7 +34,7 @@ namespace plugin {
StalkerEffect::ColorComputer *StalkerEffect::variant; StalkerEffect::ColorComputer *StalkerEffect::variant;
uint16_t StalkerEffect::step_length = 50; uint16_t StalkerEffect::step_length = 50;
cRGB StalkerEffect::inactive_color = (cRGB){ cRGB StalkerEffect::inactive_color = (cRGB){
0, 0, 0}; 0, 0, 0};
StalkerEffect::TransientLEDMode::TransientLEDMode(const StalkerEffect *parent) StalkerEffect::TransientLEDMode::TransientLEDMode(const StalkerEffect *parent)
: parent_(parent), : parent_(parent),

@ -47,9 +47,11 @@
#define LEADER_SEQ(...) \ #define LEADER_SEQ(...) \
{ __VA_ARGS__, Key_NoKey } { __VA_ARGS__, Key_NoKey }
#define LEADER_DICT(...) \ #define LEADER_DICT(...) \
{ \ { \
__VA_ARGS__, { {Key_NoKey}, NULL } \ __VA_ARGS__, { \
{Key_NoKey}, NULL \
} \
} }
namespace kaleidoscope { namespace kaleidoscope {

@ -38,8 +38,10 @@
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#ifndef SPACECADET_MAP_END #ifndef SPACECADET_MAP_END
#define SPACECADET_MAP_END \ #define SPACECADET_MAP_END \
(kaleidoscope::plugin::SpaceCadet::KeyBinding) { Key_NoKey, Key_NoKey, 0 } (kaleidoscope::plugin::SpaceCadet::KeyBinding) { \
Key_NoKey, Key_NoKey, 0 \
}
#endif #endif
constexpr Key Key_SpaceCadetEnable = Key(kaleidoscope::ranges::SC_FIRST); constexpr Key Key_SpaceCadetEnable = Key(kaleidoscope::ranges::SC_FIRST);

@ -63,7 +63,7 @@ class MatrixAddr {
//constexpr MatrixAddr(ThisType &&other) : offset_(other.offset_) {} //constexpr MatrixAddr(ThisType &&other) : offset_(other.offset_) {}
ThisType &operator=(const ThisType &) = default; ThisType &operator=(const ThisType &) = default;
ThisType &operator=(ThisType &&) = default; ThisType &operator=(ThisType &&) = default;
template<typename MatrixAddr__> template<typename MatrixAddr__>
explicit constexpr MatrixAddr(const MatrixAddr__ &other) explicit constexpr MatrixAddr(const MatrixAddr__ &other)

@ -26,7 +26,9 @@ struct cRGB {
}; };
#define CRGB(r, g, b) \ #define CRGB(r, g, b) \
(cRGB) { b, g, r } (cRGB) { \
b, g, r \
}
#endif #endif

Loading…
Cancel
Save