Skip to content

Commit

Permalink
Merge remote-tracking branch 'biologist/dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sascha committed Dec 2, 2023
2 parents f9efd18 + 29bf165 commit 886e950
Show file tree
Hide file tree
Showing 93 changed files with 12,865 additions and 9,346 deletions.
41 changes: 41 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
---
BasedOnStyle: WebKit
AlignArrayOfStructures: Right
AlignConsecutiveBitFields:
Enabled: true
AlignConsecutiveMacros:
Enabled: true
AllowShortEnumsOnASingleLine: false
AllowShortFunctionsOnASingleLine: InlineOnly
BreakBeforeBraces: Attach
Cpp11BracedListStyle: true
FixNamespaceComments: true
IncludeBlocks: Regroup
IncludeCategories:
- Regex: Arduino.h
Priority: -1
SortPriority: -2
CaseSensitive: true
- Regex: settings.h
Priority: -1
SortPriority: -1
CaseSensitive: true
- Regex: ^"
Priority: 1
SortPriority: 0
CaseSensitive: false
- Regex: .*
Priority: 4
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: (_test)?$
IndentCaseLabels: true
IndentPPDirectives: BeforeHash
InsertBraces: true
InsertNewlineAtEOF: true
NamespaceIndentation: None
PointerAlignment: Right
SpaceAfterCStyleCast: true
Standard: Auto
TabWidth: 4
UseTab: Always
5 changes: 4 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ root = true
[*] # Loosely following the kernel coding style: https://www.kernel.org/doc/html/v4.10/process/coding-style.html
charset = utf-8
end_of_line = lf
indent_size = 8
indent_size = 4
indent_style = tab
trim_trailing_whitespace = true
insert_final_newline = true
Expand All @@ -22,6 +22,9 @@ indent_size = unset
indent_style = unset
insert_final_newline = false

[*.md]
max_line_length = 100

[platformio.ini]
indent_size = 4
indent_style = space
5 changes: 5 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Code re-formatting with clang
d1f82a7c93f160f9197c8b4e14e5a984ac6f9449

# Code re-formatting with editorconf
3a562b67e3ca0f98ed128650440323c3b2d5fc78
2 changes: 2 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[blame]
ignoreRevsFile = .git-blame-ignore-revs
22 changes: 0 additions & 22 deletions .github/workflows/build.yml

This file was deleted.

15 changes: 15 additions & 0 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: clang-format-check
run-name: Clang-format Check
on: [workflow_dispatch, push, pull_request]
jobs:
formatting-check:
name: Formatting Check
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run clang-format style check for C/C++/Protobuf programs.
uses: jidicula/[email protected]
with:
clang-format-version: '16'
check-path: 'src'
fallback-style: 'LLVM' # optional
58 changes: 58 additions & 0 deletions .github/workflows/test-builds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: build-all
run-name: Build all boards
on:
workflow_dispatch:
push:
pull_request:
paths:
- 'src/*'
- 'html/*'
- 'test/*'
- '**.ini'
- '**.py'
- '**.csv'

jobs:
test_builds:
name: Run all Tests
runs-on: ubuntu-latest
strategy:
matrix:
variant:
- esp32-a1s
- lolin32
- lolin_d32
- lolin_d32_pro
- lolin_d32_pro_sdmmc_pe
- nodemcu-32s
- az-delivery-devkit-v4
- ttgo_t8
- complete

steps:
- uses: actions/checkout@v3
- name: Cache pip
uses: actions/cache@v3
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
uses: actions/cache@v3
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}

- name: Setup Python 3.9
uses: actions/setup-python@v4
with:
python-version: '3.9'
- name: Install PlatformIO Core
run: |
pip install -U setuptools platformio
pio upgrade --dev
pio pkg update --global
- name: Build ${{ matrix.variant }}
run: platformio run -e ${{ matrix.variant }}
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ venv/
.vscode/ipch
.DS_Store
.idea/
CMakeLists.txt
CMakeListsPrivate.txt
cmake-build-az-delivery-devkit-v4/
cmake-build-debug/
platformio-override.ini
sdkconfig.*
!sdkconfig.defaults
src/settings-override.h
src/settings-custom-override.h
node_modules/
7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"cmake.configureOnOpen": false
}
"cmake.configureOnOpen": false,
"gitlens.advanced.blame.customArguments": [
"--ignore-revs-file", ".git-blame-ignore-revs"
]
}
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cmake_minimum_required(VERSION 3.16.0)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(ESPuino)
Loading

0 comments on commit 886e950

Please sign in to comment.