Skip to content

Commit 88e8c28

Browse files
authored
Merge pull request #16 from Amperstrand/copilot/fix-formatting-errors
Resolve rustfmt/changelog CI failures in STM32F469 Disco display-touch updates
2 parents bfb6d9c + 439287d commit 88e8c28

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [Unreleased]
99

10+
- Improve STM32F469 Disco display/touch examples and expose the `dma` module.
11+
1012
## [v0.23.0] - 2025-09-22
1113

1214
- Implement `embedded_hal::i2c::I2c` for `I2cMasterDma` [#838]

examples/f469disco-lcd-test.rs

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -290,19 +290,21 @@ fn main() -> ! {
290290
break;
291291
}
292292
Err(_) => {
293-
if increment_error_throttle(&mut touch_error_throttle) % TOUCH_ERROR_LOG_THROTTLE == 0 {
294-
defmt::warn!(
295-
"detect_touch read error (attempt {})",
296-
attempt + 1
297-
);
293+
if increment_error_throttle(&mut touch_error_throttle)
294+
% TOUCH_ERROR_LOG_THROTTLE
295+
== 0
296+
{
297+
defmt::warn!("detect_touch read error (attempt {})", attempt + 1);
298298
}
299299
delay.delay_us(500u32);
300300
}
301301
}
302302
}
303303

304304
let Some(num) = detected_touches else {
305-
if increment_error_throttle(&mut touch_error_throttle) % TOUCH_ERROR_LOG_THROTTLE == 0 {
305+
if increment_error_throttle(&mut touch_error_throttle) % TOUCH_ERROR_LOG_THROTTLE
306+
== 0
307+
{
306308
defmt::warn!(
307309
"detect_touch timed out after {} attempts",
308310
TOUCH_MAX_RETRIES
@@ -329,11 +331,11 @@ fn main() -> ! {
329331
break;
330332
}
331333
Err(_) => {
332-
if increment_error_throttle(&mut touch_error_throttle) % TOUCH_ERROR_LOG_THROTTLE == 0 {
333-
defmt::warn!(
334-
"get_touch read error (attempt {})",
335-
attempt + 1
336-
);
334+
if increment_error_throttle(&mut touch_error_throttle)
335+
% TOUCH_ERROR_LOG_THROTTLE
336+
== 0
337+
{
338+
defmt::warn!("get_touch read error (attempt {})", attempt + 1);
337339
}
338340
delay.delay_us(500u32);
339341
}
@@ -356,7 +358,10 @@ fn main() -> ! {
356358
}
357359
}
358360
None => {
359-
if increment_error_throttle(&mut touch_error_throttle) % TOUCH_ERROR_LOG_THROTTLE == 0 {
361+
if increment_error_throttle(&mut touch_error_throttle)
362+
% TOUCH_ERROR_LOG_THROTTLE
363+
== 0
364+
{
360365
defmt::warn!(
361366
"get_touch timed out after {} attempts",
362367
TOUCH_MAX_RETRIES

examples/f469disco/nt35510.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ impl Nt35510 {
6565
defmt::warn!("NT35510 already initialized, skipping re-initialization");
6666
return Ok(());
6767
}
68-
68+
6969
self.write_reg(dsi_host, 0xF0, &[0x55, 0xAA, 0x52, 0x08, 0x01])?;
7070
self.write_reg(dsi_host, 0xB0, &[0x03, 0x03, 0x03])?;
7171
self.write_reg(dsi_host, 0xB6, &[0x46, 0x46, 0x46])?;

0 commit comments

Comments
 (0)