diff --git a/projekte/soundz/alex_sound1/sound_alex2_nochmal/sound_alex2_nochmal.pde b/projekte/soundz/alex_sound2_nochmal/alex_sound2_nochmal.pde similarity index 100% rename from projekte/soundz/alex_sound1/sound_alex2_nochmal/sound_alex2_nochmal.pde rename to projekte/soundz/alex_sound2_nochmal/alex_sound2_nochmal.pde diff --git a/projekte/soundz/alex_sound1/sound_alex2_nochmal_repimped/sound_alex2_nochmal_repimped.pde b/projekte/soundz/alex_sound2_nochmal_repimped/alex_sound2_nochmal_repimped.pde similarity index 100% rename from projekte/soundz/alex_sound1/sound_alex2_nochmal_repimped/sound_alex2_nochmal_repimped.pde rename to projekte/soundz/alex_sound2_nochmal_repimped/alex_sound2_nochmal_repimped.pde diff --git a/projekte/soundz/arpeggio/applet/HardwareSerial.cpp.o b/projekte/soundz/arpeggio/applet/HardwareSerial.cpp.o deleted file mode 100644 index ff3e13c..0000000 Binary files a/projekte/soundz/arpeggio/applet/HardwareSerial.cpp.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/Print.cpp.o b/projekte/soundz/arpeggio/applet/Print.cpp.o deleted file mode 100644 index 1820b34..0000000 Binary files a/projekte/soundz/arpeggio/applet/Print.cpp.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/WInterrupts.c.o b/projekte/soundz/arpeggio/applet/WInterrupts.c.o deleted file mode 100644 index a93ecc3..0000000 Binary files a/projekte/soundz/arpeggio/applet/WInterrupts.c.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/WMath.cpp.o b/projekte/soundz/arpeggio/applet/WMath.cpp.o deleted file mode 100644 index 215570c..0000000 Binary files a/projekte/soundz/arpeggio/applet/WMath.cpp.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/arpeggio.cpp b/projekte/soundz/arpeggio/applet/arpeggio.cpp deleted file mode 100644 index df6d298..0000000 --- a/projekte/soundz/arpeggio/applet/arpeggio.cpp +++ /dev/null @@ -1,134 +0,0 @@ -#include -#include -#include - -// number of timer0 overflows/sec -#define INT_PER_SEC F_CPU/1/256 - -// Frequencies (in Hz) of notes -#define F_FSH_4 370 -#define F_A_4 440 -#define F_B_4 494 -#define F_E_4 330 -#define F_CSH_5 554 -#define F_D_5 587 -#define F_FSH_5 740 -#define F_CSH_4 277 -#define F_GSH_4 415 - -// number of timer0 overflows for notes -#define REST -1 // special case -#define FSH_4 INT_PER_SEC/F_FSH_4 -#define A_4 INT_PER_SEC/F_A_4 -#define B_4 INT_PER_SEC/F_B_4 -#define E_4 INT_PER_SEC/F_E_4 -#define CSH_5 INT_PER_SEC/F_CSH_5 -#define D_5 INT_PER_SEC/F_D_5 -#define FSH_5 INT_PER_SEC/F_FSH_5 -#define CSH_4 INT_PER_SEC/F_CSH_4 -#define GSH_4 INT_PER_SEC/F_GSH_4 - -#define SEMIQUAVER_TIME 60 // ms -#define BREATH_TIME 20 // ms - -#include "WProgram.h" -void play(int32_t note, uint32_t len); -void setup(); -void loop(); -volatile uint32_t intrs = 0; -volatile int32_t curNote = REST; - -// TIMER0 overflow -ISR(TIMER0_OVF_vect) -{ - if (curNote == REST) - intrs = 0; - else - { - intrs++; - if (intrs >= curNote) - { - PORTD ^= _BV(PD4); - intrs = 0; - } - } -} - - -void play(int32_t note, uint32_t len) -{ - int i; - curNote = note; - for (i = 0; i< len; i++) - _delay_ms(SEMIQUAVER_TIME); - curNote = REST; - _delay_ms(BREATH_TIME); -} - -void setup() { - /* setup clock divider. Timer0 overflows on counting to 256. - * 16Mhz / 1 (CS0=1) = 16000000 increments/sec. Overflows every 256. - */ - TCCR0B |= _BV(CS00); - - // enable overflow interrupts - TIMSK0 |= _BV(TOIE0); - - // PD4 as output - DDRD = _BV(PD4); - - TCNT0 = 0; - intrs = 0; - - curNote = REST; - - // enable interrupts - sei(); -} - - -void loop() { - // Axel F - play(FSH_4, 2); - play(REST, 2); - play(A_4, 3); - play(FSH_4, 2); - play(FSH_4, 1); - play(B_4, 2); - play(FSH_4, 2); - play(E_4, 2); - play(FSH_4, 2); - play(REST, 2); - play(CSH_5, 3); - play(FSH_4, 2); - play(FSH_4, 1); - play(D_5, 2); - play(CSH_5, 2); - play(A_4, 2); - play(FSH_4, 2); - play(CSH_5, 2); - play(FSH_5, 2); - play(FSH_4, 1); - play(E_4, 2); - play(E_4, 1); - play(CSH_4, 2); - play(GSH_4, 2); - play(FSH_4, 6); - play(REST, 12); - - delay(3000); - -} - -int main(void) -{ - init(); - - setup(); - - for (;;) - loop(); - - return 0; -} - diff --git a/projekte/soundz/arpeggio/applet/arpeggio.cpp.o b/projekte/soundz/arpeggio/applet/arpeggio.cpp.o deleted file mode 100644 index 1a68d99..0000000 Binary files a/projekte/soundz/arpeggio/applet/arpeggio.cpp.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/core.a b/projekte/soundz/arpeggio/applet/core.a deleted file mode 100644 index 7ef6323..0000000 Binary files a/projekte/soundz/arpeggio/applet/core.a and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/pins_arduino.c.o b/projekte/soundz/arpeggio/applet/pins_arduino.c.o deleted file mode 100644 index f6f0bed..0000000 Binary files a/projekte/soundz/arpeggio/applet/pins_arduino.c.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/wiring.c.o b/projekte/soundz/arpeggio/applet/wiring.c.o deleted file mode 100644 index c39c7f3..0000000 Binary files a/projekte/soundz/arpeggio/applet/wiring.c.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/wiring_analog.c.o b/projekte/soundz/arpeggio/applet/wiring_analog.c.o deleted file mode 100644 index 0ab6564..0000000 Binary files a/projekte/soundz/arpeggio/applet/wiring_analog.c.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/wiring_digital.c.o b/projekte/soundz/arpeggio/applet/wiring_digital.c.o deleted file mode 100644 index a769214..0000000 Binary files a/projekte/soundz/arpeggio/applet/wiring_digital.c.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/wiring_pulse.c.o b/projekte/soundz/arpeggio/applet/wiring_pulse.c.o deleted file mode 100644 index eeff05e..0000000 Binary files a/projekte/soundz/arpeggio/applet/wiring_pulse.c.o and /dev/null differ diff --git a/projekte/soundz/arpeggio/applet/wiring_shift.c.o b/projekte/soundz/arpeggio/applet/wiring_shift.c.o deleted file mode 100644 index 1428c70..0000000 Binary files a/projekte/soundz/arpeggio/applet/wiring_shift.c.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/HardwareSerial.cpp.o b/projekte/soundz/axelf/applet/HardwareSerial.cpp.o deleted file mode 100644 index ff3e13c..0000000 Binary files a/projekte/soundz/axelf/applet/HardwareSerial.cpp.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/Print.cpp.o b/projekte/soundz/axelf/applet/Print.cpp.o deleted file mode 100644 index 1820b34..0000000 Binary files a/projekte/soundz/axelf/applet/Print.cpp.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/WInterrupts.c.o b/projekte/soundz/axelf/applet/WInterrupts.c.o deleted file mode 100644 index a93ecc3..0000000 Binary files a/projekte/soundz/axelf/applet/WInterrupts.c.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/WMath.cpp.o b/projekte/soundz/axelf/applet/WMath.cpp.o deleted file mode 100644 index 215570c..0000000 Binary files a/projekte/soundz/axelf/applet/WMath.cpp.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/axelf.cpp b/projekte/soundz/axelf/applet/axelf.cpp deleted file mode 100644 index 59b2fa8..0000000 --- a/projekte/soundz/axelf/applet/axelf.cpp +++ /dev/null @@ -1,134 +0,0 @@ -#include -#include -#include - -// number of timer0 overflows/sec -#define INT_PER_SEC F_CPU/1/256 - -// Frequencies (in Hz) of notes -#define F_FSH_4 370 -#define F_A_4 440 -#define F_B_4 494 -#define F_E_4 330 -#define F_CSH_5 554 -#define F_D_5 587 -#define F_FSH_5 740 -#define F_CSH_4 277 -#define F_GSH_4 415 - -// number of timer0 overflows for notes -#define REST -1 // special case -#define FSH_4 INT_PER_SEC/F_FSH_4 -#define A_4 INT_PER_SEC/F_A_4 -#define B_4 INT_PER_SEC/F_B_4 -#define E_4 INT_PER_SEC/F_E_4 -#define CSH_5 INT_PER_SEC/F_CSH_5 -#define D_5 INT_PER_SEC/F_D_5 -#define FSH_5 INT_PER_SEC/F_FSH_5 -#define CSH_4 INT_PER_SEC/F_CSH_4 -#define GSH_4 INT_PER_SEC/F_GSH_4 - -#define SEMIQUAVER_TIME 60 // ms -#define BREATH_TIME 20 // ms - -#include "WProgram.h" -void play(int32_t note, uint32_t len); -int main(void); -volatile uint32_t intrs = 0; -volatile int32_t curNote = REST; - -// TIMER0 overflow -ISR(TIMER0_OVF_vect) -{ - if (curNote == REST) - intrs = 0; - else - { - intrs++; - if (intrs >= curNote) - { - PORTD ^= _BV(PD4); - intrs = 0; - } - } -} - - -void play(int32_t note, uint32_t len) -{ - int i; - curNote = note; - for (i = 0; i< len; i++) - _delay_ms(SEMIQUAVER_TIME); - curNote = REST; - _delay_ms(BREATH_TIME); -} - -int main(void) -{ - /* setup clock divider. Timer0 overflows on counting to 256. - * 16Mhz / 1 (CS0=1) = 16000000 increments/sec. Overflows every 256. - */ - TCCR0B |= _BV(CS00); - - // enable overflow interrupts - TIMSK0 |= _BV(TOIE0); - - // PD4 as output - DDRD = _BV(PD4); - - TCNT0 = 0; - intrs = 0; - - curNote = REST; - - // enable interrupts - sei(); - - while (1) - { - // Axel F - play(FSH_4, 2); - play(REST, 2); - play(A_4, 3); - play(FSH_4, 2); - play(FSH_4, 1); - play(B_4, 2); - play(FSH_4, 2); - play(E_4, 2); - play(FSH_4, 2); - play(REST, 2); - play(CSH_5, 3); - play(FSH_4, 2); - play(FSH_4, 1); - play(D_5, 2); - play(CSH_5, 2); - play(A_4, 2); - play(FSH_4, 2); - play(CSH_5, 2); - play(FSH_5, 2); - play(FSH_4, 1); - play(E_4, 2); - play(E_4, 1); - play(CSH_4, 2); - play(GSH_4, 2); - play(FSH_4, 6); - play(REST, 12); - - } - delay(3000); -} - - -int main(void) -{ - init(); - - setup(); - - for (;;) - loop(); - - return 0; -} - diff --git a/projekte/soundz/axelf/applet/core.a b/projekte/soundz/axelf/applet/core.a deleted file mode 100644 index 4435d7d..0000000 Binary files a/projekte/soundz/axelf/applet/core.a and /dev/null differ diff --git a/projekte/soundz/axelf/applet/pins_arduino.c.o b/projekte/soundz/axelf/applet/pins_arduino.c.o deleted file mode 100644 index f6f0bed..0000000 Binary files a/projekte/soundz/axelf/applet/pins_arduino.c.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/wiring.c.o b/projekte/soundz/axelf/applet/wiring.c.o deleted file mode 100644 index c39c7f3..0000000 Binary files a/projekte/soundz/axelf/applet/wiring.c.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/wiring_analog.c.o b/projekte/soundz/axelf/applet/wiring_analog.c.o deleted file mode 100644 index 0ab6564..0000000 Binary files a/projekte/soundz/axelf/applet/wiring_analog.c.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/wiring_digital.c.o b/projekte/soundz/axelf/applet/wiring_digital.c.o deleted file mode 100644 index a769214..0000000 Binary files a/projekte/soundz/axelf/applet/wiring_digital.c.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/wiring_pulse.c.o b/projekte/soundz/axelf/applet/wiring_pulse.c.o deleted file mode 100644 index eeff05e..0000000 Binary files a/projekte/soundz/axelf/applet/wiring_pulse.c.o and /dev/null differ diff --git a/projekte/soundz/axelf/applet/wiring_shift.c.o b/projekte/soundz/axelf/applet/wiring_shift.c.o deleted file mode 100644 index 1428c70..0000000 Binary files a/projekte/soundz/axelf/applet/wiring_shift.c.o and /dev/null differ