From 2df2697107d7873232c31a25a6947711b0903edb Mon Sep 17 00:00:00 2001 From: Max Christian Pohle Date: Mon, 27 Jul 2015 15:12:22 +0200 Subject: latest running version from march 2011, not having been in repo before, dcf77 working, mp3 playback and two display types are supported --- .gitmodules | 3 + Makefile | 5 + doc/3d/alarmclock.blend | Bin 0 -> 1548764 bytes doc/3d/dcf77/dcf77-module.blend | Bin 0 -> 939184 bytes doc/3d/dcf77/dcf77.png | Bin 0 -> 524301 bytes doc/3d/flat-flex.png | Bin 0 -> 446 bytes doc/3d/lcd/lcd.blend | Bin 0 -> 971796 bytes doc/3d/wecker.png | 1 + doc/menu.dia | Bin 0 -> 2821 bytes doc/menu.png | Bin 0 -> 51724 bytes src/Makefile | 75 +++++++++++ src/inc/int/dcf77/clock.c | 157 +++++++++++++++++++++++ src/inc/int/dcf77/clock.h | 98 ++++++++++++++ src/inc/pwm/pwm.c | 13 ++ src/inc/pwm/pwm.h | 3 + src/inc/spi/dev/audio_vs1011.c | 173 +++++++++++++++++++++++++ src/inc/spi/dev/audio_vs1011.h | 91 +++++++++++++ src/inc/spi/dev/display_dogm.c | 39 ++++++ src/inc/spi/dev/display_dogm.h | 31 +++++ src/inc/spi/dev/petit | 1 + src/inc/spi/spi.c | 56 ++++++++ src/inc/spi/spi.h | 37 ++++++ src/inc/stdalg.c | 29 +++++ src/inc/stdalg.h | 8 ++ src/inc/stdout.c | 154 ++++++++++++++++++++++ src/inc/stdout.h | 41 ++++++ src/inc/uart/uart.c | 47 +++++++ src/inc/uart/uart.h | 17 +++ src/main.c | 277 ++++++++++++++++++++++++++++++++++++++++ 29 files changed, 1356 insertions(+) create mode 100644 .gitmodules create mode 100755 Makefile create mode 100644 doc/3d/alarmclock.blend create mode 100644 doc/3d/dcf77/dcf77-module.blend create mode 100644 doc/3d/dcf77/dcf77.png create mode 100644 doc/3d/flat-flex.png create mode 100644 doc/3d/lcd/lcd.blend create mode 120000 doc/3d/wecker.png create mode 100755 doc/menu.dia create mode 100755 doc/menu.png create mode 100755 src/Makefile create mode 100755 src/inc/int/dcf77/clock.c create mode 100755 src/inc/int/dcf77/clock.h create mode 100755 src/inc/pwm/pwm.c create mode 100755 src/inc/pwm/pwm.h create mode 100755 src/inc/spi/dev/audio_vs1011.c create mode 100755 src/inc/spi/dev/audio_vs1011.h create mode 100755 src/inc/spi/dev/display_dogm.c create mode 100755 src/inc/spi/dev/display_dogm.h create mode 160000 src/inc/spi/dev/petit create mode 100755 src/inc/spi/spi.c create mode 100755 src/inc/spi/spi.h create mode 100755 src/inc/stdalg.c create mode 100755 src/inc/stdalg.h create mode 100755 src/inc/stdout.c create mode 100755 src/inc/stdout.h create mode 100755 src/inc/uart/uart.c create mode 100755 src/inc/uart/uart.h create mode 100755 src/main.c diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d889259 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/inc/spi/dev/petit"] + path = src/inc/spi/dev/petit + url = https://gist.github.com/2325039.git diff --git a/Makefile b/Makefile new file mode 100755 index 0000000..a7e8f9c --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +all: + + +doc: + make -f doc/ diff --git a/doc/3d/alarmclock.blend b/doc/3d/alarmclock.blend new file mode 100644 index 0000000..c323ef0 Binary files /dev/null and b/doc/3d/alarmclock.blend differ diff --git a/doc/3d/dcf77/dcf77-module.blend b/doc/3d/dcf77/dcf77-module.blend new file mode 100644 index 0000000..ee939ba Binary files /dev/null and b/doc/3d/dcf77/dcf77-module.blend differ diff --git a/doc/3d/dcf77/dcf77.png b/doc/3d/dcf77/dcf77.png new file mode 100644 index 0000000..5dd0217 Binary files /dev/null and b/doc/3d/dcf77/dcf77.png differ diff --git a/doc/3d/flat-flex.png b/doc/3d/flat-flex.png new file mode 100644 index 0000000..2e824b8 Binary files /dev/null and b/doc/3d/flat-flex.png differ diff --git a/doc/3d/lcd/lcd.blend b/doc/3d/lcd/lcd.blend new file mode 100644 index 0000000..0db1a4f Binary files /dev/null and b/doc/3d/lcd/lcd.blend differ diff --git a/doc/3d/wecker.png b/doc/3d/wecker.png new file mode 120000 index 0000000..615565a --- /dev/null +++ b/doc/3d/wecker.png @@ -0,0 +1 @@ +wecker05.png \ No newline at end of file diff --git a/doc/menu.dia b/doc/menu.dia new file mode 100755 index 0000000..140db1f Binary files /dev/null and b/doc/menu.dia differ diff --git a/doc/menu.png b/doc/menu.png new file mode 100755 index 0000000..ad577b3 Binary files /dev/null and b/doc/menu.png differ diff --git a/src/Makefile b/src/Makefile new file mode 100755 index 0000000..ca05759 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,75 @@ +AVRPATH = /usr/bin/ +# AVRPATH = C:/WinAVR-20100110/bin/ + +CC = $(AVRPATH)avr-gcc +OBJCOPY = $(AVRPATH)avr-objcopy +AVRSTRIP = $(AVRPATH)avr-strip +AVRDUDE = $(AVRPATH)avrdude +AVRSIZE = $(AVRPATH)avr-size +AVRNM = $(AVRPATH)avr-nm + +PRG = main +PATH = output/ + + +MCU_TARGET = atmega16 +# F_CPU = 7372800UL +#F_CPU = 4000000UL +# F_CPU = 8000000UL +F_CPU = 12000000UL +# F_CPU = 12288000UL +#F_CPU = 20000000UL + +# +override CFLAGS = -Wall -gstabs+ -Os -mcall-prologues -fshort-enums -msize -fno-jump-tables -std=c99 -Wunsafe-loop-optimizations -mmcu=$(MCU_TARGET) +#override PENIBL = -Wunused-parameter -Wunsafe-loop-optimizations -funsafe-loop-optimizations -Wextra -Wpadded -Wredundant-decls -Winline -Werror -nodefaultlibs -nostdlib +override PREPRO = -DF_CPU=$(F_CPU) -DBAUD=19200 +override LDFLAGS = -Wl,-Map,$(PATH)$(PRG).map +override STDOUT = -DSTDOUT_put_string -DSTDOUT_put_uint inc/stdout.c +# override STDALG = -DSTDALGO_CRC7 inc/stdalg.c +# -DSTDOUT_putf + + +#/ FATFS_PATH = inc/spi/dev/petit_fatfs/avr/ +#/ ASRC = $(FATFS_PATH)xitoa.S $(FATFS_PATH)usi.S +#/ OBJ = $(CSRC:.c=.o) $(ASRC:.S=.o) + +#/ ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs +#/ ALL_ASFLAGS = -mmcu=$(MCU_TARGET) -I. -x assembler-with-cpp $(ASFLAGS) + + +# inc/spi/dev/petit_fatfs/avr/pff.c inc/spi/dev/memory_sdcard.c +# inc/uart/uart.c \ +#/ inc/spi/dev/petit/pff.c \ +#/ inc/spi/dev/petit/diskio.c +#/ inc/spi/dev/audio_vs1011.c + +$(PATH)$(PRG).elf: clean + $(CC) -o$(PATH)$(PRG).elf $(PREPRO) $(CFLAGS) $(LDFLAGS) $(DEBUG) $(STDOUT) $(STDALG) \ + $(PRG).c \ + inc/spi/spi.c \ + inc/int/dcf77/clock.c \ + inc/spi/dev/display_dogm.c + @$(AVRNM) --size-sort -l ./output/$(PRG).elf + @$(AVRSIZE) -d ./output/$(PRG).elf + #@$(AVRSIZE) -C --mcu=$(MCU_TARGET) ./output/$(TARGET).elf + +%.hex: $(PATH)%.elf + $(OBJCOPY) -S -j.text -j.data -Oihex $< $(PATH)$@ + +#/ %.o : %.S + #/ $(CC) -c $(ALL_ASFLAGS) $< -o $@ + +upload: clean $(PRG).hex + # skip: -e (erase, because ATMega doesn't need it and avrdude checks this automatically) + $(AVRDUDE) -cavrispv2 -b115200 -pm16 -Pusb -e -V -U ./output/$(PRG).hex + +upload_mp3: + $(AVRDUDE) -cavrispv2 -pm16 -Pusb -V -F -Ueeprom:w:accessdenied.mp3 + +clean: + $(shell rm -f $(PATH)$(PRG).elf) + $(shell rm -f $(PATH)$(PRG).hex) + $(shell rm -f $(PATH)$(PRG).map) + +#avr-gcc -o./output/main.elf -DF_CPU=7372800UL -DBAUD=9600 -DSTDOUT_reverse_bits -DSTDOUT_put_int -DSTDOUT_put_string -g -Wall -std=c99 -Os -mmcu=atmega16 -Wl,-Map,./output/main.map ./inc/display/dog.c main.c ./inc/dcf77/clock.c ./inc/stdout.c diff --git a/src/inc/int/dcf77/clock.c b/src/inc/int/dcf77/clock.c new file mode 100755 index 0000000..75f33fe --- /dev/null +++ b/src/inc/int/dcf77/clock.c @@ -0,0 +1,157 @@ +#include "clock.h" + + +// returns -1 on error +unsigned char getBits(const DCF start, const char len, const DCF pbit) +{ + static const unsigned char mult[] = {1, 2, 4, 8, 10, 20 ,40 ,80}; + /// unsigned char p = 1; //parity + unsigned char r = 0; // retval + unsigned char i; + for(i=0; i 59) | + /// (getBits(DCF_HOUR, 6, DCF_HOURP) == -1) + /// ) return; + + // set new time + t_current.m = (getBits(DCF_MIN, 7, DCF_START)) - 1; + t_current.h = (getBits(DCF_HOUR, 6, DCF_START)); + t_current.dd = (getBits(DCF_DAY, 6, DCF_START)); + t_current.wd = (getBits(DCF_WEEKDAY, 3, DCF_START)); + t_current.mm = (getBits(DCF_MONTH, 5, DCF_START)); + t_current.yy = (getBits(DCF_YEAR, 8, DCF_START)); +} + +// 7372800/a=10000 +// 115200 / a * x = 10000 +// 7372800/8/150 +ISR(TIMER0_COMP_vect) // called 10000 times per second (12000000/8/150) +{ + //cli(); + // F_CPU / PRESCALER / (OCR0 + 1) + if(++t_current.us >= 10) // one u-second + { + t_current.us = 0; // restart + // interval length of dcf77 can be greater than 1000 ms... count it! + ++interval; + + /* + cli(); + if(t_current.ms <= 500) + { OCR1A = 50 + (200 - (t_current.ms / 3)); } + else + { OCR1A = 50 + (200 - ((1000 - t_current.ms) / 3)); } + sei(); + */ + + if(++t_current.ms >= 1000) // one second + { + t_current.ms = 0; // restart + if(++t_current.s > 59) // one minute + { + t_current.s = 0; // restart + if(++t_current.m > 59) // one hour + { + t_current.m = 0; // restart + if(++t_current.h > 23) // one day + { + t_current.h = 0; // restart + t_current.dd++; + } + } + } + } + } + //sei(); +} + +ISR(INT0_vect) +{ + /// stdout_put_int(interval, uart_putc); + /// stdout_put_string("INT0 call\n", uart_putc); + cli(); + if(INT0_CONTROL == INT0_RISING_EDGE) + { + if(interval > 1000 && interval < 2000) // 59th second - no rising edge at the beginning + { + /// if(dcf77_bit == 59) // check if every bit has been transfered + set_dcf_value(); // completely received- apply new time data + + // 59th second: synchronize with receiver... + dcf77_bit = 0; + TCNT0 = 0; + t_current.s = 0; + t_current.ms = 0; + t_current.us = 0; + } + INT0_CONTROL = INT0_FALLING_EDGE; + } + else // INT0_FALLING_EDGE + { + dcf77[dcf77_bit++].bit = interval >= 200 ? 1 : 0; + lastinterval = interval; + + INT0_CONTROL = INT0_RISING_EDGE; + } + + interval = 0; // reset interval to count next interval + sei(); +} + + +void timer_init() +{ + // 7372800/8 + DDRD &= ~((1< + #include + #include + #include + + /// #include "../stdout.h" + /// #include "../display/display.h" + /// #include "../uart/uart.h" + + #define INT0_CONTROL MCUCR + #define INT0_FALLING_EDGE 0x02 + #define INT0_RISING_EDGE 0x03 + + + + typedef struct + { + volatile unsigned char bit : 1; + } Bit; + + typedef struct + { + unsigned char h ; // hour + unsigned char m ; // minute + unsigned char s ; // second + unsigned char dd; // day + unsigned char wd; // weekday + unsigned char mm; // month + unsigned char yy; // year + unsigned char us; // 10th second + unsigned int ms; // milli second + } Time; + + typedef enum + { + DCF_FIRST = 0, // start of a new minute (note: always 0) + DCF_WEATHER = 14, // proprietary :-( + DCF_ANTENNA = 15, // 0: normal, 1: replacement + DCF_DST = 16, // daylight saving time: this hour new time... + DCF_MEZ = 17, // 'summer-time' + DCF_MESZ = 18, // 'winter-time' + DCF_DBLSEC = 19, // one extra second gonna be inserted + DCF_START = 20, // begin of time-info (note: always 1) + DCF_MIN = 21, // 7 bit + DCF_MINP = 28, // parity bit for minutes + DCF_HOUR = 29, // 6 bit + DCF_HOURP = 35, // parity bit for hours + DCF_DAY = 36, // 6 bit + DCF_WEEKDAY = 42, // 3 bit + DCF_MONTH = 45, // 5 bit + DCF_YEAR = 50, // 8 bit + DCF_DATEP = 58 // parity bit for date + } DCF; + + /* + typedef struct + { + Bit useless[14]; + Bit antenna; + Bit dst; + Bit mez; + Bit mesz; + Bit dblsec; + Bit start; // < always 1 - use for verification + unsigned char min : 7; + Bit min_p; // < minutes parity + unsigned char hour : 6; + Bit hour_p; // < hours parity + unsigned char day : 6; // day of month + unsigned char dow : 3; // day of week (1=monday) + unsigned char month : 5; // month of year + unsigned char year : 8; // year + Bit date_p; // parity of date + } DCF_Signal; + */ + + + volatile Bit dcf77[60]; + volatile unsigned char dcf77_bit; + volatile Time t_current; + volatile unsigned int interval; + volatile unsigned int lastinterval; + + /// void getBits(volatile unsigned char* target, const DCF start, const char len, const DCF parity); + /// void set_dcf_value(); + void timer_init(); + /// void interrupts_init(); + +#endif diff --git a/src/inc/pwm/pwm.c b/src/inc/pwm/pwm.c new file mode 100755 index 0000000..fac9347 --- /dev/null +++ b/src/inc/pwm/pwm.c @@ -0,0 +1,13 @@ + +void pwminit() +{ + TCCR0 |= (1< + +void pwminit(); diff --git a/src/inc/spi/dev/audio_vs1011.c b/src/inc/spi/dev/audio_vs1011.c new file mode 100755 index 0000000..ad44654 --- /dev/null +++ b/src/inc/spi/dev/audio_vs1011.c @@ -0,0 +1,173 @@ +#include "audio_vs1011.h" +/// inline void audio_vs1011_setVolume(unsigned char left, unsigned char right) +/// { audio_vs1011_cmd(SCI_VOL, left, right); } + +void audio_vs1011_init() +{ + // [initialize pins and ports] + DDRC |= ((1< + // Wait for at least 10 ms after startup (required!!) + // then make GPIO an output signal and set it to 1... + /// _delay_ms(20); + PORTC |= (1< + /// _delay_ms(20); + + // wait until DREQ is set- so chip has rebooted from reset... + wait4dreq(); + + // [set vs1011 to 'new-mode'] + // where xdcs is driven low, before you want to send mp3-data or test-bits + // where xcs is driven low to send SCI-commands. + // and both together may not been activated, why we started with resetting + // after having configured those output-ports. + audio_vs1011_cmd(SCI_MODE, (SM_SDINEW | SM_TESTS)); + + // [set clock-frequency...] + // formular: + // 32768{if clock doubler} + // + (F_CRYSTAL{crystals frequency in Hz} / 2000{const}) + // = 0x9770 for a 12MHz-crystal (with clock-doubler), so send: + /// audio_vs1011_cmd(SCI_CLOCKF, 0x98, 0x00); + /// stdout_put_uint(uart_putc, ((F_CPU / 2000) | SC_CLK2X)); + /// stdout_put_string(uart_putc, "\t< clock freq for vs1011\n"); + + audio_vs1011_cmd(SCI_CLOCKF, ((F_CPU / 2000) | SC_CLK2X)); + audio_vs1011_cmd(SCI_AUDATA, 44100); + + /* + spi_setspeed(SPICLK_FAST); + int q; + for(q=0; q<=30000; q++) + spi_putc(0x00); + spi_setspeed(SPICLK_DEFAULT); + // wait for at least 11000 clock cycles... + */ + + // wait until DREQ is set- so chip has rebooted from reset... + wait4dreq(); + + + /// spi_putc(0xFF); + + audio_vs1011_setVolume(1, 1); // left and right both to 100%=0xFF + /// _delay_ms(250); + + /// stdout_put_string(uart_putc, "clock frequency set!\n"); +} + + +void audio_vs1011_setVolume(const unsigned char left, const unsigned char right) +{ + //uint16_t volume = right + (256 * left); + /// stdout_put_uint(uart_putc, volume); + /// stdout_put_string(uart_putc, "\t< new volume for vs1011\n"); + audio_vs1011_cmd(SCI_VOL, ((uint16_t) right) + ((uint16_t) left * 256)); +} + +void audio_vs1011_test_volume() +{ + audio_vs1011_setVolume(0, 0); // left and right to 0%=0x00 -> standby + _delay_ms(250); + audio_vs1011_setVolume(255, 255); // left and right both to 100%=0xFF + _delay_ms(250); +} + +void audio_vs1011_test_sine() +{ + static const unsigned char sinetest[] = {0x53, 0xEF, 0x6E, 0x30, 0x0, 0x0, 0x0, 0x0}; + static const unsigned char testexit[] = {'E', 'x', 'i', 't', 0x0, 0x0, 0x0, 0x0}; + + /// audio_vs1011_setVolume(255, 255); // left and right both to 100%=0xFF + /// stdout_put_string(uart_putc, "activating sine-test...\n"); + audio_vs1011_dat(sinetest, sizeof(sinetest)); + _delay_ms(250); + + /// stdout_put_string(uart_putc, "deactivating sine-test...\n"); + audio_vs1011_dat(testexit, sizeof(testexit)); + _delay_ms(250); + /// audio_vs1011_setVolume(255, 255); // left and right both to 100%=0xFF +} + +/* +void audio_vs1011_test_eeprom() +{ + unsigned char block[512]; + eeprom_read_block((void*) &block, (const void*) 0, 512); + + int i,q; + for(i=0; i<512; i+=32) + { + audio_vs1011_enable(); + loop_until_bit_is_set(PIND, PD5); + for(q=0; q<32; q++) + spi_putc(block[i+q]); + audio_vs1011_disable(); + } + loop_until_bit_is_set(PIND, PD5); + _delay_ms(500); +} +*/ + +void audio_vs1011_dat(const unsigned char* dat, const unsigned char size) +{ + audio_vs1011_enable(); + unsigned char i; + for(i=0; i + audio_vs1011_init_xcs(); + spi_putc(VS_WRITE); + spi_putc(cmd); + spi_putc((dat >> 8) & 0xFF); + spi_putc((dat >> 0) & 0xFF); + //PORTA |= (1< + audio_vs1011_exit_xcs(); + spi_putc(0); + spi_putc(0); + spi_putc(0); + spi_putc(0); + /// audio_vs1011_disable(); + /// _delay_ms(1); // << wait to make sure vs1011 got the message + _delay_ms(5); + loop_until_bit_is_set(PIND, PD5); // << wait for DREQ to become ready again +} diff --git a/src/inc/spi/dev/audio_vs1011.h b/src/inc/spi/dev/audio_vs1011.h new file mode 100755 index 0000000..ec97550 --- /dev/null +++ b/src/inc/spi/dev/audio_vs1011.h @@ -0,0 +1,91 @@ +#ifndef AUDIO_VS1011_H +#define AUDIO_VS1011_H + + #include + #include + #include + #include + + #include "../spi.h" + /// #include "../../uart/uart.h" + /// #include "../../stdout.h" + + + #define audio_vs1011_enable() PORTC &= ~(1< + #define audio_vs1011_disable() PORTC |= (1< + #define audio_vs1011_isDREQ() (PIND & (1< + #define audio_vs1011_exit_xcs() PORTC |= (1< + + #define audio_vs1011_init_xdcs() PORTC &= ~(1< + #define audio_vs1011_exit_xdcs() PORTC |= (1< + + #define wait4dreq() loop_until_bit_is_set(PINC, PC3); // + + + /// void audio_vs1011_cmd(const unsigned char sci_cmd, const unsigned char hdata, + /// const unsigned char ldata); + void audio_vs1011_init(); + void audio_vs1011_cmd(const unsigned char cmd, uint16_t dat); + void audio_vs1011_setVolume(const unsigned char left, const unsigned char right); + + //void audio_vs1011_dat(const unsigned char dat[32]); + void audio_vs1011_dat(const unsigned char* dat, const unsigned char size); + /// unsigned char audio_vs1011_stream(unsigned char (*readfn)()); + void audio_vs1011_test_sine(); + void audio_vs1011_test_volume(); + /// void audio_vs1011_test_eeprom(); + /// void audio_vs1011_enable(); + /// void audio_vs1011_disable(); + /// char audio_vs1011_isDREQ(); + + + /// void audio_vs1011_test_softreset(); + + +#endif diff --git a/src/inc/spi/dev/display_dogm.c b/src/inc/spi/dev/display_dogm.c new file mode 100755 index 0000000..a655769 --- /dev/null +++ b/src/inc/spi/dev/display_dogm.c @@ -0,0 +1,39 @@ +#include "display_dogm.h" + +void display_dogm_init() +{ + //DDRA |= (1<40mS after VDD stable + _delay_ms(50); // 10ms for safty + + display_dogm_exec(CMD_FUNCTION_SET); + display_dogm_exec(CMD_FUNCTION_SET); + display_dogm_exec(CMD_CONTRAST_SET); + display_dogm_exec(CMD_POWER_CONTROL); + display_dogm_exec(CMD_FOLLOWER_CONTROL); + display_dogm_exec(CMD_DISPLAY_ONOFF); + display_dogm_exec(CMD_ENTRY_MODE_SET); + display_dogm_exec(CMD_DISPLAY_CLEAR); +} + +void display_dogm_putc(char c) +{ + PORTD &= ~(1< + #include + #include "../spi.h" + + #define CONTAST 3 + + #define CMD_FUNCTION_SET 32 + 16 + 8 + 0 + 1 + #define CMD_POWER_CONTROL 64 + 0 + 16 + 0 + 4 + CONTAST + #define CMD_FOLLOWER_CONTROL 0x6E + + #define CMD_ENTRY_MODE_SET 4 + 2 + 0 + #define CMD_DISPLAY_HOME 0 + 2 + 0 + #define CMD_DISPLAY_CLEAR 0 + 0 + 1 + + #define CMD_CONTRAST_SET 0x7F + #define CMD_FUNCTION_SET2 0x38 + #define CMD_DISPLAY_ONOFF 0x0C + #define CMD_DISPLAY_POS 0x80 + + //#define display_dogm_enable() PORTD &= ~(1< + //#define display_dogm_disable() PORTD |= (1< + + + void display_dogm_init(); + void display_dogm_putc(char); + void display_dogm_exec(char); + +#endif diff --git a/src/inc/spi/dev/petit b/src/inc/spi/dev/petit new file mode 160000 index 0000000..b110953 --- /dev/null +++ b/src/inc/spi/dev/petit @@ -0,0 +1 @@ +Subproject commit b1109539d5d34b62849d67a65ce244fcb1d0f5e5 diff --git a/src/inc/spi/spi.c b/src/inc/spi/spi.c new file mode 100755 index 0000000..b04fe7e --- /dev/null +++ b/src/inc/spi/spi.c @@ -0,0 +1,56 @@ +#include "spi.h" + +void spi_init() +{ + // setup SPI-Port + DDR_SPI = (1<'); + /// uart_putc(c); + /// uart_putc('\n'); + SPDR = c; + loop_until_bit_is_set(SPSR, SPIF); + /// stdout_put_string(uart_putc, "- [done]\n"); +} + +unsigned char spi_getc() +{ + SPDR = 0xFF; // init receive register with value + /* Wait for reception complete */ + while(!(SPSR & (1< + #include + #include "../uart/uart.h" + #include "../stdout.h" + + #define SPICLK_DEFAULT SPICLK_64 + #define SPICLK_FAST SPICLK_X2 + + #define PORT_SPI PORTB + #define DDR_SPI DDRB + #define DD_SS DDB4 + #define DD_MOSI DDB5 + #define DD_MISO DDB6 + #define DD_SCK DDB7 + + typedef enum + { + SPICLK_4, // vv nominal clk-speeds + SPICLK_16, + SPICLK_64, + SPICLK_128, + SPICLK_X2, // vv with SPI2x + SPICLK_X32, + SPICLK_X64 + } SPICLK; + + + void spi_init(); + void spi_putc(unsigned char c); + unsigned char spi_getc(); + void spi_setspeed(SPICLK speed); + + +#endif diff --git a/src/inc/stdalg.c b/src/inc/stdalg.c new file mode 100755 index 0000000..99558a9 --- /dev/null +++ b/src/inc/stdalg.c @@ -0,0 +1,29 @@ +#include "stdalg.h" + +#ifdef STDALGO_CRC7 + unsigned char crc7(unsigned char* bytes, unsigned char size) + { + register unsigned char val = 0; // last cycles value + register unsigned char cb; // current byte. + + unsigned char i; + for(i=0; i<=size; i++) + { + cb = bytes[i]; + + int q = (i==size) ? 7 : 8; // counter + do + { + val <<= 1; + if(cb & 0x80) // check MSB of current byte + ++val; // overflow, add 1 + + if(val & 0x80) // check MSB of (last) seed + val ^= 0x9; // polynome + cb <<= 1; + } while(--q); + val &= 0x7f; // lower 7 bits + } + return ((val<<1) + 1); + } +#endif diff --git a/src/inc/stdalg.h b/src/inc/stdalg.h new file mode 100755 index 0000000..5f31cc5 --- /dev/null +++ b/src/inc/stdalg.h @@ -0,0 +1,8 @@ +#ifndef STDALG_H +#define STDALG_H + + #ifdef STDALGO_CRC7 + unsigned char crc7(unsigned char* bytes, unsigned char size); + #endif + +#endif diff --git a/src/inc/stdout.c b/src/inc/stdout.c new file mode 100755 index 0000000..0160e0b --- /dev/null +++ b/src/inc/stdout.c @@ -0,0 +1,154 @@ +#include "stdout.h" + +#ifdef STDOUT_put_string + void stdout_put_string(void (*putc)(char c), const char* s) + { + register unsigned char c; + while ((c=*s++)) + putc(c); + } +#endif + +#ifdef STDOUT_put_uint + void stdout_put_uint(void (*putc)(const char c), int n) + { + unsigned char i; + for(i=0; _devisor_ten[i]>n; i++); + int c=0; + for(; i0; n %= d, d /= 10) + /// putc('0' + (n / d)); + } +#endif + +#ifdef STDOUT_reverse_bits + char stdout_reverse_bits(unsigned char v) + { + unsigned char s = sizeof(v) * CHAR_BIT; // bit size; must be power of 2 + unsigned char mask = ~0; + while ((s >>= 1) > 0) + { + mask ^= (mask << s); + v = ((v >> s) & mask) | ((v << s) & ~mask); + } + return v; + } +#endif + +#ifdef STDOUT_put_binary + void stdout_put_binary(void (*putc)(const char c), const unsigned char data) + { + char i; + for(i=CHAR_BIT-1; i>=0; i--) + { + if(data & (1<='0' && format[0] <='9') + s++; + for(; s>=0; --s) + width += _potences[sizeof(_potences) - s] * (format[-s] - '0'); + + // count numbers width in decimal-system... + for(s=10; s1; width--, putc(f)); // prepend whitespace-character[space] + } + + stdout_put_uint(putc, data.as_uint); + if(format[0] != 'd') + ++format; + } + break; + case 's': + #ifdef STDOUT_put_string + stdout_put_string(putc, va_arg(vl, char*)); + #else + va_arg(vl, int); // remove next argument + #endif + break; + case 'b': + #ifdef STDOUT_put_binary + data.as_int = va_arg(vl, int); + stdout_put_binary(putc, data.as_uint); + #else + va_arg(vl, int); // remove next argument + #endif + break; + } + } + } + while((++format)[0] != '\0'); + return; +} +#endif diff --git a/src/inc/stdout.h b/src/inc/stdout.h new file mode 100755 index 0000000..da7027f --- /dev/null +++ b/src/inc/stdout.h @@ -0,0 +1,41 @@ +#ifndef STDOUT_H +#define STDOUT_H + #include + #include + + #ifdef STDOUT_put_string + void stdout_put_string(void (*putc)(const char c), const char* s); + #endif + + #ifdef STDOUT_put_uint + static const unsigned int _devisor_two[] = + { + /// 2147483648, 1073741824, 536870912, 268435456, 134217728, 67108864, + /// 33554432, 16777216, 8388608, 4194304, 2097152, 1048576, 524288, 262144, + /// 131072, 65536, + 32768, 16384, 8192, 4096, 2048, 1024, 512, 256, 128, 64, + 32, 16, 8, 4, 2, 1 + }; + static const unsigned int _devisor_ten[] = + { + /// 1000000000, 100000000, 10000000, 1000000, 100000, + 10000, 1000, 100, 10, 1 + }; + void stdout_put_uint(void (*putc)(const char c), int n); + #endif + + #ifdef STDOUT_put_binary + void stdout_put_binary(void (*putc)( const char c), const unsigned char data); + #endif + + #ifdef STDOUT_reverse_bits + char stdout_reverse_bits(const unsigned char v); + #endif + + #ifdef STDOUT_putf + #include + extern void dec_put_char(const char); + void stdout_putf(void (*putc)( const char c), const char* format, ...); + #endif + +#endif diff --git a/src/inc/uart/uart.c b/src/inc/uart/uart.c new file mode 100755 index 0000000..b2f1a59 --- /dev/null +++ b/src/inc/uart/uart.c @@ -0,0 +1,47 @@ +#include "uart.h" + +/// // UART-Receiver... +/// ISR(USART_RXC_vect) +/// { + /// unsigned char buffer; + /// buffer = UDR; + /// if(uart_string.size == -1) return; + /// if(buffer == '\n') + /// { + /// uart_string.data[uart_string.size] = '\0'; + /// uart_string.size = -1; + /// } + /// else + /// { + /// uart_string.data[uart_string.size] = buffer; + /// if(++uart_string.size > STRING_SIZE) + /// { uart_string.size = 0; } + /// } +/// } + +void uart_init() +{ + /// uart_string.size = 0; + /// uart_string.data[0] = '\0'; + + // activate UART TX // and RX... + UCSRB |= (1< + #include + + /// #define STRING_SIZE 32 + /// typedef struct + /// { + /// char data[STRING_SIZE]; + /// int8_t size; + /// } string; + /// volatile string uart_string; + + void uart_init(); + void uart_putc(char c); + +#endif diff --git a/src/main.c b/src/main.c new file mode 100755 index 0000000..2acae0a --- /dev/null +++ b/src/main.c @@ -0,0 +1,277 @@ +#include +#include + +// shared routines... +#include "inc/stdout.h" + +// uart-driven... +/// #include "inc/uart/uart.h" + +// interrupt-driven... +#include "inc/int/dcf77/clock.h" + +// spi-driven... +#include "inc/spi/spi.h" +#include "inc/spi/dev/display_dogm.h" +#include "inc/spi/dev/audio_vs1011.h" + +/// #include "inc/spi/dev/petit/pff.h" +/// #include "inc/spi/dev/petit/diskio.h" + +/* +static void showtime() +{ + const char* dow[] = {"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"}; + + display_dogm_exec(CMD_DISPLAY_POS + 0); + stdout_put_uint(display_dogm_putc, t_current.h); + display_dogm_putc(':'); + stdout_put_uint(display_dogm_putc, t_current.m); + display_dogm_putc(':'); + stdout_put_uint(display_dogm_putc, t_current.s); + + display_dogm_exec(CMD_DISPLAY_POS + 16); + if(t_current.wd > 0 && t_current.wd < 6) + stdout_put_string(display_dogm_putc, dow[t_current.wd]); + else + stdout_put_string(display_dogm_putc, "dow:n/a"); +} +*/ + +/* +void notify_error(FRESULT res) +{ + switch(res) + { + case FR_OK: + stdout_put_string(display_dogm_putc, "FR_OK\n"); + break; + case FR_DISK_ERR: + stdout_put_string(display_dogm_putc, "FR_DISK_ERR\n"); + break; + case FR_NOT_READY: + stdout_put_string(display_dogm_putc, "FR_NOT_READY\n"); + break; + case FR_NO_FILE: + stdout_put_string(display_dogm_putc, "FR_NO_FILE\n"); + break; + case FR_NO_PATH: + stdout_put_string(display_dogm_putc, "FR_NO_PATH\n"); + break; + case FR_NOT_OPENED: + stdout_put_string(display_dogm_putc, "FR_NOT_OPENED\n"); + break; + case FR_NOT_ENABLED: + stdout_put_string(display_dogm_putc, "FR_NOT_ENABLED\n"); + break; + case FR_NO_FILESYSTEM: + stdout_put_string(display_dogm_putc, "FR_NO_FILESYSTEM\n"); + break; + default: + stdout_put_string(display_dogm_putc, "FR_UNKNOWN\n"); + break; + } + + _delay_ms(1000); + display_dogm_exec(CMD_DISPLAY_CLEAR); +} +*/ + +int main() +{ + /// uart_init(); + spi_init(); + /// display_dogm_init(); + /// stdout_put_string(display_dogm_putc, "Display initialized!"); + /// DDRD = (1<=12; q--) + { + if(dcf77[q].bit == 1) + display_dogm_putc('1'); + else + display_dogm_putc('0'); + } + + display_dogm_exec(CMD_DISPLAY_POS + 16); + for(q=DCF_HOURP; q>=DCF_HOUR-1; q--) + { + if(dcf77[q].bit == 1) + display_dogm_putc('1'); + else + display_dogm_putc('0'); + } + + display_dogm_putc(' '); + stdout_put_uint(display_dogm_putc, lastinterval); + display_dogm_putc(' '); + stdout_put_uint(display_dogm_putc, dcf77_bit); + + + display_dogm_exec(CMD_DISPLAY_POS + 32); + //stdout_put_uint(display_dogm_putc, t_current.ms); + stdout_put_uint(display_dogm_putc, t_current.h); + display_dogm_putc(':'); + stdout_put_uint(display_dogm_putc, t_current.m); + display_dogm_putc(':'); + stdout_put_uint(display_dogm_putc, t_current.s); + + display_dogm_putc(' '); + stdout_put_uint(display_dogm_putc, t_current.dd); + display_dogm_putc(':'); + stdout_put_uint(display_dogm_putc, t_current.mm); + display_dogm_putc(':'); + stdout_put_uint(display_dogm_putc, t_current.yy); + _delay_ms(100); +} + +/* + + display_dogm_exec(CMD_DISPLAY_POS + 0); + stdout_put_string(display_dogm_putc, "test: vs-init..."); + /// audio_vs1011_init(); + _delay_ms(1000); + + display_dogm_exec(CMD_DISPLAY_POS + 16); + stdout_put_string(display_dogm_putc, "test: volume..."); + /// audio_vs1011_test_volume(); + _delay_ms(1000); + + display_dogm_exec(CMD_DISPLAY_POS + 32); + stdout_put_string(display_dogm_putc, "test: sine..."); + /// audio_vs1011_test_sine(); + _delay_ms(1000); +*/ +/* + FATFS fs; // File system object + + char t = 0; + for(;;) + { + if(t) + { + PORTD |= ((1<\t\n"); + for(i=0; i<5; i++) + audio_vs1011_test_sine(); + stdout_put_string(uart_putc, "\n"); + */ + + /* + + for(i=0; i<5; i++) + audio_vs1011_test_eeprom(); + + display_dogm_exec(CMD_DISPLAY_CLEAR); + display_dogm_exec(CMD_DISPLAY_POS + 0); + stdout_put_string(display_dogm_putc, "[volume test]"); + for(i=0; i<5; i++) + audio_vs1011_test_volume(); + + */ -- cgit v1.2.3