lauchmelder/b15f
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

adc reference bug fixed

Browse source
This commit is contained in:
Tristan Krause 2019-05-16 10:44:38 +02:00
parent 2c36fe05f8
commit 708b35c295
7 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
# Prerequisites # Prerequisites
*.d *.d
gnuplotscript.gp
# Compiled Object files # Compiled Object files
*.slo *.slo

13
control/examples/pegel/gnuplotscript.gp
View file

@ -1,13 +0,0 @@
set margin 10,10
unset key
set grid
set title ''
set xlabel 'U_{OUT} [V]'
set ylabel 'U_{IN} [V]'
set xrange [0:5]
set yrange [0:5]
set label at 5,5 ' [V] = 0' left
unset output
set terminal qt
unset output
plot "/tmp/tempfile0" using ($1*0.004888):($2*0.004888) binary format="%int16%int16" endian=big title ' [V] = 0' w l

5
control/examples/pegel/main.cpp
View file

@ -34,7 +34,10 @@ int main()
for(uint16_t x = 0; x < sample_count * delta; x += delta) for(uint16_t x = 0; x < sample_count * delta; x += delta)
{ {
pf.addDot(Dot(x, ba[x], curve)); drv.analogWrite0(x);
uint16_t y = drv.analogRead(0);
std::cout << x << " - " << y << std::endl;
pf.addDot(Dot(x, y, curve));
} }
// speichern und plotty starten // speichern und plotty starten

BIN
control/examples/pegel/test_plot
View file

Binary file not shown.

4
control/src/Makefile
View file

@ -47,7 +47,7 @@ cli: drv $(OBJECTS_CLI)
$(PATH_COMPILER) $(CFLAGS) $(OBJECTS_CLI) -L $(PATH_TMP_LIB) -o $(OUT_TMP_CLI) $(LDFLAGS_CLI) $(PATH_COMPILER) $(CFLAGS) $(OBJECTS_CLI) -L $(PATH_TMP_LIB) -o $(OUT_TMP_CLI) $(LDFLAGS_CLI)
@bash -c 'if [ ! -f "$(OUT_DRV)" ]; then echo -e "\n*** Warning ***: driver not installed\nType \"sudo make install\" to install or update b15fdrv."; fi' @bash -c 'if [ ! -f "$(OUT_DRV)" ]; then echo -e "\n*** Warning ***: driver not installed\nType \"sudo make install\" to install or update b15fdrv."; fi'
install: drv install: all
@echo "Installing driver..." @echo "Installing driver..."
@mkdir -p $(PATH_INCLUDE) @mkdir -p $(PATH_INCLUDE)
cp $(OUT_TMP_DRV) $(OUT_DRV) cp $(OUT_TMP_DRV) $(OUT_DRV)
@ -55,7 +55,7 @@ install: drv
cp $(OUT_TMP_PLOTTY) $(OUT_PLOTTY) cp $(OUT_TMP_PLOTTY) $(OUT_PLOTTY)
cp drv/*.h $(PATH_INCLUDE) cp drv/*.h $(PATH_INCLUDE)
uninstall: uninstall: clean
@echo "Uninstalling driver..." @echo "Uninstalling driver..."
rm -rf $(PATH_INCLUDE) $(OUT_DRV) $(OUT_CLI) $(OUT_PLOTTY) rm -rf $(PATH_INCLUDE) $(OUT_DRV) $(OUT_CLI) $(OUT_PLOTTY)

2
firmware/Makefile
View file

@ -44,7 +44,7 @@ clean:
checkfuses: checkfuses:
@echo "Checking fuses..." @echo "Checking fuses..."
@bash -c 'diff -B <( echo "$(FUSES)" ) <( avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) 2>&1 | grep "safemode: Fuses OK" | tail -c 19 ) >/dev/null || avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) -U lfuse:w:0x$(LFUSE):m -U hfuse:w:0x$(HFUSE):m -U efuse:w:0x$(EFUSE):m' @bash -c 'diff -B <( echo "$(FUSES)" ) <( avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) 2>&1 | grep "safemode: Fuses OK" | tail -c 19 ) >/dev/null && echo "Fuses okay" || avrdude -Pusb -p $(MCU) -c $(PROGRAMMER) -U lfuse:w:0x$(LFUSE):m -U hfuse:w:0x$(HFUSE):m -U efuse:w:0x$(EFUSE):m'
upload: b15f checkfuses upload: b15f checkfuses
@echo "Uploading hex file..." @echo "Uploading hex file..."

2
firmware/adu.cpp
View file

@ -3,7 +3,7 @@
void ADU::init() volatile void ADU::init() volatile
{ {
// externe Referenz an AREF // externe Referenz an AREF
ADMUX = 0; ADMUX = _BV(REFS0);
// ADC aktiviert, Interruptbetrieb, prescaler = 128 // ADC aktiviert, Interruptbetrieb, prescaler = 128
ADCSRA = _BV(ADEN) | _BV(ADIE) | _BV(ADPS2) | _BV(ADPS1) | _BV(ADPS0); ADCSRA = _BV(ADEN) | _BV(ADIE) | _BV(ADPS2) | _BV(ADPS1) | _BV(ADPS0);