Skip to content

Commit

Permalink
improved dlog recording
Browse files Browse the repository at this point in the history
  • Loading branch information
mvladic committed Mar 27, 2020
1 parent ccecd6d commit 4344b23
Show file tree
Hide file tree
Showing 11 changed files with 38,932 additions and 38,909 deletions.
14 changes: 7 additions & 7 deletions modular-psu-firmware.eez-project
Original file line number Diff line number Diff line change
Expand Up @@ -1856,7 +1856,7 @@
{
"name": "file_manager_file_size",
"type": "string",
"defaultValue": "999.99K"
"defaultValue": "442.39 MB"
},
{
"name": "file_manager_file_selected",
Expand Down Expand Up @@ -47536,7 +47536,7 @@
"data": "file_manager_file_name",
"left": 36,
"top": 0,
"width": 224,
"width": 220,
"height": 34,
"text": ""
},
Expand All @@ -47548,9 +47548,9 @@
"alignHorizontal": "right"
},
"data": "file_manager_file_size",
"left": 260,
"left": 256,
"top": 0,
"width": 80,
"width": 84,
"height": 34,
"text": ""
},
Expand Down Expand Up @@ -47605,7 +47605,7 @@
"data": "file_manager_file_name",
"left": 36,
"top": 0,
"width": 224,
"width": 220,
"height": 34,
"text": ""
},
Expand All @@ -47617,9 +47617,9 @@
"alignHorizontal": "right"
},
"data": "file_manager_file_size",
"left": 260,
"left": 256,
"top": 0,
"width": 80,
"width": 84,
"height": 34,
"text": ""
},
Expand Down
44,200 changes: 22,100 additions & 22,100 deletions src/eez/gui/document_simulator.cpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/eez/gui/document_simulator.h
Original file line number Diff line number Diff line change
Expand Up @@ -1670,4 +1670,4 @@ enum PagesEnum {
PAGE_ID_TOUCH_TEST = 165
};

extern const uint8_t assets[403452];
extern const uint8_t assets[403455];
33,350 changes: 16,675 additions & 16,675 deletions src/eez/gui/document_stm32.cpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/eez/gui/document_stm32.h
Original file line number Diff line number Diff line change
Expand Up @@ -1637,4 +1637,4 @@ enum PagesEnum {
PAGE_ID_TOUCH_TEST = 160
};

extern const uint8_t assets[310843];
extern const uint8_t assets[310838];
3 changes: 0 additions & 3 deletions src/eez/modules/psu/conf_advanced.h
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,6 @@
/// To prevent too fast switching betweeen current ranges
#define CURRENT_AUTO_RANGE_SWITCHING_DELAY_MS 5

/// During data logging call file.sync every N seconds
#define CONF_DLOG_SYNC_FILE_TIME 10 // 10 seconds

// Default duration of all animations in seconds
#define CONF_DEFAULT_ANIMATIONS_DURATION 0.15f

Expand Down
Loading

0 comments on commit 4344b23

Please sign in to comment.