b28d03a16bad7df6303b7798da3cb563bd0de06b

Fixed a few comments

Signed-off-by: Michel Pollet <buserror@gmail.com>

diff --git a/README b/README
index a8496d6c30da17a6c4225641b1716cfab7fca9be..ce3bdffa3161fda4f790a8db449c1ae04a01fa73 100644 (file)
--- 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 6378f980629b9ce4b3bb3d2b1e28aabfdf59303e..ef9945f76f37e30811f08790ee847793327e9c91 100644 (file)
--- 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 d1c5b35743e503dcd7b827073f832f2f78d84f75..6d4e1d875ad4be09bd5313d7e32f2c610a52d9a7 100644 (file)
--- 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 ae02e32e07c1b0179d04a9fda0c4846d1009dea8..b2a892d7fa192aeb90657af46121d92a2a7b7bbd 100644 (file)
--- 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 6f6d006e4c17f8342804c5220e2418a9cdc2d435..280249f1f27adefd5d3c83bb122bbe8352337604 100644 (file)
--- 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 dc1430c13cda3bc44443515e33d4f426c22e975a..9695c057dd9cee89d7d778f214475aac8154157b 100644 (file)
--- 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"