Cool_Tools/Jumperless
1
0
Fork 0
mirror of https://github.com/Architeuthis-Flux/Jumperless.git synced 2024-11-24 07:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use adcReadings instead of analogRead

Browse Source
This commit is contained in:
Niklas Cathor 2024-02-16 11:50:25 +01:00
parent aab83ac20f
commit 454ea53754
3 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
JumperlessNano/src/AdcUsb.cpp
View File

@ -77,6 +77,8 @@ JumperlessUsbInterface jlUsbInterface;
void setupAdcUsbStuff() { void setupAdcUsbStuff() {
TinyUSBDevice.addInterface(jlUsbInterface); TinyUSBDevice.addInterface(jlUsbInterface);
analogReadResolution(12);
adc.setBuffers(4, 32); adc.setBuffers(4, 32);
adc.onReceive(adcCallback); adc.onReceive(adcCallback);
// the sample rate passed here is already adjusted for the number of pins. // the sample rate passed here is already adjusted for the number of pins.

24
JumperlessNano/src/Peripherals.cpp
View File

@ -14,11 +14,11 @@
#include <stdio.h> #include <stdio.h>
#include "pico/stdlib.h" #include "pico/stdlib.h"
#include "hardware/gpio.h" #include "hardware/gpio.h"
#include "ADCInput.h"
#include "pico/cyw43_arch.h" #include "pico/cyw43_arch.h"
#include "mcp4725.hpp" #include "mcp4725.hpp"
#include "MCP_DAC.h" #include "MCP_DAC.h"
#include "AdcUsb.h"
#include <SPI.h> #include <SPI.h>
@ -71,24 +71,6 @@ uint32_t lastTime = 0;
uint16_t sine0[360]; uint16_t sine0[360];
uint16_t sine1[360]; uint16_t sine1[360];
// ADCInput adc(A3);
void initADC(void)
{
pinMode(ADC0_PIN, INPUT);
pinMode(ADC1_PIN, INPUT);
pinMode(ADC2_PIN, INPUT);
pinMode(ADC3_PIN, INPUT);
gpio_set_function(ADC3_PIN, GPIO_FUNC_NULL);
adc_gpio_init(ADC3_PIN);
adc_select_input(3);
adc_fifo_setup(true, false, 0, false, false);
adc_run(true);
analogReadResolution(12);
}
void initDAC(void) void initDAC(void)
{ {
@ -537,11 +519,9 @@ int readAdc(int channel, int samples)
{ {
int adcReadingAverage = 0; int adcReadingAverage = 0;
uint8_t adcChannel = channel + ADC0_PIN;
for (int i = 0; i < samples; i++) for (int i = 0; i < samples; i++)
{ {
adcReadingAverage += analogRead(adcChannel); adcReadingAverage += adcReadings[channel];
delay(1); delay(1);
} }

1
JumperlessNano/src/Peripherals.h
View File

@ -22,7 +22,6 @@ extern int showADCreadings[4];
extern int revisionNumber; extern int revisionNumber;
void initINA219(void); void initINA219(void);
void initADC(void);
void initDAC(void); void initDAC(void);