diff --git a/Building/Linux/clean_rm-NN-test1.sh b/Building/Linux/clean_rm-NN-test1.sh new file mode 100755 index 00000000..e5887003 --- /dev/null +++ b/Building/Linux/clean_rm-NN-test1.sh @@ -0,0 +1,9 @@ +#! /bin/bash +set -e +# +# delete all the folder not deleted by the purge command + +# at the beginning, there was +# application name +appli_name="OSCAR_beta" + diff --git a/Building/Linux/clean_rm-NN-test2.sh b/Building/Linux/clean_rm-NN-test2.sh new file mode 100755 index 00000000..e13ae757 --- /dev/null +++ b/Building/Linux/clean_rm-NN-test2.sh @@ -0,0 +1,7 @@ + +# +# delete all the folder not deleted by the purge command + +# now, application name +appli_name="OSCAR-test" + diff --git a/Building/Linux/ln_usrbin-NN-test.sh b/Building/Linux/ln_usrbin-NN-test.sh new file mode 100755 index 00000000..c853213c --- /dev/null +++ b/Building/Linux/ln_usrbin-NN-test.sh @@ -0,0 +1,10 @@ +#! /bin/bash +set -e +# +# modify by untoutseul05 to search local name for Desktop Folder +# the package now suits the fhs + +# application name +appli_name="OSCAR-test" + + diff --git a/Building/Linux/mkOSDistDeb-NN.sh b/Building/Linux/mkOSDistDeb-NN.sh index 42b13382..e8e39353 100755 --- a/Building/Linux/mkOSDistDeb-NN.sh +++ b/Building/Linux/mkOSDistDeb-NN.sh @@ -112,7 +112,7 @@ if [[ -n ${PRERELEASE} && -z ${RC} ]] ; then post_rem="clean_rm-result-NN-test.sh" else post_inst="ln_usrbin-result-NN.sh" - pre_rem="rm_usrbin-result.sh" + pre_rem="rm_usrbin-result-NN.sh" post_rem="clean_rm-result-NN.sh" fi diff --git a/Building/Linux/rm_usrbin-NN-test.sh b/Building/Linux/rm_usrbin-NN-test.sh new file mode 100755 index 00000000..1f72bfa8 --- /dev/null +++ b/Building/Linux/rm_usrbin-NN-test.sh @@ -0,0 +1,9 @@ +#! /bin/bash +# +# no error is permitted +set -e + +# application name +appli_name="OSCAR-test" + + diff --git a/oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp b/oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp index 84105fd4..286d5a32 100644 --- a/oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp @@ -1068,10 +1068,12 @@ bool PRS1DataChunk::ParseSummaryF5V3(void) case 9: // new to F5V3 vs. F0V6, comes right after settings, before mask on? CHECK_VALUE(data[pos], 0); CHECK_VALUE(data[pos+1], 1); - CHECK_VALUE(data[pos+2], 0); + CHECK_VALUES(data[pos+2], 0, 4); // Apnea Alarm, 0 = off, 4 = 40 CHECK_VALUE(data[pos+3], 1); CHECK_VALUE(data[pos+4], 1); - CHECK_VALUE(data[pos+5], 0); + if (data[pos+5] > 3) { + UNEXPECTED_VALUE(data[pos+5], "0-3"); // Low Minute Ventilation Alarm, 0 = off, 1-3 = 1-3 + } CHECK_VALUE(data[pos+6], 2); CHECK_VALUE(data[pos+7], 1); @@ -1262,7 +1264,7 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size) breath_rate = data[pos+1]; timed_inspiration = data[pos+2]; if (breath_rate < 4 || breath_rate > 16) UNEXPECTED_VALUE(breath_rate, "4-16"); - if (timed_inspiration < 12 || timed_inspiration > 25) UNEXPECTED_VALUE(timed_inspiration, "12-25"); + if (timed_inspiration < 12 || timed_inspiration > 30) UNEXPECTED_VALUE(timed_inspiration, "12-30"); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_BACKUP_BREATH_MODE, PRS1Backup_Fixed)); this->AddEvent(new PRS1ParsedSettingEvent(PRS1_SETTING_BACKUP_BREATH_RATE, breath_rate)); // BPM this->AddEvent(new PRS1ScaledSettingEvent(PRS1_SETTING_BACKUP_TIMED_INSPIRATION, timed_inspiration, 0.1));