Skip to content

Commit

Permalink
updated hass
Browse files Browse the repository at this point in the history
  • Loading branch information
@balazsgrill
balazsgrill committed Jun 7, 2024
1 parent 6417eb1 commit 5cf290b
Show file tree
Hide file tree
Showing 26 changed files with 54 additions and 52 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:

- name: Publish CI package
id: push
if: github.ref == 'refs/heads/master'
if: startsWith(github.ref, 'refs/tags/v')
uses: cloudsmith-io/action@master
with:
api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# wscgo

[![Go Report Card](https://goreportcard.com/badge/github.com/balazsgrill/wscgo)](https://goreportcard.com/report/github.com/balazsgrill/wscgo)
![Build status](https://github.com/balazsgrill/wscgo/workflows/Main/badge.svg)
[![Go Report Card](https://goreportcard.com/badge/github.com/home2mqtt/wscgo)](https://goreportcard.com/report/github.com/home2mqtt/wscgo)
![Build status](https://github.com/home2mqtt/wscgo/workflows/Main/badge.svg)
[![Maintainability](https://api.codeclimate.com/v1/badges/27fbdc40e649c93f781e/maintainability)](https://codeclimate.com/github/balazsgrill/wscgo/maintainability)

wscgo is a highly configurable controller intended for home automation written in Go. Supported
Expand Down
4 changes: 2 additions & 2 deletions cmd/wscgo/wscgo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"log"
"os"

"github.com/balazsgrill/wscgo/config"
"github.com/home2mqtt/wscgo/config"
"periph.io/x/host/v3"

"github.com/balazsgrill/wscgo/integration"
"github.com/home2mqtt/wscgo/integration"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"os"
"sort"

"github.com/balazsgrill/wscgo/devices"
"github.com/balazsgrill/wscgo/protocol"
"github.com/home2mqtt/wscgo/devices"
"github.com/home2mqtt/wscgo/protocol"
)

// DeviceInitializer is a function capable of initializing a device
Expand Down
2 changes: 1 addition & 1 deletion config/info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package config
import (
"os"

"github.com/balazsgrill/hass"
"github.com/home2mqtt/hass"
)

// ComputeDeviceInfo extracts discovery metadata from the host system
Expand Down
3 changes: 2 additions & 1 deletion devices/cometblue/cometbluedevice.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
//go:build linux
// +build linux

package cometblue

import (
"sync"

"github.com/balazsgrill/wscgo/devices"
"github.com/home2mqtt/wscgo/devices"
)

// recoverDuration time to wait before retrying in case of communication error
Expand Down
2 changes: 1 addition & 1 deletion devices/dimmer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"log"
"testing"

"github.com/balazsgrill/wscgo/tests"
"github.com/home2mqtt/wscgo/tests"
"periph.io/x/conn/v3/gpio"
)

Expand Down
2 changes: 1 addition & 1 deletion devices/shutter_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package devices
import (
"testing"

"github.com/balazsgrill/wscgo/tests"
"github.com/home2mqtt/wscgo/tests"
"periph.io/x/conn/v3/gpio"
)

Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
module github.com/balazsgrill/wscgo
module github.com/home2mqtt/wscgo

go 1.18
go 1.21

require (
github.com/balazsgrill/hass v0.0.7
github.com/home2mqtt/hass v0.0.8
github.com/eclipse/paho.mqtt.golang v1.4.3
github.com/go-ble/ble v0.0.0-20220207185428-60d1eecf2633
gopkg.in/ini.v1 v1.67.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/JuulLabs-OSS/cbgo v0.0.1/go.mod h1:L4YtGP+gnyD84w7+jN66ncspFRfOYB5aj9QSXaFHmBA=
github.com/JuulLabs-OSS/cbgo v0.0.2 h1:gCDyT0+EPuI8GOFyvAksFcVD2vF4CXBAVwT6uVnD9oo=
github.com/JuulLabs-OSS/cbgo v0.0.2/go.mod h1:L4YtGP+gnyD84w7+jN66ncspFRfOYB5aj9QSXaFHmBA=
github.com/balazsgrill/hass v0.0.7 h1:j+d3tZUC7o38mvsdIyiF1wZA1llrwph5xGAXYIpZLPo=
github.com/balazsgrill/hass v0.0.7/go.mod h1:94lN6vuyZTTV/0GggEWnKrLQzT/TuLa3rosI7TQeQf4=
github.com/home2mqtt/hass v0.0.7 h1:j+d3tZUC7o38mvsdIyiF1wZA1llrwph5xGAXYIpZLPo=
github.com/home2mqtt/hass v0.0.7/go.mod h1:94lN6vuyZTTV/0GggEWnKrLQzT/TuLa3rosI7TQeQf4=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
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=
Expand Down
6 changes: 3 additions & 3 deletions integration/ccs811.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package integration

import (
"github.com/balazsgrill/wscgo/config"
"github.com/balazsgrill/wscgo/devices"
"github.com/balazsgrill/wscgo/protocol"
"github.com/home2mqtt/wscgo/config"
"github.com/home2mqtt/wscgo/devices"
"github.com/home2mqtt/wscgo/protocol"
)

type ccs811ConfigPartParser struct{}
Expand Down
7 changes: 4 additions & 3 deletions integration/cometblue.go
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
//go:build linux
// +build linux

package integration

import (
"github.com/balazsgrill/wscgo/config"
"github.com/balazsgrill/wscgo/devices/cometblue"
"github.com/balazsgrill/wscgo/protocol"
"github.com/home2mqtt/wscgo/config"
"github.com/home2mqtt/wscgo/devices/cometblue"
"github.com/home2mqtt/wscgo/protocol"
)

type cometblueConfigurationParser struct {
Expand Down
6 changes: 3 additions & 3 deletions integration/gpio.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package integration

import (
"github.com/balazsgrill/wscgo/config"
"github.com/balazsgrill/wscgo/devices"
"github.com/balazsgrill/wscgo/protocol"
"github.com/home2mqtt/wscgo/config"
"github.com/home2mqtt/wscgo/devices"
"github.com/home2mqtt/wscgo/protocol"
)

type inputConfigPartParser struct{}
Expand Down
8 changes: 4 additions & 4 deletions integration/instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"log"
"time"

"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/config"
"github.com/balazsgrill/wscgo/devices"
"github.com/balazsgrill/wscgo/protocol"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"
"github.com/home2mqtt/wscgo/config"
"github.com/home2mqtt/wscgo/devices"
"github.com/home2mqtt/wscgo/protocol"
)

type WscgoInstance struct {
Expand Down
6 changes: 3 additions & 3 deletions integration/light.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package integration

import (
"github.com/balazsgrill/wscgo/config"
"github.com/balazsgrill/wscgo/devices"
"github.com/balazsgrill/wscgo/protocol"
"github.com/home2mqtt/wscgo/config"
"github.com/home2mqtt/wscgo/devices"
"github.com/home2mqtt/wscgo/protocol"
)

type lightConfigurationParser struct {
Expand Down
2 changes: 1 addition & 1 deletion integration/mcp23xxx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"strings"

"github.com/balazsgrill/wscgo/config"
"github.com/home2mqtt/wscgo/config"
"periph.io/x/conn/v3/i2c/i2creg"
"periph.io/x/conn/v3/physic"
"periph.io/x/conn/v3/spi"
Expand Down
2 changes: 1 addition & 1 deletion integration/pca9685.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package integration
import (
"log"

"github.com/balazsgrill/wscgo/config"
"github.com/home2mqtt/wscgo/config"
"periph.io/x/conn/v3/i2c/i2creg"
"periph.io/x/conn/v3/physic"
"periph.io/x/devices/v3/pca9685"
Expand Down
6 changes: 3 additions & 3 deletions integration/shutter.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package integration

import (
"github.com/balazsgrill/wscgo/config"
"github.com/balazsgrill/wscgo/devices"
"github.com/balazsgrill/wscgo/protocol"
"github.com/home2mqtt/wscgo/config"
"github.com/home2mqtt/wscgo/devices"
"github.com/home2mqtt/wscgo/protocol"
)

type shutterConfigPartParser struct{}
Expand Down
4 changes: 2 additions & 2 deletions protocol/cover.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strconv"
"strings"

"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/devices"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"

Check failure on line 9 in protocol/cover.go

View workflow job for this annotation

GitHub Actions / Build 

missing go.sum entry for module providing package github.com/home2mqtt/hass (imported by github.com/home2mqtt/wscgo/protocol); to add:
"github.com/home2mqtt/wscgo/devices"
)

// CoverConfig is the protocol configuration of a cover (a.k.a. shutter)
Expand Down
4 changes: 2 additions & 2 deletions protocol/cover_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"testing"

"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/devices"
"github.com/home2mqtt/hass"
"github.com/home2mqtt/wscgo/devices"
)

type testshutter struct {
Expand Down
4 changes: 2 additions & 2 deletions protocol/dinput.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package protocol

import (
"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/devices"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"
"github.com/home2mqtt/wscgo/devices"
)

type DInputConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion protocol/discovery.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package protocol
import (
"encoding/json"

"github.com/balazsgrill/hass"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"
)

type IDiscoverable interface {
Expand Down
4 changes: 2 additions & 2 deletions protocol/hvac.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strconv"
"strings"

"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/devices"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"
"github.com/home2mqtt/wscgo/devices"
)

// HVACConfig contains configuration parameters for a HVAC device
Expand Down
4 changes: 2 additions & 2 deletions protocol/light.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strconv"
"strings"

"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/devices"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"
"github.com/home2mqtt/wscgo/devices"
"periph.io/x/conn/v3/gpio"
)

Expand Down
4 changes: 2 additions & 2 deletions protocol/sensor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"log"

"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/devices"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"
"github.com/home2mqtt/wscgo/devices"
)

// SensorConfig is the protocol configuration of a sensor
Expand Down
4 changes: 2 additions & 2 deletions protocol/switch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"strconv"
"strings"

"github.com/balazsgrill/hass"
"github.com/balazsgrill/wscgo/devices"
mqtt "github.com/eclipse/paho.mqtt.golang"
"github.com/home2mqtt/hass"
"github.com/home2mqtt/wscgo/devices"
"periph.io/x/conn/v3/gpio"
)

Expand Down

0 comments on commit 5cf290b

Please sign in to comment.