] [-n ]"
+ echo
+}
+
+# get environment from command line
+while [[ $# -gt 1 ]]; do
+
+ key="$1"
+
+ case $key in
+ -e)
+ ENVIRONMENT="$2"
+ shift
+ ;;
+ -n)
+ NUMBER="$2"
+ shift
+ ;;
+ esac
+
+ shift # past argument or value
+
+done
+
+# check environment folder
+if [ $ENVIRONMENT == "" ]; then
+ echo "No environment defined"
+ help
+ exit 1
+fi
+ELF=.pioenvs/$ENVIRONMENT/firmware.elf
+if [ ! -f $ELF ]; then
+ echo "Could not find ELF file for the selected environment: $ELF"
+ exit 2
+fi
+
+$READELF -s $ELF | head -3 | tail -1
+$READELF -s $ELF | sort -r -k3 -n | head -$NUMBER
diff --git a/images/devices/arniex-swifitch.jpg b/images/devices/arniex-swifitch.jpg
new file mode 100644
index 00000000..373036ff
Binary files /dev/null and b/images/devices/arniex-swifitch.jpg differ
diff --git a/images/devices/geiger_espurna_configuration.png b/images/devices/geiger_espurna_configuration.png
new file mode 100644
index 00000000..1316084d
Binary files /dev/null and b/images/devices/geiger_espurna_configuration.png differ
diff --git a/images/devices/geiger_espurna_status.png b/images/devices/geiger_espurna_status.png
new file mode 100644
index 00000000..26bd8185
Binary files /dev/null and b/images/devices/geiger_espurna_status.png differ
diff --git a/images/devices/geiger_grafana_dashboard.png b/images/devices/geiger_grafana_dashboard.png
new file mode 100644
index 00000000..d997f7a4
Binary files /dev/null and b/images/devices/geiger_grafana_dashboard.png differ
diff --git a/images/devices/geiger_scope_following_pulses.png b/images/devices/geiger_scope_following_pulses.png
new file mode 100755
index 00000000..63fd5b5a
Binary files /dev/null and b/images/devices/geiger_scope_following_pulses.png differ
diff --git a/images/devices/geiger_scope_single_pulse.png b/images/devices/geiger_scope_single_pulse.png
new file mode 100755
index 00000000..d5d38782
Binary files /dev/null and b/images/devices/geiger_scope_single_pulse.png differ
diff --git a/images/devices/geiger_wiring_diagram.png b/images/devices/geiger_wiring_diagram.png
new file mode 100644
index 00000000..730a0845
Binary files /dev/null and b/images/devices/geiger_wiring_diagram.png differ
diff --git a/images/devices/generic-dht11-10.jpg b/images/devices/generic-dht11-10.jpg
new file mode 100644
index 00000000..65cf8e9a
Binary files /dev/null and b/images/devices/generic-dht11-10.jpg differ
diff --git a/images/devices/generic-ds18b20-10.jpg b/images/devices/generic-ds18b20-10.jpg
new file mode 100644
index 00000000..16f94d7b
Binary files /dev/null and b/images/devices/generic-ds18b20-10.jpg differ
diff --git a/images/devices/generic-relay-40.jpg b/images/devices/generic-relay-40.jpg
new file mode 100644
index 00000000..62a9144d
Binary files /dev/null and b/images/devices/generic-relay-40.jpg differ
diff --git a/images/devices/generic-rgbled-10.jpg b/images/devices/generic-rgbled-10.jpg
new file mode 100644
index 00000000..24e8ad65
Binary files /dev/null and b/images/devices/generic-rgbled-10.jpg differ
diff --git a/images/devices/heltec-touch-relay.jpg b/images/devices/heltec-touch-relay.jpg
new file mode 100644
index 00000000..883e689f
Binary files /dev/null and b/images/devices/heltec-touch-relay.jpg differ
diff --git a/images/devices/ike-espike.jpg b/images/devices/ike-espike.jpg
new file mode 100644
index 00000000..dbe7a577
Binary files /dev/null and b/images/devices/ike-espike.jpg differ
diff --git a/images/devices/itead-sonoff-basic-2.jpg b/images/devices/itead-sonoff-basic-2.jpg
deleted file mode 100644
index 8a3a731b..00000000
Binary files a/images/devices/itead-sonoff-basic-2.jpg and /dev/null differ
diff --git a/images/devices/maxcio-15a.jpg b/images/devices/maxcio-15a.jpg
deleted file mode 100644
index a7974a55..00000000
Binary files a/images/devices/maxcio-15a.jpg and /dev/null differ
diff --git a/images/devices/tonbux-mosquito-killer.jpg b/images/devices/tonbux-mosquito-killer.jpg
new file mode 100644
index 00000000..dfed5f3c
Binary files /dev/null and b/images/devices/tonbux-mosquito-killer.jpg differ
diff --git a/images/devices/yidian-16a.jpg b/images/devices/yidian-16a.jpg
deleted file mode 100644
index 1f36b69c..00000000
Binary files a/images/devices/yidian-16a.jpg and /dev/null differ
diff --git a/images/devices/yjzk-2gang-switch.jpg b/images/devices/yjzk-2gang-switch.jpg
new file mode 100644
index 00000000..81696468
Binary files /dev/null and b/images/devices/yjzk-2gang-switch.jpg differ
diff --git a/pre-commit b/pre-commit
index 90640b70..acc37a69 100755
--- a/pre-commit
+++ b/pre-commit
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
"""
Referencing current branch in github README.md [1]
@@ -17,61 +17,107 @@ Copy this file to .git/hooks/
import os
import sys
import re
-import subprocess
-
-BASE = os.path.dirname(os.path.realpath(__file__)) + "/../../"
-README = BASE + "README.md"
-remote = subprocess.check_output(["git", "remote", "-v"]).strip().split('\n')[0]
-parts = re.split('[/\.: ]', remote)
-REPO = parts[ len(parts) - 3]
-USER = parts[ len(parts) - 4]
-BRANCH = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).strip()
-
-def getVersion():
- file_name = BASE + "code/espurna/config/version.h"
- lines = open(file_name).readlines()
- for line in lines:
- if "APP_VERSION" in line:
- parts = line.split('"')
- return parts[1]
- return "unknown"
-VERSION = getVersion()
-
-version = "[](CHANGELOG.md)\n".format(
- VERSION = VERSION
-)
-
-branch = "\n".format(
- BRANCH = BRANCH
-)
-
-travis = "[]" \
- "(https://travis-ci.org/{USER}/{REPO})\n".format(
- USER = USER,
- REPO = REPO,
- BRANCH = BRANCH
-)
-
-codacy = "[]" \
- "(https://www.codacy.com/app/{USER}/{REPO}/dashboard)\n".format(
- HASH = "c9496e25cf07434cba786b462cb15f49",
- USER = USER,
- REPO = REPO,
- BRANCH = BRANCH
-)
-
-lines = open(README).readlines()
-with open(README, "w") as fh:
- for line in lines:
- if "![travis]" in line:
- fh.write(travis)
- elif "![version]" in line:
- fh.write(version)
- elif "![branch]" in line:
- fh.write(branch)
- elif "![codacy]" in line:
- fh.write(codacy)
- else:
- fh.write(line)
-
-subprocess.check_output(["git", "add", README ])
+
+from subprocess import call, check_output
+try:
+ from urllib.parse import urlparse
+except ImportError:
+ from urlparse import urlparse
+
+from fileinput import FileInput
+# https://github.com/python/cpython/commit/6cb7b659#diff-78790b53ff259619377058acd4f74672
+if sys.version_info[0] < 3:
+ class FileInputCtx(FileInput):
+ def __enter__(self):
+ return self
+
+ def __exit__(self, type, value, traceback):
+ self.close()
+
+ FileInput = FileInputCtx
+
+
+def run(cmd, cwd=None):
+ out = check_output(cmd, cwd=cwd)
+ out = out.decode("latin1").strip()
+
+ return out
+
+
+def parse_h_string(define, r_quotes=re.compile("\"(.*)\"")):
+ string = r_quotes.search(define).group(1)
+ return string
+
+
+def git_parse_remote(cwd=None, remote="origin"):
+ remote_url = run([
+ "git", "config", "--local",
+ "--get", "remote.{}.url".format(remote)], cwd)
+
+ if remote_url.startswith("git"):
+ _, _, repo = remote_url.partition(":")
+ path = repo.replace(".git", "")
+ elif remote_url.startswith("https"):
+ parsed = urlparse(remote_url)
+ path = parsed.path[1:]
+ return path.split("/")
+
+
+def git_branch(cwd=None):
+ return run(["git", "rev-parse", "--abbrev-ref", "HEAD"], cwd)
+
+
+def espurna_get_version(base, version_h="code/espurna/config/version.h"):
+ version = "unknown"
+
+ path = os.path.join(base, version_h)
+ with open(path, "r") as version_f:
+ for line in version_f:
+ if line.startswith("#define") and "APP_VERSION" in line:
+ version = parse_h_string(line)
+ break
+
+ return version
+
+TEMPLATES = {
+ "![travis]": "[]" \
+ "(https://travis-ci.org/{USER}/{REPO})\n",
+ "![version]": "[](CHANGELOG.md)\n",
+ "![branch]": "[]" \
+ "(https://github.org/{USER}/{REPO}/tree/{BRANCH}/)\n",
+ "![codacy]": "[]" \
+ "(https://www.codacy.com/app/{USER}/{REPO}/dashboard)\n"
+}
+
+README = "README.md"
+
+
+if __name__ == "__main__":
+ base = os.getcwd()
+
+ user, repo = git_parse_remote()
+ fmt = {
+ "USER": user,
+ "REPO": repo,
+ "BRANCH": git_branch(),
+ "VERSION": espurna_get_version(base)
+ }
+ templates = [
+ (k, tmpl.format(**fmt))
+ for k, tmpl in TEMPLATES.items()
+ ]
+
+ def fmt_line(line):
+ for match, tmpl in templates:
+ if match in line:
+ return tmpl
+
+ return line
+
+ path = os.path.join(base, README)
+
+ with FileInput(path, inplace=True) as readme:
+ for line in readme:
+ sys.stdout.write(fmt_line(line))
+
+ sys.exit(call(["git", "add", README]))