mkrieger/byos_laravel
1
0
Fork 0
mirror of https://github.com/usetrmnl/byos_laravel.git synced 2026-01-13 15:07:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

feat: prefer png format on firmware versions >=1.5.2

Browse source
This commit is contained in:
Benjamin Nussbaum 2025-05-10 01:39:41 +02:00
parent cc63c8cce2
commit ad5ff5d2c9
12 changed files with 215 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

13
routes/api.php
View file

@ -82,9 +82,11 @@ Route::get('/display', function (Request $request) {
$image_path = 'images/setup-logo.bmp';
$filename = 'setup-logo.bmp';
} else {
if (file_exists(storage_path('app/public/images/generated/'.$image_uuid.'.bmp'))) {
if (isset($device->last_firmware_version)
&& version_compare($device->last_firmware_version, '1.5.2', '<')
&& Storage::disk('public')->exists('images/generated/'.$image_uuid.'.bmp')) {
$image_path = 'images/generated/'.$image_uuid.'.bmp';
} elseif (file_exists(storage_path('app/public/images/generated/'.$image_uuid.'.png'))) {
} elseif (Storage::disk('public')->exists('images/generated/'.$image_uuid.'.png')) {
$image_path = 'images/generated/'.$image_uuid.'.png';
} else {
$image_path = 'images/generated/'.$image_uuid.'.bmp';
@ -106,7 +108,6 @@ Route::get('/display', function (Request $request) {
if (config('services.trmnl.image_url_timeout')) {
$response['image_url_timeout'] = config('services.trmnl.image_url_timeout');
}
// If update_firmware is true, reset it after returning it, to avoid upgrade loop
if ($device->update_firmware) {
$device->resetUpdateFirmwareFlag();
@ -271,9 +272,11 @@ Route::get('/current_screen', function (Request $request) {
$image_path = 'images/setup-logo.bmp';
$filename = 'setup-logo.bmp';
} else {
if (file_exists(storage_path('app/public/images/generated/'.$image_uuid.'.bmp'))) {
if (isset($device->last_firmware_version)
&& version_compare($device->last_firmware_version, '1.5.2', '<')
&& Storage::disk('public')->exists('images/generated/'.$image_uuid.'.bmp')) {
$image_path = 'images/generated/'.$image_uuid.'.bmp';
} elseif (file_exists(storage_path('app/public/images/generated/'.$image_uuid.'.png'))) {
} elseif (Storage::disk('public')->exists('images/generated/'.$image_uuid.'.png')) {
$image_path = 'images/generated/'.$image_uuid.'.png';
} else {
$image_path = 'images/generated/'.$image_uuid.'.bmp';