diff --git a/applications/services/gui/canvas.c b/applications/services/gui/canvas.c index 9c19853d3..573ad185e 100644 --- a/applications/services/gui/canvas.c +++ b/applications/services/gui/canvas.c @@ -96,12 +96,12 @@ size_t canvas_get_buffer_size(const Canvas* canvas) { bool canvas_is_inverted_lcd(Canvas* canvas) { furi_assert(canvas); - return canvas->lcd_inverse; + return canvas->lcd_inversion; } void canvas_set_inverted_lcd(Canvas* canvas, bool inverted) { furi_assert(canvas); - canvas->lcd_inverse = inverted; + canvas->lcd_inversion = inverted; } void canvas_frame_set( @@ -152,7 +152,7 @@ const CanvasFontParameters* canvas_get_font_params(const Canvas* canvas, Font fo void canvas_clear(Canvas* canvas) { furi_check(canvas); - if(canvas->lcd_inverse) { + if(canvas->lcd_inversion) { u8g2_FillBuffer(&canvas->fb); } else { u8g2_ClearBuffer(&canvas->fb); @@ -162,7 +162,7 @@ void canvas_clear(Canvas* canvas) { void canvas_set_color(Canvas* canvas, Color color) { furi_check(canvas); - if(canvas->lcd_inverse) { + if(canvas->lcd_inversion) { if(color == ColorBlack) { color = ColorWhite; } else if(color == ColorWhite) { @@ -178,9 +178,9 @@ void canvas_set_font_direction(Canvas* canvas, CanvasDirection dir) { } void canvas_invert_color(Canvas* canvas) { - if((canvas->fb.draw_color == ColorXOR) && canvas->lcd_inverse) { + if((canvas->fb.draw_color == ColorXOR) && canvas->lcd_inversion) { // ColorXOR = 0x02, inversion change it to White = 0x00 - // but if we have lcd_inverse ON then we need Black =0x01 instead White 0x00 + // but if we have lcd_inversion ON then we need Black =0x01 instead White 0x00 // so we force changing color to black canvas->fb.draw_color = ColorBlack; } else { diff --git a/applications/services/gui/canvas_i.h b/applications/services/gui/canvas_i.h index d342c07f5..420b97e0f 100644 --- a/applications/services/gui/canvas_i.h +++ b/applications/services/gui/canvas_i.h @@ -47,7 +47,7 @@ struct Canvas { CompressIcon* compress_icon; CanvasCallbackPairArray_t canvas_callback_pair; FuriMutex* mutex; - bool lcd_inverse; + bool lcd_inversion; }; /** Allocate memory and initialize canvas diff --git a/applications/services/notification/notification_app.c b/applications/services/notification/notification_app.c index f57900fc5..d416c89f9 100644 --- a/applications/services/notification/notification_app.c +++ b/applications/services/notification/notification_app.c @@ -657,10 +657,10 @@ static void notification_apply_settings(NotificationApp* app) { } // --- NIGHT SHIFT END --- - //setup canvas variable "inverse" by settings value; + //setup canvas variable "inversion" by settings value; Gui* tmp_gui = furi_record_open(RECORD_GUI); Canvas* tmp_canvas = gui_direct_draw_acquire(tmp_gui); - canvas_set_inverted_lcd(tmp_canvas, app->settings.lcd_inverse); + canvas_set_inverted_lcd(tmp_canvas, app->settings.lcd_inversion); gui_direct_draw_release(tmp_gui); furi_record_close(RECORD_GUI); } diff --git a/applications/services/notification/notification_app.h b/applications/services/notification/notification_app.h index c0b64b807..7ac8528f2 100644 --- a/applications/services/notification/notification_app.h +++ b/applications/services/notification/notification_app.h @@ -48,7 +48,7 @@ typedef struct { float night_shift; uint32_t night_shift_start; uint32_t night_shift_end; - bool lcd_inverse; + bool lcd_inversion; } NotificationSettings; struct NotificationApp { diff --git a/applications/settings/notification_settings/notification_settings_app.c b/applications/settings/notification_settings/notification_settings_app.c index d313714fc..4362039f0 100644 --- a/applications/settings/notification_settings/notification_settings_app.c +++ b/applications/settings/notification_settings/notification_settings_app.c @@ -270,12 +270,12 @@ const uint32_t night_shift_end_value[NIGHT_SHIFT_END_COUNT] = { // --- NIGHT SHIFT END --- -#define LCD_INVERSE_COUNT 2 -const char* const lcd_inverse_text[LCD_INVERSE_COUNT] = { +#define LCD_INVERSION_COUNT 2 +const char* const lcd_inversion_text[LCD_INVERSION_COUNT] = { "OFF", "ON", }; -const bool lcd_inverse_value[LCD_INVERSE_COUNT] = {false, true}; +const bool lcd_inversion_value[LCD_INVERSION_COUNT] = {false, true}; static void contrast_changed(VariableItem* item) { NotificationAppSettings* app = variable_item_get_context(item); @@ -348,15 +348,15 @@ static void vibro_changed(VariableItem* item) { notification_message(app->notification, &sequence_single_vibro); } -static void lcd_inverse_changed(VariableItem* item) { +static void lcd_inversion_changed(VariableItem* item) { NotificationAppSettings* app = variable_item_get_context(item); uint8_t index = variable_item_get_current_value_index(item); - variable_item_set_current_value_text(item, lcd_inverse_text[index]); - app->notification->settings.lcd_inverse = lcd_inverse_value[index]; + variable_item_set_current_value_text(item, lcd_inversion_text[index]); + app->notification->settings.lcd_inversion = lcd_inversion_value[index]; Canvas* tmp_canvas = gui_direct_draw_acquire(app->gui); - canvas_set_inverted_lcd(tmp_canvas, lcd_inverse_value[index]); + canvas_set_inverted_lcd(tmp_canvas, lcd_inversion_value[index]); gui_direct_draw_release(app->gui); notification_message(app->notification, &sequence_display_backlight_on); @@ -743,11 +743,11 @@ static NotificationAppSettings* alloc_settings(void) { } item = variable_item_list_add( - app->variable_item_list, "LCD Inverse", LCD_INVERSE_COUNT, lcd_inverse_changed, app); + app->variable_item_list,"LCD inversion",LCD_INVERSION_COUNT,lcd_inversion_changed,app); value_index = value_index_bool( - app->notification->settings.lcd_inverse, lcd_inverse_value, LCD_INVERSE_COUNT); + app->notification->settings.lcd_inversion, lcd_inversion_value, LCD_INVERSION_COUNT); variable_item_set_current_value_index(item, value_index); - variable_item_set_current_value_text(item, lcd_inverse_text[value_index]); + variable_item_set_current_value_text(item, lcd_inversion_text[value_index]); //--- RGB BACKLIGHT ---