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 snap #2391

Merged
merged 25 commits into from
Jun 8, 2018
Merged

Next master snap #2391

merged 25 commits into from
Jun 8, 2018

Conversation

marcelstoer
Copy link
Member

As always the PRs are listed in the milestone: https://github.com/nodemcu/nodemcu-firmware/milestone/9?closed=1

peturdainn and others added 25 commits March 25, 2018 22:56
ds18b20 decimals do not take into account the sign bit. Since the original calculation was not so readable, rewritten in readable way that also fixes the bug. Same code as PR against master.
Added `node.egc.meminfo()` to expose LVM usage (to make the regular
`node.egc.ON_MEM_LIMIT` option usable).

Extended the `node.egc.ON_MEM_LIMIT` option to also take negative limits,
in which case that's taken as a request to keep a certain amount of heap
available for non-Lua use.
* Put each ICACHE_RAM_ATTR function in its own section.

* Chached the macro names to be less likely to cause problems
Missed setting the ID into the data block
* pmsleep refactor
* Shortened swtmr disabled message 
* Added swtimer debug module option to user_modules.h.
* Added comments to user_config.h.
* Fixed error in documentation for node.sleep()
* remove blank sntp.c that got added in during rebase onto dev(6218b92)
* Added #ifdefs around SWTIMER_REG_CB to prevent inclusion of disabled
code
* Update node.dsleep() to support longer deep sleep duration.
* Updated documentation for node.dsleepMax()
Fixed coding errors in app/pm/swtimer.c
* fix application of patch 0018-feat-espconn-Modification-for-espconn.patch in #2269
espconn_tcp_reconnect() was removed instead of espconn_list_delete()
* updated wifi_eventmon to store events in LUA_REGISTRYINDEX

* updated wifi_eventmon debug comments

* Updated wifi.c to remove c_free()

In wifi_ap_listclient(app/modules/wifi.c), c_free() was replaced with
wifi_softap_free_station_info()

* Removed unnecessary line of code from app/modules/wifi_eventmon.c
Fix for lack of nil return in file.read() when EOF is reached
@marcelstoer
Copy link
Member Author

marcelstoer commented Jun 7, 2018

Can we get this out the door please so that LFS can land on dev?

@TerryE TerryE merged commit 8b84445 into master Jun 8, 2018
@TerryE
Copy link
Collaborator

TerryE commented Jun 8, 2018

Can we get this out the door please so that LFS can land on dev?

Sorry Marcel, I am running a few days behind partly because I had a bit of a problem overcoming my Candida infection which flattened me and I've had to totally change my diet to shake off, and partly debugging my LFS version of the FTP server, but I'll post on that separately even though it's nice to boot into a version with telnet, FTP and a bunch of other utitlities loaded and still have 45kb RAM free.

@marcelstoer
Copy link
Member Author

👍 No worries, you're not the only one with merge permissions 😉

@TerryE
Copy link
Collaborator

TerryE commented Jun 9, 2018

Unfortunately this is i's dotting and t's crossing before we can merge the LFS version -- mainly integrating Johny's linker-magic static LFS allocator.

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.

7 participants