Replace embedded-time with fugit #54

andresv · 2021-11-02T19:52:36Z

This PR replaces embedded-time with more lightweight const generics based time library called fugit which is for example going to be used in RTIC.

embedded-time had some dependencies that did not work well on ESP32, this PR fixes this particular problem.

And use ublox-sockets that support fugit time crate.

`embedded-time` has some serious issues and moves too slowly and tries to do too much in single lib. Fugit is a time library that was built because some people were not happy to use embedded-time on embedded systems. Fugit only deals with time conversions and those conversions are done using const generics. So most of the stuff is happening during compilation. This is very light weight compared to embedded-time.

ublox-cellular/src/lib.rs

andresv · 2021-11-03T08:37:33Z

Ahaa, I think I know why I did not see these errors. I added std to:

atat = { version = "0.13.1", features = ["std", "derive", "defmt", "bytes"] }

Edit: nope that wasn't the problem

andresv · 2021-11-03T17:56:53Z

I just realized that atat uses embedded-hal CountDown trait (https://github.com/BlackbirdHQ/atat/blob/master/atat/src/client.rs#L58), but at the moment here we are using our own Clock trait.

It would be actually better if we use CountDown also here, but we also need now() method to get current time and I guess there is also problem with time conversion. Typically CountDown is implemented for u32, but here we would like to use it more like for fugit::MillisDurationU32.

Lemme think about it some more.

MathiasKoch · 2021-11-03T18:19:50Z

Yeah . The timer stuff across the stack is not ideal, so i am very much open to solutions that would make it easier to use..

It is very much affected by the currently bad shape of the timer traits in embedded Hal.. also the requirement on into 🥲

the same is used in rtic and it is more clear what it is

andresv · 2021-11-04T18:33:16Z

Clock trait now comes from atat: https://github.com/andresv/atat/blob/use-fugit-for-timing/atat/src/lib.rs#L278-L290

MathiasKoch · 2021-11-04T19:28:39Z

This looks amazing! Awesome job so far! Hope i can find the time to review both atat & this tomorrow 🤞👌

FactbirdHQ#53) * Make sure the embedded-nal implementations only makes use of error-types from ublox-sockets * Add embedded-hal-driver keyword to crates.io # Conflicts: # ublox-cellular/Cargo.toml # ublox-cellular/src/services/data/tcp_stack.rs # ublox-cellular/src/services/data/udp_stack.rs

andresv · 2021-11-05T12:42:43Z

Clock in atat was changed to use WouldBlock for wait. This is not yet updated here.

andresv · 2021-11-05T12:44:50Z

Hmm, I guess cherry-picking your latest commit was not right thing to do (this conflict message here).

From trait cannot be used here because Clock error is associated type

andresv · 2021-11-05T13:14:09Z

Clock is now updated.

andresv · 2021-11-05T14:03:25Z

It makes most sense if Format is implemented for fugit types: korken89/fugit#6

andresv · 2021-11-06T12:19:14Z

Linux example builds now: https://github.com/andresv/ublox-cellular-rs/blob/replace-embedded-time-with-fugit/examples/linux/src/main.rs

on macos dummy gpio support is used

MathiasKoch · 2021-11-08T10:47:10Z

Can you update this PR to make use of atat 0.14.0 & ublox-sockets 0.1.0 releases as well?

andresv · 2021-11-09T07:45:21Z

Yes. Adding those and starting to use fmt.rs file for logging.

andresv · 2021-11-09T08:09:10Z

I wonder how to enable log or defmt feature for atat and ublox-sockets based on if log or defmt feature is selected for this crate.
For example here log is at the moment hardcoded.

[dependencies]
atat = { version = "0.14", features = ["derive", "log", "bytes"] }
ublox-sockets = { version = "0.1", features = ["log"] }

log = { version = "^0.4", default-features = false, optional = true }
defmt = { version = "^0.2", optional = true }

[features]
default = ['log", "toby-r2", "socket-udp", "socket-tcp"]

lara-r2 = []
leon-g1 = []
lisa-u2 = []
mpci-l2 = []
sara-g3 = []
sara-g4 = []
sara-u1 = []
sara-u2 = ["upsd-context-activation"]
toby-l2 = []
toby-r2 = []
topy-l4 = []

upsd-context-activation = []

socket-tcp = ["ublox-sockets/socket-tcp"]
socket-udp = ["ublox-sockets/socket-udp"]

defmt-default = ["defmt"]
defmt-trace = ["defmt"]
defmt-debug = ["defmt"]
defmt-info = ["defmt"]
defmt-warn = ["defmt"]
defmt-error = ["defmt"]

EDIT: https://stackoverflow.com/questions/61090286/cargo-toml-how-do-i-select-a-dependencys-feature-based-on-my-crates-features

without those it returns immediately without blocking in place

andresv · 2021-12-22T12:40:08Z

FYI: this is not dropped, I am continuing with it quite soon.

MathiasKoch · 2021-12-22T12:43:02Z

No problem 👍
I have not had a chance to replace our own embedded-time stuff with fugit yet, so i am not in a rush.. Hopefully i'll find the time in the beginning of the new year.

Let med know if you need anything from me :)

Merry Christmas 🎄

andresv · 2022-01-12T07:57:05Z

Finally back in hacking with it. At the moment I am working on SARA-N310 support.
I think actually embedded-time replacement with fugit was successful.
I can confirm if everything works if I got N310 working.

MathiasKoch · 2022-01-20T19:22:07Z

FactbirdHQ/atat#113 merged

MathiasKoch

Would you mind updating this to embedded-hal: "^1.0.0-alpha.6" and `defmt: "^0.3", now that FactbirdHQ/atat#113 is merged?

macOS creates those nasty files

andresv · 2022-01-24T07:59:01Z

Updated, but waiting for new atat release: FactbirdHQ/atat#116.

MathiasKoch · 2022-01-24T08:01:13Z

Yeah, i also have a few PRs blocked on that, so it will be out during today.

Just want to check if FactbirdHQ/atat#115 makes any significant code-size changes first

MathiasKoch · 2022-01-25T15:59:45Z

atat v0.15.0 & ublox-sockets v0.2.0 released 🎉

ublox-cellular/Cargo.toml

* Cargo.toml: replace embedded-time with fugit And use ublox-sockets that support fugit time crate. * lib: introduce new Clock trait and Instant alias * replace embedded-time with fugit `embedded-time` has some serious issues and moves too slowly and tries to do too much in single lib. Fugit is a time library that was built because some people were not happy to use embedded-time on embedded systems. Fugit only deals with time conversions and those conversions are done using const generics. So most of the stuff is happening during compilation. This is very light weight compared to embedded-time. * rename FREQ_HZ to TIMER_HZ the same is used in rtic and it is more clear what it is * lib: export Clock from atat * use Clock trait from atat lib * examples: update common_lib to latest * examples: linux wip * Make sure the embedded-nal implementations only makes use of error-ty… (#53) * Make sure the embedded-nal implementations only makes use of error-types from ublox-sockets * Add embedded-hal-driver keyword to crates.io # Conflicts: # ublox-cellular/Cargo.toml # ublox-cellular/src/services/data/tcp_stack.rs # ublox-cellular/src/services/data/udp_stack.rs * test_helpers: update to WouldBlock based Clock * error: add helper to convert Clock error to Error::Generic From trait cannot be used here because Clock error is associated type * client: use nb::block to wait for timer * import atat from blackbirdhq master * use fugit defmt feature to get Format impl * linux: set_socket_storage * add IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr to prelude * linux example: add socket read/write * reexport fugit fugit is needed for implementing Clock trait therefore it makes sense to reexport it here * add some general documentation about the crate * make first examples buildable also on macos on macos dummy gpio support is used * rename linux example to sockets, add args support * power: add nb::block! for blocking timer.waits without those it returns immediately without blocking in place * use atat and ublox-sockets from crates.io * use fmt.rs to support log or defmt * examples: add better logging * update to embedded-hal 1.0.0-alpha.6 * add .DS_Store to .gitignore macOS creates those nasty files * update atat and ublox-sockets * Update ublox-cellular/Cargo.toml * Replace CharVec with Bytes, following deprecation warning in ATAT * Fix tests & add defmt-impl feature Co-authored-by: Andres Vahter <[email protected]> Co-authored-by: Andres Vahter <[email protected]>

MathiasKoch · 2022-01-28T11:12:50Z

Merged here: #57

andresv added 3 commits November 2, 2021 21:41

Cargo.toml: replace embedded-time with fugit

3fcecf5

And use ublox-sockets that support fugit time crate.

lib: introduce new Clock trait and Instant alias

6640568

andresv commented Nov 2, 2021

View reviewed changes

ublox-cellular/src/lib.rs Outdated Show resolved Hide resolved

rename FREQ_HZ to TIMER_HZ

c8a8078

the same is used in rtic and it is more clear what it is

andresv mentioned this pull request Nov 4, 2021

Use fugit for timing FactbirdHQ/atat#107

Merged

andresv added 2 commits November 4, 2021 20:25

lib: export Clock from atat

8ad06cb

use Clock trait from atat lib

f77d95a

andresv and others added 3 commits November 4, 2021 21:32

examples: update common_lib to latest

c98cd14

examples: linux wip

64db75c

andresv added 4 commits November 5, 2021 15:09

test_helpers: update to WouldBlock based Clock

7f373a4

error: add helper to convert Clock error to Error::Generic

138ad21

From trait cannot be used here because Clock error is associated type

client: use nb::block to wait for timer

143c38a

import atat from blackbirdhq master

074b42e

Merge branch 'master' into replace-embedded-time-with-fugit

fa5abbc

andresv and others added 4 commits November 5, 2021 16:05

use fugit defmt feature to get Format impl

0c39345

linux: set_socket_storage

a90c7bb

add IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr to prelude

015f580

linux example: add socket read/write

8964999

andresv added 3 commits November 6, 2021 17:16

add some general documentation about the crate

9142608

make first examples buildable also on macos

4a4e3f6

on macos dummy gpio support is used

rename linux example to sockets, add args support

56f99e2

andresv added 3 commits November 9, 2021 11:52

power: add nb::block! for blocking timer.waits

8ca67ac

without those it returns immediately without blocking in place

use atat and ublox-sockets from crates.io

3bf306e

use fmt.rs to support log or defmt

5c32bf1

examples: add better logging

adf3aac

MathiasKoch requested changes Jan 23, 2022

View reviewed changes

andresv added 2 commits January 24, 2022 09:51

update to embedded-hal 1.0.0-alpha.6

01e7e0d

add .DS_Store to .gitignore

ca5cf7d

macOS creates those nasty files

andresv and others added 2 commits January 27, 2022 13:52

update atat and ublox-sockets

7a8fd47

Merge branch 'master' into replace-embedded-time-with-fugit

f502481

MathiasKoch approved these changes Jan 27, 2022

View reviewed changes

MathiasKoch reviewed Jan 27, 2022

View reviewed changes

ublox-cellular/Cargo.toml Outdated Show resolved Hide resolved

Update ublox-cellular/Cargo.toml

2abfd06

MathiasKoch mentioned this pull request Jan 28, 2022

Replace embedded-time with fugit #54 #57

Merged

MathiasKoch closed this Jan 28, 2022

andresv deleted the replace-embedded-time-with-fugit branch October 21, 2022 12:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replace embedded-time with fugit #54

Replace embedded-time with fugit #54

andresv commented Nov 2, 2021

andresv commented Nov 3, 2021 •

edited

Loading

andresv commented Nov 3, 2021

MathiasKoch commented Nov 3, 2021 •

edited

Loading

andresv commented Nov 4, 2021

MathiasKoch commented Nov 4, 2021

andresv commented Nov 5, 2021

andresv commented Nov 5, 2021

andresv commented Nov 5, 2021 •

edited

Loading

andresv commented Nov 5, 2021

andresv commented Nov 6, 2021

MathiasKoch commented Nov 8, 2021

andresv commented Nov 9, 2021

andresv commented Nov 9, 2021 •

edited

Loading

andresv commented Dec 22, 2021

MathiasKoch commented Dec 22, 2021

andresv commented Jan 12, 2022 •

edited

Loading

MathiasKoch commented Jan 20, 2022

MathiasKoch left a comment

andresv commented Jan 24, 2022

MathiasKoch commented Jan 24, 2022

MathiasKoch commented Jan 25, 2022

MathiasKoch commented Jan 28, 2022

Replace embedded-time with fugit #54

Replace embedded-time with fugit #54

Conversation

andresv commented Nov 2, 2021

andresv commented Nov 3, 2021 • edited Loading

andresv commented Nov 3, 2021

MathiasKoch commented Nov 3, 2021 • edited Loading

andresv commented Nov 4, 2021

MathiasKoch commented Nov 4, 2021

andresv commented Nov 5, 2021

andresv commented Nov 5, 2021

andresv commented Nov 5, 2021 • edited Loading

andresv commented Nov 5, 2021

andresv commented Nov 6, 2021

MathiasKoch commented Nov 8, 2021

andresv commented Nov 9, 2021

andresv commented Nov 9, 2021 • edited Loading

andresv commented Dec 22, 2021

MathiasKoch commented Dec 22, 2021

andresv commented Jan 12, 2022 • edited Loading

MathiasKoch commented Jan 20, 2022

MathiasKoch left a comment

Choose a reason for hiding this comment

andresv commented Jan 24, 2022

MathiasKoch commented Jan 24, 2022

MathiasKoch commented Jan 25, 2022

MathiasKoch commented Jan 28, 2022

andresv commented Nov 3, 2021 •

edited

Loading

MathiasKoch commented Nov 3, 2021 •

edited

Loading

andresv commented Nov 5, 2021 •

edited

Loading

andresv commented Nov 9, 2021 •

edited

Loading

andresv commented Jan 12, 2022 •

edited

Loading