diff --git a/tools/oneclick/prestudy/YAML/mm_menu.py b/tools/oneclick/prestudy/YAML/mm_menu.py index 58082a442519531704824e5ca76473ab7f8a30f9..a565da47b869dd081f0b88f7d2568674d6ad309f 100755 --- a/tools/oneclick/prestudy/YAML/mm_menu.py +++ b/tools/oneclick/prestudy/YAML/mm_menu.py @@ -35,7 +35,7 @@ from py_mm_lib import * def main(): - """ main function """ + """ main """ while True: menu_choice = show_menu().lower() if menu_choice == 'q': @@ -68,10 +68,12 @@ def show_menu(): def get_filename(): + """ ask user for filename to load """ return raw_input("wich file: ") def generate_report(filename): + """ generate report (pdf) for loaded file. """ try: config = yaml.load(open(filename, "r")) name = config.keys()[0] @@ -92,6 +94,7 @@ def generate_report(filename): def show_overview(filename): + """ show overview of loaded file """ try: config = yaml.load(open(filename, "r")) name = config.keys()[0] @@ -110,6 +113,7 @@ def generate_system_rom(filename): """ generate system_rom reg and txt file """ system_rom = SystemRom() system_rom.read_system(filename) + system_rom.calc_offsets() system_rom.generate_reg() system_rom.generate_txt() diff --git a/tools/oneclick/prestudy/YAML/py_mm_lib/system_rom.py b/tools/oneclick/prestudy/YAML/py_mm_lib/system_rom.py index 9dc5656001bc8ffa7a8c9bcfc202d22e67e29582..1dab7a45aaba43ad1583c07605aa51d781d4c8bd 100644 --- a/tools/oneclick/prestudy/YAML/py_mm_lib/system_rom.py +++ b/tools/oneclick/prestudy/YAML/py_mm_lib/system_rom.py @@ -70,7 +70,7 @@ class SystemRom(object): for name in slave_order: peripheral = peripherals[name] for key, val in peripheral.rams.items(): - width = int(val['with']) + width = int(val['width']) depth = int(val['depth']) n_words = int(ceil(float(width) / self.word_size)) n_addresses = n_words * depth