Skip to content

Commit

Permalink
add tone to display
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonygilkerson
tonygilkerson committed Apr 1, 2024
1 parent 0fa7604 commit e8e1ad8
Show file tree
Hide file tree
Showing 2 changed files with 77 additions and 48 deletions.
41 changes: 35 additions & 6 deletions cmd/dsp/epaper/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"github.com/tonygilkerson/mbx-iot/internal/umsg"
"github.com/tonygilkerson/mbx-iot/pkg/iot"
"tinygo.org/x/drivers/waveshare-epd/epd4in2"
"tinygo.org/x/drivers/tone"
)

const (
Expand All @@ -35,6 +36,7 @@ func main() {
var uartOutTx machine.Pin = machine.GP4 // UART1
var uartOutRx machine.Pin = machine.GP5 // UART1
var neo machine.Pin = machine.GP6 // Neopixel DIN
var speakerPin machine.Pin = machine.GP7 // Speaker DIN

var dc machine.Pin = machine.GP11 // pin15
var rst machine.Pin = machine.GP12 // pin16
Expand All @@ -45,6 +47,23 @@ func main() {

var led machine.Pin = machine.GPIO25 // GP25 machine.LED

//
// run light
//
led.Configure(machine.PinConfig{Mode: machine.PinOutput})
dsp.RunLight(led, 10)
log.SetFlags(log.LstdFlags | log.Lshortfile)

//
// PWM for tone alarm
//
speaker, err := tone.New(machine.PWM3, speakerPin)
if err != nil {
log.Panicln("failed to configure PWM")
}
soundSiren(speaker)


//
// Neo Pixel
//
Expand Down Expand Up @@ -83,12 +102,7 @@ func main() {
uartIn := machine.UART0
uartOut := machine.UART1

//
// run light
//
led.Configure(machine.PinConfig{Mode: machine.PinOutput})
dsp.RunLight(led, 10)
log.SetFlags(log.LstdFlags | log.Lshortfile)


/////////////////////////////////////////////////////////////////////////////
// Broker
Expand Down Expand Up @@ -185,6 +199,7 @@ func main() {
// Get someone's attention
log.Println("dsp.epaper.main: Nightrider")
dsp.NeoNightrider(neo)
soundSiren(speaker)
isDirtyCount += 1
} else {
isDirtyCount = 0
Expand Down Expand Up @@ -250,3 +265,17 @@ func consumeAllStatusFromChToUpdateContent(statusCh chan umsg.StatusMsg, content
}
}
}

func soundSiren(speaker tone.Speaker) {
for i := 0; i < 10; i++ {
log.Println("nee")
speaker.SetNote(tone.B5)
time.Sleep(time.Second / 2)

log.Println("naw")
speaker.SetNote(tone.A5)
time.Sleep(time.Second / 2)

}
speaker.Stop()
}
84 changes: 42 additions & 42 deletions cmd/dsp/epaper/wiring.md
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@
# Wiring

| Pico Board Pin | Pico GPIO | e-Paper Dsp | Buttons | Com Pico |neo
| -------------- | -------------- | ----------- | --------------------------------- | -------------- |----
| 1 | GP0 (UART0 TX) | | | GP5 (UART1 RX) |
| 2 | GP1 (UART0 RX) | | | GP4 (UART1 TX) |
| 3 | GND | | | |
| 4 | GP2 | | MbxDoorOpenedAck PinInputPulldown | |
| 5 | GP3 | | Request PinInputPulldown | |
| 6 | GP4 | | | GP1 |
| 7 | GP5 | | | GP0 |
| 8 | GND | | | |
| 9 | GP6 | | | | DIN
| 10 | GP7 | | | |
| 11 | GP8 | | | |
| 12 | GP9 | | | |
| 13 | GND | | | |
| 14 | GP10 | | | |
| 15 | GP11 | DC | | |
| 16 | GP12 | RST | | |
| 17 | GP13 | BUSY | | |
| 18 | GND | | | |
| 19 | GP14 | | | |
| 20 | GP15 | | | |
| 21 | GP16 | | | |
| 22 | GP17 | CS | | |
| 23 | GND | | | |
| 24 | GP18 | CLK | | |
| 25 | GP19 | DIN | | |
| 26 | GP20 | | | |
| 27 | GP21 | | | |
| 28 | GND | | | |
| 29 | GP22 | | | |
| 30 | RUN | | | |
| 31 | GP26 | | | |
| 32 | GP27 | | | |
| 33 | GND | | | |
| 34 | GP28 | | | |
| 35 | ACD_VREF | | | |
| 36 | 3v3 (out) | VIN | | |
| 37 | 3v3 (EN) | | | |
| 38 | GND | GND | | | GND
| 39 | 5v0 (VSYS) | | | | 5v
| 40 | 5v0 (VBUS) | | | |
| Pico Board Pin | Pico GPIO | e-Paper Dsp | Buttons | Com Pico | neo | tone |
| -------------- | -------------- | ----------- | --------------------------------- | -------------- | --- | ---- |
| 1 | GP0 (UART0 TX) | | | GP5 (UART1 RX) | | |
| 2 | GP1 (UART0 RX) | | | GP4 (UART1 TX) | | |
| 3 | GND | | | | | |
| 4 | GP2 | | MbxDoorOpenedAck PinInputPulldown | | | |
| 5 | GP3 | | Request PinInputPulldown | | | |
| 6 | GP4 | | | GP1 | | |
| 7 | GP5 | | | GP0 | | |
| 8 | GND | | | | | GND |
| 9 | GP6 | | | | DIN | |
| 10 | GP7 | | | | | Pos |
| 11 | GP8 | | | | | |
| 12 | GP9 | | | | | |
| 13 | GND | | | | | |
| 14 | GP10 | | | | | |
| 15 | GP11 | DC | | | | |
| 16 | GP12 | RST | | | | |
| 17 | GP13 | BUSY | | | | |
| 18 | GND | | | | | |
| 19 | GP14 | | | | | |
| 20 | GP15 | | | | | |
| 21 | GP16 | | | | | |
| 22 | GP17 | CS | | | | |
| 23 | GND | | | | | |
| 24 | GP18 | CLK | | | | |
| 25 | GP19 | DIN | | | | |
| 26 | GP20 | | | | | |
| 27 | GP21 | | | | | |
| 28 | GND | | | | | |
| 29 | GP22 | | | | | |
| 30 | RUN | | | | | |
| 31 | GP26 | | | | | |
| 32 | GP27 | | | | | |
| 33 | GND | | | | | |
| 34 | GP28 | | | | | |
| 35 | ACD_VREF | | | | | |
| 36 | 3v3 (out) | VIN | | | | |
| 37 | 3v3 (EN) | | | | | |
| 38 | GND | GND | | | GND | |
| 39 | 5v0 (VSYS) | | | | 5v | |
| 40 | 5v0 (VBUS) | | | | | |

Not exposed as board pins

Expand Down

0 comments on commit e8e1ad8

Please sign in to comment.