aanper 5 лет назад
Родитель
Сommit
f2a38cf174

+ 2 - 1
applications/examples/fatfs_list.c

@@ -49,7 +49,8 @@ void fatfs_list(void* p) {
 
 
     furi_log = get_default_log();
     furi_log = get_default_log();
 
 
-    FuriRecordSubscriber* fb_record = furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
+    FuriRecordSubscriber* fb_record =
+        furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
     if(fb_record == NULL) {
     if(fb_record == NULL) {
         fuprintf(furi_log, "[widget][fatfs_list] cannot create fb record\n");
         fuprintf(furi_log, "[widget][fatfs_list] cannot create fb record\n");
         furiac_exit(NULL);
         furiac_exit(NULL);

+ 2 - 1
applications/examples/u8g2_example.c

@@ -5,7 +5,8 @@ void u8g2_example(void* p) {
     FuriRecordSubscriber* log = get_default_log();
     FuriRecordSubscriber* log = get_default_log();
 
 
     // open record
     // open record
-    FuriRecordSubscriber* fb_record = furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
+    FuriRecordSubscriber* fb_record =
+        furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
 
 
     if(fb_record == NULL) {
     if(fb_record == NULL) {
         fuprintf(log, "[widget] cannot create fb record\n");
         fuprintf(log, "[widget] cannot create fb record\n");

+ 2 - 1
applications/examples/u8g2_qrcode.c

@@ -14,7 +14,8 @@ void u8g2_qrcode(void* p) {
     FuriRecordSubscriber* log = get_default_log();
     FuriRecordSubscriber* log = get_default_log();
 
 
     // open record
     // open record
-    FuriRecordSubscriber* fb_record = furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
+    FuriRecordSubscriber* fb_record =
+        furi_open_deprecated("u8g2_fb", false, false, NULL, NULL, NULL);
 
 
     // Allocate a chunk of memory to store the QR code
     // Allocate a chunk of memory to store the QR code
     // https://github.com/ricmoo/QRCode
     // https://github.com/ricmoo/QRCode

+ 4 - 3
applications/gui/gui_event.c

@@ -29,8 +29,8 @@ GUIEvent* gui_event_alloc() {
     assert(gui_event->mqueue);
     assert(gui_event->mqueue);
 
 
     // Input
     // Input
-    gui_event->input_event_record =
-        furi_open_deprecated("input_events", false, false, gui_event_input_events_callback, NULL, gui_event);
+    gui_event->input_event_record = furi_open_deprecated(
+        "input_events", false, false, gui_event_input_events_callback, NULL, gui_event);
     assert(gui_event->input_event_record != NULL);
     assert(gui_event->input_event_record != NULL);
     // Lock mutex
     // Lock mutex
     gui_event->lock_mutex = osMutexNew(NULL);
     gui_event->lock_mutex = osMutexNew(NULL);
@@ -58,7 +58,8 @@ void gui_event_unlock(GUIEvent* gui_event) {
 }
 }
 
 
 void gui_event_messsage_send(GUIEvent* gui_event, GUIMessage* message) {
 void gui_event_messsage_send(GUIEvent* gui_event, GUIMessage* message) {
-    assert(gui_event); assert(message);
+    assert(gui_event);
+    assert(message);
     osMessageQueuePut(gui_event->mqueue, message, 0, 0);
     osMessageQueuePut(gui_event->mqueue, message, 0, 0);
 }
 }
 
 

+ 1 - 1
applications/menu/menu.c

@@ -187,7 +187,7 @@ void menu_task(void* p) {
         furiac_exit(NULL);
         furiac_exit(NULL);
     }
     }
     furiac_ready();
     furiac_ready();
-    
+
     while(1) {
     while(1) {
         MenuMessage m = menu_event_next(menu->event);
         MenuMessage m = menu_event_next(menu->event);
 
 

+ 0 - 1
applications/tests/furi_valuemutex_test.c

@@ -39,7 +39,6 @@ void test_furi_valuemutex() {
     //read mutex blocking case
     //read mutex blocking case
 }
 }
 
 
-
 /*
 /*
 TEST: concurrent access
 TEST: concurrent access
 
 

+ 0 - 1
applications/tests/minunit_test.c

@@ -67,7 +67,6 @@ MU_TEST_SUITE(test_suite) {
     MU_RUN_TEST(mu_test_furi_create_open);
     MU_RUN_TEST(mu_test_furi_create_open);
     MU_RUN_TEST(mu_test_furi_valuemutex);
     MU_RUN_TEST(mu_test_furi_valuemutex);
     MU_RUN_TEST(mu_test_furi_concurrent_access);
     MU_RUN_TEST(mu_test_furi_concurrent_access);
-
 }
 }
 
 
 int run_minunit() {
 int run_minunit() {

+ 3 - 9
core/api-basic/value-expanders.h

@@ -12,15 +12,10 @@ void COPY_COMPOSE(void* ctx, void* state) {
     read_mutex((ValueMutex*)ctx, state, 0);
     read_mutex((ValueMutex*)ctx, state, 0);
 }
 }
 
 
-typedef enum {
-    UiLayerBelowNotify
-    UiLayerNotify,
-    UiLayerAboveNotify
-} UiLayer;
+typedef enum { UiLayerBelowNotify UiLayerNotify, UiLayerAboveNotify } UiLayer;
 
 
-ValueComposerHandle* add_compose_layer(
-    ValueComposer* composer, ValueComposerCallback cb, void* ctx, uint32_t layer
-);
+ValueComposerHandle*
+add_compose_layer(ValueComposer* composer, ValueComposerCallback cb, void* ctx, uint32_t layer);
 
 
 bool remove_compose_layer(ValueComposerHandle* handle);
 bool remove_compose_layer(ValueComposerHandle* handle);
 
 
@@ -44,7 +39,6 @@ typedef struct {
     PubSub pubsub;
     PubSub pubsub;
 } ValueManager;
 } ValueManager;
 
 
-
 /*
 /*
 acquire value, changes it and send notify with current value.
 acquire value, changes it and send notify with current value.
 */
 */

+ 10 - 7
core/api-hal/api-spi.h

@@ -17,13 +17,17 @@ For transmit/receive data use `spi_xfer` function.
 */
 */
 bool spi_xfer(
 bool spi_xfer(
     SPI_HandleTypeDef* spi,
     SPI_HandleTypeDef* spi,
-    uint8_t* tx_data, uint8_t* rx_data, size_t len,
-    PubSubCallback cb, void* ctx);
+    uint8_t* tx_data,
+    uint8_t* rx_data,
+    size_t len,
+    PubSubCallback cb,
+    void* ctx);
 
 
 /*
 /*
 Blocking verison:
 Blocking verison:
 */
 */
-static inline bool spi_xfer_block(SPI_HandleTypeDef* spi, uint8_t* tx_data, uint8_t* rx_data, size_t len) {
+static inline bool
+spi_xfer_block(SPI_HandleTypeDef* spi, uint8_t* tx_data, uint8_t* rx_data, size_t len) {
     semaphoreInfo s;
     semaphoreInfo s;
     osSemaphore block = createSemaphoreStatic(s);
     osSemaphore block = createSemaphoreStatic(s);
     if(!spi_xfer(spi, tx_data, rx_data, len, RELEASE_SEMAPHORE, (void*)block)) {
     if(!spi_xfer(spi, tx_data, rx_data, len, RELEASE_SEMAPHORE, (void*)block)) {
@@ -52,15 +56,15 @@ typedef struct {
     ValueMutex* bus; ///< <SpiBus*>
     ValueMutex* bus; ///< <SpiBus*>
 } SpiDevice;
 } SpiDevice;
 
 
-## SPI IRQ device
+##SPI IRQ device
 
 
-/*
+    /*
 Many devices (like CC1101 and NFC) present as SPI bus and IRQ line.
 Many devices (like CC1101 and NFC) present as SPI bus and IRQ line.
 For work with it there is special entity `SpiIrqDevice`.
 For work with it there is special entity `SpiIrqDevice`.
 Use `subscribe_pubsub` for subscribinq to irq events.
 Use `subscribe_pubsub` for subscribinq to irq events.
 */
 */
 
 
-typedef struct {
+    typedef struct {
     ValueMutex* bus; ///< <SpiBus*>
     ValueMutex* bus; ///< <SpiBus*>
     PubSub* irq;
     PubSub* irq;
 } SpiIrqDevice;
 } SpiIrqDevice;
@@ -75,7 +79,6 @@ typedef struct {
     ValueMutex* spi; ///< <SPI_HandleTypeDef*>
     ValueMutex* spi; ///< <SPI_HandleTypeDef*>
 } DisplayBus;
 } DisplayBus;
 
 
-
 typedef struct {
 typedef struct {
     ValueMutex* bus; ///< <DisplayBus*>
     ValueMutex* bus; ///< <DisplayBus*>
 } DisplayDevice;
 } DisplayDevice;