Merge branch 'experimental-pwm-bit' of github.com:hzeller/rpi-rgb-led…

…-matrix into experimental-pwm-bit

adapter/README.md

@@ -1,9 +1,6 @@
 PCB adapter for Raspberry Pi to Hub75 RGB Matrixes
 ==================================================
 
-**(Note: I am working on a change in the pinout to better accomodate various constraints.
-Please contact me if you intend to build and adapter, maybe it makes sense to wait a week).**
-
 Since hand-wiring can be a little tedious, here are some PCBs that help
 with the wiring when using the `rpi-rgb-led-matrix` code.
 

adapter/active-3/README.md

@@ -1,22 +1,23 @@
 Adapter PCB to support up to 3 panels
 ======================================
 
-   * Supports one panel for Raspberry PIs with 26 GPIO pins up to three
-     panel chains for newer plus models and Raspberry Pi 2 that have 40 GPIO pins.
+   * Supports up to three panel chains for newer plus models and
+     Raspberry Pi 2 that have 40 GPIO pins.
    * Uses HCT245 to level shift signals from 3.3V to 5V and shield
      the Raspberry Pi GPIOs from overloading.
    * Open source KiCAD PCB EDA format.
    * (not very pretty layout, was just lazy and let the auto-router do it).
 
-For multiple parallel boards to work, you have to uncomment
-
-     #DEFINES+=-DSUPPORT_MULTI_PARALLEL   # remove the '#' in the begging
-
-in [lib/Makefile](../../lib/Makefile).
-
+   * BOM:
+     - 4x HCT245 in 20-SOIC (7.5mm package)
+     - 4x 100nF ceramic capacitor
+     - 3x 16pin IDC (=2x8) male receptible to connect the panels.
+     - 1x 40pin female connector to connect to the RPi.
+     
 You can [buy the board from OSH Park][osh-active3].
 
 ![Preview][rendering]
 
 [rendering]: ../../img/active3-pcb.png
-[osh-active3]: https://oshpark.com/shared_projects/D2hXjnYT
+[osh-active3]: https://oshpark.com/shared_projects/fIYlJxnA
+

adapter/passive-3/README.md

@@ -0,0 +1,15 @@
+Adapter PCB to support up to 3 panels
+======================================
+
+   * Supports up to three panel chains for newer plus models and
+     Raspberry Pi 2 that have 40 GPIO pins.
+   * Open source KiCAD PCB EDA format.
+   * (not very pretty layout, was just lazy and let the auto-router do it).
+
+You can [buy the board from OSH Park][osh-passive3].
+
+![Preview][rendering]
+
+[rendering]: ../../img/passive3-pcb.png
+[osh-passive3]: https://oshpark.com/shared_projects/FNAtZUsP
+

adapter/passive-3/passive3-rpi-hub75-adapter-cache.lib

@@ -1,6 +1,7 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
+<<<<<<< HEAD
 # CONN_01X01
 #
 DEF CONN_01X01 P 0 40 Y N 1 F N
@@ -21,6 +22,8 @@ X P1 1 -200 0 150 R 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
+=======
+>>>>>>> d9ecea532afc911de3244f458589b6eadd051949
 # CONN_02X08
 #
 DEF CONN_02X08 P 0 1 Y N 1 F N
@@ -182,6 +185,22 @@ X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
+<<<<<<< HEAD
+=======
+# PWR_FLAG
+#
+DEF PWR_FLAG #FLG 0 0 N N 1 F P
+F0 "#FLG" 0 95 50 H I C CNN
+F1 "PWR_FLAG" 0 180 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+DRAW
+X pwr 1 0 0 0 U 20 20 0 0 w
+P 6 0 1 0  0 0  0 50  -75 100  0 150  75 100  0 50 N
+ENDDRAW
+ENDDEF
+#
+>>>>>>> d9ecea532afc911de3244f458589b6eadd051949
 # VCC
 #
 DEF VCC #PWR 0 0 Y Y 1 F P

adapter/passive-3/passive3-rpi-hub75-adapter.pro

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 update=Sun 14 Jun 2015 04:40:22 PM PDT
+=======
+update=Wed 17 Jun 2015 07:02:16 PM PDT
+>>>>>>> d9ecea532afc911de3244f458589b6eadd051949
 version=1
 last_client=kicad
 [cvpcb]