[FL-873] Add F5 target, lp5562 driver and api-hal-light (#347)
* Add F5 target, lp5562 driver and api-hal-light. Update api-usage, switch to F5 by default. * API HAL: add i2c and hardware version api. Dolphin: show hardware version. * OTP version generator and flashing utility. * Assets script: fix code formatting * Backport F5 changes to F4 * F4: disable insomnia, prevent damage to BLE RX path * F5 HAL API Light: remove magic delay to fix magic BLE * Dolphin: HW target validation on start * invert RSSI indication in sub-1 * API HAL: rename board to body in version api * Gpio tester: detach and release viewport on exit Co-authored-by: aanper <mail@s3f.ru>
This commit is contained in:
@@ -38,16 +38,16 @@ bool dolphin_view_idle_main_input(InputEvent* event, void* context) {
|
||||
with_value_mutex(
|
||||
dolphin->menu_vm, (Menu * menu) { menu_ok(menu); });
|
||||
} else if(event->key == InputKeyUp) {
|
||||
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewIdleStats);
|
||||
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewIdleUp);
|
||||
} else if(event->key == InputKeyDown) {
|
||||
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewIdleDebug);
|
||||
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewIdleDown);
|
||||
}
|
||||
}
|
||||
// All events consumed
|
||||
return true;
|
||||
}
|
||||
|
||||
bool dolphin_view_idle_stats_input(InputEvent* event, void* context) {
|
||||
bool dolphin_view_idle_up_input(InputEvent* event, void* context) {
|
||||
furi_assert(event);
|
||||
furi_assert(context);
|
||||
Dolphin* dolphin = context;
|
||||
@@ -95,21 +95,27 @@ Dolphin* dolphin_alloc() {
|
||||
view_dispatcher_add_view(
|
||||
dolphin->idle_view_dispatcher, DolphinViewIdleMain, dolphin->idle_view_main);
|
||||
// Stats Idle View
|
||||
dolphin->idle_view_stats = view_alloc();
|
||||
view_set_context(dolphin->idle_view_stats, dolphin);
|
||||
dolphin->idle_view_up = view_alloc();
|
||||
view_set_context(dolphin->idle_view_up, dolphin);
|
||||
view_allocate_model(
|
||||
dolphin->idle_view_stats, ViewModelTypeLockFree, sizeof(DolphinViewIdleStatsModel));
|
||||
view_set_draw_callback(dolphin->idle_view_stats, dolphin_view_idle_stats_draw);
|
||||
view_set_input_callback(dolphin->idle_view_stats, dolphin_view_idle_stats_input);
|
||||
view_set_previous_callback(dolphin->idle_view_stats, dolphin_view_idle_back);
|
||||
dolphin->idle_view_up, ViewModelTypeLockFree, sizeof(DolphinViewIdleUpModel));
|
||||
view_set_draw_callback(dolphin->idle_view_up, dolphin_view_idle_up_draw);
|
||||
view_set_input_callback(dolphin->idle_view_up, dolphin_view_idle_up_input);
|
||||
view_set_previous_callback(dolphin->idle_view_up, dolphin_view_idle_back);
|
||||
view_dispatcher_add_view(
|
||||
dolphin->idle_view_dispatcher, DolphinViewIdleStats, dolphin->idle_view_stats);
|
||||
// Debug Idle View
|
||||
dolphin->idle_view_debug = view_alloc();
|
||||
view_set_draw_callback(dolphin->idle_view_debug, dolphin_view_idle_debug_draw);
|
||||
view_set_previous_callback(dolphin->idle_view_debug, dolphin_view_idle_back);
|
||||
dolphin->idle_view_dispatcher, DolphinViewIdleUp, dolphin->idle_view_up);
|
||||
// Down Idle View
|
||||
dolphin->idle_view_down = view_alloc();
|
||||
view_set_draw_callback(dolphin->idle_view_down, dolphin_view_idle_down_draw);
|
||||
view_set_previous_callback(dolphin->idle_view_down, dolphin_view_idle_back);
|
||||
view_dispatcher_add_view(
|
||||
dolphin->idle_view_dispatcher, DolphinViewIdleDebug, dolphin->idle_view_debug);
|
||||
dolphin->idle_view_dispatcher, DolphinViewIdleDown, dolphin->idle_view_down);
|
||||
// HW Mismatch
|
||||
dolphin->view_hw_mismatch = view_alloc();
|
||||
view_set_draw_callback(dolphin->view_hw_mismatch, dolphin_view_hw_mismatch_draw);
|
||||
view_set_previous_callback(dolphin->view_hw_mismatch, dolphin_view_idle_back);
|
||||
view_dispatcher_add_view(
|
||||
dolphin->idle_view_dispatcher, DolphinViewHwMismatch, dolphin->view_hw_mismatch);
|
||||
|
||||
return dolphin;
|
||||
}
|
||||
@@ -140,7 +146,7 @@ int32_t dolphin_task() {
|
||||
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewFirstStart);
|
||||
}
|
||||
with_view_model(
|
||||
dolphin->idle_view_stats, (DolphinViewIdleStatsModel * model) {
|
||||
dolphin->idle_view_up, (DolphinViewIdleUpModel * model) {
|
||||
model->icounter = dolphin_state_get_icounter(dolphin->state);
|
||||
model->butthurt = dolphin_state_get_butthurt(dolphin->state);
|
||||
return true;
|
||||
@@ -148,13 +154,17 @@ int32_t dolphin_task() {
|
||||
|
||||
furi_record_create("dolphin", dolphin);
|
||||
|
||||
if(!api_hal_version_do_i_belong_here()) {
|
||||
view_dispatcher_switch_to_view(dolphin->idle_view_dispatcher, DolphinViewHwMismatch);
|
||||
}
|
||||
|
||||
DolphinEvent event;
|
||||
while(1) {
|
||||
furi_check(osMessageQueueGet(dolphin->event_queue, &event, NULL, osWaitForever) == osOK);
|
||||
if(event.type == DolphinEventTypeDeed) {
|
||||
dolphin_state_on_deed(dolphin->state, event.deed);
|
||||
with_view_model(
|
||||
dolphin->idle_view_stats, (DolphinViewIdleStatsModel * model) {
|
||||
dolphin->idle_view_up, (DolphinViewIdleUpModel * model) {
|
||||
model->icounter = dolphin_state_get_icounter(dolphin->state);
|
||||
model->butthurt = dolphin_state_get_butthurt(dolphin->state);
|
||||
return true;
|
||||
|
@@ -5,7 +5,7 @@
|
||||
#include "dolphin_views.h"
|
||||
|
||||
#include <furi.h>
|
||||
|
||||
#include <api-hal.h>
|
||||
#include <gui/gui.h>
|
||||
#include <gui/view_dispatcher.h>
|
||||
#include <gui/canvas.h>
|
||||
@@ -37,8 +37,9 @@ struct Dolphin {
|
||||
ViewDispatcher* idle_view_dispatcher;
|
||||
View* idle_view_first_start;
|
||||
View* idle_view_main;
|
||||
View* idle_view_stats;
|
||||
View* idle_view_debug;
|
||||
View* idle_view_up;
|
||||
View* idle_view_down;
|
||||
View* view_hw_mismatch;
|
||||
};
|
||||
|
||||
Dolphin* dolphin_alloc();
|
||||
|
@@ -1,5 +1,6 @@
|
||||
#include "dolphin_state.h"
|
||||
#include <furi.h>
|
||||
#include <api-hal.h>
|
||||
|
||||
typedef struct {
|
||||
uint8_t magic;
|
||||
|
@@ -3,6 +3,8 @@
|
||||
#include <gui/gui.h>
|
||||
#include <gui/elements.h>
|
||||
|
||||
#include <api-hal.h>
|
||||
|
||||
void dolphin_view_first_start_draw(Canvas* canvas, void* model) {
|
||||
DolphinViewFirstStartModel* m = model;
|
||||
canvas_clear(canvas);
|
||||
@@ -64,8 +66,8 @@ void dolphin_view_idle_main_draw(Canvas* canvas, void* model) {
|
||||
canvas_draw_str(canvas, 2, 52, "\\/: Version");
|
||||
}
|
||||
|
||||
void dolphin_view_idle_stats_draw(Canvas* canvas, void* model) {
|
||||
DolphinViewIdleStatsModel* m = model;
|
||||
void dolphin_view_idle_up_draw(Canvas* canvas, void* model) {
|
||||
DolphinViewIdleUpModel* m = model;
|
||||
canvas_clear(canvas);
|
||||
canvas_set_color(canvas, ColorBlack);
|
||||
canvas_set_font(canvas, FontPrimary);
|
||||
@@ -80,7 +82,7 @@ void dolphin_view_idle_stats_draw(Canvas* canvas, void* model) {
|
||||
canvas_draw_str(canvas, 5, 40, "< > change icounter");
|
||||
}
|
||||
|
||||
void dolphin_view_idle_debug_draw(Canvas* canvas, void* model) {
|
||||
void dolphin_view_idle_down_draw(Canvas* canvas, void* model) {
|
||||
canvas_clear(canvas);
|
||||
canvas_set_color(canvas, ColorBlack);
|
||||
canvas_set_font(canvas, FontPrimary);
|
||||
@@ -88,8 +90,31 @@ void dolphin_view_idle_debug_draw(Canvas* canvas, void* model) {
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
canvas_draw_str(canvas, 5, 22, TARGET " " BUILD_DATE);
|
||||
canvas_draw_str(canvas, 5, 32, GIT_BRANCH);
|
||||
canvas_draw_str(canvas, 5, 42, GIT_BRANCH_NUM);
|
||||
canvas_draw_str(canvas, 5, 52, GIT_COMMIT);
|
||||
canvas_draw_str(canvas, 5, 42, GIT_BRANCH_NUM " " GIT_COMMIT);
|
||||
|
||||
char buffer[64];
|
||||
snprintf(
|
||||
buffer,
|
||||
64,
|
||||
"HW: %d.F%dB%dC%d",
|
||||
api_hal_version_get_hw_version(),
|
||||
api_hal_version_get_hw_target(),
|
||||
api_hal_version_get_hw_body(),
|
||||
api_hal_version_get_hw_connect());
|
||||
canvas_draw_str(canvas, 5, 52, buffer);
|
||||
}
|
||||
|
||||
void dolphin_view_hw_mismatch_draw(Canvas* canvas, void* model) {
|
||||
canvas_clear(canvas);
|
||||
canvas_set_color(canvas, ColorBlack);
|
||||
canvas_set_font(canvas, FontPrimary);
|
||||
canvas_draw_str(canvas, 2, 10, "!!!! HW Mismatch !!!!");
|
||||
|
||||
char buffer[64];
|
||||
canvas_set_font(canvas, FontSecondary);
|
||||
snprintf(buffer, 64, "HW target: F%d", api_hal_version_get_hw_target());
|
||||
canvas_draw_str(canvas, 5, 22, buffer);
|
||||
canvas_draw_str(canvas, 5, 32, "FW target: " TARGET);
|
||||
}
|
||||
|
||||
uint32_t dolphin_view_idle_back(void* context) {
|
||||
|
@@ -10,8 +10,9 @@
|
||||
typedef enum {
|
||||
DolphinViewFirstStart,
|
||||
DolphinViewIdleMain,
|
||||
DolphinViewIdleStats,
|
||||
DolphinViewIdleDebug,
|
||||
DolphinViewIdleUp,
|
||||
DolphinViewIdleDown,
|
||||
DolphinViewHwMismatch,
|
||||
} DolphinViewIdle;
|
||||
|
||||
typedef struct {
|
||||
@@ -24,11 +25,14 @@ bool dolphin_view_first_start_input(InputEvent* event, void* context);
|
||||
typedef struct {
|
||||
uint32_t icounter;
|
||||
uint32_t butthurt;
|
||||
} DolphinViewIdleStatsModel;
|
||||
} DolphinViewIdleUpModel;
|
||||
|
||||
void dolphin_view_idle_main_draw(Canvas* canvas, void* model);
|
||||
bool dolphin_view_idle_main_input(InputEvent* event, void* context);
|
||||
void dolphin_view_idle_stats_draw(Canvas* canvas, void* model);
|
||||
bool dolphin_view_idle_stats_input(InputEvent* event, void* context);
|
||||
void dolphin_view_idle_debug_draw(Canvas* canvas, void* model);
|
||||
|
||||
void dolphin_view_idle_up_draw(Canvas* canvas, void* model);
|
||||
void dolphin_view_idle_down_draw(Canvas* canvas, void* model);
|
||||
|
||||
void dolphin_view_hw_mismatch_draw(Canvas* canvas, void* model);
|
||||
|
||||
uint32_t dolphin_view_idle_back(void* context);
|
||||
|
Reference in New Issue
Block a user