Fiabilite Canon : veille/reveil relais, sequence boot, stats diagnostic, fin evenement, compteur consommables
- Preview thread : poll uniquement quand ecran capture actif, keepalive 30s sinon - Sequence boot Canon : power cycle relais si absent USB au demarrage - Veille auto 30min : Canon coupe par relais apres inactivite, reveil au preview_start - Stats diagnostic /api/canon/stats : keepalive, preview, captures, connexions - Escalade reconnexion adoucie : pas d'USB reset les 2 premieres tentatives - Hard reset relais 10s (resistance decharge 990ohm sur dummy battery 8V) - Gestion fin evenement : date_fin + bouton terminer + guard 403 impression - Compteur base sur min(papier, ruban) avec cap evenement optionnel - Pre-eclairage countdown : projecteurs ON 3s avant capture pour mesure expo - Canon _configurer_init() : ISO 800, drivemode Single, viewfinder, EXIF preserve - Admin : detail evenement, compteur consommables, galerie impression Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WyN9xFp84P9VaWT3Qe2DXu
This commit is contained in:
@@ -162,8 +162,11 @@ async function chargerCompteur() {
|
||||
const etat = await apiGet('/api/compteur');
|
||||
document.getElementById('tog-compteur-actif').checked = etat.actif;
|
||||
document.getElementById('admin-compteur-restant').textContent = etat.restantes;
|
||||
document.getElementById('admin-compteur-limite-display').textContent = etat.limite;
|
||||
const limiteAff = (etat.actif && etat.limite > 0) ? etat.limite : etat.capacite;
|
||||
document.getElementById('admin-compteur-limite-display').textContent = limiteAff;
|
||||
setValue('admin-compteur-limite', etat.limite);
|
||||
const detail = document.getElementById('admin-compteur-detail');
|
||||
if (detail) detail.textContent = `Papier: ${etat.papier_restant} | Ruban: ${etat.ruban_restant}`;
|
||||
}
|
||||
|
||||
async function sauvegarderCompteur() {
|
||||
@@ -713,10 +716,14 @@ async function chargerListeEvenements() {
|
||||
for (const ev of events) {
|
||||
const div = document.createElement('div');
|
||||
div.className = 'event-item' + (ev.id === actifId ? ' event-actif' : '');
|
||||
const badges = [];
|
||||
if (ev.id === actifId) badges.push('<span class="badge-actif">Actif</span>');
|
||||
if (ev.termine) badges.push('<span style="background:#f44336;color:#fff;padding:2px 6px;border-radius:4px;font-size:0.7em">Termine</span>');
|
||||
div.innerHTML = `
|
||||
<span class="event-nom">${ev.nom}</span>
|
||||
<span class="event-nom">${ev.nom}${ev.date_fin ? ' <small style="opacity:0.5">(' + ev.date_fin + ')</small>' : ''}</span>
|
||||
<span class="event-actions">
|
||||
${ev.id !== actifId ? `<button class="btn-secondaire btn-petit" onclick="activerEventAdmin('${ev.id}')">Activer</button>` : '<span class="badge-actif">Actif</span>'}
|
||||
${ev.id !== actifId ? `<button class="btn-secondaire btn-petit" onclick="activerEventAdmin('${ev.id}')">Activer</button>` : ''}
|
||||
${badges.join(' ')}
|
||||
<button class="btn-secondaire btn-petit" onclick="editerEventAdmin('${ev.id}')">Editer</button>
|
||||
<button class="btn-danger btn-petit" onclick="supprimerEventAdmin('${ev.id}','${ev.nom}')">Suppr</button>
|
||||
</span>`;
|
||||
@@ -760,6 +767,7 @@ function afficherDetailEvent(event) {
|
||||
setValue('admin-nom-event', event.nom);
|
||||
setValue('admin-couleur-primaire', event.couleur_primaire || '#e91e63');
|
||||
setValue('admin-couleur-secondaire', event.couleur_secondaire || '#ffffff');
|
||||
setValue('admin-date-fin', event.date_fin || '');
|
||||
rafraichirMediaAccueil().then(() => {
|
||||
const select = document.getElementById('admin-media-accueil');
|
||||
if (event.media_accueil) select.value = event.media_accueil;
|
||||
@@ -770,6 +778,17 @@ function afficherDetailEvent(event) {
|
||||
document.getElementById('tog-event-fmt-15x20').checked = fmts.includes('15x20');
|
||||
document.getElementById('tog-event-fmt-strip').checked = fmts.includes('strip');
|
||||
|
||||
// Statut termine
|
||||
const btnTerminer = document.getElementById('btn-terminer-event');
|
||||
const badgeTermine = document.getElementById('badge-event-termine');
|
||||
if (event.termine) {
|
||||
btnTerminer.classList.add('cache');
|
||||
badgeTermine.classList.remove('cache');
|
||||
} else {
|
||||
btnTerminer.classList.remove('cache');
|
||||
badgeTermine.classList.add('cache');
|
||||
}
|
||||
|
||||
// Lien galerie en ligne
|
||||
const booth = config.booth || {};
|
||||
const lienBloc = document.getElementById('lien-galerie-event');
|
||||
@@ -787,6 +806,17 @@ function afficherDetailEvent(event) {
|
||||
chargerCadresEvent();
|
||||
}
|
||||
|
||||
async function terminerEvenement() {
|
||||
if (!eventEditId) return;
|
||||
if (!confirm('Terminer cet evenement ? L\'impression sera desactivee.')) return;
|
||||
await apiPost(`/api/evenements/${eventEditId}/terminer`);
|
||||
config = await apiGet('/api/config');
|
||||
const event = await apiGet(`/api/evenements/${eventEditId}`);
|
||||
afficherDetailEvent(event);
|
||||
await chargerListeEvenements();
|
||||
afficherStatut('Evenement termine — impression desactivee', 'succes');
|
||||
}
|
||||
|
||||
async function supprimerEventAdmin(id, nom) {
|
||||
if (!confirm(`Supprimer l'evenement "${nom}" et ses cadres ?`)) return;
|
||||
await fetch(`/api/evenements/${id}`, { method: 'DELETE' });
|
||||
@@ -856,6 +886,7 @@ async function sauvegarderEvenement() {
|
||||
couleur_primaire: getValue('admin-couleur-primaire'),
|
||||
couleur_secondaire: getValue('admin-couleur-secondaire'),
|
||||
media_accueil: getValue('admin-media-accueil') || null,
|
||||
date_fin: getValue('admin-date-fin') || null,
|
||||
formats_actifs,
|
||||
};
|
||||
|
||||
@@ -1743,6 +1774,41 @@ function fermerWizard() {
|
||||
_wizardSituation = null;
|
||||
_wizardEtapes = [];
|
||||
_wizardIndex = 0;
|
||||
_arreterAutoDetect();
|
||||
}
|
||||
|
||||
let _wizardAutoDetectTimer = null;
|
||||
let _wizardAutoDetectType = null;
|
||||
|
||||
function lancerWizardSituation(situationId, autoDetectType) {
|
||||
_wizardAutoDetectType = autoDetectType || null;
|
||||
lancerWizard(situationId);
|
||||
if (_wizardAutoDetectType) {
|
||||
_demarrerAutoDetect();
|
||||
}
|
||||
}
|
||||
|
||||
function _demarrerAutoDetect() {
|
||||
if (_wizardAutoDetectTimer) clearInterval(_wizardAutoDetectTimer);
|
||||
_wizardAutoDetectTimer = setInterval(async () => {
|
||||
try {
|
||||
const s = await apiGet('/api/systeme/sante');
|
||||
let resolu = false;
|
||||
if (_wizardAutoDetectType === 'camera' && s.camera.status === 'ok') resolu = true;
|
||||
if (_wizardAutoDetectType === 'imprimante' && s.imprimante.status === 'prete') resolu = true;
|
||||
if (resolu) {
|
||||
_arreterAutoDetect();
|
||||
fermerWizard();
|
||||
afficherStatut('Probleme resolu !', 'succes');
|
||||
if (typeof fermerErreurEquipement === 'function') fermerErreurEquipement();
|
||||
}
|
||||
} catch (e) {}
|
||||
}, 5000);
|
||||
}
|
||||
|
||||
function _arreterAutoDetect() {
|
||||
if (_wizardAutoDetectTimer) { clearInterval(_wizardAutoDetectTimer); _wizardAutoDetectTimer = null; }
|
||||
_wizardAutoDetectType = null;
|
||||
}
|
||||
|
||||
function lancerWizardDepuisAdmin() {
|
||||
@@ -1857,6 +1923,8 @@ async function chargerRelaisConfig() {
|
||||
if (s2) s2.value = data.seuil_proj2 ?? 30;
|
||||
const soff = document.getElementById('relais-seuil-off');
|
||||
if (soff) soff.value = data.seuil_off ?? 65;
|
||||
const vd = document.getElementById('relais-veille-delai');
|
||||
if (vd) vd.value = data.veille_delai ?? 0;
|
||||
} catch (e) {
|
||||
console.warn('Erreur relais config:', e);
|
||||
}
|
||||
@@ -1867,13 +1935,20 @@ async function sauvegarderRelaisConfig() {
|
||||
const seuil_proj1 = parseInt(document.getElementById('relais-seuil-proj1')?.value) || 45;
|
||||
const seuil_proj2 = parseInt(document.getElementById('relais-seuil-proj2')?.value) || 30;
|
||||
const seuil_off = parseInt(document.getElementById('relais-seuil-off')?.value) || 65;
|
||||
await apiPost('/api/relais/config', { eclairage_auto, seuil_proj1, seuil_proj2, seuil_off });
|
||||
const veille_delai = parseInt(document.getElementById('relais-veille-delai')?.value) || 0;
|
||||
await apiPost('/api/relais/config', { eclairage_auto, seuil_proj1, seuil_proj2, seuil_off, veille_delai });
|
||||
afficherStatut('Config relais sauvegardee', 'succes');
|
||||
}
|
||||
|
||||
async function relaisAction(nom, action) {
|
||||
try {
|
||||
if (nom === 'canon/power-cycle') {
|
||||
if (nom === 'canon/hard-reset') {
|
||||
await fetch('/api/relais/canon/hard-reset', {
|
||||
method: 'POST', headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({duree: 5})
|
||||
});
|
||||
afficherStatut('Hard reset Canon lance (trappe + alim)', 'succes');
|
||||
} else if (nom === 'canon/power-cycle') {
|
||||
await fetch('/api/relais/canon/power-cycle', {
|
||||
method: 'POST', headers: {'Content-Type': 'application/json'},
|
||||
body: JSON.stringify({duree: 3})
|
||||
@@ -1893,3 +1968,147 @@ function demarrerEclairageLiveExt() {
|
||||
chargerRelaisStatus();
|
||||
chargerRelaisConfig();
|
||||
}
|
||||
|
||||
// === DIAGNOSTIC ===
|
||||
|
||||
let _diagRefreshTimer = null;
|
||||
|
||||
async function chargerDiagnostic() {
|
||||
chargerSante();
|
||||
chargerLogs();
|
||||
chargerUsb();
|
||||
if (_diagRefreshTimer) clearInterval(_diagRefreshTimer);
|
||||
_diagRefreshTimer = setInterval(chargerSante, 10000);
|
||||
}
|
||||
|
||||
async function chargerSante() {
|
||||
try {
|
||||
const s = await apiGet('/api/systeme/sante');
|
||||
|
||||
// Camera
|
||||
const camCard = document.getElementById('diag-camera');
|
||||
const camSt = document.getElementById('diag-camera-status');
|
||||
if (s.camera.status === 'ok') {
|
||||
camCard.className = 'diag-card ok';
|
||||
camSt.textContent = 'Connectee — ' + s.camera.mode;
|
||||
} else if (s.camera.usb) {
|
||||
camCard.className = 'diag-card warn';
|
||||
camSt.textContent = 'USB detecte mais non connectee';
|
||||
} else {
|
||||
camCard.className = 'diag-card err';
|
||||
camSt.textContent = s.camera.status === 'erreur' ? 'Non disponible' : s.camera.mode;
|
||||
}
|
||||
|
||||
// Imprimante
|
||||
const impCard = document.getElementById('diag-imprimante');
|
||||
const impSt = document.getElementById('diag-imp-status');
|
||||
if (s.imprimante.status === 'prete') {
|
||||
impCard.className = 'diag-card ok';
|
||||
impSt.textContent = s.imprimante.nom + ' — Prete';
|
||||
} else if (s.imprimante.status === 'impression') {
|
||||
impCard.className = 'diag-card ok';
|
||||
impSt.textContent = 'En cours d\'impression';
|
||||
} else if (s.imprimante.status === 'arretee') {
|
||||
impCard.className = 'diag-card err';
|
||||
impSt.textContent = s.imprimante.nom + ' — Arretee' + (s.imprimante.usb ? ' (USB ok)' : ' (USB absente)');
|
||||
} else {
|
||||
impCard.className = 'diag-card ' + (s.imprimante.usb ? 'warn' : 'off');
|
||||
impSt.textContent = s.imprimante.usb ? 'USB detectee — CUPS inconnu' : 'Non detectee';
|
||||
}
|
||||
if (s.imprimante.jobs > 0) impSt.textContent += ' — ' + s.imprimante.jobs + ' job(s)';
|
||||
|
||||
// Relais
|
||||
const relCard = document.getElementById('diag-relais');
|
||||
const relSt = document.getElementById('diag-relais-status');
|
||||
if (s.relais.connecte) {
|
||||
relCard.className = 'diag-card ok';
|
||||
relSt.textContent = 'Connecte';
|
||||
} else {
|
||||
relCard.className = 'diag-card off';
|
||||
relSt.textContent = 'Non detecte';
|
||||
}
|
||||
|
||||
// Systeme
|
||||
const sysCard = document.getElementById('diag-systeme');
|
||||
const sysSt = document.getElementById('diag-sys-status');
|
||||
const ramWarn = s.systeme.ram_pct > 85;
|
||||
const diskWarn = s.systeme.disque_pct > 90;
|
||||
const tempWarn = s.systeme.temp && s.systeme.temp > 75;
|
||||
if (ramWarn || diskWarn || tempWarn) {
|
||||
sysCard.className = 'diag-card warn';
|
||||
} else {
|
||||
sysCard.className = 'diag-card ok';
|
||||
}
|
||||
let sysInfo = 'RAM ' + s.systeme.ram_pct + '% — Disque ' + s.systeme.disque_pct + '%';
|
||||
if (s.systeme.temp) sysInfo += ' — ' + s.systeme.temp + '°C';
|
||||
if (s.systeme.uptime) sysInfo += ' — Up ' + s.systeme.uptime;
|
||||
sysSt.textContent = sysInfo;
|
||||
} catch (e) {
|
||||
console.error('Diagnostic sante:', e);
|
||||
}
|
||||
}
|
||||
|
||||
async function chargerLogs() {
|
||||
try {
|
||||
const r = await apiGet('/api/systeme/logs?n=80');
|
||||
const el = document.getElementById('diag-logs');
|
||||
el.textContent = r.lignes.join('\n');
|
||||
el.scrollTop = el.scrollHeight;
|
||||
} catch (e) {
|
||||
document.getElementById('diag-logs').textContent = 'Erreur chargement logs';
|
||||
}
|
||||
}
|
||||
|
||||
async function chargerUsb() {
|
||||
try {
|
||||
const r = await apiGet('/api/systeme/usb');
|
||||
const el = document.getElementById('diag-usb');
|
||||
el.textContent = r.peripheriques.join('\n');
|
||||
} catch (e) {
|
||||
document.getElementById('diag-usb').textContent = 'Erreur';
|
||||
}
|
||||
}
|
||||
|
||||
async function diagReconnecterCamera() {
|
||||
afficherStatut('Reconnexion camera...', 'succes');
|
||||
try {
|
||||
await apiPost('/api/camera/reconnecter', {});
|
||||
await chargerSante();
|
||||
afficherStatut('Reconnexion terminee', 'succes');
|
||||
} catch (e) {
|
||||
afficherStatut('Echec reconnexion', 'erreur');
|
||||
}
|
||||
}
|
||||
|
||||
async function diagReactiverImprimante() {
|
||||
afficherStatut('Reactivation imprimante...', 'succes');
|
||||
try {
|
||||
const r = await apiPost('/api/imprimante/reactiver', {});
|
||||
afficherStatut(r.message || 'OK', r.succes ? 'succes' : 'erreur');
|
||||
await chargerSante();
|
||||
} catch (e) {
|
||||
afficherStatut('Echec reactivation', 'erreur');
|
||||
}
|
||||
}
|
||||
|
||||
async function diagRedemarrerBackend() {
|
||||
afficherStatut('Redemarrage backend...', 'succes');
|
||||
try {
|
||||
await fetch('/api/systeme/redemarrer-backend', { method: 'POST' });
|
||||
afficherStatut('Backend redemarre — rechargement dans 5s...', 'succes');
|
||||
setTimeout(() => location.reload(), 5000);
|
||||
} catch (e) {
|
||||
afficherStatut('Erreur', 'erreur');
|
||||
}
|
||||
}
|
||||
|
||||
async function diagRefreshChromium() {
|
||||
location.reload();
|
||||
}
|
||||
|
||||
async function diagRedemarrerSysteme() {
|
||||
afficherStatut('Redemarrage borne...', 'succes');
|
||||
try {
|
||||
await fetch('/api/systeme/redemarrer', { method: 'POST' });
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user