From 6e6f4998ea6f9e7ca301ef8f5769b65aa90c44ed Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 9 Nov 2023 15:55:57 +0800 Subject: [PATCH] update --- .settings/com.st.stm32cube.ide.mcu.sfrview.prefs | 2 -- .settings/language.settings.xml | 25 ---------------------- .settings/org.eclipse.cdt.core.prefs | 6 ------ .settings/stm32cubeide.project.prefs | 3 --- .../com.st.stm32cube.ide.mcu.sfrview.prefs | 2 ++ Core/.settings/language.settings.xml | 25 ++++++++++++++++++++++ Core/.settings/org.eclipse.cdt.core.prefs | 6 ++++++ Core/.settings/stm32cubeide.project.prefs | 3 +++ usrc/main.cpp | 4 ++++ 9 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 .settings/com.st.stm32cube.ide.mcu.sfrview.prefs delete mode 100644 .settings/language.settings.xml delete mode 100644 .settings/org.eclipse.cdt.core.prefs delete mode 100644 .settings/stm32cubeide.project.prefs create mode 100644 Core/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs create mode 100644 Core/.settings/language.settings.xml create mode 100644 Core/.settings/org.eclipse.cdt.core.prefs create mode 100644 Core/.settings/stm32cubeide.project.prefs diff --git a/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs b/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs deleted file mode 100644 index 98a69fc..0000000 --- a/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -sfrviewstate={"fFavorites"\:{"fLists"\:{}},"fProperties"\:{"fNodeProperties"\:{}}} diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml deleted file mode 100644 index 6d9848e..0000000 --- a/.settings/language.settings.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.settings/org.eclipse.cdt.core.prefs b/.settings/org.eclipse.cdt.core.prefs deleted file mode 100644 index c8ec5df..0000000 --- a/.settings/org.eclipse.cdt.core.prefs +++ /dev/null @@ -1,6 +0,0 @@ -doxygen/doxygen_new_line_after_brief=true -doxygen/doxygen_use_brief_tag=false -doxygen/doxygen_use_javadoc_tags=true -doxygen/doxygen_use_pre_tag=false -doxygen/doxygen_use_structural_commands=false -eclipse.preferences.version=1 diff --git a/.settings/stm32cubeide.project.prefs b/.settings/stm32cubeide.project.prefs deleted file mode 100644 index 1ad0e68..0000000 --- a/.settings/stm32cubeide.project.prefs +++ /dev/null @@ -1,3 +0,0 @@ -8DF89ED150041C4CBC7CB9A9CAA90856=F6DE5292A9642B92EC07AFF89A393D1B -DC22A860405A8BF2F2C095E5B6529F12=F6DE5292A9642B92EC07AFF89A393D1B -eclipse.preferences.version=1 diff --git a/Core/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs b/Core/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs new file mode 100644 index 0000000..98a69fc --- /dev/null +++ b/Core/.settings/com.st.stm32cube.ide.mcu.sfrview.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +sfrviewstate={"fFavorites"\:{"fLists"\:{}},"fProperties"\:{"fNodeProperties"\:{}}} diff --git a/Core/.settings/language.settings.xml b/Core/.settings/language.settings.xml new file mode 100644 index 0000000..6d9848e --- /dev/null +++ b/Core/.settings/language.settings.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Core/.settings/org.eclipse.cdt.core.prefs b/Core/.settings/org.eclipse.cdt.core.prefs new file mode 100644 index 0000000..c8ec5df --- /dev/null +++ b/Core/.settings/org.eclipse.cdt.core.prefs @@ -0,0 +1,6 @@ +doxygen/doxygen_new_line_after_brief=true +doxygen/doxygen_use_brief_tag=false +doxygen/doxygen_use_javadoc_tags=true +doxygen/doxygen_use_pre_tag=false +doxygen/doxygen_use_structural_commands=false +eclipse.preferences.version=1 diff --git a/Core/.settings/stm32cubeide.project.prefs b/Core/.settings/stm32cubeide.project.prefs new file mode 100644 index 0000000..1ad0e68 --- /dev/null +++ b/Core/.settings/stm32cubeide.project.prefs @@ -0,0 +1,3 @@ +8DF89ED150041C4CBC7CB9A9CAA90856=F6DE5292A9642B92EC07AFF89A393D1B +DC22A860405A8BF2F2C095E5B6529F12=F6DE5292A9642B92EC07AFF89A393D1B +eclipse.preferences.version=1 diff --git a/usrc/main.cpp b/usrc/main.cpp index daddbeb..18f91dc 100644 --- a/usrc/main.cpp +++ b/usrc/main.cpp @@ -293,6 +293,10 @@ void Main::run() { // uint16_t water_vapor_saturation_pressure_h2o_h2o2; // hpa auto *sensordata = m_m211887ModuleManager.readSensor(atoi(paraV[0])); + if(!sensordata){ + ZLOGE(TAG, "hpp272 is null"); + return; + } // ZLOGI(TAG, "hpp272_read_c1000 %d", sensordata->pressure); ZLOGI(TAG, "hydrogen_peroxide_volume :%d", sensordata->hydrogen_peroxide_volume); ZLOGI(TAG, "h2o_h2o2_rs :%d", sensordata->h2o_h2o2_rs);