Rebase changes from main branch

kar-rahul-aws · Oct 25, 2024 · 4c95653 · 4c95653
2 parents 0f3c447 + e13d6ab
commit 4c95653
Show file tree

Hide file tree

Showing 20 changed files with 685 additions and 641 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,7 +45,7 @@ jobs:
       - name: Check Formatting
         uses: FreeRTOS/CI-CD-Github-Actions/formatting@main
         with:
-          exclude-dirs: ethernet, drivers, FreeRTOS/Demo
+          exclude-dirs: ethernet, drivers, FreeRTOS/Demo, FreeRTOS-Plus/Demo
 
   spell-check:
     runs-on: ubuntu-latest

diff --git a/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/readme.url b/FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/readme.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=https://www.freertos.org/iot-device-defender/index.html
diff --git a/...vice_Shadow_Demo/READ_ME_INSTRUCTIONS.url → ...s_Simulator/Device_Shadow_Demo/readme.url b/...vice_Shadow_Demo/READ_ME_INSTRUCTIONS.url → ...s_Simulator/Device_Shadow_Demo/readme.url
@@ -3,4 +3,3 @@ Prop3=19,11
 [InternetShortcut]
 IDList=
 URL=https://www.freertos.org/iot-device-shadow/index.html
-
diff --git a/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/readme.url b/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/readme.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=https://www.freertos.org/Documentation/03-Libraries/04-AWS-libraries/06-AWS-IoT-Fleet-Provisioning/03-Fleet-provisioning-demo
diff --git a/FreeRTOS-Plus/Demo/AWS/Jobs_Windows_Simulator/Jobs_Demo/readme.url b/FreeRTOS-Plus/Demo/AWS/Jobs_Windows_Simulator/Jobs_Demo/readme.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=https://www.freertos.org/Documentation/03-Libraries/04-AWS-libraries/04-AWS-IoT-Jobs/03-Jobs-demo
diff --git a/FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/Ota_Over_Http_Demo/readme.url b/FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/Ota_Over_Http_Demo/readme.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=https://www.freertos.org/Documentation/03-Libraries/04-AWS-libraries/02-AWS-IoT-OTA/04-HTTP-demo
diff --git a/FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/Ota_Over_Mqtt_Demo/readme.url b/FreeRTOS-Plus/Demo/AWS/Ota_Windows_Simulator/Ota_Over_Mqtt_Demo/readme.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=https://www.freertos.org/Documentation/03-Libraries/04-AWS-libraries/02-AWS-IoT-OTA/03-MQTT-demo
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/readme.url b/FreeRTOS-Plus/Demo/FreeRTOS_Cellular_Interface_Windows_Simulator/readme.url
@@ -0,0 +1,5 @@
+[{000214A0-0000-0000-C000-000000000046}]
+Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=https://www.freertos.org/Documentation/03-Libraries/03-FreeRTOS-core/09-Cellular-interface/03-Cellular-interface-demo
diff --git a/..._with_Trace_Windows_Simulator/READ_ME.url → ...I_with_Trace_Windows_Simulator/readme.url b/..._with_Trace_Windows_Simulator/READ_ME.url → ...I_with_Trace_Windows_Simulator/readme.url
@@ -1,5 +1,5 @@
-[InternetShortcut]
-URL=http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_Trace/Free_RTOS_Plus_Trace_CLI_Example.shtml
-IDList=
 [{000214A0-0000-0000-C000-000000000046}]
 Prop3=19,2
+[InternetShortcut]
+IDList=
+URL=http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_Trace/Free_RTOS_Plus_Trace_CLI_Example.html
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/ReadMe.txt b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/ReadMe.txt
@@ -23,6 +23,10 @@ The TCP client example included in the minimal project is described on the
 following URL:
 http://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Clients.html
 
+The TCP server example included in the minimal project is described on the
+following URL:
+https://www.freertos.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Echo_Server.html
+
 A description of the FreeRTOS+TCP source code directory is provided on the
 following URL:
 http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_TCP/TCP_Networking_Tutorial_Source_Code_Organisation.html

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/README_FIRST.txt b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/README_FIRST.txt
@@ -1,11 +1,10 @@
 This demo is documented on the following web page:
-http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/RTOS_UDP_CLI_Windows_Simulator.shtml
+http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/RTOS_UDP_CLI_Windows_Simulator.html
 
 The FreeRTOS+UDP API is documented on the following web page:
-http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/FreeRTOS_UDP_API_Functions.shtml
+http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/FreeRTOS_UDP_API_Functions.html
 
 Other information, including a FreeRTOS+UDP primer, a description of the
 directory structure, and a glossary of networking terminology, can be found in
 the FreeRTOS+UDP portal:
 http://www.FreeRTOS.org/udp
-
diff --git a/...o/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL_Windows_Simulator.vcxproj b/...o/FreeRTOS_Plus_WolfSSL_Windows_Simulator/FreeRTOS_Plus_WolfSSL_Windows_Simulator.vcxproj
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@ Prop3=19,11
		[InternetShortcut]
		IDList=
		URL=https://www.freertos.org/iot-device-shadow/index.html