From 8c0a11d827c2d5336bc3f29734208b0a216dbce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torben=20B=C3=B6hnke?=
<torben.boehnke-makerspace@ruhr-uni-bochum.de>
Date: Thu, 21 Sep 2023 16:46:21 +0200
Subject: [PATCH] en-update: digiLab + how to slide
-digital labor formatting
-added en version of howto slides
---
.gitlab-ci.yml | 16 +-
docs/digitallabor.en.md | 338 ++++++++++++++++++++++++++++++----------
docs/digitallabor.md | 6 +-
docs/howto-slides.en.md | 8 +
docs/howto-slides.md | 2 +-
5 files changed, 274 insertions(+), 96 deletions(-)
create mode 100644 docs/howto-slides.en.md
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 92002974b..1460575b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,18 +1,18 @@
pages:
stage: deploy
- before_script:
- - eval $(ssh-agent -s)
- - echo "${RUB_SSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add -
+ # before_script:
+ # - eval $(ssh-agent -s)
+ # - echo "${RUB_SSH_PRIVATE_KEY}" | tr -d '\r' | ssh-add -
script:
- rm -rf public/en/medien
- cp -R slides public
# Debugging SSH connection:
- - echo "${RUB_SSH_PRIVATE_KEY}" > temporary_key
- - chmod 600 temporary_key
- - ssh -v -i temporary_key ${RUB_SSH_USER}@${RUB_SSH_HOST}
- - rm -f temporary_key
+ # - echo "${RUB_SSH_PRIVATE_KEY}" > temporary_key
+ # - chmod 600 temporary_key
+ # - ssh -v -i temporary_key ${RUB_SSH_USER}@${RUB_SSH_HOST}
+ # - rm -f temporary_key
# Actual upload command:
- - lftp -u ${RUB_SSH_USER}, -e "mirror -R ${CI_PROJECT_DIR}/public/ ${RUB_TARGET_DIR}/; quit" sftp://${RUB_SSH_HOST}
+ # - lftp -u ${RUB_SSH_USER}, -e "mirror -R ${CI_PROJECT_DIR}/public/ ${RUB_TARGET_DIR}/; quit" sftp://${RUB_SSH_HOST}
artifacts:
paths:
- public
diff --git a/docs/digitallabor.en.md b/docs/digitallabor.en.md
index 848e2fbcd..6697fc6e7 100644
--- a/docs/digitallabor.en.md
+++ b/docs/digitallabor.en.md
@@ -2,7 +2,7 @@
-Our digital lab is your contact point for everything concerning +++computers, +++soldering, +++measuring, +++circuit boards and other aspects of digital matters. Here you will find everything you need for development work in IT and electrical engineering.
+Our digital lab is your contact point for everything concerning [computers](#it), [soldering](#loeten), [measuring](#messen), [circuit boards](#platinen) and other aspects of digital matters. Here you will find everything you need for development work in IT and electrical engineering.
??? question "Who is the contact for the digital lab?"
@@ -14,20 +14,41 @@ Our digital lab is your contact point for everything concerning +++computers, ++
Participation in the [General Safety Instruction and the General Instruction "Digital Lab"](unterweisungen.en.md) is required for the use of the digital lab. To use the Makerspace computers you will only need the General Safety Instruction.
-+++ Fancy Kasten fehlt hier +++
+=== "Instruction Slides"
-!!! info "[To the 'Digital Lab' work folder with additional documents](https://ruhr-uni-bochum.sciebo.de/s/VuFDh7eChe6z1v7?path=%2FDigitallabor)"
+ <iframe src="../slides/unterweisung-digitallabor" width="100%" height="430px" style="border: 0.5px solid #003561"></iframe>
- In this folder you will find further documents on all areas of the digital lab such as operating instructions, templates and samples, tutorials and other things to make your work easier.
- As always: We are stronger together - we are happy about every [contribution to the pool of knowledge and experience](feedback.en.md).
+ :material-fullscreen:
+ <small><a href="../slides/unterweisung-digitallabor" target="_blank">Präsentation in neuem Tab groß anzeigen</a></small>
+ :material-printer:
+ <small><a href="../slides/unterweisung-digitallabor/?print-pdf" target="_blank">Druck-Ansicht, z.B. für PDF-Export (nur in Chromium-Browsern, ohne externe Inhalte)</a></small>
+ :material-file-edit:
+ <small><a href="https://git.noc.rub.de/makerspace/homepage/-/blob/main/slides/unterweisung-digitallabor/slides.md" target="_blank">Quelldatei "slides.md" zu den Folien auf Gitlab</a></small>
-## Computers and IT
+ --8<--
+ howto-slides.en.md
+ --8<--
+
+=== "Operating Instructions"
+
+ --8<--
+ sicherheit/ba-digitallabor.md
+ --8<--
+
+=== "Work Material"
+
+ !!! info "[To the 'Digital Lab' work folder with additional documents](https://ruhr-uni-bochum.sciebo.de/s/VuFDh7eChe6z1v7?path=%2FDigitallabor)"
+
+ In this folder you will find further documents on all areas of the digital lab such as operating instructions, templates and samples, tutorials and other things to make your work easier.
+ As always: We are stronger together - we are happy about every [contribution to the pool of knowledge and experience](feedback.en.md).
+
+## Computers and IT {: #it }
Out of the digital lab (partly in cooperation with [IT.Services](https://it-services.ruhr-uni-bochum.de/)) the different computers in the Makerspace are maintained.
-In addition to the hardware, we also take care of various software topics such as this website (e.g. our +++source code on Gitlab), the IT-infratructure as well as the working equipment of our team, our user and safety instruction management via [Fabman](faq.en.md##fabman). Also we take care of the licenses for the software on the above-mentioned computers or also our license for the [Arduino IoT Cloud](https://docs.arduino.cc/arduino-cloud/), with which we (and you) can bring electronics projects online quite easily (for "Dashboards", Fernsteuerugen, u.v.m.). Please +++contact us if you need it!
+In addition to the hardware, we also take care of various software topics such as this website (e.g. our [source code on Gitlab](https://git.noc.ruhr-uni-bochum.de/makerspace/homepage)), the IT-infratructure as well as the working equipment of our team, our user and safety instruction management via [Fabman](faq.en.md##fabman). Also we take care of the licenses for the software on the above-mentioned computers or also our license for the [Arduino IoT Cloud](https://docs.arduino.cc/arduino-cloud/), with which we (and you) can bring electronics projects online quite easily (for "Dashboards", Fernsteuerugen, u.v.m.). Please [contact us](kontakt.en.md) if you need it!
=== "Hardware"
@@ -39,10 +60,10 @@ In addition to the hardware, we also take care of various software topics such a
=== "Software"
- !!! warning "Software licenses for educational use only!"
+ !!! warning "Software Licenses for Educational Use Only!"
All of the commercial software mentioned below may be used for educational and research purposes only. Commercial use is prohibited. For applications with a commercial background, separate licenses must be purchased. These can also be installed on the Makerspace hardware if required and after consultation with the team.
- **software on various workstations and laptops:**
+ **Software on Various Workstations and Laptops:**
- Apple Pro Apps (Final Cut Pro, Logic Pro, Motion, Compressor, MainStage)
- Affinity Suite (Designer, Photo, Publisher)
@@ -50,7 +71,7 @@ In addition to the hardware, we also take care of various software topics such a
- Steam with various (VR) content on VR computer in the design lab and on the workstation-laptops
- Various software that is also installed in our computer room (see below)
- **Software in the computer room:**
+ **Software in the Computer Room:**
- Inkscape und InkStitch
- Arduino IDE
@@ -73,16 +94,24 @@ In addition to the hardware, we also take care of various software topics such a
- Lego Mindstorms Robot Inventor
- In addition, the "standard software for PC pools" is available from IT.Services (Office, 7zip, Firefox, VLC, LaTeX, Matlab, etc.)
- !!! info "Subsequent installation of software"
+ !!! info "Subsequent Installation of Software"
- In the computer room, a subsequent installation of software is only possible with longer advance notice. Current versions of the software are not necessarily always installed. The workstations are virtualized and a RUB loginID or an event account for external users (only with advance notice!) is required for use.
- On the other workstations and laptops in the Makerspace, a subsequent installation of software is possible by prior arrangement.
-+++Betriebsanweisungen und Arbeitsmaterial fehlt+++ BA hab ich erstmal ausgelassen (sind die schon irgendwie irgendwo eingefügt worden oder vorhanden?)
+=== "Operating Instructions"
+
+ --8<--
+ sicherheit/ba-computerraum.md
+ sicherheit/ba-it-edv.md
+ --8<--
+
-Text zu "Arbeitsmaterial"
-Work material
-In this file you can find further documents about the computers at Makerspace, for example operation manuals, operation instuctions, notes about the preinstalled software and other things, that might help you with your project. As always: Together we are stronger - we are happy about every [contribution to the collection of knowledge and experience!](feedback.en.md)
+=== "Work Material"
+
+ !!! info "[To the work folder "Computer and IT" with further documents](https://ruhr-uni-bochum.sciebo.de/s/VuFDh7eChe6z1v7?path=%2FDigitallabor%2FComputer-und-IT)"
+
+ In this file you can find further documents about the computers at Makerspace, for example operation manuals, operation instuctions, notes about the preinstalled software and other things, that might help you with your project. As always: Together we are stronger - we are happy about every [contribution to the collection of knowledge and experience!](feedback.en.md)
## Soldering and General Electrical Lab Work
@@ -90,17 +119,36 @@ One of the most common activities in the digital lab is [soldering](https://de.w
-**Our devices (*links lead to the website of the manufacturer*):**
+=== "Our Devices"
+
+ *links lead to the website of the manufacturer*
-- [3x Weller WR2 - Soldering station](https://www.weller-tools.com/professional/EUR/de/Professional/Loettechnik/Loetstationen/Entloetstationen/WR+2)
+ - [3x Weller WR2 - Soldering station](https://www.weller-tools.com/professional/EUR/de/Professional/Loettechnik/Loetstationen/Entloetstationen/WR+2)
-- [2x Weller Zero Smog EL - Solder fume extraction](https://www.weller-tools.com/professional/EUR/de/Filtertechnik/Loetrauch/Flaechenabsaugung/1-2+Arbeitsplaetze/Zero+Smog+EL+Kit+1)
+ - [2x Weller Zero Smog EL - Solder fume extraction](https://www.weller-tools.com/professional/EUR/de/Filtertechnik/Loetrauch/Flaechenabsaugung/1-2+Arbeitsplaetze/Zero+Smog+EL+Kit+1)
-- [RND-560 - Hot air soldering device](http://www.rnd-electronics.com)
+ - [RND-560 - Hot air soldering device](http://www.rnd-electronics.com)
-- [Weller DSX 80 - Desoldering unit](https://www.weller-tools.com/professional/EUR/de/Professional/Loettechnik/Loetkolben/Entloetkolben/DSX+80)
+ - [Weller DSX 80 - Desoldering unit](https://www.weller-tools.com/professional/EUR/de/Professional/Loettechnik/Loetkolben/Entloetkolben/DSX+80)
-- [2x R&S NGE100 - Laboratory power supply unit](https://www.rohde-schwarz.com/de/produkte/messtechnik/dc-netzgeraete/rs-nge100-netzgeraeteserie_63493-387267.html)
+ - [2x R&S NGE100 - Laboratory power supply unit](https://www.rohde-schwarz.com/de/produkte/messtechnik/dc-netzgeraete/rs-nge100-netzgeraeteserie_63493-387267.html)
+
+=== "Operating Instructions"
+
+ --8<--
+ sicherheit/ba-loeten.md
+ sicherheit/ba-gefahrstoffe.md
+ --8<--
+
+=== "Work Material"
+
+ - [Grundlagen Löten - YouTube-Playlist](https://www.youtube.com/watch?v=Arj34uQoLdM&list=PLXod-KSvITpIYLLHx45ajUlle3YH2IGN9)
+ - PDF-Comic [Löten ist einfach](https://mightyohm.com/files/soldercomic/translations/DE_SolderComic.pdf) von von Mitch Altman, Andie Nordgen, Jeff Keyzer, Alexander Bodora und Richard Meinsen
+
+ !!! info "[To the work folder "Soldering" with further documents](https://ruhr-uni-bochum.sciebo.de/s/VuFDh7eChe6z1v7?path=%2FDigitallabor%2FL%C3%B6ten)"
+
+ In this folder you will find other documents for soldering such as instruction manuals, operating instructions, templates and patterns, tutorials and other things to make your work easier.
+ As always: We are stronger together - we are happy about every [contribution to the pool of knowledge and experience](feedback.en.md).
## Measuring and Checking
@@ -108,20 +156,40 @@ To support the manufacturing process, to check their functionality or to find er
-**Our devices (*links lead to the website of the manufacturer*):**
-
-- [AMPROBE 520 - Multimeter](https://www.amprobe.com/product/am-520/) and various other multimeters
-- [Rhode&Schwarz RTB2002 - Oscilloscope](https://www.rohde-schwarz.com/de/produkte/messtechnik/oszilloskope/rs-rtb2000-oszilloskop_63493-266306.html)
-- [RND lab - digital wireless microscope](http://www.rnd-electronics.com)
-- Thermal imaging camera Fluke Ti401 Pro
-- PH meter PEAKTECH 5307
-- PEAKTECH 9035 Energy cost measuring device
-- PEAKTECH 5200 Moisture meter
-- UT 333BT Humidity meter for air humidity
-- TFA 30505302 Thermo-Hygrometer
-- Precision scale
-- Digital wall scanner Testboy TV 700
-- Microscopes (2x USB, 1x optical), Endoscopes
+=== "Our Devices"
+
+ *links lead to the website of the manufacturer*
+
+ - [AMPROBE 520 - Multimeter](https://www.amprobe.com/product/am-520/) and various other multimeters
+ - [Rhode&Schwarz RTB2002 - Oscilloscope](https://www.rohde-schwarz.com/de/produkte/messtechnik/oszilloskope/rs-rtb2000-oszilloskop_63493-266306.html)
+ - [RND lab - digital wireless microscope](http://www.rnd-electronics.com)
+ - Thermal imaging camera Fluke Ti401 Pro
+ - PH meter PEAKTECH 5307
+ - PEAKTECH 9035 Energy cost measuring device
+ - PEAKTECH 5200 Moisture meter
+ - UT 333BT Humidity meter for air humidity
+ - TFA 30505302 Thermo-Hygrometer
+ - Precision scale
+ - Digital wall scanner Testboy TV 700
+ - Microscopes (2x USB, 1x optical), Endoscopes
+
+=== "Operating Instructions"
+
+ --8<--
+ sicherheit/ba-digitallabor.md
+ --8<--
+
+=== "Work Material"
+
+ - [Multimeter - Wikipedia](https://de.wikipedia.org/wiki/Multimeter)
+ - [Oszilloskop - Wikipedia](https://de.wikipedia.org/wiki/Oszilloskop)
+ - [Multimeter-Tutorial - Youtube](https://www.youtube.com/watch?v=_ojBTpmCVJ0&list=PLcjOhSiDq35dRdtlHF_yxtqDqVXqxclI6&index=2)
+ - [Oszilloskop-Einführung - Youtube](https://www.youtube.com/watch?v=aRun6Ku-mno)
+
+ !!! info "[To the "Measuring and Testing" work folder with additional documents](https://ruhr-uni-bochum.sciebo.de/s/VuFDh7eChe6z1v7?path=%2FDigitallabor%2FMessen-und-Pr%C3%BCfen)"
+
+ In this folder you will find additional documents for measuring such as operating instructions, operating instructions, templates and samples, tutorials and other things to make your work easier.
+ As always: We are stronger together - we are happy about every [contribution to the pool of knowledge and experience](feedback.en.md).
## Manufacture Circuit Boards
@@ -135,10 +203,37 @@ In addition it is possible to use the [desktop milling machine](kunststoffwerkst
Although the aim of the device is the rapid prototyping of printed circuit boards, our experience to date shows that the machine is quite temperamental and that printing with liquid ink and the further process steps certainly carry some potential for error. Unfortunately, this is sometimes the case with new types of equipment and processes. We therefore do not currently recommend relying on the device for time-critical applications and see it more as an interesting research device and certainly as an alternative application, for example in the high-precision dispensing of liquids.
-**Our devices (*links lead to the manufacturer's website*):**
+=== "Our Devices"
+
+ *links lead to the manufacturer's website*
-- [Voltera V-One](https://www.voltera.io/store/v-one)
-- [Roland SRM-20 Desktop CNC Milling Machine](https://www.rolanddg.eu/de/produkte/3d/srm-20-small-milling-machine) (Workspace 203,2 x 152,4 x 60,5mm)
+ - [Voltera V-One](https://www.voltera.io/store/v-one)
+ - [Roland SRM-20 Desktop CNC Milling Machine](https://www.rolanddg.eu/de/produkte/3d/srm-20-small-milling-machine) (Workspace 203,2 x 152,4 x 60,5mm)
+
+=== "Operating Instructions"
+
+ --8<--
+ sicherheit/ba-platinendrucker.md
+ sicherheit/ba-gefahrstoffe.md
+ --8<--
+
+=== "Work Material"
+
+ - [Platinendrucker Voltera V-One Support / Manual](https://support.voltera.io/)
+ - [Workshop "Platinendrucker"](#ws-platinendrucker)
+ - For platinum printing, data in [Gerber format - Wikipedia](https://en.wikipedia.org/wiki/Gerber_format) is required, which can be generated with all common tools for designing circuit boards ([KiCad](https://www.kicad.org) is an open source software for circuit board design).
+ - For consumable material see ["Consumables" in Voltera-Store](https://www.voltera.io/store/consumables)
+
+ !!! info "[To the working folder "PCB Printer" with further documents](https://ruhr-uni-bochum.sciebo.de/s/VuFDh7eChe6z1v7?path=%2FDigitallabor%2FPlatinen-Drucker%20Voltera%20V-One)"
+
+ In this folder you will find other documents related to the PCB Printer, such as user manuals, operating instructions, templates and samples, tutorials and other things that will make your work easier.
+ As always: We are stronger together - we are happy about every [contribution to the pool of knowledge and experience](feedback.en.md).
+
+ !!! info "[To the "Desktop CNC Milling" work folder with additional documentation](https://ruhr-uni-bochum.sciebo.de/apps/files/?dir=/RUB-Makerspace%20%C3%96FFENTLICH/Kunststoffwerkstatt/Desktop-CNC_Roland_SRM-20&fileid=997380343)"
+
+ In this folder you will find additional documentation for our desktop CNC mills such as instruction manuals, operating instructions, templates and samples, tutorials and other things to make your work easier.
+ As always: We are stronger together - we are happy about every [contribution to the pool of knowledge and experience](feedback.en.md).
+
## Pick and Place - Assembling Circuit Bards
In the digital lab it will soon be possible to assamble circuit boards automatically. The required Pick and Place Machine for this process is being purchased right now. Attachments for applying solder paste on circuit boards via patterns are already available and we are currently considering to purchase or build a manually operated placement tool for components.
@@ -150,27 +245,30 @@ In the digital lab it will soon be possible to assamble circuit boards automatic
## Reflow Oven
-In our small, digitally operated oven circuit boards can be soldered with the +++reflow-soldering method. During this process the different components are not being soldered indivually with common solder but they are being soldered all at once with soldering paste. The soldering paste is applied to the circuit board as well as the remaining components and then - completely equiped - it will be soldered in the oven.
+In our small, digitally operated oven circuit boards can be soldered with the [reflow-soldering method](https://en.wikipedia.org/wiki/Reflow_soldering). During this process the different components are not being soldered indivually with common solder but they are being soldered all at once with soldering paste. The soldering paste is applied to the circuit board as well as the remaining components and then - completely equiped - it will be soldered in the oven.
The reflow oven can also be usefull to repair circuit boards, in case there is the assumption that the problem is caused by broken soldering points.
-**Our devices (*links lead to the manufacter's website*):**
+
+
+**Our Devices (*links lead to the manufacter's website*):**
- [Beta Layout Reflow Kit V3 Pro](https://de.beta-layout.com/elektronik-shop/reflow-loeten/10590-reflow-kit-v3-pro/)
-##Borrowing and Class/Group sets
-Besides the general possibility to +++borrow equipment from the digital lab we also have some special offers.
+## Borrowing and Class/Group sets
+Besides the general possibility to [borrow](ausleihe.en.md) equipment from the digital lab we also have some special offers.
-On the one hand we can provide members of Ruhr University Bochum with mobile data hotspot "+++Freifunk-in-a-Box" with a flat rate.
+On the one hand we can provide members of Ruhr University Bochum with mobile data hotspot ["Freifunk-in-a-Box"](https://freifunk.net/en/) with a flat rate.
On the other hand we offer various sets of hardware for classes or groups to work with. On demand we can also offer safety instructions for teachers or workshop leaders: "train the trainers".
-++++BILD FEHLT
+
+
**Our class and group sets (*links lead to the manufacter's website*):**
-- Mobile Soldering: 11x +++Soldering irons "Pinecil", fume extractors and various accessories in wheeled box.
-- Laptops: Our at +++Computer and IT listed laptops with solid case on wheels, in witch they can also be charged.
-- +++Calliope Mini: 1x class set primary school: 20 pieces. Can be expanded with further components for the needs of other/higher classes on demand.
-- Adafruit Circuit Playground Express: 10 Pieces including USB-Cables and further components on demand. For 10-30 persons.
+- Mobile Soldering: 11x [Soldering irons "Pinecil"](https://pine64.com/product/pinecil-smart-mini-portable-soldering-iron/), fume extractors and various accessories in wheeled box.
+- Laptops: Our at [Computer and IT](#it) listed laptops with solid case on wheels, in witch they can also be charged.
+- [Calliope Mini](https://calliope.cc/): 1x [class set primary school](https://cornelsen-experimenta.de/shop/de/Grundschule/Coding%20-%20Robotik/Microcontroller%20Calliope%20mini/21820-Calliope+mini+Klassensatz+Grundschule.html): 20 pieces. Can be expanded with further components for the needs of other/higher classes on demand.
+- [Adafruit Circuit Playground Express](https://learn.adafruit.com/adafruit-circuit-playground-express/): 10 Pieces including USB-Cables and further components on demand. For 10-30 persons.
- On demand further sets can be compiled individually as required.
## Material, Parts and Supplies
@@ -189,55 +287,123 @@ The digital lab usually keeps needed materials from computer and electrical engi
## Workshops
-Here you can find some of our workshops for groups that we offer on demand. We also have other workshopconcepts e.g. about +++CAD or about soldering in a software that we will provide little by little on this website as an open educational ressource. Furthermore you can contact us if you want a new workshop concept developed by us as a service or if you want to collaborate in another form of cooperation.
+Here you can find some of our workshops for groups that we offer on demand. We also have other workshopconcepts e.g. about [CAD](https://en.wikipedia.org/wiki/Computer-aided_design) or about soldering in a software that we will provide little by little on this website as an [open educational ressource](https://en.wikipedia.org/wiki/Open_educational_resources). Furthermore you can [contact us](kontakt.en.md) if you want a new workshop concept developed by us as a [service](dienstleistungen.en.md) or if you want to collaborate in another form of [cooperation](zielgruppen.en.md).
+
+### Building Air Data Sensors
+
+=== "About the Workshop"
+
+ During this workshop, which is aboult half a day long, people can build their own air data senor based on the project [Sensor.community](https://sensor.community) and take it home with them.
+ The workshop can be performed [on demand](kontakt.en.md) for groups up to 20 people. There are costs for the hardware and, depending on the [target group](zielgruppen.en.md), also for the [teaching itself](dienstleistungen.en.md).
+
+=== "Workshop Documents"
+
+ <iframe src="../slides/ws-luftdaten" width="100%" height="430px" style="border: 0.5px solid #003561"></iframe>
+
+ :material-fullscreen:
+ <small><a href="../slides/ws-luftdaten" target="_blank">Präsentation in neuem Tab groß anzeigen</a></small>
+ :material-printer:
+ <small><a href="../slides/ws-luftdaten/?print-pdf" target="_blank">Druck-Ansicht, z.B. für PDF-Export (nur in Chromium-Browsern, ohne externe Inhalte)</a></small>
+ :material-file-edit:
+ <small><a href="https://git.noc.rub.de/makerspace/homepage/-/blob/main/slides/ws-luftdaten/slides.md" target="_blank">Quelldatei "slides.md" zu den Folien auf Gitlab</a></small>
+
+ --8<--
+ howto-slides.en.md
+ --8<--
+
+### Basics Microcontroller
+
+=== "About the Workshop"
+
+ An introduction in (micro-) electronics and programming based on [Arduino](https://arduino.cc) and similar educational systems for the development of hard- and software.
+
+ The workshop can be performed [on demand](kontakt.en.md) for groups up to 20 people. There are costs for the hardware and, depending on the [target group](zielgruppen.en.md), also for the [teaching itself](dienstleistungen.en.md).
+
+=== "Workshop Documents"
+
+ <iframe src="../slides/ws-microcontroller" width="100%" height="430px" style="border: 0.5px solid #003561"></iframe>
+
+ :material-fullscreen:
+ <small><a href="../slides/ws-microcontroller" target="_blank">Präsentation in neuem Tab groß anzeigen</a></small>
+ :material-printer:
+ <small><a href="../slides/ws-microcontroller/?print-pdf" target="_blank">Druck-Ansicht, z.B. für PDF-Export (nur in Chromium-Browsern, ohne externe Inhalte)</a></small>
+ :material-file-edit:
+ <small><a href="https://git.noc.rub.de/makerspace/website/-/blob/main/slides/ws-microcontroller/slides.md" target="_blank">Quelldatei "slides.md" zu den Folien auf Gitlab</a></small>
+
+ --8<--
+ howto-slides.en.md
+ --8<--
+
+## Sensor Data
+
+We installed (environmental) sensors on different locations of the makerspace. The most of them are air data sensors based on [sensor.community](https://sensor.community) (particle pollution, humidity, temperature)
+
+!!! imoprtant "About the Quality of the Data"
+The collected data is recorded automatically. The data are unadjusted based on diy solutions with low priced components - the data is not inspected. The displayed data about temperature for example are generally higher than the actual ambient temperature, which is caused by the lost heat of the electronic components. Furthermore, the sensors are not activated permanently, they maybe temporary lose the connection or get accidentally unplugged. Please keep this in mind while you view the data.
+
+#### Design Lab (Tea Kitchen-Corner)
+
+??? info "Temperature and Humidity"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-13861846&var-type=DHT22&var-query0=sensors&orgId=1&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
+
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-13861846&var-type=DHT22&var-query0=sensors&orgId=1)
+
+??? info "Particle Pollution"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-13861846&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
+
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-13861846)
+
+In the design lab there is also a multifunctional sensor (particles, CO, temperature, humidity, luminousity, level of sound). The collected data can be found [here based on the Arduino IoT-Cloud](https://create.arduino.cc/iot/dashboards/507eadcf-834f-43e2-840b-7aa5938c01a0). Unfortunately the access is only given if you create an account and you have also been invited by us.
+
+#### Wood Workshop
+
+??? info "Temperature and Humidity"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-3532227&var-type=DHT22&var-query0=sensors&orgId=1&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
+
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-3532227&var-type=DHT22&var-query0=sensors&orgId=1)
+
+??? info "Particle Pollution"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-3532227&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
+
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-3532227)
+
+#### Metal Workshop (welding corner)
+
+??? info "Temperature and Humidity"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-3502148&var-type=DHT22&var-query0=sensors&orgId=1&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
+
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-3502148&var-type=DHT22&var-query0=sensors&orgId=1)
+
+??? info "Particle Pollution"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-3502148&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
-##Building air data seonsors
-+++Fancy Formatierung fehlt + "Unterlagen zum Workshop"+++
-About the workshop
-During this workshop, which is aboult half a day long, people can build their own air data senor based on the project +++Sensor.Community and take it homw with them.
-The workshop can be performed on +++demand for groups up to 20 people. For the used hardware charges are to be collected as well as for the +++pefromance of the workshop - depending on the +++target group.
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-3502148)
-+++Kasten: Info+++
-Information about operating with the slides
-- Navigate with the blue arrow on the bottom right or via the menu on the bottom left.
-- There are horizontal as well as vertical slides. You can see where to go by paying attention to the blue arrows or in the slide overview.
-- On the keyboard: "Escape" for slide overview, "f" for fullscreen, "s" for "speaker notes", arrows for navigation, "?" for help etc.
-- On mobile hardware: Navigation possible via swiping
-- If the first slide looks "shifted" (depending on your browser), please just navigate to the next slide and back again or simply reboot the site. That will solve the problem.
-- Printing (Paper or PDF) will work best via the link "print view" underneath the slides.
-Important: The print view only works in chomium browsers correctly (e.g. Chrome, Chromium, Edge, Brave, etc.)
+#### Platics Workshop
-##Basics Microcontroller
-+++Fancy Formatierung fehlt + "Unterlagen zum Workshop"+++
-About the Workshop
-An introduction in (micro-) electronics and programming based on +++arduino and similar educational systems for the development of hard- and software.
+??? info "Temperature and Humidity"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-651719&var-type=DHT22&var-query0=sensors&orgId=1&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
-The workshop can be performed on +++demand for groups up to 20 people. For the used hardware charges are to be collected as well as for the +++pefromance of the workshop - depending on the +++target group.
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-651719&var-type=DHT22&var-query0=sensors&orgId=1)
-#Sensor data
-We installed (environmental) sensors on different locations of the makerspace. The most of them are air data sensors based on +++sensor.community (particle pollution, humidity, temperature)
+??? info "Particle Pollution"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-651719&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
-+++Infokasten+++
-About the quality of the data
-The collected data is recorded automatically. The data are unadjusted based on diy solutions with low priced components - the data is not inspected. The displayed data about temperature for example are genrally higher than the actual ambient temperature, which is caused by the lost heat of the electronic components. Furthermore the sensors are not activated permanently, they maybe temporary lose the connection or get accidentally unplugged. Please keep this in mind while you view the data.
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-651719)
-+++Ab hier Luftdaten+++
-Design Lab (small kitchen)
-++2 Infokästen+
+#### Outside Area - Courtyard
-In the design lab there is also a multifunctional sensor (particles, CO, temperature, humidity, luminousity, level of sound). The collected data can be found +++here based on the Arduino IoT-Cloud. Unfortunately the acces is only given if you create an account and you have also been invited by us.
+??? info "Temperature and Humidity"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/q87EBfWGk/temperature-humidity-pressure?var-chipID=esp8266-5431914&var-type=DHT22&var-query0=sensors&orgId=1&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
-Wood Workshop
-+++2 Infokästen+++
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-5431914&var-type=DHT22&var-query0=sensors&orgId=1)
-Metal Workshop (welding corner)
-+++2 Infokästen+++
+??? info "Particle Pollution"
+ <iframe src="https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-5431914&kiosk=tv" width="100%" height="430px" frameBorder="0"></iframe>
-Platics Workshop
-+++2Infok.+++
+ [Link to this Dashboard](https://api-rrd.madavi.de/grafana/d/GUaL5aZMz/pm-sensors?orgId=1&theme=light&var-chipID=esp8266-5431914)
-Outside area - courtyard
+## Maybe in the Future...
-##Maybe in the Future...
-Do you have [feedback](https://makerspace.io.noc.ruhr-uni-bochum.de/homepage/en/feedback/) for the topics listed here? Do you want to support the development of the things mentioned here? Are you a manufacturer for THE device par excellence in one of the areas mentioned and interested in a [test or demo site](https://makerspace.io.noc.ruhr-uni-bochum.de/homepage/en/unterstuetzung/#demozentrum)? Do you have other thoughts on the topic? [Talk to us](https://makerspace.io.noc.ruhr-uni-bochum.de/homepage/en/kontakt/)!
+!!! question "Do you have [feedback](https://makerspace.io.noc.ruhr-uni-bochum.de/homepage/en/feedback/) for the topics listed here? Do you want to support the development of the things mentioned here? Are you a manufacturer for THE device par excellence in one of the areas mentioned and interested in a [test or demo site](https://makerspace.io.noc.ruhr-uni-bochum.de/homepage/en/unterstuetzung/#demozentrum)? Do you have other thoughts on the topic? [Talk to us](https://makerspace.io.noc.ruhr-uni-bochum.de/homepage/en/kontakt/)!"
diff --git a/docs/digitallabor.md b/docs/digitallabor.md
index 4989e6fcf..77bf0d999 100644
--- a/docs/digitallabor.md
+++ b/docs/digitallabor.md
@@ -26,6 +26,10 @@ Für die Nutzung des Digitallabors wird die Teilnahme an der [Allgemeinen Sicher
:material-file-edit:
<small><a href="https://git.noc.rub.de/makerspace/homepage/-/blob/main/slides/unterweisung-digitallabor/slides.md" target="_blank">Quelldatei "slides.md" zu den Folien auf Gitlab</a></small>
+ --8<--
+ howto-slides.md
+ --8<--
+
=== "Betriebsanweisung"
--8<--
@@ -184,7 +188,7 @@ Um den Fertigungsprozess zu unterstützen, ihre Funktionalität zu überprüfen
!!! info "[Zum Arbeitsordner "Messen und Prüfen" mit weiteren Unterlagen](https://ruhr-uni-bochum.sciebo.de/s/VuFDh7eChe6z1v7?path=%2FDigitallabor%2FMessen-und-Pr%C3%BCfen)"
- In diesem Ordner findest Du weitere Unterlagen zum Löten wie z.B. Bedienungsanleitungen, Betriebsanweisungen, Vorlagen und Muster, Tutorials und andere Dinge, die Dir die Arbeit erleichtern sollen.
+ In diesem Ordner findest Du weitere Unterlagen zum Messen wie z.B. Bedienungsanleitungen, Betriebsanweisungen, Vorlagen und Muster, Tutorials und andere Dinge, die Dir die Arbeit erleichtern sollen.
Wie immer gilt: Gemeinsam sind wir stärker - wir freuen uns über jeden [Beitrag zur Wissens- und Erfahrungssamlung!](feedback.md)
diff --git a/docs/howto-slides.en.md b/docs/howto-slides.en.md
new file mode 100644
index 000000000..6f13a0f29
--- /dev/null
+++ b/docs/howto-slides.en.md
@@ -0,0 +1,8 @@
+??? info "How to Navigate the Presentation Slides"
+
+ - Navigate with the blue arrows on the bottom right or via the menu on the bottom left.
+ - There are horizontal and vertical slides. You can see which way to go by the blue arrows or in the slide overview.
+ - On the keyboard: "Escape" for slide overview, "f" for fullscreen; "s" for "Speaker Notes", arrow keys for navigation, and much more. - Overview of all shortcuts via keystroke "?" for help.
+ - On mobile devices: Navigation via swipe gestures possible.
+ - If the first slide looks " out of place " (can happen depending on your browser), simply navigate to the next slide and then back again or reload the page. This will fix the problem.
+ - Print (paper or PDF) best via the link "Print View" below the slide set. Important: The print view only works correctly in Chromium browsers (for example Chrome, Chromium, Edge, Brave, etc.).
\ No newline at end of file
diff --git a/docs/howto-slides.md b/docs/howto-slides.md
index e5324debd..37418543e 100644
--- a/docs/howto-slides.md
+++ b/docs/howto-slides.md
@@ -2,7 +2,7 @@
- Navigiere mit den blauen Pfeilen rechts unten oder über das Menü links unten.
- Es gibt horizontale und vertikale Folien. Wo es lang geht, erkennst Du an den blauen Pfeilen oder in der Folienübersicht.
- - Auf der Tastatur: "Escape" für Folienübersicht, "f" für Fullscreen; "s" für "Speaker Notes", Pfeiltasten zur Navigation, u.v.m. - Übersicht aller Shortcuts per Tastendruck "?" für Hilfe).
+ - Auf der Tastatur: "Escape" für Folienübersicht, "f" für Fullscreen; "s" für "Speaker Notes", Pfeiltasten zur Navigation, u.v.m. - Übersicht aller Shortcuts per Tastendruck "?" für Hilfe.
- Auf Mobilgeräten: Navigation per Swipe-Gesten möglich.
- Sollte die erste Folie "verrutscht" aussehen (kann je nach Browser evtl. passieren), navigiere einfach kurz zur nächsten Folie und dann wieder zurück oder lade die Seite neu. Das behebt das Problem.
- Ausdrucken (Papier oder PDF) am besten über den Link "Druck-Ansicht" unter dem Foliensatz. Wichtig: Die Druck-Ansicht funktioniert nur in Chromium-Browsern korrekt (zum Beispiel Chrome, Chromium, Edge, Brave, etc.)
\ No newline at end of file
--
GitLab