Parcourir la source

Squashed 'counter/' changes from 755d41735..022b484b5

022b484b5 fix catalog versions
ecb0b04fe Icon fixes & manifest updates
d580ef464 categories part 1
6c51233b2 more manifestos, xbox controller and videopoker ufbt fixes
a9cd97332 Add Screenshots
6b4b2fdf1 API 31 / unzip sources
REVERT: 755d41735 Update README.md
REVERT: 1bab137a6 Add files via upload
REVERT: 96442781c Delete Screencast from 14-11-22 23:45:57.webm
REVERT: f439a894e Add files via upload
REVERT: 1c82bec6f Add files via upload
REVERT: 1c0f88ca0 Update README.md
REVERT: a37f97d19 Add files via upload
REVERT: 2e3daa3f0 Update README.md
REVERT: ac00851d2 Initial commit

git-subtree-dir: counter
git-subtree-split: 022b484b59642fcb19297cabf8f3492046cef88c
Willy-JL il y a 2 ans
Parent
commit
245567a55e
6 fichiers modifiés avec 8 ajouts et 4 suppressions
  1. 7 3
      application.fam
  2. 1 1
      counter.c
  3. BIN
      icons/counter_icon.png
  4. BIN
      img/1.png
  5. BIN
      img/2.png
  6. BIN
      media/preview.gif

+ 7 - 3
application.fam

@@ -1,12 +1,16 @@
 App(
 App(
     appid="counter",
     appid="counter",
     name="Counter",
     name="Counter",
-    apptype=FlipperAppType.PLUGIN,
+    apptype=FlipperAppType.EXTERNAL,
     entry_point="counterapp",
     entry_point="counterapp",
     requires=[
     requires=[
         "gui",
         "gui",
     ],
     ],
-    fap_category="Misc",
+    fap_category="Tools",
     fap_icon="icons/counter_icon.png",
     fap_icon="icons/counter_icon.png",
     fap_icon_assets="icons",
     fap_icon_assets="icons",
-)
+    fap_author="@Krulknul",
+    fap_weburl="https://github.com/Krulknul/dolphin-counter",
+    fap_version="1.2",
+    fap_description="Simple counter",
+)

+ 1 - 1
counter.c

@@ -90,7 +90,7 @@ int32_t counterapp(void) {
                 furi_mutex_release(c->mutex);
                 furi_mutex_release(c->mutex);
                 state_free(c);
                 state_free(c);
                 return 0;
                 return 0;
-            } else if(input.key == InputKeyUp && c->count < MAX_COUNT) {
+            } else if((input.key == InputKeyUp || input.key == InputKeyOk) && c->count < MAX_COUNT) {
                 c->pressed = true;
                 c->pressed = true;
                 c->boxtimer = BOXTIME;
                 c->boxtimer = BOXTIME;
                 c->count++;
                 c->count++;

BIN
icons/counter_icon.png


BIN
img/1.png


BIN
img/2.png


BIN
media/preview.gif