janky bitreader, usercmdinfo almost finished

2 files changed, 41 insertions, 31 deletions

diff --git a/utils/bitreader.go b/utils/bitreader.go
new file mode 100644
index 0000000..c4936fd
--- /dev/null
+++ b/utils/bitreader.go
@@ -0,0 +1,41 @@
+package utils
+
+import (
+        "fmt"
+        "math"
+        "strconv"
+)
+
+func ReadBitStateLSB(input byte, index int) (bool, error) {
+        if index < 0 && index > 7 {
+                return false, fmt.Errorf("IndexOutOfBounds for type byte")
+        }
+        value := input & (1 << index)
+        return (value > 0), nil
+}
+
+func Read32BitsAfterFirstBitInt32(input []byte, index int, step int) int32 {
+        binary := ""
+        binary += fmt.Sprintf("%08b", input[step])[8-index : 8]
+        binary += fmt.Sprintf("%08b", input[step-1])
+        binary += fmt.Sprintf("%08b", input[step-2])
+        binary += fmt.Sprintf("%08b", input[step-3])
+        binary += fmt.Sprintf("%08b", input[step-4])[:8-index]
+        output, err := strconv.ParseInt(binary, 2, 32)
+        CheckError(err)
+        return int32(output)
+
+}
+
+func Read32BitsAfterFirstBitFloat32(input []byte, index int, step int) float32 {
+        binary := ""
+        binary += fmt.Sprintf("%08b", input[step])[8-index : 8]
+        binary += fmt.Sprintf("%08b", input[step-1])
+        binary += fmt.Sprintf("%08b", input[step-2])
+        binary += fmt.Sprintf("%08b", input[step-3])
+        binary += fmt.Sprintf("%08b", input[step-4])[:8-index]
+        output, err := strconv.ParseUint(binary, 2, 32)
+        CheckError(err)
+        return math.Float32frombits(uint32(output))
+
+}
diff --git a/utils/utils.go b/utils/utils.go
index 6874e6b..5226e80 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -1,15 +1,12 @@
 package utils
 
 import (
-        "bytes"
         "encoding/binary"
         "log"
         "math"
         "math/bits"
         "os"
         "unsafe"
-
-        "github.com/32bitkid/bitreader"
 )
 
 func CheckError(e error) {
@@ -18,34 +15,6 @@ func CheckError(e error) {
         }
 }
 
-func ReadBitsFromReversedByteArray1(byteArr []byte) bool {
-        r := bitreader.NewReader(bytes.NewBuffer(ReverseByteArrayValues(byteArr, len(byteArr))))
-        value, err := r.Read1()
-        CheckError(err)
-        return value
-}
-
-func ReadBitsFromReversedByteArray8(byteArr []byte, bitLength uint) uint8 {
-        r := bitreader.NewReader(bytes.NewBuffer(ReverseByteArrayValues(byteArr, len(byteArr))))
-        value, err := r.Read8(bitLength)
-        CheckError(err)
-        return value
-}
-
-func ReadBitsFromReversedByteArray16(byteArr []byte, bitLength uint) uint16 {
-        r := bitreader.NewReader(bytes.NewBuffer(ReverseByteArrayValues(byteArr, len(byteArr))))
-        value, err := r.Read16(bitLength)
-        CheckError(err)
-        return value
-}
-
-func ReadBitsFromReversedByteArray32(byteArr []byte, bitLength uint) uint32 {
-        r := bitreader.NewReader(bytes.NewBuffer(ReverseByteArrayValues(byteArr, len(byteArr))))
-        value, err := r.Read32(bitLength)
-        CheckError(err)
-        return value
-}
-
 func ReverseByteArrayValues(byteArr []byte, size int) []byte {
         arr := make([]byte, size)
         for index, byteValue := range byteArr {