added git hashes to about page

cpsdqs/unified-input
Ondřej Hruška 7 years ago
parent bdadb9b532
commit fd2a6df245
  1. 6
      _debug_replacements.php
  2. 5
      pages/about.php

@ -8,6 +8,8 @@
$vers = '???'; $vers = '???';
$versfn = __DIR__ . '/../user/version.h'; $versfn = __DIR__ . '/../user/version.h';
$myHash = shell_exec('git rev-parse --short HEAD');
$fwHash = '00000000';
if (file_exists($versfn)) { if (file_exists($versfn)) {
$f = file_get_contents($versfn); $f = file_get_contents($versfn);
preg_match_all('/#define FW_V_.*? (\d+)/', $f, $vm); preg_match_all('/#define FW_V_.*? (\d+)/', $f, $vm);
@ -15,6 +17,7 @@ if (file_exists($versfn)) {
#define FW_V_MINOR 0 #define FW_V_MINOR 0
#define FW_V_PATCH 0 #define FW_V_PATCH 0
$vers = $vm[1][0] . '.' . $vm[1][1] . '.' . $vm[1][2]; $vers = $vm[1][0] . '.' . $vm[1][1] . '.' . $vm[1][2];
$fwHash = shell_exec('cd .. && git rev-parse --short HEAD');
} }
return [ return [
@ -59,6 +62,9 @@ return [
'vers_httpd' => '0.4', 'vers_httpd' => '0.4',
'vers_sdk' => '010502', 'vers_sdk' => '010502',
'githubrepo' => 'https://github.com/espterm/espterm-firmware', 'githubrepo' => 'https://github.com/espterm/espterm-firmware',
'githubrepo_front' => 'https://github.com/espterm/espterm-front-end',
'hash_backend' => $fwHash,
'hash_frontend' => $myHash, // TODO actual versions?
'ap_dhcp_time' => '120', 'ap_dhcp_time' => '120',
'ap_dhcp_start' => '192.168.4.100', 'ap_dhcp_start' => '192.168.4.100',

@ -22,6 +22,11 @@
<th>ESPTerm</th> <th>ESPTerm</th>
<td>v%vers_fw%, built %date% at %time%</td> <td>v%vers_fw%, built %date% at %time%</td>
</tr> </tr>
<tr>
<th>Git hash</th>
<td>back-end: <a href="%githubrepo%/commit/%hash_backend%">%hash_backend%</a>,
front-end: <a href="%githubrepo_front%/commit/%hash_frontend%">%hash_frontend%</td>
</tr>
<tr> <tr>
<th>libesphttpd</th> <th>libesphttpd</th>
<td>v%vers_httpd%</td> <td>v%vers_httpd%</td>

Loading…
Cancel
Save