Skip to content

Commit 8c4b77f

Browse files
authored
Merge pull request #12 from HarvestX/fix_humble
Update humble
2 parents fabe8f6 + 4468f02 commit 8c4b77f

File tree

8 files changed

+532
-174
lines changed

8 files changed

+532
-174
lines changed
54 Bytes
Binary file not shown.

example/m5core2/include/command_handler.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,4 +250,4 @@ void command_handler(const uint8_t & command, Packet & s_pkt)
250250

251251
}
252252

253-
#endif
253+
#endif

example/m5core2/include/protocol_definitions.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,3 @@ extern "C" {
2424
#endif
2525

2626
#endif // PROTOCOL_DEFINITIONS_H
27-
28-
29-

example/m5core2/platformio.ini

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ board = m5stack-core2
77
framework = arduino
88
upload_port = /dev/ttyACM0
99
test_framework = googletest
10+
lib_deps = m5stack/M5Core2
1011

11-
lib_deps =
12-
m5stack/M5Core2
12+
extra_scripts = extra_script.py
1313

1414
build_unflags = -std=gnu++11
15-
16-
build_flags =
17-
-std=gnu++14
18-
-D M5STACK_M5CORE2
19-
-I ../../include
20-
-I../../h6x_dynamic_packet_handler/include
21-
22-
extra_scripts = extra_script.py
15+
build_flags =
16+
-std=gnu++14
17+
-D M5STACK_M5CORE2
18+
-I ${PROJECT_DIR}/../../include
19+
-I ${PROJECT_DIR}/../../h6x_dynamic_packet_handler/include

example/m5core2/primary/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,4 +128,4 @@ void loop()
128128
}
129129

130130
delay(20);
131-
}
131+
}

example/m5core2/secondary/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ void loop()
4747
}
4848
}
4949
delay(10); // ~100Hz loop
50-
}
50+
}

0 commit comments

Comments
 (0)