Skip to content

Commit

Permalink
fix(src/machine/nrf52xxx): tests
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Schroeder <[email protected]>
  • Loading branch information
milkpirate committed Dec 16, 2024
1 parent 7121e23 commit 72d63a4
Show file tree
Hide file tree
Showing 4 changed files with 106 additions and 22 deletions.
5 changes: 4 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
github.com/mattn/go-colorable v0.1.13
github.com/mattn/go-tty v0.0.4
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3
github.com/stretchr/testify v1.8.4
github.com/tetratelabs/wazero v1.6.0
go.bug.st/serial v1.6.0
golang.org/x/net v0.26.0
Expand All @@ -26,12 +27,14 @@ require (
require (
github.com/chromedp/sysutil v1.0.0 // indirect
github.com/creack/goselect v0.1.2 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/text v0.16.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
3 changes: 3 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moA
github.com/creack/goselect v0.1.2 h1:2DNy14+JPjRBgPzAd1thbQp4BSIihxcBf0IXhQXDRa0=
github.com/creack/goselect v0.1.2/go.mod h1:a/NhLweNvqIYMuxcMOuWY516Cimucms3DglDzQP3hKY=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
Expand Down Expand Up @@ -44,6 +45,7 @@ github.com/mattn/go-tty v0.0.4/go.mod h1:u5GGXBtZU6RQoKV8gY5W6UhMudbR5vXnUe7j3px
github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5 h1:1SoBaSPudixRecmlHXb/GxmaD3fLMtHIDN13QujwQuc=
github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 h1:aQKxg3+2p+IFXXg97McgDGT5zcMrQoi0EICZs8Pgchs=
github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3/go.mod h1:9/etS5gpQq9BJsJMWg1wpLbfuSnkm8dPF6FdW2JXVhA=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
Expand Down Expand Up @@ -74,5 +76,6 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
tinygo.org/x/go-llvm v0.0.0-20240627184919-3b50c76783a8 h1:bLsZXRUBavt++CJlMN7sppNziqu3LyamESLhFJcpqFQ=
tinygo.org/x/go-llvm v0.0.0-20240627184919-3b50c76783a8/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=
51 changes: 30 additions & 21 deletions src/machine/machine_nrf52xxx.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,15 @@ import (
)

const (
SPI_CPHA0_CPOL0 SPIMode = iota
SPI_CPHA1_CPOL0
SPI_CPHA1_CPOL1
SPI_CPHA0_CPOL1
SPI_MODE_CPHA0_CPOL0 SPIMode = iota
SPI_MODE_CPHA1_CPOL0
SPI_MODE_CPHA1_CPOL1
SPI_MODE_CPHA0_CPOL1

SPI_MODE_CPHA_FALLING_EDGE_CPOL_ACTIVE_LOW = SPI_MODE_CPHA0_CPOL0
SPI_MODE_CPHA_RISING_EDGE_CPOL_ACTIVE_LOW = SPI_MODE_CPHA1_CPOL0
SPI_MODE_CPHA_RISING_EDGE_CPOL_ACTIVE_HIGH = SPI_MODE_CPHA1_CPOL1
SPI_MODE_CPHA_FALLING_EDGE_CPOL_ACTIVE_HIGH = SPI_MODE_CPHA0_CPOL1
)

// There are 3 SPI interfaces on the NRF528xx.
Expand All @@ -24,21 +29,23 @@ var (

type SPIMode uint8

func (m *SPIMode) ApplyTo(conf uint32) uint32 {
// see https://de.wikipedia.org/wiki/Serial_Peripheral_Interface#/media/Datei:SPI_timing_diagram2.svg
func (m SPIMode) ApplyTo(conf uint32) uint32 {
// See:
// - https://de.wikipedia.org/wiki/Serial_Peripheral_Interface#/media/Datei:SPI_timing_diagram2.svg
// - https://docs-be.nordicsemi.com/bundle/ps_nrf52840/attach/nRF52840_PS_v1.11.pdf?_LANG=enus page 716, table 43
switch m {
case SPI_CPHA1_CPOL0:
case SPI_MODE_CPHA0_CPOL0:
conf &^= (nrf.SPIM_CONFIG_CPOL_ActiveHigh << nrf.SPIM_CONFIG_CPOL_Pos)
conf &^= (nrf.SPIM_CONFIG_CPHA_Leading << nrf.SPIM_CONFIG_CPHA_Pos)
case SPI_MODE_CPHA1_CPOL0:
conf &^= (nrf.SPIM_CONFIG_CPOL_ActiveHigh << nrf.SPIM_CONFIG_CPOL_Pos)
conf |= (nrf.SPIM_CONFIG_CPHA_Trailing << nrf.SPIM_CONFIG_CPHA_Pos)
case SPI_CPHA1_CPOL1:
case SPI_MODE_CPHA1_CPOL1:
conf |= (nrf.SPIM_CONFIG_CPOL_ActiveLow << nrf.SPIM_CONFIG_CPOL_Pos)
conf &^= (nrf.SPIM_CONFIG_CPHA_Leading << nrf.SPIM_CONFIG_CPHA_Pos)
case SPI_CPHA0_CPOL1:
case SPI_MODE_CPHA0_CPOL1:
conf |= (nrf.SPIM_CONFIG_CPOL_ActiveLow << nrf.SPIM_CONFIG_CPOL_Pos)
conf |= (nrf.SPIM_CONFIG_CPHA_Trailing << nrf.SPIM_CONFIG_CPHA_Pos)
case SPI_CPHA0_CPOL0:
conf &^= (nrf.SPIM_CONFIG_CPOL_ActiveHigh << nrf.SPIM_CONFIG_CPOL_Pos)
conf &^= (nrf.SPIM_CONFIG_CPHA_Leading << nrf.SPIM_CONFIG_CPHA_Pos)
}
return conf
}
Expand All @@ -63,15 +70,15 @@ func (a *ADC) Configure(config ADCConfig) {
var resolution uint32
switch config.Resolution {
case 8:
resolution = SAADC_RESOLUTION_VAL_8bit
resolution = nrf.SAADC_RESOLUTION_VAL_8bit
case 10:
resolution = SAADC_RESOLUTION_VAL_10bit
resolution = nrf.SAADC_RESOLUTION_VAL_10bit
case 12:
resolution = SAADC_RESOLUTION_VAL_12bit
resolution = nrf.SAADC_RESOLUTION_VAL_12bit
case 14:
resolution = SAADC_RESOLUTION_VAL_14bit
resolution = nrf.SAADC_RESOLUTION_VAL_14bit
default:
resolution = SAADC_RESOLUTION_VAL_12bit
resolution = nrf.SAADC_RESOLUTION_VAL_12bit
}
nrf.SAADC.RESOLUTION.Set(resolution)

Expand Down Expand Up @@ -229,9 +236,11 @@ func (spi *SPI) Configure(config SPIConfig) error {
// set frequency
var freq uint32
switch {
case config.Frequency == 0: // default
freq = nrf.SPIM_FREQUENCY_FREQUENCY_M4
case config.Frequency >= 8000000:
freq = nrf.SPIM_FREQUENCY_FREQUENCY_M8
case config.Frequency >= 4000000, 0: // default
case config.Frequency >= 4000000:
freq = nrf.SPIM_FREQUENCY_FREQUENCY_M4
case config.Frequency >= 2000000:
freq = nrf.SPIM_FREQUENCY_FREQUENCY_M2
Expand All @@ -254,7 +263,7 @@ func (spi *SPI) Configure(config SPIConfig) error {
}

// set mode
conf = config.Mode.Apply(conf)
conf = config.Mode.ApplyTo(conf)
spi.Bus.CONFIG.Set(conf)

// set pins
Expand Down Expand Up @@ -329,12 +338,12 @@ func (spi *SPI) Tx(w, r []byte) error {

// Read implements [io.Reader]. And reads as many bytes as the given buffer is long
func (spi *SPI) Read(r []byte) (int, error) {
return spi.Tx(nil, r), len(r)
return len(r), spi.Tx(nil, r)
}

// Write implements [io.Writer]. And writes as long as there are bytes in w.
func (spi *SPI) Write(w []byte) (int, error) {
return spi.Tx(w, nil), len(w)
return len(w), spi.Tx(w, nil)
}

// PWM is one PWM peripheral, which consists of a counter and multiple output
Expand Down
69 changes: 69 additions & 0 deletions src/machine/machine_nrf52xxx_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
//go:build nrf52 || nrf52840 || nrf52833

package machine

import (
"github.com/stretchr/testify/require"
"testing"
)

func Test_SPIMode_ApplyTo(t *testing.T) {
t.Parallel()

type args struct {
mode SPIMode
config uint32
}
type want struct {
config uint32
}

cases := map[string]struct {
args
want
}{
"Mode0": {
args: args{
mode: SPI_MODE_CPHA0_CPOL0,
config: 0b_1111_1111_1111_1111_1111_1111_1111_1111,
},
want: want{
config: 0b_1111_1111_1111_1111_1111_1111_1111_1111,
},
},
"Mode1": {
args: args{
mode: SPI_MODE_CPHA1_CPOL0,
config: 0b_1111_1111_1111_1111_1111_1111_1111_1111,
},
want: want{
config: 0b_1111_1111_1111_1111_1111_1111_1111_1111,
},
},
"Mode2": {
args: args{
mode: SPI_MODE_CPHA1_CPOL1,
config: 0b_1111_1111_1111_1111_1111_1111_1111_1111,
},
want: want{
config: 0b_0000_0000_0000_0000_0000_0000_0000_0000,
},
},
"Mode3": {
args: args{
mode: SPI_MODE_CPHA0_CPOL1,
config: 0b_0000_0000_0000_0000_0000_0000_0000_0000,
},
want: want{
config: 0b_000_0000_0000_0000_0000_0000_0000_0000,
},
},
}

for name, tc := range cases {
t.Run(name, func(t *testing.T) {
actl := tc.args.mode.ApplyTo(tc.args.config)
require.Equal(t, tc.want.config, actl)
})
}
}

0 comments on commit 72d63a4

Please sign in to comment.