diff --git a/Dockerfile b/Dockerfile index fc5eee9..45b23aa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ RUN apk update && \ apk add --no-cache python py-paho-mqtt py-pillow libstdc++ make rsync g++ \ ttf-freefont ttf-opensans ttf-dejavu ttf-inconsolata ttf-ubuntu-font-family ttf-droid ttf-liberation ttf-linux-libertine \ graphicsmagick-dev zlib-dev freetype-dev mosquitto-dev python-dev json-c-dev python2-dev && \ - cd /root/rpi-rgb-led-matrix && \ + mkdir -p /home/pi/rpi-rgb-led-matrix + cd /home/pi/rpi-rgb-led-matrix && \ HARDWARE_DESC=adafruit-hat-pwm make && \ mkdir -p /usr/local/include/rgbmatrix && \ cp include/* /usr/local/include/rgbmatrix && \ diff --git a/MQTTpanel/config.json b/MQTTpanel/config.json index faf9fe3..1e386d3 100644 --- a/MQTTpanel/config.json +++ b/MQTTpanel/config.json @@ -4,9 +4,9 @@ "hardware_mapping":"adafruit-hat-pwm", "led_rgb_sequence":"RGB", "rows":64, - "cols":64, + "cols":128, "chain_length":1, - "parallel":1, + "parallel":2, "brightness":100, "scan_mode":1, "show_refresh_rate":0 @@ -14,12 +14,12 @@ "background": { "dir":"/usr/local/share/rgbmatrix/images", - "image":"Alien.gif", + "image":"Hei.jpg", "show":1 }, "time": { - "timezone":"Australia/Sydney", + "timezone":"Europe/Amsterdam", "format":"%H:%M", "dir":"/usr/local/share/rgbmatrix/fonts", "font":"DroidSans-14pt.bdf", @@ -30,7 +30,7 @@ }, "date": { - "timezone":"Australia/Sydney", + "timezone":"Europe/Amsterdam", "format":"%Y/%m/%d", "dir":"/usr/local/share/rgbmatrix/fonts", "font":"DroidSans-8pt.bdf", diff --git a/container.json b/container.json index 306cfb0..72c3932 100644 --- a/container.json +++ b/container.json @@ -1,5 +1,5 @@ { - "project": "mickmake", + "project": "timmah88", "name": "project-mqttpanel", "version": "0.10", "majorversion": "", diff --git a/create.sh b/create.sh index 50878c9..1af432a 100755 --- a/create.sh +++ b/create.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker create --name project-mqttpanel --restart unless-stopped -p 1883:1883 --device /dev/mem:/dev/mem --privileged --user root mickmake/project-mqttpanel:latest +docker create --name project-mqttpanel --restart unless-stopped -p 1883:1883 --device /dev/mem:/dev/mem --privileged --user root timmah88/project-mqttpanel:latest docker start project-mqttpanel diff --git a/files/usr/local/share/rgbmatrix/images/Hei.jpg b/files/usr/local/share/rgbmatrix/images/Hei.jpg new file mode 100644 index 0000000..e2c8e2b Binary files /dev/null and b/files/usr/local/share/rgbmatrix/images/Hei.jpg differ diff --git a/mosquitto_pub.sh b/mosquitto_pub.sh index 3627f9d..1d599a9 100755 --- a/mosquitto_pub.sh +++ b/mosquitto_pub.sh @@ -1,2 +1,2 @@ #!/bin/bash -exec docker run --rm -i -t mickmake/project-mqttpanel:latest /usr/bin/mosquitto_pub -d -h 172.17.0.1 "$@" +exec docker run --rm -i -t timmah88/project-mqttpanel:latest /usr/bin/mosquitto_pub -d -h 172.17.0.1 "$@" diff --git a/shell.sh b/shell.sh index c19795d..6503f99 100755 --- a/shell.sh +++ b/shell.sh @@ -1,2 +1,2 @@ #!/bin/bash -exec docker run --rm -i -t mickmake/project-mqttpanel:latest /bin/bash +exec docker run --rm -i -t timmah88/project-mqttpanel:latest /bin/bash