Skip to content

Commit

Permalink
Merge pull request makerplane#246 from e100/portrait
Browse files Browse the repository at this point in the history
Portrait mode screen configs
  • Loading branch information
e100 authored Sep 1, 2024
2 parents 83df1d4 + a7d7b50 commit c8ad1ac
Show file tree
Hide file tree
Showing 22 changed files with 1,097 additions and 138 deletions.
2 changes: 1 addition & 1 deletion src/pyefis/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "2.0.27"
__version__ = "2.0.29"

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
instruments:
- type: ganged_arc_gauge
gang_type: horizontal
groups:
- name: Power and Temp
instruments:
-
preferences: ARC9
-
preferences: ARC10
-
preferences: ARC11
-
preferences: ARC12

Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
instruments:
- type: ganged_arc_gauge
gang_type: horizontal
display_state: 1
groups:
- name: Engine
instruments:
-
preferences: ARC1
-
preferences: ARC2
-
preferences: ARC3
-
preferences: ARC4
- type: ganged_arc_gauge
gang_type: horizontal
display_state: 2
groups:
- name: Engine
instruments:
-
preferences: ARC5
-
preferences: ARC6
-
preferences: ARC7
-
preferences: ARC8
5 changes: 0 additions & 5 deletions src/pyefis/config/includes/bars/vertical/4_CHT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ instruments:
- type: ganged_vertical_bar_gauge
gang_type: horizontal
ratio: 0.2
row: 0
column: 0
span:
rows: 40
columns: 30
groups:
- name: CHT
gap: 0
Expand Down
5 changes: 0 additions & 5 deletions src/pyefis/config/includes/bars/vertical/4_EGT.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@ instruments:
- type: ganged_vertical_bar_gauge
gang_type: horizontal
ratio: 0.2
row: 0
column: 0
span:
rows: 40
columns: 30
groups:
- name: EGT
gap: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
instruments:
- type: ganged_button
gang_type: horizontal
row: 0
column: 0
span:
rows: 9
columns: 200
groups:
- name: Side Buttons
gap: 1
common_options:
font_mask: "ANDROID"
instruments:
-
options:
config: buttons/screen-ems-pfd.yaml
encoder_order: 100011
-
options:
config: buttons/screen-ems2-pfd.yaml
encoder_order: 100012
-
options:
config: buttons/screen-android-pfd.yaml
encoder_order: 100013
-
options:
config: buttons/screen-radio-pfd.yaml
encoder_order: 100014
-
options:
config: buttons/screen-sixpack-pfd.yaml
encoder_order: 100015
-
options:
config: buttons/units.yaml
encoder_order: 100016

Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
instruments:
- type: minimal_size
disabled: true
row: 0
column: 0
span:
rows: 37
columns: 67
- type: static_text
row: 0
column: 0
span:
rows: 5
columns: 27
preferences: TEXT3
options:
text: "Active:"
font_mask: "XXXXXXX:"
alignment: AlignLeft
- type: static_text
row: 0
column: 35
span:
rows: 5
columns: 27
preferences: TEXT4
options:
text: "Standby:"
font_mask: "XXXXXXX:"
alignment: AlignLeft
- type: include,RADIO_ACTIVE
row: 5
column: 0
span:
rows: 32
columns: 32
- type: include,RADIO_STANDBY
row: 5
column: 35
span:
rows: 32
columns: 32
- type: button
row: 26
column: 35
span:
rows: 6
columns: 6
#move:
# shrink: 14
options:
config: buttons/mgl/v16/swap-active-standby.yaml
font_mask: "SWAP"
encoder_order: 400026

Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,15 @@ instruments:
- type: include,RADIO_ACTIVE
row: 5
column: 28
# span:
# rows: 27
# columns: 42
span:
rows: 27
columns: 42
- type: include,RADIO_STANDBY
row: 5
column: 64
span:
rows: 27
columns: 42
- type: button
row: 26
column: 64
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
instruments:
- type: minimal_size
disabled: true
row: 0
column: 0
span:
rows: 32
columns: 32
- type: numeric_display
gang_type: horizontal
row: 0
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
instruments:
- type: minimal_size
disabled: true
row: 0
column: 0
span:
rows: 32
columns: 32
- type: numeric_display
gang_type: horizontal
row: 0
Expand Down
11 changes: 10 additions & 1 deletion src/pyefis/config/includes/trim/pitch-yaw-roll-combined.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,20 @@ instruments:
disabled: PITCH_TRIM
row: 0
column: 0
span:
rows: 32
columns: 13
- type: include,includes/trim/roll-slider-button-control.yaml
disabled: ROLL_TRIM
row: 12
column: 12
span:
rows: 10
columns: 29
- type: include,includes/trim/yaw-slider-button-control.yaml
disabled: YAW_TRIM
row: 22
column: 12
column: 12
span:
rows: 10
columns: 29
4 changes: 4 additions & 0 deletions src/pyefis/config/main/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
#screenWidth: 1920
#screenHeight: 1080

# portrait testing
#screenHeight: 960
#screenWidth: 540

# Set EFIS to occupy the entire screen without system border / menu
screenFullSize: True

Expand Down
17 changes: 10 additions & 7 deletions src/pyefis/config/preferences.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,23 +116,26 @@ includes:
SCREENS_CONFIG: screens/default_list.yaml
# The include for the main navigations buttons:
BUTTON_GROUP1: includes/buttons/vertical/screen_changing_PFD-EMS-EMS2-ANDROID-RADIO-SIXPACK-Units.yaml
BUTTON_GROUP2: includes/buttons/horizontal/screen_changing_PFD-EMS-EMS2-ANDROID-RADIO-SIXPACK-Units.yaml

# The include for the encoder button control feature
HMI_ENCODER_BUTTONS: hmi/encoder_input.yaml
# The screen config files to load for the various default screens:
SCREEN_SIXPACK: screens/sixpack.yaml
SCREEN_ANDROID: screens/android.yaml
SCREEN_PFD: screens/pfd.yaml
SCREEN_RADIO: screens/radio.yaml
SCREEN_EMS: screens/ems.yaml
SCREEN_EMS2: screens/ems2.yaml
SCREEN_SIXPACK: screens/sixpack.yaml # screens/sixpack-portrait.yaml
SCREEN_ANDROID: screens/android.yaml # screens/android-portrait.yaml
SCREEN_PFD: screens/pfd.yaml # screens/pfd-portrait.yaml
SCREEN_RADIO: screens/radio.yaml # screens/radio-portrait.yaml
SCREEN_EMS: screens/ems.yaml # screens/ems-portrait.yaml
SCREEN_EMS2: screens/ems2.yaml # screens/ems2-portrait.yaml
# Include file for logging configuration
LOGGING_CONFIG: logging/stderr-info.yaml
# File that defines what lists are included in the radio listbox
RADIO_LISTBOX: lists/radio/listbox.yaml
RADIO_ACTIVE: includes/mgl/v16/square-active-radio-display.yaml
RADIO_STANDBY: includes/mgl/v16/square-standby-radio-display.yaml
RADIO_VOLUMES: includes/mgl/v16/radio-volumes-controls-display.yaml
RADIO_COMBINED: includes/mgl/v16/rectangle-radio-volume-primary-secondary-display.yaml
RADIO_COMBINED_MINIMAL: includes/mgl/v16/rectangle-radio-primary-secondary-display.yaml
RADIO_COMBINED: includes/mgl/v16/rectangle-radio-volume-primary-secondary-listbox-display.yaml

# columns: 35 for square
# 29 + 35 = 64
Expand Down
84 changes: 84 additions & 0 deletions src/pyefis/config/screens/android-portrait.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
ANDROID:
module: pyefis.screens.screenbuilder
title: Screen Builder
include:
- HMI_ENCODER_BUTTONS
layout:
#draw_grid: true
rows: 110
columns: 200
display_state:
interval: 3000
states: 2
instruments:
- type: value_text
disabled: DEMO_TESTING_TEXT
row: 0
column: 0
span:
rows: 2
columns: 200
options:
dbkey: MAVMSG
font_percent: 0.9
- type: weston
disabled: DEMO_TESTING_TEXT
row: 2
column: 0
span:
rows: 43
columns: 200
options:
socket: pyefis-waydroid-1
ini: weston.ini
command: waydroid
args:
- show-full-ui
- type: weston
disabled: not DEMO_TESTING_TEXT
row: 0
column: 0
span:
rows: 45
columns: 200
options:
socket: pyefis-waydroid-1
ini: weston.ini
command: waydroid
args:
- show-full-ui
- type: include,includes/arcs/horizontal/four_wide_two_states_preferences_ARC1-8.yaml
disabled: BUTTONS
row: 45
column: 0
span:
columns: 195.5
rows: 15
- type: include,includes/arcs/vertical/four_high_two_states_preferences_ARC1-8.yaml
disabled: not BUTTONS
row: 45
column: 0
span:
columns: 195.5
rows: 15
- type: include,BUTTON_GROUP2
disabled: BUTTONS
row: 100
column: 0
- type: include,includes/bars/vertical/six_wide_preferences_BAR1-6.yaml
row: 60
column: 0
display_state: 1
span:
rows: 40
columns: 200
- type: include,includes/mgl/v16/square-active-radio-display.yaml
row: 60
column: 0
span:
rows: 40
columns: 200
display_state: 2
replace:
radio_id: 1

Loading

0 comments on commit c8ad1ac

Please sign in to comment.