|
|
@@ -3,8 +3,8 @@
|
|
|
#include "icon.h"
|
|
|
#include "icon_i.h"
|
|
|
|
|
|
-#include <assert.h>
|
|
|
#include <flipper.h>
|
|
|
+#include <flipper_v2.h>
|
|
|
|
|
|
typedef struct {
|
|
|
CanvasApi api;
|
|
|
@@ -60,12 +60,12 @@ CanvasApi* canvas_api_init() {
|
|
|
}
|
|
|
|
|
|
void canvas_api_free(CanvasApi* api) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
free(api);
|
|
|
}
|
|
|
|
|
|
void canvas_commit(CanvasApi* api) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_SetPowerSave(&canvas->fb, 0); // wake up display
|
|
|
u8g2_SendBuffer(&canvas->fb);
|
|
|
@@ -77,7 +77,7 @@ void canvas_frame_set(
|
|
|
uint8_t offset_y,
|
|
|
uint8_t width,
|
|
|
uint8_t height) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
canvas->offset_x = offset_x;
|
|
|
canvas->offset_y = offset_y;
|
|
|
@@ -86,31 +86,31 @@ void canvas_frame_set(
|
|
|
}
|
|
|
|
|
|
uint8_t canvas_width(CanvasApi* api) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
return canvas->width;
|
|
|
}
|
|
|
|
|
|
uint8_t canvas_height(CanvasApi* api) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
return canvas->height;
|
|
|
}
|
|
|
|
|
|
void canvas_clear(CanvasApi* api) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_ClearBuffer(&canvas->fb);
|
|
|
}
|
|
|
|
|
|
void canvas_color_set(CanvasApi* api, Color color) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_SetDrawColor(&canvas->fb, color);
|
|
|
}
|
|
|
|
|
|
void canvas_font_set(CanvasApi* api, Font font) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_SetFontMode(&canvas->fb, 1);
|
|
|
if(font == FontPrimary) {
|
|
|
@@ -118,12 +118,12 @@ void canvas_font_set(CanvasApi* api, Font font) {
|
|
|
} else if(font == FontSecondary) {
|
|
|
u8g2_SetFont(&canvas->fb, u8g2_font_HelvetiPixel_tr);
|
|
|
} else {
|
|
|
- assert(0);
|
|
|
+ furi_check(0);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
void canvas_str_draw(CanvasApi* api, uint8_t x, uint8_t y, const char* str) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
if(!str) return;
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
x += canvas->offset_x;
|
|
|
@@ -132,7 +132,7 @@ void canvas_str_draw(CanvasApi* api, uint8_t x, uint8_t y, const char* str) {
|
|
|
}
|
|
|
|
|
|
void canvas_icon_draw(CanvasApi* api, uint8_t x, uint8_t y, Icon* icon) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
if(!icon) return;
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
x += canvas->offset_x;
|
|
|
@@ -142,25 +142,25 @@ void canvas_icon_draw(CanvasApi* api, uint8_t x, uint8_t y, Icon* icon) {
|
|
|
}
|
|
|
|
|
|
void canvas_dot_draw(CanvasApi* api, uint8_t x, uint8_t y) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_DrawPixel(&canvas->fb, x, y);
|
|
|
}
|
|
|
|
|
|
void canvas_box_draw(CanvasApi* api, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_DrawBox(&canvas->fb, x, y, width, height);
|
|
|
}
|
|
|
|
|
|
void canvas_draw_frame(CanvasApi* api, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_DrawFrame(&canvas->fb, x, y, width, height);
|
|
|
}
|
|
|
|
|
|
void canvas_draw_line(CanvasApi* api, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2) {
|
|
|
- assert(api);
|
|
|
+ furi_assert(api);
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
u8g2_DrawLine(&canvas->fb, x1, y1, x2, y2);
|
|
|
}
|