Skip to content

Fix for #121 - missing Sensor::init() calls and NRF52 support by Polyphe #127

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

Merged
merged 7 commits into from
Oct 31, 2021
Merged

Fix for #121 - missing Sensor::init() calls and NRF52 support by Polyphe #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7902e62
make AREF pin optional in SAMD current sensing
runger1101001 Oct 12, 2021
c99dd26
Merge branch 'dev' of https://github.com/simplefoc/Arduino-FOC.git in…
runger1101001 Oct 12, 2021
063d1d5
Update generic_mcu.cpp
Polyphe Oct 30, 2021
8e77508
Add files via upload
Polyphe Oct 30, 2021
748ff92
fix #121 - add calls to Sensor::init()
runger1101001 Oct 30, 2021
236b955
Merge branch 'master' of https://github.com/Polyphe/Arduino-FOC into …
runger1101001 Oct 30, 2021
28fb9de
Merge branch 'Polyphe-master' into dev
runger1101001 Oct 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/current_sense/hardware_specific/samd21_mcu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ float SAMDCurrentSenseADCDMA::toVolts(uint16_t counts) {

void SAMDCurrentSenseADCDMA::initPins(){

pinMode(pinAREF, INPUT);
if (pinAREF>=0)
pinMode(pinAREF, INPUT);
pinMode(pinA, INPUT);
pinMode(pinB, INPUT);

Expand Down Expand Up @@ -169,8 +170,10 @@ void SAMDCurrentSenseADCDMA::initADC(){
//ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC0_Val; // 2.2297 V Supply VDDANA
ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_1X_Val; // Gain select as 1X
// ADC->INPUTCTRL.bit.GAIN = ADC_INPUTCTRL_GAIN_DIV2_Val; // default
ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA;
// ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC0;
if (pinAREF>=0)
ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_AREFA;
else
ADC->REFCTRL.bit.REFSEL = ADC_REFCTRL_REFSEL_INTVCC0;
ADCsync(); // ref 31.6.16

/*
Expand Down
6 changes: 4 additions & 2 deletions src/current_sense/hardware_specific/samd21_mcu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef CURRENT_SENSE_SAMD21_H
#define CURRENT_SENSE_SAMD21_H

// #define SIMPLEFOC_SAMD_DEBUG
#define SIMPLEFOC_SAMD_DEBUG
#if !defined(SIMPLEFOC_SAMD_DEBUG_SERIAL)
#define SIMPLEFOC_SAMD_DEBUG_SERIAL Serial
#endif
Expand All @@ -18,6 +18,8 @@
} dmacdescriptor ;


// AREF pin is 42

class SAMDCurrentSenseADCDMA
{

Expand Down Expand Up @@ -64,4 +66,4 @@ class SAMDCurrentSenseADCDMA



#endif
#endif
Loading