Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Corrections for French and Romanian time display #422

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Corrections for French and Romanian time display #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/Uhrtypes/FR10x11.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Fr10x11_t : public iUhrType {

//------------------------------------------------------------------------------

// virtual const bool hasZwanzig() override { return true; }
virtual const bool hasZwanzig() override { return true; }

//------------------------------------------------------------------------------

Expand Down
11 changes: 8 additions & 3 deletions include/clockWork.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,9 @@ void ClockWork::setMinute(uint8_t min, uint8_t &offsetHour, bool &fullHour) {
usedUhrType->show(FrontWord::nach);
break;
case 20:
if (hasTwentyAndCheckForUsage()) {
if (hasTwentyAndCheckForUsage() && G.UhrtypeDef == Fr10x11) {
usedUhrType->show(FrontWord::min_20);
} else if (hasTwentyAndCheckForUsage() && G.UhrtypeDef != Fr10x11) {
usedUhrType->show(FrontWord::min_20);
usedUhrType->show(FrontWord::nach);
} else {
Expand All @@ -564,7 +566,9 @@ void ClockWork::setMinute(uint8_t min, uint8_t &offsetHour, bool &fullHour) {
case 23:
case 24:
case 25:
if (usedUhrType->hasTwentyfive()) {
if (usedUhrType->hasTwentyfive()&& G.UhrtypeDef == Fr10x11) {
usedUhrType->show(FrontWord::min_25);
} else if (usedUhrType->hasTwentyfive() && G.UhrtypeDef != Fr10x11) {
usedUhrType->show(FrontWord::min_25);
usedUhrType->show(FrontWord::nach);
} else {
Expand Down Expand Up @@ -620,12 +624,13 @@ void ClockWork::setMinute(uint8_t min, uint8_t &offsetHour, bool &fullHour) {
} else if (usedUhrType->hasTwentyfive()) {
usedUhrType->show(FrontWord::min_25);
usedUhrType->show(FrontWord::vor);
offsetHour = 1;
} else {
usedUhrType->show(FrontWord::min_5);
usedUhrType->show(FrontWord::nach);
usedUhrType->show(FrontWord::halb);
offsetHour = 1;
}
offsetHour = 1;
break;
case 36:
case 37:
Expand Down
Loading