Update 'Dockerfile'

Reviewed-on: https://gitea.wagshome.duckdns.org/publicWagsHome/rgb-go-test/pulls/2

.devcontainer/devcontainer.json

@@ -8,7 +8,7 @@
 			// Update the VARIANT arg to pick a version of Go: 1, 1.18, 1.17
 			// Append -bullseye or -buster to pin to an OS version.
 			// Use -bullseye variants on local arm64/Apple Silicon.
-			"VARIANT": "1.18-bullseye",
+			"VARIANT": "1.21-bullseye",
 			// Options
 			"NODE_VERSION": "none"
 		}

.gitea/workflows/Build.yaml

@@ -0,0 +1,37 @@
+name: build only rgb-board
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on: 
+  push:
+    branches:
+      - "animate-separate"
+    paths-ignore:
+      - ".gitea/workflows/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: 
+      image: registry.local/catthehacker-home:act-latest
+      volumes:
+        - /var/run/user/1000/docker.sock:/var/run/docker.sock
+    steps:
+      - uses: actions/checkout@v3
+      - name: short-sha
+        id: short-sha
+        run: echo "short-sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:                  
+          driver-opts: |
+             image=registry.local/buildkit-wagnerca:stable-3-rootless
+             seccomp=unconfined
+             apparmor=unconfined
+             systempaths=unconfined
+             privileged=false                          
+      - run: docker buildx ls
+      - name: push rgbboard
+        uses: docker/build-push-action@master
+        with:
+          push: false
+          tags: registry.local/rgbboard:${{ steps.short-sha.outputs.short-sha }}
+          platforms: linux/arm64,linux/amd64

.gitea/workflows/build.yaml

@@ -0,0 +1,37 @@
+name: build rgb-board
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on: 
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - ".gitea/workflows/**"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: 
+      image: registry.local/catthehacker-home:act-latest
+      volumes:
+        - /var/run/user/1000/docker.sock:/var/run/docker.sock
+    steps:
+      - uses: actions/checkout@v3
+      - name: short-sha
+        id: short-sha
+        run: echo "short-sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:                  
+          driver-opts: |
+             image=registry.local/buildkit-wagnerca:stable-3-rootless
+             seccomp=unconfined
+             apparmor=unconfined
+             systempaths=unconfined
+             privileged=false
+      - run: docker buildx ls
+      - name: push rgbboard
+        uses: docker/build-push-action@master
+        with:
+          push: true
+          tags: registry.local/rgbboard:${{ steps.short-sha.outputs.short-sha }}
+          platforms: linux/arm64,linux/amd64

Dockerfile

@@ -1,20 +1,14 @@
-from registry.local/rgbarm64lib:latest as builder
-
-workdir /usr/src/app/rgb
+FROM registry.local/rgbarm64lib:latest as builder
+WORKDIR /usr/src/app/rgb
 COPY . .
+ENV GOPRIVATE=gitea.wagshome.duckdns.org
+ENV GONOSUMBDB=gitea.wagshome.duckdns.org
 RUN go mod tidy
-#RUN CGO_ENABLED=1 CC=musl-gcc go build --ldflags 'linkmode external -extldflags "-static"'
-RUN go build .
+RUN CGO_ENABLED=1  go build --ldflags '-linkmode external -extldflags=-static'
 RUN mkdir -p /usr/src/app/work/ 
 RUN cp /usr/src/app/rgb/rgb /usr/src/app/work/rgb
-RUN cp /usr/src/app/rgb/mario* /usr/src/app/work/
-
-#FROM alpine:latest
-
-#COPY --from=builder /usr/src/app/rgb/rgb /usr/src/app/work/
-
-
-
-
-
+FROM scratch
+COPY --from=builder /usr/src/app/rgb/rgb /usr/src/app/work/
+COPY --from=builder /usr/src/app/rgb/mari* /usr/src/app/work/
+WORKDIR /usr/src/app/work
 

Jenkinsfile

@@ -1,26 +0,0 @@
-pipeline {
-agent any
-stages {
-  /*stage('GitCheckOut') {
-	steps{
-	checkout([$class: 'GitSCM', branches: [[name: "${env.CHECKOUT}"]], extensions: [], userRemoteConfigs: [[credentialsId: 'gitea', url: "$GIT_URL"]]])
-	}
-
-}*/ 
- stage('buildPush') {
-	steps{
-	sh 'echo "ADASDASDSADSADASD"'
-	sh 'docker buildx rm jenkins-agent || echo "none there"'
-	sh '''#!/bin/bash 
-		docker buildx create --bootstrap --name=jenkins-agent --driver=kubernetes --driver-opt=namespace=jenkinsagent --driver-opt=qemu.install=true --driver-opt=\\"nodeselector=kubernetes.io/arch=amd64\\" --driver-opt=\\"image=registry.local/buildkit-wagnerca:stable-3-rootless\\"  --use
-	'''
-	sh 'docker buildx build . -t registry.local/rgbboard:v0.0.$BUILD_NUMBER --push --platform=linux/arm64,linux/amd64'
-	sh 'docker buildx rm jenkins-agent'
- }
-
-
-}
-
-}
-}
-

go.mod

@@ -3,21 +3,24 @@ module rgb
 go 1.18
 
 require (
-	gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix v0.0.0-20220709235716-bf87ebdb3e55
+	gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix v1.0.0
 	github.com/disintegration/imaging v1.6.2
+	github.com/eclipse/paho.mqtt.golang v1.4.2
 	github.com/fogleman/gg v1.3.0
 )
 
 require (
-	dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037 // indirect
-	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 // indirect
+	dmitri.shuralyov.com/gpu/mtl v0.0.0-20221208032759-85de2813cf6b // indirect
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
-	github.com/jezek/xgb v1.0.0 // indirect
-	golang.org/x/exp/shiny v0.0.0-20220713135740-79cabaa25d75 // indirect
-	golang.org/x/image v0.0.0-20220617043117-41969df76e82 // indirect
-	golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd // indirect
-	golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/jezek/xgb v1.1.0 // indirect
+	golang.org/x/exp/shiny v0.0.0-20231006140011-7918f672742d // indirect
+	golang.org/x/image v0.13.0 // indirect
+	golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe // indirect
+	golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
+	golang.org/x/sync v0.4.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 )
 
 //replace gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix v0.0.0-20220709235716-bf87ebdb3e55 => /usr/src/app

go.sum

@@ -1,63 +1,41 @@
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037 h1:+PdD6GLKejR9DizMAKT5DpSAkKswvZrurk1/eEt9+pw=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix v0.0.0-20220709235716-bf87ebdb3e55 h1:+sXEegWFQ+bO3c4+BvNkr/V2g+evYY4uXBmx9ns4mmk=
-gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix v0.0.0-20220709235716-bf87ebdb3e55/go.mod h1:DLjEFm7sw//9GNvWjdUU9Ey3anpN6XNSEm+Zgdfh70Q=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20221208032759-85de2813cf6b h1:a26Bdkl2B9PmYN6vGXnnfB2UGKjz0Moif1aEg+xTd7M=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20221208032759-85de2813cf6b/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix v1.0.0 h1:My2/dfuRCTf4T9k3TyyYGJFQ+9M7aOZyaecbxUVWhBk=
+gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix v1.0.0/go.mod h1:irNP534nYpVyP1wwMz2O903jJ2Ve6se7LAGi6A8JSnE=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
+github.com/eclipse/paho.mqtt.golang v1.4.2 h1:66wOzfUHSSI1zamx7jR6yMEI5EuHnT1G6rNA5PM12m4=
+github.com/eclipse/paho.mqtt.golang v1.4.2/go.mod h1:JGt0RsEwEX+Xa/agj90YJ9d9DH2b7upDZMK9HRbFvCA=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4 h1:WtGNWLvXpe6ZudgnXrq0barxBImvnnJoMEhXAzcbM0I=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/jezek/xgb v1.0.0 h1:s2rRzAV8KQRlpsYA7Uyxoidv1nodMF0m6dIG6FhhVLQ=
-github.com/jezek/xgb v1.0.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/jezek/xgb v1.1.0 h1:wnpxJzP1+rkbGclEkmwpVFQWpuE2PUGNUzP8SbfFobk=
+github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
-golang.org/x/exp/shiny v0.0.0-20220713135740-79cabaa25d75 h1:+tvDaVUVC7xUhwmi3B/tvmqManNx24wRIWsXvvnkb8Q=
-golang.org/x/exp/shiny v0.0.0-20220713135740-79cabaa25d75/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/exp/shiny v0.0.0-20231006140011-7918f672742d h1:grE48C8cjIY0aiHVmFyYgYxxSARQWBABLXKZfQPrBhY=
+golang.org/x/exp/shiny v0.0.0-20231006140011-7918f672742d/go.mod h1:UH99kUObWAZkDnWqppdQe5ZhPYESUw8I0zVV1uWBR+0=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20220617043117-41969df76e82 h1:KpZB5pUSBvrHltNEdK/tw0xlPeD13M6M6aGP32gKqiw=
-golang.org/x/image v0.0.0-20220617043117-41969df76e82/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd h1:x1GptNaTtxPAlTVIAJk61fuXg0y17h09DTxyb+VNC/k=
-golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg=
+golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
+golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe h1:lrXv4yHeD9FA8PSJATWowP1QvexpyAPWmPia+Kbzql8=
+golang.org/x/mobile v0.0.0-20231006135142-2b44d11868fe/go.mod h1:BrnXpEObnFxpaT75Jo9hsCazwOWcp7nVIa8NNuH5cuA=
+golang.org/x/net v0.0.0-20200425230154-ff2c4b7c35a0/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

main.go

@@ -1,22 +1,51 @@
 package main
 
 import (
+	"bytes"
+	b64 "encoding/base64"
+	"encoding/json"
 	"flag"
+	"fmt"
 	"image"
 	"image/color"
 	_ "image/jpeg"
 	"log"
 	"os"
+	"os/signal"
+	"syscall"
 	"time"
-
 	rgbmatrix "gitea.wagshome.duckdns.org/publicWagsHome/go-rpi-rgb-led-matrix"
 	"github.com/disintegration/imaging"
+	MQTT "github.com/eclipse/paho.mqtt.golang"
+	mqtt "github.com/eclipse/paho.mqtt.golang"
 	"github.com/fogleman/gg"
 )
 
+//  contents of struct mostly don't matter for toolkit.
+type incomingImage struct {
+	Image string `json:"image"`
+}
+
+type Animation struct {
+	ctx      *gg.Context
+	position image.Point
+	dir      image.Point
+	height   int
+	width    int
+	stroke   int
+	image    []image.Image
+	images   map[string]image.Image
+	updown   string
+	mqmsg    chan mqtt.Message
+	msg      string
+
+	countDown int
+}
+
+//flags from cmd line
 var (
-	rows                     = flag.Int("led-rows", 32, "number of rows supported")
-	cols                     = flag.Int("led-cols", 32, "number of columns supported")
+	rows                     = flag.Int("led-rows", 64, "number of rows supported")
+	cols                     = flag.Int("led-cols", 64, "number of columns supported")
 	parallel                 = flag.Int("led-parallel", 1, "number of daisy-chained panels")
 	chain                    = flag.Int("led-chain", 2, "number of displays daisy-chained")
 	brightness               = flag.Int("brightness", 100, "brightness (0-100)")
@@ -24,8 +53,163 @@ var (
 	show_refresh             = flag.Bool("led-show-refresh", false, "Show refresh rate.")
 	inverse_colors           = flag.Bool("led-inverse", false, "Switch if your matrix has inverse colors on.")
 	disable_hardware_pulsing = flag.Bool("led-no-hardware-pulse", false, "Don't use hardware pin-pulse generation.")
+	led_slowdown_gpio        = flag.Int("led-slowdown-gpio", 1, "GPIO pin slowdown")
 )
 
+//listens on topic for messages
+func listener(mqMessages chan mqtt.Message) {
+	opts := setupMQTT()
+	client := MQTT.NewClient(opts)
+	topic := "home/rgbboard"
+	if token := client.Connect(); token.Wait() && token.Error() != nil {
+		log.Println(fmt.Sprintf("failed to connect to mq: %s", token.Error().Error()))
+		panic(token.Error())
+	}
+	log.Println("connected")
+	client.Subscribe(topic, 0, func(client mqtt.Client, msg mqtt.Message) {
+		log.Println("Receiving ", string(msg.Payload()), " on topic: ", msg.Topic())
+		mqMessages <- msg
+	})
+}
+
+//animator is a wrapping function for go routine that can receive an mq channel
+func animator(tk *rgbmatrix.ToolKit, mqMessages chan mqtt.Message) {
+	//Playanimation comes from the toolkit, all it takes is an animation struct
+	tk.PlayAnimation(NewAnimation(image.Point{128, 64}, mqMessages))
+
+}
+
+//connection lost management
+func onConnectionLostHandler(c MQTT.Client, reason error) {
+	log.Fatalf(reason.Error())
+}
+
+//setup connection to mqtt, topic to listen to, qos
+func setupMQTT() *mqtt.ClientOptions {
+	opts := MQTT.NewClientOptions()
+	opts.AddBroker(fmt.Sprintf("tcp://%s:%s", os.Getenv("MQTTBROKER"), os.Getenv("MQTTPORT")))
+	opts.SetUsername(os.Getenv("MQTTUSER"))
+	opts.SetPassword(os.Getenv("MQTTPASSWORD"))
+	opts.SetClientID("rgbboard")
+	opts.SetAutoReconnect(true)
+	opts.SetConnectionLostHandler(onConnectionLostHandler)
+
+	return opts
+}
+
+//runs before main, parses flags
+func init() {
+	flag.Parse()
+}
+
+//small function for handling fatal errors
+func fatal(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
+//initializes the struct for the an play animation function, this could all be dumped into function that's wrapping go routine if I wanted
+func NewAnimation(sz image.Point, mqMessages chan mqtt.Message) *Animation {
+	imageMap := make(map[string]image.Image)
+	reader, err := os.Open("marioUp.png")
+	if err != nil {
+		log.Fatal(err)
+	}
+	rawMario, _, err := image.Decode(reader)
+
+	//marioUp := imaging.FlipH(imaging.Resize(rawMario, 16, 16, imaging.Lanczos))
+	marioUp := imaging.Resize(rawMario, 16, 16, imaging.Lanczos)
+	imageMap["marioUp"] = marioUp
+	reader, err = os.Open("marioDown.png")
+	if err != nil {
+		log.Fatal(err)
+	}
+	rawMario, _, err = image.Decode(reader)
+	//marioDown := imaging.FlipH(imaging.Resize(rawMario, 16, 16, imaging.Lanczos))
+	marioDown := imaging.Resize(rawMario, 16, 16, imaging.Lanczos)
+	imageMap["marioDown"] = marioDown
+	imageSlice := []image.Image{marioUp, marioDown}
+	return &Animation{
+		ctx:       gg.NewContext(sz.X, sz.Y),
+		dir:       image.Point{1, 1},
+		height:    8,
+		width:     8,
+		stroke:    8,
+		image:     imageSlice,
+		images:    imageMap,
+		updown:    "marioUp",
+		mqmsg:     mqMessages,
+		countDown: 5000,
+	}
+}
+
+func appendImage(img string, a *Animation) {
+	baseImage, _ := b64.StdEncoding.DecodeString(img)
+	bigImage, _, _ := image.Decode(bytes.NewReader(baseImage))
+	a.images["doorbell"] = imaging.Resize(bigImage, 64, 64, imaging.Lanczos)
+}
+
+// what happens each frame, at an interval of 50 milliseconds
+func (a *Animation) Next() (image.Image, <-chan time.Time, error) {
+	incoming := incomingImage{}
+	a.animateMario()
+	if a.images["doorbell"] != nil {
+		if a.countDown > 0 {
+			a.ctx.DrawImageAnchored(a.image[2], 0, 0, 0, 0)
+			a.countDown -= 50
+		} else {
+			//a.image = a.image[:len(a.image)-1]
+			delete(a.images, "doorbell")
+			a.countDown = 5000
+		}
+	}
+	a.ctx.SetColor(color.White)
+	select {
+	case msg := <-a.mqmsg:
+		json.Unmarshal([]byte(string(msg.Payload())), &incoming)
+		if incoming.Image == "" {
+			a.msg = string(msg.Payload())
+			a.ctx.DrawString(a.msg, 5, 9)
+		} else {
+			go appendImage(incoming.Image, a)
+		}
+	default:
+	}
+	return a.ctx.Image(), time.After(time.Millisecond * 50), nil
+}
+
+func (a *Animation) animateMario() {
+	defer a.updateMarioPosition()
+	a.ctx.SetColor(color.Black)
+	a.ctx.Clear()
+	if a.dir.X == 1 {
+		a.ctx.DrawImageAnchored(a.images[a.updown], a.position.X, a.position.Y, 0.5, 0.5)
+	} else {
+		a.ctx.DrawImageAnchored(imaging.FlipH(a.images[a.updown]), a.position.X, a.position.Y, 0.5, 0.5)
+	}
+}
+
+//what mario does every frame
+func (a *Animation) updateMarioPosition() {
+	a.position.X += 1 * a.dir.X
+	a.position.Y += 1 * a.dir.Y
+
+	if a.position.Y+a.height > a.ctx.Height() {
+		a.dir.Y = -1
+		a.updown = "marioUp"
+	} else if a.position.Y-a.height < 0 {
+		a.updown = "marioDown"
+		a.dir.Y = 1
+	}
+
+	if a.position.X+a.width > a.ctx.Width() {
+		a.dir.X = -1
+	} else if a.position.X-a.width < 0 {
+		a.dir.X = 1
+	}
+}
+
 func main() {
 	config := &rgbmatrix.DefaultConfig
 	config.Rows = *rows
@@ -37,111 +221,30 @@ func main() {
 	config.ShowRefreshRate = *show_refresh
 	config.InverseColors = *inverse_colors
 	config.DisableHardwarePulsing = *disable_hardware_pulsing
+	var rt rgbmatrix.RunTimeConfig
+	rt.Gpio_slowdown = *led_slowdown_gpio
+	setupMQTT()
 
-	/*bounds := mario.Bounds()
-	var histogram [16][4]int
-	for y := bounds.Min.Y; y < bounds.Max.Y; y++ {
-		for x := bounds.Min.X; x < bounds.Max.X; x++ {
-			r, g, b, a := mario.At(x, y).RGBA()
-			// A color's RGBA method returns values in the range [0, 65535].
-			// Shifting by 12 reduces this to the range [0, 15].
-			histogram[r>>12][0]++
-			histogram[g>>12][1]++
-			histogram[b>>12][2]++
-			histogram[a>>12][3]++
-		}
-	}*/
-	m, err := rgbmatrix.NewRGBLedMatrix(config)
+	m, err := rgbmatrix.NewRGBLedMatrix(config, &rt)
 	fatal(err)
-
+	mqMessages := make(chan mqtt.Message)
+	log.Println("making listener")
+	go listener(mqMessages)
 	tk := rgbmatrix.NewToolKit(m)
 	defer tk.Close()
-
-	tk.PlayAnimation(NewAnimation(image.Point{64, 32}))
-}
-
-func init() {
-	flag.Parse()
-}
-
-func fatal(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
-type Animation struct {
-	ctx      *gg.Context
-	position image.Point
-	dir      image.Point
-	height   int
-	width    int
-	stroke   int
-	image    []image.Image
-	updown   int
-}
-
-func NewAnimation(sz image.Point) *Animation {
-	reader, err := os.Open("marioUp.png")
-	if err != nil {
-		log.Fatal(err)
-	}
-	rawMario, _, err := image.Decode(reader)
-
-	//marioUp := imaging.FlipH(imaging.Resize(rawMario, 16, 16, imaging.Lanczos))
-	marioUp := imaging.Resize(rawMario, 16, 16, imaging.Lanczos)
-
-	reader, err = os.Open("marioDown.png")
-	if err != nil {
-		log.Fatal(err)
-	}
-	rawMario, _, err = image.Decode(reader)
-	//marioDown := imaging.FlipH(imaging.Resize(rawMario, 16, 16, imaging.Lanczos))
-	marioDown := imaging.Resize(rawMario, 16, 16, imaging.Lanczos)
-	images := []image.Image{marioUp, marioDown}
-	return &Animation{
-		ctx:    gg.NewContext(sz.X, sz.Y),
-		dir:    image.Point{1, 1},
-		height: 8,
-		width:  8,
-		stroke: 8,
-		image:  images,
-		updown: 0,
-	}
-}
-
-func (a *Animation) Next() (image.Image, <-chan time.Time, error) {
-	defer a.updatePosition()
-	a.ctx.SetColor(color.Black)
-	a.ctx.Clear()
-	//a.ctx.SetColor(color.RGBA{0, 255, 0, 255})
-	//a.ctx.DrawCircle(float64(8), float64(8), float64(a.stroke))
-	//a.ctx.Fill()
-	if a.dir.X == 1 {
-		a.ctx.DrawImageAnchored(a.image[a.updown], a.position.X, a.position.Y, 0.5, 0.5)
-	} else {
-		a.ctx.DrawImageAnchored(imaging.FlipH(a.image[a.updown]), a.position.X, a.position.Y, 0.5, 0.5)
-	}
-	a.ctx.SetColor(color.White)
-	a.ctx.DrawString("mario", 5, 9)
-	return a.ctx.Image(), time.After(time.Millisecond * 50), nil
-}
-
-func (a *Animation) updatePosition() {
-	a.position.X += 1 * a.dir.X
-	a.position.Y += 1 * a.dir.Y
-
-	if a.position.Y+a.height > a.ctx.Height() {
-		a.dir.Y = -1
-		a.updown = 0
-	} else if a.position.Y-a.height < 0 {
-		a.updown = 1
-		a.dir.Y = 1
-	}
-
-	if a.position.X+a.width > a.ctx.Width() {
-		a.dir.X = -1
-	} else if a.position.X-a.width < 0 {
-		a.dir.X = 1
-	}
+	log.Println("making animator")
+	go animator(tk, mqMessages)
+	log.Println("I guess I'm at the end")
+	sigs := make(chan os.Signal, 1)
+	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+	done := make(chan bool, 1)
+	go func() {
+		sig := <-sigs
+		fmt.Println()
+		fmt.Println(sig)
+		done <- true
+	}()
+	fmt.Println("awaiting signal")
+	<-done
+	fmt.Println("exiting")
 }