Преглед на файлове

Merge signal_generator from https://github.com/flipperdevices/flipperzero-good-faps

Willy-JL преди 9 месеца
родител
ревизия
193c29d6f8
променени са 4 файла, в които са добавени 10 реда и са изтрити 3 реда
  1. 6 0
      signal_generator/.catalog/changelog.md
  2. 1 1
      signal_generator/.gitsubtree
  3. 1 1
      signal_generator/application.fam
  4. 2 1
      signal_generator/scenes/signal_gen_scene_pwm.c

+ 6 - 0
signal_generator/.catalog/changelog.md

@@ -0,0 +1,6 @@
+## 1.2
+ - Fixed compatibility with PWM HAL API
+## 1.1
+ - Removed call to legacy UI SDK API
+## 1.0
+ - Initial release

+ 1 - 1
signal_generator/.gitsubtree

@@ -1,2 +1,2 @@
 https://github.com/xMasterX/all-the-plugins dev base_pack/signal_generator 8bc18d5d99262484548b6bbc92690a1472c329a0
-https://github.com/flipperdevices/flipperzero-good-faps dev signal_generator b791dea234f855155027bb46215dc60f3ddeb243
+https://github.com/flipperdevices/flipperzero-good-faps dev signal_generator b1dca2058d92504562c40fca9840bcd95843c698

+ 1 - 1
signal_generator/application.fam

@@ -6,7 +6,7 @@ App(
     requires=["gui"],
     stack_size=1 * 1024,
     fap_description="Control GPIO pins to generate digital signals",
-    fap_version="1.1",
+    fap_version="1.2",
     fap_icon="signal_gen_10px.png",
     fap_category="GPIO",
     fap_icon_assets="icons",

+ 2 - 1
signal_generator/scenes/signal_gen_scene_pwm.c

@@ -57,7 +57,8 @@ bool signal_gen_scene_pwm_on_event(void* context, SceneManagerEvent event) {
         } else if(event.event == SignalGenPwmEventChannelChange) {
             consumed = true;
             // Stop previous channel PWM
-            if(furi_hal_pwm_is_running(app->pwm_ch_prev)) {
+            if(app->pwm_ch_prev != FuriHalPwmOutputIdNone &&
+               furi_hal_pwm_is_running(app->pwm_ch_prev)) {
                 furi_hal_pwm_stop(app->pwm_ch_prev);
             }