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.

Sign up for GitHub

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

Locks conan to 1.59 for GUI builds #1325

Merged
merged 2 commits into from
Mar 21, 2023
Merged

Locks conan to 1.59 for GUI builds #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3f5048
locked conan to 1.59 for now; updates #1324
martukas Mar 21, 2023
14443b1
fixed software design images; updates #1324
martukas Mar 21, 2023
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
2 changes: 1 addition & 1 deletion software/design/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The RespiraWorks ventilator includes software running on two computers:
an STM32 microcontroller and a Raspberry Pi.

![Module diagram](module_diagram.png)
![Module diagram](images/module_diagram.png)

The microcontroller runs bare-metal and controls the sensors and
actuators (valves and blower). Its main loop runs every
Expand Down
2 changes: 1 addition & 1 deletion software/design/UI_requirements.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ suspend all audial alarms for 2 minutes, etc. (see `01_Alarms` in Valispace)

**Additional alarms per ISO 80601-2-12:**
(See [Slack thread](https://respiraworks.slack.com/archives/C011UMNUWGZ/p1591500042061800?thread_ts=1591207530.031400&cid=C011UMNUWGZ))
![](https://i.imgur.com/DJqVFaL.png)
![](images/alarms_table.png)

## Event logs (not in v0.2)

Expand Down
3 changes: 3 additions & 0 deletions software/design/images/alarms_table.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 software/design/module_diagram.png → software/design/images/module_diagram.png
View file
Open in desktop
File renamed without changes
3 changes: 1 addition & 2 deletions software/gui/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@ include(EnsureBuildType)

if(NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/v0.16.1/conan.cmake"
file(DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake"
"${CMAKE_BINARY_DIR}/conan.cmake"
EXPECTED_HASH SHA256=396e16d0f5eabdc6a14afddbcfff62a54a7ee75c6da23f32f7a31bc85db23484
TLS_VERIFY ON)
endif()

Expand Down
4 changes: 2 additions & 2 deletions software/gui/conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[requires]
fmt/8.1.1
spdlog/1.9.2
fmt/9.1.0
spdlog/1.11.0

[generators]
cmake
Expand Down
7 changes: 6 additions & 1 deletion software/gui/gui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
# This script is designed for local unix usage.
# ./gui.sh --help

# \todo: keep CONAN_VERSION updated, test thoroughly whenever you do, leave this "todo" here
CONAN_VERSION=1.59

# Fail if any command fails
set -e
set -o pipefail
Expand Down Expand Up @@ -120,7 +123,9 @@ install_linux() {

configure_conan() {
sudo pip3 install -U pip
sudo pip3 install conan gitpython
pip3 install gitpython
pip3 install conan==$CONAN_VERSION
conan --version
#source ${HOME}/.profile
conan profile new --detect default
conan profile update settings.compiler.libcxx=libstdc++11 default
Expand Down