#198

eez-open · Jun 9, 2021 · 6902cb4 · 6902cb4
1 parent db418a2
commit 6902cb4
Show file tree

Hide file tree

Showing 22 changed files with 60,933 additions and 61,941 deletions.
diff --git a/src/eez/gui/data.cpp b/src/eez/gui/data.cpp
@@ -896,6 +896,15 @@ int getXScroll(const WidgetCursor &widgetCursor) {
     return value.getType() == VALUE_TYPE_INT ? value.getInt() : 0;
 }
 
+void getSloatAndSubchannelIndex(Cursor cursor, int16_t id, int &slotIndex, int &subchannelIndex) {
+	Value value;
+	DATA_OPERATION_FUNCTION(id, DATA_OPERATION_GET_SLOT_AND_SUBCHANNEL_INDEX, cursor, value);
+	if (value.getType() == VALUE_TYPE_UINT32) {
+		slotIndex = value.getFirstInt16();
+		subchannelIndex = value.getSecondInt16();
+	}
+}
+
 } // namespace gui
 } // namespace eez
 

diff --git a/src/eez/gui/data.h b/src/eez/gui/data.h
@@ -398,7 +398,8 @@ enum DataOperationEnum {
     DATA_OPERATION_YT_DATA_TOUCH_DRAG,
     DATA_OPERATION_GET_CANVAS_DRAW_FUNCTION,
     DATA_OPERATION_GET_TEXT_CURSOR_POSITION,
-    DATA_OPERATION_GET_X_SCROLL
+    DATA_OPERATION_GET_X_SCROLL,
+	DATA_OPERATION_GET_SLOT_AND_SUBCHANNEL_INDEX
 };
 
 int count(int16_t id);
@@ -484,5 +485,7 @@ void ytDataTouchDrag(Cursor cursor, int16_t id, TouchDrag *touchDrag);
 int getTextCursorPosition(Cursor cursor, int16_t id);
 int getXScroll(const WidgetCursor &widgetCursor);
 
+void getSloatAndSubchannelIndex(Cursor cursor, int16_t id, int &slotIndex, int &subchannelIndex);
+
 } // namespace gui
 } // namespace eez
diff --git a/src/eez/gui/document_simulator.cpp b/src/eez/gui/document_simulator.cpp
diff --git a/src/eez/gui/document_simulator.h b/src/eez/gui/document_simulator.h
diff --git a/src/eez/gui/document_stm32.cpp b/src/eez/gui/document_stm32.cpp
diff --git a/src/eez/gui/document_stm32.h b/src/eez/gui/document_stm32.h
diff --git a/src/eez/index.cpp b/src/eez/index.cpp
@@ -921,7 +921,7 @@ const char *Module::getPinoutFile() {
     return nullptr;
 }
 
-bool Module::measureTemperature(int subbchannelIndex, float &temperature, int *err) {
+bool Module::measureTemperature(int subchannelIndex, float &temperature, int *err) {
 	if (err) {
 		*err = SCPI_ERROR_HARDWARE_MISSING;
 	}
@@ -935,6 +935,14 @@ bool Module::isCopyToAvailable() {
 void Module::copyTo(int slotIndex) {
 }
 
+bool Module::isMicroAmperAllowed(int subchannelIndex) {
+	return false;
+}
+
+bool Module::isAmperAllowed(int subchannelIndex) {
+	return false;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 struct NoneModule : public Module {

diff --git a/src/eez/index.h b/src/eez/index.h
@@ -441,10 +441,13 @@ struct Module {
 
     virtual const char *getPinoutFile();
 
-	virtual bool measureTemperature(int subbchannelIndex, float &temperature, int *err);
+	virtual bool measureTemperature(int subchannelIndex, float &temperature, int *err);
 
     virtual bool isCopyToAvailable();
     virtual void copyTo(int slotIndex);
+
+	virtual bool isMicroAmperAllowed(int subchannelIndex);
+	virtual bool isAmperAllowed(int subchannelIndex);
 };
 
 static const int NUM_SLOTS = 3;