From ab88409038ce4a04c7c92ec9c9f2cb9ee2b035bb Mon Sep 17 00:00:00 2001 From: Oleksii Kutuzov <8535871+oleksiikutuzov@users.noreply.github.com> Date: Wed, 22 Feb 2023 21:03:05 +0100 Subject: [PATCH] Various minor updates (#40) * Bump library module * Add 1/48 shutter speed * Use v2 build/lint action --- .github/workflows/build.yml | 4 ++-- .github/workflows/lint.yml | 2 +- application/gui/views/main_view.c | 10 +++++----- application/lib/BH1750 | 2 +- application/lightmeter_config.h | 1 + 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ea148b6..c1e855a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ name: Build FAP on: - pull_request: + pull_request: branches: - main push: @@ -19,6 +19,6 @@ jobs: submodules: "true" - name: Build - uses: oleksiikutuzov/flipperzero-ufbt-action@v1 + uses: oleksiikutuzov/flipperzero-ufbt-action@v2 with: path: application diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a1c3a1d..68df4dc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: submodules: true - name: Lint - uses: oleksiikutuzov/flipperzero-ufbt-action@v1 + uses: oleksiikutuzov/flipperzero-ufbt-action@v2 with: lint: true path: application diff --git a/application/gui/views/main_view.c b/application/gui/views/main_view.c index fcbafbf..8b3e298 100644 --- a/application/gui/views/main_view.c +++ b/application/gui/views/main_view.c @@ -62,11 +62,11 @@ const float aperture_numbers[] = { const float speed_numbers[] = { [SPEED_8000] = 1.0 / 8000, [SPEED_4000] = 1.0 / 4000, [SPEED_2000] = 1.0 / 2000, [SPEED_1000] = 1.0 / 1000, [SPEED_500] = 1.0 / 500, [SPEED_250] = 1.0 / 250, - [SPEED_125] = 1.0 / 125, [SPEED_60] = 1.0 / 60, [SPEED_30] = 1.0 / 30, - [SPEED_15] = 1.0 / 15, [SPEED_8] = 1.0 / 8, [SPEED_4] = 1.0 / 4, - [SPEED_2] = 1.0 / 2, [SPEED_1S] = 1.0, [SPEED_2S] = 2.0, - [SPEED_4S] = 4.0, [SPEED_8S] = 8.0, [SPEED_15S] = 15.0, - [SPEED_30S] = 30.0, + [SPEED_125] = 1.0 / 125, [SPEED_60] = 1.0 / 60, [SPEED_48] = 1.0 / 48, + [SPEED_30] = 1.0 / 30, [SPEED_15] = 1.0 / 15, [SPEED_8] = 1.0 / 8, + [SPEED_4] = 1.0 / 4, [SPEED_2] = 1.0 / 2, [SPEED_1S] = 1.0, + [SPEED_2S] = 2.0, [SPEED_4S] = 4.0, [SPEED_8S] = 8.0, + [SPEED_15S] = 15.0, [SPEED_30S] = 30.0, }; struct MainView { diff --git a/application/lib/BH1750 b/application/lib/BH1750 index ea31b71..cf05c49 160000 --- a/application/lib/BH1750 +++ b/application/lib/BH1750 @@ -1 +1 @@ -Subproject commit ea31b71437c93b4ab79fea06036b4b0232198d9b +Subproject commit cf05c49076a54dc0559d193e5aec29ff7455aa65 diff --git a/application/lightmeter_config.h b/application/lightmeter_config.h index 4f7e11e..5edbdce 100644 --- a/application/lightmeter_config.h +++ b/application/lightmeter_config.h @@ -79,6 +79,7 @@ typedef enum { SPEED_250, SPEED_125, SPEED_60, + SPEED_48, SPEED_30, SPEED_15, SPEED_8,