From 009296e25b79b35e7e3a5aee4a8e83e9f97dfa04 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Mon, 11 Nov 2024 18:09:08 +0000 Subject: [PATCH] FlipperHTTP: Use UART chosen in settings --- flip_library/flipper_http/flipper_http.h | 3 ++- flip_social/flipper_http/flipper_http.h | 3 ++- flip_store/flipper_http/flipper_http.h | 3 ++- flip_trader/flipper_http/flipper_http.h | 3 ++- flip_weather/flipper_http/flipper_http.h | 3 ++- flip_wifi/flipper_http/flipper_http.h | 3 ++- web_crawler/flipper_http/flipper_http.h | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/flip_library/flipper_http/flipper_http.h b/flip_library/flipper_http/flipper_http.h index 01dc978b9..890029eca 100644 --- a/flip_library/flipper_http/flipper_http.h +++ b/flip_library/flipper_http/flipper_http.h @@ -7,12 +7,13 @@ #include #include #include +#include // STORAGE_EXT_PATH_PREFIX is defined in the Furi SDK as /ext #define HTTP_TAG "FlipLibrary" // change this to your app name #define http_tag "flip_library" // change this to your app id -#define UART_CH (FuriHalSerialIdUsart) // UART channel +#define UART_CH (momentum_settings.uart_esp_channel) // UART channel #define TIMEOUT_DURATION_TICKS (5 * 1000) // 5 seconds #define BAUDRATE (115200) // UART baudrate #define RX_BUF_SIZE 1024 // UART RX buffer size diff --git a/flip_social/flipper_http/flipper_http.h b/flip_social/flipper_http/flipper_http.h index 3e589c39b..3f6cb9194 100644 --- a/flip_social/flipper_http/flipper_http.h +++ b/flip_social/flipper_http/flipper_http.h @@ -7,12 +7,13 @@ #include #include #include +#include // STORAGE_EXT_PATH_PREFIX is defined in the Furi SDK as /ext #define HTTP_TAG "FlipSocial" // change this to your app name #define http_tag "flip_social" // change this to your app id -#define UART_CH (FuriHalSerialIdUsart) // UART channel +#define UART_CH (momentum_settings.uart_esp_channel) // UART channel #define TIMEOUT_DURATION_TICKS (5 * 1000) // 5 seconds #define BAUDRATE (115200) // UART baudrate #define RX_BUF_SIZE 1024 // UART RX buffer size diff --git a/flip_store/flipper_http/flipper_http.h b/flip_store/flipper_http/flipper_http.h index 3ec24d578..00c3d3544 100644 --- a/flip_store/flipper_http/flipper_http.h +++ b/flip_store/flipper_http/flipper_http.h @@ -7,12 +7,13 @@ #include #include #include +#include // STORAGE_EXT_PATH_PREFIX is defined in the Furi SDK as /ext #define HTTP_TAG "FlipStore" // change this to your app name #define http_tag "flip_store" // change this to your app id -#define UART_CH (FuriHalSerialIdUsart) // UART channel +#define UART_CH (momentum_settings.uart_esp_channel) // UART channel #define TIMEOUT_DURATION_TICKS (5 * 1000) // 5 seconds #define BAUDRATE (115200) // UART baudrate #define RX_BUF_SIZE 1024 // UART RX buffer size diff --git a/flip_trader/flipper_http/flipper_http.h b/flip_trader/flipper_http/flipper_http.h index c05994fc5..fb1f4229e 100644 --- a/flip_trader/flipper_http/flipper_http.h +++ b/flip_trader/flipper_http/flipper_http.h @@ -7,12 +7,13 @@ #include #include #include +#include // STORAGE_EXT_PATH_PREFIX is defined in the Furi SDK as /ext #define HTTP_TAG "FlipTrader" // change this to your app name #define http_tag "flip_trader" // change this to your app id -#define UART_CH (FuriHalSerialIdUsart) // UART channel +#define UART_CH (momentum_settings.uart_esp_channel) // UART channel #define TIMEOUT_DURATION_TICKS (5 * 1000) // 5 seconds #define BAUDRATE (115200) // UART baudrate #define RX_BUF_SIZE 1024 // UART RX buffer size diff --git a/flip_weather/flipper_http/flipper_http.h b/flip_weather/flipper_http/flipper_http.h index 3892d297f..9cd2b47aa 100644 --- a/flip_weather/flipper_http/flipper_http.h +++ b/flip_weather/flipper_http/flipper_http.h @@ -7,12 +7,13 @@ #include #include #include +#include // STORAGE_EXT_PATH_PREFIX is defined in the Furi SDK as /ext #define HTTP_TAG "FlipWeather" // change this to your app name #define http_tag "flip_weather" // change this to your app id -#define UART_CH (FuriHalSerialIdUsart) // UART channel +#define UART_CH (momentum_settings.uart_esp_channel) // UART channel #define TIMEOUT_DURATION_TICKS (5 * 1000) // 5 seconds #define BAUDRATE (115200) // UART baudrate #define RX_BUF_SIZE 1024 // UART RX buffer size diff --git a/flip_wifi/flipper_http/flipper_http.h b/flip_wifi/flipper_http/flipper_http.h index 45d72c4e7..c6cafcc5a 100644 --- a/flip_wifi/flipper_http/flipper_http.h +++ b/flip_wifi/flipper_http/flipper_http.h @@ -7,12 +7,13 @@ #include #include #include +#include // STORAGE_EXT_PATH_PREFIX is defined in the Furi SDK as /ext #define HTTP_TAG "FlipWiFi" // change this to your app name #define http_tag "flip_wifi" // change this to your app id -#define UART_CH (FuriHalSerialIdUsart) // UART channel +#define UART_CH (momentum_settings.uart_esp_channel) // UART channel #define TIMEOUT_DURATION_TICKS (5 * 1000) // 5 seconds #define BAUDRATE (115200) // UART baudrate #define RX_BUF_SIZE 1024 // UART RX buffer size diff --git a/web_crawler/flipper_http/flipper_http.h b/web_crawler/flipper_http/flipper_http.h index ba6a2ee4d..65d8a8ee7 100644 --- a/web_crawler/flipper_http/flipper_http.h +++ b/web_crawler/flipper_http/flipper_http.h @@ -7,12 +7,13 @@ #include #include #include +#include // STORAGE_EXT_PATH_PREFIX is defined in the Furi SDK as /ext #define HTTP_TAG "Web Crawler" // change this to your app name #define http_tag "web_crawler" // change this to your app id -#define UART_CH (FuriHalSerialIdUsart) // UART channel +#define UART_CH (momentum_settings.uart_esp_channel) // UART channel #define TIMEOUT_DURATION_TICKS (5 * 1000) // 5 seconds #define BAUDRATE (115200) // UART baudrate #define RX_BUF_SIZE 2048 // UART RX buffer size