Commit Graph

107 Commits

Author SHA1 Message Date
Finlay Davidson
2f37837c77 motioncontroller: Fix changes in InfiniTime#1659 2023-03-10 10:18:16 +01:00
Reinhold Gschweicher
32fada34f4 Support rename of TimerController to FreeRTOS::Timer 2023-03-02 22:33:05 +01:00
Riku Isokoski
6c0488da74 timers: Fix restarting timer from a timer
Running xTimerChangePeriod and xTimerStart on the expired timer from a
callback function returns successfully, but doesn't actually set the
timer.
2023-02-27 19:03:18 +01:00
NeroBurner
191bb9a59b
Merge pull request #90 from Riksu9000/fix-lvgl
Remove LVGL instance in main
2023-02-27 19:02:19 +01:00
Riku Isokoski
1278132840 Remove LVGL instance in main
This has been moved to DisplayApp in InfiniTime, so there were two
instances in InfiniSim.
2023-02-27 08:45:53 +02:00
Reinhold Gschweicher
02f980f278 sim: LittleVgl: update s.t. LVGL-FS driver is initialized by LittleVgl
InfiniTime moved the LVGL-FS driver initialization to the LittleVgl
constructor and passed the FS member to do that.

Update the simulator copy of LittleVgl to do just that.

Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/89
2023-02-26 23:42:03 +01:00
Reinhold Gschweicher
44452ccdf6 sim: LittleVgl: remove touchPanel from constructor as done upstream
InfiniTime removed the `Pinetime::Drivers::Cst816S& touchPanel`
reference from the LittleVGL constructor. Update that in the simulator
to stay compatible
2023-02-26 23:11:00 +01:00
Reinhold Gschweicher
3a0ee34be5 main: updated to changed DisplayApp and SystemTask constructors
The constructors got cleaned up and the WatchdogView got replaced by a
const reference to the Watchdog object.

Update develop branch to the `infineat: Create colors at compile time`
commit, where those changes are needed
2023-02-26 23:00:52 +01:00
Reinhold Gschweicher
36c69bbc2e main: use ctime put_time to replace date/date.h include
Implementation referenced from:
https://stackoverflow.com/questions/17223096/outputting-date-and-time-in-c-using-stdchrono

Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/88
2023-02-26 22:44:15 +01:00
Reinhold Gschweicher
f457925952 sim: WeatherService: add missing algorithm include 2023-02-26 21:46:42 +01:00
NeroBurner
35aca7323d
Merge pull request #87 from Riksu9000/remove-unused-files
Remove unused files
2023-02-25 19:18:04 +01:00
Riku Isokoski
322092e2ef Remove unused app_timer library
This is no longer used in InfiniTime, and I can't see any reason it
would ever be used again.
2023-02-25 19:49:58 +02:00
Riku Isokoski
3be951690c Remove unused Missing screen
This class causes builds to fail every time screens are changed in
InfiniTime.
2023-02-25 19:49:58 +02:00
NeroBurner
6ccca0caf1
Merge pull request #86 from Riksu9000/infinitime-changes
Fix build after InfiniTime changes
2023-02-25 18:02:52 +01:00
Riku Isokoski
df768e2030 Remove motorController from SystemTask
InfiniTime change
2023-02-25 12:35:16 +02:00
Riku Isokoski
8ca2f42037 Update InfiniTime submodule 2023-02-25 12:35:16 +02:00
Riku Isokoski
48afc495ab Apply InfiniTime LittleVgl changes 2023-02-24 18:11:26 +02:00
Riku Isokoski
c6bccf5225 Apply InfiniTime TouchHandler changes 2023-02-24 18:10:17 +02:00
Riku Isokoski
1aaf2c3890 Fix build after InfiniTime change
Update InfiniTime
2023-01-29 20:15:40 +01:00
NeroBurner
df7f4bd813
Merge pull request #83 from devnoname120/cmake-explicit-std-filesystem-linking
cmake: add explicit std::filesystem linking

g++8 compiler has C++17 support, but needs a link parameter for `std::filesystem` to work.
Add a cmake-module to find the needed link flag (if any) and provide a CMake target to
link against.

This can be removed once InfiniTime needs a newer compiler standard (like C++20).

Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/57
2023-01-19 07:44:59 +01:00
Paul
d6c266905b cmake: add explicit std::filesystem linking
Fix: https://github.com/InfiniTimeOrg/InfiniSim/issues/57
Supersede: https://github.com/InfiniTimeOrg/InfiniSim/pull/58
2023-01-18 17:26:10 +01:00
Reinhold Gschweicher
168ff53cb4 Merge branch 'combine_datetime' 2023-01-15 22:41:07 +01:00
Reinhold Gschweicher
45500e8f32 InfiniTime: Update for Combined Date and Time Settings
Update to develop branch after https://github.com/InfiniTimeOrg/InfiniTime/pull/1465
got merged.
2023-01-15 22:39:46 +01:00
Elements6007
4fe058c652 combine 2023-01-15 22:38:25 +01:00
NeroBurner
63bfd6e49e
Merge pull request #77 from faxe1008/fix-gif-output
GifExporter: Disable dithering fixing artifacts in recording

Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/51
2022-11-21 20:15:59 +01:00
blatzfab
db77a2cf52 Infinisim: GifExporter: Disable dithering
This patch disables dithering since it causes artifacts within the
generated gif files.
2022-11-21 19:55:32 +01:00
NeroBurner
7cc4876066
Merge pull request #76 from 1sra3l/patch-1
s/scren/screen/ README.md
2022-11-12 17:08:00 +01:00
Israel
d1516f16b6
s/screen/scren/
fix small typo....
2022-11-11 16:38:44 -06:00
Reinhold Gschweicher
e4a3aa0cc4 Update InfiniTime to current develop v1.11.0 branch 2022-10-16 16:10:10 +02:00
Reinhold Gschweicher
00ae5fc2d7 Update InfiniTime to 1.11.0 release 2022-10-16 16:10:10 +02:00
NeroBurner
02b75a8d3e
Merge pull request #71 from minacode/low-battery
Add support for low battery warning
2022-10-12 21:23:40 +02:00
minacode
81c060874f added threshold 2022-10-12 21:17:22 +02:00
minacode
3381d68baa add dummy function 2022-10-12 20:29:33 +02:00
NeroBurner
535ed3cbdb
Merge pull request #70 from InfiniTimeOrg/build_resources_option
Add option BUILD_RESOURCES=ON to build resources for sim
2022-10-11 22:51:49 +02:00
Reinhold Gschweicher
51f6de612a Add option BUILD_RESOURCES=ON to build resources.zip file
The `BUILD_RESOURCES` option is also available in `InfiniTime`, but we
don't want to require building the firmware to test `resource.zip` file
generation.
2022-10-11 22:31:14 +02:00
Reinhold Gschweicher
945693db93 Merge branch 'tgc-dk_new-notifi-msg' 2022-09-27 23:39:44 +02:00
Reinhold Gschweicher
c6b1f0f74b sim: wake up screen (delete label) when screen off on new Notification
Get the system into the running state again, when the `n` button is
pressed for a new notification. Otherwise the simulation freezes
2022-09-27 23:37:45 +02:00
Tomas Groth
ac5a04ee9d Send a NewNotification message when a new notification has been created. 2022-09-27 23:16:27 +02:00
NeroBurner
2cfd22c856
Merge pull request #69 from InfiniTimeOrg/displayapp-needs-fs
DisplayApp now takes the filesystem as ctor arguments
2022-09-27 23:10:39 +02:00
Reinhold Gschweicher
17abf385f6 Update InfiniTime submodule with InfiNeat watchface PR
Update the submodule to the version just after
https://github.com/InfiniTimeOrg/InfiniTime/pull/1024 is merged.
2022-09-27 23:05:07 +02:00
Jean-François Milants
4e60d77270 Since #1324 (https://github.com/InfiniTimeOrg/InfiniTime/pull/1324) / #1024 (https://github.com/InfiniTimeOrg/InfiniTime/pull/1024) DisplayApp needs the FileSystem as parameter to the constructor. 2022-09-27 21:08:08 +02:00
NeroBurner
8460a5207a
sim: change brightness only when screen is on (#66)
Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/45
2022-09-18 21:46:49 +02:00
NeroBurner
3d52e4a826
Update libpng to v1.6.38 with libm cmake fix (#65) 2022-09-17 16:08:33 +02:00
Aaron Honeycutt
c89e9701af
REAdme: Add npm package for Fedora (#64) 2022-09-16 17:41:06 +02:00
Aaron Honeycutt
07aa97bca3
README: Add zlib-devel package as Fedora dependency (#63)
This package is needed to run this command on Fedora:

```sh
cmake -S . -B build
```
2022-09-16 08:27:50 +02:00
Dyllan Kobal
0fe5b87bc6
Add changes for music fast forward PR (#61)
This pull request allows my pull request InfiniTimeOrg/InfiniTime#1323 in the
InfiniTime project to build the simulator that's in this project. Both pull requests
add the feature that I requested here: InfiniTimeOrg/InfiniTime#1320

Co-authored-by: Dyllan Kobal <dddk500@gmail.com>
2022-09-12 08:31:36 +02:00
Galdor
7ca0e50f1b
Print memory usage (p/P) only on change (#56)
* print memory usage (p/P): Only print when changed, max-memory

No longer spam the memory usage constantly. This makes the output much
more useful by allowing to observe each change in memory usage, since
the values now no longer get pushed up and scroll out of view rapidly.

Changes:
- Add `max_used` peak memory usage
- Add labels in the output (slightly more verbose, but much clearer)
- Remove unnecessary `int64_t` cast
- Change "free" to "budget left" to clarify it shows mem that would be
  free on the real hardware, making situations where it goes negative
  less confusing
- Change field widths so 5 digit values no longer jump out of alignment

Example output:
```
Mem:  6720 used (change:  -248, peak:  7928) 7616 budget left
Mem:  6832 used (change:  +112, peak:  7928) 7504 budget left
Mem:  6584 used (change:  -248, peak:  7928) 7752 budget left
Mem: 10856 used (change: +4272, peak: 10848) 3480 budget left
Mem: 10888 used (change:   +32, peak: 10880) 3448 budget left
Mem: 10616 used (change:  -272, peak: 10880) 3720 budget left
Mem:  6704 used (change: -3912, peak: 10880) 7632 budget left
Mem:  6808 used (change:  +104, peak: 10880) 7528 budget left
```
2022-09-11 19:38:37 +02:00
NeroBurner
23bf37995c
Merge pull request #60 from InfiniTimeOrg/littlefs-do_install_ressource
littlefs-do: unzip in memory and copy listed resources to SPI raw file
2022-09-08 20:14:15 +02:00
Reinhold Gschweicher
2306807a73 littlefs-do: unzip in memory and copy listed resources to SPI raw file
Add a new command `littlefs-do res load resource.zip` which loads
resources from a zip file to the SPI raw file.

Below an example `resource.zip` is loaded:

```sh
$ ./littlefs-do res load infinitime-resources-1.10.0.zip --verbose
Calling FS::Init()
running 'res'
running 'res load'
loading resource file: "infinitime-resources-1.10.0.zip"
zip: num of files in zip: 8
copy file teko.bin                  from zip to SPI path '/teko.bin'
copy file lv_font_dots_40.bin       from zip to SPI path '/lv_font_dots_40.bin'
copy file 7segments_40.bin          from zip to SPI path '/7segments_40.bin'
copy file bebas.bin                 from zip to SPI path '/bebas.bin'
copy file 7segments_115.bin         from zip to SPI path '/7segments_115.bin'
copy file matrix.bin                from zip to SPI path '/matrix.bin'
copy file infineat-1.bin            from zip to SPI path '/infineat-1.bin'
finished: zip file fully loaded into SPI memory: infinitime-resources-1.10.0.zip
```

Afterwards the files are listed in the SPI raw file:

```sh
$ ./littlefs-do ls
type: DIR
name: /
type: DIR name: .
type: DIR name: ..
type: REG size: 4928 name: 7segments\_115.bin
type: REG size: 760 name: 7segments\_40.bin
type: REG size: 4420 name: bebas.bin
type: REG size: 1430 name: infineat-1.bin
type: REG size: 1840 name: lv\_font\_dots\_40.bin
type: REG size: 115204 name: matrix.bin
type: REG size: 440 name: teko.bin
```

Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/55
2022-09-08 20:02:48 +02:00
Reinhold Gschweicher
4dea63843e external: add nlohmann_json v3.11.2
Single header downloaded from https://github.com/nlohmann/json/releases/tag/v3.11.2

Add a custom CMakeLists.txt to have a `nlohmann_json::nlohmann_json`
target to link against (just like the full project)
2022-09-06 21:34:55 +02:00