aboutsummaryrefslogtreecommitdiff
path: root/assignments
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2018-06-13 20:41:24 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2018-06-13 20:41:24 +0200
commita4cbbee0671ff20560c31a2f3945b6131496ab2b (patch)
tree7b3a7d80db0eb3377d87bb812a3cc233f7f0cd4d /assignments
parente4bdeee49319bc5570dfa0e998e4e68f3c33ee8c (diff)
downloadiot-workshop-ndc-2018-a4cbbee0671ff20560c31a2f3945b6131496ab2b.tar.gz
iot-workshop-ndc-2018-a4cbbee0671ff20560c31a2f3945b6131496ab2b.tar.bz2
iot-workshop-ndc-2018-a4cbbee0671ff20560c31a2f3945b6131496ab2b.tar.xz
iot-workshop-ndc-2018-a4cbbee0671ff20560c31a2f3945b6131496ab2b.zip
wip
Diffstat (limited to 'assignments')
-rw-r--r--assignments/Makefile6
-rw-r--r--assignments/mqtt-with-button/mqtt-with-button.md (renamed from assignments/mqtt/mqtt.md)30
-rw-r--r--assignments/mqtt-with-button/mqtt-with-button.pdfbin0 -> 857368 bytes
-rw-r--r--assignments/mqtt-with-button/schematic/mqtt-with-button.fzzbin0 -> 24221 bytes
-rw-r--r--assignments/mqtt-with-button/schematic/mqtt-with-button_bb.pdfbin0 -> 449304 bytes
-rw-r--r--assignments/mqtt-with-button/schematic/mqtt-with-button_schem.pdfbin0 -> 305478 bytes
-rw-r--r--assignments/mqtt/mqtt.pdfbin104784 -> 0 bytes
-rw-r--r--assignments/old/client1/client1.ino (renamed from assignments/client1/client1.ino)0
-rw-r--r--assignments/old/mqtt2/mqtt2.md (renamed from assignments/mqtt2/mqtt2.md)0
-rw-r--r--assignments/old/mqtt2/mqtt2.pdf (renamed from assignments/mqtt2/mqtt2.pdf)bin51245 -> 51245 bytes
-rw-r--r--assignments/old/mqtt3/mqtt3.md (renamed from assignments/mqtt3/mqtt3.md)0
-rw-r--r--assignments/old/mqtt3/mqtt3.pdf (renamed from assignments/mqtt3/mqtt3.pdf)bin53509 -> 53509 bytes
-rw-r--r--assignments/old/network/network.md (renamed from assignments/network/network.md)0
-rw-r--r--assignments/old/read-temperature/read-temperature.md (renamed from assignments/read-temperature/read-temperature.md)0
-rw-r--r--assignments/old/read-temperature/read-temperature.pdf (renamed from assignments/read-temperature/read-temperature.pdf)bin794796 -> 794796 bytes
-rw-r--r--assignments/old/read-temperature/schematic/read-temperature.fzz (renamed from assignments/read-temperature/schematic/read-temperature.fzz)bin23036 -> 23036 bytes
-rw-r--r--assignments/old/read-temperature/schematic/read-temperature_bb.pdf (renamed from assignments/read-temperature/schematic/read-temperature_bb.pdf)bin392490 -> 392490 bytes
-rw-r--r--assignments/old/read-temperature/schematic/read-temperature_schem.pdf (renamed from assignments/read-temperature/schematic/read-temperature_schem.pdf)bin354997 -> 354997 bytes
-rw-r--r--assignments/old/read-temperature/solution/read-temperature/read-temperature.ino (renamed from assignments/read-temperature/solution/read-temperature/read-temperature.ino)0
19 files changed, 24 insertions, 12 deletions
diff --git a/assignments/Makefile b/assignments/Makefile
index e1ec335..52ee5c5 100644
--- a/assignments/Makefile
+++ b/assignments/Makefile
@@ -1,10 +1,6 @@
AS =
AS += blink-a-led
-AS += mqtt
-AS += mqtt2
-AS += mqtt3
-AS += read-a-button
-AS += read-temperature
+AS += mqtt-with-button
PDFS=$(foreach A,$(AS),$(A)/$(A).pdf)
diff --git a/assignments/mqtt/mqtt.md b/assignments/mqtt-with-button/mqtt-with-button.md
index f52eed3..6b8872b 100644
--- a/assignments/mqtt/mqtt.md
+++ b/assignments/mqtt-with-button/mqtt-with-button.md
@@ -1,16 +1,32 @@
-# Assignment: MQTT
+# Assignment: MQTT with button
-## Goal
+## Goals
-Get aquainted with MQTT.
+* Get aquainted with MQTT.
+* Publish a message when a button is pressed.
-## Steps
+## Step 1
-1. Connect to the Wi-Fi network
+Wire up this schematic on the bread board:
+
+![](schematic/mqtt-with-button_schem.pdf)
+
+![](schematic/mqtt-with-button_bb.pdf)
+
+# Step 2
+
+* Read button, print message on terminal
+
+# Step 3
+
+* Connect to the Wi-Fi network
* Use `WiFi.localIP()`
-1. Connect to MQTT broker
-1. Publish temperature
+* Connect to MQTT broker
+
+# Step 4
+
+* Publish a message on button press
## Tips
diff --git a/assignments/mqtt-with-button/mqtt-with-button.pdf b/assignments/mqtt-with-button/mqtt-with-button.pdf
new file mode 100644
index 0000000..ffb779e
--- /dev/null
+++ b/assignments/mqtt-with-button/mqtt-with-button.pdf
Binary files differ
diff --git a/assignments/mqtt-with-button/schematic/mqtt-with-button.fzz b/assignments/mqtt-with-button/schematic/mqtt-with-button.fzz
new file mode 100644
index 0000000..57e5e5d
--- /dev/null
+++ b/assignments/mqtt-with-button/schematic/mqtt-with-button.fzz
Binary files differ
diff --git a/assignments/mqtt-with-button/schematic/mqtt-with-button_bb.pdf b/assignments/mqtt-with-button/schematic/mqtt-with-button_bb.pdf
new file mode 100644
index 0000000..aa0d283
--- /dev/null
+++ b/assignments/mqtt-with-button/schematic/mqtt-with-button_bb.pdf
Binary files differ
diff --git a/assignments/mqtt-with-button/schematic/mqtt-with-button_schem.pdf b/assignments/mqtt-with-button/schematic/mqtt-with-button_schem.pdf
new file mode 100644
index 0000000..3ce5de3
--- /dev/null
+++ b/assignments/mqtt-with-button/schematic/mqtt-with-button_schem.pdf
Binary files differ
diff --git a/assignments/mqtt/mqtt.pdf b/assignments/mqtt/mqtt.pdf
deleted file mode 100644
index 8d35bb7..0000000
--- a/assignments/mqtt/mqtt.pdf
+++ /dev/null
Binary files differ
diff --git a/assignments/client1/client1.ino b/assignments/old/client1/client1.ino
index 39eabfe..39eabfe 100644
--- a/assignments/client1/client1.ino
+++ b/assignments/old/client1/client1.ino
diff --git a/assignments/mqtt2/mqtt2.md b/assignments/old/mqtt2/mqtt2.md
index cfc623a..cfc623a 100644
--- a/assignments/mqtt2/mqtt2.md
+++ b/assignments/old/mqtt2/mqtt2.md
diff --git a/assignments/mqtt2/mqtt2.pdf b/assignments/old/mqtt2/mqtt2.pdf
index fdd47f6..fdd47f6 100644
--- a/assignments/mqtt2/mqtt2.pdf
+++ b/assignments/old/mqtt2/mqtt2.pdf
Binary files differ
diff --git a/assignments/mqtt3/mqtt3.md b/assignments/old/mqtt3/mqtt3.md
index 2994e9a..2994e9a 100644
--- a/assignments/mqtt3/mqtt3.md
+++ b/assignments/old/mqtt3/mqtt3.md
diff --git a/assignments/mqtt3/mqtt3.pdf b/assignments/old/mqtt3/mqtt3.pdf
index 179a73e..179a73e 100644
--- a/assignments/mqtt3/mqtt3.pdf
+++ b/assignments/old/mqtt3/mqtt3.pdf
Binary files differ
diff --git a/assignments/network/network.md b/assignments/old/network/network.md
index 8e49b24..8e49b24 100644
--- a/assignments/network/network.md
+++ b/assignments/old/network/network.md
diff --git a/assignments/read-temperature/read-temperature.md b/assignments/old/read-temperature/read-temperature.md
index 31a32a8..31a32a8 100644
--- a/assignments/read-temperature/read-temperature.md
+++ b/assignments/old/read-temperature/read-temperature.md
diff --git a/assignments/read-temperature/read-temperature.pdf b/assignments/old/read-temperature/read-temperature.pdf
index f1ec641..f1ec641 100644
--- a/assignments/read-temperature/read-temperature.pdf
+++ b/assignments/old/read-temperature/read-temperature.pdf
Binary files differ
diff --git a/assignments/read-temperature/schematic/read-temperature.fzz b/assignments/old/read-temperature/schematic/read-temperature.fzz
index 52a9fa0..52a9fa0 100644
--- a/assignments/read-temperature/schematic/read-temperature.fzz
+++ b/assignments/old/read-temperature/schematic/read-temperature.fzz
Binary files differ
diff --git a/assignments/read-temperature/schematic/read-temperature_bb.pdf b/assignments/old/read-temperature/schematic/read-temperature_bb.pdf
index 79cc8eb..79cc8eb 100644
--- a/assignments/read-temperature/schematic/read-temperature_bb.pdf
+++ b/assignments/old/read-temperature/schematic/read-temperature_bb.pdf
Binary files differ
diff --git a/assignments/read-temperature/schematic/read-temperature_schem.pdf b/assignments/old/read-temperature/schematic/read-temperature_schem.pdf
index d01ab4b..d01ab4b 100644
--- a/assignments/read-temperature/schematic/read-temperature_schem.pdf
+++ b/assignments/old/read-temperature/schematic/read-temperature_schem.pdf
Binary files differ
diff --git a/assignments/read-temperature/solution/read-temperature/read-temperature.ino b/assignments/old/read-temperature/solution/read-temperature/read-temperature.ino
index b261dc5..b261dc5 100644
--- a/assignments/read-temperature/solution/read-temperature/read-temperature.ino
+++ b/assignments/old/read-temperature/solution/read-temperature/read-temperature.ino