Merge branch 'main' of github.com:RoboticsBrno/RB0011-SolderingChallenge

docs/README.md

@@ -23,10 +23,10 @@ The challenge is to solder all the components on the PCB in the shortest time po
 - Level 5 - SMD 0201 components (PCB is not complete) -->
 
 
-If you manage to plug in all the components correctly, the LED will flash at about 2 Hz when plugged into the USB port.
+If you manage to solder all the components correctly, the LED will flash about 2 times per second when plugged into the USB port.
 
 <div align="center">
     <img src="/media/schema.png">
 </div>
 
-!!! info "Attention, L2 has swapped resistor R1 and R2"
+!!! info "Attention, L2 has swapped resistor R1 and R2"

docs/assembly.md

@@ -3,20 +3,19 @@
 ## How to Proceed
 
 - **Always solder only one level at a time.**
-- Always take one component, solder it, and then proceed with the next.
-- Then you can solder the other components.
-- Once you have soldered, attach a pad underneath the USB connector.
+- Take one component from the holder, solder it, and only after that take another one. (They are easy to mixup.)
+- Once you have soldered everything, glue a padding underneath the USB connector.
 
 !!! info "Important Information"
     - Start by soldering the integrated circuit. As last solder the LED.
         - Be mindful of the orientation of the integrated circuit. If you're unsure, ask the instructor.
-	- Polarity usually matters with LEDs. However, on this board, you don't have to worry about polarity; the circuit is designed to be polarity-independent.
+	- Polarity usually matters with LEDs. However, on this board, you don't have to worry about polarity; the circuit is designed to be polarity-agnostic.
 
 !!! danger "Work Safety"
 	- The tip of the soldering iron is hot (~300 °C).
 	- Always place the soldering iron back in its stand.
 	- Keep your workspace tidy.
-	- If you get burned, go and cool the burned area with water or ice. Don't rub anything on the burned area.
+	- If you get burned, go and cool the burned area with water (do not use ice). Don't rub anything on the burned area.
 
 ## L1 - THT
 

docs/soldering.cs.md

@@ -18,19 +18,19 @@ Pájení je proces, při kterém zahříváme a spojujeme dvě (nebo více) sou
 
 ## Jak postupovat
 <figure markdown>
-  ![J](/media/soldering/pajeni-1.jpg)
+  ![Pajeni](/media/soldering/cs/pajeni-1.jpg)
   <figcaption markdown>Obrázek 1: Jak pájet [zdroj :octicons-link-external-16:](https://kutiluv-zapisnik.cz/jak-spravne-pajet-elektronicke-soucastky)</figcaption>
 </figure>
 
 
 <figure markdown>
-  ![J](/media/soldering/pajeni-3.jpg)
+  ![Pajeni](/media/soldering/cs/pajeni-3.jpg)
   <figcaption markdown>Obrázek 2: Jak pájet [zdroj :octicons-link-external-16:](https://kutiluv-zapisnik.cz/jak-spravne-pajet-elektronicke-soucastky)</figcaption>
 </figure>
 
 
 <figure markdown>
-  ![J](/media/soldering/pajeni-2.jpg)
+  ![Pajeni](/media/soldering/cs/pajeni-2.jpg)
   <figcaption markdown>Obrázek 3: Jak to má vypadat [zdroj :octicons-link-external-16:](https://kutiluv-zapisnik.cz/jak-spravne-pajet-elektronicke-soucastky)</figcaption>
 </figure>
 

docs/soldering.md

@@ -1,3 +1,43 @@
-# How to solder
+# How to Solder
 
-![type:video](https://www.youtube.com/embed/6rmErwU5E-k)
+Soldering is a process in which we heat and join two (or more) components using flux and solder.
+
+## Preparation
+- **Sponge:** Wet the sponge before starting. After every soldered joint, first wipe the tip on the sponge and then place it in the holder.
+- **Flux:** It aids in better solder wettability and helps create a conductive, smooth, and good-looking joint.
+- **Soldering Station:**
+    - **Transformer Soldering Iron:** It is larger and heavier.
+    - **Micro-soldering Iron:** Heats continuously during operation, not only when the button is pressed, unlike the transformer soldering iron. The temperature is adjustable and regulated, preventing damage to the soldering tip.
+        - Set the micro-soldering iron to a temperature of 300 °C.
+
+## Types of Soldering
+
+* **THT (Through-hole technology)** - soldering components with metal legs that are inserted through holes in the printed circuit board.
+* **SMD (Surface-mount technology)** - soldering components with metal bands that are pasted onto the printed circuit board.
+
+## How to Proceed
+<figure markdown>
+  ![Soldering](/media/soldering/en/soldering-1.png)
+  <figcaption markdown>Image 1: How to solder [source :octicons-link-external-16:](https://consolemods.org/wiki/Intro_to_Soldering)</figcaption>
+</figure>
+
+<figure markdown>
+  ![Soldering](/media/soldering/en/soldering-3.jpg)
+  <figcaption markdown>Image 2: How to solder [source :octicons-link-external-16:](https://www.circuitspecialists.com/blog/how-to-soldering-correctly-soldering-101/)</figcaption>
+</figure>
+
+<figure markdown>
+  ![Soldering](/media/soldering/en/soldering-2.png)
+  <figcaption markdown>Image 3: How it should look [source :octicons-link-external-16:](https://consolemods.org/wiki/Intro_to_Soldering)</figcaption>
+</figure>
+
+## Tutorials
+
+### THT
+![type:video](https://www.youtube.com/embed/vujaGgBuKu8?si=R9vzuez8leylzqLy&amp;clip=Ugkx7ZWut5RlKXG5L_a4UvHT_Kxr66VqGn3X&amp;clipt=EPybHhi_3h8)
+
+### SMD - chip
+![type:video](https://www.youtube.com/embed/vujaGgBuKu8?si=u0rPdQ2BL0gkE9qN&amp;start=718)
+
+### SMD
+![type:video](https://www.youtube.com/embed/vujaGgBuKu8?si=kH_I_9oBVI9Ww6fT&amp;clip=Ugkx-ag6_xJGoN_jpni_PyNBF9dca4yeR7nQ&amp;clipt=ENj2PhiQhUI)

docs/team.md

@@ -24,27 +24,18 @@ Each year we organize a [summer camp](https://robotickytabor.cz/) with engaging
 During the school year students can attend hobby groups covering modeling, electronics, mechanical engineering and programming.
 We are convinced that our activities are important in complementing the formal education system and expanding the possibilities of learning.
 
-<!-- <div align="center">
-<a href="https://helceletka.cz/robotarna/"><button>Helceletka&nbsp;&nbsp;&nbsp;</button></a>
-<a href="https://robotickytabor.cz/"><button>RoboCamp&nbsp;&nbsp;&nbsp;</button></a>
-<a href="https://www.instagram.com/_robotarna_/"><button>Instagram&nbsp;&nbsp;&nbsp;</button></a>
-<a href="https://www.facebook.com/robotarna"><button>Facebook&nbsp;&nbsp;&nbsp;</button></a>
-<a href="https://www.youtube.com/@robotikabrno-robotarnaasps2392"><button>YouTube&nbsp;&nbsp;&nbsp;</button></a>
-<a href="https://twitter.com/RobotikaBrno"><button>Twitter&nbsp;&nbsp;</button></a>
 
-</div> -->
+## Our Team
 
-
-<!--
 <table style="width: 100%; border: none;">
     <tr>
         <td style="width: 50%; vertical-align: top; border: none;">
-            <img src="https://raw.githubusercontent.com/RoboticsBrno/Our-team/main/docs/image/RenataZemanova.jpg" alt="Renata Zemanová's photo" style="width: 100%; border-radius: 50%">
+            <img src="https://raw.githubusercontent.com/RoboticsBrno/Our-team/main/docs/image/RenataZemanova.jpg" alt="Photo of Renata Zemanová" style="width: 100%; border-radius: 50%">
         </td>
         <td style="width: 50%; vertical-align: top; border: none;">
             <h2> Renata Zemanová </h2>
-            <p>Pro Renču je technika jedno velké kouzlo. I proto se jí věnuje a snaží se jí přijít co nejvíce na kloub. Baví ji pájení i většina rukodělných prací. Ráda své vědomosti předává dál, baví ji přemýšlet a nesnáší stereotypy. Je velmi společenská a přátelská. Bojí se výšek a přesto miluje hory a rozhledny a fascinují ji krásné výhledy do přírody. Hraje také na kytaru a zpívá ve sboru. Ráda by se někdy podívala na Island, do Norska nebo do Kanady. Na našem táboře je na pozici hlavní vedoucí.</p>
             <p style="font-size: 15px;">
+                <i class="fas fa-envelope"></i> <a href="mailto:renata.zemanova@helceletka.cz">renata.zemanova@helceletka.cz</a><br>
                 <i class="fab fa-github"></i> <a href="https://github.com/renata7zemanova" target="_blank">renata7zemanova</a><br>
             </p>
         </td>
@@ -56,7 +47,6 @@ We are convinced that our activities are important in complementing the formal e
     <tr>
         <td style="width: 50%; vertical-align: top; border: none;">
             <h2> Jakub Andrýsek </h2>
-            <p>Kuba je člověk pro všechno, rád pomůže všude tam, kde je třeba. Neodradí ho ani nestandardní situace a jde si vždy za svým cílem.  Studoval informatiku na gymnáziu Vídeňská a nyní pokračuje na FI MUNI v Brně. Nejčastěji ho najdete viset na skále, nebo sedět u počítače, kde vymýšlí nějaké nové projekty. U nás se věnuje hlavně programování a také 3D modelování v kroužku, který už několik let vede.</p>
             <p style="font-size: 15px;">
                 <i class="fas fa-envelope"></i> <a href="mailto:email@kubaandrysek.cz">email@kubaandrysek.cz</a><br>
                 <i class="fab fa-linkedin"></i> <a href="https://www.linkedin.com/in/jakub-andrysek/" target="_blank">in/jakub-andrysek</a><br>
@@ -65,23 +55,23 @@ We are convinced that our activities are important in complementing the formal e
             </p>
         </td>
         <td style="width: 50%; vertical-align: top; border: none;">
-            <img src="https://raw.githubusercontent.com/RoboticsBrno/Our-team/main/docs/image/JakubAndrysek.jpg" alt="Jakub Andrýsek's photo" style="width: 100%; border-radius: 50%">
+            <img src="https://raw.githubusercontent.com/RoboticsBrno/Our-team/main/docs/image/JakubAndrysek.jpg" alt="Photo of Jakub Andrýsek" style="width: 100%; border-radius: 50%">
         </td>
     </tr>
 </table>
 <hr>
+
 <table style="width: 100%; border: none;">
     <tr>
         <td style="width: 50%; vertical-align: top; border: none;">
-            <img src="https://raw.githubusercontent.com/RoboticsBrno/Our-team/main/docs/image/TomasVavrinec.jpg" alt="Tomáš Vavrinec's photo" style="width: 100%; border-radius: 50%">
+            <img src="https://raw.githubusercontent.com/RoboticsBrno/Our-team/main/docs/image/TomasVavrinec.jpg" alt="Photo of Tomáš Vavrinec" style="width: 100%; border-radius: 50%">
         </td>
         <td style="width: 50%; vertical-align: top; border: none;">
             <h2> Tomáš Vavrinec </h2>
-            <p>Tom je člověk primárně pro elektroniku, přesto nepohrdne ani dobrou táborovou hrou nebo jinou kulišarnou. Když se pro něco nadchne nepřestane dokud neuzná dílo za hotové. Aktuálně je studentem ústavu mikroelektrotechniky na fakultě FEKT univerzity VUT a zároveň pracuje na vývoji měřících zařízení.  Bývá k vidění na nejrůznějších horách i za polárním kruhem, přesto že nejčastěji ho najdete v okolí technologického parku VUT, nebo u počítače či osciloskopu, jak se snaží zprovoznit hračky nejmenovanému programátorovi. U nás se zabývá návrhem elektroniky a mechaniky všeho druhu a spolu s Kubou Andrýskem vede kroužek 3D modelování a 3D tisku.</p>
             <p style="font-size: 15px;">
                 <i class="fab fa-github"></i> <a href="https://github.com/TVavrinec" target="_blank">TVavrinec</a><br>
+                <i class="fas fa-envelope"></i> <a href="mailto:tomas.vavrinec@helceletka.cz">tomas.vavrinec@helceletka.cz</a><br>
             </p>
         </td>
     </tr>
 </table>
-<hr> -->