diff -Bb -up freq_meter/cpu_mhz.h freq_meter-20100823/cpu_mhz.h --- freq_meter/cpu_mhz.h 2010-08-22 17:03:09.000000000 +0200 +++ freq_meter-20100823/cpu_mhz.h 2010-08-23 22:07:54.000000000 +0200 @@ -1,6 +1,6 @@ -// autogenerated by ./avr_isp.pl, Sun Aug 22 17:03:09 2010 +// autogenerated by ./avr_isp.pl, Mon Aug 23 22:07:54 2010 #ifndef CPU_MHZ -# define CPU_MHZ 12 -# define CPU_MHZ_10 120 -# define F_CPU 12000000L +# define CPU_MHZ 20 +# define CPU_MHZ_10 200 +# define F_CPU 20000000L #endif diff -Bb -up freq_meter/lcd_hd44780u.h freq_meter-20100823/lcd_hd44780u.h --- freq_meter/lcd_hd44780u.h 2010-08-22 16:56:56.000000000 +0200 +++ freq_meter-20100823/lcd_hd44780u.h 2010-08-24 00:20:01.000000000 +0200 @@ -80,6 +80,8 @@ static inline void lcd_write4 (uint8_t d // RW setup time t_AS: min 40ns (60ns) - considered already set LCDC_PORT |= (1<> LCD_D4; LCDC_PORT &= ~(1< + * 20100823 - uwe de0508 * License: GPL v2 */ @@ -21,14 +22,14 @@ #define _TOSTRING2(x) #x #define _TOSTRING(x) _TOSTRING2(x) -#define INIT_TEXT "FreqC V" _TOSTRING(VERSION) +#define INIT_TEXT "Frequency Meter Version " _TOSTRING(VERSION) #define MIN_SAMPLE_TIME 0.5 // May be extended by up to a full cycle #define MIN_RES 5 // Minimum resolution: 6 numbers i.e. .000001 #define MAX_RES 7 // Maximum resolution: 7 numbers i.e. 123456.7 #define INPUT_PULLUP 0 // Set to 1 to enable pullup at input pin(s) -#define DEBUG_LED 0 // Enable to have blinking lights +#define DEBUG_LED 1 // Enable to have blinking lights #define DEBUG_LCD 0 // Only working with min. 2x8 displays #if DEBUG_LCD @@ -41,7 +42,7 @@ */ #define LCD_LINES 2 // 1 or 2 lines -#define LCD_COLS 5 // 10col display (2*5) - only required for wrap +#define LCD_COLS 16 // 10col display (2*5) - only required for wrap #if defined (__AVR_ATtiny2313__) || defined (__AVR_ATtiny2313A__) @@ -279,8 +280,11 @@ extern int main (void) /* Init LCD */ lcd_init (); _delay_ms (200.0); + lcd_clear (); // clear display lcd_putswrap (0, 0, INIT_TEXT); - _delay_ms (500.0); + _delay_ms (1000.0); + + lcd_clear (); // clear display /* Setup pull-up for external input - allow open collector inputs */ /* INT0 and T0 have to be connected */ diff -Bb -up freq_meter/Makefile freq_meter-20100823/Makefile --- freq_meter/Makefile 2010-08-22 16:59:11.000000000 +0200 +++ freq_meter-20100823/Makefile 2010-08-23 22:04:47.000000000 +0200 @@ -9,8 +9,10 @@ CFILES = main.c #CPU = tiny2313 CPU = mega48 #CPU = mega8 +#CPU = mega88 +#CPU = mega32 -PROG_HW = usbtiny # www.ladyada.com +PROG_HW = usbasp PROG_SW = avrdude CFLAGS += -Os -g -Wall