chore: Update ArduinoJson Package#76
Merged
faustbrian merged 25 commits intoArkEcosystemArchive:masterfrom Apr 17, 2019
sleepdefic1t:chore/arduinojson-v6
Merged
chore: Update ArduinoJson Package#76faustbrian merged 25 commits intoArkEcosystemArchive:masterfrom sleepdefic1t:chore/arduinojson-v6
faustbrian merged 25 commits intoArkEcosystemArchive:masterfrom
sleepdefic1t:chore/arduinojson-v6
Conversation
misc: merge from upstream
- list ArduinoJson as a dependency. - add Arduino sketch path to config. - fix the 'platformio_example' path.
This reverts commit 55d830b.
The current Cpp-Crypto library supports ArduinoJson v.5 semantics. This PR updates to and explicitly forces use of ArduinoJson v.6.10.0. Specifically, this PR changes the following: - updates version in ./circleci/script_arduino.sh - updates version in docs/INSTALL_PLATFORMIO.md - updates version in /platformio.ini - updates version in test/platformio.ini - updates ArduinoJson submodule - updates transaction.cpp ArduinoJson semantics. - updates test/transaction.cpp ArduinoJson semantics. - updates message.cpp ArduinoJson semantics. - updates test/message.cpp ArduinoJson semantics.
|
The ci/circleci: build-linux-default job is failing as of b8a5defa2908ef7718a6112a669fabbe38cada39. Please review the logs for more information. Once you've pushed the fixes, the build will automatically re-run. Thanks! |
Contributor
Author
|
@ciband I didn't touch anything with BIP39. PIO 32/8266 works just fine on macOS; |
Contributor
|
I think some of the interfaces in ESP8266 Arduino libs for PROGMEM strings changed as some point.
I don’t remember all of the particulars.
… On Apr 16, 2019, at 15:07, Simon ***@***.***> wrote:
@ciband
This error look familiar at all?
I didn't touch anything with BIP39.
PIO 32/8266 works just fine on macOS;
Linux PIO ESP8266 apparently not so much.
In file included from /home/circleci/.platformio/packages/framework-arduinoespressif8266/tools/sdk/libc/xtensa-lx106-elf/include/string.h:163:0,
from /home/circleci/.platformio/packages/framework-arduinoespressif8266/cores/esp8266/Arduino.h:33,
from .piolibdeps/bip39_ID5886/src/util.h:13,
from .piolibdeps/bip39_ID5886/src/dictionary/english_str.h:4,
from .piolibdeps/bip39_ID5886/src/dictionary/english.h:4,
from .piolibdeps/bip39_ID5886/src/bip39.cpp:2:
.piolibdeps/bip39_ID5886/src/bip39.cpp: In function 'int BIP39::{anonymous}::get_word_index(const char* const*, const string&)':
.piolibdeps/bip39_ID5886/src/bip39.cpp:52:28: error: 'const void*' is not a pointer-to-object type
strcpy_P(w, (char*)pgm_read_ptr_far(&(lexicon[i]))); // NOLINT
^
/home/circleci/.platformio/packages/framework-arduinoespressif8266/tools/sdk/libc/xtensa-lx106-elf/include/sys/string.h:32:57: note: in definition of macro 'strcpy_P'
#define strcpy_P(dest, src) strncpy_P((dest), (src), SIZE_IRRELEVANT)
^
.piolibdeps/bip39_ID5886/src/bip39.cpp: In function 'BIP39::word_list BIP39::create_mnemonic(std::vector<unsigned char>&, BIP39::language)':
.piolibdeps/bip39_ID5886/src/bip39.cpp:106:31: error: 'const void*' is not a pointer-to-object type
strcpy_P(word, (char*)pgm_read_ptr_far(&(lexicon[position]))); // NOLINT
^
/home/circleci/.platformio/packages/framework-arduinoespressif8266/tools/sdk/libc/xtensa-lx106-elf/include/sys/string.h:32:57: note: in definition of macro 'strcpy_P'
#define strcpy_P(dest, src) strncpy_P((dest), (src), SIZE_IRRELEVANT)
^
*** [.pioenvs/esp8266/src/test/.piolibdeps/bip39_ID5886/src/bip39.cpp.o] Error 1
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Contributor
Author
|
@ciband Tried this fix in bip39 on a Linux instance, seems to resolve issue. #if defined(ESP8266) | \
defined(ARDUINO_SAMD_MKRZERO) | \
defined(ARDUINO_SAMD_ZERO) | \
defined(ARDUINO_SAM_DUE) | \
defined(ARDUINO_ARCH_ARC32) | \
defined(__TC27XX__) | \
(defined(TEENSYDUINO) && (TEENSYDUINO < 139))
#undef pgm_read_ptr
#define pgm_read_ptr(addr) (*(const void **)(addr))
#endifI'll open a PR in ciband/BIP39 so you can check it out. |
Contributor
|
Sounds good.
… On Apr 16, 2019, at 16:30, Simon ***@***.***> wrote:
@ciband
Yeah, I'm guessing 8266 Core changed at some point recently.
Tried this fix in bip39 on a Linux instance, seems to resolve issue.
#if defined(ESP8266) | \
defined(ARDUINO_SAMD_MKRZERO) | \
defined(ARDUINO_SAMD_ZERO) | \
defined(ARDUINO_SAM_DUE) | \
defined(ARDUINO_ARCH_ARC32) | \
defined(__TC27XX__) | \
(defined(TEENSYDUINO) && (TEENSYDUINO < 139))
#undef pgm_read_ptr
#define pgm_read_ptr(addr) (*(const void **)(addr))
#endif
src: SlashDevin/NeoGPS#112
I'll open a PR in ciband/BIP39 so you can check it out.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
Contributor
Author
|
Final build error in A PR to resolve that packages build error was submitted @ ciband/bip39#8 This PR should be good to go now 👍 |
faustbrian
approved these changes
Apr 17, 2019
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Proposed changes
The current Cpp-Crypto library supports ArduinoJson v.5 semantics.
This PR updates to and explicitly forces use of ArduinoJson v.6.10.0.
Specifically, this PR changes the following:
Types of changes
Checklist
Further comments
This PR also resolves build failure in #74 as noted in #75.
It is [WIP] until I can confirm this will pass all CI test.