Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding ADC support for stm323f303xc #2000

Merged
merged 21 commits into from
Jul 17, 2020
Merged

Adding ADC support for stm323f303xc #2000

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1060266
enabled ADC
cosmindanielradu19 Jul 2, 2020
b413612
ADC turned on and tested with temperature sensor
cosmindanielradu19 Jul 4, 2020
6742457
semicolon fixed
cosmindanielradu19 Jul 4, 2020
2a5d5ae
set pins to analog
cosmindanielradu19 Jul 4, 2020
e5f6995
adc single sample working
cosmindanielradu19 Jul 4, 2020
706a796
updated makefile
cosmindanielradu19 Jul 4, 2020
38a8104
fixed mutable ref
cosmindanielradu19 Jul 4, 2020
df790ff
adc pins set to analog mode
cosmindanielradu19 Jul 4, 2020
8152dc6
updated to original version
cosmindanielradu19 Jul 6, 2020
8359a2a
removed .vscode
cosmindanielradu19 Jul 6, 2020
26a7a35
updated to only 5 channles of ADC
cosmindanielradu19 Jul 6, 2020
1c2c070
updated wait time for ADVREGEN
cosmindanielradu19 Jul 6, 2020
7bfaa92
fixed coding style
cosmindanielradu19 Jul 6, 2020
2921e2d
fixed analog mode for 1..5 channels for ADC pins
cosmindanielradu19 Jul 7, 2020
8e351b5
coding style fix
cosmindanielradu19 Jul 7, 2020
88c3ce6
added sample_continuous moude ADC
cosmindanielradu19 Jul 8, 2020
e3c3349
continuous sample problems
cosmindanielradu19 Jul 10, 2020
29d3439
enabling adc when sample requested
cosmindanielradu19 Jul 13, 2020
81836c5
returning ENOPSUPPORT on sample_continuous function
cosmindanielradu19 Jul 13, 2020
a2520b7
removed debug code
cosmindanielradu19 Jul 16, 2020
ff5f131
removed commented code lines
cosmindanielradu19 Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
266 changes: 191 additions & 75 deletions boards/stm32f3discovery/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ struct STM32F3Discovery {
'static,
VirtualMuxAlarm<'static, stm32f303xc::tim2::Tim2<'static>>,
>,
adc: &'static capsules::adc::Adc<'static, stm32f303xc::adc::Adc>,
}

/// Mapping of integer syscalls to objects that implement syscalls.
Expand All @@ -85,6 +86,7 @@ impl Platform for STM32F3Discovery {
capsules::ninedof::DRIVER_NUM => f(Some(self.ninedof)),
capsules::temperature::DRIVER_NUM => f(Some(self.temp)),
kernel::ipc::DRIVER_NUM => f(Some(&self.ipc)),
capsules::adc::DRIVER_NUM => f(Some(self.adc)),
_ => f(None),
}
}
Expand Down Expand Up @@ -186,6 +188,82 @@ unsafe fn set_pin_primary_functions() {
pin.set_alternate_function(AlternateFunction::AF4);
});

// ADC1
PinId::PA00.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PA01.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PA02.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PA03.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});
cosmindanielradu19 marked this conversation as resolved.
Show resolved Hide resolved

PinId::PF04.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

// ADC2
PinId::PA04.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PA05.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PA06.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PA07.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

// ADC3
PinId::PB01.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PE09.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PE13.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PB13.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

// ADC4
PinId::PE14.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PE15.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PB12.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PB14.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

PinId::PB15.get_pin().as_ref().map(|pin| {
pin.set_mode(stm32f303xc::gpio::Mode::AnalogMode);
});

stm32f303xc::i2c::I2C1.enable_clock();
stm32f303xc::i2c::I2C1.set_speed(stm32f303xc::i2c::I2CSpeed::Speed400k, 8);
}
Expand Down Expand Up @@ -358,88 +436,94 @@ pub unsafe fn reset_handler() {
// Left outer connector
0 => stm32f303xc::gpio::PinId::PC01.get_pin().as_ref().unwrap(),
1 => stm32f303xc::gpio::PinId::PC03.get_pin().as_ref().unwrap(),
2 => stm32f303xc::gpio::PinId::PA01.get_pin().as_ref().unwrap(),
3 => stm32f303xc::gpio::PinId::PA03.get_pin().as_ref().unwrap(),
4 => stm32f303xc::gpio::PinId::PF04.get_pin().as_ref().unwrap(),
// 2 => stm32f303xc::gpio::PinId::PA01.get_pin().as_ref().unwrap(),
// 3 => stm32f303xc::gpio::PinId::PA03.get_pin().as_ref().unwrap(),
// 4 => stm32f303xc::gpio::PinId::PF04.get_pin().as_ref().unwrap(),
// 5 => stm32f303xc::gpio::PinId::PA05.get_pin().as_ref().unwrap(),
// 6 => stm32f303xc::gpio::PinId::PA07.get_pin().as_ref().unwrap(),
7 => stm32f303xc::gpio::PinId::PC05.get_pin().as_ref().unwrap(),
8 => stm32f303xc::gpio::PinId::PB01.get_pin().as_ref().unwrap(),
// 7 => stm32f303xc::gpio::PinId::PC05.get_pin().as_ref().unwrap(),
// 8 => stm32f303xc::gpio::PinId::PB01.get_pin().as_ref().unwrap(),
9 => stm32f303xc::gpio::PinId::PE07.get_pin().as_ref().unwrap(),
10 => stm32f303xc::gpio::PinId::PE09.get_pin().as_ref().unwrap(),
// 10 => stm32f303xc::gpio::PinId::PE09.get_pin().as_ref().unwrap(),
11 => stm32f303xc::gpio::PinId::PE11.get_pin().as_ref().unwrap(),
12 => stm32f303xc::gpio::PinId::PE13.get_pin().as_ref().unwrap(),
13 => stm32f303xc::gpio::PinId::PB11.get_pin().as_ref().unwrap(),
14 => stm32f303xc::gpio::PinId::PB13.get_pin().as_ref().unwrap(),
15 => stm32f303xc::gpio::PinId::PB15.get_pin().as_ref().unwrap(),
16 => stm32f303xc::gpio::PinId::PD09.get_pin().as_ref().unwrap(),
17 => stm32f303xc::gpio::PinId::PD11.get_pin().as_ref().unwrap(),
18 => stm32f303xc::gpio::PinId::PD13.get_pin().as_ref().unwrap(),
19 => stm32f303xc::gpio::PinId::PD15.get_pin().as_ref().unwrap(),
20 => stm32f303xc::gpio::PinId::PC06.get_pin().as_ref().unwrap(),
// 12 => stm32f303xc::gpio::PinId::PE13.get_pin().as_ref().unwrap(),
// 13 => stm32f303xc::gpio::PinId::PE15.get_pin().as_ref().unwrap(),
14 => stm32f303xc::gpio::PinId::PB11.get_pin().as_ref().unwrap(),
// 15 => stm32f303xc::gpio::PinId::PB13.get_pin().as_ref().unwrap(),
// 16 => stm32f303xc::gpio::PinId::PB15.get_pin().as_ref().unwrap(),
17 => stm32f303xc::gpio::PinId::PD09.get_pin().as_ref().unwrap(),
18 => stm32f303xc::gpio::PinId::PD11.get_pin().as_ref().unwrap(),
19 => stm32f303xc::gpio::PinId::PD13.get_pin().as_ref().unwrap(),
20 => stm32f303xc::gpio::PinId::PD15.get_pin().as_ref().unwrap(),
21 => stm32f303xc::gpio::PinId::PC06.get_pin().as_ref().unwrap(),
// Left inner connector
21 => stm32f303xc::gpio::PinId::PC00.get_pin().as_ref().unwrap(),
22 => stm32f303xc::gpio::PinId::PC02.get_pin().as_ref().unwrap(),
23 => stm32f303xc::gpio::PinId::PF02.get_pin().as_ref().unwrap(),
// 24 => stm32f303xc::gpio::PinId::PA00.get_pin().as_ref().unwrap(),
25 => stm32f303xc::gpio::PinId::PA02.get_pin().as_ref().unwrap(),
26 => stm32f303xc::gpio::PinId::PA04.get_pin().as_ref().unwrap(),
// 27 => stm32f303xc::gpio::PinId::PA06.get_pin().as_ref().unwrap(),
28 => stm32f303xc::gpio::PinId::PC04.get_pin().as_ref().unwrap(),
29 => stm32f303xc::gpio::PinId::PB00.get_pin().as_ref().unwrap(),
30 => stm32f303xc::gpio::PinId::PB02.get_pin().as_ref().unwrap(),
31 => stm32f303xc::gpio::PinId::PE08.get_pin().as_ref().unwrap(),
32 => stm32f303xc::gpio::PinId::PE10.get_pin().as_ref().unwrap(),
33 => stm32f303xc::gpio::PinId::PE12.get_pin().as_ref().unwrap(),
34 => stm32f303xc::gpio::PinId::PE14.get_pin().as_ref().unwrap(),
35 => stm32f303xc::gpio::PinId::PB10.get_pin().as_ref().unwrap(),
36 => stm32f303xc::gpio::PinId::PB12.get_pin().as_ref().unwrap(),
37 => stm32f303xc::gpio::PinId::PB14.get_pin().as_ref().unwrap(),
38 => stm32f303xc::gpio::PinId::PD08.get_pin().as_ref().unwrap(),
39 => stm32f303xc::gpio::PinId::PD10.get_pin().as_ref().unwrap(),
40 => stm32f303xc::gpio::PinId::PD14.get_pin().as_ref().unwrap(),
41 => stm32f303xc::gpio::PinId::PC07.get_pin().as_ref().unwrap(),
22 => stm32f303xc::gpio::PinId::PC00.get_pin().as_ref().unwrap(),
23 => stm32f303xc::gpio::PinId::PC02.get_pin().as_ref().unwrap(),
24 => stm32f303xc::gpio::PinId::PF02.get_pin().as_ref().unwrap(),
// 25 => stm32f303xc::gpio::PinId::PA00.get_pin().as_ref().unwrap(),
// 26 => stm32f303xc::gpio::PinId::PA02.get_pin().as_ref().unwrap(),
// 27 => stm32f303xc::gpio::PinId::PA04.get_pin().as_ref().unwrap(),
// 28 => stm32f303xc::gpio::PinId::PA06.get_pin().as_ref().unwrap(),
// 29 => stm32f303xc::gpio::PinId::PC04.get_pin().as_ref().unwrap(),
30 => stm32f303xc::gpio::PinId::PB00.get_pin().as_ref().unwrap(),
31 => stm32f303xc::gpio::PinId::PB02.get_pin().as_ref().unwrap(),
32 => stm32f303xc::gpio::PinId::PE08.get_pin().as_ref().unwrap(),
33 => stm32f303xc::gpio::PinId::PE10.get_pin().as_ref().unwrap(),
34 => stm32f303xc::gpio::PinId::PE12.get_pin().as_ref().unwrap(),
// 35 => stm32f303xc::gpio::PinId::PE14.get_pin().as_ref().unwrap(),
36 => stm32f303xc::gpio::PinId::PB10.get_pin().as_ref().unwrap(),
// 37 => stm32f303xc::gpio::PinId::PB12.get_pin().as_ref().unwrap(),
// 38 => stm32f303xc::gpio::PinId::PB14.get_pin().as_ref().unwrap(),
39 => stm32f303xc::gpio::PinId::PD08.get_pin().as_ref().unwrap(),
40 => stm32f303xc::gpio::PinId::PD10.get_pin().as_ref().unwrap(),
41 => stm32f303xc::gpio::PinId::PD12.get_pin().as_ref().unwrap(),
42 => stm32f303xc::gpio::PinId::PD14.get_pin().as_ref().unwrap(),
43 => stm32f303xc::gpio::PinId::PC07.get_pin().as_ref().unwrap(),
// Right inner connector
42 => stm32f303xc::gpio::PinId::PF09.get_pin().as_ref().unwrap(),
43 => stm32f303xc::gpio::PinId::PF00.get_pin().as_ref().unwrap(),
44 => stm32f303xc::gpio::PinId::PC14.get_pin().as_ref().unwrap(),
45 => stm32f303xc::gpio::PinId::PE06.get_pin().as_ref().unwrap(),
46 => stm32f303xc::gpio::PinId::PE04.get_pin().as_ref().unwrap(),
47 => stm32f303xc::gpio::PinId::PE02.get_pin().as_ref().unwrap(),
48 => stm32f303xc::gpio::PinId::PB08.get_pin().as_ref().unwrap(),
// 49 => stm32f303xc::gpio::PinId::PB06.get_pin().as_ref().unwrap(),
50 => stm32f303xc::gpio::PinId::PB04.get_pin().as_ref().unwrap(),
51 => stm32f303xc::gpio::PinId::PD07.get_pin().as_ref().unwrap(),
52 => stm32f303xc::gpio::PinId::PD05.get_pin().as_ref().unwrap(),
53 => stm32f303xc::gpio::PinId::PD03.get_pin().as_ref().unwrap(),
54 => stm32f303xc::gpio::PinId::PC12.get_pin().as_ref().unwrap(),
55 => stm32f303xc::gpio::PinId::PC10.get_pin().as_ref().unwrap(),
56 => stm32f303xc::gpio::PinId::PA14.get_pin().as_ref().unwrap(),
57 => stm32f303xc::gpio::PinId::PF06.get_pin().as_ref().unwrap(),
58 => stm32f303xc::gpio::PinId::PA12.get_pin().as_ref().unwrap(),
59 => stm32f303xc::gpio::PinId::PA10.get_pin().as_ref().unwrap(),
60 => stm32f303xc::gpio::PinId::PA08.get_pin().as_ref().unwrap(),
61 => stm32f303xc::gpio::PinId::PC08.get_pin().as_ref().unwrap(),
44 => stm32f303xc::gpio::PinId::PF09.get_pin().as_ref().unwrap(),
45 => stm32f303xc::gpio::PinId::PF00.get_pin().as_ref().unwrap(),
46 => stm32f303xc::gpio::PinId::PC14.get_pin().as_ref().unwrap(),
47 => stm32f303xc::gpio::PinId::PE06.get_pin().as_ref().unwrap(),
48 => stm32f303xc::gpio::PinId::PE04.get_pin().as_ref().unwrap(),
49 => stm32f303xc::gpio::PinId::PE02.get_pin().as_ref().unwrap(),
50 => stm32f303xc::gpio::PinId::PE00.get_pin().as_ref().unwrap(),
51 => stm32f303xc::gpio::PinId::PB08.get_pin().as_ref().unwrap(),
// 52 => stm32f303xc::gpio::PinId::PB06.get_pin().as_ref().unwrap(),
53 => stm32f303xc::gpio::PinId::PB04.get_pin().as_ref().unwrap(),
54 => stm32f303xc::gpio::PinId::PD07.get_pin().as_ref().unwrap(),
55 => stm32f303xc::gpio::PinId::PD05.get_pin().as_ref().unwrap(),
56 => stm32f303xc::gpio::PinId::PD03.get_pin().as_ref().unwrap(),
57 => stm32f303xc::gpio::PinId::PD01.get_pin().as_ref().unwrap(),
58 => stm32f303xc::gpio::PinId::PC12.get_pin().as_ref().unwrap(),
59 => stm32f303xc::gpio::PinId::PC10.get_pin().as_ref().unwrap(),
60 => stm32f303xc::gpio::PinId::PA14.get_pin().as_ref().unwrap(),
61 => stm32f303xc::gpio::PinId::PF06.get_pin().as_ref().unwrap(),
62 => stm32f303xc::gpio::PinId::PA12.get_pin().as_ref().unwrap(),
63 => stm32f303xc::gpio::PinId::PA10.get_pin().as_ref().unwrap(),
64 => stm32f303xc::gpio::PinId::PA08.get_pin().as_ref().unwrap(),
65 => stm32f303xc::gpio::PinId::PC08.get_pin().as_ref().unwrap(),
// Right outer connector
62 => stm32f303xc::gpio::PinId::PF10.get_pin().as_ref().unwrap(),
63 => stm32f303xc::gpio::PinId::PF01.get_pin().as_ref().unwrap(),
64 => stm32f303xc::gpio::PinId::PC15.get_pin().as_ref().unwrap(),
65 => stm32f303xc::gpio::PinId::PC13.get_pin().as_ref().unwrap(),
66 => stm32f303xc::gpio::PinId::PE05.get_pin().as_ref().unwrap(),
67 => stm32f303xc::gpio::PinId::PE03.get_pin().as_ref().unwrap(),
68 => stm32f303xc::gpio::PinId::PB09.get_pin().as_ref().unwrap(),
// 69 => stm32f303xc::gpio::PinId::PB07.get_pin().as_ref().unwrap(),
70 => stm32f303xc::gpio::PinId::PB05.get_pin().as_ref().unwrap(),
71 => stm32f303xc::gpio::PinId::PB03.get_pin().as_ref().unwrap(),
72 => stm32f303xc::gpio::PinId::PD06.get_pin().as_ref().unwrap(),
73 => stm32f303xc::gpio::PinId::PD04.get_pin().as_ref().unwrap(),
74 => stm32f303xc::gpio::PinId::PD02.get_pin().as_ref().unwrap(),
75 => stm32f303xc::gpio::PinId::PC11.get_pin().as_ref().unwrap(),
76 => stm32f303xc::gpio::PinId::PA15.get_pin().as_ref().unwrap(),
77 => stm32f303xc::gpio::PinId::PA13.get_pin().as_ref().unwrap(),
78 => stm32f303xc::gpio::PinId::PA11.get_pin().as_ref().unwrap(),
79 => stm32f303xc::gpio::PinId::PA09.get_pin().as_ref().unwrap(),
80 => stm32f303xc::gpio::PinId::PC09.get_pin().as_ref().unwrap()
66 => stm32f303xc::gpio::PinId::PF10.get_pin().as_ref().unwrap(),
67 => stm32f303xc::gpio::PinId::PF01.get_pin().as_ref().unwrap(),
68 => stm32f303xc::gpio::PinId::PC15.get_pin().as_ref().unwrap(),
69 => stm32f303xc::gpio::PinId::PC13.get_pin().as_ref().unwrap(),
70 => stm32f303xc::gpio::PinId::PE05.get_pin().as_ref().unwrap(),
71 => stm32f303xc::gpio::PinId::PE03.get_pin().as_ref().unwrap(),
72 => stm32f303xc::gpio::PinId::PE01.get_pin().as_ref().unwrap(),
73 => stm32f303xc::gpio::PinId::PB09.get_pin().as_ref().unwrap(),
// 74 => stm32f303xc::gpio::PinId::PB07.get_pin().as_ref().unwrap(),
75 => stm32f303xc::gpio::PinId::PB05.get_pin().as_ref().unwrap(),
76 => stm32f303xc::gpio::PinId::PB03.get_pin().as_ref().unwrap(),
77 => stm32f303xc::gpio::PinId::PD06.get_pin().as_ref().unwrap(),
78 => stm32f303xc::gpio::PinId::PD04.get_pin().as_ref().unwrap(),
79 => stm32f303xc::gpio::PinId::PD02.get_pin().as_ref().unwrap(),
80 => stm32f303xc::gpio::PinId::PD00.get_pin().as_ref().unwrap(),
81 => stm32f303xc::gpio::PinId::PC11.get_pin().as_ref().unwrap(),
82 => stm32f303xc::gpio::PinId::PA15.get_pin().as_ref().unwrap(),
83 => stm32f303xc::gpio::PinId::PA13.get_pin().as_ref().unwrap(),
84 => stm32f303xc::gpio::PinId::PA11.get_pin().as_ref().unwrap(),
85 => stm32f303xc::gpio::PinId::PA09.get_pin().as_ref().unwrap(),
86 => stm32f303xc::gpio::PinId::PC09.get_pin().as_ref().unwrap()
),
)
.finalize(components::gpio_component_buf!(
Expand Down Expand Up @@ -497,6 +581,37 @@ pub unsafe fn reset_handler() {
let ninedof = components::ninedof::NineDofComponent::new(board_kernel)
.finalize(components::ninedof_component_helper!(l3gd20, lsm303dlhc));

let adc_channels = static_init!(
[&'static stm32f303xc::adc::Channel; 6],
[
// Reserved and not used
&stm32f303xc::adc::Channel::Channel0,
// PA0 ADC1, PA4 ADC2, PB1 ADC3, PE14 ADC4
&stm32f303xc::adc::Channel::Channel1,
// PA1 ADC1, PA5 ADC2, PE9 ADC3, PE15 ADC4
&stm32f303xc::adc::Channel::Channel2,
// PA2 ADC1, PA6 ADC2, PE13 ADC3, PB12 ADC4
&stm32f303xc::adc::Channel::Channel3,
// PA3 ADC1, PA7 ADC2, PB14 ADC4
&stm32f303xc::adc::Channel::Channel4,
// PF3 ADC1, PC4 ADC2, PB13 ADC3, PB15 ADC4
&stm32f303xc::adc::Channel::Channel5,
]
);
let grant_adc = board_kernel.create_grant(&grant_cap);
let adc = static_init!(
capsules::adc::Adc<'static, stm32f303xc::adc::Adc>,
capsules::adc::Adc::new(
&stm32f303xc::adc::ADC1,
grant_adc,
adc_channels,
&mut capsules::adc::ADC_BUFFER1,
&mut capsules::adc::ADC_BUFFER2,
&mut capsules::adc::ADC_BUFFER3
)
);
stm32f303xc::adc::ADC1.set_client(adc);

let stm32f3discovery = STM32F3Discovery {
console: console,
ipc: kernel::ipc::IPC::new(board_kernel, &memory_allocation_capability),
Expand All @@ -508,6 +623,7 @@ pub unsafe fn reset_handler() {
lsm303dlhc: lsm303dlhc,
ninedof: ninedof,
temp: temp,
adc: adc,
};

// // Optional kernel tests
Expand Down