Skip to content

feature: add displays subpackage #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 28, 2024
Merged

feature: add displays subpackage #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f35a06d
feature: move all currently known supported boards with displays into…
deadprogram Oct 26, 2024
f9f928e
feature: add Display() method for displays that require it
deadprogram Oct 27, 2024
0d5a582
examples: call terminal.Display() method to ensure display updates
deadprogram Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/initdisplay/badger2040.go → displays/badger2040.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//go:build badger2040 || badger2040_w

package initdisplay
package displays

import (
"machine"
Expand All @@ -9,7 +9,7 @@ import (
"tinygo.org/x/tinyterm"
)

func InitDisplay() tinyterm.Displayer {
func Init() tinyterm.Displayer {
led3v3 := machine.ENABLE_3V3
led3v3.Configure(machine.PinConfig{Mode: machine.PinOutput})
led3v3.High()
Expand Down
4 changes: 2 additions & 2 deletions examples/initdisplay/clue.go → displays/clue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//go:build clue_alpha

package initdisplay
package displays

import (
"image/color"
Expand All @@ -10,7 +10,7 @@ import (
"tinygo.org/x/tinyterm"
)

func InitDisplay() tinyterm.Displayer {
func Init() tinyterm.Displayer {
machine.SPI1.Configure(machine.SPIConfig{
Frequency: 8000000,
SCK: machine.TFT_SCK,
Expand Down
4 changes: 2 additions & 2 deletions examples/initdisplay/gopher-badge.go → displays/gopher-badge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//go:build gopher_badge

package initdisplay
package displays

import (
"image/color"
Expand All @@ -10,7 +10,7 @@ import (
"tinygo.org/x/tinyterm"
)

func InitDisplay() tinyterm.Displayer {
func Init() tinyterm.Displayer {
machine.SPI0.Configure(machine.SPIConfig{
Frequency: 8000000,
Mode: 0,
Expand Down
6 changes: 3 additions & 3 deletions examples/initdisplay/pybadge.go → displays/pybadge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//go:build pybadge

package initdisplay
package displays

import (
"image/color"
Expand All @@ -10,7 +10,7 @@ import (
"tinygo.org/x/tinyterm"
)

func InitDisplay() tinyterm.Displayer {
func Init() tinyterm.Displayer {
machine.SPI1.Configure(machine.SPIConfig{
SCK: machine.SPI1_SCK_PIN,
SDO: machine.SPI1_SDO_PIN,
Expand All @@ -20,7 +20,7 @@ func InitDisplay() tinyterm.Displayer {

display := st7735.New(machine.SPI1, machine.TFT_RST, machine.TFT_DC, machine.TFT_CS, machine.TFT_LITE)
display.Configure(st7735.Config{
Rotation: st7735.ROTATION_180,
Rotation: st7735.ROTATION_90,
})
display.FillScreen(color.RGBA{0, 0, 0, 255})

Expand Down
4 changes: 2 additions & 2 deletions examples/initdisplay/pyportal.go → displays/pyportal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//go:build pyportal

package initdisplay
package displays

import (
"image/color"
Expand All @@ -10,7 +10,7 @@ import (
"tinygo.org/x/tinyterm"
)

func InitDisplay() tinyterm.Displayer {
func Init() tinyterm.Displayer {
display := ili9341.NewParallel(
machine.LCD_DATA0,
machine.TFT_WR,
Expand Down
4 changes: 2 additions & 2 deletions examples/initdisplay/wioterminal.go → displays/wioterminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//go:build wioterminal

package initdisplay
package displays

import (
"image/color"
Expand All @@ -10,7 +10,7 @@ import (
"tinygo.org/x/tinyterm"
)

func InitDisplay() tinyterm.Displayer {
func Init() tinyterm.Displayer {
machine.SPI3.Configure(machine.SPIConfig{
SCK: machine.LCD_SCK_PIN,
SDO: machine.LCD_SDO_PIN,
Expand Down
8 changes: 4 additions & 4 deletions examples/basic/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,27 @@ import (

"tinygo.org/x/tinyfont/proggy"
"tinygo.org/x/tinyterm"
"tinygo.org/x/tinyterm/examples/initdisplay"
"tinygo.org/x/tinyterm/displays"
)

var (
font = &proggy.TinySZ8pt7b
)

func main() {
display := initdisplay.InitDisplay()
display := displays.Init()
terminal := tinyterm.NewTerminal(display)

terminal.Configure(&tinyterm.Config{
Font: font,
FontHeight: 10,
FontOffset: 6,
UseSoftwareScroll: initdisplay.NeedsSoftwareScroll(),
UseSoftwareScroll: displays.NeedsSoftwareScroll(),
})
for {
time.Sleep(time.Second)

fmt.Fprintf(terminal, "\ntime: %d", time.Now().UnixNano())
display.Display()
terminal.Display()
}
}
6 changes: 4 additions & 2 deletions examples/colors/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (

"tinygo.org/x/tinyfont/proggy"
"tinygo.org/x/tinyterm"
"tinygo.org/x/tinyterm/examples/initdisplay"
"tinygo.org/x/tinyterm/displays"
)

var (
font = &proggy.TinySZ8pt7b
)

func main() {
display := initdisplay.InitDisplay()
display := displays.Init()
terminal := tinyterm.NewTerminal(display)

terminal.Configure(&tinyterm.Config{
Expand Down Expand Up @@ -49,6 +49,8 @@ func main() {
}
terminal.Write([]byte(strings.Repeat(" ", 12) + "|\n"))
terminal.Write([]byte(" " + strings.Repeat("\xaf", 36) + "\n"))

terminal.Display()
time.Sleep(5 * time.Second)
}

Expand Down
6 changes: 4 additions & 2 deletions examples/httpclient/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"tinygo.org/x/drivers/netlink/probe"
"tinygo.org/x/tinyfont/proggy"
"tinygo.org/x/tinyterm"
"tinygo.org/x/tinyterm/examples/initdisplay"
"tinygo.org/x/tinyterm/displays"
)

var (
Expand All @@ -39,7 +39,7 @@ var (
)

func main() {
display := initdisplay.InitDisplay()
display := displays.Init()
terminal := tinyterm.NewTerminal(display)

terminal.Configure(&tinyterm.Config{
Expand Down Expand Up @@ -90,6 +90,8 @@ func main() {

cnt++
fmt.Fprintf(terminal, "-------- %d --------\r\n", cnt)

terminal.Display()
time.Sleep(10 * time.Second)
}
}
6 changes: 6 additions & 0 deletions tinyterm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,12 @@ func (t *Terminal) Println(args ...interface{}) (n int, err error) {
return fmt.Fprintln(t, args...)
}

// Display the terminal on the display. Must be called after writing to the
// terminal to see the changes.
func (t *Terminal) Display() {
t.display.Display()
}

type state uint8

const (
Expand Down
Loading