Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

feat: better config view #681

Merged
merged 1 commit into from
Oct 3, 2024
Merged

feat: better config view #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auto_package/templates/info.nj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"displayName": "TerosHDL",
"publisher": "teros-technology",
"description": "Powerful toolbox for ASIC/FPGA: state machine viewer, linter, documentation, snippets... and more! ",
"version": "6.0.10",
"version": "6.0.11",
"engines": {
"vscode": "^1.74.0"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"displayName": "TerosHDL",
"publisher": "teros-technology",
"description": "Powerful toolbox for ASIC/FPGA: state machine viewer, linter, documentation, snippets... and more! ",
"version": "6.0.10",
"version": "6.0.11",
"engines": {
"vscode": "^1.74.0"
},
Expand Down
48 changes: 24 additions & 24 deletions src/colibri/config/config_declaration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,11 @@ export type e_templates_general = {

export type e_tools_general = {
select_tool : e_tools_general_select_tool,
gtkwave_installation_path : string,
gtkwave_extra_arguments : string,
manual_compilation_order : string,
execution_mode : e_tools_general_execution_mode,
waveform_viewer : e_tools_general_waveform_viewer,
manual_compilation_order : string,
gtkwave_installation_path : string,
gtkwave_extra_arguments : string,
};

export type e_tools_quartus = {
Expand Down Expand Up @@ -919,11 +919,11 @@ export function get_default_config(): e_config {
tools: {
general: {
select_tool : e_tools_general_select_tool.ghdl,
gtkwave_installation_path : "",
gtkwave_extra_arguments : "",
manual_compilation_order : "",
execution_mode : e_tools_general_execution_mode.cmd,
waveform_viewer : e_tools_general_waveform_viewer.tool,
manual_compilation_order : "",
gtkwave_installation_path : "",
gtkwave_extra_arguments : "",
},
quartus: {
installation_path : "",
Expand Down Expand Up @@ -1799,40 +1799,40 @@ export function get_config_from_json(json_config: any): e_config {
default_config['tools']['general']['select_tool'] = e_tools_general_select_tool.sandpiper;
}

// tools -> general -> gtkwave_installation_path
const current_value_73 = json_config['tools']['general']['gtkwave_installation_path'];
// tools -> general -> manual_compilation_order
const current_value_73 = json_config['tools']['general']['manual_compilation_order'];
if (typeof current_value_73 === 'string'){
default_config['tools']['general']['gtkwave_installation_path'] = current_value_73;
}

// tools -> general -> gtkwave_extra_arguments
const current_value_74 = json_config['tools']['general']['gtkwave_extra_arguments'];
if (typeof current_value_74 === 'string'){
default_config['tools']['general']['gtkwave_extra_arguments'] = current_value_74;
default_config['tools']['general']['manual_compilation_order'] = current_value_73;
}

// tools -> general -> execution_mode
const current_value_75 = json_config['tools']['general']['execution_mode'];
if ( current_value_75 === "gui"){
const current_value_74 = json_config['tools']['general']['execution_mode'];
if ( current_value_74 === "gui"){
default_config['tools']['general']['execution_mode'] = e_tools_general_execution_mode.gui;
}
if ( current_value_75 === "cmd"){
if ( current_value_74 === "cmd"){
default_config['tools']['general']['execution_mode'] = e_tools_general_execution_mode.cmd;
}

// tools -> general -> waveform_viewer
const current_value_76 = json_config['tools']['general']['waveform_viewer'];
if ( current_value_76 === "tool"){
const current_value_75 = json_config['tools']['general']['waveform_viewer'];
if ( current_value_75 === "tool"){
default_config['tools']['general']['waveform_viewer'] = e_tools_general_waveform_viewer.tool;
}
if ( current_value_76 === "gtkwave"){
if ( current_value_75 === "gtkwave"){
default_config['tools']['general']['waveform_viewer'] = e_tools_general_waveform_viewer.gtkwave;
}

// tools -> general -> manual_compilation_order
const current_value_77 = json_config['tools']['general']['manual_compilation_order'];
// tools -> general -> gtkwave_installation_path
const current_value_76 = json_config['tools']['general']['gtkwave_installation_path'];
if (typeof current_value_76 === 'string'){
default_config['tools']['general']['gtkwave_installation_path'] = current_value_76;
}

// tools -> general -> gtkwave_extra_arguments
const current_value_77 = json_config['tools']['general']['gtkwave_extra_arguments'];
if (typeof current_value_77 === 'string'){
default_config['tools']['general']['manual_compilation_order'] = current_value_77;
default_config['tools']['general']['gtkwave_extra_arguments'] = current_value_77;
}

// tools -> quartus -> installation_path
Expand Down
Loading
Loading