Ruakij/Geigercounter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed compile-errors

Browse Source 
Removed avrdude (incomplete)
This commit is contained in:
Alexander B 2019-03-08 10:30:38 +01:00
parent ccda41769f
commit 6a5b39f6d9
5 changed files with 7 additions and 14811 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Geigerzaehler/AVRdude/arduino_32u4.bat
View File

@ -1,6 +0,0 @@
@echo off
SET port=%1%
C:\AVRdude\avrdude.exe -patmega32u4 -cavr109 -PCOM%port% -b1200 -n
SET /a port=%port%-1
ping -n 2 127.0.0.1 > NUL
C:\AVRdude\avrdude.exe -patmega32u4 -cavr109 -PCOM%port% -b57600 -D -Uflash:w:%2%:i

14761
Geigerzaehler/AVRdude/avrdude.conf
View File

File diff suppressed because it is too large Load Diff

36
Geigerzaehler/AVRdude/config_atmel_studio.txt
View File

@ -1,36 +0,0 @@
Title: Arduino Uno
Command: C:\AVRdude\avrdude.exe
Arguments: -patmega328p -carduino -P\\.\COM6 -b115200 -D -Uflash:w:"$(ProjectDir)Debug\$(TargetName).hex":i
Title: Arduino Mega
Command: C:\AVRdude\avrdude.exe
Arguments: -patmega2560 -cwiring -P\\.\COM7 -b115200 -D -Uflash:w:"$(ProjectDir)Debug\$(TargetName).hex":i
Title: Arduino Nano
Command: C:\AVRdude\avrdude.exe
Arguments: -patmega328p -cwiring -P\\.\COM15 -b115200 -D -Uflash:w:"$(ProjectDir)Debug\$(TargetName).hex":i
Title: Arduino Leonardo/Micro/Esplora
Command: C:\AVRdude\arduino_32u4.bat
Arguments: 8 $(ItemDir)Debug\$(TargetName).hex
und mit manuellem Reset:
Command: C:\AVRdude\avrdude.exe
Arguments: -patmega32u4 -cavr109 -P\\.\COM6 -b57600 -D -Uflash:w:"$(ProjectDir)Debug\$(TargetName).hex":i
Title: Digispark
Command: C:\AVRdude\micro_batch.bat
Arguments: $(ProjectDir)Debug\$(TargetName).hex
Title: USBasp
Command: C:\AVRdude\avrdude.exe
Arguments: -patmega328p -cusbasp -Uflash:w:"$(ProjectDir)Debug\$(TargetName).hex":i
^
|
Hier aufpassen das man den richtigen MCU gewählt hat!
Title: DigiX
Command: C:\AVRdude\bossac.exe

3
Geigerzaehler/AVRdude/micro_batch.bat
View File

@ -1,3 +0,0 @@
@echo off
echo Bitte Digispark anschliessen...(in 60 Sekunden automatischer Abbruch)
micronucleus.exe --run --type intel-hex %1%

12
Geigerzaehler/main.c
View File

@ -30,7 +30,7 @@ uint16_t signalOutput_led_nextTick = 0;
// Prescaling of timer [timer-speed: cpu-clock / prescaler]
// Modes: [1, 8, 64, 256, 1024]
uint8_t timer1_prescaler = 256;
uint16_t timer1_prescaler = 256;
uint16_t timer1_overflow_value = (2^16) -1; // Just for info
int main()
@ -59,6 +59,8 @@ int main()
// Init timer1
timer1_init();
PORTB |= (1 << PORTB5); // Onboard-Led
// Endless loop
while (1)
{
@ -181,11 +183,10 @@ ISR(INT0_vect)
// Reached ~400V, deactivate booster
boost_highVoltage_nextTick = 0;
PORTB |= (0 << PORTB5); // Onboard-Led
// reset state
PORTD |= (0 << PORTD4); // pin on low
boost_highVoltage_nextHigh = 1; // next is high
PORTB |= (0 << PORTB5); // Onboard-Led
}
reti(); // Exit interrupt-handler
@ -196,7 +197,8 @@ ISR(INT0_vect)
ISR(INT1_vect)
{
// Tick detected, signalOutput
signalOutput_nextTick = 1; // Run as soon as possible
signalOutput_piezo_nextTick = 1; // Run as soon as possible
signalOutput_led_nextTick = 1;
reti(); // Exit interrupt-handler
}