diff --git a/content/arduino-cloud/01.guides/01.editor/assets/collab-code-multiple.gif b/content/arduino-cloud/01.guides/01.editor/assets/collab-code-multiple.gif new file mode 100644 index 0000000000..1060c967f6 Binary files /dev/null and b/content/arduino-cloud/01.guides/01.editor/assets/collab-code-multiple.gif differ diff --git a/content/arduino-cloud/01.guides/01.editor/assets/collab-code-orange-frame.png b/content/arduino-cloud/01.guides/01.editor/assets/collab-code-orange-frame.png new file mode 100644 index 0000000000..b63e2d3bec Binary files /dev/null and b/content/arduino-cloud/01.guides/01.editor/assets/collab-code-orange-frame.png differ diff --git a/content/arduino-cloud/01.guides/01.editor/editor.md b/content/arduino-cloud/01.guides/01.editor/editor.md index f6ca4c0beb..eaef12bac9 100644 --- a/content/arduino-cloud/01.guides/01.editor/editor.md +++ b/content/arduino-cloud/01.guides/01.editor/editor.md @@ -110,4 +110,18 @@ Most libraries provide examples, which can be accessed be clicking the three dot The reference is an embedded version of the [Arduino Language Reference](https://www.arduino.cc/reference/en/), which helps you understand the Arduino programming language & syntax. -![Reference.](assets/reference.png) \ No newline at end of file +![Reference.](assets/reference.png) + +## Collaborative Coding + +**Collaborative Coding** allows users to work together on the same code. This feature enables developers within shared spaces to edit code across multiple windows, making collaboration easier. + +When working together, changes made in one window are updated and visible in all other windows. The code editor highlights the area being edited with an orange frame, notifying users if someone else is editing the same code. Users can take turns editing in multiple windows, ensuring everyone stays coordinated. + +![Collaborative Coding](assets/collab-code-multiple.gif) + +While a user is working on the code, the area they are editing is highlighted with the orange frame, and a warning block appears. This indicates that you should wait to avoid any loss of change. Please wait for them to finish before editing the code to prevent conflicts and ensure all changes are correctly synchronized. + +![Collaborative Coding - Code editor orange frame highlight](assets/collab-code-orange-frame.png) + +By making projects more interactive and engaging, collaborative coding enhances the overall developer experience. \ No newline at end of file diff --git a/content/arduino-cloud/09.business/09.arduino-cloud-for-business/assets/collab-code-demo.gif b/content/arduino-cloud/09.business/09.arduino-cloud-for-business/assets/collab-code-demo.gif new file mode 100644 index 0000000000..e476fa9ef0 Binary files /dev/null and b/content/arduino-cloud/09.business/09.arduino-cloud-for-business/assets/collab-code-demo.gif differ diff --git a/content/arduino-cloud/09.business/09.arduino-cloud-for-business/assets/collab-code-orange-frame.png b/content/arduino-cloud/09.business/09.arduino-cloud-for-business/assets/collab-code-orange-frame.png new file mode 100644 index 0000000000..b63e2d3bec Binary files /dev/null and b/content/arduino-cloud/09.business/09.arduino-cloud-for-business/assets/collab-code-orange-frame.png differ diff --git a/content/arduino-cloud/09.business/09.arduino-cloud-for-business/content.md b/content/arduino-cloud/09.business/09.arduino-cloud-for-business/content.md index 47ddf75283..d09a0b10e1 100644 --- a/content/arduino-cloud/09.business/09.arduino-cloud-for-business/content.md +++ b/content/arduino-cloud/09.business/09.arduino-cloud-for-business/content.md @@ -333,6 +333,22 @@ Arduino Cloud for Business integrates an amazing feature: Over-The-Air updates. ***Are you interested in learning how to perform an OTA update? Check [this tutorial](https://docs.arduino.cc/arduino-cloud/features/ota-getting-started#how-does-it-work). If you prefer to use the Arduino Cloud CLI instead, go to [this link](https://docs.arduino.cc/arduino-cloud/getting-started/arduino-cloud-cli#ota-over-the-air).*** +## Collaborative Coding + +**Collaborative Coding** is a powerful feature available with the plan that enables multiple users within the same shared space to work together on the same code. This feature allows team members to share and edit code seamlessly, providing better collaboration overall. + +In a collaborative coding environment, everyone can create and modify code simultaneously. Changes are updated and visible to all participants after the last user has finished editing. The code editor highlights the area being edited by others with an orange frame, helping team members stay synchronized and aware of each other's contributions. + +The following short clip shows an idea of how the collaborative coding works from two different user perspectives: + +![Collaborative Coding](assets/collab-code-demo.gif) + +While a user is working on the code, the area they are editing is highlighted with the orange frame, and a warning block appears. This indicates that the user should wait to avoid any loss of change. Please wait for them to finish before editing the code to prevent conflicts and ensure all changes are correctly synchronized. + +![Collaborative Coding - Code editor orange frame highlight](assets/collab-code-orange-frame.png) + +This functionality ensures that all users remain aligned and can contribute effectively. Collaborative coding improves the overall development experience by making projects more interactive and engaging. + ## Fleet Management Now it is time for you to start managing your fleet of devices/Things. The Arduino Cloud for Business fleet management features allow you to filter your devices/Things by status, add tags to more efficiently identify your projects, search between boards, and list and order them. diff --git a/content/arduino-cloud/10.education/00.arduino-cloud-for-education/assets/collab-code-demo.gif b/content/arduino-cloud/10.education/00.arduino-cloud-for-education/assets/collab-code-demo.gif new file mode 100644 index 0000000000..e476fa9ef0 Binary files /dev/null and b/content/arduino-cloud/10.education/00.arduino-cloud-for-education/assets/collab-code-demo.gif differ diff --git a/content/arduino-cloud/10.education/00.arduino-cloud-for-education/assets/collab-code-orange-frame.png b/content/arduino-cloud/10.education/00.arduino-cloud-for-education/assets/collab-code-orange-frame.png new file mode 100644 index 0000000000..b63e2d3bec Binary files /dev/null and b/content/arduino-cloud/10.education/00.arduino-cloud-for-education/assets/collab-code-orange-frame.png differ diff --git a/content/arduino-cloud/10.education/00.arduino-cloud-for-education/content.md b/content/arduino-cloud/10.education/00.arduino-cloud-for-education/content.md index 93d3d462db..888a7706b8 100644 --- a/content/arduino-cloud/10.education/00.arduino-cloud-for-education/content.md +++ b/content/arduino-cloud/10.education/00.arduino-cloud-for-education/content.md @@ -178,6 +178,22 @@ Quickly find all the recent sketch files and IoT Dashboards worked by your stude ***If you are interested in knowing more about Shared Spaces, read this [tutorial](https://docs.arduino.cc/arduino-cloud/education/shared-spaces/).*** +## Collaborative Coding + +**Collaborative coding** is a feature available in the School Plan that allows multiple users within the same shared space to work together on the same code. Students and teachers can share and edit code, making it easier to collaborate and learn from each other. + +In the shared space, everyone can create and modify code simultaneously. Changes are updated and visible to all participants once the last user has finished editing. The code editor notifies users if someone else is editing by highlighting the code area with an orange frame. + +The following short clip shows an idea of how the collaborative coding works from a student and teacher perspectives: + +![Collaborative Coding](assets/collab-code-demo.gif) + +While a student or teacher is working on the code, the area they are editing is highlighted with an orange frame, and a warning block appears. This indicates that you should wait to avoid any loss of change. Please wait for them to finish before editing the code to prevent conflicts and ensure all changes are correctly synchronized. + +![Collaborative Coding - Code editor orange frame highlight](assets/collab-code-orange-frame.png) + +This helps ensure that all students and teachers stay synchronized and can contribute effectively. Collaborative coding makes projects more interactive and engaging, improving the learning experience. + ## Cloud Remote App The Cloud Remote App allows you to monitor your dashboards anywhere, anytime, from a **mobile device** i.e. smartphone or tablet for **free**. Download it from either [Google Play Store](https://play.google.com/store/apps/details?id=cc.arduino.cloudiot&hl=en&gl=US) or the [Apple App Store](https://apps.apple.com/us/app/arduino-iot-cloud-remote/id1514358431) depending on your device.