burning man 2022

cacktopus · Oct 11, 2022 · 993246c · 993246c
1 parent c2c4306
commit 993246c
Show file tree

Hide file tree

Showing 19 changed files with 275 additions and 49 deletions.
diff --git a/arm/Dockerfile.build-arm64 b/arm/Dockerfile.build-arm64
@@ -24,7 +24,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y wget dpkg-dev
 
 RUN arch=`dpkg-architecture -q DEB_BUILD_ARCH` && \
-    wget https://theheads.sfo2.digitaloceanspaces.com/builds/opencv_4.5.5-2_${arch}.deb
+    wget https://theheads.sfo2.digitaloceanspaces.com/shared/builds/arm64/opencv_4.5.5-2_${arch}.deb
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y ./opencv_4.5.5-2_*.deb
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y ffmpeg

diff --git a/arm/Dockerfile.build-armhf b/arm/Dockerfile.build-armhf
@@ -24,7 +24,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -y
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y wget dpkg-dev
 
 RUN arch=`dpkg-architecture -q DEB_BUILD_ARCH`; \
-    wget https://theheads.sfo2.digitaloceanspaces.com/builds/opencv_4.5.5-2_${arch}.deb
+    wget https://theheads.sfo2.digitaloceanspaces.com/shared/builds/armhf/opencv_4.5.5-2_${arch}.deb
 
 RUN echo '16a9489dde466c101e65cd0f91d664a83d496392e3b879ade607c2c038041666  opencv_4.5.5-2_armhf.deb' | shasum -c
 

diff --git a/boss/app/cfg.go b/boss/app/cfg.go
@@ -14,4 +14,7 @@ type Cfg struct {
 	DayDetector []string `envconfig:"default=time-based;7h30m;20h15m"`
 
 	Debug bool `envconfig:"optional"`
+
+	CheckInTime  time.Duration `envconfig:"default=500ms"`
+	FearfulCount int           `envconfig:"default=3"`
 }
diff --git a/boss/dj/dj.go b/boss/dj/dj.go
@@ -81,6 +81,8 @@ func NewDJ(
 		FloodlightController: boss.FloodlightControl,
 
 		interrupted: atomic.NewString(""),
+
+		Boss: boss,
 	}
 }
 

diff --git a/boss/head_manager/api.go b/boss/head_manager/api.go
@@ -72,6 +72,23 @@ func (h *HeadManager) Say(
 	}
 }
 
+func (h *HeadManager) SetVolume(
+	ctx context.Context,
+	logger *zap.Logger,
+	headURI string,
+) {
+	conn, err := h.GetConn(headURI)
+	if err != nil {
+		logger.Error("error fetching head connection", zap.Error(err))
+	} else {
+		client := gen.NewVoicesClient(conn.Conn)
+		_, err = client.SetVolume(ctx, &gen.SetVolumeIn{VolDb: -1})
+		if err != nil {
+			logger.Error("error setting volume", zap.Error(err))
+		}
+	}
+}
+
 func (h *HeadManager) SayRandom(ctx context.Context, headURI string) error {
 	conn, err := h.GetConn(headURI)
 	if err != nil {
@@ -84,11 +101,13 @@ func (h *HeadManager) SayRandom(ctx context.Context, headURI string) error {
 
 func (h *HeadManager) SetLedsAnimation(
 	ctx context.Context,
-	logger *zap.Logger,
+	parentLogger *zap.Logger,
 	uri string,
 	animationName string,
 	startTime time.Time,
 ) {
+	logger := parentLogger.With(zap.String("uri", uri))
+
 	conn, err := h.GetConn(uri)
 	if err != nil {
 		logger.Error("error fetching head connection", zap.Error(err))

diff --git a/boss/head_manager/head_manager.go b/boss/head_manager/head_manager.go
@@ -72,6 +72,7 @@ func (h *HeadManager) CheckIn(
 	ctx context.Context,
 	logger *zap.Logger,
 	sc *scene.Scene,
+	timeout time.Duration,
 ) {
 	logger.Info("checkin")
 	t0 := time.Now()
@@ -83,7 +84,7 @@ func (h *HeadManager) CheckIn(
 
 	found := make(chan *Connection)
 
-	ctx, cancel := context.WithTimeout(ctx, 2*time.Second)
+	ctx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 
 	remaining := map[string]bool{}

diff --git a/boss/scenes/find_zeros/find_zeros.go b/boss/scenes/find_zeros/find_zeros.go
@@ -9,11 +9,17 @@ import (
 func FindZeros(sp *dj.SceneParams) {
 	sp.DJ.Scene.ClearFearful()
 
-	sp.DJ.HeadManager.CheckIn(sp.Ctx, sp.Logger, sp.DJ.Scene)
+	sp.DJ.HeadManager.CheckIn(
+		sp.Ctx,
+		sp.Logger,
+		sp.DJ.Scene,
+		sp.DJ.Boss.Env.CheckInTime,
+	)
 
 	scenes.SceneSetup(sp, "rainbow")
 
 	go setupFloodLights(sp)
+	go setVolume(sp)
 	go findHeadZeros(sp)
 
 	<-sp.Done.Chan()

diff --git a/boss/scenes/find_zeros/floodlights.go b/boss/scenes/find_zeros/floodlights.go
@@ -31,3 +31,15 @@ func setupFloodLights(sp *dj.SceneParams) {
 		go setupFloodLight(newSp, cameraURI, sp.DJ.FloodlightController())
 	}
 }
+
+func setVolume(sp *dj.SceneParams) {
+	for _, h := range sp.DJ.Scene.Heads {
+		uri := h.URI()
+		logger := sp.Logger.With(zap.String("uri", uri))
+		go sp.DJ.HeadManager.SetVolume(
+			sp.Ctx,
+			logger,
+			uri,
+		)
+	}
+}
diff --git a/boss/scenes/follow_convo/follow_convo.go b/boss/scenes/follow_convo/follow_convo.go
@@ -32,7 +32,7 @@ func (f *FollowConvo) Run(sp *dj.SceneParams) {
 	f.setup(sp.DJ)
 
 	//go f.interruptScene(sp, randomlyInterrupt())
-	go f.interruptScene(sp, fearfulInterrupt(sp, 1, 90*time.Second))
+	go f.interruptScene(sp, fearfulInterrupt(sp, sp.DJ.Boss.Env.FearfulCount, 90*time.Second))
 
 	scenes.SceneSetup(sp, "rainbow")
 

diff --git a/cmd/leds/main.go b/cmd/leds/main.go
@@ -1,12 +1,16 @@
 package main
 
 import (
+	"github.com/cacktopus/theheads/common/dotenv"
+	"github.com/cacktopus/theheads/common/util"
 	"github.com/cacktopus/theheads/leds"
 	"go.uber.org/zap"
 )
 
 func main() {
-	logger, _ := zap.NewProduction()
+	logger, _ := util.NewLogger(false)
+
+	dotenv.EnvOverrideFromFile(logger, "/boot/leds.env")
 
 	err := leds.Run(logger)
 	if err != nil {

diff --git a/cmd/set-system-time/main.go b/cmd/set-system-time/main.go
@@ -20,7 +20,7 @@ func main() {
 	}
 
 	fmt.Println("setting system time:", t.String())
-	err = util.SetTime(util.TimeToFloat64(t))
+	err = util.SetTime(t)
 	if err != nil {
 		fmt.Println("error setting system time:", err.Error())
 		return

diff --git a/common/dotenv/dotenv.go b/common/dotenv/dotenv.go
@@ -3,16 +3,22 @@ package dotenv
 import (
 	"bufio"
 	"github.com/pkg/errors"
+	"go.uber.org/zap"
+	"io/ioutil"
 	"os"
 	"strings"
 )
 
 func SetEnvFromContent(content string) error {
+	return setEnvFromContent(content, false)
+}
+
+func setEnvFromContent(content string, override bool) error {
 	env := ParseEnvFromContent(content)
 
 	for key, value := range env {
 		_, present := os.LookupEnv(key)
-		if present {
+		if present && !override {
 			continue
 		}
 
@@ -50,3 +56,20 @@ func ParseEnvFromContent(content string) map[string]string {
 
 	return env
 }
+
+func EnvOverrideFromFile(parentLogger *zap.Logger, filename string) {
+	logger := parentLogger.With(zap.String("filename", filename))
+	content, err := ioutil.ReadFile(filename)
+	if err != nil {
+		logger.Info("unable to load env override", zap.Error(err))
+		return
+	}
+
+	err = setEnvFromContent(string(content), true)
+	if err != nil {
+		logger.Error("error setting env override", zap.Error(err))
+		return
+	}
+
+	logger.Info("set env override")
+}
diff --git a/layout/main.go b/layout/main.go
@@ -0,0 +1,62 @@
+package main
+
+import (
+	"fmt"
+	"io/ioutil"
+	"math"
+	"os"
+)
+
+func Radians(degrees float64) float64 {
+	return degrees * math.Pi / 180
+}
+
+func Degrees(radians float64) float64 {
+	return radians * 180 / math.Pi
+}
+
+func cmToFeet(x float64) float64 {
+	return x / 12 / 2.54
+}
+
+var headPos = []int{4, 3, 1, 7, 8, 2, 5, 6, 9}
+
+var tmpl = `
+cameras: [ camera-%02d ]
+heads: [ head-%02d ]
+name: stand-%02d
+pos: { x: %2f, y: %2f }
+rot: -90
+`
+
+func main() {
+	const (
+		a            = 1323.34 / 100
+		b            = 121.92 / 100
+		thetaDegrees = 5.28
+	)
+
+	theta := Radians(thetaDegrees)
+
+	for i := -4; i <= 4; i++ {
+		phi := float64(i) * theta
+		x := a * math.Sin(phi)
+		y := -a + a*math.Cos(phi)
+
+		pos := headPos[i+4]
+
+		//fmt.Println(i, x, y, cmToFeet(x), cmToFeet(y))
+		stand := fmt.Sprintf(tmpl, pos, pos, pos, x, y)
+
+		outdir := os.ExpandEnv("$HOME/shared/theheads/scenes/hb2021/stands")
+
+		err := ioutil.WriteFile(outdir+fmt.Sprintf("/stand-%02d.yaml", pos), []byte(stand), 0o600)
+		noError(err)
+	}
+}
+
+func noError(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
diff --git a/leds/cfg.go b/leds/cfg.go
@@ -24,4 +24,6 @@ type config struct {
 	}
 
 	Debug bool `envconfig:"default=false"`
+
+	ConfigFile string `envconfig:"default=/boot/leds-cfg.json"`
 }
diff --git a/leds/ir_linux.go b/leds/ir_linux.go
@@ -25,31 +25,32 @@ func runIR(app *App) {
 
 				switch event.Value {
 				case 48912: // 1
-					req.callback = app.animations["bounce"]
+					req.name = "bounce"
 					app.ch <- req
 				case 48913: // 2
-					req.callback = app.animations["rainbow1"]
+					req.name = "rainbow1"
 					app.ch <- req
 				case 48914: // 3
-					req.callback = app.animations["rainbow2"]
+					req.name = "rainbow2"
 					app.ch <- req
 
 				case 48916: // 4
-					req.callback = app.animations["raindrops"]
+					req.name = "raindrops"
 					app.ch <- req
 
 				case 48917: // 5
 				case 48918: // 6
 
 				case 48920: // 7
 				case 48921: // 8
-					req.callback = solidRandom(app)
-					app.ch <- req
+					//req.name = solidRandom(app)
+					//app.ch <- req
 				case 48922: // 9
-					req.callback = app.animations["white"]
+					req.name = "white"
 					app.ch <- req
 
 				case 48905: // enter/save
+					app.saveSettings()
 
 				case 48896: // vol-
 					app.strip.ScaleDown()
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,8 @@ func NewDJ( @@
     		FloodlightController: boss.FloodlightControl,
     		interrupted: atomic.NewString(""),
+    		Boss: boss,
     	}
     }
@@ Expand Down @@