Skip to content

Commit eb3bb1d

Browse files
Merge pull request #52 from heliosproj/develop
Merge for 0.4.1 release
2 parents 583305d + 74da2ca commit eb3bb1d

Some content is hidden

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

67 files changed

+263
-146
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,31 @@ labels: bug
66
assignees: MannyPeterson
77
---
88

9-
**PLEASE BE AWARE THAT THIS ISSUE IS FOR REPORTING BUGS ONLY**
9+
## :dart: **Help us help you by filling out this issue completely. This issue is ONLY for bug reports. If you are seeking support, please submit a support request.**
10+
### **1. Describe, in detail, the bug you have encountered and how to reproduce it (if providing a source code excerpt, use a markdown code block and please do not provide screenshots of source code):**
1011

11-
###Please describe, in detail, the bug you have encountered **and** how to reproduce it.
1212

13+
### **2. What results, output, behavior are you expecting?**
1314

1415

15-
###Please provide a screenshot or text of compiler errors, if any.
16+
### **3. What version of HeliOS are you using?**
1617

1718

19+
### **4. Provide the following details about your development environment and development board/microcontroller:**
1820

19-
###Please provide details about the MCU architecture, platform/tool-chain, development board, etc. you were using when you encountered the bug.
21+
OS [Windows, macOS, Linux]:
2022

23+
OS Version [Windows 10, Ventura, Ubuntu 22.04]:
2124

25+
IDE [Arduino IDE, PlatformIO, STM32CubeIDE, Keil]:
2226

23-
###What version of HeliOS are you running?
27+
IDE Version:
2428

29+
Board/MCU Mfg [Arduino, PJRC, ST Micro]:
2530

31+
Board/MCU Model [UNO, Teensy 4.1, NUCLEO-F429ZI]:
2632

27-
###Please attach the application source code file(s) needed to reproduce the bug.
33+
### **5. Are you experiencing any compiler or linker errors? If so, copy and paste them here (please do not provide screenshots):**
2834

2935

36+
### 7. **Attach a copy of your source code file(s) so we may compile them if needed:**

.github/ISSUE_TEMPLATE/everything-else.md

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Other Request
3+
about: A request that is not a bug report or a request for support
4+
title: "[OTHER] "
5+
labels: other
6+
assignees: MannyPeterson
7+
---
8+
9+
### **1. How can we help you?**
10+
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Support Request
3+
about: Request support for HeliOS
4+
title: "[SUPPORT] "
5+
labels: support
6+
assignees: MannyPeterson
7+
---
8+
9+
## :dart: **Help us help you by filling out this issue completely.**
10+
### **1. How can we help you (i.e., what is the issue you are facing)?**
11+
12+
13+
### **2. What results, output, behavior are you expecting?**
14+
15+
16+
### **3. What version of HeliOS are you using?**
17+
18+
19+
### **4. Provide the following details about your development environment and development board/microcontroller:**
20+
21+
OS [Windows, macOS, Linux]:
22+
23+
OS Version [Windows 10, Ventura, Ubuntu 22.04]:
24+
25+
IDE [Arduino IDE, PlatformIO, STM32CubeIDE, Keil]:
26+
27+
IDE Version:
28+
29+
Board/MCU Mfg [Arduino, PJRC, ST Micro]:
30+
31+
Board/MCU Model [UNO, Teensy 4.1, NUCLEO-F429ZI]:
32+
33+
### **5. Are you experiencing any compiler or linker errors? If so, copy and paste them here (please do not provide screenshots):**
34+
35+
36+
### **6. If you have questions about a specific block of source code, copy and paste an excerpt of the source code here (use a markdown code block and please do not provide screenshots):**
37+
38+
39+
### 7. **Attach a copy of your source code file(s) so we may compile them if needed:**
40+

.github/workflows/HeliOS_CI_Workflow.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ jobs:
5454
sed -i '/^PROJECT_NAME .*/d' ${{github.workspace}}/temp/HeliOS.conf
5555
echo 'PROJECT_NAME = HeliOS' >> ${{github.workspace}}/temp/HeliOS.conf
5656
sed -i '/^PROJECT_NUMBER .*/d' ${{github.workspace}}/temp/HeliOS.conf
57-
echo 'PROJECT_NUMBER = Kernel 0.4.0' >> ${{github.workspace}}/temp/HeliOS.conf
57+
echo 'PROJECT_NUMBER = Kernel 0.4.1' >> ${{github.workspace}}/temp/HeliOS.conf
5858
sed -i '/^PROJECT_LOGO .*/d' ${{github.workspace}}/temp/HeliOS.conf
59-
echo 'PROJECT_LOGO = ${{github.workspace}}/temp/HeliOS_OG_Logo.png' >> ${{github.workspace}}/temp/HeliOS.conf
59+
echo 'PROJECT_LOGO = ${{github.workspace}}/temp/HeliOS_OG_Logo_Light.png' >> ${{github.workspace}}/temp/HeliOS.conf
6060
sed -i '/^OUTPUT_DIRECTORY .*/d' ${{github.workspace}}/temp/HeliOS.conf
6161
echo 'OUTPUT_DIRECTORY = ${{github.workspace}}/temp' >> ${{github.workspace}}/temp/HeliOS.conf
6262
sed -i '/^OPTIMIZE_OUTPUT_FOR_C .*/d' ${{github.workspace}}/temp/HeliOS.conf
@@ -119,13 +119,13 @@ jobs:
119119
- name: Resize HeliOS logo...
120120
shell: bash
121121
run: |
122-
convert -resize 2600 ${{github.workspace}}/extras/HeliOS_OG_Logo.png ${{github.workspace}}/temp/HeliOS_OG_Logo.png
122+
convert -resize 1600 ${{github.workspace}}/extras/HeliOS_OG_Logo_Light.png ${{github.workspace}}/temp/HeliOS_OG_Logo_Light.png
123123
124124
- name: Generate LaTeX...
125125
shell: bash
126126
run: |
127127
doxygen ${{github.workspace}}/temp/HeliOS.conf
128-
sed -i 's~^\\begin{center}\%~\\begin{center}\%\n\\includegraphics{HeliOS_OG_Logo.png}\\\\\n\\vspace*{1cm}~' ${{github.workspace}}/temp/latex/refman.tex
128+
sed -i 's~^\\begin{center}\%~\\begin{center}\%\n\\includegraphics{HeliOS_OG_Logo_Light.png}\\\\\n\\vspace*{1cm}~' ${{github.workspace}}/temp/latex/refman.tex
129129
sed -i 's~Generated by Doxygen [0123456789]*.[0123456789]*.[0123456789]*~HeliOS Developer\x27s Guide~' ${{github.workspace}}/temp/latex/refman.tex
130130
sed -i 's~Generated by Doxygen~(C)Copyright 2020-2023 HeliOS Project~' ${{github.workspace}}/temp/latex/refman.tex
131131

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"custom"
3131
],
3232
"doxdocgen.file.fileTemplate": "@file {name}",
33-
"doxdocgen.file.versionTag": "@version 0.4.0",
33+
"doxdocgen.file.versionTag": "@version 0.4.1",
3434
"doxdocgen.generic.authorEmail": "manny@heliosproj.org",
3535
"doxdocgen.generic.authorName": "Manny Peterson",
3636
"doxdocgen.generic.authorTag": "@author {author} <{email}>",

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# Code of Conduct
33

4-
The [HeliOS Project](https://github.com/heliosproj) has a very simple, yet strict, Code of Conduct. If you are unable to follow the Code of Conduct, you will be blocked from the [HeliOS Project's](https://github.com/heliosproj) GitHub organization and its repositories indefinitely.
4+
The [HeliOS Project](https://github.com/heliosproj) has a straight forward Code of Conduct. If you are unable to follow the Code of Conduct, you will be blocked from the [HeliOS Project's](https://github.com/heliosproj) GitHub organization and its repositories indefinitely. All members of the [HeliOS Project](https://github.com/heliosproj) community are expected to:
55

66
1. Adhere to the [GitHub Terms of Service](https://docs.github.com/en/site-policy/github-terms/github-terms-of-service)
77
2. Treat others as you wish to be treated yourself (i.e., act as if you are a mature adult human being by treating others with respect and dignity)

CONTRIBUTING.md

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Contributing to HeliOS
2-
We love that you are interested in joining the HeliOS Project community by contributing to HeliOS. We want to make contributing to this project as easy and seamless as possible, whether it is:
2+
We love that you are interested in joining the HeliOS Project community as a contributor. We want to make contributing to the project as easy and seamless as possible, whether it is:
33

44
- Reporting a bug
55
- Submitting a bug fix
@@ -10,29 +10,32 @@ We love that you are interested in joining the HeliOS Project community by contr
1010
- Becoming a maintainer
1111

1212
## We Develop with Github
13-
The HeliOS Project uses GitHub exclusively to maintain a develop HeliOS. The primary methods for contributing to HeliOS are through GitHub Issues and Pull Requests (i.e., PRs).
13+
The HeliOS Project uses GitHub exclusively to maintain and develop HeliOS. The best methods for engaging with the HeliOS Project is through GitHub Issues and Pull Requests.
1414

1515
Submit a:
16-
- **Issue**: If you are reporting a bug, asking a question or proposing a new feature, then submit an issue. Please do not submit source code or other file changes through an issue. If you do, you will be asked to submit a pull request and your issue will be closed. See the **Submitting an Issue** section below for more details.
17-
- **Pull Request**: If you are submitting a bug fix, a new feature or a documentation change, then submit a pull request. See the **Submitting a Pull Request** section below for more details.
16+
- **Issue**: If you are reporting a bug, asking a question or proposing a new feature, then submit an issue. Please do not submit source code or other file changes through an issue. If you do, you will be asked to submit a pull request and your issue will be closed. See the **Submitting an Issue** section below for more details on submitting an issue.
17+
- **Pull Request**: If you are submitting a bug fix or a new feature, then submit a pull request. See the **Submitting a Pull Request** section below for more details.
1818

1919
## Submitting an Issue
2020

21-
If you are reporting a bug then submit a **Bug Report** issue. Other requests or questions should be submitted using the **Everything Else** issue. If your issue includes formatted text or source code excerpts, please use markdown so your issue is readable. Reading an unformatted source code excerpt is nearly impossible. Please note, the more time you put into submitting a clear and detailed issue, the more helpful we can be to you.
21+
If you are reporting a bug then submit a **Bug Report** issue. If you are in need of help or seeking support then submit a **Support Request**. Anything else should be submitted as an **Other Request**. To open a new issue, go [here](https://github.com/heliosproj/HeliOS/issues). We kindly ask for your patience as it may take several days before we are able to respond to your issue. If it is a bug report or support request, it may take longer.
2222

2323
## Submitting a Pull Request
2424

25-
First and foremost, it will take several days before your pull request is merged (if it is merged at all). All pull requests are reviewed multiple times and we may request you make changes before your pull request is merged. Once your pull request is merged, it will not appear in the mainline HeliOS source code until the next release which may be several months away. To submit a pull request, the following **must** be followed:
25+
First and foremost, it may take a week or more before your pull request is merged (if at all). All pull requests are reviewed multiple times and we may request you make changes before your pull request is merged. Once your pull request is merged, it will not appear in the mainline HeliOS source code until the next release which may be months away. To submit a pull request, the following steps **must** be followed:
2626

27-
1. Fork the repo and create your branch from **develop**. Pull requests opened against the **master** branch will be rejected.
28-
2. If you have added a new feature, you **must** add unit tests for the new feature. Pull requests for new features not accompanied by unit tests will be rejected.
29-
3. Your code changes must include code comments (where appropriate) and be accompanied by documentation updates (again, where appropriate).
30-
4. Ensure all unit tests pass.
31-
5. Format your code using Uncrustify. The HeliOS Uncrustify config is available [here](/extras/uncrustify/helios.cfg).
32-
6. Issue that pull request and hang tight! :)
27+
1. Fork the repository (you must uncheck **[x] Copy the ``main`` branch only.** option before forking the repository) into your personal GitHub account. If you do not perform this step correctly, only the ``master`` branch will be forked and you will have to start over.
28+
2. Create a new branch named ``develop-<account_name>`` from the ``develop`` branch. **Do not make your changes to the sources in the ``master`` branch (this branch contains the latest release). If you do, your pull request will be rejected.**
29+
3. Make your source code changes.
30+
4. If you have added a new feature, you **must** add unit tests for the new feature. The unit tests are in ``/test``. **Pull requests for new features not accompanied by unit tests will be rejected.**
31+
5. Changes to source code must include code comments (where appropriate) and be accompanied by documentation updates (again, where appropriate). Most documentation changes are made to the doxygen documentation in ``/src/HeliOS.h`` which is used to auto-generate the HeliOS Developer's Guide.
32+
6. Run Uncrustify against the source code files. The HeliOS Uncrustify config is available in ``/extras/uncrustify/helios.cfg``.
33+
7. Ensure your code compiles without warnings and all unit tests pass.
34+
8. Create a commit and push to the remote.
35+
9. Last, but most importantly. Create and submit your pull request. Then go have a :beer:.
3336

3437
## Copyright & License
35-
In short, when you contribute source code, documentation or other file changes to the HeliOS project, they will fall under the HeliOS Project copyright and license.
38+
In short, when you contribute source code, documentation or other file changes to the HeliOS project, those contributions will become part of the HeliOS Project license and copyright.
3639

3740
## Thank You
38-
Thank you for your contributions to HeliOS.
41+
Thank you for your contributions to HeliOS. :pray:

0 commit comments

Comments
 (0)