Skip to content

Commit ead2e95

Browse files
ForairaaaaaForairaaaaa
authored
Merge pull request #27 from Forairaaaaa/Cardputer-ADV
CardputerADV userdemo
2 parents f3169b0 + f07c341 commit ead2e95

815 files changed

Lines changed: 51690 additions & 1807149 deletions

File tree

Some content is hidden

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

‎.clang-format‎

Lines changed: 162 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,164 @@
1-
---
2-
# We'll use defaults from the LLVM style, but with 4 columns indentation.
3-
BasedOnStyle: LLVM
4-
5-
---
6-
Language: Cpp
7-
# Force pointers to the type for C++.
8-
ColumnLimit: 128
9-
IndentWidth: 4
10-
NamespaceIndentation: All
1+
BasedOnStyle: Google
112
AccessModifierOffset: -4
12-
DerivePointerAlignment: false
13-
PointerAlignment: Left
14-
BreakBeforeBraces: Allman
15-
BinPackArguments: false
16-
BinPackParameters: false
3+
AlignAfterOpenBracket: Align
4+
AlignConsecutiveMacros: true
5+
AlignConsecutiveAssignments: true
6+
AlignConsecutiveDeclarations: false
7+
AlignEscapedNewlines: Left
8+
AlignOperands: true
9+
AlignTrailingComments: true
10+
AllowAllArgumentsOnNextLine: true
11+
AllowAllConstructorInitializersOnNextLine: true
12+
AllowAllParametersOfDeclarationOnNextLine: true
13+
AllowShortBlocksOnASingleLine: Never
14+
AllowShortCaseLabelsOnASingleLine: false
15+
AllowShortFunctionsOnASingleLine: false
16+
AllowShortLambdasOnASingleLine: All
17+
AllowShortIfStatementsOnASingleLine: WithoutElse
18+
AllowShortLoopsOnASingleLine: true
19+
AlwaysBreakAfterDefinitionReturnType: None
20+
AlwaysBreakAfterReturnType: None
21+
AlwaysBreakBeforeMultilineStrings: true
1722
AlwaysBreakTemplateDeclarations: Yes
18-
SortIncludes: false
19-
AllowAllArgumentsOnNextLine: false
20-
# AllowShortBlocksOnASingleLine: Always
21-
# AllowShortCaseLabelsOnASingleLine: false
22-
23-
---
24-
Language: JavaScript
25-
# Use 100 columns for JS.
26-
ColumnLimit: 100
27-
---
28-
Language: Proto
29-
# Don't format .proto files.
30-
DisableFormat: true
31-
---
32-
Language: CSharp
33-
# Use 100 columns for C#.
34-
ColumnLimit: 100
23+
BinPackArguments: true
24+
BinPackParameters: true
25+
BraceWrapping:
26+
AfterCaseLabel: false
27+
AfterClass: false
28+
AfterControlStatement: false
29+
AfterEnum: false
30+
AfterFunction: true
31+
AfterNamespace: false
32+
AfterObjCDeclaration: false
33+
AfterStruct: false
34+
AfterUnion: false
35+
AfterExternBlock: false
36+
BeforeCatch: false
37+
BeforeElse: false
38+
IndentBraces: false
39+
SplitEmptyFunction: true
40+
SplitEmptyRecord: true
41+
SplitEmptyNamespace: true
42+
BreakBeforeBinaryOperators: None
43+
BreakBeforeBraces: Custom
44+
BreakBeforeInheritanceComma: false
45+
BreakInheritanceList: BeforeColon
46+
BreakBeforeTernaryOperators: true
47+
BreakConstructorInitializersBeforeComma: false
48+
BreakConstructorInitializers: BeforeColon
49+
BreakAfterJavaFieldAnnotations: false
50+
BreakStringLiterals: true
51+
ColumnLimit: 120
52+
CommentPragmas: '^ IWYU pragma:'
53+
CompactNamespaces: false
54+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
55+
ConstructorInitializerIndentWidth: 4
56+
ContinuationIndentWidth: 4
57+
Cpp11BracedListStyle: true
58+
DeriveLineEnding: true
59+
DerivePointerAlignment: true
60+
DisableFormat: false
61+
ExperimentalAutoDetectBinPacking: false
62+
FixNamespaceComments: true
63+
ForEachMacros:
64+
- foreach
65+
- Q_FOREACH
66+
- BOOST_FOREACH
67+
IncludeBlocks: Regroup
68+
IncludeCategories:
69+
- Regex: '^<ext/.*\.h>'
70+
Priority: 2
71+
SortPriority: 0
72+
- Regex: '^<.*\.h>'
73+
Priority: 1
74+
SortPriority: 0
75+
- Regex: '^<.*'
76+
Priority: 2
77+
SortPriority: 0
78+
- Regex: '.*'
79+
Priority: 3
80+
SortPriority: 0
81+
IncludeIsMainRegex: '([-_](test|unittest))?$'
82+
IncludeIsMainSourceRegex: ''
83+
IndentCaseLabels: true
84+
IndentGotoLabels: true
85+
IndentPPDirectives: None
86+
IndentWidth: 4
87+
IndentWrappedFunctionNames: false
88+
JavaScriptQuotes: Leave
89+
JavaScriptWrapImports: true
90+
KeepEmptyLinesAtTheStartOfBlocks: false
91+
MacroBlockBegin: ''
92+
MacroBlockEnd: ''
93+
MaxEmptyLinesToKeep: 1
94+
NamespaceIndentation: None
95+
ObjCBinPackProtocolList: Never
96+
ObjCBlockIndentWidth: 2
97+
ObjCSpaceAfterProperty: false
98+
ObjCSpaceBeforeProtocolList: true
99+
PenaltyBreakAssignment: 2
100+
PenaltyBreakBeforeFirstCallParameter: 1
101+
PenaltyBreakComment: 300
102+
PenaltyBreakFirstLessLess: 120
103+
PenaltyBreakString: 1000
104+
PenaltyBreakTemplateDeclaration: 10
105+
PenaltyExcessCharacter: 1000000
106+
PenaltyReturnTypeOnItsOwnLine: 200
107+
PointerAlignment: Left
108+
RawStringFormats:
109+
- Language: Cpp
110+
Delimiters:
111+
- cc
112+
- CC
113+
- cpp
114+
- Cpp
115+
- CPP
116+
- 'c++'
117+
- 'C++'
118+
CanonicalDelimiter: ''
119+
BasedOnStyle: google
120+
- Language: TextProto
121+
Delimiters:
122+
- pb
123+
- PB
124+
- proto
125+
- PROTO
126+
EnclosingFunctions:
127+
- EqualsProto
128+
- EquivToProto
129+
- PARSE_PARTIAL_TEXT_PROTO
130+
- PARSE_TEST_PROTO
131+
- PARSE_TEXT_PROTO
132+
- ParseTextOrDie
133+
- ParseTextProtoOrDie
134+
CanonicalDelimiter: ''
135+
BasedOnStyle: google
136+
ReflowComments: true
137+
SortIncludes: false
138+
SortUsingDeclarations: true
139+
SpaceAfterCStyleCast: false
140+
SpaceAfterLogicalNot: false
141+
SpaceAfterTemplateKeyword: true
142+
SpaceBeforeAssignmentOperators: true
143+
SpaceBeforeCpp11BracedList: false
144+
SpaceBeforeCtorInitializerColon: true
145+
SpaceBeforeInheritanceColon: true
146+
SpaceBeforeParens: ControlStatements
147+
SpaceBeforeRangeBasedForLoopColon: true
148+
SpaceInEmptyBlock: false
149+
SpaceInEmptyParentheses: false
150+
SpacesBeforeTrailingComments: 2
151+
SpacesInAngles: false
152+
SpacesInConditionalStatement: false
153+
SpacesInContainerLiterals: true
154+
SpacesInCStyleCastParentheses: false
155+
SpacesInParentheses: false
156+
SpacesInSquareBrackets: false
157+
SpaceBeforeSquareBrackets: false
158+
Standard: Auto
159+
StatementMacros:
160+
- Q_UNUSED
161+
- QT_REQUIRE_VERSION
162+
TabWidth: 4
163+
UseCRLF: false
164+
UseTab: Never

‎.gitignore‎

Lines changed: 65 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,65 @@
1-
.vscode
2-
build
3-
managed_components
1+
# Prerequisites
2+
*.d
3+
4+
# Compiled Object files
5+
*.slo
6+
*.lo
7+
*.o
8+
*.obj
9+
10+
# Precompiled Headers
11+
*.gch
12+
*.pch
13+
14+
# Compiled Dynamic libraries
15+
*.so
16+
*.dylib
17+
*.dll
18+
19+
# Fortran module files
20+
*.mod
21+
*.smod
22+
23+
# Compiled Static libraries
24+
*.lai
25+
*.la
26+
*.a
27+
*.lib
28+
29+
# Executables
30+
*.exe
31+
*.out
32+
*.app
33+
34+
# MacOS desktop metadata files
35+
.DS_Store
36+
37+
# Build files
38+
build/
39+
cmake-build-*/
40+
components/
41+
managed_components/
42+
43+
# PlatformIO
44+
.pio/
45+
46+
# VSCode
47+
.vscode/
48+
.cache/
49+
50+
# Python virtual environment
51+
.venv/
52+
53+
# Debug / Release files
54+
Debug/
55+
debug/
56+
Release/
57+
release/
58+
out/
59+
bin/
60+
obj/
61+
62+
*.code-workspace
63+
64+
sdkconfig
65+
sdkconfig.old

‎.gitmodules‎

Whitespace-only changes.

‎CMakeLists.txt‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
1-
2-
# For more information about build system see
3-
# https://docs.espressif.com/projects/esp-idf/en/latest/api-guides/build-system.html
41
# The following five lines of boilerplate have to be in your project's
52
# CMakeLists in this exact order for cmake to work correctly
63
cmake_minimum_required(VERSION 3.16)
74

8-
9-
# add_definitions(-DMC_USE_CUSTOM_CONF)
10-
# add_definitions(-DNO_BOOT_PLAY_SHIT)
11-
12-
include_directories(./main/apps/utils/usb_keyboard_wrap/hid_device)
13-
14-
155
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
16-
project(cardputer)
6+
project(cardputer-adv)

‎LICENSE‎

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

‎README.md‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,44 @@
1-
# M5Cardputer-UserDemo
2-
M5Cardputer user demo for hardware evaluation.
1+
# Cardputer ADV User Demo
32

4-
#### Tool Chains
3+
User demo source code of [Cardputer ADV](https://docs.m5stack.com/en/core/todo).
54

6-
[ESP-IDF v4.4.6](https://docs.espressif.com/projects/esp-idf/en/v4.4.6/esp32/index.html)
5+
## Build
76

8-
#### Build
7+
### Fetch Dependencies
98

109
```bash
11-
git clone https://github.com/m5stack/M5Cardputer-UserDemo
10+
python3 ./fetch_repos.py
1211
```
12+
13+
### Tool Chains
14+
15+
[ESP-IDF v5.4.2](https://docs.espressif.com/projects/esp-idf/en/v5.4.2/esp32s3/index.html)
16+
17+
### Build
18+
1319
```bash
14-
cd M5Cardputer-UserDemo
20+
idf.py build
1521
```
22+
23+
### Flash
24+
1625
```bash
17-
idf.py build
26+
idf.py flash
1827
```
28+
29+
## Acknowledgments
30+
31+
This project references the following open-source libraries and resources:
32+
33+
- https://github.com/adafruit/Adafruit_TCA8418
34+
- https://github.com/m5stack/M5Unified.git
35+
- https://github.com/pikasTech/PikaPython
36+
- https://github.com/jgromes/RadioLib
37+
- https://github.com/raysan5/raylib
38+
- https://github.com/mikalhart/TinyGPSPlus
39+
- https://github.com/m5stack/M5GFX.git
40+
- https://github.com/Forairaaaaa/mooncake_log
41+
- https://github.com/hhuysqt/esp32s3-keyboard
42+
- https://github.com/78/xiaozhi-esp32
43+
- https://github.com/Forairaaaaa/mooncake
44+
- https://github.com/Forairaaaaa/smooth_ui_toolkit

‎components/M5GFX/CMakeLists.txt‎

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

0 commit comments

Comments
 (0)