From 6d083a3dce02f67b9fb188d9b0eaaaa880b68a29 Mon Sep 17 00:00:00 2001 From: NachtSpyder04 Date: Sun, 9 Jun 2024 22:27:52 +0530 Subject: [PATCH] minor updates in tasks and leaderboard --- _site/assets/js/leaderboard.js | 2 +- _site/tasks/task4_2.html | 87 ++++++++++++++------------------- subtasks/task4_3.md | 88 ++++++++++++++-------------------- 3 files changed, 74 insertions(+), 103 deletions(-) diff --git a/_site/assets/js/leaderboard.js b/_site/assets/js/leaderboard.js index 9aff48d..c0b6554 100644 --- a/_site/assets/js/leaderboard.js +++ b/_site/assets/js/leaderboard.js @@ -1,6 +1,6 @@ let SHEET_ID = "1SicFCrILTarw2dsadPwuciuanI6aIcLU1i8DWhv62k0"; let SHEET_TITLE = "Eklavya Leaderboard 24"; -let SHEET_RANGE = "A2:B28"; +let SHEET_RANGE = "A2:B42"; let full_URI = `https://docs.google.com/spreadsheets/d/${SHEET_ID}/gviz/tq?sheet=${SHEET_TITLE}/&range=${SHEET_RANGE}`; diff --git a/_site/tasks/task4_2.html b/_site/tasks/task4_2.html index dd38a0f..3e47b0a 100644 --- a/_site/tasks/task4_2.html +++ b/_site/tasks/task4_2.html @@ -123,50 +123,23 @@

Embedded Task

-

This task involves implementing a system that reads a .txt file generated from Task 1 and performs actions based on the type of node and turn detected. The system will use the SRA board to control LED blinking patterns and motor movements. Additionally, the system will use freeRTOS to control both the LED blinking patterns and motor movements concurrently.

+

Embedded Task

+ +

This task involves implementing a system that reads a .txt file generated from Task 1 and performs actions based on the type of junction and turn detected. The system will use the SRA board to control LED blinking patterns and motor movements. Additionally, the system will use freeRTOS to control both the LED blinking patterns and motor movements concurrently.

Task Instructions:

-
    |  |
-____|  |____
-____    ____ <-- Node here
-    |  |
-    |  |
-____|  |
-____   | <-- Node Here
-    |  |
-    |  |_____
-    |   _____ <-- Node Here
-    |  |
-    |  |
-    |  |
-    |  |
-
-
- -

Line sensor placement:

- -

-    |   |
-    |   |
-____|   |____
-____|   |____
-    |   |
-    |   |
-   0|123|4
-
- -

0, 1, 2, 3, 4 are the locations of the 5 line sensors

- -

Types of Nodes:

- -
                       |  |
+
					   |XX|	  <--- Mines/U-turn
+					   |  |
+			-----------    -------------    <---- plus junction
+			-----------	   -------------		
+                       |  |
                        |  |
          ______________|  |
  Only-->|   ______________|  <-- Only Left
@@ -185,33 +158,47 @@ 
Task Instructions:

         |  |
         |  |
         |  |
+
+

+
+
Line sensor placement:

+
+
                               |     |
+                               |     |
+                           ____|     |____
+                           ____|     |____
+                               |     |
+                               |  6  |
+                              1|2 3 4|5
 

 
+
1, 2, 3, 4, 5 are the positions of the 4 line sensors and the 5th is for the IR sensor.

+
 
    
-  
  • Implement LED blinking according to the node type:
+  
  • Implement LED blinking according to the junction type:
     
      
       
    • Utilize the SRA board’s 8 LEDs to display the blink pattern.
      • 
-      
    • For only left node: LEDs will blink in a pattern from right to left.
      • 
-      
    • For only right node: LEDs will blink in a pattern from left to right.
      • 
-      
    • For right+straight or left+straight node: LEDs will blink in a pattern where the lights at both ends (first and eighth LEDs) move towards the center.
      • 
-      
    • For plus node: All LEDs blink simultaneously (on and off).
      • 
+      
    • For only left junction: LEDs will blink in a pattern from right to left.
      • 
+      
    • For only right junction: LEDs will blink in a pattern from left to right.
      • 
+      
    • For right+straight or left+straight junction: LEDs will blink in a pattern where the lights at both ends (first and eighth LEDs) move towards the center.
      • 
+      
    • For plus junction: All LEDs blink simultaneously (on and off).
      • 
       
    • For dead end: LEDs will blink in a stationary pattern, indicating the end of the path.
      • 
     
    
 
-    
    Click here for LED Patterns
    
+    
    Check here for LED Patterns
    
   
    • 
   
  • Control motor movements according to the detected turn type using the SRA board. 
   i.e
     
      
       
    • For a left turn, the motors should turn left.
      • 
       
    • For a right turn, the motors should turn right.
      • 
-      
    • For a right + straight node,  the motors should continue to move straight.
      • 
-      
    • For a left + straight node, the motors should turn left.
      • 
-      
    • For a plus node, the motors should turn left.
      • 
+      
    • For a right + straight junction,  the motors should continue to move straight.
      • 
+      
    • For a left + straight junction, the motors should turn left.
      • 
+      
    • For a plus junction, the motors should turn left.
      • 
       
    • For dead end, the motors should stop.
      • 
     
    
 
-    
    (This is the basic application of Left-Follow Rule where in the bot prioritises Left Turn at each node. The next priority is for going Straight and then least priority is given to the Right Turn.)
    
+    
    (This is the basic application of Left-Follow Rule where in the bot prioritises Left Turn at each junction. The next priority is for going Straight and then least priority is given to the Right Turn.)
    
   
    • 
   
  • Utilize freeRTOS to ensure parallel execution of LED blinking and motor control tasks.
    • 
 

@@ -222,9 +209,9 @@ 
Submission Instructions

 
 
    
   
  • Your code file main.c
    • 
-  
  • A video showing LED blinking patterns and motor movements.
    • 
+  
  • A video showing LED blinking patterns and motor movements, including a notepad in the video showing the task number and team name.
    • 
   
  • Rename zip folder as your team name and task number. Eg. “Task_4_TEAM_ABCD”
    • 
-  
  • Submit here
+  
  • Submit here
 
    • 
 

 
diff --git a/subtasks/task4_3.md b/subtasks/task4_3.md
index 4eabc0b..d80ff1d 100644
--- a/subtasks/task4_3.md
+++ b/subtasks/task4_3.md
@@ -6,52 +6,21 @@ permalink: /tasks/task4_2
 importance: 4
 ---
 
+# Embedded Task
 
-
-This task involves implementing a system that reads a .txt file generated from Task 1 and performs actions based on the type of node and turn detected. The system will use the SRA board to control LED blinking patterns and motor movements. Additionally, the system will use freeRTOS to control both the LED blinking patterns and motor movements concurrently.
+This task involves implementing a system that reads a .txt file generated from Task 1 and performs actions based on the type of junction and turn detected. The system will use the SRA board to control LED blinking patterns and motor movements. Additionally, the system will use freeRTOS to control both the LED blinking patterns and motor movements concurrently.
 
 ## **Task Instructions:**
 
-- Read the lsa.txt file output from Task 1.
-- Detect a specified type of node (e.g., only left node) and turn (e.g., left turn).
-- What is a Node?
-
-```
-    |  |
-____|  |____
-____    ____ <-- Node here
-    |  |
-    |  |
-____|  |
-____   | <-- Node Here
-    |  |
-    |  |_____
-    |   _____ <-- Node Here
-    |  |
-    |  |
-    |  |
-    |  |
-
-```
-
-Line sensor placement:
-
-```
-
-    |   |
-    |   |
-____|   |____
-____|   |____
-    |   |
-    |   |
-   0|123|4
-```
-
-0, 1, 2, 3, 4 are the locations of the 5 line sensors
-
-**Types of Nodes:**
+- Read the output text file output from Task 1.
+- Detect a specified type of junction (e.g., only left junction) and turn (e.g., left turn).
+- **Types of Junction**
 
 ```
+					   |XX|	  <--- Mines/U-turn
+					   |  |
+			-----------    -------------    <---- plus junction
+			-----------	   -------------		
                        |  |
                        |  |
          ______________|  |
@@ -71,28 +40,43 @@ ____|   |____
         |  |
         |  |
         |  |
+
+```
+
+Line sensor placement:
+
 ```
+                               |     |
+                               |     |
+                           ____|     |____
+                           ____|     |____
+                               |     |
+                               |  6  |
+                              1|2 3 4|5
+```
+
+1, 2, 3, 4, 5 are the positions of the 4 line sensors and the 5th is for the IR sensor.
 
-- Implement **LED blinking** according to the **node type**:
+- Implement **LED blinking** according to the **junction type**:
     - Utilize the SRA board's 8 LEDs to display the blink pattern.
-    - For only left node: LEDs will blink in a pattern from right to left.    
-    - For only right node: LEDs will blink in a pattern from left to right.    
-    - For right+straight or left+straight node: LEDs will blink in a pattern where the lights at both ends (first and eighth LEDs) move towards the center.
-    - For plus node: All LEDs blink simultaneously (on and off).
+    - For only left junction: LEDs will blink in a pattern from right to left.    
+    - For only right junction: LEDs will blink in a pattern from left to right.    
+    - For right+straight or left+straight junction: LEDs will blink in a pattern where the lights at both ends (first and eighth LEDs) move towards the center.
+    - For plus junction: All LEDs blink simultaneously (on and off).
     - For dead end: LEDs will blink in a stationary pattern, indicating the end of the path.
     
-    **Click [here](https://tangy-ironclad-2ce.notion.site/LED-Patterns-415bc48176e9438fa4d564c7bb276041) for LED Patterns**
+    **Check [here](https://tangy-ironclad-2ce.notion.site/LED-Patterns-415bc48176e9438fa4d564c7bb276041) for LED Patterns**
 
 - Control **motor movement**s according to the detected **turn type** using the SRA board. 
     i.e 
     - For a left turn, the motors should turn left.
     - For a right turn, the motors should turn right.
-    - For a right + straight node,  the motors should continue to move straight.
-    - For a left + straight node, the motors should turn left.
-    - For a plus node, the motors should turn left.
+    - For a right + straight junction,  the motors should continue to move straight.
+    - For a left + straight junction, the motors should turn left.
+    - For a plus junction, the motors should turn left.
     - For dead end, the motors should stop.
     
-    (This is the basic application of Left-Follow Rule where in the bot prioritises Left Turn at each node. The next priority is for going Straight and then least priority is given to the Right Turn.)
+    (This is the basic application of Left-Follow Rule where in the bot prioritises Left Turn at each junction. The next priority is for going Straight and then least priority is given to the Right Turn.)
     
 - Utilize freeRTOS to ensure parallel execution of LED blinking and motor control tasks.
 
@@ -101,9 +85,9 @@ ____|   |____
 Make a zip file containing
 
 - Your code file main.c
-- A video showing LED blinking patterns and motor movements.
+- A video showing LED blinking patterns and motor movements, including a notepad in the video showing the task number and team name.
 - Rename zip folder as your team name and task number. Eg. "Task_4_TEAM_ABCD”
-- Submit [**here**](https://docs.google.com/forms/d/e/1FAIpQLSdfMcJeF9Kahu3anRx_x-Yy7Uge-mmePv7-zoeEcM3BXhWb_Q/viewform)
+- Submit [**here**](https://drive.google.com/drive/folders/1CGM7tCPZB3jeFF9N61QfBO6x4sRzHxan?usp=sharing)
 
 ## **Resources**