Kaynağa Gözat

Merge geiger from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	geiger/flipper_geiger.c
Willy-JL 1 yıl önce
ebeveyn
işleme
7c14fed916
2 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 1 1
      geiger/application.fam
  2. 2 2
      geiger/flipper_geiger.c

+ 1 - 1
geiger/application.fam

@@ -12,6 +12,6 @@ App(
     fap_category="GPIO",
     fap_author="@nmrr",
     fap_weburl="https://github.com/nmrr/flipperzero-geigercounter",
-    fap_version="1.1",
+    fap_version="1.2",
     fap_description="Works with J305 Geiger tube on external board",
 )

+ 2 - 2
geiger/flipper_geiger.c

@@ -10,13 +10,14 @@
 #include <furi_hal_random.h>
 #include <furi_hal_pwm.h>
 #include <furi_hal_power.h>
-#include <expansion/expansion.h>
 
 #include <storage/storage.h>
 #include <stream/buffered_file_stream.h>
 
 #include <locale/locale.h>
 
+#include <expansion/expansion.h>
+
 #define SCREEN_SIZE_X 128
 #define SCREEN_SIZE_Y 64
 
@@ -204,7 +205,6 @@ int32_t flipper_geiger_app() {
     mutexVal.mutex = furi_mutex_alloc(FuriMutexTypeNormal);
     if(!mutexVal.mutex) {
         furi_message_queue_free(event_queue);
-
         expansion_enable(expansion);
         furi_record_close(RECORD_EXPANSION);
         return 255;