Skip to content

Commit 155e131

Browse files
rojerrojer
committed
Revert "Improve ROM connection setup on ESP32"
This reverts commit 64925a7.
1 parent 64925a7 commit 155e131

File tree

9 files changed

+16
-23
lines changed

9 files changed

+16
-23
lines changed

‎cli/console.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ import (
4242
"github.com/mongoose-os/mos/common/mgrpc/codec"
4343
"github.com/mongoose-os/mos/common/mgrpc/frame"
4444

45+
"github.com/cesanta/go-serial/serial"
4546
"github.com/juju/errors"
46-
"github.com/mongoose-os/go-serial/serial"
4747
flag "github.com/spf13/pflag"
4848
)
4949

‎cli/flash/cc3200/flasher.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ import (
99
"fmt"
1010
"sort"
1111

12+
"github.com/cesanta/go-serial/serial"
1213
"github.com/juju/errors"
13-
"github.com/mongoose-os/go-serial/serial"
14-
14+
"github.com/mongoose-os/mos/common/fwbundle"
1515
"github.com/mongoose-os/mos/cli/flash/cc32xx"
1616
"github.com/mongoose-os/mos/cli/flash/common"
17-
"github.com/mongoose-os/mos/common/fwbundle"
1817
)
1918

2019
type FlashOpts struct {

‎cli/flash/cc3220/flasher.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
package cc3220
99

1010
import (
11+
"github.com/cesanta/go-serial/serial"
1112
"github.com/juju/errors"
12-
"github.com/mongoose-os/go-serial/serial"
13-
13+
"github.com/mongoose-os/mos/common/fwbundle"
1414
"github.com/mongoose-os/mos/cli/flash/cc32xx"
1515
"github.com/mongoose-os/mos/cli/flash/common"
16-
"github.com/mongoose-os/mos/common/fwbundle"
1716
)
1817

1918
type FlashOpts struct {

‎cli/flash/cc32xx/rom_client.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,10 @@ import (
2424
"io/ioutil"
2525
"time"
2626

27+
"github.com/cesanta/go-serial/serial"
2728
"github.com/juju/errors"
28-
"github.com/mongoose-os/go-serial/serial"
29-
glog "k8s.io/klog/v2"
30-
3129
"github.com/mongoose-os/mos/cli/flash/common"
30+
glog "k8s.io/klog/v2"
3231
)
3332

3433
type loaderCmd uint8

‎cli/flash/esp/flasher/flasher_client.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,14 @@ import (
2828
"time"
2929
"unsafe"
3030

31+
"github.com/cesanta/go-serial/serial"
3132
"github.com/juju/errors"
32-
"github.com/mongoose-os/go-serial/serial"
33-
glog "k8s.io/klog/v2"
34-
3533
"github.com/mongoose-os/mos/cli/flash/common"
3634
"github.com/mongoose-os/mos/cli/flash/esp"
3735
"github.com/mongoose-os/mos/cli/flash/esp/rom_client"
3836
"github.com/mongoose-os/mos/cli/flash/esp32"
3937
"github.com/mongoose-os/mos/cli/flash/esp8266"
38+
glog "k8s.io/klog/v2"
4039
)
4140

4241
const (

‎cli/flash/esp/rom_client/rom_client.go

+3-6
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@ import (
2626
"math"
2727
"time"
2828

29+
"github.com/cesanta/go-serial/serial"
2930
"github.com/juju/errors"
30-
"github.com/mongoose-os/go-serial/serial"
31-
glog "k8s.io/klog/v2"
32-
3331
"github.com/mongoose-os/mos/cli/flash/common"
3432
"github.com/mongoose-os/mos/cli/flash/esp"
3533
"github.com/mongoose-os/mos/cli/flash/esp32"
3634
"github.com/mongoose-os/mos/cli/flash/esp8266"
35+
glog "k8s.io/klog/v2"
3736
)
3837

3938
const (
@@ -200,7 +199,6 @@ func (rc *ROMClient) sendCommand(cmd romCmd, arg []byte, csum uint8) error {
200199
binary.Write(cmdBuf, binary.LittleEndian, uint32(csum)) // Yes, uint8 -> uint32
201200
cmdBuf.Write(arg)
202201
_, err := rc.srw.Write(cmdBuf.Bytes())
203-
rc.sd.Flush()
204202
return err
205203
}
206204

@@ -280,7 +278,6 @@ func (rc *ROMClient) trySync() error {
280278
if err := rc.sendCommand(cmdSync, argBuf.Bytes(), 0); err != nil {
281279
return errors.Trace(err)
282280
}
283-
rc.sd.Flush()
284281
for i := 1; i <= 8; i++ {
285282
var r *romResponse
286283
for {
@@ -308,7 +305,7 @@ func (rc *ROMClient) trySync() error {
308305
func (rc *ROMClient) sync() error {
309306
var err error
310307
// Usually there is no response to the first command, and the second is successful.
311-
for i := 0; i < 5; i++ {
308+
for i := 0; i < 2; i++ {
312309
err = rc.trySync()
313310
if err == nil {
314311
return nil

‎common/mgrpc/codec/serial.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"sync"
2323
"time"
2424

25+
"github.com/cesanta/go-serial/serial"
2526
"github.com/juju/errors"
26-
"github.com/mongoose-os/go-serial/serial"
2727
glog "k8s.io/klog/v2"
2828
)
2929

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ require (
1010
github.com/Microsoft/hcsshim v0.9.0 // indirect
1111
github.com/ProtonMail/go-crypto v0.0.0-20210920160938-87db9fbc61c7 // indirect
1212
github.com/aws/aws-sdk-go v1.41.4
13+
github.com/cesanta/go-serial v0.0.0-20170105152649-4dff7aff019e
1314
github.com/cesanta/hid v0.0.0-20190304122332-79d86877855b
1415
github.com/containerd/cgroups v1.0.2 // indirect
1516
github.com/docker/docker v20.10.9+incompatible // indirect
@@ -31,7 +32,6 @@ require (
3132
github.com/mattn/go-colorable v0.1.7 // indirect
3233
github.com/mattn/go-shellwords v1.0.6
3334
github.com/mcuadros/go-version v0.0.0-20180611085657-6d5863ca60fa
34-
github.com/mongoose-os/go-serial v0.0.0-20211022230256-bb7bd0b47c67
3535
github.com/sergi/go-diff v1.2.0
3636
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c
3737
github.com/smartystreets/goconvey v1.6.4 // indirect

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8n
131131
github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50=
132132
github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE=
133133
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
134+
github.com/cesanta/go-serial v0.0.0-20170105152649-4dff7aff019e h1:C++Ag/pucyWyaAN0ZVi1TQoVPLDXP8XElP0GR4DPDRY=
135+
github.com/cesanta/go-serial v0.0.0-20170105152649-4dff7aff019e/go.mod h1:8NcZR8jUd1YKVUMGAzeu2cVpWHQAxeb1oVLFBapFwmQ=
134136
github.com/cesanta/hid v0.0.0-20190304122332-79d86877855b h1:sis04aP3W+T6iw+rr1PtowTyzGk2C/uW4Yt5kxJGtoU=
135137
github.com/cesanta/hid v0.0.0-20190304122332-79d86877855b/go.mod h1:TyHSqYNeVEvfBfk5Sg9kTkH7sH+yZSpnbhk+KOlqyS0=
136138
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -600,8 +602,6 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ
600602
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
601603
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
602604
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
603-
github.com/mongoose-os/go-serial v0.0.0-20211022230256-bb7bd0b47c67 h1:jQ1TgzH8eS3e4F42kCE9NdCqRrbidJq+qTa5gVFM6E0=
604-
github.com/mongoose-os/go-serial v0.0.0-20211022230256-bb7bd0b47c67/go.mod h1:HZ7dmippnLpPxYlKfmEyOhXr6eqwu/UtOcYICIE5SH0=
605605
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
606606
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
607607
github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=

0 commit comments

Comments
 (0)