Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

fir header dialog information into min width #569

Merged
merged 1 commit into from
Mar 1, 2022
Merged

fir header dialog information into min width #569

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
fir header dialog information into min width
  • Loading branch information
@ctzsnooze
ctzsnooze committed Feb 28, 2022
commit 3eb7d37cd6cbf312eae84d8ec98112a7b95fe2dd
15 changes: 10 additions & 5 deletions css/header_dialog.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,11 @@ select {
font-family: 'open_sanssemibold', Arial, serif;
}

.h5 {
color: red;
margin: 0;
}

/* Spacers */
.spacer {
padding-left: 7px;
Expand All @@ -125,14 +130,14 @@ select {

/* space around each div*/
.spacer_left {
padding-left: 15px;
padding-left: 0px;
float: left;
width: calc(100% - 15px);
width: calc(100%);
}

.spacer_right {
padding-right: 15px;
width: calc(100% - 15px);
padding-right: 5px;
width: calc(100% - 5px);
float: left;
}

Expand Down Expand Up @@ -176,7 +181,7 @@ select {

.header-dialog .modal-dialog {
width:75%;
min-width:954px;
min-width:850px;
}

.header-dialog .cf th {
Expand Down
21 changes: 9 additions & 12 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ <h4>Field values</h4>
</button>
<h4 class="modal-title">Configure graphs</h4>
</div>
<div class="modal-body">
<div class="modal-body" padding-left:5px;>
<div class="btn-group">
<button type="button" class="btn btn-primary dropdown-toggle config-graphs-add" data-toggle="dropdown" aria-expanded="false">
<span class="glyphicon glyphicon-plus"></span> Add graph
Expand Down Expand Up @@ -655,14 +655,11 @@ <h4 class="modal-title">Configure graphs</h4>
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" data-toggle="tooltip" title="Close without saving changes">
<button type="button" class="close" data-dismiss="modal" aria-label="Close" data-toggle="tooltip" title="Close">
<span aria-hidden="true">&times;</span>
</button>
<h4 class="modal-title">Log Header Information</h4>
<h5 class="modal-title-revision"></h5>
<h5 class="modal-title-board-info"></h5>
<h5 class="modal-title-date"></h5>
<h5 class="modal-title-craft"></h5>
<h5 class="modal-title-revision"></h5>
</div>
<div class="modal-body">
<form name="header-information" id="pid-tuning">
Expand Down Expand Up @@ -690,19 +687,19 @@ <h5 class="modal-title-craft"></h5>
<label>&nbsp</label>
</th>
<th name="Proportional">
<label>Proportional</label>
<label>P</label>
</th>
<th name="Integral">
<label>Integral</label>
<label>I</label>
</th>
<th name="D_Max">
<label>D_Max</label>
</th>
<th name="Derivative">
<label>Derivative</label>
<label>D</label>
</th>
<th name="Feedforward">
<label>Feedforward</label>
<label>FF</label>
</th>
</tr>
<tr class="rollPID">
Expand Down Expand Up @@ -941,7 +938,7 @@ <h5 class="modal-title-craft"></h5>
<input type="text" step="0.01" min="0" max="999" />
</td>
<td name="feedforwardAveraging" class="bf-only">
<label>Averaging</label>
<label>Avgerage</label>
<select>
<!~~ list generated here ~~>
</select>
Expand Down Expand Up @@ -1634,7 +1631,7 @@ <h5 class="modal-title-craft"></h5>
<input type="text" step="0.01" min="0" max="999.00" />
</td>
<td name="gyro_notch_cutoff">
<label>Notch 1 Cutoff</label>
<label>Notch1 Cutoff</label>
<input type="text" step="0.1" min="0" max="999.00" />
</td>
<td name='gyro_notch_hz_2'>
Expand Down
6 changes: 3 additions & 3 deletions js/header_dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,10 +511,10 @@ function HeaderDialog(dialog, onSave) {

// Update the log header

$('h5.modal-title-revision').text((sysConfig['Firmware revision'] != null) ? ` Rev : ${sysConfig['Firmware revision']}` : '');
$('h5.modal-title-craft').text((sysConfig['Craft name'] != null) ? ` ${sysConfig['Craft name']}` : '');
// $('h5.modal-title-date').text((sysConfig['Firmware date'] != null) ? ` ${sysConfig['Firmware date']}` : '');
$('h5.modal-title-revision').text(((sysConfig['Firmware revision'] != null) ? ` ${sysConfig['Firmware revision']}` : '') + ' - ' + ((sysConfig['Firmware date'] != null) ? ` ${sysConfig['Firmware date']}` : ''));
$('h5.modal-title-board-info').text((sysConfig['Board information'] != null) ? ` Board : ${sysConfig['Board information']}` : '');
$('h5.modal-title-date').text((sysConfig['Firmware date'] != null) ? ` Date : ${sysConfig['Firmware date']}` : '');
$('h5.modal-title-craft').text((sysConfig['Craft name'] != null) ? ` Name : ${sysConfig['Craft name']}` : '');

switch(sysConfig.firmwareType) {
case FIRMWARE_TYPE_BETAFLIGHT:
Expand Down
2 changes: 1 addition & 1 deletion js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const NEW_WINDOW_HEIGHT = 760;

// these values set the minimum resize dimensions of a secondary window
// minimum resize dimensions of the initial window are set in package.json
const INNER_BOUNDS_WIDTH = 740;
const INNER_BOUNDS_WIDTH = 930;
const INNER_BOUNDS_HEIGHT = 480;

const INITIAL_APP_PAGE = "index.html";
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 @@ -15,7 +15,7 @@
"id": "main",
"show": true,
"icon": "images/bf_icon_128.png",
"min_width": 740,
"min_width": 930,
"min_height": 480
},
"repository": {
Expand Down