Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next master drop #3151

Merged
merged 78 commits into from
Jun 10, 2020
Merged

Next master drop #3151

merged 78 commits into from
Jun 10, 2020

Conversation

marcelstoer
Copy link
Member

Fixes #3066

@nwf
Copy link
Member

nwf commented Jun 9, 2020

Looks right to me.

@marcelstoer
Copy link
Member Author

Did you see 78ae85b? That was necessary because we have #3012 on master and dev. I resolved the conflict through the GitHub UI right in the browser.

Should be fine now. But it means that currently git describe returns

3.0-master_20190907-84-g78ae85be

on dev 😉

@nwf
Copy link
Member

nwf commented Jun 9, 2020

Thanks for fixing my error with #3012. And I approve of the new git describe result.

TerryE and others added 27 commits June 9, 2020 22:26
The internal implementation already preferentially forwards to the
encoder module, so we should just remove these functions as they confuse
people into thinking that we don't have their inverses (see the feature
request #2907).

Update the docs to refer to the encoder version and add deprecation
warnings to the runtime implementations.
* clean effects library
* Fix several issues in ws2812 and effects
* Implement working way of calling shift from callback
* Remove app/include/netif/wlan_lwip_if.h

This file appears to be unused in our tree.

* New `net.if.info` call to show LwIP information

This is a generalization of `wifi.sta`'s and `wifi.ap`'s `getip` and
`getmac` calls.  I don't propose to deprecate those, but perhaps we
should, in the documentation, point users at this function instead.

The direct motivation is to permit continued use of DHCP-provided NTP
servers in a future where
#2819 has landed, now
that #2709 is in the
tree.  But rather than exposing just that information, a more general
interface seems useful.
* Remove stale putative MD2 support

This hasn't worked in a while, presumably since one of our upstream
merges.  Don't bother making it work, since MD2 is generally considered
insecure.

* Land mbedtls 2.16.3-77-gf02988e57

* TLS: remove some dead code from espconn_mbedtls

There was some... frankly kind of scary buffer and data shuffling if
ESP8266_PLATFORM was defined.  Since we don't, in fact, define that
preprocessor symbol, just drop the code lest anyone (possibly future-me)
be scared.

* TLS: espconn_mbedtls: run through astyle

No functional changes

* TLS: espconn_mbedtls: put the file_params on the stack

There's no need to malloc a structure that's used only locally.

* TLS: Further minor tidying of mbedtls glue

What an absolute shitshow this is.  mbedtls should absolutely not
be mentioned inside sys/socket.h and app/mbedtls/app/lwIPSocket.c is not
so much glue as it as a complete copy of a random subset of lwIP; it
should go, but we aren't there yet.

Get rid of the mysterious "mbedlts_record" struct, which housed merely a
length of bytes sent solely for gating the "record sent" callback.

Remove spurious __attribute__((weak)) from symbols not otherwise
defined and rename them to emphasize that they are not actually part of
mbedtls proper.

* TLS: Rampage esp mbedtls glue and delete unused code

This at least makes the shitshow smaller

* TLS: lwip: fix some memp definitions

I presume these also need the new arguments

* TLS: Remove more non-NodeMCU code from our mbedtls

* TLS: drop support for 1.1

Depending on who you ask it's either EOL already or EOL soon, so
we may as well get rid of it now.
* Add missing globals from luacheck config

* Fix luacheck warnings in all lua files

* Re-enable luacheck in Travis

* Speed up Travis by using preinstalled LuaRocks

* Fix more luacheck warnings in httpserver lua module

* Fix DCC module and add appropriate definitions to luacheck config.

* Change inline comments from ignoring block to only ignore specific line

* Add Luacheck for Windows and enable it for both Windows and Linux

* Change luacheck exceptions and fix errors from 1st round of polishing

* Add retry and timeout params to wget
Also clean-up a nasty `ow` module example.
HHHartmann and others added 22 commits June 9, 2020 22:26
…her sma… (#3016)

* #2954: adapt to the new firmware api for the timer and some other small fixes

* reduce the error msg in when not response is sent back from esp

* cleanup: remove trailing whitespaces

Co-authored-by: Adel Tayeb-Cherif <adel@evoluhome.com>
-  Lots of minor but nasty bugfixes to get all tests to run clean
-  core lua and test suite fixes to allow luac -F to run cleanly against test suite
-  next tranch to get LFS working
-  luac.cross -a options plus fixes from feedback
-  UART fixes and lua.c merge
-  commit of wip prior to rebaselining against current dev
-  more tweaks
Co-authored-by: Matsievskiy S.V <matsievskiysv@gmail.com>
Correct typo in Lua export from updateDispla() to updateDisplay()
* Net_info module exposing ping function initial commit
* Ping as a part of net module
* Sent callback implemented
* Add NET_PING_ENABLE macro

Authored-by: vsky <blue205@centrum.cz> with support from TerryE
Replay a line from #2861
after accidental revert in
#3075 (specifically
9ef5c7d)
@marcelstoer
Copy link
Member Author

I change my mind and the strategy. The previous approach would have left this repository with a somewhat odd Git history. Instead I rebased dev onto master and resolved the conflicts from #3017 .
If you approve you can now select & hit that "Rebase and merge" button. Otherwise, the previous state is preserved in dev-backup.

@nwf nwf merged commit 8d091c4 into master Jun 10, 2020
@nwf
Copy link
Member

nwf commented Jun 10, 2020

It's done and I've taken the liberty of pruning dev-backup.

ETA: Let it be open season on dev again.

@marcelstoer
Copy link
Member Author

@nwf Can I ask you to write release notes at https://github.com/nodemcu/nodemcu-firmware/releases? I won't have time for the next 2-3d. (A large part of) The community will have troubles dealing with the changes if there are no release notes to guide them.

@TerryE
Copy link
Collaborator

TerryE commented Jun 10, 2020

@nwf, I am not sure that we will be able to remove Lua51 support altogether in next master drop + 1. There are language changes which mean that some Lua files are going to need tweaking, so IMO it's going to be less disruptive if we offer developers an extended transition period where they can select a Lua51 core. It's just that we will probably stop Lua51-specific bugfixes once we've decided that 5.3 is stable and preferred.

If you note, I've added a Lua 5,1 Legacy label to tag issues that need changes to the Lua51 core

@nwf
Copy link
Member

nwf commented Jun 10, 2020

Feel free to edit the release notes, but I thought I was summarizing our discussion in #3144 (comment) and #3144 (comment) .

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When to drop the next master release