Skip to content

Commit

Permalink
fix gesture error
Browse files Browse the repository at this point in the history
  • Loading branch information
Tinyu-Zhao committed Aug 23, 2022
1 parent ebebdea commit f77022f
Show file tree
Hide file tree
Showing 15 changed files with 23 additions and 952 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clang-format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
matrix:
path:
- check: './' # path to include
exclude: '(Fonts|utility)' # path to exclude
exclude: '(Fonts|utility|RFID)' # path to exclude
# - check: 'src'
# exclude: '(Fonts)' # Exclude file paths containing "Fonts"
# - check: 'examples'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ void loop() {
M5.Lcd.fillScreen(0);
M5.Lcd.setCursor(0, 30);
M5.Lcd.printf(
"⛣⛤⛥⛦⛧⛨⛩⛪⛫⛬⛭⛮⛯F⛰⛱⛲⛳⛴⛵⛶⛷⛸⛹⛺⛻⛼⛽⛾⛿✀✁✂✃✄✅✆✇✈✉✊✋✌✍✎✏✐✑✒✓✔✕✖✗✘✙✚✛✜✝✞✟✠"
"⛣⛤⛥⛦⛧⛨⛩⛪⛫⛬⛭⛮⛯F⛰⛱⛲⛳⛴⛵⛶⛷⛸⛹⛺⛻⛼⛽⛾⛿✀✁✂✃✄✅✆✇✈✉✊✋✌✍✎✏✐✑✒✓✔✕✖✗✘✙✚✛✜✝✞"
""
""
""
""
""
Expand Down
4 changes: 3 additions & 1 deletion examples/Advanced/Display/HZK16/display_ch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ DisplayCh::DisplayCh() {
***************************************************************************************/

void DisplayCh::setTextWrap(boolean w) { textwrap = w; }
void DisplayCh::setTextWrap(boolean w) {
textwrap = w;
}
/***************************************************************************************
** Function name: setTextSize
Expand Down
12 changes: 9 additions & 3 deletions examples/Advanced/Display/HZK16/display_ch.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ class DisplayCh {

// Highlight the text (Once set to be true, the text background will not be
// transparent any more)
inline void highlight(bool isHighlight) { highlighted = isHighlight; }
inline void highlight(bool isHighlight) {
highlighted = isHighlight;
}
// Set highlight color
inline void setHighlightColor(uint16_t color) {
highlightcolor = color;
Expand All @@ -42,10 +44,14 @@ class DisplayCh {
inline void setTransparentBgColor(bool isTransparent) {
istransparent = isTransparent;
}
inline bool isTransparentBg() { return istransparent; }
inline bool isTransparentBg() {
return istransparent;
}
bool initHzk16(boolean use, const char* HZK16Path = nullptr,
const char* ASC16Path = nullptr);
inline bool isHzk16Used() { return hzk16Used; }
inline bool isHzk16Used() {
return hzk16Used;
}
void setTextWrap(boolean wrap);
void writeHzkAsc(const char c);
void writeHzkGbk(const char* c);
Expand Down
3 changes: 2 additions & 1 deletion examples/Advanced/Display/JpegDraw/JpegDraw.ino
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ void setup(void) {
// jpeg_div_t scale);
}

void loop() {}
void loop() {
}
131 changes: 0 additions & 131 deletions examples/Modules/COM_LoRaWAN/LoRaWAN_Send/TFTTerminal.cpp

This file was deleted.

33 changes: 0 additions & 33 deletions examples/Modules/COM_LoRaWAN/LoRaWAN_Send/TFTTerminal.h

This file was deleted.

46 changes: 0 additions & 46 deletions examples/Unit/BPS_BMP280/BPS_BMP280.ino

This file was deleted.

10 changes: 5 additions & 5 deletions examples/Unit/GESTURE_PAJ7620U2/GESTURE_PAJ7620U2.ino
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* Visit for more information: https://docs.m5stack.com/en/unit/gesture
* 获取更多资料请访问: https://docs.m5stack.com/zh_CN/unit/gesture
*
* Describe: GESTURE. 手势传感器
* Date: 2021/11/17
* Product: GESTURE. 手势传感器
* Date: 2022/8/17
*******************************************************************************
Please connect to Port A (G21, G22)
请连接端口A (G21, G22)
Expand All @@ -17,9 +17,9 @@
https://github.com/ouki-wang/DFRobot_PAJ7620U2
*/

#include <DFRobot_PAJ7620U2.h>
#include <M5GFX.h>
#include <M5Stack.h>
#include <M5GFX.h>
#include <DFRobot_PAJ7620U2.h>

M5GFX display;
M5Canvas canvas(&display);
Expand Down Expand Up @@ -71,4 +71,4 @@ void loop() {
String description = sensor.gestureDescription(gesture);
log("Gesture = " + description);
}
}
}
Loading

0 comments on commit f77022f

Please sign in to comment.