Skip to content

Commit f77022f

Browse files
committed
fix gesture error
1 parent ebebdea commit f77022f

File tree

15 files changed

+23
-952
lines changed

15 files changed

+23
-952
lines changed

.github/workflows/clang-format-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
matrix:
99
path:
1010
- check: './' # path to include
11-
exclude: '(Fonts|utility)' # path to exclude
11+
exclude: '(Fonts|utility|RFID)' # path to exclude
1212
# - check: 'src'
1313
# exclude: '(Fonts)' # Exclude file paths containing "Fonts"
1414
# - check: 'examples'

examples/Advanced/Display/Display_Unicode/Display_Unicode.ino

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ void loop() {
5151
M5.Lcd.fillScreen(0);
5252
M5.Lcd.setCursor(0, 30);
5353
M5.Lcd.printf(
54-
"⛣⛤⛥⛦⛧⛨⛩⛪⛫⛬⛭⛮⛯F⛰⛱⛲⛳⛴⛵⛶⛷⛸⛹⛺⛻⛼⛽⛾⛿✀✁✂✃✄✅✆✇✈✉✊✋✌✍✎✏✐✑✒✓✔✕✖✗✘✙✚✛✜✝✞✟✠"
54+
"⛣⛤⛥⛦⛧⛨⛩⛪⛫⛬⛭⛮⛯F⛰⛱⛲⛳⛴⛵⛶⛷⛸⛹⛺⛻⛼⛽⛾⛿✀✁✂✃✄✅✆✇✈✉✊✋✌✍✎✏✐✑✒✓✔✕✖✗✘✙✚✛✜✝✞"
55+
""
56+
""
5557
""
5658
""
5759
""

examples/Advanced/Display/HZK16/display_ch.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ DisplayCh::DisplayCh() {
2525
2626
***************************************************************************************/
2727

28-
void DisplayCh::setTextWrap(boolean w) { textwrap = w; }
28+
void DisplayCh::setTextWrap(boolean w) {
29+
textwrap = w;
30+
}
2931
/***************************************************************************************
3032
3133
** Function name: setTextSize

examples/Advanced/Display/HZK16/display_ch.h

+9-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ class DisplayCh {
2929

3030
// Highlight the text (Once set to be true, the text background will not be
3131
// transparent any more)
32-
inline void highlight(bool isHighlight) { highlighted = isHighlight; }
32+
inline void highlight(bool isHighlight) {
33+
highlighted = isHighlight;
34+
}
3335
// Set highlight color
3436
inline void setHighlightColor(uint16_t color) {
3537
highlightcolor = color;
@@ -42,10 +44,14 @@ class DisplayCh {
4244
inline void setTransparentBgColor(bool isTransparent) {
4345
istransparent = isTransparent;
4446
}
45-
inline bool isTransparentBg() { return istransparent; }
47+
inline bool isTransparentBg() {
48+
return istransparent;
49+
}
4650
bool initHzk16(boolean use, const char* HZK16Path = nullptr,
4751
const char* ASC16Path = nullptr);
48-
inline bool isHzk16Used() { return hzk16Used; }
52+
inline bool isHzk16Used() {
53+
return hzk16Used;
54+
}
4955
void setTextWrap(boolean wrap);
5056
void writeHzkAsc(const char c);
5157
void writeHzkGbk(const char* c);

examples/Advanced/Display/JpegDraw/JpegDraw.ino

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ void setup(void) {
1212
// jpeg_div_t scale);
1313
}
1414

15-
void loop() {}
15+
void loop() {
16+
}

examples/Modules/COM_LoRaWAN/LoRaWAN_Send/TFTTerminal.cpp

-131
This file was deleted.

examples/Modules/COM_LoRaWAN/LoRaWAN_Send/TFTTerminal.h

-33
This file was deleted.

examples/Unit/BPS_BMP280/BPS_BMP280.ino

-46
This file was deleted.

examples/Unit/GESTURE_PAJ7620U2/GESTURE_PAJ7620U2.ino

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
* Visit for more information: https://docs.m5stack.com/en/unit/gesture
77
* 获取更多资料请访问: https://docs.m5stack.com/zh_CN/unit/gesture
88
*
9-
* Describe: GESTURE. 手势传感器
10-
* Date: 2021/11/17
9+
* Product: GESTURE. 手势传感器
10+
* Date: 2022/8/17
1111
*******************************************************************************
1212
Please connect to Port A (G21, G22)
1313
请连接端口A (G21, G22)
@@ -17,9 +17,9 @@
1717
https://github.com/ouki-wang/DFRobot_PAJ7620U2
1818
*/
1919

20-
#include <DFRobot_PAJ7620U2.h>
21-
#include <M5GFX.h>
2220
#include <M5Stack.h>
21+
#include <M5GFX.h>
22+
#include <DFRobot_PAJ7620U2.h>
2323

2424
M5GFX display;
2525
M5Canvas canvas(&display);
@@ -71,4 +71,4 @@ void loop() {
7171
String description = sensor.gestureDescription(gesture);
7272
log("Gesture = " + description);
7373
}
74-
}
74+
}

0 commit comments

Comments
 (0)