Transitioned to USDOT fork of asn1c repository

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "pugixml"]
 	path = pugixml
 	url = https://github.com/zeux/pugixml.git
-[submodule "asn1c"]
-	path = asn1c
-	url = https://github.com/mouse07410/asn1c
+[submodule "usdot-asn1c"]
+	path = usdot-asn1c
+	url = https://github.com/usdot-fhwa-stol/usdot-asn1c

Dockerfile

@@ -23,7 +23,7 @@ ADD ./pugixml /asn1_codec/pugixml
 RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install
 
 # Build and install asn1c submodule
-ADD ./asn1c /asn1_codec/asn1c
+ADD ./usdot-asn1c /asn1_codec/asn1c
 RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install
 
 # Make generated files available to the build & compile example

Dockerfile.dev

@@ -23,7 +23,7 @@ ADD ./pugixml /asn1_codec/pugixml
 RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install
 
 # Build and install asn1c submodule
-ADD ./asn1c /asn1_codec/asn1c
+ADD ./usdot-asn1c /asn1_codec/asn1c
 RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install
 
 # Make generated files available to the build & compile example

Dockerfile.standalone

@@ -22,7 +22,7 @@ ADD ./pugixml /asn1_codec/pugixml
 RUN cd /asn1_codec/pugixml && mkdir -p build && cd build && cmake .. && make && make install
 
 # Build and install asn1c submodule
-ADD ./asn1c /asn1_codec/asn1c
+ADD ./usdot-asn1c /asn1_codec/asn1c
 RUN cd asn1c && test -f configure || autoreconf -iv && ./configure && make && make install
 
 # Make generated files available to the build & compile example

asn1c_combined/README.md

@@ -6,6 +6,18 @@ This script expects the necessary files to have already been generated by the `g
 ## Generating the C Code
 The necessary files can be generated using the `generate-files.sh` script. This script will reference the necessary ASN.1 files from the `j2735-asn-files` directory from the specified year and generate the C code in the `generated-files` directory.
 
+### Installing asn1c
+The `generate-files.sh` script requires the `asn1c` compiler to be installed. The `asn1c` compiler can be installed in WSL using the following commands:
+
+```bash
+cd ./usdot-asn1c
+aclocal
+test -f configure || autoreconf -iv
+./configure
+make
+sudo make install
+```
+
 ### J2735 ASN Files
 The 'j2735-asn-files' subdirectory should contain the ASN.1 files for the J2735 standard. These are organized by year.
 

build_local.sh

@@ -19,9 +19,9 @@ initializeSubmodules(){
 buildAsn1c(){
     # build asn1c
     echo "${GREEN}Building asn1c${NC}"
-    cd ./asn1c
+    cd ./usdot-asn1c
     git reset --hard
-    git pull origin master
+    git pull origin vlm_master
     aclocal
     test -f ./configure || autoreconf -iv
     ./configure

docs/testing.md

@@ -5,17 +5,32 @@ There are currently two ways to test the capabilities of the ACM.
 - [Standalone Operation / Testing](#standalone-testing)
 
 ## Unit Testing
+### Testing On Local Machine
+The following command can be run to build & run the unit tests:
+
+```bash
+$ ./build_local.sh
+```
 
-Unit tests are built when the ACM is compiled during installation. Those tests can be run using the following command:
+
+### Testing Using Docker
+Start by building the Docker image:
 
 ```bash
-$ ./acm_tests
+$ docker build -t acm .
+```
+
+Then run the Docker container:
+
+```bash
+$ docker run -it --name acm acm
 ```
 
-If using Docker, exec into the container and run the tests:
+Exec into the container and run the tests:
 
 ```bash
 $ docker exec -it acm /bin/bash
+$ cd /build
 $ ./acm_tests
 ```
 

src/tests.cpp

@@ -38,7 +38,7 @@ const char *ONE609_BSM_HEX = "038081B1001480AD562FA8400039E8E717090F9665FE1BACC3
 const char *ASD_ONE609_HEX = "44400000000084782786283B90A7148D2B0A89C49F8A85A7763BF8423C13C2107E1C0C6F7E2C0C6F16A070103620029015AAC5F50800073D1CE2E121F2CCBFC375986FFFFFFFFE0007775FBF43F4200FFFF000000000004042983820082FFFFFFFD049C20147FFFFFFFD128420408FFFFFFFD2454204D480287FFD2BAC2084680BAFFFD4EAC2064580B33FFD5BF42072380D6BFFD6FCC2079681407FFDA424206778115BFFDB34C205D0811CBFFDBC5C2057B8110BFFDBE142001780337FFEFE643FFFF800BBFFF8AB43FFFFFFFFFFFFBA3420080FFFFFFFFC345FFFC00000";
 
 /**
- * After switching to using `mouse07410/asn1c` (a fork of `vlm/asn1c`), this unit test is failing.
+ * This unit test is currently failing with the fork of asn1c that we're using (currently `usdot-fhwa-stol/usdot-asn1c`).
  * Since encoding BSMs is not a desired feature of the ACM, this test case has been commented out.
  */
 // TEST_CASE("Encode BSM", "[encoding]" ) { // TODO: fix test case failing
@@ -74,7 +74,7 @@ TEST_CASE("Encode ASD", "[encoding]" ) {
 }
 
 /**
- * After switching to using `mouse07410/asn1c` (a fork of `vlm/asn1c`), this unit test is failing.
+ * This unit test is currently failing with the fork of asn1c that we're using (currently `usdot-fhwa-stol/usdot-asn1c`).
  * Since encoding BSMs is not a desired feature of the ACM, this test case has been commented out.
  */
 // TEST_CASE("Encode ASD_BSM", "[encoding]" ) { // TODO: fix test case failing
@@ -132,7 +132,7 @@ TEST_CASE("Encode ASD_1609", "[encoding]" ) {
 }
 
 /**
- * After switching to using `mouse07410/asn1c` (a fork of `vlm/asn1c`), this unit test is failing.
+ * This unit test is currently failing with the fork of asn1c that we're using (currently `usdot-fhwa-stol/usdot-asn1c`).
  * Since encoding BSMs is not a desired feature of the ACM, this test case has been commented out.
  */
 // TEST_CASE("Encode 1609_BSM", "[encoding]") { // TODO: fix test case failing
@@ -154,7 +154,7 @@ TEST_CASE("Encode ASD_1609", "[encoding]" ) {
 // }
 
 /**
- * After switching to using `mouse07410/asn1c` (a fork of `vlm/asn1c`), this unit test is failing.
+ * This unit test is currently failing with the fork of asn1c that we're using (currently `usdot-fhwa-stol/usdot-asn1c`).
  * Since encoding BSMs is not a desired feature of the ACM, this test case has been commented out.
  */
 // TEST_CASE("Encode ASD_1609_BSM", "[encoding]") { // TODO: fix test case failing