From: Michel Pollet Date: Mon, 25 Oct 2010 11:53:29 +0000 (+0100) Subject: misc: Typos X-Git-Tag: v1.0a6~4 X-Git-Url: https://git.htl-mechatronik.at/public/?a=commitdiff_plain;h=b28d03a16bad7df6303b7798da3cb563bd0de06b;p=sx%2Fsimavr.git misc: Typos Fixed a few comments Signed-off-by: Michel Pollet --- diff --git a/README b/README index a8496d6..ce3bdff 100644 --- a/README +++ b/README @@ -14,7 +14,9 @@ specify simulation parameters directly in the emulated code using an .elf sectio The status of the project is the core works fine now. The supported IOs are eeprom, watchdog, self-programming (ie bootloader), external interrupts (INT0 etc), IO ports (including pin interupts), 8&16 bits timers (well, some of the modes), -SPI master & slave, and the UART with tx&rx interrupts. +SPI master & slave, ADC, and the UART with tx&rx interrupts. + +The only notable missing bits are i2c and XMEM bus access (for the big Megas) gdb support is implemented and works great (minus watchpoints). diff --git a/examples/board_timer_64led/README b/examples/board_timer_64led/README index 6378f98..ef9945f 100644 --- a/examples/board_timer_64led/README +++ b/examples/board_timer_64led/README @@ -4,8 +4,8 @@ timer_64led This is a real life project, see enclosed JPEG. -At atmega168 drives 4 74HC595 shift registers to drive 6 LEDs. 3 Buttons -provite an interface for "start", "stop" and "reset" of the timer. +At atmega168 drives 4 74HC595 shift registers to drive 64 LEDs. 3 Buttons +provide an interface for "start", "stop" and "reset" of the timer. The timer handles multiple days by switching to display "hours + minutes" instead of "minutes + seconds" after an hour. diff --git a/simavr/cores/sim_mega128.c b/simavr/cores/sim_mega128.c index d1c5b35..6d4e1d8 100644 --- a/simavr/cores/sim_mega128.c +++ b/simavr/cores/sim_mega128.c @@ -251,9 +251,9 @@ struct mcu_t { AVR_IO_REGBIT(TCCR1B, WGM12), AVR_IO_REGBIT(TCCR1B, WGM13) }, .wgm_op = { [0] = AVR_TIMER_WGM_NORMAL16(), - // TODO: 1 PWM phase corret 8bit - // 2 PWM phase corret 9bit - // 3 PWM phase corret 10bit + // TODO: 1 PWM phase correct 8bit + // 2 PWM phase correct 9bit + // 3 PWM phase correct 10bit [4] = AVR_TIMER_WGM_CTC(), [5] = AVR_TIMER_WGM_FASTPWM8(), [6] = AVR_TIMER_WGM_FASTPWM9(), @@ -359,15 +359,15 @@ struct mcu_t { AVR_IO_REGBIT(TCCR3B, WGM32), AVR_IO_REGBIT(TCCR3B, WGM33) }, .wgm_op = { [0] = AVR_TIMER_WGM_NORMAL16(), - // TODO: 1 PWM phase corret 8bit - // 2 PWM phase corret 9bit - // 3 PWM phase corret 10bit + // TODO: 1 PWM phase correct 8bit + // 2 PWM phase correct 9bit + // 3 PWM phase correct 10bit [4] = AVR_TIMER_WGM_CTC(), [5] = AVR_TIMER_WGM_FASTPWM8(), [6] = AVR_TIMER_WGM_FASTPWM9(), [7] = AVR_TIMER_WGM_FASTPWM10(), - // TODO: 8 PWM phase and freq corret ICR - // 9 PWM phase and freq corret OCR + // TODO: 8 PWM phase and freq correct ICR + // 9 PWM phase and freq correct OCR // 10 // 11 [12] = AVR_TIMER_WGM_ICCTC(), diff --git a/simavr/cores/sim_megax4.h b/simavr/cores/sim_megax4.h index ae02e32..b2a892d 100644 --- a/simavr/cores/sim_megax4.h +++ b/simavr/cores/sim_megax4.h @@ -39,7 +39,7 @@ void mx4_init(struct avr_t * avr); void mx4_reset(struct avr_t * avr); /* - * This is a template for all of the x4 devices, hopefuly + * This is a template for all of the x4 devices, hopefully */ struct mcu_t { avr_t core; diff --git a/simavr/cores/sim_megax8.h b/simavr/cores/sim_megax8.h index 6f6d006..280249f 100644 --- a/simavr/cores/sim_megax8.h +++ b/simavr/cores/sim_megax8.h @@ -39,7 +39,7 @@ void mx8_init(struct avr_t * avr); void mx8_reset(struct avr_t * avr); /* - * This is a template for all of the x8 devices, hopefuly + * This is a template for all of the x8 devices, hopefully */ struct mcu_t { avr_t core; diff --git a/simavr/sim/sim_avr.h b/simavr/sim/sim_avr.h index dc1430c..9695c05 100644 --- a/simavr/sim/sim_avr.h +++ b/simavr/sim/sim_avr.h @@ -91,7 +91,7 @@ typedef struct avr_t { int state; // stopped, running, sleeping uint32_t frequency; // frequency we are running at // mostly used by the ADC for now - uint32_t vcc,avcc,aref; // (optional) voltages + uint32_t vcc,avcc,aref; // (optional) voltages in millivolts // cycles gets incremented when sleeping and when running; it corresponds // not only to "cycles that runs" but also "cycles that might have run"