switch fully to 2022...

.vscode/c_cpp_properties.json

@@ -0,0 +1,24 @@
+{
+  "configurations": [
+    {
+      "browse": {
+        "databaseFilename": "${workspaceFolder}/.vscode/browse.vc.db",
+        "limitSymbolsToIncludedHeaders": false
+      },
+      "includePath": [
+        "/home/coalman321/osu-uwrt/dependencies/install/include/**",
+        "/home/coalman321/osu-uwrt/dependencies/MYNT/wrappers/ros/devel/include/**",
+        "/opt/ros/noetic/include/**",
+        "/home/coalman321/osu-uwrt/riptide_software/devel/include/**",
+        "/home/coalman321/osu-uwrt/riptide_software/src/riptide_autonomy/include/**",
+        "/usr/include/**"
+      ],
+      "name": "ROS",
+      "intelliSenseMode": "gcc-x64",
+      "compilerPath": "/usr/bin/gcc",
+      "cStandard": "gnu11",
+      "cppStandard": "c++14"
+    }
+  ],
+  "version": 4
+}

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+    "python.autoComplete.extraPaths": [
+        "/home/coalman321/osu-uwrt/dependencies/install/lib/python3/dist-packages",
+        "/home/coalman321/osu-uwrt/dependencies/MYNT/wrappers/ros/devel/lib/python3/dist-packages",
+        "/opt/ros/noetic/lib/python3/dist-packages",
+        "/home/coalman321/osu-uwrt/riptide_software/devel/lib/python3/dist-packages"
+    ]
+}

build.sh

@@ -3,7 +3,7 @@
 # constants used for build
 export TOOLCHAIN=$(pwd)/rio_toolchain.cmake
 export COLCON_META=$(pwd)/colcon.meta
-export YEAR=2021
+export YEAR=2022
 export ARM_PREFIX=arm-frc${YEAR}-linux-gnueabi
 export CROSS_ROOT=${HOME}/wpilib/${YEAR}/roborio/${ARM_PREFIX}
 export DDS_IMPL=CycloneDDS

build_host_cyclone.sh

@@ -4,6 +4,8 @@ CYC_HOST_DIR=$(pwd)/cyclone_host/cyclonedds
 
 mkdir ${CYC_HOST_DIR}/build
 
+sudo apt install bison -y
+
 pushd ${CYC_HOST_DIR}/build > /dev/null
 
     echo "Building cyclonedds for host"

downloadDeps.py

@@ -77,26 +77,6 @@
 
 }
 
-'''
-buildDeps = {
-    "files": [
-        "bison"
-    ],
-    "links" : [ # tuples of target (links to) and source (the link)
-    ]
-}
-
-deployDeps = {
-    "files": [
-
-    ],
-    "links" : [ # tuples of target (links to) and source (the link)
-
-    ]
-} 
-'''  
-
-
 remoteUrl = "https://download.ni.com/ni-linux-rt/feeds/2021.3/arm/main/cortexa9-vfpv3/"
 packageUrl = "https://download.ni.com/ni-linux-rt/feeds/2021.3/arm/main/cortexa9-vfpv3/Packages"
 
@@ -122,7 +102,7 @@ def singleDownload(download_url, save_as, local_dir):
 
         absFileName = os.path.join(local_dir, "downloads", save_as)
         urllib.request.urlretrieve(download_url, filename = absFileName)
-        logging.warning("Downloaded {} successfully as {}".format(download_url, absFileName))
+        logging.info("Downloaded {} successfully as {}".format(download_url, absFileName))
         return True
 
     except Exception as e:

rio_toolchain.cmake

@@ -1,5 +1,5 @@
 ##configuration
-set(YEAR 2021)
+set(YEAR 2022)
 
 # Set system definitions
 SET(CMAKE_SYSTEM_NAME Linux)
@@ -19,10 +19,10 @@ set(CMAKE_SYSROOT ${WPI_DIR}/roborio/${ARM_PREFIX})
 # Use a relative dir to get to the compilier
 set(COMPILIER_DIR ${WPI_DIR}/roborio/bin/)
 
-find_program(CMAKE_C_COMPILER NAMES arm-frc2021-linux-gnueabi-gcc PATHS ${COMPILIER_DIR})
-find_program(CMAKE_CXX_COMPILER NAMES arm-frc2021-linux-gnueabi-g++ PATHS ${COMPILIER_DIR})
-find_program(CMAKE_LINKER NAMES arm-frc2021-linux-gnueabi-gcc PATHS ${COMPILIER_DIR})
-find_program(CMAKE_AR NAMES arm-frc2021-linux-gnueabi-ar PATHS ${COMPILIER_DIR})
+find_program(CMAKE_C_COMPILER NAMES arm-frc${YEAR}-linux-gnueabi-gcc PATHS ${COMPILIER_DIR})
+find_program(CMAKE_CXX_COMPILER NAMES arm-frc${YEAR}-linux-gnueabi-g++ PATHS ${COMPILIER_DIR})
+find_program(CMAKE_LINKER NAMES arm-frc${YEAR}-linux-gnueabi-gcc PATHS ${COMPILIER_DIR})
+find_program(CMAKE_AR NAMES arm-frc${YEAR}-linux-gnueabi-ar PATHS ${COMPILIER_DIR})
 
 # message("Got C compilier at ${CMAKE_C_COMPILER}")
 # message("Got CXX compilier at ${CMAKE_CXX_COMPILER}")