add terminal watchface

[13werwolf13]

I tried to add watchface found here https://zephyrlabs.github.io/Watchfaces/Terminal/, I asked the developer and he doesn't mind. but now I am not able to check its work.

[NeroBurner]

that's how it looks on my unfinished simulator https://github.com/NeroBurner/InfiniTime/tree/lv_simulation_watchface_terminal if you want to flesh it out on your PC first :)

[13werwolf13]

that's how it looks on my unfinished simulator https://github.com/NeroBurner/InfiniTime/tree/lv_simulation_watchface_terminal if you want to flesh it out on your PC first :)

I will be grateful if you tell me how to check this on the simulator

[NeroBurner]

sure thing :)

First to get the information onto your local repository, add mine as new remote neroburner

git remote add neroburner https://github.com/NeroBurner/InfiniTime.git
git fetch neroburner

Then you can switch branches to mine

git checkout lv_simulation_watchface_terminal

Then to build and run the simulator

cd lv_sim
cmake -S . -B build
cmake --build build -j4
./build/main

Then press 4 on your keyboard to get to the new Terminal watchface

[13werwolf13]

Now that work!

[NeroBurner]

@13werwolf13 please cherry-pick 91cf64a for relative include fixups needed for the simulator to work, and it's now recommended to use includes relative to the src directory

git cherry-pick 91cf64abf663b6cf0200353424d9eefa256331a6

[NeroBurner]

please cleanup the mixed spaces and tabs

Furthermore please try to fix the sprintf related warnings

[NeroBurner]

why is this commented block still here? plan to implement it for this PR?

[NeroBurner]

suggesting to use - instead of . for the iso-date-string. That would be the ISO 8601 format that pythons date.isoformat() returns

Suggested change

	sprintf(dateStr, "[DATE]#007fff %04d.%02d.%02d#", short(year), char(month), char(day));
	sprintf(dateStr, "[DATE]#007fff %04d-%02d-%02d#", short(year), char(month), char(day));

[13werwolf13]

no, please, no...
it will not look so aesthetically pleasing and authentic

[13werwolf13]

@NeroBurner sorry for so many mistakes, I'm not a programmer. I have fixed those issues.

[NeroBurner]

@13werwolf13 no worries, we all had to start somewhere :)

I really like the looks of the Terminal Watchface. Thanks to making the effort to do this PR and update and cleanup this Watchface :)

The last fix I'd like to see are the relative include fixes as I've done in 91cf64a . Please cherry-pick as described earlier, or just copy the changes ;)

[13werwolf13]

@13werwolf13 please cherry-pick 91cf64a for relative include fixups needed for the simulator to work, and it's now recommended to use includes relative to the src directory

git cherry-pick 91cf64abf663b6cf0200353424d9eefa256331a6

fatal: bad object 91cf64abf663b6cf0200353424d9eefa256331a6

[13werwolf13]

@NeroBurner I still did not understand how this feature works, so I transferred the changes manually. I hope I haven't missed anything.

[13werwolf13]

@NeroBurner done

[geekbozu]

This looks great!

[NeroBurner]

The following warnings are fixed by the current review, and I think we now found all the tabs

[build] /home/nero/repos/pinetime/InfiniTime/src/displayapp/screens/WatchFaceTerminal.cpp: In member function 'virtual void Pinetime::Applications::Screens::WatchFaceTerminal::Refresh()':
[build] /home/nero/repos/pinetime/InfiniTime/src/displayapp/screens/WatchFaceTerminal.cpp:161:32: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long long int' [-Wformat=]
[build]   161 |         sprintf(hoursChar, "%02d", hour);
[build]       |                             ~~~^   ~~~~
[build]       |                                |   |
[build]       |                                int long long int
[build]       |                             %02lld
[build] /home/nero/repos/pinetime/InfiniTime/src/displayapp/screens/WatchFaceTerminal.cpp:175:32: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long long int' [-Wformat=]
[build]   175 |         sprintf(hoursChar, "%02d", hour);
[build]       |                             ~~~^   ~~~~
[build]       |                                |   |
[build]       |                                int long long int
[build]       |                             %02lld
[build] /home/nero/repos/pinetime/InfiniTime/src/displayapp/screens/WatchFaceTerminal.cpp: In member function 'virtual void Pinetime::Applications::Screens::WatchFaceTerminal::Refresh()':
[build] /home/nero/repos/pinetime/InfiniTime/src/displayapp/screens/WatchFaceTerminal.cpp:161:32: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long long int' [-Wformat=]
[build]   161 |         sprintf(hoursChar, "%02d", hour);
[build]       |                             ~~~^   ~~~~
[build]       |                                |   |
[build]       |                                int long long int
[build]       |                             %02lld
[build] /home/nero/repos/pinetime/InfiniTime/src/displayapp/screens/WatchFaceTerminal.cpp:175:32: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long long int' [-Wformat=]
[build]   175 |         sprintf(hoursChar, "%02d", hour);
[build]       |                             ~~~^   ~~~~
[build]       |                                |   |
[build]       |                                int long long int
[build]       |                             %02lld
[build] Consolidate compiler generated dependencies of target pinetime-mcuboot-recovery-loader

[Riksu9000]

The modified files should be reformatted with clang-format. No need to review and fix indentation and format manually.

[NeroBurner]

Applying my suggestions should get you a watchface looking like this

[NeroBurner]

I don't see the mentioned problem. Can you describe it?

On February 2, 2022 5:25:59 AM GMT+01:00, "Марков Дмитрий" ***@***.***> wrote: So, it really works. But on my device I noticed another problem (I will attach a photo). I hope that I can solve this problem myself.  -- Reply to this email directly or view it on GitHub: #932 (comment) You are receiving this because you were mentioned. Message ID: ***@***.***>

-- Sent from my Android device with K-9 Mail. Please excuse my brevity.

[13werwolf13]

I don't see the mentioned problem. Can you describe it?

1. this is the battery charge icon below. now that there is a text inscription I'm going to remove it. and I already found where to do it.
2. there is an idea to remove the icon of the connected charger and replace it with the inscription in the line with interest.

unfortunately, I am now busy with very important things at work (and also do not have a charger at hand) so I will do this later in the evening.

P.S.: the problem of which I wrote earlier as it turned out was visible only to me alone, because it seems time to change my eye lenses.

[calhix]

Maybe use CONN or NET for Connected/Disconnected and STAT for Charging/Discharging?

[13werwolf13]

Maybe use CONN or NET for Connected/Disconnected and STAT for Charging/Discharging?

I like the "CONN" option, but "STAT" doesn't seem very appropriate.

[thefenriswolf]

I really like this watch face for it's verbosity. I hope it gets merged in time for the next release.

[NeroBurner]

please use includes relative to the src directory, helps me greatly with the simulator

Suggested change

	#include "WatchFaceTerminal.h"
	#include "displayapp/screens/WatchFaceTerminal.h"

[JF002]

I manually squash-merged this branch in commit 69e4ab6.
Thanks for your work @13werwolf13 and everyone who helped and reviewed this PR!

[13werwolf13]

I'm glad I was helpful to the community! Thank you to everyone who helped!