Skip to content

Commit 1dc58d6

Browse files
benmabenma
committed
Merge remote-tracking branch 'benma/format'
2 parents 9416408 + 8ac3615 commit 1dc58d6

File tree

9 files changed

+1891
-1773
lines changed

9 files changed

+1891
-1773
lines changed

‎.ci/check-tidy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ for dir in build build-build; do
3232
fi
3333

3434
# Remove flags unknown to tidy
35-
sed -i 's/-mcpu=cortex-m4//g; s/-mfloat-abi=softfp//g; s/-mlong-calls//g; s/-mthumb//g;
35+
sed -i 's/-mcpu=cortex-m4//g; s/-mfloat-abi=softfp//g; s/-mlong-calls//g; s/-mthumb//g; s/--specs=nano.specs//g; s/--specs=nosys.specs//g;
3636
s/-Wno-cast-function-type//g; s/-mfpu=fpv4-sp-d16//g; s/-Wformat-signedness//g' ${dir}/compile_commands.json
3737

3838
# Only check our files
@@ -57,5 +57,5 @@ for dir in build build-build; do
5757
echo "Checking $(echo ${SOURCES} | wc -w) files with clang-tidy"
5858

5959
# The list of tidy checks must stay in sync with scripts/tidy
60-
${CLANGTIDY} -quiet -p ${dir} -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*,bugprone-*,performance-*,portability-*,readability-*,-readability-braces-around-statements,-readability-magic-numbers,-readability-isolate-declaration -warnings-as-errors=* -header-filter '.*' ${SOURCES}
60+
${CLANGTIDY} -quiet -p ${dir} -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*,bugprone-*,performance-*,portability-*,readability-*,-readability-braces-around-statements,-readability-magic-numbers,-readability-isolate-declaration,-readability-identifier-length,-readability-function-cognitive-complexity,-bugprone-reserved-identifier,-performance-no-int-to-ptr -warnings-as-errors=* -header-filter '.*' ${SOURCES}
6161
done

‎scripts/format

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e
88
# Exit on pipe fail
99
set -o pipefail
1010

11-
CLANGFORMAT=${CLANGFORMAT:-clang-format-8}
11+
CLANGFORMAT=${CLANGFORMAT:-clang-format-15}
1212
CLANGFORMAT_FLAGS=${CLANGFORMAT_FLAGS:--i}
1313
VERBOSE=${VERBOSE:-NO}
1414

‎src/qtouch/qtouch.c

Lines changed: 44 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -84,29 +84,32 @@ uint8_t module_error_code = 0;
8484
uint16_t touch_acq_signals_raw[DEF_NUM_CHANNELS];
8585

8686
/* Acquisition set 1 - General settings */
87-
qtm_acq_node_group_config_t ptc_qtlib_acq_gen1 = {DEF_NUM_CHANNELS,
88-
DEF_SENSOR_TYPE,
89-
DEF_PTC_CAL_AUTO_TUNE,
90-
DEF_SEL_FREQ_INIT,
91-
DEF_PTC_INTERRUPT_PRIORITY};
87+
qtm_acq_node_group_config_t ptc_qtlib_acq_gen1 = {
88+
DEF_NUM_CHANNELS,
89+
DEF_SENSOR_TYPE,
90+
DEF_PTC_CAL_AUTO_TUNE,
91+
DEF_SEL_FREQ_INIT,
92+
DEF_PTC_INTERRUPT_PRIORITY};
9293

9394
/* Node status, signal, calibration values */
9495
qtm_acq_node_data_t ptc_qtlib_node_stat1[DEF_NUM_CHANNELS];
9596

9697
/* Node configurations */
97-
qtm_acq_samd51_node_config_t ptc_seq_node_cfg1[DEF_NUM_CHANNELS] = {NODE_0_PARAMS,
98-
NODE_1_PARAMS,
99-
NODE_2_PARAMS,
100-
NODE_3_PARAMS,
101-
NODE_4_PARAMS,
102-
NODE_5_PARAMS,
103-
NODE_6_PARAMS,
104-
NODE_7_PARAMS};
98+
qtm_acq_samd51_node_config_t ptc_seq_node_cfg1[DEF_NUM_CHANNELS] = {
99+
NODE_0_PARAMS,
100+
NODE_1_PARAMS,
101+
NODE_2_PARAMS,
102+
NODE_3_PARAMS,
103+
NODE_4_PARAMS,
104+
NODE_5_PARAMS,
105+
NODE_6_PARAMS,
106+
NODE_7_PARAMS};
105107

106108
/* Container */
107-
qtm_acquisition_control_t qtlib_acq_set1 = {&ptc_qtlib_acq_gen1,
108-
&ptc_seq_node_cfg1[0],
109-
&ptc_qtlib_node_stat1[0]};
109+
qtm_acquisition_control_t qtlib_acq_set1 = {
110+
&ptc_qtlib_acq_gen1,
111+
&ptc_seq_node_cfg1[0],
112+
&ptc_qtlib_node_stat1[0]};
110113

111114
/* Stores recent unfiltered scroller positions for custom filter */
112115
__extension__ static uint16_t scroller_previous_position[][DEF_SCROLLER_NUM_PREV_POS] = {
@@ -124,35 +127,38 @@ __extension__ static bool scroller_active[DEF_NUM_SCROLLERS] = {[0 ...(DEF_NUM_S
124127
/**********************************************************/
125128

126129
/* Keys set 1 - General settings */
127-
qtm_touch_key_group_config_t qtlib_key_grp_config_set1 = {DEF_NUM_SENSORS,
128-
DEF_TOUCH_DET_INT,
129-
DEF_MAX_ON_DURATION,
130-
DEF_ANTI_TCH_DET_INT,
131-
DEF_ANTI_TCH_RECAL_THRSHLD,
132-
DEF_TCH_DRIFT_RATE,
133-
DEF_ANTI_TCH_DRIFT_RATE,
134-
DEF_DRIFT_HOLD_TIME,
135-
DEF_REBURST_MODE};
130+
qtm_touch_key_group_config_t qtlib_key_grp_config_set1 = {
131+
DEF_NUM_SENSORS,
132+
DEF_TOUCH_DET_INT,
133+
DEF_MAX_ON_DURATION,
134+
DEF_ANTI_TCH_DET_INT,
135+
DEF_ANTI_TCH_RECAL_THRSHLD,
136+
DEF_TCH_DRIFT_RATE,
137+
DEF_ANTI_TCH_DRIFT_RATE,
138+
DEF_DRIFT_HOLD_TIME,
139+
DEF_REBURST_MODE};
136140

137141
qtm_touch_key_group_data_t qtlib_key_grp_data_set1;
138142

139143
/* Key data */
140144
qtm_touch_key_data_t qtlib_key_data_set1[DEF_NUM_SENSORS];
141145

142146
/* Key Configurations */
143-
qtm_touch_key_config_t qtlib_key_configs_set1[DEF_NUM_SENSORS] = {KEY_0_PARAMS,
144-
KEY_1_PARAMS,
145-
KEY_2_PARAMS,
146-
KEY_3_PARAMS,
147-
KEY_4_PARAMS,
148-
KEY_5_PARAMS,
149-
KEY_6_PARAMS,
150-
KEY_7_PARAMS};
147+
qtm_touch_key_config_t qtlib_key_configs_set1[DEF_NUM_SENSORS] = {
148+
KEY_0_PARAMS,
149+
KEY_1_PARAMS,
150+
KEY_2_PARAMS,
151+
KEY_3_PARAMS,
152+
KEY_4_PARAMS,
153+
KEY_5_PARAMS,
154+
KEY_6_PARAMS,
155+
KEY_7_PARAMS};
151156
/* Container */
152-
qtm_touch_key_control_t qtlib_key_set1 = {&qtlib_key_grp_data_set1,
153-
&qtlib_key_grp_config_set1,
154-
&qtlib_key_data_set1[0],
155-
&qtlib_key_configs_set1[0]};
157+
qtm_touch_key_control_t qtlib_key_set1 = {
158+
&qtlib_key_grp_data_set1,
159+
&qtlib_key_grp_config_set1,
160+
&qtlib_key_data_set1[0],
161+
&qtlib_key_configs_set1[0]};
156162

157163
/**********************************************************/
158164
/***************** Scroller Module ********************/
@@ -583,7 +589,7 @@ uint16_t qtouch_get_sensor_node_signal_filtered(uint16_t sensor_node)
583589
if ((sensor_node == DEF_SCROLLER_OFFSET_0) || (sensor_node == DEF_SCROLLER_OFFSET_1) ||
584590
(sensor_node == DEF_SCROLLER_OFFSET_0 + DEF_SCROLLER_NUM_CHANNELS - 1) ||
585591
(sensor_node == DEF_SCROLLER_OFFSET_1 + DEF_SCROLLER_NUM_CHANNELS - 1)) {
586-
X = X * (1 + DEF_SENSOR_EDGE_WEIGHT);
592+
X = (uint16_t)((double)X * (1 + DEF_SENSOR_EDGE_WEIGHT));
587593
}
588594
// Saturate out-of-range readings.
589595
X = (X > 50) ? 50 : X;

‎src/ui/graphics/lock_animation.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,12 @@ static void _animation_timer_cb(const struct timer_task* const timer_task)
166166

167167
/* Draw the frame. */
168168
UG_ClearBuffer();
169-
position_t pos = {.left = (SCREEN_WIDTH - LOCK_ANIMATION_FRAME_WIDTH) / 2,
170-
.top = (SCREEN_HEIGHT - LOCK_ANIMATION_FRAME_HEIGHT) / 2};
169+
position_t pos = {
170+
.left = (SCREEN_WIDTH - LOCK_ANIMATION_FRAME_WIDTH) / 2,
171+
.top = (SCREEN_HEIGHT - LOCK_ANIMATION_FRAME_HEIGHT) / 2};
171172
dimension_t dim = {.width = LOCK_ANIMATION_FRAME_WIDTH, .height = LOCK_ANIMATION_FRAME_HEIGHT};
172-
in_buffer_t image = {.data = _get_frame(_animation_current_frame),
173-
.len = LOCK_ANIMATION_FRAME_SIZE};
173+
in_buffer_t image = {
174+
.data = _get_frame(_animation_current_frame), .len = LOCK_ANIMATION_FRAME_SIZE};
174175
graphics_draw_image(&pos, &dim, &image);
175176
UG_SendBuffer();
176177
_animation_current_frame++;

0 commit comments

Comments
 (0)