diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 205f9d6..131c940 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/usrc/main.cpp b/usrc/main.cpp
index a1b07a2..b153790 100644
--- a/usrc/main.cpp
+++ b/usrc/main.cpp
@@ -74,19 +74,19 @@ TemperatureSensor m_temperature_sensor[8];
static void initsubmodule() {
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);
- temperature_capture_thread.init("temperature_capture_thread", 1024, osPriorityLow);
+ temperature_capture_thread.init("temperature_capture_thread", 1024, osPriorityAboveNormal);
temperature_capture_thread.start([]() {
while (1) {
for (int i = 0; i < 5; i++) {
m_temperature_sensor[i].loop();
+ osDelay(10);
}
- osDelay(1);
}
});
}
diff --git a/usrc/serial485_to_analog.cpp b/usrc/serial485_to_analog.cpp
index 77299e1..d9957ce 100644
--- a/usrc/serial485_to_analog.cpp
+++ b/usrc/serial485_to_analog.cpp
@@ -39,7 +39,7 @@ void Serial485ToAnalog::start() {
write_reg_val[i] = (uint16_t)(temperture_i_val[i] * 1000);
}
writeReg10Muti(0x01, 0x0064, write_reg_val, m_sensorNum, 1000);
- zthread.sleep(100);
+ zthread.sleep(1000);
}
});
}
diff --git a/usrc/temperature_sensor.cpp b/usrc/temperature_sensor.cpp
index 4934228..fb73577 100644
--- a/usrc/temperature_sensor.cpp
+++ b/usrc/temperature_sensor.cpp
@@ -43,7 +43,6 @@ void TemperatureSensor::loop() {
zlock_guard l(m_mutex);
m_advVal = adcVal;
}
- osDelay(30);
}