small fix to the telemetry field id view and internal data storage
This commit is contained in:
+4
-4
@@ -55,7 +55,10 @@ func (tf *TelemetryField) Pack() []byte {
|
||||
case DataTypeINT32, DataTypeUINT32:
|
||||
buf = append(buf, uint8(tf.Raw), uint8(tf.Raw>>8), uint8(tf.Raw>>16))
|
||||
case DataTypeINT64, DataTypeUINT64:
|
||||
buf = append(buf, uint8(tf.Raw), uint8(tf.Raw>>8), uint8(tf.Raw>>16), uint8(tf.Raw>>32))
|
||||
buf = append(buf, uint8(tf.Raw), uint8(tf.Raw>>8), uint8(tf.Raw>>16),
|
||||
uint8(tf.Raw>>24), uint8(tf.Raw>>32), uint8(tf.Raw>>40), uint8(tf.Raw>>48),
|
||||
uint8(tf.Raw>>56),
|
||||
)
|
||||
case DataTypeSTRING:
|
||||
l := min(len(tf.Str), math.MaxUint8)
|
||||
|
||||
@@ -123,9 +126,6 @@ func initFieldNamesMap() {
|
||||
|
||||
func GetFieldID(name string) (FieldID, bool) {
|
||||
id, ok := fieldNameToID[name]
|
||||
if ok {
|
||||
id = id - FirstField
|
||||
}
|
||||
return id, ok
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@ func NewCDashDisplayWindowFormView() *CDashDisplayWindowFormView {
|
||||
view.TextSize.SetCurrentOption(0)
|
||||
|
||||
view.TelemetryField = tview.NewDropDown().SetLabel("Telemetry Field")
|
||||
for _, fieldName := range telemetry.FieldNames[3:] {
|
||||
for _, fieldName := range telemetry.FieldNames[telemetry.FirstField:] {
|
||||
view.TelemetryField.AddOption(fieldName, blankDropdownOptionCallback)
|
||||
}
|
||||
view.TelemetryField.SetCurrentOption(0)
|
||||
@@ -135,7 +135,7 @@ func (fv *WindowFormView) SetValues(win *cdashdisplay.DesktopUIWindow) {
|
||||
if !ok {
|
||||
telemFieldID = 100
|
||||
}
|
||||
fv.Form.TelemetryField.SetCurrentOption(int(telemFieldID))
|
||||
fv.Form.TelemetryField.SetCurrentOption(int(telemFieldID - telemetry.FirstField))
|
||||
}
|
||||
|
||||
func windowInfoPageID(idx int16) string {
|
||||
|
||||
Reference in New Issue
Block a user