Tested address claims with 2 competing devices on the bus

Author: ieb

README.md

@@ -27,11 +27,17 @@ The code was incorrectly emitting address claims in response to all address clai
 For some devices on the bus this would cause a reset resulting in the first message on the new address having incomplete data. Eg Em-Track B921 devices report no GPS Fix for the first message on a new address. This caused MFDs to report lost fix and in some cases lost AIS data.
 
 The fixes. 
+
 * Only emit claim responses when the addresses are claimed by 2 devices.
 * parse the address claim message completely. Its a 8 byte little endian uint_64 and can be set by pointing to the message buffer on a little endian CPU.
 * Where the names are identical, due to incorrect configuration if the device instance field, ramdomly select a new device instance field in the CAN device name to recolve the conflict. Since the Can Name device instance field is not generally used
 to indicate the physical measurement instance (eg Battery Instance), and cant be set (no support for setting it over Can Group Functions), this doesnt matter.  
 
+
+# Testing
+
+Using a CandelLite USB-CAN bus adapter with socket can on a linux box. see testscripts/
+
 # references
 
 Details of ISO Address Claim https://copperhilltech.com/blog/sae-j1939-address-management-messages-request-for-address-claimed-and-address-claimed/
@@ -44,6 +50,6 @@ Details of ISO Address Claim https://copperhilltech.com/blog/sae-j1939-address-m
 * [x] Fix address claim race conditions
 * [x] Fix incorrect name encoding and decoding
 * [x] Deal with name clashes on address claims
-* [ ] Test triggering address claim 
+* [x] Test triggering address claim 
 
 

SmallNMEA2000.h

@@ -119,7 +119,7 @@ class SNMEA2000DeviceInfo {
             deviceInformation.industryGroupAndSystemInstance = 0x80 | ((industryGroup&0x07)<<4) | (systemInstance&0x0f);
         };
         void setSerialNumber(uint32_t uniqueNumber) {
-            Serial.print("Serial Number set to ");
+            Serial.print(F("Serial Number set to "));
             Serial.println(uniqueNumber);
             deviceInformation.unicNumberAndManCode=(deviceInformation.unicNumberAndManCode&0xffe00000) | (uniqueNumber&0x1fffff);
         };
@@ -333,6 +333,22 @@ class SNMEA2000 {
         bool setupRXFilter();
         int getPgmSize(const char *str, int maxLen);
 
+        void print(tUnionDeviceInformation * devInfo) {
+            Serial.print(F("  UniqueNumber:"));
+            Serial.println(devInfo->unicNumberAndManCode&0x1fffff);
+            Serial.print(F("  ManufacturersCode:"));
+            Serial.println((devInfo->unicNumberAndManCode>>21)&0x7ff);
+            Serial.print(F("  deviceInstance:"));
+            Serial.println(devInfo->deviceInstance, DEC);
+            Serial.print(F("  deviceFunction:"));
+            Serial.println(devInfo->deviceFunction, DEC);
+            Serial.print(F("  deviceClass:"));
+            Serial.println((devInfo->deviceClass>>1)&0x7f, DEC);
+            Serial.print(F("  industryGroup:"));
+            Serial.println((devInfo->industryGroupAndSystemInstance>>4)&0x07, DEC);
+            Serial.print(F("  systemInstance:"));
+            Serial.println((devInfo->industryGroupAndSystemInstance>>4)&0x0f, DEC);
+        };
 
 
         unsigned char deviceAddress;

testscripts/testISOAddressClaim.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# This script requires a working socketcan + canboat installation
+# need php cli installed.
+# I am using candellight CAN-USB adapter on a linux box. Wont work on OSX as it has no support
+# for device.
+# $ sudo ip link set can0 type can bitrate 250000
+# $ sudo ip link set up can0
+
+target="${1:-255}"
+
+addressClaim=$(php util/format-message ${target} request_pgn 60928)
+
+echo "Will send reqests to target address ${target}"
+
+
+
+candump can0 | candump2analyzer | analyzer | grep "60928" &
+sleep 2
+echo ${addressClaim} |  socketcan-writer can0
+sleep 10
+echo ${addressClaim} |  socketcan-writer can0
+sleep 10
+kill %1

testscripts/testISORequests.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# This script requires a working socketcan + canboat installation
+# I am using candellight CAN-USB adapter on a linux box. Wont work on OSX as it has no support
+# for device.
+
+target="${1:-255}"
+
+productInformation=$(php util/format-message ${target} request_pgn 126996) 
+pgnList=$(php util/format-message ${target}  request_pgn 126464)
+configurationInformation=$(php util/format-message ${target}  request_pgn 126998)
+batteryConfigurationInformation=$(php util/format-message ${target}  request_pgn 127513)
+
+echo "Will send reqests to target address ${target}"
+
+
+
+candump can0 | candump2analyzer | analyzer &
+sleep 2
+echo "## Sending ISO Request for Product Information as ${productInformation}"
+echo ${productInformation} |  socketcan-writer can0
+sleep 5
+echo "## Sending ISO Request for PGN List as ${pgnList}"
+echo ${pgnList} |  socketcan-writer can0
+sleep 5
+echo "## Sending ISO Request for Configuration Information as ${configurationInformation}"
+echo ${configurationInformation} |  socketcan-writer can0
+sleep 5
+echo "## Sending ISO Request for Battery Configuration Information as ${batteryConfigurationInformation}"
+echo ${batteryConfigurationInformation} |  socketcan-writer can0
+
+sleep 5
+kill %1