From 59bd51d207747efcdd37b5577f817cd95ff5edbb Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 16 Sep 2021 20:09:33 -0400 Subject: [PATCH] avrsim: Change default speed to 16Mhz and default baud to 250K Signed-off-by: Kevin O'Connor --- docs/Debugging.md | 11 +++++------ scripts/avrsim.py | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/Debugging.md b/docs/Debugging.md index a9d35383..59e5e483 100644 --- a/docs/Debugging.md +++ b/docs/Debugging.md @@ -219,13 +219,12 @@ cd /path/to/klipper make menuconfig ``` -and compile the micro-controller software for an AVR atmega644p, set -the MCU frequency to 20Mhz, and select SIMULAVR software emulation -support. Then one can compile Klipper (run `make`) and then start the -simulation with: +and compile the micro-controller software for an AVR atmega644p and +select SIMULAVR software emulation support. Then one can compile +Klipper (run `make`) and then start the simulation with: ``` -PYTHONPATH=/path/to/simulavr/src/python/ ./scripts/avrsim.py -m atmega644 -s 20000000 -b 250000 out/klipper.elf +PYTHONPATH=/path/to/simulavr/src/python/ ./scripts/avrsim.py out/klipper.elf ``` Then, with simulavr running in another window, one can run the @@ -246,7 +245,7 @@ the directions above, but run avrsim.py with a command-line like the following: ``` -PYTHONPATH=/path/to/simulavr/src/python/ ./scripts/avrsim.py -m atmega644 -s 20000000 -b 250000 out/klipper.elf -t PORTA.PORT,PORTC.PORT +PYTHONPATH=/path/to/simulavr/src/python/ ./scripts/avrsim.py out/klipper.elf -t PORTA.PORT,PORTC.PORT ``` The above would create a file **avrsim.vcd** with information on each diff --git a/scripts/avrsim.py b/scripts/avrsim.py index 7bde13eb..e7f191e8 100755 --- a/scripts/avrsim.py +++ b/scripts/avrsim.py @@ -169,11 +169,11 @@ def main(): opts = optparse.OptionParser(usage) opts.add_option("-m", "--machine", type="string", dest="machine", default="atmega644", help="type of AVR machine to simulate") - opts.add_option("-s", "--speed", type="int", dest="speed", default=8000000, + opts.add_option("-s", "--speed", type="int", dest="speed", default=16000000, help="machine speed") opts.add_option("-r", "--rate", type="float", dest="pacing_rate", default=0., help="real-time pacing rate") - opts.add_option("-b", "--baud", type="int", dest="baud", default=38400, + opts.add_option("-b", "--baud", type="int", dest="baud", default=250000, help="baud rate of the emulated serial port") opts.add_option("-t", "--trace", type="string", dest="trace", help="signals to trace (? for help)")