|
@@ -11,11 +11,7 @@
|
|
|
|
|
|
|
|
bool configState;
|
|
bool configState;
|
|
|
|
|
|
|
|
-typedef enum ESerialCommand
|
|
|
|
|
-{
|
|
|
|
|
- ESerialCommand_Config_On,
|
|
|
|
|
- ESerialCommand_Config_Off
|
|
|
|
|
-} ESerialCommand;
|
|
|
|
|
|
|
+typedef enum ESerialCommand { ESerialCommand_Config_On, ESerialCommand_Config_Off } ESerialCommand;
|
|
|
|
|
|
|
|
struct ModuleView {
|
|
struct ModuleView {
|
|
|
View* view;
|
|
View* view;
|
|
@@ -34,20 +30,18 @@ static void Shake(void) {
|
|
|
}
|
|
}
|
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
-void send_serial_command_module(ESerialCommand command)
|
|
|
|
|
-{
|
|
|
|
|
- uint8_t data[1] = { 0 };
|
|
|
|
|
-
|
|
|
|
|
- switch(command)
|
|
|
|
|
- {
|
|
|
|
|
- case ESerialCommand_Config_On:
|
|
|
|
|
- data[0] = MODULE_CONTROL_COMMAND_CONFIG_ON;
|
|
|
|
|
- break;
|
|
|
|
|
- case ESerialCommand_Config_Off:
|
|
|
|
|
- data[0] = MODULE_CONTROL_COMMAND_CONFIG_OFF;
|
|
|
|
|
- break;
|
|
|
|
|
- default:
|
|
|
|
|
- return;
|
|
|
|
|
|
|
+void send_serial_command_module(ESerialCommand command) {
|
|
|
|
|
+ uint8_t data[1] = {0};
|
|
|
|
|
+
|
|
|
|
|
+ switch(command) {
|
|
|
|
|
+ case ESerialCommand_Config_On:
|
|
|
|
|
+ data[0] = MODULE_CONTROL_COMMAND_CONFIG_ON;
|
|
|
|
|
+ break;
|
|
|
|
|
+ case ESerialCommand_Config_Off:
|
|
|
|
|
+ data[0] = MODULE_CONTROL_COMMAND_CONFIG_OFF;
|
|
|
|
|
+ break;
|
|
|
|
|
+ default:
|
|
|
|
|
+ return;
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
furi_hal_uart_tx(FuriHalUartIdUSART1, data, 1);
|
|
furi_hal_uart_tx(FuriHalUartIdUSART1, data, 1);
|
|
@@ -66,10 +60,10 @@ static void module_view_draw_callback(Canvas* canvas, void* context) {
|
|
|
canvas_draw_str_aligned(canvas, 64, 45, AlignCenter, AlignTop, "and hold back to return");
|
|
canvas_draw_str_aligned(canvas, 64, 45, AlignCenter, AlignTop, "and hold back to return");
|
|
|
canvas_draw_str_aligned(canvas, 64, 55, AlignCenter, AlignTop, "to the menu");
|
|
canvas_draw_str_aligned(canvas, 64, 55, AlignCenter, AlignTop, "to the menu");
|
|
|
|
|
|
|
|
- if(configState == false){
|
|
|
|
|
|
|
+ if(configState == false) {
|
|
|
send_serial_command_module(ESerialCommand_Config_On);
|
|
send_serial_command_module(ESerialCommand_Config_On);
|
|
|
configState = true;
|
|
configState = true;
|
|
|
- }
|
|
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
// Right
|
|
// Right
|
|
|
if(model->right_pressed) {
|
|
if(model->right_pressed) {
|
|
@@ -78,7 +72,9 @@ static void module_view_draw_callback(Canvas* canvas, void* context) {
|
|
|
|
|
|
|
|
static void module_view_process(ModuleView* module_view, InputEvent* event) {
|
|
static void module_view_process(ModuleView* module_view, InputEvent* event) {
|
|
|
with_view_model(
|
|
with_view_model(
|
|
|
- module_view->view, (ModuleViewModel * model) {
|
|
|
|
|
|
|
+ module_view->view,
|
|
|
|
|
+ ModuleViewModel * model,
|
|
|
|
|
+ {
|
|
|
if(event->type == InputTypePress) {
|
|
if(event->type == InputTypePress) {
|
|
|
if(event->key == InputKeyUp) {
|
|
if(event->key == InputKeyUp) {
|
|
|
} else if(event->key == InputKeyDown) {
|
|
} else if(event->key == InputKeyDown) {
|
|
@@ -101,8 +97,8 @@ static void module_view_process(ModuleView* module_view, InputEvent* event) {
|
|
|
if(event->key == InputKeyBack) {
|
|
if(event->key == InputKeyBack) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- return true;
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ },
|
|
|
|
|
+ true);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static bool module_view_input_callback(InputEvent* event, void* context) {
|
|
static bool module_view_input_callback(InputEvent* event, void* context) {
|
|
@@ -147,8 +143,5 @@ View* module_view_get_view(ModuleView* module_view) {
|
|
|
void module_view_set_data(ModuleView* module_view, bool connected) {
|
|
void module_view_set_data(ModuleView* module_view, bool connected) {
|
|
|
furi_assert(module_view);
|
|
furi_assert(module_view);
|
|
|
with_view_model(
|
|
with_view_model(
|
|
|
- module_view->view, (ModuleViewModel * model) {
|
|
|
|
|
- model->connected = connected;
|
|
|
|
|
- return true;
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ module_view->view, ModuleViewModel * model, { model->connected = connected; }, true);
|
|
|
}
|
|
}
|