Correct ELB to EBL in documentation

aldas · Jun 6, 2023 · 520158f · 520158f
1 parent 516d9e1
commit 520158f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ following features:
       * N2K Ascii,
       * N2K Binary,
       * Raw ASCII
-      * ELB (log files from W2K-1 device)
+      * EBL (log files from W2K-1 device, NB: NGT1 format is different)
 * Can output read raw frames/messages as:
     * JSON,
     * HEX,
@@ -114,7 +114,7 @@ Read Actisense EBL log file as `BST-95` format (created by W2K-1 device) and out
    -device="actisense/testdata/actisense_w2k1_bst95.ebl" \
    -is-file=true \
    -output-format=json \
-   -input-format=elb
+   -input-format=ebl
 ```
 
 ## Library example

diff --git a/actisense/eblreader.go b/actisense/eblreader.go
@@ -10,6 +10,7 @@ import (
 )
 
 // EBL log file format used by Actisense W2K-1. Probably called "CAN-Raw (BST-95) message format"
+// NGT1 ebl files are probably in different format.
 //
 // Example data frame from one EBL file:
 // 1b 01 07 95 0e 28 9a 00 01 f8 09 3d 0d b3 22 48 32 59 0d 1b 0a

diff --git a/cmd/n2kreader/main.go b/cmd/n2kreader/main.go
@@ -35,7 +35,7 @@ func main() {
 	noShowPNG := flag.Bool("np", false, "do not print parsed PNGs")
 	noAddressMapper := flag.Bool("dam", false, "disable address mapper")
 	isFile := flag.Bool("is-file", false, "consider device as ordinary file")
-	inputFormat := flag.String("input-format", "ngt", "in which format packet are read (ngt, n2k-bin, n2k-ascii, n2k-raw-ascii, canboat-raw, elb)")
+	inputFormat := flag.String("input-format", "ngt", "in which format packet are read (ngt, n2k-bin, n2k-ascii, n2k-raw-ascii, canboat-raw, ebl)")
 	deviceAddr := flag.String("device", "/dev/ttyUSB0", "path to Actisense NGT-1 USB device")
 	pgnsPath := flag.String("pgns", "", "path to Canboat pgns.json file")
 	pgnFilter := flag.String("filter", "", "comma separated list of PGNs to filter")
@@ -101,7 +101,7 @@ func main() {
 	}
 
 	switch *inputFormat {
-	case "ngt", "n2k-bin", "n2k-ascii", "n2k-raw-ascii", "elb", "canboat-raw", "socketcan":
+	case "ngt", "n2k-bin", "n2k-ascii", "n2k-raw-ascii", "ebl", "canboat-raw", "socketcan":
 	default:
 		log.Fatal("unknown input format type given\n")
 	}
@@ -158,7 +158,7 @@ func main() {
 		})
 	case "canboat-raw":
 		device = canboat.NewCanBoatReader(reader)
-	case "elb":
+	case "ebl":
 		device = actisense.NewEBLFormatDeviceWithConfig(reader, config)
 	case "ngt", "n2k-bin":
 		device = actisense.NewBinaryDeviceWithConfig(reader, config)