-
Notifications
You must be signed in to change notification settings - Fork 4
Fruit Jam NTP module #14
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.
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
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
544adaa
ntp module
mikeysklar d1d0bb0
refactored to use fruitjam network module
mikeysklar fc388c5
mock imports / requirements
mikeysklar 6b86bc9
rtc lib mock add
mikeysklar 75e5fb7
Update __init__.py
mikeysklar 96e4575
retry logic for ETIMEOUT
mikeysklar 2e19356
ntp constructor dup / retry logic
mikeysklar d2ae05e
helpers for sync_time
mikeysklar cb5d1db
settings.toml float quote, attribution, duplicate last_exc setting
mikeysklar File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2025 Tim Cocks for Adafruit Industries | ||
|
||
| # | ||
| # SPDX-License-Identifier: MIT | ||
| # Wi-Fi credentials | ||
| CIRCUITPY_WIFI_SSID = "YourSSID" | ||
| CIRCUITPY_WIFI_PASSWORD = "YourPassword" | ||
|
|
||
| # NTP settings | ||
| # Common UTC offsets (hours): | ||
| # 0 UTC / Zulu | ||
| # 1 CET (Central Europe) | ||
| # 2 EET (Eastern Europe) | ||
| # 3 FET (Further Eastern Europe) | ||
| # -5 EST (Eastern US) | ||
| # -6 CST (Central US) | ||
| # -7 MST (Mountain US) | ||
| # -8 PST (Pacific US) | ||
| # -9 AKST (Alaska) | ||
| # -10 HST (Hawaii, no DST) | ||
|
|
||
| NTP_SERVER = "pool.ntp.org" # NTP host (default pool.ntp.org) | ||
| NTP_TZ = -5 # timezone offset in hours | ||
| NTP_DST = 1 # daylight saving (0=no, 1=yes) | ||
| NTP_INTERVAL = 3600 # re-sync interval (seconds) | ||
|
|
||
| # Optional tuning | ||
| NTP_TIMEOUT = 5 # socket timeout in seconds | ||
| NTP_CACHE_SECONDS = 0 # cache results (0 = always fetch) | ||
| NTP_REQUIRE_YEAR = 2022 # sanity check minimum year | ||
|
|
||
| # Retries | ||
| NTP_RETRIES = 8 # number of NTP fetch attempts | ||
| NTP_DELAY_S = 1.0 # delay between attempts (seconds) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # SPDX-FileCopyrightText: Copyright (c) 2025 Tim Cocks for Adafruit Industries | ||
| # | ||
| # SPDX-License-Identifier: MIT | ||
| import time | ||
|
|
||
| from adafruit_fruitjam import FruitJam | ||
|
|
||
| fj = FruitJam() | ||
| now = fj.sync_time() | ||
| print("RTC set:", now) | ||
| print("Localtime:", time.localtime()) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that
"now" not in locals()is getting confused here by scope or something. Or else perhaps I don't understand the intended behavior of the scope.In any case it seems like this condition causes the current version not to work for me with default values for tuning and other arguments. In my case it seems to always time out on the first attempt, and then succeed on the second attempt. But when it gets to this check
"now" not in locals()resolves toTruewhich causes this to raise the OSError from the 1st attempt that timed out. Even though the second attempt succeeded.I added this to confirm the value it resolves to and to verify that
nowis definitely definied and has a date object in it.Here is the full output which shows these values just before the exception trace
I was able to resolve this locally by adding
before the attempt
forloop. And settingsuccess = Truebefore thebreakof a successful fetch. Then changing this condition to:I think that makes the intent of the condition more clear, and it seems to be working now for me with this change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like the latest version is changed and likely doesn't have this issue based on only a quick glance at the code. I will re-test with latest version a bit later.