Little improvements, i guess
This commit is contained in:
		@@ -2,7 +2,6 @@ package main
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"github.com/blackjack/webcam"
 | 
			
		||||
	mqtt "github.com/eclipse/paho.mqtt.golang"
 | 
			
		||||
	"log"
 | 
			
		||||
	"time"
 | 
			
		||||
@@ -45,79 +44,6 @@ func onPing(client mqtt.Client, msg mqtt.Message) {
 | 
			
		||||
	publishTelemetry(client, "pong", msg.Payload())
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func handleWebcam(client mqtt.Client) {
 | 
			
		||||
	cam, err := webcam.Open("/dev/video0")
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		log.Fatalf("Could not open webcam: %v\n", err)
 | 
			
		||||
	}
 | 
			
		||||
	defer cam.Close()
 | 
			
		||||
 | 
			
		||||
	supportedFormat := cam.GetSupportedFormats()
 | 
			
		||||
	//log.Printf("Supported formats:\n")
 | 
			
		||||
	imageFormat := webcam.PixelFormat(0)
 | 
			
		||||
	for format, description := range supportedFormat {
 | 
			
		||||
		if description == "10-bit Bayer GBGB/RGRG" {
 | 
			
		||||
			imageFormat = format
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	//width, height := 1296, 972
 | 
			
		||||
	//width, height := uint32(2592), uint32(1944)
 | 
			
		||||
	width, height := uint32(640), uint32(480)
 | 
			
		||||
 | 
			
		||||
	if imageFormat != webcam.PixelFormat(0) {
 | 
			
		||||
		_, _, _, err = cam.SetImageFormat(imageFormat, width, height)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			log.Fatalf("Could not set image format: %v\n", err)
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	supportedFramerates := cam.GetSupportedFramerates(imageFormat, width, height)
 | 
			
		||||
	log.Printf("Supported frame rates:\n")
 | 
			
		||||
	for _, format := range supportedFramerates {
 | 
			
		||||
		log.Printf(" - %s\n", format)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	controls := cam.GetControls()
 | 
			
		||||
	log.Printf("Controls:\n")
 | 
			
		||||
	for _, control := range controls {
 | 
			
		||||
		log.Printf(" - %s\n", control)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	//cam.SetAutoWhiteBalance(true)
 | 
			
		||||
	//cam.SetControl()
 | 
			
		||||
 | 
			
		||||
	//err = cam.SetFramerate(10)
 | 
			
		||||
	//if err != nil {
 | 
			
		||||
	//	log.Fatalf("Could not set framerate: %v\n", err)
 | 
			
		||||
	//}
 | 
			
		||||
 | 
			
		||||
	err = cam.StartStreaming()
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		log.Fatalf("Could not start streaming webcam: %v\n", err)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	count := 0
 | 
			
		||||
	for {
 | 
			
		||||
		err = cam.WaitForFrame(100)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			log.Fatalf("Could not start streaming webcam: %v\n", err)
 | 
			
		||||
		}
 | 
			
		||||
		frame, err := cam.ReadFrame()
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			log.Fatalf("Could not read frame: %v\n", err)
 | 
			
		||||
		}
 | 
			
		||||
		if len(frame) > 0 {
 | 
			
		||||
			count++
 | 
			
		||||
			if count > 30*4 {
 | 
			
		||||
				print("Publishing frame\n")
 | 
			
		||||
				publishTelemetry(client, "camfeed", frame)
 | 
			
		||||
				return
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
func main() {
 | 
			
		||||
	opts := mqtt.NewClientOptions()
 | 
			
		||||
	opts.AddBroker(broker)
 | 
			
		||||
@@ -138,7 +64,6 @@ func main() {
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	InitBattery()
 | 
			
		||||
	//go handleWebcam(client)
 | 
			
		||||
 | 
			
		||||
	slowTelemetry := time.NewTicker(3 * time.Second)
 | 
			
		||||
	defer slowTelemetry.Stop()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user