Open puuu opened 6 years ago
I won't explain my reason here in public but you can drop me a private email, my address should be on my github profile page. I'm sure we'll find a solution.
I sent you an email on 22th. Didn't it arrived? Subject was: Re: [janLo/MQTT433gatewayNG] Please stop this fork in favour for MQTT433gateway (#2) And encrypted to the gpg key you use for signing git commits.
@janLo I decided to merge your contribution from puuu/MQTT433gateway#21 without any squashing into the
webserver
branch. This branch becomes master as soon as theREADME.md
reflect this changes. Any further modifications until merged intomaster
are accepted as pull requests against thewebserver
branch.I would be happy if we would maintain MQTT433gateway together, it makes no sense to split our resources by maintaining two forks.
Some points that may lead to your decision to create a fork:
ARDUINOJSON_ENABLE_PROGMEM
flag: This flag is only read once inside ArduinoJson/StringTraits/FlashString.hpp and automatically set in ArduinoJson/Configuration.hpp ifPROGMEM
is defined.PROGMEM
is defined in pgmspace.h that will be included by WString.h. So having this flag inplatfomio.ini
or not, will not change resulting binaries. IMHO it is better to not define this flag, since this force us to load the header files in the correct order (we needpgmspace.h
/WString.h
anyhow). Your problem was simply that inSettings.h
ArduinoJson was loaded before WString: db3e9d53b2d475be8f2b8507402b8206673197f6FIRMWARE_VERSION
definition: The result ofgit describe --abbrev=8 --dirty --always --tags
supports tags and informs about a dirty working tree. If there is a need for a more sophisticated script, we can add it later.esp12e_160
environment that defines 160 MHz.esp12e_160
is activated in.travis.yml
. Later, binaries should be created foresp12e
andesp12e_160
.CONTRIBUTING.md
(I would be happy for further modifications of this file) and let all changes (if not typos) tomaster
/webserver
go trough pull requests to give us each other an opportunity to comment them.