Skip to content

Commit 1954e3b

Browse files
committed
fbt format everything
1 parent 0553ae1 commit 1954e3b

22 files changed

+11929
-13739
lines changed

air_mouse.c

+29-16
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ enum AirMouseSubmenuIndex {
1616
void air_mouse_submenu_callback(void* context, uint32_t index) {
1717
furi_assert(context);
1818
AirMouse* app = context;
19-
if (index == AirMouseSubmenuIndexBtMouse) {
19+
if(index == AirMouseSubmenuIndexBtMouse) {
2020
app->view_id = AirMouseViewBtMouse;
2121
view_dispatcher_switch_to_view(app->view_dispatcher, AirMouseViewBtMouse);
22-
} else if (index == AirMouseSubmenuIndexUsbMouse) {
22+
} else if(index == AirMouseSubmenuIndexUsbMouse) {
2323
app->view_id = AirMouseViewUsbMouse;
2424
view_dispatcher_switch_to_view(app->view_dispatcher, AirMouseViewUsbMouse);
25-
} else if (index == AirMouseSubmenuIndexCalibration) {
25+
} else if(index == AirMouseSubmenuIndexCalibration) {
2626
app->view_id = AirMouseViewCalibration;
2727
view_dispatcher_switch_to_view(app->view_dispatcher, AirMouseViewCalibration);
2828
}
@@ -31,11 +31,11 @@ void air_mouse_submenu_callback(void* context, uint32_t index) {
3131
void air_mouse_dialog_callback(DialogExResult result, void* context) {
3232
furi_assert(context);
3333
AirMouse* app = context;
34-
if (result == DialogExResultLeft) {
34+
if(result == DialogExResultLeft) {
3535
view_dispatcher_switch_to_view(app->view_dispatcher, VIEW_NONE); // Exit
36-
} else if (result == DialogExResultRight) {
36+
} else if(result == DialogExResultRight) {
3737
view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id); // Show last view
38-
} else if (result == DialogExResultCenter) {
38+
} else if(result == DialogExResultCenter) {
3939
view_dispatcher_switch_to_view(app->view_dispatcher, AirMouseViewSubmenu); // Menu
4040
}
4141
}
@@ -63,11 +63,19 @@ AirMouse* air_mouse_app_alloc() {
6363

6464
// Submenu view
6565
app->submenu = submenu_alloc();
66-
submenu_add_item(app->submenu, "Bluetooth", AirMouseSubmenuIndexBtMouse, air_mouse_submenu_callback, app);
67-
submenu_add_item(app->submenu, "USB", AirMouseSubmenuIndexUsbMouse, air_mouse_submenu_callback, app);
68-
submenu_add_item(app->submenu, "Calibration", AirMouseSubmenuIndexCalibration, air_mouse_submenu_callback, app);
66+
submenu_add_item(
67+
app->submenu, "Bluetooth", AirMouseSubmenuIndexBtMouse, air_mouse_submenu_callback, app);
68+
submenu_add_item(
69+
app->submenu, "USB", AirMouseSubmenuIndexUsbMouse, air_mouse_submenu_callback, app);
70+
submenu_add_item(
71+
app->submenu,
72+
"Calibration",
73+
AirMouseSubmenuIndexCalibration,
74+
air_mouse_submenu_callback,
75+
app);
6976
view_set_previous_callback(submenu_get_view(app->submenu), air_mouse_exit);
70-
view_dispatcher_add_view(app->view_dispatcher, AirMouseViewSubmenu, submenu_get_view(app->submenu));
77+
view_dispatcher_add_view(
78+
app->view_dispatcher, AirMouseViewSubmenu, submenu_get_view(app->submenu));
7179

7280
// Dialog view
7381
app->dialog = dialog_ex_alloc();
@@ -77,22 +85,27 @@ AirMouse* air_mouse_app_alloc() {
7785
dialog_ex_set_right_button_text(app->dialog, "Stay");
7886
dialog_ex_set_center_button_text(app->dialog, "Menu");
7987
dialog_ex_set_header(app->dialog, "Close Current App?", 16, 12, AlignLeft, AlignTop);
80-
view_dispatcher_add_view(app->view_dispatcher, AirMouseViewExitConfirm, dialog_ex_get_view(app->dialog));
88+
view_dispatcher_add_view(
89+
app->view_dispatcher, AirMouseViewExitConfirm, dialog_ex_get_view(app->dialog));
8190

8291
// Bluetooth view
8392
app->bt_mouse = bt_mouse_alloc(app->view_dispatcher);
8493
view_set_previous_callback(bt_mouse_get_view(app->bt_mouse), air_mouse_exit_confirm_view);
85-
view_dispatcher_add_view(app->view_dispatcher, AirMouseViewBtMouse, bt_mouse_get_view(app->bt_mouse));
94+
view_dispatcher_add_view(
95+
app->view_dispatcher, AirMouseViewBtMouse, bt_mouse_get_view(app->bt_mouse));
8696

8797
// USB view
8898
app->usb_mouse = usb_mouse_alloc(app->view_dispatcher);
8999
view_set_previous_callback(usb_mouse_get_view(app->usb_mouse), air_mouse_exit_confirm_view);
90-
view_dispatcher_add_view(app->view_dispatcher, AirMouseViewUsbMouse, usb_mouse_get_view(app->usb_mouse));
100+
view_dispatcher_add_view(
101+
app->view_dispatcher, AirMouseViewUsbMouse, usb_mouse_get_view(app->usb_mouse));
91102

92103
// Calibration view
93104
app->calibration = calibration_alloc(app->view_dispatcher);
94-
view_set_previous_callback(calibration_get_view(app->calibration), air_mouse_exit_confirm_view);
95-
view_dispatcher_add_view(app->view_dispatcher, AirMouseViewCalibration, calibration_get_view(app->calibration));
105+
view_set_previous_callback(
106+
calibration_get_view(app->calibration), air_mouse_exit_confirm_view);
107+
view_dispatcher_add_view(
108+
app->view_dispatcher, AirMouseViewCalibration, calibration_get_view(app->calibration));
96109

97110
app->view_id = AirMouseViewSubmenu;
98111
view_dispatcher_switch_to_view(app->view_dispatcher, app->view_id);
@@ -128,7 +141,7 @@ int32_t air_mouse_app(void* p) {
128141
UNUSED(p);
129142

130143
AirMouse* app = air_mouse_app_alloc();
131-
if (!imu_begin()) {
144+
if(!imu_begin()) {
132145
air_mouse_app_free(app);
133146
return -1;
134147
}

tracking/calibration_data.h

+25-16
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@
1111
#define CALIBRATION_DATA_PATH INT_PATH(CALIBRATION_DATA_FILE_NAME)
1212
#define CALIBRATION_DATA_MAGIC (0x23)
1313

14-
#define CALIBRATION_DATA_SAVE(x) \
15-
saved_struct_save( \
16-
CALIBRATION_DATA_PATH, \
17-
(x), \
14+
#define CALIBRATION_DATA_SAVE(x) \
15+
saved_struct_save( \
16+
CALIBRATION_DATA_PATH, \
17+
(x), \
1818
sizeof(CalibrationMedian), \
19-
CALIBRATION_DATA_MAGIC, \
19+
CALIBRATION_DATA_MAGIC, \
2020
CALIBRATION_DATA_VER)
2121

22-
#define CALIBRATION_DATA_LOAD(x) \
23-
saved_struct_load( \
24-
CALIBRATION_DATA_PATH, \
25-
(x), \
22+
#define CALIBRATION_DATA_LOAD(x) \
23+
saved_struct_load( \
24+
CALIBRATION_DATA_PATH, \
25+
(x), \
2626
sizeof(CalibrationMedian), \
27-
CALIBRATION_DATA_MAGIC, \
27+
CALIBRATION_DATA_MAGIC, \
2828
CALIBRATION_DATA_VER)
2929

3030
typedef struct {
@@ -41,14 +41,15 @@ typedef cardboard::Vector3 Vector;
4141
* filing bugs), other may be required in the future, e.g. for bias.
4242
*/
4343
class CalibrationData {
44-
4544
public:
4645
/**
4746
* Check if the sensors were calibrated before.
4847
*
4948
* @return {@code true} if calibration data is available, or {@code false} otherwise.
5049
*/
51-
bool isComplete() { return complete; }
50+
bool isComplete() {
51+
return complete;
52+
}
5253

5354
/** Prepare to collect new calibration data. */
5455
void reset();
@@ -58,28 +59,36 @@ class CalibrationData {
5859
*
5960
* @return Three-axis median vector.
6061
*/
61-
Vector getMedian() { return median; }
62+
Vector getMedian() {
63+
return median;
64+
}
6265

6366
/**
6467
* Retrieve the mean gyroscope readings.
6568
*
6669
* @return Three-axis mean vector.
6770
*/
68-
Vector getMean() { return mean; }
71+
Vector getMean() {
72+
return mean;
73+
}
6974

7075
/**
7176
* Retrieve the standard deviation of gyroscope readings.
7277
*
7378
* @return Three-axis standard deviation vector.
7479
*/
75-
Vector getSigma() { return sigma; }
80+
Vector getSigma() {
81+
return sigma;
82+
}
7683

7784
/**
7885
* Retrieve the confidence interval size of gyroscope readings.
7986
*
8087
* @return Three-axis confidence interval size vector.
8188
*/
82-
Vector getDelta() { return delta; }
89+
Vector getDelta() {
90+
return delta;
91+
}
8392

8493
/**
8594
* Add a new gyroscope reading to the stats.

0 commit comments

Comments
 (0)