From c227cfdb3e526ac8f9c9ca5e5ed9cbfecb60cd1a Mon Sep 17 00:00:00 2001 From: Menno Finlay-Smits Date: Wed, 24 Jan 2018 15:33:41 +1300 Subject: [PATCH] Update lepton3 dependency to pull in bug fix --- Gopkg.lock | 37 +++++++++++++++++-- .../TheCacophonyProject/lepton3/lepton3.go | 8 ++-- 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index bd6654c..504ccc6 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -11,7 +11,7 @@ branch = "master" name = "github.com/TheCacophonyProject/lepton3" packages = ["."] - revision = "68e7f15af7f63193e330c2f26d53333d8f7a5a79" + revision = "fa8d59f667dbc6599761851f437da81a83295a34" [[projects]] branch = "master" @@ -39,7 +39,10 @@ [[projects]] name = "github.com/stretchr/testify" - packages = ["assert","require"] + packages = [ + "assert", + "require" + ] revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" version = "v1.1.4" @@ -64,7 +67,35 @@ [[projects]] branch = "v2" name = "periph.io/x/periph" - packages = [".","conn","conn/gpio","conn/gpio/gpioreg","conn/i2c","conn/i2c/i2creg","conn/mmr","conn/pin","conn/pin/pinreg","conn/spi","conn/spi/spireg","devices","devices/lepton/cci","devices/lepton/internal","host","host/allwinner","host/bcm283x","host/chip","host/cpu","host/distro","host/fs","host/odroidc1","host/pine64","host/pmem","host/rpi","host/sysfs","host/videocore"] + packages = [ + ".", + "conn", + "conn/gpio", + "conn/gpio/gpioreg", + "conn/i2c", + "conn/i2c/i2creg", + "conn/mmr", + "conn/pin", + "conn/pin/pinreg", + "conn/spi", + "conn/spi/spireg", + "devices", + "devices/lepton/cci", + "devices/lepton/internal", + "host", + "host/allwinner", + "host/bcm283x", + "host/chip", + "host/cpu", + "host/distro", + "host/fs", + "host/odroidc1", + "host/pine64", + "host/pmem", + "host/rpi", + "host/sysfs", + "host/videocore" + ] revision = "d06ef89e37e829cc301f5babee628e6c6e36d7c5" source = "https://github.com/TheCacophonyProject/periph.git" diff --git a/vendor/github.com/TheCacophonyProject/lepton3/lepton3.go b/vendor/github.com/TheCacophonyProject/lepton3/lepton3.go index 0485242..bb4567f 100644 --- a/vendor/github.com/TheCacophonyProject/lepton3/lepton3.go +++ b/vendor/github.com/TheCacophonyProject/lepton3/lepton3.go @@ -244,9 +244,11 @@ func (d *Lepton3) startStream() error { } func (d *Lepton3) stopStream() { - d.tomb.Kill(nil) - d.tomb.Wait() - d.tomb = nil + if d.tomb != nil { + d.tomb.Kill(nil) + d.tomb.Wait() + d.tomb = nil + } } func validatePacket(packet []byte) (int, error) {