From 941e60a6fef09fdcdb49beaa53b1c254b971acd3 Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Sat, 23 Dec 2023 19:03:00 -0800 Subject: [PATCH] Feat[charm]: progress --- go.mod | 12 +++-- go.sum | 74 ++++++++++++++++++++++---- main.go | 52 +++++++++++++------ pkg/access/rfid.go | 2 +- pkg/assets/audio_test.go | 9 ++++ pkg/config/toml.go | 16 ++++-- pkg/config/types.go | 109 +++++++++++++++++++++++++++++++++++++++ pkg/iot/types.go | 32 ------------ 8 files changed, 240 insertions(+), 66 deletions(-) create mode 100644 pkg/assets/audio_test.go create mode 100644 pkg/config/types.go delete mode 100644 pkg/iot/types.go diff --git a/go.mod b/go.mod index 2217924..5f7869c 100644 --- a/go.mod +++ b/go.mod @@ -3,19 +3,23 @@ module git.tcp.direct/kayos/door5 go 1.21.4 require ( + git.tcp.direct/kayos/common v0.9.6 git.tcp.direct/kayos/zwrap v0.4.2 github.com/clausecker/nfc/v2 v2.1.4 github.com/davecgh/go-spew v1.1.1 + github.com/faiface/beep v1.1.0 github.com/pelletier/go-toml/v2 v2.1.0 github.com/rs/zerolog v1.31.0 github.com/stianeikeland/go-rpio/v4 v4.6.0 - periph.io/x/conn/v3 v3.7.0 - periph.io/x/devices/v3 v3.7.1 - periph.io/x/host/v3 v3.8.0 ) require ( + github.com/hajimehoshi/oto v0.7.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect - golang.org/x/sys v0.12.0 // indirect + github.com/pkg/errors v0.9.1 // indirect + golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8 // indirect + golang.org/x/image v0.1.0 // indirect + golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6 // indirect + golang.org/x/sys v0.14.0 // indirect ) diff --git a/go.sum b/go.sum index 849d653..ccf138d 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,32 @@ +git.tcp.direct/kayos/common v0.9.6 h1:EITtktxZF/zkzqAhZZxvm6cZpFYoZ0P/gLB9RPatKUY= +git.tcp.direct/kayos/common v0.9.6/go.mod h1:8y9b+PN1+ZVaQ/VugD9dkKe+uqhE8jH7a64RyF7h2rM= git.tcp.direct/kayos/zwrap v0.4.2 h1:yXO21VNkAb+iMi3dOAythw42dvv1bVzXw+TJJXENVdQ= git.tcp.direct/kayos/zwrap v0.4.2/go.mod h1:SA9+Sww1LBKMw54Gjot5t4AhwEgRX1lFhy6pv5Mm78Q= +github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/clausecker/nfc/v2 v2.1.4 h1:zw2Cnny7pxPnuxVMBo+DXqXYETzUN7pMhNEA61yT5gY= github.com/clausecker/nfc/v2 v2.1.4/go.mod h1:BjRBQUQTQmiwh2tEfQ+xBM5xY05sV2gnZ0JRYEHog/o= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/d4l3k/messagediff v1.2.2-0.20190829033028-7e0a312ae40b/go.mod h1:Oozbb1TVXFac9FtSIxHBMnBCq2qeH/2KkEQxENCrlLo= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/faiface/beep v1.1.0 h1:A2gWP6xf5Rh7RG/p9/VAW2jRSDEGQm5sbOb38sf5d4c= +github.com/faiface/beep v1.1.0/go.mod h1:6I8p6kK2q4opL/eWb+kAkk38ehnTunWeToJB+s51sT4= +github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= +github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= +github.com/go-audio/audio v1.0.0/go.mod h1:6uAu0+H2lHkwdGsAY+j2wHPNPpPoeg5AaEFh9FlA+Zs= +github.com/go-audio/riff v1.0.0/go.mod h1:l3cQwc85y79NQFCRB7TiPoNiaijp6q8Z0Uv38rVG498= +github.com/go-audio/wav v1.0.0/go.mod h1:3yoReyQOsiARkvPl3ERCi8JFjihzG6WhjYpZCf5zAWE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg= -github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/hajimehoshi/go-mp3 v0.3.0/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM= +github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI= +github.com/hajimehoshi/oto v0.7.1 h1:I7maFPz5MBCwiutOrz++DLdbr4rTzBsbBuV2VpgU9kk= +github.com/hajimehoshi/oto v0.7.1/go.mod h1:wovJ8WWMfFKvP587mhHgot/MBr4DnNy9m6EepeVGnos= +github.com/icza/bitio v1.0.0/go.mod h1:0jGnlLAx8MKMr9VGnn/4YrvZiprkvBelsVIbA9Jjr9A= +github.com/icza/mighty v0.0.0-20180919140131-cfd07d671de6/go.mod h1:xQig96I1VNBDIWGCdTt54nHt6EeI639SmHycLYL7FkA= +github.com/jfreymuth/oggvorbis v1.0.1/go.mod h1:NqS+K+UXKje0FUYUPosyQ+XTVvjmVjps1aEZH1sumIk= +github.com/jfreymuth/vorbis v1.0.0/go.mod h1:8zy3lUAm9K/rJJk223RKy6vjCZTWC61NA2QD06bfOE0= +github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= @@ -16,8 +34,13 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mewkiz/flac v1.0.7/go.mod h1:yU74UH277dBUpqxPouHSQIar3G1X/QIclVbFahSd1pU= +github.com/mewkiz/pkg v0.0.0-20190919212034-518ade7978e2/go.mod h1:3E2FUC/qYUfM8+r9zAwpeHJzqRVVMIYnpzD/clwWxyA= github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -34,19 +57,52 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8 h1:idBdZTd9UioThJp8KpM/rTSinK/ChZFBE43/WtIy8zg= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/image v0.0.0-20190220214146-31aff87c08e9/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.1.0 h1:r8Oj8ZA2Xy12/b5KZYj3tuv7NG/fBz3TwQVvpJ9l8Rk= +golang.org/x/image v0.1.0/go.mod h1:iyPr49SD/G/TBxYVB/9RRtGUT5eNbo2u4NamWeQcD5c= +golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6 h1:vyLBGJPIl9ZYbcQFM2USFmJBK6KI+t+z6jL0lbwjrnc= +golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= +golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -periph.io/x/conn/v3 v3.7.0 h1:f1EXLn4pkf7AEWwkol2gilCNZ0ElY+bxS4WE2PQXfrA= -periph.io/x/conn/v3 v3.7.0/go.mod h1:ypY7UVxgDbP9PJGwFSVelRRagxyXYfttVh7hJZUHEhg= -periph.io/x/devices/v3 v3.7.1 h1:BsExlfYJlZUZoawzpMF7ksgC9f1eBAdqvKRCGvb+VYw= -periph.io/x/devices/v3 v3.7.1/go.mod h1:ezQOe8WknDaMbKZXVwQUQkIauyLyJshwAHkIohHXA94= -periph.io/x/host/v3 v3.8.0 h1:T5ojZ2wvnZHGPS4h95N2ZpcCyHnsvH3YRZ1UUUiv5CQ= -periph.io/x/host/v3 v3.8.0/go.mod h1:rzOLH+2g9bhc6pWZrkCrmytD4igwQ2vxFw6Wn6ZOlLY= +nullprogram.com/x/rng v1.1.0 h1:SMU7DHaQSWtKJNTpNFIFt8Wd/KSmOuSDPXrMFp/UMro= +nullprogram.com/x/rng v1.1.0/go.mod h1:glGw6V87vyfawxCzqOABL3WfL95G65az9Z2JZCylCkg= diff --git a/main.go b/main.go index f20baa3..ff310e2 100644 --- a/main.go +++ b/main.go @@ -8,29 +8,29 @@ import ( "github.com/davecgh/go-spew/spew" "github.com/stianeikeland/go-rpio/v4" - "git.tcp.direct/kayos/door5/config" - "git.tcp.direct/kayos/door5/iot" - "git.tcp.direct/kayos/door5/logger" + "git.tcp.direct/kayos/door5/pkg/assets" + "git.tcp.direct/kayos/door5/pkg/config" + "git.tcp.direct/kayos/door5/pkg/logger" ) var conf *config.Config func OpenDoor() { - pin := rpio.Pin(conf.Pins[iot.Door]) + pin := rpio.Pin(conf.Pins[config.Door]) pin.Output() pin.High() } func CloseDoor() { - pin := rpio.Pin(conf.Pins[iot.Door]) + pin := rpio.Pin(conf.Pins[config.Door]) pin.Output() pin.Low() } func watchButton() { - logger.Get().Logger.Debug().Uint8("pin", uint8(conf.Pins[iot.Button])).Msg("exit button daemon started") - defer logger.Get().Logger.Debug().Msg("exit button daemon stopped") - pin := rpio.Pin(conf.Pins[iot.Button]) + logger.Get().Logger.Trace().Uint8("pin", uint8(conf.Pins[config.Button])).Msg("exit button daemon started") + defer logger.Get().Logger.Trace().Msg("exit button daemon stopped") + pin := rpio.Pin(conf.Pins[config.Button]) pin.Input() pin.PullUp() count := 0 @@ -44,7 +44,7 @@ func watchButton() { } count++ if count >= 100 { - logger.Get().Logger.Info().Int("count", count).Msg("door opened") + logger.Get().Logger.Info().Int("count", count).Msg("door unlocked") OpenDoor() time.Sleep(5 * time.Second) CloseDoor() @@ -54,23 +54,44 @@ func watchButton() { } } +var DoorOpen bool + +func watchReed() { + logger.Get().Logger.Trace().Uint8("pin", uint8(conf.Pins[config.Reed])).Msg("reed switch daemon started") + defer logger.Get().Logger.Trace().Msg("reed switch daemon stopped") + pin := rpio.Pin(conf.Pins[config.Reed]) + pin.Input() + pin.PullUp() + for { + switch { + case pin.Read() == rpio.Low && !DoorOpen: + logger.Get().Logger.Info().Msg("door opened") + DoorOpen = true + go assets.PlayChime() + case pin.Read() == rpio.High && DoorOpen: + logger.Get().Logger.Info().Msg("door closed") + DoorOpen = false + } + time.Sleep(100 * time.Millisecond) + } +} + func loadConfig() { var err error path, _ := os.UserConfigDir() path = filepath.Join(path, "door5", "config.toml") if conf, err = config.ReadConfig(path); err != nil { - println(err.Error()) - println("Writing default config") - _ = os.MkdirAll(filepath.Dir(path), 0755) + logger.Get().Logger.Warn().Err(err).Msg("error reading config") + logger.Get().Logger.Warn().Msg("writing default config") c := &config.Config{ Pins: config.Pins{ - iot.Door: 22, - iot.Button: 5, + config.Door: 22, + config.Button: 5, + config.Reed: 26, }, } if err = c.WriteConfig(path); err != nil { println(err.Error()) - os.Exit(1) } conf = c } @@ -87,6 +108,7 @@ func main() { } go watchButton() + go watchReed() select {} } diff --git a/pkg/access/rfid.go b/pkg/access/rfid.go index 76902ae..649f8df 100644 --- a/pkg/access/rfid.go +++ b/pkg/access/rfid.go @@ -12,7 +12,7 @@ import ( "github.com/clausecker/nfc/v2" "github.com/rs/zerolog" - "git.tcp.direct/kayos/door5/logger" + "git.tcp.direct/kayos/door5/pkg/logger" ) type ConnectionMode uint8 diff --git a/pkg/assets/audio_test.go b/pkg/assets/audio_test.go new file mode 100644 index 0000000..27a3901 --- /dev/null +++ b/pkg/assets/audio_test.go @@ -0,0 +1,9 @@ +package assets + +import ( + "testing" +) + +func TestChime(t *testing.T) { + PlayChime() +} diff --git a/pkg/config/toml.go b/pkg/config/toml.go index 2936f61..a31d0d6 100644 --- a/pkg/config/toml.go +++ b/pkg/config/toml.go @@ -3,16 +3,19 @@ package config import ( "fmt" "os" + "path/filepath" "github.com/pelletier/go-toml/v2" - - "git.tcp.direct/kayos/door5/iot" ) -type Pins map[iot.Thing]iot.GPIO +type ( + Pins map[Thing]GPIO + SerialTargets map[Serial]string +) type Config struct { - Pins Pins `toml:"pins"` + Pins Pins `toml:"pins"` + SerialTargets SerialTargets `toml:"serial_targets"` } func (p Pins) MarshalTOML() ([]byte, error) { @@ -38,5 +41,8 @@ func (c *Config) WriteConfig(path string) error { if e != nil { return e } - return os.WriteFile(path, b, 0644) + if e = os.MkdirAll(filepath.Dir(path), 0755); e != nil { + return e + } + return os.WriteFile(path, b, 0755) } diff --git a/pkg/config/types.go b/pkg/config/types.go new file mode 100644 index 0000000..5d95692 --- /dev/null +++ b/pkg/config/types.go @@ -0,0 +1,109 @@ +package config + +type ( + Thing uint16 + Serial uint8 + GPIO uint8 +) + +const ( + I2C Serial = iota + SPI +) + +func (s Serial) String() string { + switch s { + case I2C: + return "i2c" + case SPI: + return "spi" + default: + return "unknown" + } +} + +func (s *Serial) UnmarshalText(text []byte) error { + switch string(text) { + case "i2c": + *s = I2C + case "spi": + *s = SPI + default: + *s = 0 + } + return nil +} + +func (s Serial) MarshalText() ([]byte, error) { + return []byte(s.String()), nil +} + +const ( + Door Thing = iota + Button + NFC + Webcam + Reed +) + +func (t Thing) MarshalText() ([]byte, error) { + return []byte(t.String()), nil +} + +func (t *Thing) UnmarshalText(text []byte) error { + switch string(text) { + case "Door": + *t = Door + case "Button": + *t = Button + case "NFC": + *t = NFC + case "Webcam": + *t = Webcam + case "Reed": + *t = Reed + default: + *t = 0 + } + return nil +} + +func (t Thing) MarshalJSON() ([]byte, error) { + return []byte(`"` + t.String() + `"`), nil +} + +func (t *Thing) UnmarshalJSON(text []byte) error { + switch string(text) { + case `"Door"`: + *t = Door + case `"Button"`: + *t = Button + case `"NFC"`: + *t = NFC + case `"Webcam"`: + *t = Webcam + case `"Reed"`: + *t = Reed + default: + *t = 0 + } + return nil +} + +func (t Thing) String() string { + switch t { + case Door: + return "Door" + case Button: + return "Button" + case NFC: + return "NFC" + case Webcam: + return "Webcam" + case Reed: + return "Reed" + default: + return "Unknown" + } + +} diff --git a/pkg/iot/types.go b/pkg/iot/types.go deleted file mode 100644 index 69e9f06..0000000 --- a/pkg/iot/types.go +++ /dev/null @@ -1,32 +0,0 @@ -package iot - -type ( - Thing uint16 - GPIO uint8 -) - -const ( - Door Thing = iota - Button - NFC - Webcam -) - -func (t Thing) MarshalText() ([]byte, error) { - return []byte(t.String()), nil -} - -func (t Thing) String() string { - switch t { - case Door: - return "Door" - case Button: - return "Button" - case NFC: - return "NFC" - case Webcam: - return "Webcam" - default: - return "Unknown" - } -}