Skip to content

Commit

Permalink
#33
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Oct 22, 2020
1 parent 92b9ba9 commit 38a5a96
Show file tree
Hide file tree
Showing 17 changed files with 27,371 additions and 27,517 deletions.
42 changes: 0 additions & 42 deletions modular-psu-firmware.eez-project
Original file line number Diff line number Diff line change
Expand Up @@ -992,16 +992,6 @@
"type": "string",
"defaultValue": "00-00-00-00-00-00"
},
{
"name": "channel_is_voltage_balanced",
"type": "boolean",
"defaultValue": "0"
},
{
"name": "channel_is_current_balanced",
"type": "boolean",
"defaultValue": "0"
},
{
"name": "sys_output_protection_coupled",
"type": "boolean",
Expand Down Expand Up @@ -35561,14 +35551,6 @@
"name": "encoder_cursor_14_enabled",
"inheritFrom": "encoder_cursor_enabled"
},
{
"name": "encoder_cursor_14_enabled_balanced",
"inheritFrom": "encoder_cursor_enabled",
"alwaysBuild": true,
"color": "text_enabled_balanced",
"activeBackgroundColor": "text_enabled_balanced",
"focusBackgroundColor": "text_enabled_balanced"
},
{
"name": "encoder_cursor_14_disabled",
"inheritFrom": "encoder_cursor_disabled",
Expand All @@ -35579,15 +35561,6 @@
"inheritFrom": "encoder_cursor_enabled",
"alignHorizontal": "right"
},
{
"name": "encoder_cursor_14_right_enabled_balanced",
"inheritFrom": "encoder_cursor_enabled",
"alwaysBuild": true,
"alignHorizontal": "right",
"color": "text_enabled_balanced",
"activeBackgroundColor": "text_enabled_balanced",
"focusBackgroundColor": "text_enabled_balanced"
},
{
"name": "encoder_cursor_14_right_disabled",
"inheritFrom": "encoder_cursor_disabled",
Expand All @@ -35599,15 +35572,6 @@
"inheritFrom": "encoder_cursor_enabled",
"font": "Oswald17"
},
{
"name": "encoder_cursor_17_enabled_balanced",
"inheritFrom": "encoder_cursor_enabled",
"alwaysBuild": true,
"font": "Oswald17",
"color": "text_enabled_balanced",
"activeBackgroundColor": "text_enabled_balanced",
"focusBackgroundColor": "text_enabled_balanced"
},
{
"name": "ch_prot_off",
"inheritFrom": "default",
Expand Down Expand Up @@ -57716,9 +57680,6 @@
{
"name": "text_enabled"
},
{
"name": "text_enabled_balanced"
},
{
"name": "text_selected"
},
Expand Down Expand Up @@ -57889,7 +57850,6 @@
"#1b4fd9",
"#ffffff",
"#ffffff",
"#aaaaaa",
"#5080ff",
"#4c72da",
"#404040",
Expand Down Expand Up @@ -57952,7 +57912,6 @@
"#f0f0f0",
"#202020",
"#434cf6",
"#050c7a",
"#d0d0d0",
"#d0d0d0",
"#404040",
Expand Down Expand Up @@ -58015,7 +57974,6 @@
"#000000",
"#d0d0d0",
"#ffff7f",
"#aaaa00",
"#ff8000",
"#303030",
"#f9fff0",
Expand Down
12,166 changes: 6,081 additions & 6,085 deletions src/eez/gui/document_simulator.cpp

Large diffs are not rendered by default.

Loading

0 comments on commit 38a5a96

Please sign in to comment.