The logger needs to be passed from the caller now - will change this in the future

Reviewed-on: #5

constants.go

@@ -2,7 +2,6 @@ package goirsdk
 
 import (
 	"log"
-	"strconv"
 )
 
 type Msg struct {
@@ -20,7 +19,6 @@ const (
 	IRSDK_BROADCASTMSGNAME   string = "IRSDK_BROADCASTMSG"
 	fileMapSize              uint32 = 1164 * 1024
 	connTimeout              int64  = 30
-	stConnected              int    = 1
 )
 
 const (
@@ -117,6 +115,22 @@ const (
 	csFocusAtDriver   int = 0 // ctFocusAtDriver + car number...
 )
 
+// StatusField - START
+const (
+	irsdk_stConnected = 0x01
+)
+
+func (i *IBT) SessionStatusConnected() bool {
+	return i.Headers.Status == irsdk_stConnected
+}
+
+// NOTE: move this away from here
+// func (i *IBT) SessionTimedOut() bool {
+// 	return sdk.lastValidData+connTimeout > time.Now().Unix()
+// }
+
+// StatusField - END
+
 // Camera positions
 type bitfieldValue struct {
 	Value int
@@ -126,129 +140,60 @@ type bitfieldValue struct {
 // EngineWarnings - Start
 // TODO: wtf
 var (
-	irsdk_WaterTempWarning    int64 = 0x00000001
-	irsdk_FuelPressureWarning int64 = 0x00000002
-	irsdk_OilPressureWarning  int64 = 0x00000004
-	irsdk_EngineStalled       int64 = 0x00000008
-	irsdk_PitSpeedLimiter     int64 = 0x00000010
-	irsdk_RevLimiterActive    int64 = 0x00000020
-	irsdk_AbsActive           int64 = 0x00000100
-	// DEPRECATE THESE ↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓
-	irsdkWaterTempWarning    = bitfieldValue{0x01, "irsdk_waterTempWarning"}
-	irsdkFuelPressureWarning = bitfieldValue{0x02, "irsdk_fueldPressureWarning"}
-	irsdkOilPressureWarning  = bitfieldValue{0x04, "irsdk_oilPressureWarning"}
-	irsdkEngineStalled       = bitfieldValue{0x08, "irsdk_engineStalled"}
-	irsdkPitSpeedLimiter     = bitfieldValue{0x10, "irsdk_pitSpeedLimiter"}
-	irsdkRevLimiterActive    = bitfieldValue{0x20, "irsdk_revLimiterActive"}
-	irsdkAbsActive           = bitfieldValue{0x100, "irsdk_absActive"}
-	irsdkEngineWarnings      = []bitfieldValue{
-		irsdkWaterTempWarning, irsdkFuelPressureWarning,
-		irsdkOilPressureWarning, irsdkEngineStalled, irsdkPitSpeedLimiter, irsdkRevLimiterActive,
-		irsdkAbsActive,
-	}
+	irsdk_WaterTempWarning    = 0x00000001
+	irsdk_FuelPressureWarning = 0x00000002
+	irsdk_OilPressureWarning  = 0x00000004
+	irsdk_EngineStalled       = 0x00000008
+	irsdk_PitSpeedLimiter     = 0x00000010
+	irsdk_RevLimiterActive    = 0x00000020
+	irsdk_AbsActive           = 0x00000100
 )
 
-func (i *IBT) WaterTempWarning() bool {
+func (i *IBT) checkEngineWarningsBitfield(field int) bool {
 	val, ok := i.Vars.Vars["EngineWarnings"]
 	if !ok {
 		log.Fatal("no EngineWarnings")
 	}
 
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get EngineWarnings: " + err.Error())
+	bitfield, ok := val.Value.(uint32)
+	if !ok {
+		log.Fatalf("unable to typecast EngineWarnings: %+v", val)
 	}
 
-	return bitfield&irsdk_WaterTempWarning != 0
+	return bitfield&uint32(field) != 0
+}
+
+func (i *IBT) WaterTempWarning() bool {
+	return i.checkEngineWarningsBitfield(irsdk_WaterTempWarning)
 }
 
 func (i *IBT) FuelPressureWarning() bool {
-	val, ok := i.Vars.Vars["EngineWarnings"]
-	if !ok {
-		log.Fatal("no EngineWarnings")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get EngineWarnings: " + err.Error())
-	}
-
-	return bitfield&irsdk_FuelPressureWarning != 0
+	return i.checkEngineWarningsBitfield(irsdk_FuelPressureWarning)
 }
 
 func (i *IBT) OilPressureWarning() bool {
-	val, ok := i.Vars.Vars["EngineWarnings"]
-	if !ok {
-		log.Fatal("no EngineWarnings")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get EngineWarnings: " + err.Error())
-	}
-
-	return bitfield&irsdk_OilPressureWarning != 0
+	return i.checkEngineWarningsBitfield(irsdk_OilPressureWarning)
 }
 
 func (i *IBT) EngineStalled() bool {
-	val, ok := i.Vars.Vars["EngineWarnings"]
-	if !ok {
-		log.Fatal("no EngineWarnings")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get EngineWarnings: " + err.Error())
-	}
-
-	return bitfield&irsdk_EngineStalled != 0
+	return i.checkEngineWarningsBitfield(irsdk_EngineStalled)
 }
 
 func (i *IBT) PitSpeedLimiter() bool {
-	val, ok := i.Vars.Vars["EngineWarnings"]
-	if !ok {
-		log.Fatal("no EngineWarnings")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get EngineWarnings: " + err.Error())
-	}
-
-	return bitfield&irsdk_PitSpeedLimiter != 0
+	return i.checkEngineWarningsBitfield(irsdk_PitSpeedLimiter)
 }
 
 func (i *IBT) RevLimiterActive() bool {
-	val, ok := i.Vars.Vars["EngineWarnings"]
-	if !ok {
-		log.Fatal("no EngineWarnings")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get EngineWarnings: " + err.Error())
-	}
-
-	return bitfield&irsdk_RevLimiterActive != 0
+	return i.checkEngineWarningsBitfield(irsdk_RevLimiterActive)
 }
 
 func (i *IBT) AbsActive() bool {
-	val, ok := i.Vars.Vars["EngineWarnings"]
-	if !ok {
-		log.Fatal("no EngineWarnings")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get EngineWarnings: " + err.Error())
-	}
-
-	return bitfield&irsdk_AbsActive != 0
+	return i.checkEngineWarningsBitfield(irsdk_AbsActive)
 }
 
 // EngineWarnings - END
 
-// SessionState const
+// SessionState - START
 const (
 	irsdk_StateInvalid    = 0x00
 	irsdk_StateGetInCar   = 0x01
@@ -259,6 +204,49 @@ const (
 	irsdk_StateCoolDown   = 0x06
 )
 
+func (i *IBT) checkSessionStateField(field int) bool {
+	val, ok := i.Vars.Vars["SessionState"]
+	if !ok {
+		return true
+	}
+
+	value, ok := val.Value.(int)
+	if !ok {
+		return true
+	}
+
+	return value == field
+}
+
+func (i *IBT) SessionStateInvalid() bool {
+	return i.checkSessionStateField(irsdk_StateInvalid)
+}
+
+// BUG: Need to fix all of these functions, they are all wrong
+func (i *IBT) SessionStateGetInCar() bool {
+	return i.checkSessionStateField(irsdk_StateGetInCar)
+}
+
+func (i *IBT) SessionStateWarmup() bool {
+	return i.checkSessionStateField(irsdk_StateWarmup)
+}
+
+func (i *IBT) SessionStateParadeLaps() bool {
+	return i.checkSessionStateField(irsdk_StateParadeLaps)
+}
+
+func (i *IBT) SessionStateRacing() bool {
+	return i.checkSessionStateField(irsdk_StateRacing)
+}
+
+func (i *IBT) SessionStateCheckered() bool {
+	return i.checkSessionStateField(irsdk_StateCheckered)
+}
+
+func (i *IBT) SessionStateCoolDown() bool {
+	return i.checkSessionStateField(irsdk_StateCoolDown)
+}
+
 func SessionStateToString(state int) string {
 	switch state {
 	case irsdk_StateInvalid:
@@ -280,6 +268,8 @@ func SessionStateToString(state int) string {
 	}
 }
 
+// SessionState - END
+
 // TrkLoc const
 const (
 	irsdk_NotInWorld     = -1
@@ -536,175 +526,79 @@ func CameraStateToString(state int) string {
 // PitSvFlags -- Start
 const (
 	// Tires
-	irsdk_LFTireChange = 0x00000001
-	irsdk_RFTireChange = 0x00000002
-	irsdk_LRTireChange = 0x00000004
-	irsdk_RRTireChange = 0x00000008
+	irsdk_LFTireChange uint32 = 0x00000001
+	irsdk_RFTireChange uint32 = 0x00000002
+	irsdk_LRTireChange uint32 = 0x00000004
+	irsdk_RRTireChange uint32 = 0x00000008
 	// Fuel
-	irsdk_FuelFill = 0x00000010
+	irsdk_FuelFill uint32 = 0x00000010
 
-	irsdk_WindshieldTearoff = 0x00000020
-	irsdk_FastRepair        = 0x00000040
+	irsdk_WindshieldTearoff uint32 = 0x00000020
+	irsdk_FastRepair        uint32 = 0x00000040
 
 	// Other pit service request flags
-	irsdk_ClearTires = 0x00000080 // Uncheck tire change
-	irsdk_ClearWS    = 0x00000100 // Uncheck windshield tearoff
-	irsdk_ClearFR    = 0x00000200 // Uncheck FastRepair
-	irsdk_ClearFuel  = 0x00000400 // Uncheck refuelling
+	irsdk_ClearTires uint32 = 0x00000080 // Uncheck tire change
+	irsdk_ClearWS    uint32 = 0x00000100 // Uncheck windshield tearoff
+	irsdk_ClearFR    uint32 = 0x00000200 // Uncheck FastRepair
+	irsdk_ClearFuel  uint32 = 0x00000400 // Uncheck refuelling
 )
 
-func (i *IBT) LFTireChange() bool {
+func (i *IBT) checkPitSvFlags(field uint32) bool {
 	val, ok := i.Vars.Vars["PitSvFlags"]
 	if !ok {
 		log.Fatal("no PitSvFlags")
 	}
 
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
+	bitfield, ok := val.Value.(uint32)
+	if !ok {
+		log.Fatal("unable to get PitSvFlags: %+v", val)
 	}
 
-	return bitfield&irsdk_LFTireChange != 0
+	return bitfield&field != 0
+}
+
+func (i *IBT) LFTireChange() bool {
+	return i.checkPitSvFlags(irsdk_LFTireChange)
 }
 
 func (i *IBT) RFTireChange() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_RFTireChange != 0
+	return i.checkPitSvFlags(irsdk_RFTireChange)
 }
 
 func (i *IBT) LRTireChange() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_LRTireChange != 0
+	return i.checkPitSvFlags(irsdk_LRTireChange)
 }
 
 func (i *IBT) RRTireChange() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_RRTireChange != 0
+	return i.checkPitSvFlags(irsdk_RRTireChange)
 }
 
 func (i *IBT) FuelFill() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_FuelFill != 0
+	return i.checkPitSvFlags(irsdk_FuelFill)
 }
 
 func (i *IBT) WindshieldTearoff() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_WindshieldTearoff != 0
+	return i.checkPitSvFlags(irsdk_WindshieldTearoff)
 }
 
 func (i *IBT) FastRepair() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_FastRepair != 0
+	return i.checkPitSvFlags(irsdk_FastRepair)
 }
 
 func (i *IBT) ClearTires() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_ClearTires != 0
+	return i.checkPitSvFlags(irsdk_ClearTires)
 }
 
 func (i *IBT) ClearWS() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_ClearWS != 0
+	return i.checkPitSvFlags(irsdk_ClearWS)
 }
 
 func (i *IBT) ClearFR() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_ClearFR != 0
+	return i.checkPitSvFlags(irsdk_ClearFR)
 }
 
 func (i *IBT) ClearFuel() bool {
-	val, ok := i.Vars.Vars["PitSvFlags"]
-	if !ok {
-		log.Fatal("no PitSvFlags")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("unable to get PitSvFlags: " + err.Error())
-	}
-
-	return bitfield&irsdk_ClearFuel != 0
+	return i.checkPitSvFlags(irsdk_ClearFuel)
 }
 
 // PitSvFlags -- End

diskSubHeader.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-
-	"github.com/ESilva15/goirsdk/logger"
 )
 
 const (
@@ -23,8 +21,6 @@ type DiskSubHeader struct {
 
 // readSubheader will read the subheader contents out of the telemetry data
 func (i *IBT) readSubheader() error {
-	log := logger.GetInstance()
-
 	var subheaderRaw [SubHeaderSize]byte
 	_, err := i.File.ReadAt(subheaderRaw[:], HeaderSize)
 	if err != nil {
@@ -39,7 +35,7 @@ func (i *IBT) readSubheader() error {
 	if i.Opts.IBTExport {
 		err = i.exportIBT(subheaderRaw[:], HeaderSize)
 		if err != nil {
-			log.Printf("failed to export subheaders: %v\n", err)
+			i.Opts.Logger.Debug("failed to export disksubheader", "err", err)
 		}
 	}
 
@@ -50,8 +46,6 @@ func (i *IBT) readSubheader() error {
 // or nil if an error occurs. In which case the error return value is more
 // valuable
 func parseTelemetrySubHeader(buf [SubHeaderSize]byte) (*DiskSubHeader, error) {
-	// utils.HexDump(buf[:])
-
 	dst := DiskSubHeader{}
 	err := binary.Read(bytes.NewBuffer(buf[:]), binary.LittleEndian, &dst)
 	if err != nil {

examples/read_from_ibt_file/read_from_ibt_file.go

@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	"log"
+	"log/slog"
+	"os"
 	"time"
 
 	"github.com/ESilva15/goirsdk"
@@ -13,8 +15,20 @@ func msToKph(v float32) int {
 }
 
 func main() {
+	output, err := os.OpenFile("./output.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o755)
+	if err != nil {
+		log.Fatalf("Failed to open log file: %+v", err)
+	}
+
+	logger := slog.New(
+		slog.NewTextHandler(output, &slog.HandlerOptions{
+			Level: slog.LevelDebug,
+		}),
+	)
+
 	// Instantiate our iRacing SDK instance
 	irsdk, err := goirsdk.Init(goirsdk.Options{
+		Logger:        logger,
 		SourceType:    goirsdk.IBTFile,
 		SourcePath:    "../../../../testTelemetry/mx5_2016Okayama_full_2024_10_19_22_02_12.ibt",
 		IBTExportType: goirsdk.SharedMemoryFile,
@@ -60,14 +74,14 @@ func main() {
 		sessionState := irsdk.Vars.Vars["SessionState"].Value.(int)
 		trkloc := irsdk.Vars.Vars["PlayerTrackSurface"].Value.(int)
 		trksurf := irsdk.Vars.Vars["PlayerTrackSurfaceMaterial"].Value.(int)
-		pitsvflags := irsdk.Vars.Vars["PitSvFlags"].Value.(string)
+		pitsvflags := irsdk.Vars.Vars["PitSvFlags"].Value.(uint32)
 
 		fmt.Printf("\033[?25l\033[2J\033[H")
 		fmt.Printf("Gear: %d, RPM: %d, Speed: %d\n", gear, rpm, speed)
 		fmt.Printf("SessionState: %s\n", goirsdk.SessionStateToString(sessionState))
 		fmt.Printf("TrkLoc: %s\n", goirsdk.TrkLocToString(trkloc))
 		fmt.Printf("TrkSurf: %s\n", goirsdk.TrkSurfToString(trksurf))
-		fmt.Printf("PitSvFlags: %s\n", pitsvflags)
+		fmt.Printf("PitSvFlags: %d\n", pitsvflags)
 		fmt.Printf("    FL  FR\n")
 		fmt.Printf("    %t  %t\n", irsdk.LFTireChange(), irsdk.RFTireChange())
 		fmt.Printf("\n")

examples/read_from_mmap_file/read_from_mmap_file.go

@@ -3,6 +3,8 @@ package main
 import (
 	"fmt"
 	"log"
+	"log/slog"
+	"os"
 	"time"
 
 	"github.com/ESilva15/goirsdk"
@@ -13,8 +15,22 @@ func msToKph(v float32) int {
 }
 
 func main() {
+	output, err := os.OpenFile("./output.log", os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0o755)
+	if err != nil {
+		log.Fatalf("Failed to open log file: %+v", err)
+	}
+
+	logger := slog.New(
+		slog.NewTextHandler(output, &slog.HandlerOptions{
+			Level: slog.LevelDebug,
+		}),
+	)
+
+	logger.Debug("Starting test")
+
 	// Instantiate our iRacing SDK instance
 	irsdk, err := goirsdk.Init(goirsdk.Options{
+		Logger:     logger,
 		SourceType: goirsdk.SharedMemoryFile,
 	})
 	if err != nil {
@@ -53,9 +69,29 @@ func main() {
 		gear := int32(irsdk.Vars.Vars["Gear"].Value.(int))
 		rpm := int32(irsdk.Vars.Vars["RPM"].Value.(float32))
 		speed := int32(msToKph(irsdk.Vars.Vars["Speed"].Value.(float32)))
+		sessionState := irsdk.Vars.Vars["SessionState"].Value.(int)
+		trkloc := irsdk.Vars.Vars["PlayerTrackSurface"].Value.(int)
+		trksurf := irsdk.Vars.Vars["PlayerTrackSurfaceMaterial"].Value.(int)
+		pitsvflags := irsdk.Vars.Vars["PitSvFlags"].Value.(uint32)
 
 		fmt.Printf("\033[?25l\033[2J\033[H")
-		fmt.Printf("Gear: %d, RPM: %d, Speed: %d", gear, rpm, speed)
+		fmt.Printf("Gear: %d, RPM: %d, Speed: %d\n", gear, rpm, speed)
+		fmt.Printf("SessionState: %s\n", goirsdk.SessionStateToString(sessionState))
+		fmt.Printf("TrkLoc: %s\n", goirsdk.TrkLocToString(trkloc))
+		fmt.Printf("TrkSurf: %s\n", goirsdk.TrkSurfToString(trksurf))
+		fmt.Printf("PitSvFlags: %d\n", pitsvflags)
+		fmt.Printf("    FL  FR\n")
+		fmt.Printf("    %t  %t\n", irsdk.LFTireChange(), irsdk.RFTireChange())
+		fmt.Printf("\n")
+		fmt.Printf("    RL  RR\n")
+		fmt.Printf("    %t  %t\n", irsdk.LRTireChange(), irsdk.RRTireChange())
+		fmt.Printf("    FuelFill:          %t\n", irsdk.FuelFill())
+		fmt.Printf("    WindshieldTearoff: %t\n", irsdk.WindshieldTearoff())
+		fmt.Printf("    FastRepair:        %t\n", irsdk.FastRepair())
+		fmt.Printf("    ClearTires:        %t\n", irsdk.ClearTires())
+		fmt.Printf("    ClearWS:           %t\n", irsdk.ClearWS())
+		fmt.Printf("    ClearFR:           %t\n", irsdk.ClearFR())
+		fmt.Printf("    ClearFuel:         %t\n", irsdk.ClearFuel())
 
 		<-mainLoopTicker.C
 	}

headers.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-
-	"github.com/ESilva15/goirsdk/logger"
 )
 
 const (
@@ -32,8 +30,6 @@ type TelemetryHeaders struct {
 
 // readHeader will read the header out of the telemetry data
 func (i *IBT) readHeader() error {
-	log := logger.GetInstance()
-
 	var headerRaw [FileHeaderSize]byte
 	_, err := i.File.ReadAt(headerRaw[:], 0)
 	if err != nil {
@@ -48,7 +44,7 @@ func (i *IBT) readHeader() error {
 	if i.Opts.IBTExport {
 		err = i.exportIBT(headerRaw[:], 0)
 		if err != nil {
-			log.Printf("Failed to export headers: %v\n", err)
+			i.Opts.Logger.Debug("Failed to export headers", "err", err)
 		}
 	}
 

irsdk.go

@@ -4,9 +4,9 @@ package goirsdk
 import (
 	"fmt"
 	"io"
+	"log/slog"
 	"os"
 
-	"github.com/ESilva15/goirsdk/logger"
 	"github.com/ESilva15/goirsdk/mmaputils"
 	"github.com/ESilva15/goirsdk/sharedMem"
 	"gopkg.in/yaml.v3"
@@ -33,6 +33,7 @@ const (
 )
 
 type Options struct {
+	Logger                *slog.Logger
 	SourceType            TelemetryContainer // type of source data
 	SourcePath            string             // Path to source
 	IBTExportType         TelemetryContainer // export type of telemetry: store .ibt or replay in shm
@@ -59,24 +60,25 @@ type IBT struct {
 }
 
 func (i *IBT) IsConnected() bool {
-	if i.Headers != nil {
-		if sessionStatusOK(int(i.Headers.Status)) {
-			return true
-		}
-		// if sessionStatusOK(int(i.Headers.Status)) && (sdk.lastValidData+connTimeout > time.Now().Unix()) {
-		// 	return true
-		// }
+	if i.Headers == nil {
+		return false
 	}
 
-	return false
+	if !i.SessionStatusConnected() {
+		return false
+	}
+
+	if i.SessionStateInvalid() {
+		return false
+	}
+
+	return true
 }
 
 func (i *IBT) exportYAML() error {
-	log := logger.GetInstance()
-
 	file, err := os.OpenFile(i.Opts.SessionInfoExportPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o644)
 	if err != nil {
-		log.Printf("Failed to open file for YAML export: %v\n", err)
+		i.Opts.Logger.Debug(fmt.Sprintf("Failed to open file for YAML export: %v\n", err))
 		return fmt.Errorf("failed to open output file for YAML: %v", err)
 	}
 	defer file.Close()
@@ -85,7 +87,7 @@ func (i *IBT) exportYAML() error {
 
 	err = enc.Encode(i.SessionInfo)
 	if err != nil {
-		log.Printf("Failed to write into file for YAML export: %v\n", err)
+		i.Opts.Logger.Debug(fmt.Sprintf("Failed to write into file for YAML export: %v\n", err))
 		return fmt.Errorf("failed to write YAML contents to file: %v", err)
 	}
 
@@ -93,13 +95,11 @@ func (i *IBT) exportYAML() error {
 }
 
 func (i *IBT) exportIBT(data []byte, offset int64) error {
-	log := logger.GetInstance()
-
 	_, err := i.IBTExporter.WriteAt(data, offset)
 	if err != nil {
 		i.IBTExporter.Close()
 		i.IBTExporter = nil
-		log.Println("Won't attempt to export anymore")
+		i.Opts.Logger.Debug(fmt.Sprintf("won't attempt to export anymore: %+v", err))
 		return err
 	}
 
@@ -174,8 +174,6 @@ func (i *IBT) openExporter() error {
 // Init serves to initialize and get a hold of a IBT struct
 // Receives an Options struct with the required configurations
 func Init(opts Options) (*IBT, error) {
-	// log := logger.GetInstance()
-
 	// Create our irsdk instance
 	var err error
 	ibt := IBT{
@@ -233,6 +231,10 @@ func (i *IBT) ListVariables() map[string]Var {
 
 // Close cleans up our irsdk instance
 func (i *IBT) Close() {
+	if i == nil {
+		return
+	}
+
 	if i.winUtils != nil {
 		// If its not live data, the user is the one with ownership of the handle
 		i.File.Close()

logger/logger.go

@@ -1,23 +0,0 @@
-package logger
-
-import (
-	"log"
-	"os"
-	"sync"
-)
-
-var l *log.Logger
-var once sync.Once
-
-func createLogger() {
-  l = log.New(os.Stdout, "[ibtReader] ", log.LstdFlags | log.Lshortfile)
-}
-
-func GetInstance() *log.Logger {
-	once.Do(func() {
-    createLogger() 
-	})
-
-  return l
-}
-

sessionInfo.go

@@ -6,8 +6,6 @@ import (
 	"log"
 	"strings"
 
-	"github.com/ESilva15/goirsdk/logger"
-
 	"golang.org/x/text/encoding/charmap"
 	"gopkg.in/yaml.v3"
 )
@@ -312,8 +310,6 @@ type Driver struct {
 
 // readSessionInfo will read the session info yaml out of the telemetry data
 func (i *IBT) readSessionInfo() error {
-	log := logger.GetInstance()
-
 	sessionInfoStringRaw := make([]byte, i.Headers.SessionInfoLength)
 	_, err := i.File.ReadAt(sessionInfoStringRaw, int64(i.Headers.SessionInfoOffset))
 	if err != nil {
@@ -337,7 +333,7 @@ func (i *IBT) readSessionInfo() error {
 	if i.Opts.SessionInfoExport {
 		err := i.exportYAML()
 		if err != nil {
-			log.Printf("Failed to export YAML string: %v\n", err)
+			i.Opts.Logger.Debug("Failed to export YAML string", "err", err)
 		}
 	}
 
@@ -370,11 +366,6 @@ func parseSessionInfo(buf []byte, len int32) (*SessionInfoYAML, error) {
 	return &sessionInfo, nil
 }
 
-// sessionStatusOK will tell us if we are connected to the live data
-func sessionStatusOK(status int) bool {
-	return (status & stConnected) > 0
-}
-
 // ToString will return a readable string of the struct
 func (s *SessionInfoYAML) ToString() string {
 	stringified, _ := json.MarshalIndent(s, "", "  ")

variables.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"log"
 	"math"
-	"strconv"
 	"strings"
 	"time"
 )
@@ -157,38 +156,6 @@ func (i *IBT) readVariablerHeaders() error {
 	return nil
 }
 
-func (i *IBT) parseEngineWarnings() {
-	val, ok := i.Vars.Vars["EngineWarnings"]
-	if !ok {
-		log.Fatal("no engine warnings")
-	}
-
-	bitfield, err := strconv.ParseInt(val.Value.(string), 0, 64)
-	if err != nil {
-		log.Fatal("Unable to get engine warnings: " + err.Error())
-	}
-
-	for _, ew := range irsdkEngineWarnings {
-		result := (int(bitfield) & ew.Value) != 0
-		i.Vars.Vars[ew.Name] = Var{Value: result}
-	}
-}
-
-// parseBitfieldVariables will parse the variables:
-// - irsdk_CameraState "CamCameraState"
-// - irsdk_EngineWarnings "EngineWarnings"
-// - irsdk_PitSvFlags "PitSvFlags"
-// - irsdk_Flags "SessionFlags"
-// - irsdk_SessionState "SessionState"
-// - irsdk_TrkLoc "CarIdxTrackSurface"
-//
-// The approach for now will be to create unique entries in the data map for
-// the fields in these variables
-func (i *IBT) parseBitfieldVariables() {
-	// Parse the EngineWarnings variables - its the only one for now
-	i.parseEngineWarnings()
-}
-
 func (i *IBT) readData(buf []byte) error {
 	for k, v := range i.Vars.Vars {
 		// Slice of the variable value in the buffer
@@ -249,18 +216,17 @@ func (i *IBT) readData(buf []byte) error {
 		case IRSDK_bitField:
 			if v.Count > 1 {
 				// Array of data
-				data := make([]string, v.Count)
+				data := make([]uint32, v.Count)
 				for entry := 0; entry < int(v.Count); entry++ {
 					entryOffset := v.Offset + int32(entry)*int32(VarTypes[int(v.Type)].Size)
 					rbuf := buf[entryOffset : entryOffset+int32(VarTypes[int(v.Type)].Size)]
-					newValue := fmt.Sprintf("0x%x", int(binary.LittleEndian.Uint32(rbuf)))
-					data[entry] = newValue
+					data[entry] = binary.LittleEndian.Uint32(rbuf)
 				}
 
 				v.Value = data
 			} else {
 				// Single value
-				v.Value = fmt.Sprintf("0x%x", int(binary.LittleEndian.Uint32(rbuf)))
+				v.Value = binary.LittleEndian.Uint32(rbuf)
 			}
 		case IRSDK_float:
 			if v.Count > 1 {
@@ -297,12 +263,13 @@ func (i *IBT) readData(buf []byte) error {
 		}
 		// --------------
 
+		if k == "SessionState" {
+			i.Opts.Logger.Debug(fmt.Sprintf("SessionState: %+v", v))
+		}
+
 		i.Vars.Vars[k] = v
 	}
 
-	// Parse the bitfield variables here
-	i.parseBitfieldVariables()
-
 	return nil
 }
 
@@ -310,7 +277,8 @@ func (i *IBT) readData(buf []byte) error {
 // live and offline data
 func (i *IBT) Update(timeout time.Duration) (IRacingState, error) {
 	// This is what happens if we are reading live data
-	if i.winUtils != nil {
+	switch i.Opts.SourceType {
+	case SharedMemoryFile:
 		// Put a way to check if the sim is active here
 		// fmt.Println("NOT CHECKING IF SIM IS ACTIVE - ADD ME")
 
@@ -350,17 +318,19 @@ func (i *IBT) Update(timeout time.Duration) (IRacingState, error) {
 
 		if i.Opts.IBTExport {
 			// Dirty attempt at getting this to work to write to a memory mapped file
+			var offset int64 = 0
 			switch i.Opts.IBTExportType {
 			case IBTFile:
-				err = i.exportIBT(buf, int64(i.Headers.BufOffset+i.Vars.RecorderTick*i.Headers.BufLen))
-				if err != nil {
-					log.Printf("Failed to export live telemetry data: %v", err)
-				}
+				i.Opts.Logger.Debug("Reading live data and exporting to IBT file")
+				offset = int64(i.Headers.BufOffset + i.Vars.RecorderTick*i.Headers.BufLen)
 			case SharedMemoryFile:
-				err = i.exportIBT(buf, int64(i.Headers.BufOffset))
-				if err != nil {
-					log.Printf("Failed to export live telemetry data: %v", err)
-				}
+				i.Opts.Logger.Debug("Reading live data and exporting to SHM file")
+				offset = int64(i.Headers.BufOffset)
+			}
+
+			err = i.exportIBT(buf, offset)
+			if err != nil {
+				i.Opts.Logger.Debug(fmt.Sprintf("Failed to export offline telemetry data: %+v", err))
 			}
 		}
 
@@ -375,7 +345,7 @@ func (i *IBT) Update(timeout time.Duration) (IRacingState, error) {
 
 		// Document why this is here, I don't remember the exact words right now
 		i.Vars.RecorderTick++
-	} else {
+	case IBTFile:
 		// This is what happens if we are reading from an .ibt file
 		// This will get the dataframe corresponding to a given tick
 		start := i.Headers.BufOffset + i.Vars.Tick*i.Headers.BufLen
@@ -386,17 +356,19 @@ func (i *IBT) Update(timeout time.Duration) (IRacingState, error) {
 		// writing to a file
 		if i.Opts.IBTExport {
 			// Dirty attempt at getting this to work to write to a memory mapped file
+			var offset int64 = 0
 			switch i.Opts.IBTExportType {
 			case IBTFile:
-				err = i.exportIBT(buf, int64(start))
-				if err != nil {
-					log.Printf("Failed to export offline telemetry data: %v", err)
-				}
+				i.Opts.Logger.Debug("Reading IBT file and exporting to IBT file")
+				offset = int64(start)
 			case SharedMemoryFile:
-				err = i.exportIBT(buf, int64(i.Headers.BufOffset))
-				if err != nil {
-					log.Printf("Failed to export live telemetry data: %v", err)
-				}
+				i.Opts.Logger.Debug("Reading IBT file and exporting to SHM file")
+				offset = int64(i.Headers.BufOffset)
+			}
+
+			err = i.exportIBT(buf, offset)
+			if err != nil {
+				i.Opts.Logger.Debug(fmt.Sprintf("Failed to export offline telemetry data: %+v", err))
 			}
 		}