Преглед изворни кода

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

# Conflicts:
#	swd_probe/usb_uart.c
WillyJL пре 8 месеци
родитељ
комит
d7aa7ecb5f
3 измењених фајлова са 3 додато и 3 уклоњено
  1. 1 1
      swd_probe/.gitsubtree
  2. 1 1
      swd_probe/application.fam
  3. 1 1
      swd_probe/usb_uart.c

+ 1 - 1
swd_probe/.gitsubtree

@@ -1,2 +1,2 @@
-https://github.com/xMasterX/all-the-plugins dev base_pack/swd_probe e4bf49882c5f590746e35583d821a926c757d9e7
+https://github.com/xMasterX/all-the-plugins dev base_pack/swd_probe 8b9d3e75faa8fbd1ed251476f2e7b410dd99a285
 https://github.com/g3gg0/flipper-swd_probe master /

+ 1 - 1
swd_probe/application.fam

@@ -11,6 +11,6 @@ App(
     fap_category="GPIO/Debug",
     fap_icon_assets="icons",
     fap_author="@g3gg0 & (fixes by @xMasterX)",
-    fap_version="1.2",
+    fap_version="1.3",
     fap_description="ARM SWD (Single Wire Debug) Probe",
 )

+ 1 - 1
swd_probe/usb_uart.c

@@ -7,7 +7,7 @@
 #include "usb_cdc.h"
 #include "cli/cli_vcp.h"
 #include <toolbox/api_lock.h>
-#include "cli/cli.h"
+#include <cli/cli.h>
 
 #define USB_CDC_PKT_LEN      CDC_DATA_SZ
 #define USB_UART_RX_BUF_SIZE (USB_CDC_PKT_LEN * 5)