Skip to content

Commit

Permalink
Merge with M5UnitUnified
Browse files Browse the repository at this point in the history
  • Loading branch information
GOB52 committed Aug 9, 2024
1 parent de23e40 commit 6873bbc
Show file tree
Hide file tree
Showing 14 changed files with 3,839 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ body:
label: Issue checklist
description: Please double-check that you have done each of the following things before submitting the issue.
options:
- label: I searched for previous reports in [the issue tracker](https://github.com/m5stack/M5Stack/issues?q=)
- label: I searched for previous reports in [the issue tracker](https://github.com/m5stack/M5Unit-KMeterISO/issues?q=)
required: true
- label: My report contains all necessary details
required: true
10 changes: 6 additions & 4 deletions .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ jobs:
path:
- check: './' # path to include
exclude: '' # path to exclude
# - check: 'src'
# exclude: '(Fonts)' # Exclude file paths containing "Fonts"
# - check: 'examples'
# exclude: ''
- check: 'src'
exclude: ''
- check: 'test'
exclude: ''
- check: 'examples'
exclude: ''
steps:
- uses: actions/[email protected]
- name: Run clang-format style check for C/C++/Protobuf programs.
Expand Down
32 changes: 31 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# UNIT UNIT KMETERISO
# M5Unit - KMETERISO

## Overview

Expand All @@ -11,3 +11,33 @@ Contains case programs of M5Stack UNIT KMETERISO.
## License

[UNIT KMETERISO - MIT](LICENSE)


## M5UnitUnified
Library for Unit ENV using M5UnitUnified.
The M5UnitUnified version of the library is located under [src/unit](src/unit).
M5UnitUnfied has a unified API and can control multiple units via PaHub, etc.

### Required Libraries:

- [M5UnitUnified](https://github.com/m5stack/M5UnitUnified)
- [M5Utility](https://github.com/m5stack/M5Utility)
- [M5HAL](https://github.com/m5stack/M5HAL)

### Examples
See also [examples/UnitUnified](examples/UnitUnified)

### Doxygen document
If you want to generate documents on your local machine, execute the following command

```
bash docs/doxy.sh
```

It will output it under docs/html
If you want to output Git commit hashes to html, do it for the git cloned folder.

#### Required
- [Doxyegn](https://www.doxygen.nl/)
- [pcregrep](https://formulae.brew.sh/formula/pcre2)
- [Git](https://git-scm.com/) (Output commit hash to html)
33 changes: 33 additions & 0 deletions boards/m5stack-nanoc6.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"build": {
"core": "esp32",
"extra_flags": [
"-DARDUINO_M5Stack_NanoC6"
],
"f_cpu": "160000000L",
"f_flash": "80000000L",
"flash_mode": "qio",
"mcu": "esp32c6",
"variant": "esp32c6"
},
"connectivity": [
"wifi"
],
"debug": {
"openocd_target": "esp32c6.cfg"
},
"frameworks": [
"arduino",
"espidf"
],
"name": "M5Stack NanoC6",
"upload": {
"flash_size": "4MB",
"maximum_ram_size": 327680,
"maximum_size": 4194384,
"require_upload_port": true,
"speed": 460800
},
"url": "https://docs.m5stack.com/en/core/M5NanoC6",
"vendor": "M5Stack"
}
Loading

0 comments on commit 6873bbc

Please sign in to comment.