disable pwm if oled screen

Author: solosky

fw/application/src/app/settings/scene/settings_scene_config.h

@@ -1,7 +1,9 @@
 ADD_SCENE(settings, main, MAIN)
 ADD_SCENE(settings, version, VERSION)
 ADD_SCENE(settings, sleep_timeout, SLEEP_TIMEOUT)
+#ifdef LCD_SCREEN
 ADD_SCENE(settings, lcd_backlight, LCD_BACKLIGHT)
+#endif
 #ifdef OLED_SCREEN
     ADD_SCENE(settings, oled_contrast, OLED_CONTRAST)
 #endif

fw/application/src/app/settings/scene/settings_scene_lcd_backlight.c

@@ -10,6 +10,8 @@
 #include "mui_u8g2.h"
 #include "i18n/language.h"
 
+#ifdef LCD_SCREEN
+
 static void settings_scene_lcd_backlight_event_cb(mui_progress_bar_event_t event, mui_progress_bar_t *p_progress_bar) {
     app_settings_t *app = p_progress_bar->user_data;
     settings_data_t *p_settings = settings_get_data();
@@ -38,4 +40,6 @@ void settings_scene_lcd_backlight_on_enter(void *user_data) {
 void settings_scene_lcd_backlight_on_exit(void *user_data) {
     app_settings_t *app = user_data;
     mui_progress_bar_reset(app->p_progress_bar);
-}
+}
+
+#endif

fw/application/src/app/settings/scene/settings_scene_main.c

@@ -59,9 +59,11 @@ static void settings_scene_main_list_view_on_selected(mui_list_view_event_t even
 
     uint32_t selection = (uint32_t)p_item->user_data;
     switch (selection) {
+#ifdef LCD_SCREEN
     case SETTINGS_MAIN_MENU_BACK_LIGHT:
         mui_scene_dispatcher_next_scene(app->p_scene_dispatcher, SETTINGS_SCENE_LCD_BACKLIGHT);
         break;
+#endif
 
 #ifdef OLED_SCREEN
     case SETTINGS_MAIN_MENU_OLED_CONTRAST:

fw/application/src/app/settings/scene/settings_scene_oled_contrast.c

@@ -10,6 +10,8 @@
 #include "mui_u8g2.h"
 #include "i18n/language.h"
 
+#ifdef OLED_SCREEN
+
 static void settings_scene_oled_contrast_event_cb(mui_progress_bar_event_t event, mui_progress_bar_t *p_progress_bar) {
     app_settings_t *app = p_progress_bar->user_data;
     settings_data_t *p_settings = settings_get_data();
@@ -38,4 +40,6 @@ void settings_scene_oled_contrast_on_enter(void *user_data) {
 void settings_scene_oled_contrast_on_exit(void *user_data) {
     app_settings_t *app = user_data;
     mui_progress_bar_reset(app->p_progress_bar);
-}
+}
+
+#endif

fw/application/src/mui/mui_u8g2.c

@@ -83,6 +83,8 @@
 u8g2_t u8g2;
 static spi_device_t m_dev;
 uint8_t m_u8g2_initialized = 0;
+
+#ifdef LCD_SCREEN
 APP_PWM_INSTANCE(pwm1, 1); // Create the instance "PWM1" using TIMER1.
 
 static ret_code_t pwm_init(void) {
@@ -106,12 +108,13 @@ static ret_code_t pwm_init(void) {
         app_pwm_enable(&pwm1);
         while (app_pwm_channel_duty_set(&pwm1, 0, init_duty) == NRF_ERROR_BUSY)
             ;
-
     }
 
     return NRF_SUCCESS;
 }
 
+#endif
+
 uint8_t u8x8_HW_com_spi_nrf52832(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
 uint8_t u8g2_nrf_gpio_and_delay_spi_cb(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int, void *arg_ptr);
 
@@ -184,35 +187,41 @@ void mui_u8g2_init(u8g2_t *p_u8g2) {
 
     nrf_gpio_cfg_output(LCD_RESET_PIN);
     nrf_gpio_cfg_output(LCD_DC_PIN);
+
+#ifdef LCD_SCREEN
     nrf_gpio_cfg_output(LCD_BL_PIN);
     nrf_gpio_pin_clear(LCD_BL_PIN);
 
-    #ifdef OLED_TYPE_SH1106
-        u8g2_Setup_sh1106_128x64_noname_f(p_u8g2, U8G2_R0, u8x8_HW_com_spi_nrf52832, u8g2_nrf_gpio_and_delay_spi_cb);
-    #else
-        u8g2_Setup_st7567_enh_dg128064_f(p_u8g2, U8G2_R0, u8x8_HW_com_spi_nrf52832, u8g2_nrf_gpio_and_delay_spi_cb);
-    #endif
+    u8g2_Setup_st7567_enh_dg128064_f(p_u8g2, U8G2_R0, u8x8_HW_com_spi_nrf52832, u8g2_nrf_gpio_and_delay_spi_cb);
+    u8g2_InitDisplay(p_u8g2);
+    u8g2_SetPowerSave(p_u8g2, 0);
+
+    pwm_init();
+#endif
 
+#ifdef OLED_SCREEN
+    u8g2_Setup_sh1106_128x64_noname_f(p_u8g2, U8G2_R0, u8x8_HW_com_spi_nrf52832, u8g2_nrf_gpio_and_delay_spi_cb);
     u8g2_InitDisplay(p_u8g2);
 
-    #ifdef OLED_SCREEN
-        settings_data_t *p_settings = settings_get_data();
-        mui_u8g2_set_oled_contrast_level(p_settings->oled_contrast);
-    #endif
+    settings_data_t *p_settings = settings_get_data();
+    mui_u8g2_set_oled_contrast_level(p_settings->oled_contrast);
 
     u8g2_SetPowerSave(p_u8g2, 0);
 
-    pwm_init();
+#endif
 }
 
 void mui_u8g2_deinit(u8g2_t *p_u8g2) {
     u8g2_SetPowerSave(p_u8g2, 1);
 
+#ifdef LCD_SCREEN
     mui_u8g2_set_backlight_level(0);
     nrf_gpio_pin_clear(LCD_BL_PIN);
     nrf_gpio_cfg_default(LCD_BL_PIN);
+#endif
 }
 
+#ifdef LCD_SCREEN
 void mui_u8g2_set_backlight(uint8_t bl) { nrf_gpio_pin_write(LCD_BL_PIN, bl); }
 
 uint8_t mui_u8g2_get_backlight() { return nrf_gpio_pin_out_read(LCD_BL_PIN); }
@@ -228,9 +237,13 @@ void mui_u8g2_set_backlight_level(uint8_t value) {
             ;
     }
 }
-int8_t mui_u8g2_get_backlight_level(void) { return (int8_t) app_pwm_channel_duty_get(&pwm1, 0); }
+int8_t mui_u8g2_get_backlight_level(void) { return (int8_t)app_pwm_channel_duty_get(&pwm1, 0); }
+
+#endif
 
+#ifdef OLED_SCREEN
 void mui_u8g2_set_oled_contrast_level(uint8_t value) {
     mui_t *p_mui = mui();
-    u8g2_SetContrast(&p_mui->u8g2,(value - 1) * (255.0 / 99.0));
-}
+    u8g2_SetContrast(&p_mui->u8g2, (value - 1) * (255.0 / 99.0));
+}
+#endif