Skip to content

Commit 611da31

Browse files
bors[bot]dependabot[bot]AfoHT
authored
Merge #84
84: Update rtt-target requirement from 0.2.2 to 0.3.1 in /rtic_v0.5/stm32f0_hid_mouse r=AfoHT a=dependabot[bot] Updates the requirements on [rtt-target](https://github.com/mvirkkunen/rtt-target) to permit the latest version. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/e1d3813f4ed3d0452f501a0da203865968a9a5f2"><code>e1d3813</code></a> Release 0.3.1</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/5fc2460bc73023f091ee9e941ddc1c726f0bbd9a"><code>5fc2460</code></a> Remove note about example features</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/d0259d5629a941b21b4569be74edbfda159f6054"><code>d0259d5</code></a> Formatting</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/af1dcd75be0d5a654632a8530c38c63df7751a10"><code>af1dcd7</code></a> Move examples to separate project</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/e41d104bbd87350b3df72955aeeed577f2fae6fa"><code>e41d104</code></a> Update cortex-m to 0.7.1</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/c505ed19d0602eedeaeab3948a52b5017d7136d1"><code>c505ed1</code></a> Release 0.3.0</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/7531280b42f74ab0953e3c4cc93ae9868721bf20"><code>7531280</code></a> Document RISC-V a bit more</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/970a498ca8f31f8f4714ac0de079976255436085"><code>970a498</code></a> Remove superfluous no_mangle</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/0d37eb84bb229d51e406492caf5960e07d4ca707"><code>0d37eb8</code></a> Merge branch 'Disasm-add-riscv' into master</li> <li><a href="https://github.com/mvirkkunen/rtt-target/commit/f61d420a32d5b882fb08251f68308ef70ca233c3"><code>f61d420</code></a> Add RISC-V support</li> <li>See full diff in <a href="https://github.com/mvirkkunen/rtt-target/compare/v0.2.2...v0.3.1">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting ``@dependabot` rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - ``@dependabot` rebase` will rebase this PR - ``@dependabot` recreate` will recreate this PR, overwriting any edits that have been made to it - ``@dependabot` merge` will merge this PR after your CI passes on it - ``@dependabot` squash and merge` will squash and merge this PR after your CI passes on it - ``@dependabot` cancel merge` will cancel a previously requested merge and block automerging - ``@dependabot` reopen` will reopen this PR if it is closed - ``@dependabot` close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - ``@dependabot` ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - ``@dependabot` ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
2 parents 781530c + 2126fc1 commit 611da31

File tree

19 files changed

+4529
-16
lines changed

19 files changed

+4529
-16
lines changed

rtic_v0.5/stm32f0_hid_mouse/Cargo.lock

Lines changed: 553 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rtic_v0.5/stm32f0_hid_mouse/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ branch = "main"
1111
[dependencies]
1212
embedded-hal = "0.2.4"
1313
usb-device = "0.2.5"
14-
usbd-hid = "0.4.4"
15-
rtt-target = { version = "0.2.2", features = ["cortex-m"] }
14+
usbd-hid = "0.6.1"
15+
rtt-target = { version = "0.3.1", features = ["cortex-m"] }
1616
panic-halt = "0.2.0"
1717
panic-rtt-target = { version = "0.1.1", features = ["cortex-m"] }
1818
cortex-m = "0.7.6"

rtic_v0.5/stm32f0_hid_mouse/src/main.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,31 +221,31 @@ const APP: () = {
221221
0x8000 => {
222222
rprintln!("PA15 triggered");
223223
ctx.resources.exti.pr.write(|w| w.pif15().set_bit()); // Clear interrupt
224-
send_mouse_report(Exclusive(hid), 0, 0, 1);
224+
send_mouse_report(Exclusive(hid), 0, 0, 1, 0, 0);
225225
usr_led.toggle().ok();
226226
}
227227
0x10 => {
228228
rprintln!("tb_left triggered!");
229229
ctx.resources.exti.pr.write(|w| w.pif4().set_bit());
230-
send_mouse_report(Exclusive(hid), 5, 0, 0);
230+
send_mouse_report(Exclusive(hid), 5, 0, 0, 0, 0);
231231
usr_led.toggle().ok();
232232
}
233233
0x20 => {
234234
rprintln!("tb_up triggered!");
235235
ctx.resources.exti.pr.write(|w| w.pif5().set_bit());
236-
send_mouse_report(Exclusive(hid), 0, 5, 0);
236+
send_mouse_report(Exclusive(hid), 0, 5, 0, 0, 0);
237237
usr_led.toggle().ok();
238238
}
239239
0x40 => {
240240
rprintln!("tb_right triggered!");
241241
ctx.resources.exti.pr.write(|w| w.pif6().set_bit());
242-
send_mouse_report(Exclusive(hid), -5, 0, 0);
242+
send_mouse_report(Exclusive(hid), -5, 0, 0, 0, 0);
243243
usr_led.toggle().ok();
244244
}
245245
0x80 => {
246246
rprintln!("tb_down triggered!");
247247
ctx.resources.exti.pr.write(|w| w.pif7().set_bit());
248-
send_mouse_report(Exclusive(hid), 0, -5, 0);
248+
send_mouse_report(Exclusive(hid), 0, -5, 0, 0, 0);
249249
usr_led.toggle().ok();
250250
}
251251

@@ -270,8 +270,16 @@ fn send_mouse_report(
270270
x: i8,
271271
y: i8,
272272
buttons: u8,
273+
wheel: i8,
274+
pan: i8,
273275
) {
274-
let mr = MouseReport { x, y, buttons };
276+
let mr = MouseReport {
277+
x,
278+
y,
279+
buttons,
280+
wheel,
281+
pan,
282+
};
275283

276284
shared_hid.lock(|hid| {
277285
rprintln!("Sending mouse report...");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
/target
22
**/*.rs.bk
3-
Cargo.lock
3+

0 commit comments

Comments
 (0)