refresh the display with new data

cmd/rpi/main.go

@@ -1,11 +1,21 @@
 package main
 
 import (
+	"context"
+	"fmt"
+	"image/color"
 	"log"
+	"time"
 
 	"git.dvdt.dev/david/bitcoin-ticker-pi/display"
 	"git.dvdt.dev/david/bitcoin-ticker-pi/fonts"
 	rgbmatrix "git.dvdt.dev/david/bitcoin-ticker-pi/go-rpi-rgb-led-matrix"
+	"git.dvdt.dev/david/bitcoin-ticker-pi/mempool"
+)
+
+const (
+	RefreshRateHz = 60
+	MempoolURL    = "wss://mempool.dvdt.dev/v1/api/ws"
 )
 
 func main() {
@@ -23,78 +33,68 @@ func main() {
 		display.NewSlot(12, 5, 4, 7, 27),
 		display.NewSlot(8, 5, 4, 28, 27),
 	)
-	err := d.UpdateTopLeft([]display.Segment{
+
-		{Text: "dollar", Color: fonts.Green},
+	ctx, cancel := context.WithCancel(context.Background())
-		{Text: "4", Color: fonts.White},
+	ticker := time.NewTicker(time.Second / RefreshRateHz)
-		{Text: "2", Color: fonts.White},
+	tdone := make(chan struct{})
-		{Text: "0", Color: fonts.White},
+	mdone := make(chan struct{})
-		{Text: "0", Color: fonts.White},
+	blocks := make(chan mempool.Block)
-		{Text: "0", Color: fonts.White},
+	errs := make(chan error)
-	})
+
+	mp := mempool.New(MempoolURL)
+	err := mp.Init()
 	if err != nil {
-		log.Println(err)
+		log.Fatal(err)
 	}
 
-	err = d.UpdateTopRight([]display.Segment{
+	go func(done chan struct{}, t *time.Ticker) {
-		{Text: "satoshi", Color: fonts.Orange},
+		for {
-		{Text: "2", Color: fonts.White},
+			select {
-		{Text: ".", Color: fonts.White},
+			case <-done:
-		{Text: "5", Color: fonts.White},
+				return
-		{Text: "K", Color: fonts.White},
+			case <-ticker.C:
-	})
+				updateSlots(d, 44000, 821000, 100, 200, 300)
-	if err != nil {
-		log.Println(err)
 			}
-
-	err = d.UpdateCenter([]display.Segment{
-		{Text: "height", Color: fonts.Blue},
-		{Text: "8", Color: fonts.White},
-		{Text: "2", Color: fonts.White},
-		{Text: "1", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-	})
-	if err != nil {
-		log.Println(err)
 		}
+	}(tdone, ticker)
+}
 
-	err = d.UpdateBottomLeft([]display.Segment{
+func updateSlots(d *display.Display, price, height, lfee, mfee, hfee int) error {
-		{Text: "low", Color: fonts.Green},
+	priceStr := fmt.Sprintf("%d", price)
-		{Text: "1", Color: fonts.White},
+	var priceSegments []display.Segment
-		{Text: "0", Color: fonts.White},
+	priceSegments = append(priceSegments, strToDisplaySegments("dollar", fonts.Green)...)
-		{Text: "0", Color: fonts.White},
+	priceSegments = append(priceSegments, strToDisplaySegments(fmt.Sprintf("%d", price), fonts.White)...)
-		{Text: "medium", Color: fonts.Orange},
+
-		{Text: "2", Color: fonts.White},
+	err := d.UpdateTopLeft(priceSegments)
-		{Text: "0", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-		{Text: "high", Color: fonts.Red},
-		{Text: "3", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-	})
 	if err != nil {
-		log.Println(err)
+		return err
 	}
+
+	var moscowTimeSegments []display.Segment
+	moscowTimeSegments = append(moscowTimeSegments, strToDisplaySegments("satoshi", fonts.Orange)...)
+	moscowTimeSegments = append(moscowTimeSegments, strToDisplaySegments(fmt.Sprintf("%d", 100000000/price), fonts.White)...)
 
-	err = d.UpdateBottomRight([]display.Segment{
+	err = d.UpdateTopRight(moscowTimeSegments)
-		{Text: "1", Color: fonts.White},
-		{Text: "2", Color: fonts.White},
-		{Text: ":", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-		{Text: ":", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-		{Text: "0", Color: fonts.White},
-	})
 	if err != nil {
-		log.Println(err)
+		return err
 	}
+
+	var heightSegments []display.Segment
+	heightSegments = append(heightSegments, strToDisplaySegments("height", fonts.Blue)...)
+	heightSegments = append(heightSegments, strToDisplaySegments(fmt.Sprintf("%d", height), fonts.White)...)
 
-	err = d.Render()
+	err = d.UpdateCenter(heightSegments)
 	if err != nil {
-		log.Println(err)
+		return err
 	}
 
-	select {}
+	return nil
+}
+
+func strToDisplaySegments(s string, c color.Color) []display.Segment {
+	var segs []display.Segment
+	for _, r := range s {
+		segs = append(segs, display.Segment{Text: string(r), Color: c})
+	}
+	return segs
 }

display/display.go

@@ -4,13 +4,13 @@ import (
 	rgbmatrix "git.dvdt.dev/david/bitcoin-ticker-pi/go-rpi-rgb-led-matrix"
 )
 
-type display struct {
+type Display struct {
 	canvas *rgbmatrix.Canvas
 
 	tl, tr, c, bl, br *Slot
 }
 
-func New(canvas *rgbmatrix.Canvas, tl, tr, c, bl, br *Slot) *display {
+func New(canvas *rgbmatrix.Canvas, tl, tr, c, bl, br *Slot) *Display {
 	return &display{
 		canvas: canvas,
 		tl:     tl,
@@ -21,7 +21,7 @@ func New(canvas *rgbmatrix.Canvas, tl, tr, c, bl, br *Slot) *display {
 	}
 }
 
-func (d *display) UpdateTopLeft(text []Segment) error {
+func (d *Display) UpdateTopLeft(text []Segment) error {
 	err := d.tl.Update(text)
 	if err != nil {
 		return err
@@ -30,7 +30,7 @@ func (d *display) UpdateTopLeft(text []Segment) error {
 	return nil
 }
 
-func (d *display) UpdateTopRight(text []Segment) error {
+func (d *Display) UpdateTopRight(text []Segment) error {
 	err := d.tr.Update(text)
 	if err != nil {
 		return err
@@ -39,7 +39,7 @@ func (d *display) UpdateTopRight(text []Segment) error {
 	return nil
 }
 
-func (d *display) UpdateCenter(text []Segment) error {
+func (d *Display) UpdateCenter(text []Segment) error {
 	err := d.c.Update(text)
 	if err != nil {
 		return err
@@ -48,7 +48,7 @@ func (d *display) UpdateCenter(text []Segment) error {
 	return nil
 }
 
-func (d *display) UpdateBottomLeft(text []Segment) error {
+func (d *Display) UpdateBottomLeft(text []Segment) error {
 	err := d.bl.Update(text)
 	if err != nil {
 		return err
@@ -57,7 +57,7 @@ func (d *display) UpdateBottomLeft(text []Segment) error {
 	return nil
 }
 
-func (d *display) UpdateBottomRight(text []Segment) error {
+func (d *Display) UpdateBottomRight(text []Segment) error {
 	err := d.br.Update(text)
 	if err != nil {
 		return err
@@ -66,6 +66,6 @@ func (d *display) UpdateBottomRight(text []Segment) error {
 	return nil
 }
 
-func (d *display) Render() error {
+func (d *Display) Render() error {
 	return d.canvas.Render()
 }

fonts/13x8.go

@@ -140,7 +140,7 @@ var (
 		"0": {
 			{0, 1, 1, 1, 1, 1, 0, 0},
 			{1, 1, 1, 1, 1, 1, 1, 0},
-			{1, 1, 0, 0, 0, 1, 1, 0},
+			{1, 1, 0, 0, 1, 1, 1, 0},
 			{1, 1, 0, 1, 1, 1, 1, 0},
 			{1, 1, 1, 1, 0, 1, 1, 0},
 			{1, 1, 1, 0, 0, 1, 1, 0},