p_graphite_digester
/
graphite_digester_temperature_sensors_board
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

调整ADC通道顺序

master
zhaohe 1 year ago
parent
8882c71af6
commit
920feac676
4 changed files with 9 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .settings/language.settings.xml
  2. 12
      usrc/main.cpp
  3. 2
      usrc/serial485_to_analog.cpp
  4. 1
      usrc/temperature_sensor.cpp

4
.settings/language.settings.xml
View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="1639727099451158917" 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="824669307326889509" 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.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <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.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" 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="1688855255312885878" 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="873797463188616470" 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.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

12
usrc/main.cpp
View File

@ -74,19 +74,19 @@ TemperatureSensor m_temperature_sensor[8];
static void initsubmodule() { static void initsubmodule() {
osDelay(1000); osDelay(1000);
{ {
m_temperature_sensor[0].initialize(&hadc1, ADC_CHANNEL_10);
m_temperature_sensor[1].initialize(&hadc1, ADC_CHANNEL_11);
m_temperature_sensor[2].initialize(&hadc1, ADC_CHANNEL_12);
m_temperature_sensor[3].initialize(&hadc1, ADC_CHANNEL_13);
m_temperature_sensor[0].initialize(&hadc1, ADC_CHANNEL_12);
m_temperature_sensor[1].initialize(&hadc1, ADC_CHANNEL_13);
m_temperature_sensor[2].initialize(&hadc1, ADC_CHANNEL_11);
m_temperature_sensor[3].initialize(&hadc1, ADC_CHANNEL_10);
m_temperature_sensor[4].initialize(&hadc1, ADC_CHANNEL_14); m_temperature_sensor[4].initialize(&hadc1, ADC_CHANNEL_14);
temperature_capture_thread.init("temperature_capture_thread", 1024, osPriorityLow);
temperature_capture_thread.init("temperature_capture_thread", 1024, osPriorityAboveNormal);
temperature_capture_thread.start([]() { temperature_capture_thread.start([]() {
while (1) { while (1) {
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
m_temperature_sensor[i].loop(); m_temperature_sensor[i].loop();
osDelay(10);
} }
osDelay(1);
} }
}); });
} }

2
usrc/serial485_to_analog.cpp
View File

@ -39,7 +39,7 @@ void Serial485ToAnalog::start() {
write_reg_val[i] = (uint16_t)(temperture_i_val[i] * 1000); write_reg_val[i] = (uint16_t)(temperture_i_val[i] * 1000);
} }
writeReg10Muti(0x01, 0x0064, write_reg_val, m_sensorNum, 1000); writeReg10Muti(0x01, 0x0064, write_reg_val, m_sensorNum, 1000);
zthread.sleep(100);
zthread.sleep(1000);
} }
}); });
} }

1
usrc/temperature_sensor.cpp
View File

@ -43,7 +43,6 @@ void TemperatureSensor::loop() {
zlock_guard l(m_mutex); zlock_guard l(m_mutex);
m_advVal = adcVal; m_advVal = adcVal;
} }
osDelay(30);
} }

Write Preview
Loading…
Cancel
Save