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

Wifilights plugin #74

Open

rrwiyatn wants to merge 3 commits into OpenROV:master from rrwiyatn:rey_wifilights

rrwiyatn commented May 21, 2016

Cockpit plugin to control external LED using WiFi module (ESP8266) by sending POST request from node.js to ESP8266.

1 existing file was changed:
switches.html : added WFL switch to turn LED ON/OFF

2 new files were added in wifilights folder:
index.js
wifilights.js


          Wifilights plugin

831808a

Contributor

spiderkeys commented May 21, 2016

Before we review the code, the following should be done:

Delete all backup files with "~" names
Fetch the latest version of openrov-cockpit/master and merge it into your branch
Make sure the vscode/launch.json file matches the one in master and isn't modified.

Once this is done, the merge conflicts should go away and we can proceed.

rrwiyatn added 2 commits

May 20, 2016 21:42


          deleted backup files

3bf658c


          Resolve merged conflicts with upstream master

535d0af

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet