Sync with upstream

commands.go

@@ -134,7 +134,7 @@ func (cmd *UIntCommand) ValueAsLit() string {
 // So PID 0x20 of Part 1 checks which PIDs in part 2 are supported, PID 0x40 of
 // part 2 checks which PIDs in part 3 are supported, etc etc.
 type PartSupported struct {
-	BaseCommand
+	baseCommand
 	UIntCommand
 	index byte
 }
@@ -153,7 +153,7 @@ func NewPartSupported(index byte) *PartSupported {
 	pid := OBDParameterID((index - 1) * PartRange)
 
 	return &PartSupported{
-		BaseCommand{pid, 4, fmt.Sprintf("supported_commands_part%d", index)},
+		baseCommand{SERVICE_01_ID, pid, 4, fmt.Sprintf("supported_commands_part%d", index)},
 		UIntCommand{},
 		index,
 	}

commands_test.go

@@ -100,8 +100,8 @@ func TestPartSupportedSupportsCommand(t *testing.T) {
 }
 
 func TestService01Command(t *testing.T) {
-	service01cmd := NewPart1Supported()
-	assert(t, service01cmd.ModeID() == SERVICE_01_ID, "Service id is not "+string(SERVICE_01_ID))
+	service01cmd := NewPartSupported(1)
+	assert(t, service01cmd.ModeID() == SERVICE_01_ID, fmt.Sprintf("Service id \"%d\" is not \"%d\"", service01cmd.ModeID(), SERVICE_01_ID))
 }
 
 func TestService04Command(t *testing.T) {

device_test.go

@@ -125,7 +125,7 @@ func TestGetPartByPID(t *testing.T) {
 }
 
 type DummyCommand struct {
-	BaseCommand
+	baseCommand
 }
 
 func (cmd *DummyCommand) ValueAsLit() string {
@@ -162,15 +162,15 @@ func TestIsSupportedWikipediaExample(t *testing.T) {
 
 	for _, pid := range supported {
 		cmd := &DummyCommand{
-			BaseCommand{pid, 1, "dummy"},
+			baseCommand{SERVICE_01_ID, pid, 1, "dummy"},
 		}
 
 		assertEqual(t, sc.IsSupported(cmd), true)
 	}
 
 	for _, pid := range unsupported {
 		cmd := &DummyCommand{
-			BaseCommand{pid, 1, "dummy"},
+			baseCommand{SERVICE_01_ID, pid, 1, "dummy"},
 		}
 
 		assertEqual(t, sc.IsSupported(cmd), false)
@@ -277,7 +277,7 @@ func TestIssue27Regression(t *testing.T) {
 
 	for _, pid := range supported {
 		cmd := &DummyCommand{
-			BaseCommand{pid, 1, "dummy"},
+			baseCommand{SERVICE_01_ID, pid, 1, "dummy"},
 		}
 
 		assertEqual(t, sc.IsSupported(cmd), true)