Clear buffer (#119)

* added message to clear buffer
TheCacophonyProject · Jan 25, 2021 · 9d84bc8 · 9d84bc8
1 parent 589367d
commit 9d84bc8
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/cmd/leptond/main.go b/cmd/leptond/main.go
@@ -47,6 +47,7 @@ const (
 	framesPerSdNotify = 5 * framesHz
 
 	telemetryBytes = 160 * 4 //this should be made public in lepton3
+	clearBuffer    = "clear"
 )
 
 var version = "<not set>"
@@ -154,6 +155,8 @@ func runMain() error {
 		if err != nil {
 			return err
 		}
+		log.Print("Clearing Buffer")
+		conn.Write([]byte(clearBuffer))
 	}
 }
 
@@ -217,13 +220,11 @@ func runCamera(conf *Config, camera *lepton3.Lepton3, conn *net.UnixConn) error
 	conn.SetWriteBuffer(camera.ResX() * camera.ResY() * 2 * 20)
 	log.Print("reading frames")
 	frame := lepton3.NewRawFrame()
-
 	notifyCount := 0
 	for {
 		if err := camera.NextFrame(frame); err != nil {
 			return &nextFrameErr{err}
 		}
-
 		if firstPixel(frame) == 0 {
 			event := eventclient.Event{
 				Timestamp: time.Now(),

diff --git a/cmd/thermal-recorder/main.go b/cmd/thermal-recorder/main.go
@@ -38,6 +38,7 @@ import (
 
 const (
 	cptvTempExt = "cptv.temp"
+	clearBuffer = "clear"
 )
 
 var (
@@ -137,7 +138,6 @@ func runMain() error {
 }
 
 func handleConn(conn net.Conn, conf *Config) error {
-
 	totalFrames := 0
 	reader := bufio.NewReader(conn)
 	header, err := headers.ReadHeaderInfo(reader)
@@ -174,15 +174,26 @@ func handleConn(conn net.Conn, conf *Config) error {
 	)
 
 	log.Print("reading frames")
-
 	frameLogIntervalFirstMin *= header.FPS()
 	frameLogInterval *= header.FPS()
 	rawFrame := make([]byte, header.FrameSize())
 	for {
-		_, err := io.ReadFull(reader, rawFrame[:])
+		_, err := io.ReadFull(reader, rawFrame[:5])
+		if err != nil {
+			return err
+		}
+		message := string(rawFrame[:5])
+		if message == clearBuffer {
+			log.Print("clearing motion buffer")
+			processor.Reset(header)
+			continue
+		}
+
+		_, err = io.ReadFull(reader, rawFrame[5:])
 		if err != nil {
 			return err
 		}
+		message = string(rawFrame[:5])
 		totalFrames++
 
 		if totalFrames%frameLogIntervalFirstMin == 0 &&

diff --git a/motion/frameloop.go b/motion/frameloop.go
@@ -52,6 +52,12 @@ type FrameLoop struct {
 	mu            sync.Mutex
 }
 
+func (fl *FrameLoop) Reset() {
+	fl.currentIndex = 0
+	fl.oldest = 0
+	fl.bufferFull = false
+
+}
 func (fl *FrameLoop) nextIndexAfter(index int) int {
 	return (index + 1) % fl.size
 }

diff --git a/motion/motion.go b/motion/motion.go
@@ -92,6 +92,13 @@ type motionDetector struct {
 	framesHz         int
 }
 
+func (d *motionDetector) Reset(camera cptvframe.CameraSpec) {
+	d.backgroundFrames = 0
+	d.count = 0
+	d.flooredFrames.Reset()
+	d.diffFrames.Reset()
+}
+
 func (d *motionDetector) calculateThreshold(backAverage float64) {
 	if d.tempThreshMin != 0 {
 		d.tempThresh = uint16(math.Max(backAverage, float64(d.tempThreshMin)))

diff --git a/motion/motionprocessor.go b/motion/motionprocessor.go
@@ -86,6 +86,11 @@ type RecordingListener interface {
 	RecordingEnded()
 }
 
+func (mp *MotionProcessor) Reset(camera cptvframe.CameraSpec) {
+	mp.stopRecording()
+	mp.motionDetector.Reset(camera)
+}
+
 func (mp *MotionProcessor) Process(rawFrame []byte) error {
 	frame := mp.frameLoop.Current()
 	if err := mp.parseFrame(rawFrame, frame); err != nil {
@@ -169,6 +174,9 @@ func (mp *MotionProcessor) startRecording() error {
 }
 
 func (mp *MotionProcessor) stopRecording() error {
+	if !mp.isRecording {
+		return nil
+	}
 	if mp.listener != nil {
 		mp.listener.RecordingEnded()
 	}