Skip to content

native periph rtc#1922

Merged
LudwigKnuepfer merged 5 commits intoRIOT-OS:masterfrom
LudwigKnuepfer:native_periph_rtc
Dec 16, 2014
Merged

native periph rtc#1922
LudwigKnuepfer merged 5 commits intoRIOT-OS:masterfrom
LudwigKnuepfer:native_periph_rtc

Conversation

@LudwigKnuepfer
Copy link
Copy Markdown
Member

@LudwigKnuepfer LudwigKnuepfer commented Oct 31, 2014

  • implement periph/rtc instead of the deprecated rtc in native
  • add error checking / warnings
  • clean up the code a bit

Edit: split all non-native parts into separate PRs.

@LudwigKnuepfer LudwigKnuepfer changed the title native periph rtc WIP: native periph rtc Oct 31, 2014
@LudwigKnuepfer LudwigKnuepfer added State: WIP State: The PR is still work-in-progress and its code is not in its final presentable form yet Platform: native Platform: This PR/issue effects the native platform Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation labels Oct 31, 2014
This was referenced Nov 20, 2014
Closed
Closed
@LudwigKnuepfer LudwigKnuepfer removed the State: WIP State: The PR is still work-in-progress and its code is not in its final presentable form yet label Nov 20, 2014
@LudwigKnuepfer LudwigKnuepfer changed the title WIP: native periph rtc native periph rtc Nov 20, 2014
@LudwigKnuepfer LudwigKnuepfer added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Nov 20, 2014
@LudwigKnuepfer LudwigKnuepfer assigned OlegHahm and unassigned Kijewski Nov 20, 2014
@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Nov 20, 2014

I'll merge the cpu/Makefile.features into board

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Nov 20, 2014

Looks good as far as I can tell. ACK

@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Nov 20, 2014

Should we wait for #2054 and your replacement for #1919 ?

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Nov 20, 2014

Actually my replacement depends on this PR, because it removes `drivers/include/rtc.h'

@OlegHahm OlegHahm mentioned this pull request Nov 20, 2014
Merged
@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Nov 20, 2014

squashed

@LudwigKnuepfer LudwigKnuepfer removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Nov 20, 2014
@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Nov 20, 2014

See #2060.

@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Nov 20, 2014

This PR does not remove 'drivers/include/rtc.h'.

@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Nov 20, 2014

Ah, I understand what you mean now - #2060 removes rtc.h, so this PR must be merged first.

@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Nov 20, 2014

Anyhow - I would like to merge the new rtc shell command (in whichever form), this PR and #2060 in one go, do you agree?

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Nov 20, 2014

I don't object. ;)

@LudwigKnuepfer LudwigKnuepfer mentioned this pull request Nov 20, 2014
Merged
OlegHahm
OlegHahm reviewed Nov 23, 2014
View reviewed changes
cpu/native/include/periph_conf.h Outdated
Copy link
Copy Markdown
Member

@OlegHahm OlegHahm Nov 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#2041 (comment)

Copy link
Copy Markdown
Member Author

@LudwigKnuepfer LudwigKnuepfer Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file does not specify an RTC ;)

Copy link
Copy Markdown
Member

@OlegHahm OlegHahm Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It could still need documentation.

Copy link
Copy Markdown
Member Author

@LudwigKnuepfer LudwigKnuepfer Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is why I addressed the comment ;)

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented Nov 24, 2014

ACK

@OlegHahm OlegHahm added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Nov 24, 2014
@LudwigKnuepfer LudwigKnuepfer removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Nov 24, 2014
@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Nov 24, 2014

squashed

Ludwig Ortmann added 3 commits December 13, 2014 15:21
native: move rtc to periph
c0ef84b 
* adapt implementation to new interface
* remove now superfluous drivers directory
native/rtc: clean up documentation
37a1a10
native/rtc: improve implementation
f35981a 
* add error checking / warnings
* implement parts of alarm functionality
* clean up
@LudwigKnuepfer
Copy link
Copy Markdown
Member Author

LudwigKnuepfer commented Dec 13, 2014

rebased

@LudwigKnuepfer LudwigKnuepfer merged commit 2ec0a1c into RIOT-OS:master Dec 16, 2014
@LudwigKnuepfer LudwigKnuepfer deleted the native_periph_rtc branch December 16, 2014 17:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@OlegHahm OlegHahm

Labels

Platform: native Platform: This PR/issue effects the native platform Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@LudwigKnuepfer @OlegHahm @Kijewski