revert changes / update changelog

DarkFlippers · Apr 6, 2023 · 5a7cddf · 5a7cddf
1 parent b8dba0f
commit 5a7cddf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,6 @@
 * Plugins: Update **TOTP (Authenticator)** [(by akopachov)](https://github.com/akopachov/flipper-zero_authenticator) (Steam guard support)
 * Plugins: Update **UART Terminal** [(by cool4uma)](https://github.com/cool4uma/UART_Terminal/tree/main) (AT commands support)
 * Plugins: Add IR Scope app. (by @kallanreed | PR #407)
-* OFW PR 2567: Fix state gpio AVR Programmer (by @Skorpionm)
 * OFW: scripts: sconsdist: added stub file artifact for older ufbt 
 * OFW: Graphics cleanup and icon rotation
 * OFW: Moved ufbt to fbt codebase

diff --git a/applications/external/avr_isp_programmer/helpers/avr_isp.c b/applications/external/avr_isp_programmer/helpers/avr_isp.c
@@ -152,7 +152,6 @@ bool avr_isp_auto_set_spi_speed_start_pmode(AvrIsp* instance) {
             }
         }
     }
-    if(instance->spi) avr_isp_spi_sw_free(instance->spi);
     return false;
 }
 

diff --git a/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c b/applications/external/avr_isp_programmer/helpers/avr_isp_worker_rw.c
@@ -198,8 +198,9 @@ bool avr_isp_worker_rw_detect_chip(AvrIspWorkerRW* instance) {
         }
         avr_isp_end_pmode(instance->avr_isp);
 
+        furi_hal_pwm_stop(FuriHalPwmOutputIdLptim2PA4);
+
     } while(0);
-    furi_hal_pwm_stop(FuriHalPwmOutputIdLptim2PA4);
     if(instance->callback) {
         if(instance->chip_arr_ind > avr_isp_chip_arr_size) {
             instance->callback(instance->context, "No detect", instance->chip_detect, 0);

diff --git a/applications/external/avr_isp_programmer/lib/driver/avr_isp_prog.c b/applications/external/avr_isp_programmer/lib/driver/avr_isp_prog.c
@@ -317,7 +317,6 @@ static bool avr_isp_prog_auto_set_spi_speed_start_pmode(AvrIspProg* instance) {
             }
         }
     }
-    if(instance->spi) avr_isp_spi_sw_free(instance->spi);
     return false;
 }
 

diff --git a/applications/external/avr_isp_programmer/lib/driver/avr_isp_spi_sw.c b/applications/external/avr_isp_programmer/lib/driver/avr_isp_spi_sw.c
@@ -18,6 +18,7 @@ struct AvrIspSpiSw {
 AvrIspSpiSw* avr_isp_spi_sw_init(AvrIspSpiSwSpeed speed) {
     AvrIspSpiSw* instance = malloc(sizeof(AvrIspSpiSw));
     instance->speed_wait_time = speed;
+
     instance->miso = AVR_ISP_SPI_SW_MISO;
     instance->mosi = AVR_ISP_SPI_SW_MOSI;
     instance->sck = AVR_ISP_SPI_SW_SCK;
@@ -39,6 +40,7 @@ void avr_isp_spi_sw_free(AvrIspSpiSw* instance) {
     furi_hal_gpio_init(instance->miso, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
     furi_hal_gpio_init(instance->mosi, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
     furi_hal_gpio_init(instance->sck, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
+
     free(instance);
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
         }
-        if(instance->spi) avr_isp_spi_sw_free(instance->spi);
         return false;
     }
@@ Expand Down @@