Merge branch 'dev' into ct/v1.8.0

views/camera_suite_view_camera.h

@@ -17,15 +17,16 @@
 
 #include "../helpers/camera_suite_custom_event.h"
 
-#ifdef xtreme_settings
+#ifdef FW_ORIGIN_Xtreme
 /**
  * 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
 */
+#include <xtreme/xtreme.h>
 #define UART_CH (xtreme_settings.uart_esp_channel)
-#elif defined momentum_settings
+#elif defined FW_ORIGIN_Momentum
 /**
  * Enable the following line for "Momentum Firmware" & "Momentum Apps".
  * 
@@ -34,6 +35,14 @@
 */
 #include <momentum/momentum.h>
 #define UART_CH (momentum_settings.uart_esp_channel)
+#elif defined FW_ORIGIN_RM
+/**
+ * Enable the following line for "RogueMaster Firmware".
+ * 
+ * @see https://github.com/RogueMaster/flipperzero-firmware-wPlugins
+*/
+#include <cfw/cfw.h>
+#define UART_CH (cfw_settings.uart_esp_channel)
 #else
 #define UART_CH (FuriHalSerialIdUsart)
 #endif