p_transmit_little_disinfection
/
little_disinfection_high_power_ctrl_prj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

hpp272
zhaohe 2 years ago
parent
f9c8a783cc
commit
cea347f183
2 changed files with 26 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .settings/language.settings.xml
  2. 30
      usrc/hardware.cpp

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-588101754177311339" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1262840214205683626" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-606449587763093902" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1244492380619901063" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>

30
usrc/hardware.cpp
View File

@ -92,6 +92,14 @@ void dumphpp272data(hpp272_data_t *data) {
printf("water_vapor_saturation_pressure_h2o_h2o2: %d\n", data->water_vapor_saturation_pressure_h2o_h2o2);
}
int hydrogen_peroxide_volume_get_ppm() {
uint32_t adc_val = ADC_Get_Average(3, 12);
float voltage = adc_val * 3.3 / 4096;
float current_ma = voltage / 150.0;
float ppm = (current_ma - 4.0) / 16.0 * 2000;
return ppm;
}
void Hardware::initialize(int deviceId) {
m_device_id = deviceId;
@ -220,14 +228,22 @@ int32_t Hardware::process_rx_packet(from_where_t fromwhere, uint8_t *packet, int
}
static hpp272_data_t fake_hpp272data;
//
PROCESS_CMD(kcmd_m211887_operation, 0, 1) {
// hpp272_data_t *hpp272data = hpp272.readVal();
fake_hpp272data.hydrogen_peroxide_volume = 101;
fake_hpp272data.h2o_h2o2_rs = 102;
fake_hpp272data.temperature1 = 103;
fake_hpp272data.relative_humidity = 104;
#if 0
data.h2o2 = m_hpp272_data_1.hydrogen_peroxide_volume;
data.humid = m_hpp272_data_1.relative_humidity / 100;
data.temp = m_hpp272_data_1.temperature1 / 100;
data.saturation = m_hpp272_data_1.h2o_h2o2_rs / 100;
#endif
fake_hpp272data.hydrogen_peroxide_volume = hydrogen_peroxide_volume_get_ppm(); // ppm
fake_hpp272data.relative_humidity = 50 * 100; // %RH * 100
fake_hpp272data.temperature1 = 25 * 100; // °C * 100
fake_hpp272data.h2o_h2o2_rs = 1 * 100; // %RS * 100
#if 0
fake_hpp272data.absolute_hydrogen_peroxide = 105;
fake_hpp272data.h2o_h2o2dew_point_temperature = 106;
fake_hpp272data.reserved1 = 107;
@ -238,7 +254,9 @@ int32_t Hardware::process_rx_packet(from_where_t fromwhere, uint8_t *packet, int
fake_hpp272data.temperature2 = 112;
fake_hpp272data.h2o2_vapor_pressure = 113;
fake_hpp272data.water_vapor_saturation_pressure_h2o_h2o2 = 114;
hpp272_data_t *hpp272data = &fake_hpp272data;
#endif
hpp272_data_t *hpp272data = &fake_hpp272data;
if (hpp272data) {
receipt[0] = 1;
receipt[1] = 0;

Write Preview
Loading…
Cancel
Save