Willy-JL 1 年之前
父节点
当前提交
15f866270c

+ 1 - 1
cross_remote/helpers/subghz/subghz_txrx.c

@@ -76,7 +76,7 @@ SubGhzTxRx* subghz_txrx_alloc(void) {
 
 void subghz_txrx_free(SubGhzTxRx* instance) {
     furi_assert(instance);
-    
+
     if(instance->radio_device_type != SubGhzRadioDeviceTypeInternal) {
         subghz_txrx_radio_device_power_off(instance);
         subghz_devices_end(instance->radio_device);

+ 4 - 2
cross_remote/helpers/xremote_storage.c

@@ -59,7 +59,8 @@ void xremote_save_settings(void* context) {
         fff_file, XREMOTE_SETTINGS_KEY_SAVE_SETTINGS, &app->save_settings, 1);
     flipper_format_write_uint32(fff_file, XREMOTE_SETTINGS_KEY_IR_TIMING, &app->ir_timing, 1);
     flipper_format_write_uint32(fff_file, XREMOTE_SETTINGS_KEY_SG_TIMING, &app->sg_timing, 1);
-    flipper_format_write_uint32(fff_file, XREMOTE_SETTINGS_KEY_LOOP_TRANSMIT, &app->loop_transmit, 1);
+    flipper_format_write_uint32(
+        fff_file, XREMOTE_SETTINGS_KEY_LOOP_TRANSMIT, &app->loop_transmit, 1);
 
     if(!flipper_format_rewind(fff_file)) {
         xremote_close_config_file(fff_file);
@@ -113,7 +114,8 @@ void xremote_read_settings(void* context) {
         fff_file, XREMOTE_SETTINGS_KEY_SAVE_SETTINGS, &app->save_settings, 1);
     flipper_format_read_uint32(fff_file, XREMOTE_SETTINGS_KEY_IR_TIMING, &app->ir_timing, 1);
     flipper_format_read_uint32(fff_file, XREMOTE_SETTINGS_KEY_SG_TIMING, &app->sg_timing, 1);
-    flipper_format_read_uint32(fff_file, XREMOTE_SETTINGS_KEY_LOOP_TRANSMIT, &app->loop_transmit, 1);
+    flipper_format_read_uint32(
+        fff_file, XREMOTE_SETTINGS_KEY_LOOP_TRANSMIT, &app->loop_transmit, 1);
 
     flipper_format_rewind(fff_file);
 

+ 6 - 6
cross_remote/scenes/xremote_scene_transmit.c

@@ -122,18 +122,18 @@ static void xremote_scene_transmit_end_scene(XRemote* app) {
 
 static void xremote_scene_transmit_run_single_transmit(XRemote* app) {
     CrossRemote* remote = app->cross_remote;
-    if (xremote_cross_remote_get_transmitting(remote) == XRemoteTransmittingIdle) {
+    if(xremote_cross_remote_get_transmitting(remote) == XRemoteTransmittingIdle) {
         xremote_cross_remote_set_transmitting(remote, XRemoteTransmittingStart);
         CrossRemoteItem* item = xremote_cross_remote_get_item(remote, app->transmit_item);
         xremote_scene_transmit_send_signal(app, item);
-    } else if (xremote_cross_remote_get_transmitting(remote) == XRemoteTransmittingStopSubghz) {
+    } else if(xremote_cross_remote_get_transmitting(remote) == XRemoteTransmittingStopSubghz) {
         app->transmit_item++;
         app->state_notifications = SubGhzNotificationStateIDLE;
         app->transmitting = false;
         subghz_txrx_stop(app->subghz->txrx);
         xremote_scene_ir_notification_message(app, SubGhzNotificationMessageBlinkStop);
         xremote_cross_remote_set_transmitting(remote, XRemoteTransmittingIdle);
-    } else if (xremote_cross_remote_get_transmitting(remote) == XRemoteTransmittingStop) {
+    } else if(xremote_cross_remote_get_transmitting(remote) == XRemoteTransmittingStop) {
         app->transmit_item++;
         xremote_cross_remote_set_transmitting(remote, XRemoteTransmittingIdle);
     }
@@ -142,11 +142,11 @@ static void xremote_scene_transmit_run_single_transmit(XRemote* app) {
 static void xremote_scene_transmit_run_next_transmission(XRemote* app) {
     CrossRemote* remote = app->cross_remote;
     size_t item_count = xremote_cross_remote_get_item_count(remote);
-    if (app->transmit_item < item_count) {
+    if(app->transmit_item < item_count) {
         xremote_scene_transmit_run_single_transmit(app);
         return;
     }
-    if (app->loop_transmit && !app->stop_transmit) {
+    if(app->loop_transmit && !app->stop_transmit) {
         app->transmit_item = 0;
         return;
     }
@@ -165,7 +165,7 @@ void xremote_scene_transmit_on_enter(void* context) {
 bool xremote_scene_transmit_on_event(void* context, SceneManagerEvent event) {
     XRemote* app = context;
     bool consumed = false;
-    
+
     if(event.type == SceneManagerEventTypeCustom) {
         FURI_LOG_D(TAG, "Custom Event");
         switch(event.event) {

+ 10 - 10
cross_remote/views/xremote_transmit.c

@@ -53,11 +53,11 @@ void xremote_transmit_draw_ir(Canvas* canvas, XRemoteTransmitModel* model) {
     canvas_draw_str_aligned(canvas, 74, 15, AlignLeft, AlignTop, "Infrared");
     canvas_draw_str_aligned(canvas, 74, 25, AlignLeft, AlignTop, model->name);
 
-    if (model->time == 0) {
+    if(model->time == 0) {
         canvas_draw_icon(canvas, 36, 2, &I_ir_ani_1_32x22);
-    } else if (model->time == 1) {
+    } else if(model->time == 1) {
         canvas_draw_icon(canvas, 36, 2, &I_ir_ani_2_32x22);
-    } else if (model->time == 2) {
+    } else if(model->time == 2) {
         canvas_draw_icon(canvas, 36, 2, &I_ir_ani_3_32x22);
     }
 }
@@ -73,11 +73,11 @@ void xremote_transmit_draw_pause(Canvas* canvas, XRemoteTransmitModel* model) {
     canvas_draw_str_aligned(canvas, 74, 15, AlignLeft, AlignTop, "Sequence");
     canvas_draw_str_aligned(canvas, 74, 25, AlignLeft, AlignTop, model->name);
 
-    if (model->time == 0) {
+    if(model->time == 0) {
         canvas_draw_icon(canvas, 9, 28, &I_pause_ani_1_22x23);
-    } else if (model->time == 1) {
+    } else if(model->time == 1) {
         canvas_draw_icon(canvas, 9, 28, &I_pause_ani_2_22x23);
-    } else if (model->time == 2) {
+    } else if(model->time == 2) {
         canvas_draw_icon(canvas, 9, 28, &I_pause_ani_3_22x23);
     }
 }
@@ -93,11 +93,11 @@ void xremote_transmit_draw_subghz(Canvas* canvas, XRemoteTransmitModel* model) {
     canvas_draw_str_aligned(canvas, 74, 15, AlignLeft, AlignTop, "SubGhz");
     canvas_draw_str_aligned(canvas, 74, 25, AlignLeft, AlignTop, model->name);
 
-    if (model->time == 0) {
+    if(model->time == 0) {
         canvas_draw_icon(canvas, 15, 1, &I_sg_ani_1_19x13);
-    } else if (model->time == 1) {
+    } else if(model->time == 1) {
         canvas_draw_icon(canvas, 15, 1, &I_sg_ani_2_19x13);
-    } else if (model->time == 2) {
+    } else if(model->time == 2) {
         canvas_draw_icon(canvas, 15, 1, &I_sg_ani_3_19x13);
     }
 }
@@ -110,7 +110,7 @@ void xremote_transmit_draw(Canvas* canvas, XRemoteTransmitModel* model) {
     } else if(model->type == XRemoteRemoteItemTypePause) {
         xremote_transmit_draw_pause(canvas, model);
     }
-    if (model->time > 2) {
+    if(model->time > 2) {
         model->time = 0;
     }
     elements_button_right(canvas, "exit");

+ 1 - 1
cross_remote/xremote.c

@@ -174,7 +174,7 @@ void xremote_app_free(XRemote* app) {
 
     app->gui = NULL;
     app->notification = NULL;
-    
+
     //Remove whatever is left
     free(app);
 }

+ 1 - 1
flip_library/application.fam

@@ -10,5 +10,5 @@ App(
     fap_description="Utilize WiFi to retrieve data from 20 different APIs",
     fap_author="JBlanked",
     fap_weburl="https://github.com/jblanked/FlipLibrary",
-    fap_version = "1.4",
+    fap_version="1.4",
 )

+ 1 - 1
flip_trader/application.fam

@@ -10,5 +10,5 @@ App(
     fap_description="Use WiFi to get the price of stocks and currency pairs on your Flipper Zero.",
     fap_author="JBlanked",
     fap_weburl="https://github.com/jblanked/FlipTrader",
-    fap_version = "1.2",
+    fap_version="1.2",
 )

+ 1 - 1
flip_weather/application.fam

@@ -10,5 +10,5 @@ App(
     fap_description="Use WiFi to get GPS and Weather information on your Flipper Zero.",
     fap_author="JBlanked",
     fap_weburl="https://github.com/jblanked/FlipWeather",
-    fap_version = "1.2",
+    fap_version="1.2",
 )

+ 35 - 36
oscilloscope/scenes/scope_scene_run.c

@@ -74,20 +74,20 @@ uint8_t pause = 0; // Whether we want to pause output or not
 enum measureenum type; // Type of measurement we are performing
 int toggle = 0; // Used for toggling output GPIO, only used in testing
 uint32_t adc_buffer; // ADC buffer size
-int16_t *index_crossings; // Indexes of zero crossings
-float *data; // Shift data across virtual zero line
-float *crossings;
-float complex *fft_data; // Real data, transformed to complex data via FFT
-float *fft_power; // Power data from FFT
+int16_t* index_crossings; // Indexes of zero crossings
+float* data; // Shift data across virtual zero line
+float* crossings;
+float complex* fft_data; // Real data, transformed to complex data via FFT
+float* fft_power; // Power data from FFT
 
 void Error_Handler() {
     while(1) {
     }
 }
 
-uint16_t *aADCxConvertedData; // Array that ADC data is copied to, via DMA
-__IO uint16_t *aADCxConvertedData_Voltage_mVoltA; // Data is converted to range from 0 to 2500
-__IO uint16_t *aADCxConvertedData_Voltage_mVoltB; // Data is converted to range from 0 to 2500
+uint16_t* aADCxConvertedData; // Array that ADC data is copied to, via DMA
+__IO uint16_t* aADCxConvertedData_Voltage_mVoltA; // Data is converted to range from 0 to 2500
+__IO uint16_t* aADCxConvertedData_Voltage_mVoltB; // Data is converted to range from 0 to 2500
 __IO uint8_t ubDmaTransferStatus = 2; // DMA transfer status
 
 __IO uint16_t* mvoltWrite; // Pointer to area we write converted voltage data to
@@ -279,9 +279,7 @@ void swap(__IO uint16_t** a, __IO uint16_t** b) {
 
 void AdcDmaTransferComplete_Callback() {
     uint32_t tmp_index = 0;
-    for(tmp_index = (adc_buffer / 2);
-        tmp_index < adc_buffer;
-        tmp_index++) {
+    for(tmp_index = (adc_buffer / 2); tmp_index < adc_buffer; tmp_index++) {
         mvoltWrite[tmp_index] = __LL_ADC_CALC_DATA_TO_VOLTAGE(
             VDDA_APPLI, aADCxConvertedData[tmp_index], LL_ADC_RESOLUTION_12B);
     }
@@ -456,8 +454,9 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
         // see https://gist.github.com/endolith/255291 for Python version
         for(uint32_t x = 0; x < adc_buffer; x++) {
             if(index_crossings[x] == -1) break;
-            crossings[count++] =
-                (float)index_crossings[x] - data[index_crossings[x]] / (data[index_crossings[x] + 1] - data[index_crossings[x]]);
+            crossings[count++] = (float)index_crossings[x] -
+                                 data[index_crossings[x]] /
+                                     (data[index_crossings[x] + 1] - data[index_crossings[x]]);
         }
         float avg = 0.0;
         float countv = 0.0;
@@ -473,7 +472,7 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
         canvas_draw_str(canvas, 2, 20, buf1);
     } break;
     case m_fft: {
-        for (uint32_t i=0; i < adc_buffer; i++){
+        for(uint32_t i = 0; i < adc_buffer; i++) {
             fft_data[i] = ((float)mvoltDisplay[i] / 1000);
         }
 
@@ -483,9 +482,9 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
         // Find FFT bin, with highest power
         float max_val = -1;
         int idx = 0;
-        for (uint32_t i = 1; i < adc_buffer / 2; i++) {
+        for(uint32_t i = 1; i < adc_buffer / 2; i++) {
             float f = cabsf(fft_data[i]) * cabsf(fft_data[i]);
-            if (f > max_val) {
+            if(f > max_val) {
                 max_val = f;
                 idx = i;
             }
@@ -493,7 +492,7 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
         }
 
         // Display frequency of waveform
-        snprintf(buf1, 50, "Freq: %.1fHz",  (double)idx * ((double)freq / (double)adc_buffer));
+        snprintf(buf1, 50, "Freq: %.1fHz", (double)idx * ((double)freq / (double)adc_buffer));
         canvas_draw_str(canvas, 2, 10, buf1);
     } break;
     case m_voltage: {
@@ -512,24 +511,26 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
         break;
     }
 
-    if (type != m_fft){
+    if(type != m_fft) {
         // Draw lines between each data point
         // y should range from 0 to 63
         for(uint32_t x = 1; x < adc_buffer; x++) {
-            int32_t prev = 63 - (uint32_t)(((float)mvoltDisplay[x - 1] / (float)VDDA_APPLI) * scale * 63.0f);
-            int32_t cur = 63 - (uint32_t)(((float)mvoltDisplay[x] / (float)VDDA_APPLI) * scale * 63.0f);
+            int32_t prev =
+                63 - (uint32_t)(((float)mvoltDisplay[x - 1] / (float)VDDA_APPLI) * scale * 63.0f);
+            int32_t cur =
+                63 - (uint32_t)(((float)mvoltDisplay[x] / (float)VDDA_APPLI) * scale * 63.0f);
             if(!(prev < 0 && cur < 0))
                 canvas_draw_line(canvas, x - 1, clamp(prev, 0, 63), x, clamp(cur, 0, 63));
         }
     } else {
         // Process FFT data - excluding bin 0
         float max = 0;
-        for (uint32_t i = 1; i < adc_buffer / 2; i+= adc_buffer / 2 / 128) {
+        for(uint32_t i = 1; i < adc_buffer / 2; i += adc_buffer / 2 / 128) {
             float sum = 0;
-            for (uint32_t i2 = i; i2 < i + (adc_buffer / 2 / 128); i2++) {
+            for(uint32_t i2 = i; i2 < i + (adc_buffer / 2 / 128); i2++) {
                 sum += fft_power[i2];
             }
-            if (sum > max){
+            if(sum > max) {
                 max = sum;
             }
         }
@@ -539,9 +540,9 @@ static void app_draw_callback(Canvas* canvas, void* ctx) {
         // xpos: 0 to 127 for window size 512
         // xpos: 0 to 127 for window size 1024
         // y should range from 0 to 63
-        for (uint32_t i = 1; i < adc_buffer / 2; i+= adc_buffer / 2 / 128) {
+        for(uint32_t i = 1; i < adc_buffer / 2; i += adc_buffer / 2 / 128) {
             float sum = 0;
-            for (uint32_t i2 = i; i2 < i + (adc_buffer / 2 / 128); i2++) {
+            for(uint32_t i2 = i; i2 < i + (adc_buffer / 2 / 128); i2++) {
                 sum += fft_power[i2];
             }
             canvas_draw_line(canvas, xpos, 63, xpos, 63 - (uint32_t)(((sum / max) * 63.0f)));
@@ -562,7 +563,7 @@ static void app_input_callback(InputEvent* input_event, void* ctx) {
 }
 
 // Free malloc'd data
-void free_all(){
+void free_all() {
     free(aADCxConvertedData);
     free((void*)aADCxConvertedData_Voltage_mVoltA);
     free((void*)aADCxConvertedData_Voltage_mVoltB);
@@ -594,20 +595,20 @@ void scope_scene_run_on_enter(void* context) {
     type = app->measurement;
 
     adc_buffer = ADC_CONVERTED_DATA_BUFFER_SIZE;
-    if(type == m_fft)
-        adc_buffer = app->fft;
+    if(type == m_fft) adc_buffer = app->fft;
 
     aADCxConvertedData = malloc(adc_buffer * sizeof(uint16_t));
-    aADCxConvertedData_Voltage_mVoltA =  malloc(adc_buffer * sizeof(uint16_t));
-    aADCxConvertedData_Voltage_mVoltB =  malloc(adc_buffer * sizeof(uint16_t));
+    aADCxConvertedData_Voltage_mVoltA = malloc(adc_buffer * sizeof(uint16_t));
+    aADCxConvertedData_Voltage_mVoltB = malloc(adc_buffer * sizeof(uint16_t));
 
     index_crossings = malloc(adc_buffer * sizeof(int16_t));
-    data  = malloc(adc_buffer * sizeof(float));
+    data = malloc(adc_buffer * sizeof(float));
     crossings = malloc(adc_buffer * sizeof(float));
     fft_data = malloc(adc_buffer * sizeof(float complex));
     fft_power = malloc(adc_buffer * sizeof(float));
 
-    mvoltWrite = &aADCxConvertedData_Voltage_mVoltA[0]; // Pointer to area we write converted voltage data to
+    mvoltWrite =
+        &aADCxConvertedData_Voltage_mVoltA[0]; // Pointer to area we write converted voltage data to
     mvoltDisplay = &aADCxConvertedData_Voltage_mVoltB[0]; // Pointer to area of memory we display
 
     // Copy vector table, modify to use our own IRQ handlers
@@ -640,8 +641,7 @@ void scope_scene_run_on_enter(void* context) {
     MX_ADC1_Init();
 
     // Setup initial values from ADC
-    for(tmp_index_adc_converted_data = 0;
-        tmp_index_adc_converted_data < adc_buffer;
+    for(tmp_index_adc_converted_data = 0; tmp_index_adc_converted_data < adc_buffer;
         tmp_index_adc_converted_data++) {
         aADCxConvertedData[tmp_index_adc_converted_data] = VAR_CONVERTED_DATA_INIT_VALUE;
         aADCxConvertedData_Voltage_mVoltA[tmp_index_adc_converted_data] = 0;
@@ -725,8 +725,7 @@ void scope_scene_run_on_enter(void* context) {
         view_port_free(view_port);
 
         app->data = malloc(sizeof(uint16_t) * adc_buffer);
-        memcpy(
-            app->data, (uint16_t*)mvoltDisplay, sizeof(uint16_t) * adc_buffer);
+        memcpy(app->data, (uint16_t*)mvoltDisplay, sizeof(uint16_t) * adc_buffer);
         free_all();
         scene_manager_next_scene(app->scene_manager, ScopeSceneSave);
     }

+ 2 - 4
oscilloscope/scenes/scope_scene_setup.c

@@ -54,8 +54,7 @@ void scope_scene_setup_on_enter(void* context) {
         }
     }
 
-    item = variable_item_list_add(
-        var_item_list, "FFT window", COUNT_OF(fft_list), fft_cb, app);
+    item = variable_item_list_add(var_item_list, "FFT window", COUNT_OF(fft_list), fft_cb, app);
 
     for(uint32_t i = 0; i < COUNT_OF(fft_list); i++) {
         if(fft_list[i].window == app->fft) {
@@ -65,8 +64,7 @@ void scope_scene_setup_on_enter(void* context) {
         }
     }
 
-    item = variable_item_list_add(
-        var_item_list, "Scale", COUNT_OF(scale_list), scale_cb, app);
+    item = variable_item_list_add(var_item_list, "Scale", COUNT_OF(scale_list), scale_cb, app);
 
     for(uint32_t i = 0; i < COUNT_OF(scale_list); i++) {
         if(scale_list[i].scale == app->scale) {

+ 1 - 1
web_crawler/application.fam

@@ -10,5 +10,5 @@ App(
     fap_description="Use Wi-Fi to access the internet and scrape data from the web.",
     fap_author="JBlanked",
     fap_weburl="https://github.com/jblanked/WebCrawler-FlipperZero",
-    fap_version = "0.8",
+    fap_version="0.8",
 )