diff options
Diffstat (limited to 'roles/info-beamer/config')
-rw-r--r-- | roles/info-beamer/config/defaults/main.yml | 62 | ||||
-rw-r--r-- | roles/info-beamer/config/tasks/main.yml | 16 |
2 files changed, 50 insertions, 28 deletions
diff --git a/roles/info-beamer/config/defaults/main.yml b/roles/info-beamer/config/defaults/main.yml index 93be6d5d..0a81c865 100644 --- a/roles/info-beamer/config/defaults/main.yml +++ b/roles/info-beamer/config/defaults/main.yml @@ -2,23 +2,51 @@ ## path to the info-beamer boot partition # info_beamer_base_path: -info_beamer_tvservices: - 2160p25: "CEA 94" - 2160p30: "CEA 95" - 2160p50: "CEA 96" - 2160p60: "CEA 97" - 1080i50: "CEA 20" - 1080p25: "CEA 33" - 1080p30: "CEA 34" - 1080p50: "CEA 31" - 1080p60: "DMT 16" - 720p50: "CEA 19" - 720p60: "CEA 4" - 576p: "CEA 17" - 576p_wide: "CEA 18" - 576p_wide_quad: "CEA 38" - -# info_beamer_tvservice: "{{ info_beamer_tvservices['1080i50'] }}" +info_beamer_hdmi_resolutions: + 2160p25: + group: 1 + mode: 94 + 2160p30: + group: 1 + mode: 95 + 2160p50: + group: 1 + mode: 96 + 2160p60: + group: 1 + mode: 97 + 1080i50: + group: 1 + mode: 20 + 1080p25: + group: 1 + mode: 33 + 1080p30: + group: 1 + mode: 34 + 1080p50: + group: 1 + mode: 31 + 1080p60: + group: 2 + mode: 16 + 720p50: + group: 1 + mode: 19 + 720p60: + group: 1 + mode: 4 + 576p: + group: 1 + mode: 17 + 576p_wide: + group: 1 + mode: 18 + 576p_wide_quad: + group: 1 + mode: 38 + +# info_beamer_hdmi_resolution: "{{ info_beamer_hdmi_resolutions['1080i50'] }}" ## 'local' or 'hdmi' # info_beamer_audio_target: "hdmi" diff --git a/roles/info-beamer/config/tasks/main.yml b/roles/info-beamer/config/tasks/main.yml index 4fad333d..c603d11c 100644 --- a/roles/info-beamer/config/tasks/main.yml +++ b/roles/info-beamer/config/tasks/main.yml @@ -14,19 +14,13 @@ path: "{{ info_beamer_base_path }}/config" state: directory -- name: configure video output resolution (tvservice) - when: info_beamer_tvservice is defined - copy: - content: "{{ info_beamer_tvservice }}" - dest: "{{ info_beamer_base_path }}/config/tvservice" - -- name: configure video output resolution (userconfig.txt) - when: info_beamer_tvservice is defined +- name: configure video output resolution + when: info_beamer_hdmi_resolution is defined copy: content: | - hdmi_group={{ (info_beamer_tvservice.split(' ')[0] == 'DMT') | ternary('2', '1') }} - hdmi_mode={{ info_beamer_tvservice.split(' ')[1] }} - dest: "{{ info_beamer_base_path }}/config/userconfig.txt" + hdmi_group={{ info_beamer_hdmi_resolution.group }} + hdmi_mode={{ info_beamer_hdmi_resolution.mode }} + dest: "{{ info_beamer_base_path }}/config/screen-settings.txt" - name: configure audio output when: info_beamer_audio_target is defined |