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.

Sign up for GitHub

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

Jump to bottom

WIP, OpenEVSE merge 2020-08 #74

Merged
merged 53 commits into from
Sep 28, 2020
Merged

WIP, OpenEVSE merge 2020-08 #74

merged 53 commits into from
Sep 28, 2020

Conversation

jeremypoulter
Copy link
Contributor

@jeremypoulter jeremypoulter commented Aug 19, 2020 •
edited
Loading

This is a merge of work from OpenEVSE back to EmonESP. Loads of features including, but not limited to

  • HTML/JS embeded into the firmware, no more uploading the SPIFFS separately
  • Better WiFi management
  • Improved GUI dev tools, makes it easier to develop the UI
  • Remote display of both the EmonTX serial and the Debug output
  • Config saved as JSON in the 'EEPROM', makes adding additional config easier
  • The Input process is more robust, parsed into ArduinoJson 'document' for passing to the different outputs

Still need to test on different devices, currently only really tested on a Huzzah

@jeremypoulter
WIP, Initial merge of OpenEVSE changes back to EmonESP
25ddace
@jeremypoulter
Various bug fixes to get things working.
95f2e83
@jeremypoulter
Lint fixes
b1de070
@jeremypoulter
Inital addition of remote debug/serial view
271883f
@jeremypoulter
Buttons to open the serial terminals
3810ff1
@jeremypoulter
Fixing the node name/id
42dbeb7 
Also moved all the board specific setup to the platform.ini and based on #defines, makes the code less complicated
@jeremypoulter
Added sending serial from the remote terminal to the EmonTx serial out
c9b3cf9
@jeremypoulter
Fixed loading legacy config
d54be5c 
both for the timer branch and (my)pre-timer branch
@jeremypoulter
Slight improvement in sending live serial data
de2fb6d
@jeremypoulter
Updated GUI
9e55b3e
@jeremypoulter
Added parsing off the input string into the JSON doc
f5f8acc
@jeremypoulter
Fixed setting the flags from the legacy config
598b9ec
@jeremypoulter
Fixes to build all envs and stop building the FS (no longer required)
ea4a1e0
@jeremypoulter
Additional fixes for CI
d0216ee
@jeremypoulter
Merge branch 'openevse_merge_202007' of github.com:jeremypoulter/Emon…
6133287 
…ESP into openevse_merge_202007
@jeremypoulter
Connected states are now numbers not strings
5203097
@jeremypoulter
Added a simple split screen page with both terminals
b820618
@jeremypoulter
Only send emoncms connected state when changed
3af890b
@jeremypoulter
Do not try and send serial data when not ready
f6ba4b0
@jeremypoulter
More input processing fixes
033b25a 
- last data now a propper JSON doc
- merged logs and latest value view models to stop extra fetches
- added more units
- added a few more system values to the input data
@jeremypoulter
Fixed building on all boards
f25f748
@jeremypoulter
Removed jQuery from term.js and load the lib.js, saves on flash space
9b1c3ef
@jeremypoulter
Latest GUI
bf9afc2
@jeremypoulter
Enable backtrace decoding
29b202e
@jeremypoulter
Split JS up a bit to make it more manageable
c76105a
@jeremypoulter
WiFi GUI from OpenEVSE
d734743
@jeremypoulter
No need to check the button in wifi_start to select AP, done by hol…
b63e08a 
…ding the button for 5 secs
@jeremypoulter
Added the show/hide password to all passwords
bcd386c
@jeremypoulter
Move over to std::string for buffers, should be safer to use in callb…
681e4d2 
…acks
@jeremypoulter
Whitespace tidy-up
96b8b5b
@glynhudson
Copy link
Member

  • saving config is now working and persisting between reboots, the version I compiled locally now includes this fix 👍

Current issues remaining:

  • HTTP firmware update
  • WiFi PSK printed as plain text in serial debug

@jeremypoulter
Copy link
Contributor Author

Both those issues should now be fixed

@glynhudson
Copy link
Member

glynhudson commented Sep 8, 2020 •
edited
Loading

I've just tested HTTP update, the progress bar looks nice! However, the bar gets about 1/4 of the way before hanging for a few seconds then reporting 'update failed'. Nothing is shown in the debug window:

Screenshot from 2020-09-08 13-14-12

@jeremypoulter
Copy link
Contributor Author

I suspect this may be memory related, in my tests only 7k free when upgrading :( need to review the memory usage.

@jeremypoulter
Adding some memory debug
691bac3
@jeremypoulter
Added checkboxes to enable/disable EmonCMS and MQTT
fe81998
@jeremypoulter
Use memory on the stack for the JSON doc as this goes is created ever…
c37155f 
…y time through the loop.
@jeremypoulter
Updated to use the latest SSL APIs, removes the need for essentially …
467c6d2 
…different code for HTTP and HTTPS
@jeremypoulter
Changed a large amount of static strings to be stored loaded from fla…
5f9f33e 
…sh rather than taking up RAM
@jeremypoulter
Removed HTTP pull update, the server is no longer setup
81606ce
@jeremypoulter
No longer needed, fetched from NPM
f095451
@jeremypoulter
Updated Micro Debug and ConfigJson libs
1f2dcc6
@jeremypoulter
Status for if there is an OTA update happening
20762ca
@jeremypoulter
Support for allowing the browser to cache the static files
943158a
@jeremypoulter
Latest compiled GUI
c30251f
@jeremypoulter
More tests
52d7605
@jeremypoulter
Updated to match old values
fdece84
@glynhudson
Copy link
Member

I've been testing the latest version for a few days now, It works perfectly on the Huzzah: receiving data from emonTx, posting to MQTT/HTTP and HTTP firmware update 👍

However, running on the WiFi relay the issue of losing the config when restarted / power cycled has returned. Also HTTP update does not work on the WiFi relay. It's a shame the firmware update does not work on the wifi relay but maybe it's not possible given the hardware limitation. However, the issue of losing the config and dropping off the WiFi on reboot is obviously a major issue.

Screenshot from 2020-09-25 01-03-40

@danbates2
Copy link
Contributor

danbates2 commented Sep 25, 2020 •
edited
Loading

Heya, chipping in here that the wifi relay has only 1MB flash. The config as EEPROM emulation on the esp8266 will be put at the end of the flash, so EEPROM would be lost on the 1MB flash if it's expecting it to be elsewhere.
We've noticed also that Tasmota have got around the issue of updatability by having a separate, smaller, binary for updates. Something to do with firmware mapping, which I don't know much about unfortunately.

@jeremypoulter
Copy link
Contributor Author

Ah that would explain both issues, thanks @danbates2.

@jeremypoulter
Copy link
Contributor Author

@glynhudson I have fixed the WiFi relay image to be 1Mb, give it a try.

@glynhudson
Copy link
Member

Fantastic! It works great now 👍

I think we're good to merge this.

The WiFi relay actually has 2Mb of flash. I've made the change to build the 2Mb image.

@glynhudson glynhudson merged commit a0538cb into openenergymonitor:master Sep 28, 2020
@stuartpittaway
Copy link

Hi, I've just tried this firmware on an old SONOFF WIFI Relay (basic). It only has 1Mb flash.

The version in the releases 3.1.0 seems to work fine, please stay at 1Mb !

Detecting chip type... ESP8266
Chip is ESP8266EX
Features: WiFi
Crystal is 26MHz
MAC: 5c:cf:7f:e9:ec:ae
Uploading stub...
Running stub...
Stub running...
Configuring flash size...
Auto-detected Flash size: 1MB
Flash params set to 0x0320
Compressed 845472 bytes to 498612...
Wrote 845472 bytes (498612 compressed) at 0x00000000 in 44.3 seconds (effective 152.6 kbit/s)...
Hash of data verified.

@jeremypoulter
Copy link
Contributor Author

The different envs should be configured with the correct amount of flash so that shouldn't be a problem.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jeremypoulter @glynhudson @danbates2 @stuartpittaway