# Add the remote, call it "upstream":
git remote add upstream https://github.com/whoever/whatever.git
# Fetch all the branches of that remote into remote-tracking branches,
# such as upstream/master:
git fetch upstream
# Make sure that you're on your master branch:
git checkout master
# Rewrite your master branch so that any commits of yours that
# aren't already in upstream/master are replayed on top of that
# other branch:
git rebase upstream/master
# And finally push your local updated copy to GitHub:
git push
Category Archives: programming
Determine ws event frame type.
To determine the websocket frame type you can use the following comparisons:
e.data instanceof ArrayBuffere.data instanceof Blobtypeof e.data === "string"
Links:
Converteer C++ ‘time_t’ naar JavaScript ‘Date’.
Hier is ‘1524248879’ de C++ time_t waarde zoals die bijvoorbeeld uit de C++ functie time( NULL ) komt.
new Date(1000 * 1524248879); "Sat Apr 21 2018 12:19:27 GMT+0200 (CEST)"
Vermenigvuldig met 1000 ( want C++ time_t is seconden en JS Date() is in milliseconden ) en in een JS new Date() variable stoppen.
Reminder: Git version hash in C code.
Upload files with curl.
Like this:
curl -F ‘data=@path/to/local/file’ UPLOAD_ADDRESS
Dus om /home/Cellie/test.txt te uploaden naar 192.168.2.5/upload gebruik je:
curl -F ‘data=@/home/Cellie/test.txt’ 192.168.2.5/upload
Met username / password inlog word dat:
curl --user admin:esp32 -F 'data=@/home/Cellie/test.txt' 192.168.2.5/upload
URL encode en decode Arduino.
EDIT: – Er zit ook een prima urlDecode() functie in de ESP8266Webserver lib verstopt.
WebServer.urlDecode( '/test%20text.txt' );