[FL-140] Core api dynamic records (#296)
* SYSTEM: tickless mode with deep sleep.
* Move FreeRTOS ticks to lptim2
* API: move all sumbodules init routines to one place. Timebase: working lptim2 at tick source.
* API Timebase: lp-timer routines, timer access safe zones prediction and synchronization. FreeRTOS: adjust configuration for tickless mode.
* NFC: support for tickless mode.
* API Timebase: improve tick error handling in IRQ. Apploader: use insomnia mode to run applications.
* BLE: prevent sleep while core2 starting
* HAL: nap while in insomnia mode
* init records work
* try to implement record delete
* tests and flapp
* flapp subsystem
* new core functions to get app stat, simplify core code
* fix thread termination
* add strdup to core
* fix tests
* Refactoring: remove all unusued parts, update API usage, aggreagate API sources and headers, new record storage
* Refactoring: update furi record api usage, cleanup code
* Fix broken merge for freertos apps
* Core, Target: fix compilation warnings
* Drop firmware target local
* HAL Timebase, Power, Clock: semaphore guarded access to clock and power modes, better sleep mode.
* SD-Filesystem: wait for all deps to arrive before adding widget. Core, BLE: disable debug dump to serial.
* delete old app example-ipc
* delete old app fatfs list
* fix strobe app, add input header
* delete old display driver
* comment old app qr-code
* fix sd-card test, add forced widget update
* remove unused new core test
* increase heap to 128k
* comment and assert old core tests
* fix syntax
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-01-20 19:09:26 +03:00
|
|
|
#include <furi.h>
|
2021-02-18 15:49:32 +03:00
|
|
|
#include <api-hal.h>
|
|
|
|
|
[FL-140] Core api dynamic records (#296)
* SYSTEM: tickless mode with deep sleep.
* Move FreeRTOS ticks to lptim2
* API: move all sumbodules init routines to one place. Timebase: working lptim2 at tick source.
* API Timebase: lp-timer routines, timer access safe zones prediction and synchronization. FreeRTOS: adjust configuration for tickless mode.
* NFC: support for tickless mode.
* API Timebase: improve tick error handling in IRQ. Apploader: use insomnia mode to run applications.
* BLE: prevent sleep while core2 starting
* HAL: nap while in insomnia mode
* init records work
* try to implement record delete
* tests and flapp
* flapp subsystem
* new core functions to get app stat, simplify core code
* fix thread termination
* add strdup to core
* fix tests
* Refactoring: remove all unusued parts, update API usage, aggreagate API sources and headers, new record storage
* Refactoring: update furi record api usage, cleanup code
* Fix broken merge for freertos apps
* Core, Target: fix compilation warnings
* Drop firmware target local
* HAL Timebase, Power, Clock: semaphore guarded access to clock and power modes, better sleep mode.
* SD-Filesystem: wait for all deps to arrive before adding widget. Core, BLE: disable debug dump to serial.
* delete old app example-ipc
* delete old app fatfs list
* fix strobe app, add input header
* delete old display driver
* comment old app qr-code
* fix sd-card test, add forced widget update
* remove unused new core test
* increase heap to 128k
* comment and assert old core tests
* fix syntax
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-01-20 19:09:26 +03:00
|
|
|
#include <gui/gui.h>
|
|
|
|
#include <input/input.h>
|
2020-11-16 20:12:05 +03:00
|
|
|
|
|
|
|
// TODO float note freq
|
|
|
|
typedef enum {
|
|
|
|
// Delay
|
|
|
|
N = 0,
|
|
|
|
// Octave 4
|
|
|
|
B4 = 494,
|
|
|
|
// Octave 5
|
|
|
|
C5 = 523,
|
|
|
|
D5 = 587,
|
|
|
|
E5 = 659,
|
|
|
|
F_5 = 740,
|
|
|
|
G5 = 784,
|
|
|
|
A5 = 880,
|
|
|
|
B5 = 988,
|
|
|
|
// Octave 6
|
|
|
|
C6 = 1046,
|
|
|
|
D6 = 1175,
|
|
|
|
E6 = 1319,
|
|
|
|
} MelodyEventNote;
|
|
|
|
|
|
|
|
typedef enum {
|
|
|
|
L1 = 1,
|
|
|
|
L2 = 2,
|
|
|
|
L4 = 4,
|
|
|
|
L8 = 8,
|
|
|
|
L16 = 16,
|
|
|
|
L32 = 32,
|
|
|
|
L64 = 64,
|
|
|
|
L128 = 128,
|
|
|
|
} MelodyEventLength;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
MelodyEventNote note;
|
|
|
|
MelodyEventLength length;
|
|
|
|
} MelodyEventRecord;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
const MelodyEventRecord* record;
|
|
|
|
int8_t loop_count;
|
|
|
|
} SongPattern;
|
|
|
|
|
|
|
|
const MelodyEventRecord melody_start[] = {
|
|
|
|
{E6, L8}, {N, L8}, {E5, L8}, {B5, L8}, {N, L4}, {E5, L8}, {A5, L8}, {G5, L8}, {A5, L8},
|
|
|
|
{E5, L8}, {B5, L8}, {N, L8}, {G5, L8}, {A5, L8}, {D6, L8}, {N, L4}, {D5, L8}, {B5, L8},
|
|
|
|
{N, L4}, {D5, L8}, {A5, L8}, {G5, L8}, {A5, L8}, {D5, L8}, {F_5, L8}, {N, L8}, {G5, L8},
|
|
|
|
{A5, L8}, {D6, L8}, {N, L4}, {F_5, L8}, {B5, L8}, {N, L4}, {F_5, L8}, {D6, L8}, {C6, L8},
|
|
|
|
{B5, L8}, {F_5, L8}, {A5, L8}, {N, L8}, {G5, L8}, {F_5, L8}, {E5, L8}, {N, L8}, {C5, L8},
|
|
|
|
{E5, L8}, {B5, L8}, {B4, L8}, {C5, L8}, {D5, L8}, {D6, L8}, {C6, L8}, {B5, L8}, {F_5, L8},
|
|
|
|
{A5, L8}, {N, L8}, {G5, L8}, {A5, L8}, {E6, L8}};
|
|
|
|
|
|
|
|
const MelodyEventRecord melody_loop[] = {
|
|
|
|
{N, L4}, {E5, L8}, {B5, L8}, {N, L4}, {E5, L8}, {A5, L8}, {G5, L8}, {A5, L8}, {E5, L8},
|
|
|
|
{B5, L8}, {N, L8}, {G5, L8}, {A5, L8}, {D6, L8}, {N, L4}, {D5, L8}, {B5, L8}, {N, L4},
|
|
|
|
{D5, L8}, {A5, L8}, {G5, L8}, {A5, L8}, {D5, L8}, {F_5, L8}, {N, L8}, {G5, L8}, {A5, L8},
|
|
|
|
{D6, L8}, {N, L4}, {F_5, L8}, {B5, L8}, {N, L4}, {F_5, L8}, {D6, L8}, {C6, L8}, {B5, L8},
|
|
|
|
{F_5, L8}, {A5, L8}, {N, L8}, {G5, L8}, {F_5, L8}, {E5, L8}, {N, L8}, {C5, L8}, {E5, L8},
|
|
|
|
{B5, L8}, {B4, L8}, {C5, L8}, {D5, L8}, {D6, L8}, {C6, L8}, {B5, L8}, {F_5, L8}, {A5, L8},
|
|
|
|
{N, L8}, {G5, L8}, {A5, L8}, {E6, L8}};
|
|
|
|
|
|
|
|
const MelodyEventRecord melody_chords_1bar[] = {
|
|
|
|
{E6, L8}, {N, L8}, {B4, L128}, {E5, L128}, {B4, L128}, {E5, L128}, {B4, L128}, {E5, L128},
|
|
|
|
{B4, L128}, {E5, L128}, {B4, L128}, {E5, L128}, {B4, L128}, {E5, L128}, {B4, L128}, {E5, L128},
|
|
|
|
{B4, L128}, {E5, L128}, {B5, L8}, {N, L4}, {B4, L128}, {E5, L128}, {B4, L128}, {E5, L128},
|
|
|
|
{B4, L128}, {E5, L128}, {B4, L128}, {E5, L128}, {B4, L128}, {E5, L128}, {B4, L128}, {E5, L128},
|
|
|
|
{B4, L128}, {E5, L128}, {B4, L128}, {E5, L128}, {A5, L8}};
|
|
|
|
|
|
|
|
const SongPattern song[] = {{melody_start, 1}, {melody_loop, -1}};
|
|
|
|
|
|
|
|
typedef enum {
|
|
|
|
EventTypeTick,
|
|
|
|
EventTypeKey,
|
|
|
|
EventTypeNote,
|
|
|
|
// add your events type
|
|
|
|
} MusicDemoEventType;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
union {
|
|
|
|
InputEvent input;
|
|
|
|
const MelodyEventRecord* note_record;
|
|
|
|
} value;
|
|
|
|
MusicDemoEventType type;
|
|
|
|
} MusicDemoEvent;
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
ValueMutex* state_mutex;
|
|
|
|
osMessageQueueId_t event_queue;
|
|
|
|
|
|
|
|
} MusicDemoContext;
|
|
|
|
|
|
|
|
#define note_stack_size 4
|
|
|
|
typedef struct {
|
|
|
|
// describe state here
|
|
|
|
const MelodyEventRecord* note_record;
|
|
|
|
const MelodyEventRecord* note_stack[note_stack_size];
|
|
|
|
uint8_t volume_id;
|
|
|
|
uint8_t volume_id_max;
|
|
|
|
} State;
|
|
|
|
|
|
|
|
float volumes[] = {0, 0.02, 0.05, 0.1, 0.5};
|
|
|
|
|
|
|
|
bool is_white_note(const MelodyEventRecord* note_record, uint8_t id) {
|
|
|
|
if(note_record == NULL) return false;
|
|
|
|
|
|
|
|
switch(note_record->note) {
|
|
|
|
case C5:
|
|
|
|
case C6:
|
|
|
|
if(id == 0) return true;
|
|
|
|
break;
|
|
|
|
case D5:
|
|
|
|
case D6:
|
|
|
|
if(id == 1) return true;
|
|
|
|
break;
|
|
|
|
case E5:
|
|
|
|
case E6:
|
|
|
|
if(id == 2) return true;
|
|
|
|
break;
|
|
|
|
case G5:
|
|
|
|
if(id == 4) return true;
|
|
|
|
break;
|
|
|
|
case A5:
|
|
|
|
if(id == 5) return true;
|
|
|
|
break;
|
|
|
|
case B4:
|
|
|
|
case B5:
|
|
|
|
if(id == 6) return true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool is_black_note(const MelodyEventRecord* note_record, uint8_t id) {
|
|
|
|
if(note_record == NULL) return false;
|
|
|
|
|
|
|
|
switch(note_record->note) {
|
|
|
|
case F_5:
|
|
|
|
if(id == 3) return true;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char* get_note_name(const MelodyEventRecord* note_record) {
|
|
|
|
if(note_record == NULL) return "";
|
|
|
|
|
|
|
|
switch(note_record->note) {
|
|
|
|
case N:
|
|
|
|
return "---";
|
|
|
|
break;
|
|
|
|
case B4:
|
|
|
|
return "B4-";
|
|
|
|
break;
|
|
|
|
case C5:
|
|
|
|
return "C5-";
|
|
|
|
break;
|
|
|
|
case D5:
|
|
|
|
return "D5-";
|
|
|
|
break;
|
|
|
|
case E5:
|
|
|
|
return "E5-";
|
|
|
|
break;
|
|
|
|
case F_5:
|
|
|
|
return "F#5";
|
|
|
|
break;
|
|
|
|
case G5:
|
|
|
|
return "G5-";
|
|
|
|
break;
|
|
|
|
case A5:
|
|
|
|
return "A5-";
|
|
|
|
break;
|
|
|
|
case B5:
|
|
|
|
return "B5-";
|
|
|
|
break;
|
|
|
|
case C6:
|
|
|
|
return "C6-";
|
|
|
|
break;
|
|
|
|
case D6:
|
|
|
|
return "D6-";
|
|
|
|
break;
|
|
|
|
case E6:
|
|
|
|
return "E6-";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return "UNK";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
const char* get_note_len_name(const MelodyEventRecord* note_record) {
|
|
|
|
if(note_record == NULL) return "";
|
|
|
|
|
|
|
|
switch(note_record->length) {
|
|
|
|
case L1:
|
|
|
|
return "1-";
|
|
|
|
break;
|
|
|
|
case L2:
|
|
|
|
return "2-";
|
|
|
|
break;
|
|
|
|
case L4:
|
|
|
|
return "4-";
|
|
|
|
break;
|
|
|
|
case L8:
|
|
|
|
return "8-";
|
|
|
|
break;
|
|
|
|
case L16:
|
|
|
|
return "16";
|
|
|
|
break;
|
|
|
|
case L32:
|
|
|
|
return "32";
|
|
|
|
break;
|
|
|
|
case L64:
|
|
|
|
return "64";
|
|
|
|
break;
|
|
|
|
case L128:
|
|
|
|
return "1+";
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return "--";
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-14 13:50:32 +03:00
|
|
|
static void render_callback(Canvas* canvas, void* ctx) {
|
2020-11-16 20:12:05 +03:00
|
|
|
State* state = (State*)acquire_mutex((ValueMutex*)ctx, 25);
|
|
|
|
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_clear(canvas);
|
|
|
|
canvas_set_color(canvas, ColorBlack);
|
|
|
|
canvas_set_font(canvas, FontPrimary);
|
|
|
|
canvas_draw_str(canvas, 0, 12, "MusicPlayer");
|
2020-11-16 20:12:05 +03:00
|
|
|
|
|
|
|
uint8_t x_pos = 0;
|
|
|
|
uint8_t y_pos = 24;
|
|
|
|
const uint8_t white_w = 10;
|
|
|
|
const uint8_t white_h = 40;
|
|
|
|
|
|
|
|
const int8_t black_x = 6;
|
|
|
|
const int8_t black_y = -5;
|
|
|
|
const uint8_t black_w = 8;
|
|
|
|
const uint8_t black_h = 32;
|
|
|
|
|
|
|
|
// white keys
|
|
|
|
for(size_t i = 0; i < 7; i++) {
|
|
|
|
if(is_white_note(state->note_record, i)) {
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_box(canvas, x_pos + white_w * i, y_pos, white_w + 1, white_h);
|
2020-11-16 20:12:05 +03:00
|
|
|
} else {
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_frame(canvas, x_pos + white_w * i, y_pos, white_w + 1, white_h);
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// black keys
|
|
|
|
for(size_t i = 0; i < 7; i++) {
|
|
|
|
if(i != 2 && i != 6) {
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_set_color(canvas, ColorWhite);
|
|
|
|
canvas_draw_box(
|
2020-11-16 20:12:05 +03:00
|
|
|
canvas, x_pos + white_w * i + black_x, y_pos + black_y, black_w + 1, black_h);
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_set_color(canvas, ColorBlack);
|
2020-11-16 20:12:05 +03:00
|
|
|
if(is_black_note(state->note_record, i)) {
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_box(
|
2020-11-16 20:12:05 +03:00
|
|
|
canvas, x_pos + white_w * i + black_x, y_pos + black_y, black_w + 1, black_h);
|
|
|
|
} else {
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_frame(
|
2020-11-16 20:12:05 +03:00
|
|
|
canvas, x_pos + white_w * i + black_x, y_pos + black_y, black_w + 1, black_h);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-29 16:52:16 +03:00
|
|
|
// volume view_port
|
2020-11-16 20:12:05 +03:00
|
|
|
x_pos = 124;
|
|
|
|
y_pos = 0;
|
|
|
|
const uint8_t volume_h = (64 / (state->volume_id_max - 1)) * state->volume_id;
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_frame(canvas, x_pos, y_pos, 4, 64);
|
|
|
|
canvas_draw_box(canvas, x_pos, y_pos + (64 - volume_h), 4, volume_h);
|
2020-11-16 20:12:05 +03:00
|
|
|
|
2021-01-29 16:52:16 +03:00
|
|
|
// note stack view_port
|
2020-11-16 20:12:05 +03:00
|
|
|
x_pos = 73;
|
|
|
|
y_pos = 0;
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_set_color(canvas, ColorBlack);
|
|
|
|
canvas_set_font(canvas, FontPrimary);
|
|
|
|
canvas_draw_frame(canvas, x_pos, y_pos, 49, 64);
|
|
|
|
canvas_draw_line(canvas, x_pos + 28, 0, x_pos + 28, 64);
|
2020-11-16 20:12:05 +03:00
|
|
|
|
|
|
|
for(uint8_t i = 0; i < note_stack_size; i++) {
|
|
|
|
if(i == 0) {
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_box(canvas, x_pos, y_pos + 48, 49, 16);
|
|
|
|
canvas_set_color(canvas, ColorWhite);
|
2020-11-16 20:12:05 +03:00
|
|
|
} else {
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_set_color(canvas, ColorBlack);
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_str(canvas, x_pos + 4, 64 - 16 * i - 3, get_note_name(state->note_stack[i]));
|
|
|
|
canvas_draw_str(
|
2020-11-16 20:12:05 +03:00
|
|
|
canvas, x_pos + 31, 64 - 16 * i - 3, get_note_len_name(state->note_stack[i]));
|
2020-12-14 13:50:32 +03:00
|
|
|
canvas_draw_line(canvas, x_pos, 64 - 16 * i, x_pos + 48, 64 - 16 * i);
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
release_mutex((ValueMutex*)ctx, state);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void input_callback(InputEvent* input_event, void* ctx) {
|
[FL-140] Core api dynamic records (#296)
* SYSTEM: tickless mode with deep sleep.
* Move FreeRTOS ticks to lptim2
* API: move all sumbodules init routines to one place. Timebase: working lptim2 at tick source.
* API Timebase: lp-timer routines, timer access safe zones prediction and synchronization. FreeRTOS: adjust configuration for tickless mode.
* NFC: support for tickless mode.
* API Timebase: improve tick error handling in IRQ. Apploader: use insomnia mode to run applications.
* BLE: prevent sleep while core2 starting
* HAL: nap while in insomnia mode
* init records work
* try to implement record delete
* tests and flapp
* flapp subsystem
* new core functions to get app stat, simplify core code
* fix thread termination
* add strdup to core
* fix tests
* Refactoring: remove all unusued parts, update API usage, aggreagate API sources and headers, new record storage
* Refactoring: update furi record api usage, cleanup code
* Fix broken merge for freertos apps
* Core, Target: fix compilation warnings
* Drop firmware target local
* HAL Timebase, Power, Clock: semaphore guarded access to clock and power modes, better sleep mode.
* SD-Filesystem: wait for all deps to arrive before adding widget. Core, BLE: disable debug dump to serial.
* delete old app example-ipc
* delete old app fatfs list
* fix strobe app, add input header
* delete old display driver
* comment old app qr-code
* fix sd-card test, add forced widget update
* remove unused new core test
* increase heap to 128k
* comment and assert old core tests
* fix syntax
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-01-20 19:09:26 +03:00
|
|
|
osMessageQueueId_t event_queue = ctx;
|
2020-11-16 20:12:05 +03:00
|
|
|
|
|
|
|
MusicDemoEvent event;
|
|
|
|
event.type = EventTypeKey;
|
|
|
|
event.value.input = *input_event;
|
|
|
|
osMessageQueuePut(event_queue, &event, 0, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void process_note(
|
|
|
|
const MelodyEventRecord* note_record,
|
|
|
|
float bar_length_ms,
|
|
|
|
MusicDemoContext* context) {
|
|
|
|
MusicDemoEvent event;
|
|
|
|
// send note event
|
|
|
|
event.type = EventTypeNote;
|
|
|
|
event.value.note_record = note_record;
|
|
|
|
osMessageQueuePut(context->event_queue, &event, 0, 0);
|
|
|
|
|
|
|
|
// read volume
|
|
|
|
State* state = (State*)acquire_mutex(context->state_mutex, 25);
|
|
|
|
float volume = volumes[state->volume_id];
|
|
|
|
release_mutex(context->state_mutex, state);
|
|
|
|
|
|
|
|
// play note
|
|
|
|
float note_delay = bar_length_ms / (float)note_record->length;
|
|
|
|
if(note_record->note != N) {
|
|
|
|
hal_pwm_set(volume, note_record->note, &SPEAKER_TIM, SPEAKER_CH);
|
|
|
|
}
|
|
|
|
delay(note_delay);
|
|
|
|
hal_pwm_stop(&SPEAKER_TIM, SPEAKER_CH);
|
|
|
|
}
|
|
|
|
|
|
|
|
void music_player_thread(void* p) {
|
|
|
|
MusicDemoContext* context = (MusicDemoContext*)p;
|
|
|
|
|
|
|
|
const float bpm = 130.0f;
|
|
|
|
// 4/4
|
|
|
|
const float bar_length_ms = (60.0f * 1000.0f / bpm) * 4;
|
|
|
|
const uint16_t melody_start_events_count = sizeof(melody_start) / sizeof(melody_start[0]);
|
|
|
|
const uint16_t melody_loop_events_count = sizeof(melody_loop) / sizeof(melody_loop[0]);
|
|
|
|
|
|
|
|
for(size_t i = 0; i < melody_start_events_count; i++) {
|
|
|
|
process_note(&melody_start[i], bar_length_ms, context);
|
|
|
|
}
|
|
|
|
|
|
|
|
while(1) {
|
|
|
|
for(size_t i = 0; i < melody_loop_events_count; i++) {
|
|
|
|
process_note(&melody_loop[i], bar_length_ms, context);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-12 20:24:34 +03:00
|
|
|
int32_t music_player(void* p) {
|
2021-02-10 11:56:05 +03:00
|
|
|
osMessageQueueId_t event_queue = osMessageQueueNew(8, sizeof(MusicDemoEvent), NULL);
|
2020-11-16 20:12:05 +03:00
|
|
|
|
|
|
|
State _state;
|
|
|
|
_state.note_record = NULL;
|
|
|
|
for(size_t i = 0; i < note_stack_size; i++) {
|
|
|
|
_state.note_stack[i] = NULL;
|
|
|
|
}
|
|
|
|
_state.volume_id = 1;
|
|
|
|
_state.volume_id_max = sizeof(volumes) / sizeof(volumes[0]);
|
|
|
|
|
|
|
|
ValueMutex state_mutex;
|
|
|
|
if(!init_mutex(&state_mutex, &_state, sizeof(State))) {
|
[FL-781] FURI, CLI, stdlib: stdout hooks, integration between subsystems, uniform printf usage (#311)
* FURI stdglue: stdout hooks, local and global, ISR safe printf. Uniform newlines for terminal/debug output. Power: prevent sleep while core 2 has not started.
* Furi record, stdglue: check mutex allocation
* remove unused test
* Furi stdglue: buferized output, dynamically allocated state. Furi record: dynamically allocated state. Input dump: proper line ending. Hal VCP: dynamically allocated state.
* Interrupt manager: explicitly init list.
* Makefile: cleanup rules, fix broken dfu upload. F4: add compiler stack protection options.
* BLE: call debug uart callback on transmission complete
* FreeRTOS: add configUSE_NEWLIB_REENTRANT
* API HAL Timebase: fix issue with idle thread stack corruption caused by systick interrupt. BT: cleanup debug info output. FreeRTOS: disable reentry for newlib.
* F4: update stack protection CFLAGS to match used compiller
* F4: disable compiller stack protection because of incompatibility with current compiller
* Makefile: return openocd logs to gdb
* BLE: fixed pin, moar power, ble trace info.
* Prevent sleep when connection is active
* Makefile: return serial port to upload rule, add workaround for mac os
* Furi: prevent usage of stack for cmsis functions.
* F4: add missing includes, add debugger breakpoints
* Applications: per app stack size.
* Furi: honor kernel state in stdglue
* FreeRTOS: remove unused hooks
* Cleanup and format sources
Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
2021-01-29 03:09:33 +03:00
|
|
|
printf("cannot create mutex\r\n");
|
2021-02-12 20:24:34 +03:00
|
|
|
return 255;
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
|
|
|
|
2021-01-29 16:52:16 +03:00
|
|
|
ViewPort* view_port = view_port_alloc();
|
|
|
|
view_port_draw_callback_set(view_port, render_callback, &state_mutex);
|
|
|
|
view_port_input_callback_set(view_port, input_callback, event_queue);
|
2020-11-16 20:12:05 +03:00
|
|
|
|
2021-01-29 16:52:16 +03:00
|
|
|
// Open GUI and register view_port
|
[FL-140] Core api dynamic records (#296)
* SYSTEM: tickless mode with deep sleep.
* Move FreeRTOS ticks to lptim2
* API: move all sumbodules init routines to one place. Timebase: working lptim2 at tick source.
* API Timebase: lp-timer routines, timer access safe zones prediction and synchronization. FreeRTOS: adjust configuration for tickless mode.
* NFC: support for tickless mode.
* API Timebase: improve tick error handling in IRQ. Apploader: use insomnia mode to run applications.
* BLE: prevent sleep while core2 starting
* HAL: nap while in insomnia mode
* init records work
* try to implement record delete
* tests and flapp
* flapp subsystem
* new core functions to get app stat, simplify core code
* fix thread termination
* add strdup to core
* fix tests
* Refactoring: remove all unusued parts, update API usage, aggreagate API sources and headers, new record storage
* Refactoring: update furi record api usage, cleanup code
* Fix broken merge for freertos apps
* Core, Target: fix compilation warnings
* Drop firmware target local
* HAL Timebase, Power, Clock: semaphore guarded access to clock and power modes, better sleep mode.
* SD-Filesystem: wait for all deps to arrive before adding widget. Core, BLE: disable debug dump to serial.
* delete old app example-ipc
* delete old app fatfs list
* fix strobe app, add input header
* delete old display driver
* comment old app qr-code
* fix sd-card test, add forced widget update
* remove unused new core test
* increase heap to 128k
* comment and assert old core tests
* fix syntax
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-01-20 19:09:26 +03:00
|
|
|
Gui* gui = furi_record_open("gui");
|
2021-01-29 16:52:16 +03:00
|
|
|
gui_add_view_port(gui, view_port, GuiLayerFullscreen);
|
2020-11-16 20:12:05 +03:00
|
|
|
|
|
|
|
// open input record
|
[FL-140] Core api dynamic records (#296)
* SYSTEM: tickless mode with deep sleep.
* Move FreeRTOS ticks to lptim2
* API: move all sumbodules init routines to one place. Timebase: working lptim2 at tick source.
* API Timebase: lp-timer routines, timer access safe zones prediction and synchronization. FreeRTOS: adjust configuration for tickless mode.
* NFC: support for tickless mode.
* API Timebase: improve tick error handling in IRQ. Apploader: use insomnia mode to run applications.
* BLE: prevent sleep while core2 starting
* HAL: nap while in insomnia mode
* init records work
* try to implement record delete
* tests and flapp
* flapp subsystem
* new core functions to get app stat, simplify core code
* fix thread termination
* add strdup to core
* fix tests
* Refactoring: remove all unusued parts, update API usage, aggreagate API sources and headers, new record storage
* Refactoring: update furi record api usage, cleanup code
* Fix broken merge for freertos apps
* Core, Target: fix compilation warnings
* Drop firmware target local
* HAL Timebase, Power, Clock: semaphore guarded access to clock and power modes, better sleep mode.
* SD-Filesystem: wait for all deps to arrive before adding widget. Core, BLE: disable debug dump to serial.
* delete old app example-ipc
* delete old app fatfs list
* fix strobe app, add input header
* delete old display driver
* comment old app qr-code
* fix sd-card test, add forced widget update
* remove unused new core test
* increase heap to 128k
* comment and assert old core tests
* fix syntax
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-01-20 19:09:26 +03:00
|
|
|
PubSub* input_events_record = furi_record_open("input_events");
|
2020-11-16 20:12:05 +03:00
|
|
|
// prepare "do nothing" event
|
2021-02-10 11:56:05 +03:00
|
|
|
InputEvent input_event = {InputKeyRight, true};
|
2020-11-16 20:12:05 +03:00
|
|
|
|
|
|
|
// start player thread
|
|
|
|
// TODO change to fuirac_start
|
|
|
|
osThreadAttr_t player_attr = {.name = "music_player_thread", .stack_size = 512};
|
|
|
|
MusicDemoContext context = {.state_mutex = &state_mutex, .event_queue = event_queue};
|
|
|
|
osThreadId_t player = osThreadNew(music_player_thread, &context, &player_attr);
|
|
|
|
|
2020-11-17 00:39:48 +03:00
|
|
|
if(player == NULL) {
|
[FL-781] FURI, CLI, stdlib: stdout hooks, integration between subsystems, uniform printf usage (#311)
* FURI stdglue: stdout hooks, local and global, ISR safe printf. Uniform newlines for terminal/debug output. Power: prevent sleep while core 2 has not started.
* Furi record, stdglue: check mutex allocation
* remove unused test
* Furi stdglue: buferized output, dynamically allocated state. Furi record: dynamically allocated state. Input dump: proper line ending. Hal VCP: dynamically allocated state.
* Interrupt manager: explicitly init list.
* Makefile: cleanup rules, fix broken dfu upload. F4: add compiler stack protection options.
* BLE: call debug uart callback on transmission complete
* FreeRTOS: add configUSE_NEWLIB_REENTRANT
* API HAL Timebase: fix issue with idle thread stack corruption caused by systick interrupt. BT: cleanup debug info output. FreeRTOS: disable reentry for newlib.
* F4: update stack protection CFLAGS to match used compiller
* F4: disable compiller stack protection because of incompatibility with current compiller
* Makefile: return openocd logs to gdb
* BLE: fixed pin, moar power, ble trace info.
* Prevent sleep when connection is active
* Makefile: return serial port to upload rule, add workaround for mac os
* Furi: prevent usage of stack for cmsis functions.
* F4: add missing includes, add debugger breakpoints
* Applications: per app stack size.
* Furi: honor kernel state in stdglue
* FreeRTOS: remove unused hooks
* Cleanup and format sources
Co-authored-by: DrZlo13 <who.just.the.doctor@gmail.com>
2021-01-29 03:09:33 +03:00
|
|
|
printf("cannot create player thread\r\n");
|
2021-02-12 20:24:34 +03:00
|
|
|
return 255;
|
2020-11-17 00:39:48 +03:00
|
|
|
}
|
|
|
|
|
2020-11-16 20:12:05 +03:00
|
|
|
MusicDemoEvent event;
|
|
|
|
while(1) {
|
|
|
|
osStatus_t event_status = osMessageQueueGet(event_queue, &event, NULL, 100);
|
|
|
|
|
|
|
|
State* state = (State*)acquire_mutex_block(&state_mutex);
|
|
|
|
|
|
|
|
if(event_status == osOK) {
|
|
|
|
if(event.type == EventTypeKey) {
|
|
|
|
// press events
|
2021-03-18 10:58:16 +03:00
|
|
|
if(event.value.input.type == InputTypeShort &&
|
2021-02-10 11:56:05 +03:00
|
|
|
event.value.input.key == InputKeyBack) {
|
2021-03-18 10:58:16 +03:00
|
|
|
osThreadTerminate(player);
|
|
|
|
hal_pwm_stop(&SPEAKER_TIM, SPEAKER_CH);
|
|
|
|
view_port_enabled_set(view_port, false);
|
|
|
|
gui_remove_view_port(gui, view_port);
|
|
|
|
view_port_free(view_port);
|
|
|
|
osMessageQueueDelete(event_queue);
|
|
|
|
|
|
|
|
return 0;
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
|
|
|
|
2021-02-10 11:56:05 +03:00
|
|
|
if(event.value.input.type == InputTypePress &&
|
|
|
|
event.value.input.key == InputKeyUp) {
|
2020-11-16 20:12:05 +03:00
|
|
|
if(state->volume_id < state->volume_id_max - 1) state->volume_id++;
|
|
|
|
}
|
|
|
|
|
2021-02-10 11:56:05 +03:00
|
|
|
if(event.value.input.type == InputTypePress &&
|
|
|
|
event.value.input.key == InputKeyDown) {
|
2020-11-16 20:12:05 +03:00
|
|
|
if(state->volume_id > 0) state->volume_id--;
|
|
|
|
}
|
|
|
|
|
2021-02-10 11:56:05 +03:00
|
|
|
if(event.value.input.type == InputTypePress &&
|
|
|
|
event.value.input.key == InputKeyLeft) {
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
|
|
|
|
2021-02-10 11:56:05 +03:00
|
|
|
if(event.value.input.type == InputTypePress &&
|
|
|
|
event.value.input.key == InputKeyRight) {
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
|
|
|
|
2021-02-10 11:56:05 +03:00
|
|
|
if(event.value.input.key == InputKeyOk) {
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
} else if(event.type == EventTypeNote) {
|
|
|
|
// send "do nothing" event to prevent display backlight off
|
|
|
|
notify_pubsub(input_events_record, &input_event);
|
|
|
|
|
|
|
|
state->note_record = event.value.note_record;
|
|
|
|
|
|
|
|
for(size_t i = note_stack_size - 1; i > 0; i--) {
|
|
|
|
state->note_stack[i] = state->note_stack[i - 1];
|
|
|
|
}
|
|
|
|
state->note_stack[0] = state->note_record;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// event timeout
|
|
|
|
}
|
|
|
|
|
2021-01-29 16:52:16 +03:00
|
|
|
view_port_update(view_port);
|
2020-11-16 20:12:05 +03:00
|
|
|
release_mutex(&state_mutex, state);
|
|
|
|
}
|
2021-02-12 20:24:34 +03:00
|
|
|
|
|
|
|
return 0;
|
2020-11-16 20:12:05 +03:00
|
|
|
}
|