#198

eez-open · Jun 12, 2021 · f6a944b · f6a944b
1 parent 980b60b
commit f6a944b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/eez/function_generator.cpp b/src/eez/function_generator.cpp
@@ -1426,7 +1426,7 @@ bool isActive() {
 }
 
 float getMax(WaveformParameters &waveformParameters) {
-	return waveformParameters.offset + waveformParameters.amplitude;
+	return waveformParameters.offset + waveformParameters.amplitude / 2.0f;
 }
 
 int checkLimits(int iChannel) {
@@ -2504,7 +2504,11 @@ void data_function_generator_is_dc(DataOperationEnum operation, Cursor cursor, V
 
 void data_function_generator_any_selected(DataOperationEnum operation, Cursor cursor, Value &value) {
 	if (operation == DATA_OPERATION_GET) {
-		value = g_functionGeneratorSelectChannelsPage.m_selectedChannels != 0;
+		if (getActivePageId() == PAGE_ID_SYS_SETTINGS_FUNCTION_GENERATOR) {
+			value = g_functionGeneratorPage.m_selectedResources.m_numResources > 0;
+		} else {
+			value = g_functionGeneratorSelectChannelsPage.m_selectedChannels != 0;
+		}
 	}
 }