FWT-45 adding Multiple Actually Dangerous Commits (Multi ADC Support) #108

tmb5932 · 2024-09-28T16:57:11Z

Super cool really cool working multi adc for F4xx. Also made F4xx single adc work properly, as apparently it was broken before 👎

…e adc to use. Made it an enum, so depending on if you are using f4xx or f3xx you can have different options.

…32_t that contains the channel as well as the ADC peripherals it supports (1, 2, and/or 3). Added hard fault if the channel does not support the peripheral

mjh9585

I don't see anything obvious that is causing your issue, but maybe using a struct for each ADC will better distinguish between the ADCs and fix your issue in the process.

include/core/io/platform/f3xx/ADCf3xx.hpp

samples/adc/single_adc.cpp

src/core/io/ADC.cpp

src/core/io/platform/f4xx/ADCf4xx.cpp

include/core/io/platform/f4xx/ADCf4xx.hpp

…ank var and 1 buffer

…its one 1 channel per adc

… ADC

…eature/tmb5932/MultiADC # Conflicts: # include/core/io/platform/f4xx/ADCf4xx.hpp # src/core/io/platform/f4xx/ADCf4xx.cpp

…eature/tmb5932/MultiADC # Conflicts: # src/core/io/platform/f4xx/ADCf4xx.cpp

…re/tmb5932/MultiADC

…eature/tmb5932/MultiADC

Ethan-Caracoglia

All changes make sense and look good

include/core/io/platform/f4xx/ADCf4xx.hpp

include/core/io/pin.hpp

tmb5932 · 2024-11-15T01:33:40Z

Just tested f4 and f3 adc single and multi (tested with diff combos all the way up to all 3 adc periphs with 3 channels on each), and everything works. Helldog saw it 👨‍🍳

mjmagee991

2 little details

src/core/io/platform/f4xx/ADCf4xx.cpp

samples/adc/multi_adc.cpp

… enabled

mjh9585

Looks pretty good, just a few little things.

include/core/io/ADC.hpp

include/core/io/pin.hpp

samples/adc/multi_adc.cpp

samples/adc/single_adc.cpp

src/core/io/platform/f3xx/ADCf3xx.cpp

src/core/io/platform/f4xx/ADCf4xx.cpp

Co-authored-by: Matthew Heller <[email protected]>

… enabled

tmb5932 added 5 commits September 21, 2024 11:08

Added new variable "adcPeriph" to adc class, so you can now choose th…

f7028f6

…e adc to use. Made it an enum, so depending on if you are using f4xx or f3xx you can have different options.

Added new method along with define statements to create a single uint…

ff87ea2

…32_t that contains the channel as well as the ADC peripherals it supports (1, 2, and/or 3). Added hard fault if the channel does not support the peripheral

Updated ADC f4 to support multiple ADC's simultaneously (In theory)

0cd6678

Fixed where default value was assigned

206a267

fixed misplaced comments

ee190f8

tmb5932 requested a review from mjh9585 September 28, 2024 16:57

tmb5932 changed the title ~~FWT-45 Support for Multiple Actually Dumb Commits (Multi ADC)~~ FWT-45 adding Multiple Actually Dangerous Commits (Multi ADC Support) Sep 28, 2024

tmb5932 and others added 5 commits September 28, 2024 13:02

Altered adc f3 JUST enough so it will compile. Will come back to it.

7cbba52

Altered adc f3 JUST enough so it will compile. Will come back to it.

05e67ae

Applied Formatting Changes During GitHub Build

9f9fb81

Single ADC works for all 3. Multi not so much

65e9968

Clang formatting

621ad09

mjh9585 requested changes Sep 30, 2024

View reviewed changes

tmb5932 and others added 17 commits October 2, 2024 22:59

Made it initializer list

e574c37

Created struct to store each adc state information

e4971e3

swapped over to using the struct. Still has old code, just commented out

2771124

added dummy pin so that the pin array isnt initialized to all PA_0.

72a569d

Testing alterations to multiadc sample. will be reverted when im done

80fd520

added default values to the typedef struct. also am testing using 1 r…

ebcb3ce

…ank var and 1 buffer

Trying to make it work...

97d8d79

Single adc works with single channel... Multi adc works, BUT only if …

bde81b0

…its one 1 channel per adc

MULTI & SINGLE WORK WITH 1 CHANNEL PER ADC

c08692b

so it will build on github

c9b4dbf

Applied Formatting Changes During GitHub Build

ff878a1

CubeIDE certified code... Doesnt work. but progress towards DMA Multi…

3e1ec95

… ADC

Merge remote-tracking branch 'origin/feature/tmb5932/MultiADC' into f…

e73ce50

…eature/tmb5932/MultiADC # Conflicts: # include/core/io/platform/f4xx/ADCf4xx.hpp # src/core/io/platform/f4xx/ADCf4xx.cpp

Applied Formatting Changes During GitHub Build

047f971

SINGLE ADC WORKS!!!

63025d9

Merge remote-tracking branch 'origin/feature/tmb5932/MultiADC' into f…

8a73d05

…eature/tmb5932/MultiADC # Conflicts: # src/core/io/platform/f4xx/ADCf4xx.cpp

Applied Formatting Changes During GitHub Build

08502cb

tmb5932 and others added 13 commits November 9, 2024 20:00

removed inline from check support

7da0661

removed "_t" from ADC_State

7a734f3

updated comments in adcf4xx.hpp

cbb5205

no more inline, and added bit packed struct

0a31112

clang formatting

ddbc380

removed extra stuff

6678459

updated comment placement & added log message to f3

906bd4e

changed switch to 1 liner, and typecasting channel to uint8_t

4131d5c

Merge branch 'main' of https://github.com/RIT-EVT/EVT-core into featu…

4f52d2f

…re/tmb5932/MultiADC

Applied Formatting Changes During GitHub Build

838e7f3

changed switch to 1 liner, and typecasting channel to uint8_t

91c6aba

Merge remote-tracking branch 'origin/feature/tmb5932/MultiADC' into f…

7c1ff1b

…eature/tmb5932/MultiADC

Applied Formatting Changes During GitHub Build

c1cc5a1

tmb5932 requested a review from mjmagee991 November 12, 2024 01:29

Ethan-Caracoglia approved these changes Nov 13, 2024

View reviewed changes

include/core/io/platform/f4xx/ADCf4xx.hpp Outdated Show resolved Hide resolved

include/core/io/pin.hpp Show resolved Hide resolved

tmb5932 added 3 commits November 14, 2024 20:16

The giga tester commit. 3 ADC periphs with 3 channels on each

5e6e6f1

added ADCf4xx:: for all static variables

97206e7

reset sample to normal

ee7fd23

mjmagee991 approved these changes Nov 16, 2024

View reviewed changes

src/core/io/platform/f4xx/ADCf4xx.cpp Show resolved Hide resolved

samples/adc/multi_adc.cpp Outdated Show resolved Hide resolved

changed 1 logger message back to uart so people see it if logger isnt…

9bb85d5

… enabled

mjh9585 approved these changes Nov 23, 2024

View reviewed changes

tmb5932 and others added 6 commits December 2, 2024 21:14

Update ADC.hpp

4ab700e

Co-authored-by: Matthew Heller <[email protected]>

changed 1 logger message back to uart so people see it if logger isnt…

de2574f

… enabled

moved irq handler anon namespace inside the core::io namespace

5487bd0

moved irq handler anon namespace inside the core::io namespace

d40ab00

Applied Formatting Changes During GitHub Build

32e5c7c

need to merge please github auto formatter.

203571a

tmb5932 merged commit 8429056 into main Dec 6, 2024
1 check passed

tmb5932 deleted the feature/tmb5932/MultiADC branch December 6, 2024 01:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FWT-45 adding Multiple Actually Dangerous Commits (Multi ADC Support) #108

FWT-45 adding Multiple Actually Dangerous Commits (Multi ADC Support) #108

tmb5932 commented Sep 28, 2024 •

edited

Loading

mjh9585 left a comment

Ethan-Caracoglia left a comment

tmb5932 commented Nov 15, 2024

mjmagee991 left a comment

mjh9585 left a comment

FWT-45 adding Multiple Actually Dangerous Commits (Multi ADC Support) #108

FWT-45 adding Multiple Actually Dangerous Commits (Multi ADC Support) #108

Conversation

tmb5932 commented Sep 28, 2024 • edited Loading

mjh9585 left a comment

Choose a reason for hiding this comment

Ethan-Caracoglia left a comment

Choose a reason for hiding this comment

tmb5932 commented Nov 15, 2024

mjmagee991 left a comment

Choose a reason for hiding this comment

mjh9585 left a comment

Choose a reason for hiding this comment

tmb5932 commented Sep 28, 2024 •

edited

Loading