Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resizing #97

Open
wants to merge 19 commits into
base: simulator
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ confy = "0.4"
lazy_static = "1.4"
serde = { version = "1.0", features = ["derive"] }
paste = "1.0"
resize = "0.7"
rgb = "0.8"
rust-embed = { version = "6.2", default-features = false, features = ["compression", "debug-embed"] }
chrono = { version = "0.4", default-features = false }
fluent = "0.16"
Expand All @@ -40,7 +42,7 @@ conrod_core = { git = "https://github.com/dsferruzza/conrod", branch = "update-g
sysfs_gpio = { version = "0.6", optional = true }
rn2903 = { git = "https://github.com/waxzce/lora-rust-rn2903-rn2483.git", rev = "b086057ba096920abef3870ad0cefa2c80a343e2", optional = true }
makair-telemetry = { git = "https://github.com/makers-for-life/makair-telemetry", rev = "72e9bf31a9baa5f2ef143bdc313bf5124a5223e2", default-features = false }
makair-simulator = { git = "https://github.com/makers-for-life/makair-simulator", rev = "0b91e1b6fd5740ea3cb379cc16f71d701ce66166", optional = true }
makair-simulator = { git = "https://github.com/makers-for-life/makair-simulator", rev = "338fdbf20235e014a6b5fca04cbbdb94d0bcba3b", optional = true }

[build-dependencies]
winres = { git = "https://github.com/Skirmisher/winres", rev = "7333e0ff201d25eaaa70352682cd1a37614f93f4" } # https://github.com/mxre/winres/pull/36 is required
Expand Down
14 changes: 7 additions & 7 deletions res/locales/en.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,16 @@ modal-snooze-alarms = Snooze alarms
modal-snooze-alarms-active = Beeps enabled (default setting)
modal-snooze-alarms-inactive = Beeps disabled (for some time)

modal-mode-pressure-inspiratory = Inspiratory pressure
modal-mode-pressure-expiratory = Expiratory pressure
modal-mode-time-inspiratory = Inspiratory time
modal-mode-time-inspiratory-minimum = Inspiratory time (minimum)
modal-mode-time-inspiratory-maximum = Inspiratory time (maximum)
modal-mode-pressure-inspiratory = Inspiratory Pressure
modal-mode-pressure-expiratory = Expiratory Pressure
modal-mode-time-inspiratory = Inspiratory duration
modal-mode-time-inspiratory-minimum = Inspiratory duration (min)
modal-mode-time-inspiratory-maximum = Inspiratory duration (max)
modal-mode-flow-inspiratory = Inspiratory flow
modal-mode-cycles-per-minute = Cycles per minute
modal-mode-cycles-per-minute = Respiratory rate
modal-mode-tidal-volume = Tidal volume
modal-mode-plateau-duration = Plateau duration
modal-mode-trigger-offset = Trigger offset
modal-mode-trigger-offset = Inspiratory trigger
modal-mode-trigger-expiratory = Expiratory trigger
modal-mode-alarm-low-inspiratory-minute-volume = Insp. minute volume (min)
modal-mode-alarm-high-inspiratory-minute-volume = Insp. minute volume (max)
Expand Down
32 changes: 16 additions & 16 deletions res/locales/fr.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ telemetry-label-peak = P(crête)
telemetry-label-plateau = P(plateau)
telemetry-label-expiratory = P(expiration)
telemetry-label-cycles = Cycles/minute
telemetry-label-ratio = Temps inspiratoire
telemetry-label-ratio = Durée de l'inspiration
telemetry-label-ratio-details = ratio insp-exp. de
telemetry-label-tidal = Volume courant
telemetry-label-minute-volume = Volume minute
Expand Down Expand Up @@ -83,24 +83,24 @@ modal-snooze-alarms-inactive = Bips désactivés (temporaire)
modal-mode-pressure-inspiratory = Pression inspiratoire
modal-mode-pressure-expiratory = Pression expiratoire
modal-mode-time-inspiratory = Temps inspiratoire
modal-mode-time-inspiratory-minimum = Temps inspiratoire (min)
modal-mode-time-inspiratory-maximum = Temps inspiratoire (max)
modal-mode-time-inspiratory-minimum = Durée d'inspiration (min)
modal-mode-time-inspiratory-maximum = Durée d'inspiration (max)
modal-mode-flow-inspiratory = Débit inspiratoire
modal-mode-cycles-per-minute = Cycles par minute
modal-mode-cycles-per-minute = Fréquence respiratoire
modal-mode-tidal-volume = Volume courant
modal-mode-plateau-duration = Durée du plateau
modal-mode-trigger-offset = Seuil de déclenchement
modal-mode-plateau-duration = Durée de plateau
modal-mode-trigger-offset = Trigger inspiratoire
modal-mode-trigger-expiratory = Trigger expiratoire
modal-mode-alarm-low-inspiratory-minute-volume = Volume inspiratoire (bas)
modal-mode-alarm-high-inspiratory-minute-volume = Volume inspiratoire (haut)
modal-mode-alarm-low-expiratory-minute-volume = Volume expiratoire (bas)
modal-mode-alarm-high-expiratory-minute-volume = Volume expiratoire (haut)
modal-mode-alarm-low-respiratory-rate = Cycles par minute (bas)
modal-mode-alarm-high-respiratory-rate = Cycles par minute (haut)
modal-mode-alarm-low-tidal-volume = Volume courant (bas)
modal-mode-alarm-high-tidal-volume = Volume courant (haut)
modal-mode-alarm-leak = Volume de fuite (haut)
modal-mode-alarm-peak-pressure = Pression de crête (haut)
modal-mode-alarm-low-inspiratory-minute-volume = Volume minute inspi. (min)
modal-mode-alarm-high-inspiratory-minute-volume = Volume minute inspi. (max)
modal-mode-alarm-low-expiratory-minute-volume = Volume minute expi. (min)
modal-mode-alarm-high-expiratory-minute-volume = Volume minute expi. (max)
modal-mode-alarm-low-respiratory-rate = Fréquence respiratoire (min)
modal-mode-alarm-high-respiratory-rate =Fréquence respiratoire (max)
modal-mode-alarm-low-tidal-volume = Volume courant (min)
modal-mode-alarm-high-tidal-volume = Volume courant (max)
modal-mode-alarm-leak = Volume de fuite (max)
modal-mode-alarm-peak-pressure = Pression de crête (max)

modal-advanced-locale = Langue
modal-advanced-date = Date
Expand Down
Loading