Skip to content

Commit f385da5

Browse files
committed
stim tree: add names for voltage and duration sources
1 parent 4905c48 commit f385da5

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

hekatoolslib/PMparameters.cpp

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,22 @@ namespace hkLib {
7070
"AdcVirtual"sv
7171
};
7272

73+
constexpr std::array seSourceNames{
74+
"value"sv,
75+
"holding"sv,
76+
"pgf-1"sv,
77+
"pgf-2"sv,
78+
"pgf-3"sv,
79+
"pgf-4"sv,
80+
"pgf-5"sv,
81+
"pgf-6"sv,
82+
"pgf-7"sv,
83+
"pgf-8"sv,
84+
"pgf-9"sv,
85+
"pgf-10"sv
86+
};
87+
88+
7389
std::array SegStoreTypeNames {
7490
"SegNoStore"sv,
7591
"SegStore"sv,
@@ -218,11 +234,11 @@ namespace hkLib {
218234
{ true,true,"seVoltageIncMode","",PMparameter::StimIncrementMode,6},
219235
{ true,true,"seDurationIncMode","",PMparameter::StimIncrementMode,7},
220236
{ true,true,"seVoltage","V",PMparameter::LongReal ,8},
221-
{ true,true,"seVoltageSource","",PMparameter::Int32,16},
237+
{ true,true,"seVoltageSource","",PMparameter::seSourceName,16},
222238
{ true,true,"seDeltaVFactor", "",PMparameter::LongReal, 20},
223239
{ true,true,"seDeltaVIncrement","V", PMparameter::LongReal, 28},
224240
{ true,true,"seDuration","s", PMparameter::LongReal , 36},
225-
{ true,true,"seDurationSource", "",PMparameter::Int32, 44},
241+
{ true,true,"seDurationSource", "",PMparameter::seSourceName, 44},
226242
{ true,true,"seDeltaTFactor","", PMparameter::LongReal, 48},
227243
{ true,true,"seDeltaTIncrement","s", PMparameter::LongReal, 56},
228244
{ true,true,"seScanRate","", PMparameter::LongReal, 72}
@@ -587,6 +603,9 @@ namespace hkLib {
587603
case AdcTypeName:
588604
ss << AdcTypeNames.at(static_cast<std::size_t>(node.getChar(offset)));
589605
break;
606+
case seSourceName:
607+
ss << seSourceNames.at(node.extractValue<std::int32_t>(offset));
608+
break;
590609
case SegStoreType:
591610
ss << SegStoreTypeNames.at(static_cast<std::size_t>(node.getChar(offset)));
592611
break;

hekatoolslib/PMparameters.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ namespace hkLib {
6868
ExtTriggerTypeName,
6969
AmplModeType,
7070
AdcTypeName,
71+
seSourceName,
7172
SegStoreType,
7273
UserParamDesc4, // 4x UserParamDesc
7374
UserParamDesc2,

0 commit comments

Comments
 (0)