Skip to content
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

rtl8720dn: add SetupAndConnectToAccessPoint() #436

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

rtl8720dn: add SetupAndConnectToAccessPoint() #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 3 additions & 24 deletions examples/rtl8720dn/tlsclient/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import (
"strings"
"time"

"tinygo.org/x/drivers/net"
"tinygo.org/x/drivers/examples/rtl8720dn"
"tinygo.org/x/drivers/net/http"
"tinygo.org/x/drivers/rtl8720dn"
)

// You can override the setting with the init() in another source code.
Expand Down Expand Up @@ -53,12 +52,6 @@ CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
-----END CERTIFICATE-----
`

var buf [0x1000]byte

var lastRequestTime time.Time
var conn net.Conn
var adaptor *rtl8720dn.RTL8720DN

func main() {
err := run()
for err != nil {
Expand All @@ -68,26 +61,12 @@ func main() {
}

func run() error {
rtl, err := setupRTL8720DN()
rtl8720dn.Debug(debug)
rtl, err := rtl8720dn.SetupAndConnectToAccessPoint(ssid, password, 10*time.Second)
if err != nil {
return err
}
rtl.SetRootCA(&test_root_ca)
net.UseDriver(rtl)
http.SetBuf(buf[:])

err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
if err != nil {
return err
}

ip, subnet, gateway, err := rtl.GetIP()
if err != nil {
return err
}
fmt.Printf("IP Address : %s\r\n", ip)
fmt.Printf("Mask : %s\r\n", subnet)
fmt.Printf("Gateway : %s\r\n", gateway)

// You can send and receive cookies in the following way
// import "tinygo.org/x/drivers/net/http/cookiejar"
Expand Down
72 changes: 0 additions & 72 deletions examples/rtl8720dn/tlsclient/wioterminal.go
View file
Open in desktop

This file was deleted.

27 changes: 5 additions & 22 deletions examples/rtl8720dn/webclient-tinyterm/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"tinygo.org/x/drivers/net"
"tinygo.org/x/drivers/examples/rtl8720dn"
"tinygo.org/x/drivers/net/http"
"tinygo.org/x/tinyfont/proggy"
"tinygo.org/x/tinyterm"
Expand All @@ -30,7 +30,7 @@ var (
)

var (
terminal = tinyterm.NewTerminal(display)
terminal *tinyterm.Terminal

black = color.RGBA{0, 0, 0, 255}
white = color.RGBA{255, 255, 255, 255}
Expand All @@ -41,12 +41,10 @@ var (
font = &proggy.TinySZ8pt7b
)

var buf [0x400]byte

func main() {
display.FillScreen(black)
backlight.High()

terminal = tinyterm.NewTerminal(display)
terminal.Configure(&tinyterm.Config{
Font: font,
FontHeight: 10,
Expand All @@ -65,29 +63,14 @@ func run() error {
if debug {
fmt.Fprintf(terminal, "Running in debug mode.\r\n")
fmt.Fprintf(terminal, "A serial connection is required to continue execution.\r\n")
rtl8720dn.Debug(true)
}
rtl, err := setupRTL8720DN()
if err != nil {
return err
}
net.UseDriver(rtl)
http.SetBuf(buf[:])

fmt.Fprintf(terminal, "ConnectToAP()\r\n")
err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
_, err := rtl8720dn.SetupAndConnectToAccessPoint(ssid, password, 10*time.Second)
if err != nil {
return err
}
fmt.Fprintf(terminal, "connected\r\n\r\n")

ip, subnet, gateway, err := rtl.GetIP()
if err != nil {
return err
}
fmt.Fprintf(terminal, "IP Address : %s\r\n", ip)
fmt.Fprintf(terminal, "Mask : %s\r\n", subnet)
fmt.Fprintf(terminal, "Gateway : %s\r\n", gateway)

// You can send and receive cookies in the following way
// import "tinygo.org/x/drivers/net/http/cookiejar"
// jar, err := cookiejar.New(nil)
Expand Down
88 changes: 4 additions & 84 deletions examples/rtl8720dn/webclient-tinyterm/wioterminal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,95 +4,15 @@
package main

import (
"device/sam"
"machine"
"runtime/interrupt"
"time"

"tinygo.org/x/drivers/examples/ili9341/initdisplay"
"tinygo.org/x/drivers/ili9341"
"tinygo.org/x/drivers/rtl8720dn"
)

var (
uart UARTx
)

var (
display = ili9341.NewSPI(
machine.SPI3,
machine.LCD_DC,
machine.LCD_SS_PIN,
machine.LCD_RESET,
)

backlight = machine.LCD_BACKLIGHT
display *ili9341.Device
)

func init() {
machine.SPI3.Configure(machine.SPIConfig{
SCK: machine.LCD_SCK_PIN,
SDO: machine.LCD_SDO_PIN,
SDI: machine.LCD_SDI_PIN,
Frequency: 40000000,
})
display.Configure(ili9341.Config{})

backlight.Configure(machine.PinConfig{machine.PinOutput})
}

func handleInterrupt(interrupt.Interrupt) {
// should reset IRQ
uart.Receive(byte((uart.Bus.DATA.Get() & 0xFF)))
uart.Bus.INTFLAG.SetBits(sam.SERCOM_USART_INT_INTFLAG_RXC)
}

func setupRTL8720DN() (*rtl8720dn.RTL8720DN, error) {
machine.RTL8720D_CHIP_PU.Configure(machine.PinConfig{Mode: machine.PinOutput})
machine.RTL8720D_CHIP_PU.Low()
time.Sleep(100 * time.Millisecond)
machine.RTL8720D_CHIP_PU.High()
time.Sleep(1000 * time.Millisecond)
if debug {
waitSerial()
}

uart = UARTx{
UART: &machine.UART{
Buffer: machine.NewRingBuffer(),
Bus: sam.SERCOM0_USART_INT,
SERCOM: 0,
},
}

uart.Interrupt = interrupt.New(sam.IRQ_SERCOM0_2, handleInterrupt)
uart.Configure(machine.UARTConfig{TX: machine.PB24, RX: machine.PC24, BaudRate: 614400})

rtl := rtl8720dn.New(uart)
rtl.Debug(debug)

_, err := rtl.Rpc_tcpip_adapter_init()
if err != nil {
return nil, err
}

return rtl, nil
}

// Wait for user to open serial console
func waitSerial() {
for !machine.Serial.DTR() {
time.Sleep(100 * time.Millisecond)
}
}

type UARTx struct {
*machine.UART
}

func (u UARTx) Read(p []byte) (n int, err error) {
if u.Buffered() == 0 {
time.Sleep(1 * time.Millisecond)
return 0, nil
}
return u.UART.Read(p)
display = initdisplay.InitDisplay()
display.SetRotation(ili9341.Rotation0)
}
21 changes: 2 additions & 19 deletions examples/rtl8720dn/webclient/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"tinygo.org/x/drivers/net"
"tinygo.org/x/drivers/examples/rtl8720dn"
"tinygo.org/x/drivers/net/http"
)

Expand All @@ -25,8 +25,6 @@ var (
debug = false
)

var buf [0x400]byte

func main() {
err := run()
for err != nil {
Expand All @@ -36,25 +34,10 @@ func main() {
}

func run() error {
rtl, err := setupRTL8720DN()
if err != nil {
return err
}
net.UseDriver(rtl)
http.SetBuf(buf[:])

err = rtl.ConnectToAccessPoint(ssid, password, 10*time.Second)
if err != nil {
return err
}

ip, subnet, gateway, err := rtl.GetIP()
_, err := rtl8720dn.SetupAndConnectToAccessPoint(ssid, password, 10*time.Second)
if err != nil {
return err
}
fmt.Printf("IP Address : %s\r\n", ip)
fmt.Printf("Mask : %s\r\n", subnet)
fmt.Printf("Gateway : %s\r\n", gateway)

// You can send and receive cookies in the following way
// import "tinygo.org/x/drivers/net/http/cookiejar"
Expand Down
Loading