diff --git a/compiler/datasheet/assets/OpenRAM_logo.png b/compiler/datasheet/assets/OpenRAM_logo.png new file mode 100644 index 00000000..d155cce0 Binary files /dev/null and b/compiler/datasheet/assets/OpenRAM_logo.png differ diff --git a/compiler/datasheet/assets/datasheet.css b/compiler/datasheet/assets/datasheet.css index ff16f101..629239bd 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: #004184; - color: #F1B521; + background-color: #003C6C; + color: #FDC700; } diff --git a/compiler/datasheet/assets/openram_logo_placeholder.png b/compiler/datasheet/assets/openram_logo_placeholder.png deleted file mode 100644 index b19f0bfe..00000000 Binary files a/compiler/datasheet/assets/openram_logo_placeholder.png and /dev/null differ diff --git a/compiler/datasheet/assets/vlsi_logo.png b/compiler/datasheet/assets/vlsi_logo.png index 3f02a45e..784277af 100644 Binary files a/compiler/datasheet/assets/vlsi_logo.png and b/compiler/datasheet/assets/vlsi_logo.png differ diff --git a/compiler/datasheet/datasheet.py b/compiler/datasheet/datasheet.py index 4b5cb741..a7700349 100644 --- a/compiler/datasheet/datasheet.py +++ b/compiler/datasheet/datasheet.py @@ -35,11 +35,10 @@ class datasheet(): # Add openram logo openram_logo = 0 - with open(os.path.abspath(os.environ.get("OPENRAM_HOME")) + '/datasheet/assets/openram_logo_placeholder.png', "rb") as image_file: + with open(os.path.abspath(os.environ.get("OPENRAM_HOME")) + '/datasheet/assets/OpenRAM_logo.png', "rb") as image_file: openram_logo = base64.b64encode(image_file.read()) - self.html += 'VLSIDA'.format(str(vlsi_logo)[ - 2:-1]) + self.html += 'VLSIDAOpenRAM'.format(str(vlsi_logo)[2:-1], str(openram_logo)[2:-1]) self.html += '

' + \ self.name + '.html' + '

' @@ -53,7 +52,7 @@ class datasheet(): # print port table self.html += '

Ports and Configuration

' self.html += self.io_table.to_html() - + # print operating condidition information self.html += '

Operating Conditions

' self.html += self.operating_table.to_html() @@ -61,8 +60,8 @@ class datasheet(): # check if analytical model is being used self.html += '

Timing Data

' model = '' - if self.ANALYTICAL_MODEL: - model = "analytical model: results may not be percise" + if self.ANALYTICAL_MODEL == 'True': + model = "analytical model: results may not be precise" else: model = "spice characterizer" # display timing data diff --git a/compiler/datasheet/datasheet_gen.py b/compiler/datasheet/datasheet_gen.py index 1644df5f..3b4fe2ac 100644 --- a/compiler/datasheet/datasheet_gen.py +++ b/compiler/datasheet/datasheet_gen.py @@ -105,16 +105,16 @@ def parse_characterizer_csv(f, pages): DATETIME = row[col] col += 1 + + ANALYTICAL_MODEL = row[col] + col += 1 DRC = row[col] col += 1 LVS = row[col] col += 1 - - ANALYTICAL_MODEL = row[col] - col += 1 - + AREA = row[col] col += 1 @@ -615,7 +615,7 @@ def parse_characterizer_csv(f, pages): new_sheet.io_table.add_row(['NUM_R_PORTS', NUM_R_PORTS]) new_sheet.io_table.add_row(['NUM_W_PORTS', NUM_W_PORTS]) new_sheet.io_table.add_row( - ['Area (µm2)', AREA]) + ['Area (µm2)', str(round(float(AREA)))]) class datasheet_gen():