Просмотр исходного кода

Move uart settings to camera suite view cam .h

Cody Tolene 1 год назад
Родитель
Сommit
0279dd03b7
2 измененных файлов с 20 добавлено и 20 удалено
  1. 0 20
      camera_suite.h
  2. 20 0
      views/camera_suite_view_camera.h

+ 0 - 20
camera_suite.h

@@ -20,26 +20,6 @@
 
 
 #define TAG "Camera Suite"
 #define TAG "Camera Suite"
 
 
-#ifdef xtreme_settings
-/**
- * Enable the following line for "Xtreme Firmware" & "Xtreme Apps" (Flipper-XFW).
- * 
- * @see https://github.com/Flipper-XFW/Xtreme-Firmware
- * @see https://github.com/Flipper-XFW/Xtreme-Apps
-*/
-#define UART_CH (xtreme_settings.uart_esp_channel)
-#elif momentum_settings
-/**
- * Enable the following line for "Momentum Firmware" & "Momentum Apps".
- * 
- * @see https://github.com/Next-Flip/Momentum-Firmware
- * @see https://github.com/Next-Flip/Momentum-Apps
-*/
-#define UART_CH (momentum_settings.uart_esp_channel)
-#else
-#define UART_CH (FuriHalSerialIdUsart)
-#endif
-
 typedef struct {
 typedef struct {
     Gui* gui;
     Gui* gui;
     NotificationApp* notification;
     NotificationApp* notification;

+ 20 - 0
views/camera_suite_view_camera.h

@@ -17,6 +17,26 @@
 
 
 #include "../helpers/camera_suite_custom_event.h"
 #include "../helpers/camera_suite_custom_event.h"
 
 
+#ifdef xtreme_settings
+/**
+ * Enable the following line for "Xtreme Firmware" & "Xtreme Apps" (Flipper-XFW).
+ * 
+ * @see https://github.com/Flipper-XFW/Xtreme-Firmware
+ * @see https://github.com/Flipper-XFW/Xtreme-Apps
+*/
+#define UART_CH (xtreme_settings.uart_esp_channel)
+#elif momentum_settings
+/**
+ * Enable the following line for "Momentum Firmware" & "Momentum Apps".
+ * 
+ * @see https://github.com/Next-Flip/Momentum-Firmware
+ * @see https://github.com/Next-Flip/Momentum-Apps
+*/
+#define UART_CH (momentum_settings.uart_esp_channel)
+#else
+#define UART_CH (FuriHalSerialIdUsart)
+#endif
+
 #define BITMAP_HEADER_LENGTH 62
 #define BITMAP_HEADER_LENGTH 62
 #define FRAME_BIT_DEPTH 1
 #define FRAME_BIT_DEPTH 1
 #define FRAME_BUFFER_LENGTH 1024
 #define FRAME_BUFFER_LENGTH 1024