Skip to content

Commit df60e6e

Browse files
committed
Format
1 parent 3f42ba6 commit df60e6e

File tree

2 files changed

+48
-49
lines changed

2 files changed

+48
-49
lines changed

lib/led/nfc_playlist_led.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ NotificationMessage blink_message_normal = {
44
.type = NotificationMessageTypeLedBlinkStart,
55
.data.led_blink.color = LightBlue | LightGreen,
66
.data.led_blink.on_time = 10,
7-
.data.led_blink.period = 100,
7+
.data.led_blink.period = 100
88
};
99
const NotificationSequence blink_sequence_normal = {
1010
&blink_message_normal,
1111
&message_do_not_reset,
12-
NULL,
12+
NULL
1313
};
1414

1515
NotificationMessage blink_message_error = {
1616
.type = NotificationMessageTypeLedBlinkStart,
1717
.data.led_blink.color = LightRed,
1818
.data.led_blink.on_time = 10,
19-
.data.led_blink.period = 100,
19+
.data.led_blink.period = 100
2020
};
2121

2222
const NotificationSequence blink_sequence_error = {
2323
&blink_message_error,
2424
&message_do_not_reset,
25-
NULL,
25+
NULL
2626
};
2727

2828
void start_blink(NfcPlaylist* nfc_playlist, int state) {

lib/worker/nfc_playlist_worker.c

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,79 @@
11
#include "nfc_playlist_worker.h"
22

33
NfcPlaylistWorker* nfc_playlist_worker_alloc() {
4-
NfcPlaylistWorker* nfc_playlist_worker = malloc(sizeof(NfcPlaylistWorker));
5-
// Worker thread attributes
6-
nfc_playlist_worker->thread = furi_thread_alloc_ex(
7-
"NfcPlaylistWorker", 8192, nfc_playlist_worker_task, nfc_playlist_worker);
8-
nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
4+
NfcPlaylistWorker* nfc_playlist_worker = malloc(sizeof(NfcPlaylistWorker));
95

10-
nfc_playlist_worker->nfc = nfc_alloc();
11-
nfc_playlist_worker->nfc_device = nfc_device_alloc();
6+
nfc_playlist_worker->thread = furi_thread_alloc_ex("NfcPlaylistWorker", 8192, nfc_playlist_worker_task, nfc_playlist_worker);
7+
nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
128

13-
return nfc_playlist_worker;
9+
nfc_playlist_worker->nfc = nfc_alloc();
10+
nfc_playlist_worker->nfc_device = nfc_device_alloc();
11+
12+
return nfc_playlist_worker;
1413
}
1514

1615
void nfc_playlist_worker_free(NfcPlaylistWorker* nfc_playlist_worker) {
17-
furi_assert(nfc_playlist_worker);
18-
furi_thread_free(nfc_playlist_worker->thread);
16+
furi_assert(nfc_playlist_worker);
17+
furi_thread_free(nfc_playlist_worker->thread);
1918

20-
nfc_free(nfc_playlist_worker->nfc);
21-
nfc_device_free(nfc_playlist_worker->nfc_device);
19+
nfc_free(nfc_playlist_worker->nfc);
20+
nfc_device_free(nfc_playlist_worker->nfc_device);
2221

23-
free(nfc_playlist_worker);
22+
free(nfc_playlist_worker);
2423
}
2524

2625
void nfc_playlist_worker_stop(NfcPlaylistWorker* nfc_playlist_worker) {
27-
furi_assert(nfc_playlist_worker);
28-
if(nfc_playlist_worker->state != NfcPlaylistWorkerState_Stopped) {
29-
nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
30-
furi_thread_join(nfc_playlist_worker->thread);
31-
}
26+
furi_assert(nfc_playlist_worker);
27+
if (nfc_playlist_worker->state != NfcPlaylistWorkerState_Stopped) {
28+
nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
29+
furi_thread_join(nfc_playlist_worker->thread);
30+
}
3231
}
3332

3433
void nfc_playlist_worker_start(NfcPlaylistWorker* nfc_playlist_worker) {
35-
furi_assert(nfc_playlist_worker);
36-
nfc_playlist_worker->state = NfcPlaylistWorkerState_Emulating;
37-
furi_thread_start(nfc_playlist_worker->thread);
34+
furi_assert(nfc_playlist_worker);
35+
nfc_playlist_worker->state = NfcPlaylistWorkerState_Emulating;
36+
furi_thread_start(nfc_playlist_worker->thread);
3837
}
3938

4039
int32_t nfc_playlist_worker_task(void* context) {
41-
NfcPlaylistWorker* nfc_playlist_worker = context;
40+
NfcPlaylistWorker* nfc_playlist_worker = context;
4241

43-
if(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
42+
if (nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
4443

45-
nfc_playlist_worker->nfc_listener =
46-
nfc_listener_alloc(nfc_playlist_worker->nfc,
47-
nfc_playlist_worker->nfc_protocol,
48-
nfc_device_get_data(nfc_playlist_worker->nfc_device, nfc_playlist_worker->nfc_protocol)
49-
);
50-
nfc_listener_start(nfc_playlist_worker->nfc_listener, NULL, NULL);
44+
nfc_playlist_worker->nfc_listener =
45+
nfc_listener_alloc(nfc_playlist_worker->nfc,
46+
nfc_playlist_worker->nfc_protocol,
47+
nfc_device_get_data(nfc_playlist_worker->nfc_device, nfc_playlist_worker->nfc_protocol)
48+
);
49+
nfc_listener_start(nfc_playlist_worker->nfc_listener, NULL, NULL);
5150

52-
while(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
53-
furi_delay_ms(50);
54-
}
51+
while(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
52+
furi_delay_ms(50);
53+
}
5554

56-
nfc_listener_stop(nfc_playlist_worker->nfc_listener);
57-
nfc_listener_free(nfc_playlist_worker->nfc_listener);
58-
}
55+
nfc_listener_stop(nfc_playlist_worker->nfc_listener);
56+
nfc_listener_free(nfc_playlist_worker->nfc_listener);
57+
}
5958

60-
nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
59+
nfc_playlist_worker->state = NfcPlaylistWorkerState_Stopped;
6160

62-
return 0;
61+
return 0;
6362
}
6463

6564
bool nfc_playlist_worker_is_emulating(NfcPlaylistWorker* nfc_playlist_worker) {
66-
if(nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
67-
return true;
68-
}
69-
return false;
65+
if (nfc_playlist_worker->state == NfcPlaylistWorkerState_Emulating) {
66+
return true;
67+
}
68+
return false;
7069
}
7170

7271
void nfc_playlist_worker_set_nfc_data(NfcPlaylistWorker* nfc_playlist_worker, char* file_path) {
73-
nfc_device_clear(nfc_playlist_worker->nfc_device);
74-
nfc_device_load(nfc_playlist_worker->nfc_device, file_path);
75-
nfc_playlist_worker->nfc_protocol = nfc_device_get_protocol(nfc_playlist_worker->nfc_device);
72+
nfc_device_clear(nfc_playlist_worker->nfc_device);
73+
nfc_device_load(nfc_playlist_worker->nfc_device, file_path);
74+
nfc_playlist_worker->nfc_protocol = nfc_device_get_protocol(nfc_playlist_worker->nfc_device);
7675
}
7776

7877
NfcDeviceData* nfc_playlist_worker_get_nfc_data(NfcPlaylistWorker* nfc_playlist_worker) {
79-
return nfc_playlist_worker->nfc_data;
78+
return nfc_playlist_worker->nfc_data;
8079
}

0 commit comments

Comments
 (0)