Skip to content

Commit 0162b51

Browse files
darylcdarylc
committed
Clarify Flash to SD/USB/NVMe wording
1 parent 6e821e2 commit 0162b51

File tree

2 files changed

+23
-24
lines changed

2 files changed

+23
-24
lines changed

‎SD/Pi-FlashUSB.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ then
66
FPPBOOTDIR=/boot/firmware
77
fi
88

9-
echo "Checking for updated eeprom to allow booting from USB"
9+
echo "Checking for updated eeprom to allow booting from USB/NVMe"
1010
echo ""
1111
rpi-eeprom-update -a
1212

‎www/settings-storage.php

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ function checkFormatStorage() {
6767
checkForStorageCopy();
6868
},
6969
failure: function (data) {
70-
DialogError("Formate Storage", "Error formatting storage.");
70+
DialogError("Format Storage", "Error formatting storage.");
7171
}
7272
});
7373
} else {
@@ -86,14 +86,14 @@ function flashEMMCDone() {
8686
EnableModalDialogCloseButton("flashEMMCProgress");
8787
}
8888
function flashEMMC() {
89-
DisplayConfirmationDialog("flashEMMC", "Flash to eMMC", $("#dialog-confirm-emmc"), function () {
90-
DisplayProgressDialog("flashEMMCProgress", "Flash to eMMC");
89+
DisplayConfirmationDialog("flashEMMC", "Copy FPP to eMMC", $("#dialog-confirm-emmc"), function () {
90+
DisplayProgressDialog("flashEMMCProgress", "Copy FPP to eMMC");
9191
StreamURL("flashbbbemmc.php", 'flashEMMCProgressText', 'flashEMMCDone', 'flashEMMCDone');
9292
});
9393
}
9494
function flashEMMCBtrfs() {
95-
DisplayConfirmationDialog("flashEMMC", "Flash to eMMC", $("#dialog-confirm-emmc"), function () {
96-
DisplayProgressDialog("flashEMMCProgress", "Flash to eMMC");
95+
DisplayConfirmationDialog("flashEMMC", "Copy FPP to eMMC", $("#dialog-confirm-emmc"), function () {
96+
DisplayProgressDialog("flashEMMCProgress", "Copy FPP to eMMC");
9797
StreamURL("flashbbbemmc-btrfs.php", 'flashEMMCProgressText', 'flashEMMCDone', 'flashEMMCDone');
9898
});
9999
}
@@ -105,14 +105,14 @@ function flashUSBDone() {
105105
EnableModalDialogCloseButton("flashUSBProgress");
106106
}
107107
function flashUSB(device) {
108-
DisplayConfirmationDialog("flashUSB", "Flash to NVMe/USB/SD", $("#dialog-confirm-usb"), function () {
109-
DisplayProgressDialog("flashUSBProgress", "Flash to NVMe/USB/SD");
108+
DisplayConfirmationDialog("flashUSB", "Create new FPP on NVMe/USB/SD", $("#dialog-confirm-usb"), function () {
109+
DisplayProgressDialog("flashUSBProgress", "Create new FPP on NVMe/USB/SD");
110110
StreamURL("flash-pi-usb.php?cone=false&dev=" + device, 'flashUSBProgressText', 'flashUSBDone', 'flashUSBDone');
111111
});
112112
}
113113
function cloneUSB(device) {
114-
DisplayConfirmationDialog("flashUSB", "Clone to NVMe/USB/SD", $("#dialog-confirm-usb"), function () {
115-
DisplayProgressDialog("flashUSBProgress", "Clone to NVMe/USB/SD");
114+
DisplayConfirmationDialog("flashUSB", "Copy existing FPP to NVMe/USB/SD", $("#dialog-confirm-usb"), function () {
115+
DisplayProgressDialog("flashUSBProgress", "Copy existing FPP to NVMe/USB/SD");
116116
StreamURL("flash-pi-usb.php?clone=true&dev=" + device, 'flashUSBProgressText', 'flashUSBDone', 'flashUSBDone');
117117
});
118118
}
@@ -277,13 +277,13 @@ function PrintStorageDeviceSelect($platform)
277277
<h3>eMMC Actions:</h3>
278278

279279
<div class="row">
280-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Flash to eMMC'
280+
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Copy to eMMC'
281281
onClick='flashEMMC();'></div>
282282
<div class="col-auto">&nbsp;This will copy FPP to the internal eMMC.</div>
283283
</div>
284284
<? if ($uiLevel >= 1) { ?>
285285
<div class="row mt-2">
286-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Flash to eMMC (BTRFS)'
286+
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Copy to eMMC (BTRFS)'
287287
onClick='flashEMMCBtrfs();'></div>
288288
<div class="col-auto"><i class='fas fa-fw fa-graduation-cap ui-level-1'></i>&nbsp;This will copy FPP to the internal
289289
eMMC, but use BTRFS for the root filesystem.<br>BTRFS uses compression to save a lot of space on the eMMC, but
@@ -296,37 +296,36 @@ function PrintStorageDeviceSelect($platform)
296296
<? if (($rootDevice == 'mmcblk0p2') && file_exists("/dev/sda")) { ?>
297297
<h3>USB Actions:</h3>
298298
<div class="row">
299-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Flash to USB'
299+
<div class="col-auto"><input style='width:20em;' type='button' class='buttons' value='Create new FPP on USB'
300300
onClick='flashUSB("sda");'></div>
301-
<div class="col-auto">&nbsp;This will clone FPP to the USB device. See note below for more information.</div>
301+
<div class="col-auto">&nbsp;This will create a new FPP on the USB device.</div>
302302
</div>
303303
<div class="row">
304-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Clone to USB'
304+
<div class="col-auto"><input style='width:20em;' type='button' class='buttons' value='Copy existing FPP to USB'
305305
onClick='cloneUSB("sda");'></div>
306-
<div class="col-auto">&nbsp;This will copy FPP, media, sequences, settings, etc... to the USB device. See note below
307-
for more information.</div>
306+
<div class="col-auto">&nbsp;This will copy FPP, media, sequences, settings, etc... to the USB device.</div>
308307
</div>
309308
<? } else if (($rootDevice == 'mmcblk0p2') && file_exists("/dev/nvme0n1")) { ?>
310309
<h3>NVMe Actions:</h3>
311310
<div class="row">
312-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Flash to NVMe'
311+
<div class="col-auto"><input style='width:20em;' type='button' class='buttons' value='Create new FPP on NVMe'
313312
onClick='flashUSB("nvme0n1");'></div>
314-
<div class="col-auto">&nbsp;This will clone FPP to the NVMe device.</div>
313+
<div class="col-auto">&nbsp;This will create a new FPP on the NVMe device.</div>
315314
</div>
316315
<div class="row">
317-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Clone to NVMe'
316+
<div class="col-auto"><input style='width:20em;' type='button' class='buttons' value='Copy existing FPP to NVMe'
318317
onClick='cloneUSB("nvme0n1");'></div>
319318
<div class="col-auto">&nbsp;This will copy FPP, media, sequences, settings, etc... to the NVMe device.</div>
320319
</div>
321320
<? } else { ?>
322321
<h3>SD Card Actions:</h3>
323322
<div class="row">
324-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Flash to SD'
323+
<div class="col-auto"><input style='width:20em;' type='button' class='buttons' value='Create new FPP on SD card'
325324
onClick='flashUSB("mmcblk0");'></div>
326-
<div class="col-auto">&nbsp;This will flash FPP to the SD Card.</div>
325+
<div class="col-auto">&nbsp;This will create a new FPP on the SD Card.</div>
327326
</div>
328327
<div class="row">
329-
<div class="col-auto"><input style='width:13em;' type='button' class='buttons' value='Clone to SD'
328+
<div class="col-auto"><input style='width:20em;' type='button' class='buttons' value='Copy existing FPP to SD card'
330329
onClick='cloneUSB("mmcblk0");'></div>
331330
<div class="col-auto">&nbsp;This will copy FPP, media, sequences, settings, etc... to the SD Card.</div>
332331
</div>
@@ -460,4 +459,4 @@ function PrintStorageDeviceSelect($platform)
460459
<div id="mounted-device-callout-warning" class="callout callout-warning">
461460
Use caution when unmounting USB devices as they may be in use by the system processes. Forcing a unmount may result
462461
incomplete data or data loss.
463-
</div>
462+
</div>

0 commit comments

Comments
 (0)