Skip to content

Commit 32e6390

Browse files
committed
Merge branch 'emuflight-1.0.0-master' into 20220329_cherry_pick_Smith_Predictor
2 parents 64299e2 + 2f5f0d0 commit 32e6390

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1523
-541
lines changed

.github/no-response.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

.github/release.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- "cleanup"
5+
categories:
6+
- title: Features
7+
labels:
8+
- "RN: MAJOR FEATURE"
9+
- "RN: MINOR FEATURE"
10+
- title: Improvements
11+
labels:
12+
- "RN: IMPROVEMENT"
13+
- "RN: SAFETY IMPROVEMENT"
14+
- "RN: REFACTORING"
15+
- title: Fixes
16+
labels:
17+
- "RN: BUGFIX"
18+
- title: Targets
19+
labels:
20+
- "RN: NEW TARGET"
21+
- "RN: TARGET UPDATE"
22+
- title: Known Issues
23+
labels:
24+
- BUG
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Release
2+
3+
on:
4+
release:
5+
types: [published]
6+
7+
jobs:
8+
ci:
9+
name: CI
10+
uses: ./.github/workflows/ci.yml
11+
with:
12+
release_build: true
13+
14+
release:
15+
name: Release
16+
needs: ci
17+
runs-on: ubuntu-20.04
18+
steps:
19+
- name: Code Checkout
20+
uses: actions/checkout@v2
21+
22+
- name: Fetch build artifacts
23+
uses: actions/download-artifact@v2
24+
25+
- name: List assets
26+
run: ls -al Assets
27+
28+
- name: Attach assets to release
29+
run: |
30+
set -x
31+
assets=()
32+
for asset in Assets/*.hex; do
33+
assets+=("-a" "$asset")
34+
echo "$asset"
35+
done
36+
tag_name="${GITHUB_REF##*/}"
37+
hub release edit "${assets[@]}" -m "" "$tag_name"
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Builds Betaflight Firmware.
2+
#
3+
# After building, artifacts are kept for 7 days.
4+
5+
name: CI
6+
7+
on:
8+
workflow_call:
9+
inputs:
10+
release_build:
11+
description: 'Specifies if it is a debug build or a release build'
12+
default: false
13+
required: false
14+
type: boolean
15+
16+
jobs:
17+
build:
18+
name: Build
19+
runs-on: ubuntu-20.04
20+
steps:
21+
- name: Code Checkout
22+
uses: actions/checkout@v2
23+
24+
- name: Prepare environment
25+
run: make arm_sdk_install
26+
27+
- name: Execute Build
28+
run: make all RELEASE=${{ inputs.release_build && 'yes' || 'no' }}
29+
30+
- name: Publish build artifacts
31+
uses: actions/upload-artifact@v3
32+
with:
33+
name: Assets
34+
path: ./obj/*.hex
35+
retention-days: 7

.github/workflows/no-response.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: No Response
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
schedule:
7+
- cron: 0 4 * * *
8+
9+
jobs:
10+
no-response:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: lee-dohm/no-response@9bb0a4b5e6a45046f00353d5de7d90fb8bd773bb # v0.5.0
14+
with:
15+
daysUntilClose: 1
16+
responseRequiredLabel: Missing Information
17+
token: ${{ github.token }}

.github/workflows/stale.yaml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
1-
name: 'Close stale issues'
1+
name: Stale Issues and PRs
22

33
on:
44
schedule:
5-
- cron: "30 4 * * *"
5+
- cron: 30 4 * * *
66

77
jobs:
88
stale:
9-
name: 'Check and close stale issues'
109
runs-on: ubuntu-latest
1110
steps:
12-
- uses: actions/stale@v3
11+
- uses: actions/stale@v4
1312
with:
14-
repo-token: ${{ secrets.GITHUB_TOKEN }}
15-
operations-per-run: 30
13+
exempt-all-milestones: true
1614
days-before-stale: 30
1715
days-before-close: 7
16+
1817
stale-issue-message: >
1918
This issue has been automatically marked as stale because it
2019
has not had recent activity. It will be closed if no further activity occurs
2120
within a week.
22-
close-issue-message: 'Issue closed automatically as inactive.'
23-
exempt-issue-labels: 'BUG,Feature Request,Pinned'
24-
stale-issue-label: 'Inactive'
21+
close-issue-message: Issue closed automatically as inactive.
22+
stale-issue-label: Inactive
23+
exempt-issue-labels: BUG,Feature Request,Pinned
24+
2525
stale-pr-message: >
2626
This pull request has been automatically marked as stale because it
2727
has not had recent activity. It will be closed if no further activity occurs
2828
within a week.
29-
close-pr-message: 'Pull request closed automatically as inactive.'
30-
exempt-pr-labels: 'Pinned'
31-
stale-pr-label: 'Inactive'
32-
exempt-all-milestones: true
29+
close-pr-message: Pull request closed automatically as inactive.
30+
stale-pr-label: Inactive
31+
exempt-pr-labels: Pinned

CODE_OF_CONDUCT.md

Lines changed: 50 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,75 @@
22

33
## Our Pledge
44

5-
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
5+
We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
6+
7+
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
68

79
## Our Standards
810

9-
Examples of behavior that contributes to creating a positive environment include:
11+
Examples of behavior that contributes to a positive environment for our community include:
1012

11-
* Using welcoming and inclusive language
12-
* Being respectful of differing viewpoints and experiences
13-
* Gracefully accepting constructive criticism
14-
* Focusing on what is best for the community
15-
* Showing empathy towards other community members
13+
* Demonstrating empathy and kindness toward other people
14+
* Being respectful of differing opinions, viewpoints, and experiences
15+
* Giving and gracefully accepting constructive feedback
16+
* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
17+
* Focusing on what is best not just for us as individuals, but for the overall community
1618

17-
Examples of unacceptable behavior by participants include:
19+
Examples of unacceptable behavior include:
1820

19-
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20-
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* The use of sexualized language or imagery, and sexual attention or advances of any kind
22+
* Trolling, insulting or derogatory comments, and personal or political attacks
2123
* Public or private harassment
22-
* Publishing others' private information, such as a physical or electronic address, without explicit permission
24+
* Publishing others private information, such as a physical or email address, without their explicit permission
2325
* Other conduct which could reasonably be considered inappropriate in a professional setting
2426

25-
## Our Responsibilities
27+
## Enforcement Responsibilities
2628

27-
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
29+
Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
2830

29-
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
31+
Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
3032

3133
## Scope
3234

33-
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
35+
This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
3436

3537
## Enforcement
3638

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at [email protected]. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
39+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at [INSERT CONTACT METHOD]. All complaints will be reviewed and investigated promptly and fairly.
40+
41+
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
42+
43+
## Enforcement Guidelines
44+
45+
Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
46+
47+
### 1. Correction
48+
49+
Community Impact: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
50+
51+
Consequence: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
52+
53+
### 2. Warning
3854

39-
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
55+
Community Impact: A violation through a single incident or series of actions.
4056

57+
Consequence: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
58+
59+
### 3. Temporary Ban
60+
61+
Community Impact: A serious violation of community standards, including sustained inappropriate behavior.
62+
63+
Consequence: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
64+
65+
### 4. Permanent Ban
66+
67+
Community Impact: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals.
68+
69+
Consequence: A permanent ban from any sort of public interaction within the community.
4170
## Attribution
4271

43-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
72+
This Code of Conduct is adapted from the Contributor Covenant, version 2.1, available at https://www.contributor-covenant.org/version/2/1/code_of_conduct.html.
73+
74+
Community Impact Guidelines were inspired by Mozilla’s code of conduct enforcement ladder.
4475

45-
[homepage]: http://contributor-covenant.org
46-
[version]: http://contributor-covenant.org/version/1/4/
76+
For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

0 commit comments

Comments
 (0)