From cd0e4a551acaf2b7bb5b5000cab81c02cda1bd70 Mon Sep 17 00:00:00 2001 From: Daniel Kulp Date: Fri, 17 May 2019 09:08:50 -0400 Subject: [PATCH] Detect capes as "Unknown" and not "Unsupported" --- capes/other/Unknown-eeprom.bin | Bin 0 -> 682 bytes .../{unsupported => other}/Unsupported-eeprom.bin | Bin scripts/detect_cape | 4 ++-- www/about.php | 8 +++++--- www/css/fpp.css | 5 +++++ 5 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 capes/other/Unknown-eeprom.bin rename capes/{unsupported => other}/Unsupported-eeprom.bin (100%) diff --git a/capes/other/Unknown-eeprom.bin b/capes/other/Unknown-eeprom.bin new file mode 100644 index 0000000000000000000000000000000000000000..fe8270dfa5f5fbff592a6f683ac62ca175cfc048 GIT binary patch literal 682 zcmZ<@2rw{W2+hmR%P-GkzyyYR22epmO9N9wb3-E&6GO0&u?a}R(mc5sp-Tb5L}Hm+ zfH;P_f;Zpq-K^dV}3C&Gzi>6Gxv1hwL+0SUt6^38jWG&|Cp4$Laa@y1M z(zGjVf0sPk@8Xdp+$*xOHS9siN=~_F&F;O}6+V&)ob?+Z2~H26243 z;&40oWnxx;SXRnOkH>f0E|ss>S>EV$LU&8+Prc^!e}Y0gj(5gMF0c8iTUGu^>D8`x zyZDN7XUDw$d^buw_wvDSN!QEHR$ktsd*$}sZ;Najf2FSbyxh{Ltz_!Mylt0_cZvkR zn)&mWNX44}o$}HiT*e~P18R!O&&kIYZZnhZ`{H7K;RXMf#u>f0kBj`6^Se@PtNp%> z-~Jvswmage?A_fvS+fbwrlmqFzpFGFiXyQ zfuYkEWkx>s5?kH{Y1j4H7n#=7v+XVKv3rk4V#-#&j@I6a&vZLf`nli%A2vDx!y@Bh1-L$O7`34{2j SxS!#I&69r&8o(3-jzR#FpY}cg literal 0 HcmV?d00001 diff --git a/capes/unsupported/Unsupported-eeprom.bin b/capes/other/Unsupported-eeprom.bin similarity index 100% rename from capes/unsupported/Unsupported-eeprom.bin rename to capes/other/Unsupported-eeprom.bin diff --git a/scripts/detect_cape b/scripts/detect_cape index 3299357b7..403d70fe9 100755 --- a/scripts/detect_cape +++ b/scripts/detect_cape @@ -80,7 +80,7 @@ function checkUnsupported($orig) { return $orig; } if (HasI2CDevice("3c")) { - return "/opt/fpp/capes/unsupported/Unsupported-eeprom.bin"; + return "/opt/fpp/capes/other/Unknown-eeprom.bin"; } } return $orig; @@ -228,7 +228,7 @@ fclose($fp); // also put the serialNumber into the cape-info for display if (file_exists("/home/fpp/media/tmp/cape-info.json")) { $json = json_decode(file_get_contents("/home/fpp/media/tmp/cape-info.json")); - if ($json->id != "Unsupported") { + if ($json->id != "Unsupported" && $json->id != "Unknown") { $json->serialNumber = $capesn; } foreach($extras as $key => $value) { diff --git a/www/about.php b/www/about.php index 69e32321d..ca99b2b1d 100644 --- a/www/about.php +++ b/www/about.php @@ -297,11 +297,13 @@ function ToggleDeveloperMode() { About Cape/Hat
-
+
'> - "; + } if (isSet($currentCapeInfo['serialNumber'])) { echo ""; } @@ -310,7 +312,7 @@ function ToggleDeveloperMode() { } if (isSet($currentCapeInfo['description'])) { echo "
Name:
Version:
Version:" . $currentCapeInfo['version'] . "
Serial Number:" . $currentCapeInfo['serialNumber'] . "
"; - if (isSet($currentCapeInfo['vendor'])) { + if (isSet($currentCapeInfo['vendor']) || $currentCapeInfo['name'] == "Unknown") { echo $currentCapeInfo['description']; } else { echo htmlspecialchars($currentCapeInfo['description']); diff --git a/www/css/fpp.css b/www/css/fpp.css index 3966006f3..69880ba1e 100644 --- a/www/css/fpp.css +++ b/www/css/fpp.css @@ -218,6 +218,11 @@ float: left; width: 47%; } +.aboutAll{ + float: left; + width: 95%; +} + html {