From ef2c7bf173826389485bacecef5cbf6ca6f8f8af Mon Sep 17 00:00:00 2001
From: Eduardo Silva <eduardosilva@disroot.org>
Date: Mon, 9 Mar 2026 23:06:17 +0000
Subject: [PATCH] small fix to the telemetry field id view and internal data
 storage

---
 telemetry/data.go                      | 8 ++++----
 tui/internal/views/layoutTool_forms.go | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/telemetry/data.go b/telemetry/data.go
index 46f42f0..7dd9200 100644
--- a/telemetry/data.go
+++ b/telemetry/data.go
@@ -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
 }
 
diff --git a/tui/internal/views/layoutTool_forms.go b/tui/internal/views/layoutTool_forms.go
index 61f6824..03afa6f 100644
--- a/tui/internal/views/layoutTool_forms.go
+++ b/tui/internal/views/layoutTool_forms.go
@@ -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 {