From 0df5ef4d2eef949bcd75f22fbb6d10716b3bf995 Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 17 Jul 2026 14:07:43 +0200 Subject: [PATCH] =?UTF-8?q?config:=20r=C3=A9solution=20conflit,=20garde=20?= =?UTF-8?q?version=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/settings.yaml | 223 +++++++++++++++++++++---------------------- 1 file changed, 110 insertions(+), 113 deletions(-) diff --git a/config/settings.yaml b/config/settings.yaml index 59b00e3..85ef5a0 100644 --- a/config/settings.yaml +++ b/config/settings.yaml @@ -1,119 +1,116 @@ -# ============================================================ -# JH Photomaton -- Configuration principale -# Association Les Sapins Du Web (LSDW) -# ============================================================ - app: - name: "JH Photomaton" - host: "0.0.0.0" - port: 8090 + admin_password: PhotoBooth2026! debug: false - secret_key: "photomaton-jh-2026-secret-change-me" - admin_password: "PhotoBooth2026!" - -# --- Integration photobooth-app --- -photobooth: - base_url: "http://localhost:8000" - public_url: "https://photobooth.lessapinsduweb.com" # URL publique pour les medias dans la galerie - data_dir: "/home/pi/photobooth-data" - config_file: "/home/pi/photobooth-data/config/config.json" - media_dir: "/home/pi/photobooth-data/media/processed_full" - userdata_dir: "/home/pi/photobooth-data/userdata" - show_delete_button: false - -# --- Evenement en cours --- -event: - name: "Evenement" - slug: "evenement" - started_at: 0 - -# --- Bouton physique --- + host: 0.0.0.0 + name: JH Photomaton + port: 8090 + secret_key: photomaton-jh-2026-secret-change-me button: - pin: 23 - relay_pin: 12 debounce_ms: 50 - double_click_ms: 400 - long_press_ms: 1500 + double_click_ms: 800 + long_press_action: print_last + long_press_ms: 3000 max_clicks: 4 - long_press_action: "print_last" - print_enabled: true - -# --- Anneau LED WS2812b --- -leds: - pin: 18 - count: 35 - brightness: 180 # Luminosite normale (0-255) - auto_brightness: false # Ajustement automatique du flash selon la luminosite ambiante - freq_hz: 800000 - dma: 10 - strip_type: "WS2812" - effects: - idle: - color: [0, 30, 80] - mode: "solid" - speed: 0.025 - - countdown: - color: [0, 200, 80] - mode: "fill_progressive" - - capture: - # BLANC CHAUD pour photo -- les WS2812b ont une LED bleue tres efficace. - # [255,255,255] donne un rendu tres bleu sur les photos. - # Reduisez le bleu (3eme valeur) et augmentez le rouge pour corriger. - # Exemples : - # [255, 200, 80] -> blanc chaud (recommande pour debuter) - # [255, 180, 40] -> blanc tres chaud / jaune - # [255, 220, 120] -> blanc neutre legerement chaud - color: [255, 200, 80] - mode: "flash" - flashes: 2 - # Duree en secondes de chaque flash (plus long = plus de lumiere) - flash_duration: 0.30 - - captured: - color: [150, 0, 200] - mode: "solid" - - finished: - color: [0, 100, 255] - mode: "solid" - duration: 2.0 - - printing: - color: [0, 120, 255] - mode: "spin" - speed: 0.05 - - error: - color: [220, 0, 0] - mode: "flash" - flashes: 4 - - disabled: - color: [60, 0, 0] - mode: "solid" - -# --- Impression --- -print: - mode: "validation" - script_path: "/home/pi/photobooth-data/script/script_print.sh" - default_copies: 1 - printers: - - name: "Selphy_Blanche_WiFi" - label: "Selphy Blanche (WiFi)" - - name: "Selphy_Noire_WiFi" - label: "Selphy Noire (WiFi)" - -# --- Galerie --- -gallery: - public_enabled: true - photos_per_page: 24 - qr_base_url: "https://photomaton.lessapinsduweb.com" - -# --- Mapping clics bouton -> actions photobooth-app --- + pin: 23 + print_enabled: false + relay_pin: 12 button_actions: - 1: { label: "Photo normale", photobooth_index: 0 } - 2: { label: "Photo etoile", photobooth_index: 1 } - 3: { label: "Photo cailloux", photobooth_index: 2 } - 4: { label: "Photo soiree", photobooth_index: 3 } + 1: + label: Photo normale + photobooth_index: 0 + 2: + label: Photo etoile + photobooth_index: 1 + 3: + label: Photo cailloux + photobooth_index: 2 + 4: + label: Photo soiree + photobooth_index: 3 +event: + name: Evenement + slug: evenement + started_at: 0 +gallery: + photos_per_page: 24 + public_enabled: true + qr_base_url: https://photomaton.lessapinsduweb.com +leds: + auto_brightness: true + brightness: 180 + count: 35 + dma: 10 + effects: + capture: + color: + - 255 + - 200 + - 80 + flash_duration: 0.3 + flashes: 2 + mode: flash + captured: + color: + - 150 + - 0 + - 200 + mode: solid + countdown: + color: + - 0 + - 200 + - 80 + mode: fill_progressive + disabled: + color: + - 60 + - 0 + - 0 + mode: solid + error: + color: + - 220 + - 0 + - 0 + flashes: 4 + mode: flash + finished: + color: + - 0 + - 100 + - 255 + duration: 2.0 + mode: solid + idle: + color: + - 0 + - 30 + - 80 + mode: solid + speed: 0.025 + printing: + color: + - 0 + - 120 + - 255 + mode: spin + speed: 0.05 + freq_hz: 800000 + pin: 18 + strip_type: WS2812 +photobooth: + base_url: http://localhost:8000 + config_file: /home/pi/photobooth-data/config/config.json + data_dir: /home/pi/photobooth-data + media_dir: /home/pi/photobooth-data/media/processed_full + show_delete_button: false + userdata_dir: /home/pi/photobooth-data/userdata +print: + default_copies: 1 + mode: validation + printers: + - label: Selphy Blanche (WiFi) + name: Selphy_Blanche_WiFi + - label: Selphy Noire (WiFi) + name: Selphy_Noire_WiFi + script_path: /home/pi/photobooth-data/script/script_print.sh