Fix format 6 parsing

Author: Scrin

parser/format_6.go

@@ -16,19 +16,19 @@ func ParseFormat6(input string) (Measurement, error) {
 	if err != nil {
 		return m, err
 	}
-	if len(data) < 27 {
+	if len(data) < 23 {
 		return m, errors.New("data is too short")
 	}
 
-	if data[8] != 0xff { // manufacturer specific data
+	if data[4] != 0xff { // manufacturer specific data
 		return m, errors.New("data is not manufacturer specific data")
 	}
 
-	if data[9] != ruuviCompanyIdentifier[0] || data[10] != ruuviCompanyIdentifier[1] {
+	if data[5] != ruuviCompanyIdentifier[0] || data[6] != ruuviCompanyIdentifier[1] {
 		return m, errors.New("data has wrong company identifier")
 	}
 
-	data = data[11:]
+	data = data[7:]
 
 	if data[0] != 0x06 { // data format
 		return m, errors.New("data is not in data format 6")

parser/format_6_test.go

@@ -15,16 +15,12 @@ func buildFullAdvertisementFormat6(payload []byte) []byte {
 	adv[1] = 0x01 // AD Type
 	adv[2] = 0x06 // Flags
 	adv[3] = 0x00 // Padding
-	adv[4] = 0x00 // Padding
-	adv[5] = 0x00 // Padding
-	adv[6] = 0x00 // Padding
-	adv[7] = 0x00 // Padding
 	// Manufacturer specific data
-	adv[8] = 0xFF  // Manufacturer specific data flag
-	adv[9] = 0x99  // Company identifier (Ruuvi)
-	adv[10] = 0x04 // Company identifier (Ruuvi)
+	adv[4] = 0xFF // Manufacturer specific data flag
+	adv[5] = 0x99 // Company identifier (Ruuvi)
+	adv[6] = 0x04 // Company identifier (Ruuvi)
 	// Copy payload
-	copy(adv[11:], payload)
+	copy(adv[7:], payload)
 	return adv
 }