- Changing static ip of linux vm

- Updating freertos submodule - Altered vscode settings
xX7 · Dec 3, 2022 · ab418a1 · ab418a1
1 parent b1e1d33
commit ab418a1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -4,7 +4,8 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceFolder}/**",
-                "${workspaceFolder}/src/**"
+                "${workspaceFolder}/src/**",
+                "${workspaceFolder}/src/freertos/**"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/gcc",
@@ -14,4 +15,4 @@
         }
     ],
     "version": 4
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,7 +7,8 @@
         "limits": "c",
         "vm.h": "c",
         "type_traits": "c",
-        "cstdlib": "c"
+        "cstdlib": "c",
+        "global.h": "c"
     },
     "files.exclude": {
         "**/.git": true,

diff --git a/configs/linux_rpi4.dts b/configs/linux_rpi4.dts
@@ -117,7 +117,7 @@
 	};
 
 	chosen {
-		bootargs = "earlycon clk_ignore_unused ip=192.168.178.15 carrier_timeout=0";
+		bootargs = "earlycon clk_ignore_unused ip=192.168.178.11 carrier_timeout=0";
 	};
 
 };
diff --git a/src/freertos b/src/freertos
+1 −1		src/arch/armv8/inc/FreeRTOSConfig.h
+1 −1		src/hartstone/inc/global.h
+4 −18		src/main.c