read DCP405 channel temperature only inside PSU thread

eez-open · Sep 16, 2020 · 04c6f8c · 04c6f8c
1 parent f0e25c2
commit 04c6f8c
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 14 deletions.
diff --git a/src/eez/drivers/tc77.cpp b/src/eez/drivers/tc77.cpp
@@ -40,6 +40,10 @@ float readTemperature(uint8_t slotIndex) {
     uint8_t output[2] = { 0, 0 };
     uint8_t result[2];
 
+	if (g_isBooted && !isPsuThread()) {
+        DebugTrace("wrong thread\n");
+    }
+
     spi::select(slotIndex, spi::CHIP_TEMP_SENSOR);
     spi::transfer2(slotIndex, output, result);
     spi::deselect(slotIndex);

diff --git a/src/eez/modules/dib-dcp405/adc.cpp b/src/eez/modules/dib-dcp405/adc.cpp
@@ -243,6 +243,10 @@ bool AnalogDigitalConverter::test() {
     data[2] = 0;
     data[3] = 0;
 
+	if (g_isBooted && !isPsuThread()) {
+        DebugTrace("wrong thread\n");
+    }
+
     spi::select(slotIndex, spi::CHIP_ADC);
     spi::transfer4(slotIndex, data, result);
     spi::deselect(slotIndex);

diff --git a/src/eez/modules/dib-dcp405/dib-dcp405.cpp b/src/eez/modules/dib-dcp405/dib-dcp405.cpp
@@ -811,17 +811,7 @@ struct DcpChannel : public Channel {
 		return false;
 	}
 
-	float readTemperature() override {
-#if defined(EEZ_PLATFORM_STM32)
-		auto &slot = *g_slots[slotIndex];
-		if (slot.moduleRevision >= MODULE_REVISION_DCP405_R1B1) {
-			return drivers::tc77::readTemperature(slotIndex);
-		} else {
-			return drivers::tmp1075::readTemperature(slotIndex);
-		}
-#endif
-		return NAN;
-	}
+	float readTemperature() override;
 
 	int getAdvancedOptionsPageId() override {
 		return gui::PAGE_ID_CH_SETTINGS_ADV_OPTIONS;
@@ -830,6 +820,8 @@ struct DcpChannel : public Channel {
 
 struct DcpModule : public PsuModule {
 public:
+	float temperature = 0;
+
     DcpModule() {
         moduleType = MODULE_TYPE_DCP405;
         moduleName = "DCP405";
@@ -952,6 +944,25 @@ struct DcpModule : public PsuModule {
 static DcpModule g_dcpModule;
 Module *g_module = &g_dcpModule;
 
+float DcpChannel::readTemperature() {
+#if defined(EEZ_PLATFORM_STM32)
+	DcpModule *module = (DcpModule *)g_slots[slotIndex];
+
+	if (!isPsuThread()) {
+		sendMessageToPsu(PSU_MESSAGE_READ_CHANNEL_TEMPERATURE, channelIndex);
+	} else {
+		if (module->moduleRevision >= MODULE_REVISION_DCP405_R1B1) {
+			module->temperature = drivers::tc77::readTemperature(slotIndex);
+		} else {
+			module->temperature = drivers::tmp1075::readTemperature(slotIndex);
+		}
+	}
+
+	return module->temperature;
+#endif
+	return NAN;
+}
+
 bool isDacRampActive() {
 	for (int i = 0; i < CH_NUM; i++) {
 		auto &channel = Channel::get(i);

diff --git a/src/eez/modules/psu/psu.cpp b/src/eez/modules/psu/psu.cpp
@@ -587,7 +587,10 @@ void onThreadMessage(uint8_t type, uint32_t param) {
     } else if (type == PSU_MESSAGE_REMOTE_SENSING_EANBLE) {
     	Channel &channel = Channel::get((param >> 8) & 0xFF);
         channel_dispatcher::remoteSensingEnable(channel, param & 0xFF);
-    } 
+    } else if (type == PSU_MESSAGE_READ_CHANNEL_TEMPERATURE) {
+        Channel &channel = Channel::get(param);
+        channel.readTemperature();
+    }
 }
 
 bool measureAllAdcValuesOnChannel(int channelIndex) {

diff --git a/src/eez/tasks.cpp b/src/eez/tasks.cpp
@@ -388,7 +388,7 @@ void lowPriorityThreadOneIter() {
             else if (type == THREAD_MESSAGE_GENERATE_ERROR) {
                 generateError(param);
             } else if (type == THREAD_MESSAGE_SAVE_CHANNEL_CALIBRATION) {
-                if (param < CH_NUM) {
+                if (param < (unsigned)CH_NUM) {
                     persist_conf::saveChannelCalibration(Channel::get(param));
                 } else {
                     param -= CH_NUM;

diff --git a/src/eez/tasks.h b/src/eez/tasks.h
@@ -51,7 +51,8 @@ enum HighPriorityThreadMessage {
     PSU_MESSAGE_RECALL_STATE,
     PSU_MESSAGE_SLOT_SET_ENABLED,
     PSU_MESSAGE_SET_CURRENT_RANGE_SELECTION_MODE,
-    PSU_MESSAGE_REMOTE_SENSING_EANBLE
+    PSU_MESSAGE_REMOTE_SENSING_EANBLE,
+    PSU_MESSAGE_READ_CHANNEL_TEMPERATURE
 };
 
 enum LowPriorityThreadMessage {