Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: yehoshuapw/InfiniSim
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: InfiniTimeOrg/InfiniSim
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Able to merge. These branches can be automatically merged.
29 contributors

Commits on Aug 4, 2022

  1. Update InfiniTime to 1.10.0 release

    @NeroBurner
    NeroBurner committed Aug 4, 2022
    Copy the full SHA
    dfe7223 View commit details

  2. Update InfiniTime to current develop v1.10.0 branch

    @NeroBurner
    NeroBurner committed Aug 4, 2022
    Copy the full SHA
    8861b98 View commit details

Commits on Aug 7, 2022

  1. Updated README with required node.js version (InfiniTimeOrg#48)

    @toastom
    toastom authored Aug 7, 2022
    Copy the full SHA
    fc96e5d View commit details

Commits on Aug 15, 2022

  1. Support "Centralize most color definitions" (InfiniTimeOrg#50) 

    Support changes in InfiniTimeOrg/InfiniTime#1258

The file `lv_pinetime_theme.c` is renamed to `InfiniTimeTheme.cpp`.
Need to pick up that change in the simulator to compile with the new cpp
file if it exists.

Furthermore use the new `InfiniTimeTheme.h` header in simulator files.

Fixes: InfiniTimeOrg#49
    @NeroBurner
    NeroBurner authored Aug 15, 2022
    Copy the full SHA
    b00dceb View commit details

Commits on Aug 21, 2022

  1. main: add index to notification message

    @NeroBurner
    NeroBurner committed Aug 21, 2022
    Copy the full SHA
    741db4e View commit details

Commits on Aug 29, 2022

  1. littlefs-do binary to work with spi raw file (InfiniTimeOrg#52) 

    Add helper to modify spi raw file, to make experimenting with it easier.

```sh
$ ./littlefs-do --help
Usage: ./littlefs-do <command> [options]
Commands:
  -h, --help           show this help message for the selected command and exit
  -v, --verbose        print status messages to the console
  stat                 show information of specified file or directory
  ls                   list available files in 'spiNorFlash.raw' file
  mkdir                create directory
  rmdir                remove directory
  rm                   remove directory or file
  cp                   copy files into or out of flash file
  settings             list settings from 'settings.h'
```

In the process restructure the CMake file for less duplicate
includes/defines for both executables (`infinisim` and `littlefs-do`).

Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary.
Use the updated upload-artifact@v3 template to do that.
    @NeroBurner
    NeroBurner authored Aug 29, 2022
    Copy the full SHA
    9e15182 View commit details

Commits on Sep 5, 2022

  1. README: get sources before lv_font_conv install 

    The build dependencies section says to install `lv_font_conv` to the
source directory. But the instructions to download the InfiniSim sources
was after the build dependencies.

Move the "get sources" section before the "build dependencies" to
clairify the instructions.

Fixes: InfiniTimeOrg#53
    @NeroBurner
    NeroBurner committed Sep 5, 2022
    Copy the full SHA
    25ce4b2 View commit details

  2. Update Notification::On/Off enum rename (InfiniTimeOrg#59) 

    In InfiniTimeOrg/InfiniTime#1261 the enums for
Notification ON/OFF were renamed to On/Off and the additional entry
`Sleep` was added.

Update `littlefs-do` to this change.
    @NeroBurner
    NeroBurner authored Sep 5, 2022
    Copy the full SHA
    6e423c9 View commit details

Commits on Sep 6, 2022

  1. external: add miniz v2.2.0 with self written CMakeLists.txt 

    Sources downloaded from https://github.com/richgel999/miniz/releases/tag/2.2.0
    @NeroBurner
    NeroBurner committed Sep 6, 2022
    Copy the full SHA
    9841601 View commit details

  2. 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)
    @NeroBurner
    NeroBurner committed Sep 6, 2022
    Copy the full SHA
    4dea638 View commit details

Commits on Sep 8, 2022

  1. 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: InfiniTimeOrg#55
    @NeroBurner
    NeroBurner committed Sep 8, 2022
    Copy the full SHA
    2306807 View commit details

  2. Merge pull request InfiniTimeOrg#60 from InfiniTimeOrg/littlefs-do_in… 

    …stall_ressource

littlefs-do: unzip in memory and copy listed resources to SPI raw file
    @NeroBurner
    NeroBurner authored Sep 8, 2022
    Copy the full SHA
    23bf379 View commit details

Commits on Sep 11, 2022

  1. Print memory usage (p/P) only on change (InfiniTimeOrg#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
```
    @ght
    ght authored Sep 11, 2022
    Copy the full SHA
    7ca0e50 View commit details

Commits on Sep 12, 2022

  1. Add changes for music fast forward PR (InfiniTimeOrg#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>
    @dyllan500
    dyllan500 and Dyllan Kobal authored Sep 12, 2022
    Copy the full SHA
    0fe5b87 View commit details

Commits on Sep 16, 2022

  1. README: Add zlib-devel package as Fedora dependency (InfiniTimeOrg#63) 

    This package is needed to run this command on Fedora:

```sh
cmake -S . -B build
```
    @ahoneybun
    ahoneybun authored Sep 16, 2022
    Copy the full SHA
    07aa97b View commit details

  2. REAdme: Add npm package for Fedora (InfiniTimeOrg#64)

    @ahoneybun
    ahoneybun authored Sep 16, 2022
    Copy the full SHA
    c89e970 View commit details

Commits on Sep 17, 2022

  1. Update libpng to v1.6.38 with libm cmake fix (InfiniTimeOrg#65)

    @NeroBurner
    NeroBurner authored Sep 17, 2022
    Copy the full SHA
    3d52e4a View commit details

Commits on Sep 18, 2022

  1. sim: change brightness only when screen is on (InfiniTimeOrg#66) 

    Fixes: InfiniTimeOrg#45
    @NeroBurner
    NeroBurner authored Sep 18, 2022
    Copy the full SHA
    8460a52 View commit details

Commits on Sep 27, 2022

  1. Since #1324 (InfiniTimeOrg/InfiniTime#1324) / #1024 (InfiniTimeOrg/In… 

    …finiTime#1024) DisplayApp needs the FileSystem as parameter to the constructor.
    @JF002
    JF002 committed Sep 27, 2022
    Copy the full SHA
    4e60d77 View commit details

  2. Update InfiniTime submodule with InfiNeat watchface PR 

    Update the submodule to the version just after
InfiniTimeOrg/InfiniTime#1024 is merged.
    @NeroBurner
    NeroBurner committed Sep 27, 2022
    Copy the full SHA
    17abf38 View commit details

  3. Merge pull request InfiniTimeOrg#69 from InfiniTimeOrg/displayapp-nee… 

    …ds-fs

DisplayApp now takes the filesystem as ctor arguments
    @NeroBurner
    NeroBurner authored Sep 27, 2022
    Copy the full SHA
    2cfd22c View commit details

  4. Send a NewNotification message when a new notification has been created.

    @tgc-dk @NeroBurner
    tgc-dk authored and NeroBurner committed Sep 27, 2022
    Copy the full SHA
    ac5a04e View commit details

  5. 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
    @NeroBurner
    NeroBurner committed Sep 27, 2022
    Copy the full SHA
    c6b1f0f View commit details

  6. Merge branch 'tgc-dk_new-notifi-msg'

    @NeroBurner
    NeroBurner committed Sep 27, 2022
    Copy the full SHA
    945693d View commit details

Commits on Oct 11, 2022

  1. 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.
    @NeroBurner
    NeroBurner committed Oct 11, 2022
    Copy the full SHA
    51f6de6 View commit details

  2. Merge pull request InfiniTimeOrg#70 from InfiniTimeOrg/build_resource… 

    …s_option

Add option BUILD_RESOURCES=ON to build resources for sim
    @NeroBurner
    NeroBurner authored Oct 11, 2022
    Copy the full SHA
    535ed3c View commit details

Commits on Oct 12, 2022

  1. add dummy function

    minacode committed Oct 12, 2022
    Copy the full SHA
    3381d68 View commit details

  2. added threshold

    minacode committed Oct 12, 2022
    Copy the full SHA
    81c0608 View commit details

  3. Merge pull request InfiniTimeOrg#71 from minacode/low-battery 

    Add support for low battery warning
    @NeroBurner
    NeroBurner authored Oct 12, 2022
    Copy the full SHA
    02b75a8 View commit details

Commits on Oct 16, 2022

  1. Update InfiniTime to 1.11.0 release

    @NeroBurner
    NeroBurner committed Oct 16, 2022
    Copy the full SHA
    00ae5fc View commit details

  2. Update InfiniTime to current develop v1.11.0 branch

    @NeroBurner
    NeroBurner committed Oct 16, 2022
    Copy the full SHA
    e4a3aa0 View commit details

Commits on Nov 11, 2022

  1. s/screen/scren/ 

    fix small typo....
    @1sra3l
    1sra3l authored Nov 11, 2022
    Copy the full SHA
    d1516f1 View commit details

Commits on Nov 12, 2022

  1. Merge pull request InfiniTimeOrg#76 from 1sra3l/patch-1 

    s/scren/screen/ README.md
    @NeroBurner
    NeroBurner authored Nov 12, 2022
    Copy the full SHA
    7cc4876 View commit details

Commits on Nov 21, 2022

  1. Infinisim: GifExporter: Disable dithering 

    This patch disables dithering since it causes artifacts within the
generated gif files.
    blatzfab committed Nov 21, 2022
    Copy the full SHA
    db77a2c View commit details

  2. Merge pull request InfiniTimeOrg#77 from faxe1008/fix-gif-output 

    GifExporter: Disable dithering fixing artifacts in recording

Fixes: InfiniTimeOrg#51
    @NeroBurner
    NeroBurner authored Nov 21, 2022
    Copy the full SHA
    63bfd6e View commit details

Commits on Jan 15, 2023

  1. combine

    @Elements6007 @NeroBurner
    Elements6007 authored and NeroBurner committed Jan 15, 2023
    Copy the full SHA
    4fe058c View commit details

  2. InfiniTime: Update for Combined Date and Time Settings 

    Update to develop branch after InfiniTimeOrg/InfiniTime#1465
got merged.
    @NeroBurner
    NeroBurner committed Jan 15, 2023
    Copy the full SHA
    45500e8 View commit details

  3. Merge branch 'combine_datetime'

    @NeroBurner
    NeroBurner committed Jan 15, 2023
    Copy the full SHA
    168ff53 View commit details

Commits on Jan 18, 2023

  1. cmake: add explicit std::filesystem linking 

    Fix: InfiniTimeOrg#57
Supersede: InfiniTimeOrg#58
    @devnoname120
    devnoname120 committed Jan 18, 2023
    Copy the full SHA
    d6c2669 View commit details

Commits on Jan 19, 2023

  1. Merge pull request InfiniTimeOrg#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: InfiniTimeOrg#57
    @NeroBurner
    NeroBurner authored Jan 19, 2023
    Copy the full SHA
    df7f4bd View commit details

Commits on Jan 29, 2023

  1. Fix build after InfiniTime change 

    Update InfiniTime
    @Riksu9000 @NeroBurner
    Riksu9000 authored and NeroBurner committed Jan 29, 2023
    Copy the full SHA
    1aaf2c3 View commit details

Commits on Feb 24, 2023

  1. Apply InfiniTime TouchHandler changes

    @Riksu9000
    Riksu9000 committed Feb 24, 2023
    Copy the full SHA
    c6bccf5 View commit details

  2. Apply InfiniTime LittleVgl changes

    @Riksu9000
    Riksu9000 committed Feb 24, 2023
    Copy the full SHA
    48afc49 View commit details

Commits on Feb 25, 2023

  1. Update InfiniTime submodule

    @Riksu9000
    Riksu9000 committed Feb 25, 2023
    Copy the full SHA
    8ca2f42 View commit details

  2. Remove motorController from SystemTask 

    InfiniTime change
    @Riksu9000
    Riksu9000 committed Feb 25, 2023
    Copy the full SHA
    df768e2 View commit details

  3. Merge pull request InfiniTimeOrg#86 from Riksu9000/infinitime-changes 

    Fix build after InfiniTime changes
    @NeroBurner
    NeroBurner authored Feb 25, 2023
    Copy the full SHA
    6ccca0c View commit details

  4. Remove unused Missing screen 

    This class causes builds to fail every time screens are changed in
InfiniTime.
    @Riksu9000
    Riksu9000 committed Feb 25, 2023
    Copy the full SHA
    3be9516 View commit details

  5. 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.
    @Riksu9000
    Riksu9000 committed Feb 25, 2023
    Copy the full SHA
    322092e View commit details

  6. Merge pull request InfiniTimeOrg#87 from Riksu9000/remove-unused-files 

    Remove unused files
    @NeroBurner
    NeroBurner authored Feb 25, 2023
    Copy the full SHA
    35aca73 View commit details

Commits on Feb 26, 2023

  1. sim: WeatherService: add missing algorithm include

    @NeroBurner
    NeroBurner committed Feb 26, 2023
    Copy the full SHA
    f457925 View commit details
Showing with 39,493 additions and 2,623 deletions.
  1. +14 −4 .github/workflows/lv_sim.yml
  2. +0 −3 .gitmodules
  3. +204 −114 CMakeLists.txt
  4. +1 −1 InfiniTime
  5. +89 −10 README.md
  6. +248 −0 cmake/FindFilesystem.cmake
  7. +6 −0 external/miniz/CMakeLists.txt
  8. +196 −0 external/miniz/ChangeLog.md
  9. +22 −0 external/miniz/LICENSE
  10. +1 −0 external/miniz/download-url.txt
  11. +105 −0 external/miniz/examples/example1.c
  12. +164 −0 external/miniz/examples/example2.c
  13. +269 −0 external/miniz/examples/example3.c
  14. +102 −0 external/miniz/examples/example4.c
  15. +327 −0 external/miniz/examples/example5.c
  16. +162 −0 external/miniz/examples/example6.c
  17. +7,733 −0 external/miniz/miniz.c
  18. +1,350 −0 external/miniz/miniz.h
  19. +34 −0 external/miniz/readme.md
  20. +14 −0 external/nlohmann_json/CMakeLists.txt
  21. +24,596 −0 external/nlohmann_json/include/nlohmann/json.hpp
  22. +26 −0 img/CMakeLists.txt
  23. +21 −0 img/convert_bmp_to_header.py
  24. BIN img/sim_background.bmp
  25. BIN img/sim_background.xcf
  26. +0 −1 libpng
  27. +827 −0 littlefs-do-main.cpp
  28. +293 −70 main.cpp
  29. +46 −0 sim/FreeRTOS.cpp
  30. +25 −10 sim/FreeRTOS.h
  31. +6 −0 sim/components/battery/BatteryController.h
  32. +0 −125 sim/components/ble/AlertNotificationService.cpp
  33. +0 −68 sim/components/ble/AlertNotificationService.h
  34. +0 −198 sim/components/ble/MusicService.cpp
  35. +0 −87 sim/components/ble/MusicService.h
  36. +0 −111 sim/components/ble/NavigationService.cpp
  37. +0 −63 sim/components/ble/NavigationService.h
  38. +6 −7 sim/components/ble/NimbleController.cpp
  39. +11 −11 sim/components/ble/NimbleController.h
  40. +0 −602 sim/components/ble/weather/WeatherService.cpp
  41. +0 −172 sim/components/ble/weather/WeatherService.h
  42. +1 −1 sim/components/brightness/BrightnessController.h
  43. +0 −88 sim/components/motion/MotionController.cpp
  44. +0 −72 sim/components/motion/MotionController.h
  45. +104 −35 sim/displayapp/LittleVgl.cpp
  46. +11 −7 sim/displayapp/LittleVgl.h
  47. +0 −131 sim/displayapp/screens/Missing.cpp
  48. +0 −18 sim/displayapp/screens/Missing.h
  49. +0 −105 sim/drivers/Hrs3300.cpp
  50. +0 −46 sim/drivers/Hrs3300.h
  51. +1 −1 sim/drivers/SpiMaster.cpp
  52. +2 −1 sim/drivers/SpiMaster.h
  53. +6 −2 sim/drivers/SpiNorFlash.cpp
  54. +4 −1 sim/drivers/SpiNorFlash.h
  55. +0 −41 sim/drivers/Watchdog.cpp
  56. +0 −34 sim/drivers/Watchdog.h
  57. +198 −0 sim/host/ble_att.h
  58. +47 −0 sim/host/ble_gap.h
  59. +78 −0 sim/host/ble_gatt.cpp
  60. +903 −0 sim/host/ble_gatt.h
  61. +26 −0 sim/host/ble_hs_mbuf.cpp
  62. +88 −0 sim/host/ble_hs_mbuf.h
  63. +27 −0 sim/host/ble_uuid.cpp
  64. +100 −0 sim/host/ble_uuid.h
  65. +33 −0 sim/host/os_mbuf.cpp
  66. +138 −0 sim/host/os_mbuf.h
  67. +0 −88 sim/libraries/timer/app_timer.cpp
  68. +0 −254 sim/libraries/timer/app_timer.h
  69. +6 −0 sim/nrf_assert.h
  70. +3 −0 sim/nrfx/hal/nrf_gpio.cpp
  71. +3 −0 sim/nrfx/hal/nrf_gpio.h
  72. +56 −0 sim/nrfx/mdk/nrf.h
  73. +19 −0 sim/nrfx/mdk/nrf52.cpp
  74. +162 −0 sim/nrfx/mdk/nrf52.h
  75. +321 −0 sim/nrfx/mdk/nrf52_bitfields.h
  76. +22 −6 sim/portmacro_cmsis.h
  77. +125 −0 sim/projdefs.h
  78. +29 −12 sim/queue.cpp
  79. +9 −10 sim/queue.h
  80. +43 −0 sim/semphr.cpp
  81. +11 −0 sim/semphr.h
  82. +1 −1 sim/task.cpp
  83. +16 −7 sim/task.h
  84. +1 −1 sim/timers.cpp
  85. +1 −4 sim/timers.h
18 changes: 14 additions & 4 deletions .github/workflows/lv_sim.yml
View file
Original file line number Diff line number Diff line change
@@ -29,10 +29,14 @@ jobs:
- name: Install cmake
uses: lukka/get-cmake@v3.18.3

- name: Install SDL2 development package
- name: Install SDL2 and libpng development package
run: |
sudo apt-get update
sudo apt-get -y install libsdl2-dev
sudo apt-get -y install libsdl2-dev libpng-dev
- name: Install resource build dependencies
run: |
sudo apt-get -y install --no-install-recommends python3-pil
- name: Install lv_font_conv
run:
@@ -42,7 +46,7 @@ jobs:
# Checkout

- name: Checkout source files
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
submodules: recursive

@@ -64,7 +68,13 @@ jobs:
cmake --build build_lv_sim
- name: Upload simulator executable
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: infinisim
path: build_lv_sim/infinisim

- name: Upload littlefs-do executable
uses: actions/upload-artifact@v4
with:
name: littlefs-do
path: build_lv_sim/littlefs-do
3 changes: 0 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,3 @@
[submodule "lv_drivers"]
path = lv_drivers
url = ../../lvgl/lv_drivers.git
[submodule "libpng"]
path = libpng
url = ../../glennrp/libpng.git
Loading