Merge remote-tracking branch 'upstream/dev' into keymindCascade
This commit is contained in:
commit
5f0452412d
3 files changed
+11
-1
No files matched your search
@@ -3055,7 +3055,7 @@ void MyMesh::handleCmdFrame(size_t len) {
|
||||
#endif
|
||||
} else if (cmd_frame[0] == CMD_SEND_RAW_DATA && len >= 6) {
|
||||
int i = 1;
|
||||
int8_t path_len = cmd_frame[i++];
|
||||
uint8_t path_len = cmd_frame[i++];
|
||||
if (path_len >= 0 && mesh::Packet::isValidPathLen(path_len)) {
|
||||
uint8_t path[MAX_PATH_SIZE];
|
||||
i += mesh::Packet::writePath(path, &cmd_frame[i], path_len);
|
||||
|
||||
@@ -114,6 +114,7 @@ platform_packages =
|
||||
; https://github.com/meshcore-dev/MeshCore/pull/1177
|
||||
; https://github.com/meshcore-dev/MeshCore/pull/1295
|
||||
framework-arduinoadafruitnrf52 @ https://github.com/meshcore-dev/Adafruit_nRF52_Arduino#d541301
|
||||
platformio/toolchain-gccarmnoneeabi@^1.140201.0
|
||||
extra_scripts = create-uf2.py
|
||||
build_flags = ${arduino_base.build_flags}
|
||||
-D NRF52_PLATFORM
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
// https://github.com/meshcore-dev/MeshCore/issues/2469
|
||||
// armstubs.cpp exists to silence warnings introduced after upgrading platformio/toolchain-gccarmnoneeabi
|
||||
extern "C" __attribute__((weak)) int _close(int fd) { return -1; }
|
||||
extern "C" __attribute__((weak)) int _lseek(int fd, int offset, int whence) { return 0; }
|
||||
extern "C" __attribute__((weak)) int _read(int fd, char *buf, int len) { return 0; }
|
||||
extern "C" __attribute__((weak)) int _fstat(int fd, struct stat *st) { return 0; }
|
||||
extern "C" __attribute__((weak)) int _isatty(int fd) { return 1; }
|
||||
extern "C" __attribute__((weak)) int _getpid(void) { return 1; }
|
||||
extern "C" __attribute__((weak)) int _kill(int pid, int sig) { return -1; }
|
||||
Reference in new issue
Block a user