Merge branch 'master' into develop

kaulketh · Mar 17, 2019 · e60a285 · e60a285
2 parents da83c26 + 81c455b
commit e60a285
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 1 deletion.
diff --git a/hardware/HARDWARE.md b/hardware/HARDWARE.md
@@ -51,4 +51,3 @@ Please refer other [images](./images) also!
 ![./images/20190202_154306.jpg](./images/20190202_154306.jpg)
 
 
-
diff --git a/hardware/datasheets/1411605_a.pdf b/hardware/datasheets/1411605_a.pdf
diff --git a/hardware/datasheets/Datenblatt_787-1226_.pdf b/hardware/datasheets/Datenblatt_787-1226_.pdf
diff --git a/hardware/datasheets/plugs 1404641 deutsch.pdf b/hardware/datasheets/plugs 1404641 deutsch.pdf
diff --git a/hardware/datasheets/plugs 1404641 english.pdf b/hardware/datasheets/plugs 1404641 english.pdf
diff --git a/hardware/datasheets/power supply WAGO_787-1226_ english.pdf b/hardware/datasheets/power supply WAGO_787-1226_ english.pdf
diff --git a/hardware/datasheets/power supply WAGO_787-1226_deutsch.pdf b/hardware/datasheets/power supply WAGO_787-1226_deutsch.pdf
diff --git a/hardware/datasheets/sockets 1411605 deutsch.pdf b/hardware/datasheets/sockets 1411605 deutsch.pdf
diff --git a/hardware/datasheets/sockets 1411605 english.pdf b/hardware/datasheets/sockets 1411605 english.pdf
diff --git a/hardware/gpio/pin_assignment.info b/hardware/gpio/pin_assignment.info
@@ -0,0 +1,27 @@
+# pin assignment
+# +-----+-----+---------+----------+---Pi 3---+----------+---------+-----+-----+
+# | BCM | wPi |   Name  | ASSIGNED | Physical | ASSIGNED | Name    | wPi | BCM |
+# +-----+-----+---------+----------+----++----+----------+---------+-----+-----+
+# |     |     |    3.3v | DHT22/FAN|  1 || 2  |OLED      | 5v      |     |     |
+# |   2 |   8 |   SDA.1 |  OLED SDA|  3 || 4  |RELAIS MOD| 5v      |     |     |
+# |   3 |   9 |   SCL.1 |  OLED SCL|  5 || 6  |RELAIS MOD| 0v      |     |     |
+# |   4 |   7 | GPIO. 7 | DHT22 OUT|  7 || 8  |LED POWER | TxD     | 15  | 14  |
+# |     |     |      0v |      OLED|  9 || 10 |LED PIACT | RxD     | 16  | 15  |
+# |  17 |   0 | GPIO. 0 |          | 11 || 12 |FAN TR B  | GPIO. 1 | 1   | 18  |
+# |  27 |   2 | GPIO. 2 |          | 13 || 14 |FAN TR E  | 0v      |     |     |
+# |  22 |   3 | GPIO. 3 |          | 15 || 16 |LED HDDACT| GPIO. 4 | 4   | 23  |
+# |     |     |    3.3v |     4-DIG| 17 || 18 |LED NETACT| GPIO. 5 | 5   | 24  |
+# |  10 |  12 |    MOSI |          | 19 || 20 |          | 0v      |     |     |
+# |   9 |  13 |    MISO |          | 21 || 22 |4-DIG DIO | GPIO. 6 | 6   | 25  |
+# |  11 |  14 |    SCLK |          | 23 || 24 |          | CE0     | 10  | 8   |
+# |     |     |      0v |     4-DIG| 25 || 26 |          | CE1     | 11  | 7   |
+# |   0 |  30 |   SDA.0 |          | 27 || 28 |          | SCL.0   | 31  | 1   |
+# |   5 |  21 | GPIO.21 | RELAIS_01| 29 || 30 |          | 0v      |     |     |
+# |   6 |  22 | GPIO.22 | RELAIS_02| 31 || 32 |4-DIG CLK | GPIO.26 | 26  | 12  |
+# |  13 |  23 | GPIO.23 | RELAIS_03| 33 || 34 |LED GROUND| 0v      |     |     |
+# |  19 |  24 | GPIO.24 | RELAIS_04| 35 || 36 |RELAIS_06 | GPIO.27 | 27  | 16  |
+# |  26 |  25 | GPIO.25 | RELAIS_05| 37 || 38 |RELAIS_07 | GPIO.28 | 28  | 20  |
+# |     |     |      0v |     DHT22| 39 || 40 |RELAIS_08 | GPIO.29 | 29  | 21  |
+# +-----+-----+---------+----------+----++----+----------+---------+-----+-----+
+# | BCM | wPi |   Name  | ASSIGNED | Physical | ASSIGNED | Name    | wPi | BCM |
+# +-----+-----+---------+----------+---Pi 3---+----------+---------+-----+-----+