From 70ac2e8aa4003d4efdf515804dc6db7a55811a96 Mon Sep 17 00:00:00 2001 From: Jesse Cirimelli-Low Date: Tue, 30 Oct 2018 22:56:13 -0700 Subject: [PATCH] changed css to orange and black for Halloween; fixed CSb timing table in datasheet --- compiler/datasheet/assets/datasheet.css | 4 ++-- compiler/datasheet/datasheet_gen.py | 28 ++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/compiler/datasheet/assets/datasheet.css b/compiler/datasheet/assets/datasheet.css index 5d5a04e5..5d4f1470 100644 --- a/compiler/datasheet/assets/datasheet.css +++ b/compiler/datasheet/assets/datasheet.css @@ -19,8 +19,8 @@ padding-top: 11px; padding-bottom: 11px; text-align: left; - background-color: #3CAF50; - color: white; + background-color: #FF8C00; + color: black; } diff --git a/compiler/datasheet/datasheet_gen.py b/compiler/datasheet/datasheet_gen.py index 767990fa..318d345f 100644 --- a/compiler/datasheet/datasheet_gen.py +++ b/compiler/datasheet/datasheet_gen.py @@ -81,8 +81,8 @@ def parse_characterizer_csv(f,pages): FF_HOLD_HL_MIN = row[20] FF_HOLD_HL_MAX = row[21] - - + + for sheet in pages: @@ -121,25 +121,25 @@ def parse_characterizer_csv(f,pages): for item in sheet.timing: if item.paramter == "CSb setup rising": if float(FF_SETUP_LH_MIN) < float(item.min): - item.min = FF_SETUP_LH + item.min = FF_SETUP_LH_MIN elif float(FF_SETUP_LH_MAX) > float(item.max): - item.max = FF_SETUP_LH + item.max = FF_SETUP_LH_MAX if item.paramter == "CSb setup falling": - if float(FF_SETUP_HL_MIN) > float(item.min): - item.max = FF_SETUP_HL_MIN + if float(FF_SETUP_HL_MIN) < float(item.min): + item.min = FF_SETUP_HL_MIN elif float(FF_SETUP_HL_MAX) > float(item.nax): item.max = FF_SETUP_HL_MAX if item.paramter == "CSb hold rising": - if float(FF_HOLD_HL_MIN) > float(item.min): - item.max = FF_SETUP_HL_MIN + if float(FF_HOLD_HL_MIN) < float(item.min): + item.min = FF_SETUP_HL_MIN elif float(FF_HOLD_HL_MAX) > float(item.nax): item.max = FF_SETUP_HL_MAX - if item.paramter == "CSb hold rising": - if float(FF_HOLD_HL_MIN) > float(item.min): - item.max = FF_SETUP_HL_MIN + if item.paramter == "CSb hold falling": + if float(FF_HOLD_HL_MIN) < float(item.min): + item.min = FF_SETUP_HL_MIN elif float(FF_HOLD_HL_MAX) > float(item.nax): item.max = FF_SETUP_HL_MAX @@ -149,7 +149,7 @@ def parse_characterizer_csv(f,pages): new_sheet.dlv.append(deliverables_item('.lib','Synthesis models','{1}'.format(LIB_NAME,LIB_NAME.replace(OUT_DIR,'')))) if found == 0: - + #if this is the first corner for this sram, run first time configuration and set up tables new_sheet = datasheet(NAME) pages.append(new_sheet) @@ -170,8 +170,8 @@ def parse_characterizer_csv(f,pages): new_sheet.timing.append(timing_and_current_data_item('Positive clk hold','2','3','4')) new_sheet.timing.append(timing_and_current_data_item('CSb setup rising',FF_SETUP_LH_MIN,FF_SETUP_LH_MAX,'ns')) new_sheet.timing.append(timing_and_current_data_item('CSb setup falling',FF_SETUP_HL_MIN,FF_SETUP_HL_MAX,'ns')) - new_sheet.timing.append(timing_and_current_data_item('CSb hold rising',FF_SETUP_LH_MIN,FF_SETUP_LH_MAX,'ns')) - new_sheet.timing.append(timing_and_current_data_item('CSb hold falling',FF_SETUP_HL_MIN,FF_SETUP_HL_MAX,'ns')) + new_sheet.timing.append(timing_and_current_data_item('CSb hold rising',FF_HOLD_LH_MIN,FF_HOLD_LH_MAX,'ns')) + new_sheet.timing.append(timing_and_current_data_item('CSb hold falling',FF_HOLD_HL_MIN,FF_HOLD_HL_MAX,'ns')) new_sheet.timing.append(timing_and_current_data_item('AC current','2','3','4')) new_sheet.timing.append(timing_and_current_data_item('Standby current','2','3','4')) new_sheet.timing.append(timing_and_current_data_item('Area','2','3','4'))