Merge branch 'master' of https://github.com/fallais/gocoop

Author: fallais

go.mod

@@ -6,10 +6,10 @@ require (
 	github.com/abbot/go-http-auth v0.4.0
 	github.com/cpucycle/astrotime v0.0.0-20120927164819-9c7d514efdb5
 	github.com/gorilla/schema v1.1.0
-	github.com/nathan-osman/go-rpigpio v0.0.0-20160701025123-bce6190607da
 	github.com/sirupsen/logrus v1.4.2
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/viper v1.6.2
+	github.com/stianeikeland/go-rpio/v4 v4.5.1
 	golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df

go.sum

@@ -76,8 +76,6 @@ github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrk
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nathan-osman/go-rpigpio v0.0.0-20160701025123-bce6190607da h1:4fuSzRW9Os4EsqurEJtUADEZBAhYBQGDwMYEpm0tY70=
-github.com/nathan-osman/go-rpigpio v0.0.0-20160701025123-bce6190607da/go.mod h1:d9P2zqmuOhe7dbKtAOfSXL4vIB9BAjFj/+/vMULsVfE=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
@@ -117,6 +115,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E=
 github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
+github.com/stianeikeland/go-rpio/v4 v4.5.1 h1:sLzl5w1HS+4726C5kfvpIgjXULrLCCM82vDpAFefGQI=
+github.com/stianeikeland/go-rpio/v4 v4.5.1/go.mod h1:A3GvHxC1Om5zaId+HqB3HKqx4K/AqeckxB7qRjxMK7o=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=

internal/main.go

@@ -6,17 +6,20 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	auth "github.com/abbot/go-http-auth"
 	"github.com/fallais/gocoop/internal/routes"
 	"github.com/fallais/gocoop/internal/services"
 	"github.com/fallais/gocoop/internal/system"
 	"github.com/fallais/gocoop/pkg/coop"
 	"github.com/fallais/gocoop/pkg/door"
-	"golang.org/x/crypto/bcrypt"
+	"github.com/fallais/gocoop/pkg/motor"
+	"github.com/fallais/gocoop/pkg/motor/bts7960"
+	"github.com/fallais/gocoop/pkg/motor/l293d"
 
+	auth "github.com/abbot/go-http-auth"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"golang.org/x/crypto/bcrypt"
 )
 
 // StaticFS is the embed for the static files.
@@ -43,13 +46,22 @@ func Run(cmd *cobra.Command, args []string) {
 		logrus.WithError(err).Fatalln("Error when reading configuration data")
 	}
 
-	// Door
+	// Motor
+	var motor motor.Motor
 	logrus.WithFields(logrus.Fields{
-		"pin_1A":      viper.GetString("door.pin_1A"),
-		"pin_1B":      viper.GetString("door.pin_1B"),
-		"pin_enable1": viper.GetString("door.pin_enable1"),
-	}).Infoln("Creating the door")
-	d := door.NewDoor(viper.GetInt("door.pin_1A"), viper.GetInt("door.pin_1B"), viper.GetInt("door.pin_enable1"), viper.GetDuration("door.opening_duration"), viper.GetDuration("door.closing_duration"))
+		"type": viper.GetString("door.motor.type"),
+	}).Infoln("Creating the motor")
+	switch viper.GetString("door.motor.type") {
+	case "l293d":
+		motor = l293d.NewL293D(viper.GetInt("door.motor.pin_1A"), viper.GetInt("door.motor.pin_1B"), viper.GetInt("door.motor.pin_enable1"))
+	case "bts7960":
+		motor = bts7960.NewBTS7960(viper.GetInt("door.motor.forward_PWM"), viper.GetInt("door.motor.backward_PWM"), viper.GetInt("door.motor.forward_enable"), viper.GetInt("door.motor.backward_enable"))
+	}
+	logrus.Infoln("Successfully created the motor")
+
+	// Door
+	logrus.Infoln("Creating the door")
+	d := door.NewDoor(motor, viper.GetDuration("door.opening_duration"), viper.GetDuration("door.closing_duration"))
 	logrus.Infoln("Successfully created the door")
 
 	// Notifiers

pkg/door/door.go

@@ -1,8 +1,82 @@
 package door
 
-// Door operation contract.
-type Door interface {
-	Open() error
-	Close() error
-	Stop() error
+import (
+	"context"
+	"time"
+
+	"github.com/fallais/gocoop/pkg/motor"
+
+	"github.com/sirupsen/logrus"
+)
+
+//------------------------------------------------------------------------------
+// Structure
+//------------------------------------------------------------------------------
+
+// Door is a physical door manipulated with a motor.
+type door struct {
+	motor           motor.Motor
+	openingDuration time.Duration
+	closingDuration time.Duration
+}
+
+//------------------------------------------------------------------------------
+// Factory
+//------------------------------------------------------------------------------
+
+// NewDoor returns a new Door.
+func NewDoor(motor motor.Motor, openingDuration, closingDuration time.Duration) Door {
+	return &door{
+		motor:           motor,
+		openingDuration: openingDuration,
+		closingDuration: closingDuration,
+	}
+}
+
+//------------------------------------------------------------------------------
+// Functions
+//------------------------------------------------------------------------------
+
+// Open the door
+func (d *door) Open() error {
+	logrus.Infoln("Opening the door")
+
+	// Create context
+	ctx, cancel := context.WithTimeout(context.Background(), d.openingDuration)
+	defer cancel()
+
+	// Run the motor in forward
+	d.motor.Forward(ctx)
+
+	logrus.Infoln("Door has been opened")
+
+	return nil
+}
+
+// Close the door
+func (d *door) Close() error {
+	logrus.Infoln("Closing the door")
+
+	// Create context
+	ctx, cancel := context.WithTimeout(context.Background(), d.closingDuration)
+	defer cancel()
+
+	// Run the motor in backward
+	d.motor.Backward(ctx)
+
+	logrus.Infoln("Door has been closed")
+
+	return nil
+}
+
+// Stop the door
+func (d *door) Stop() error {
+	logrus.Infoln("Stopping the door")
+
+	// Stop the motor
+	d.motor.Stop()
+
+	logrus.Infoln("Door has been stopped")
+
+	return nil
 }