Merge branch 'main' into advanced-mode

danielskowronski · Feb 22, 2023 · 5103462 · 5103462
2 parents fda432c + ab88409
commit 5103462
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -63,11 +63,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
diff --git 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,
+24 −0		.github/workflows/build.yml
+26 −0		.github/workflows/lint.yml
+12 −6		BH1750.c
+7 −0		BH1750.h