diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java index aabf5b00aaf12efb6d97236e8214c7a763f304c1..806ad1d8c03f8d214b6b4744454269c3a7b5b951 100644 --- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java +++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java @@ -297,34 +297,33 @@ public class OpenblocksFrame extends JFrame simulateMenuItem.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulation.tooltip")); simulateMenuItem.setVisible(false); //hide on startUp - //SIMULATOR HELP + //HELP //************** - ImageIcon simulatorHelpButtonIcon = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/helpSim1.png"))); - ImageIcon simulatorHelpButtonIconHovered = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/helpSim2.png"))); - ImageIcon simulatorHelpButtonIconPressed = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/helpSim3.png"))); - ButtonMouseListener simulatorHelpButtonMouseListener = new ButtonMouseListener(simulatorHelpButtonIcon, simulatorHelpButtonIconHovered, simulatorHelpButtonIconPressed); + ImageIcon helpButtonIcon = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/helpSim1.png"))); + ImageIcon helpButtonIconHovered = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/helpSim2.png"))); + ImageIcon helpButtonIconPressed = new ImageIcon(getToolkit().getImage(GUI.class.getResource("/com/ardublock/block/helpSim3.png"))); + ButtonMouseListener helpButtonMouseListener = new ButtonMouseListener(helpButtonIcon, helpButtonIconHovered, helpButtonIconPressed); ActionListener simulatorHelpButtonListener = new SimulatorHelpButtonListener(this); + ActionListener helpButtonListener = new HelpButtonListener(this); - JButton simulatorHelpButton = new JButton(simulatorHelpButtonIcon); - simulatorHelpButton.addMouseListener(simulatorHelpButtonMouseListener); - simulatorHelpButton.setMargin(new Insets(0, 0, 0, 0)); - simulatorHelpButton.setContentAreaFilled(false); - simulatorHelpButton.setBorderPainted(false); + JButton helpButton = new JButton(helpButtonIcon); + helpButton.addMouseListener(helpButtonMouseListener); + helpButton.setMargin(new Insets(0, 0, 0, 0)); + helpButton.setContentAreaFilled(false); + helpButton.setBorderPainted(false); //JButton simulatorHelpButton = new JButton(uiMessageBundle.getString("ardublock.ui.simulatorHelp")); - simulatorHelpButton.addActionListener(simulatorHelpButtonListener); - simulatorHelpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulatorHelp.tooltip")); - simulatorHelpButton.setVisible(false); //hide on startUp + //helpButton.addActionListener(simulatorHelpButtonListener); + //helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulatorHelp.tooltip")); + //helpButton.setVisible(false); //hide on startUp + helpButton.addActionListener(helpButtonListener); + helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip")); JMenuItem simulatorHelpMenuItem = new JMenuItem(uiMessageBundle.getString("ardublock.ui.simulatorHelp")); simulatorHelpMenuItem.addActionListener(simulatorHelpButtonListener); simulatorHelpMenuItem.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulatorHelp.tooltip")); //simulatorHelpMenuItem.setVisible(false); //hide on startUp - //HELP - //************** - ActionListener helpButtonListener = new HelpButtonListener(this); - JMenuItem helpMenuItem = new JMenuItem(uiMessageBundle.getString("ardublock.ui.help")); helpMenuItem.addActionListener(helpButtonListener); helpMenuItem.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip")); @@ -530,7 +529,10 @@ public class OpenblocksFrame extends JFrame simulateButton.setVisible(false); simulateMenuItem.setVisible(false); simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke); - simulatorHelpButton.setVisible(false); + //helpButton.setVisible(false); + helpButton.removeActionListener(simulatorHelpButtonListener); + helpButton.addActionListener(helpButtonListener); + helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip")); serialMonitorButton.setVisible(true); serialPlotterButton.setVisible(true); modeBasicButtonMouseListener.setSelected(true); @@ -597,7 +599,10 @@ public class OpenblocksFrame extends JFrame simulateButton.setVisible(false); simulateMenuItem.setVisible(false); simulateMenuItem.unregisterKeyboardAction(ctrluKeyStroke); - simulatorHelpButton.setVisible(false); + //helpButton.setVisible(false); + helpButton.removeActionListener(simulatorHelpButtonListener); + helpButton.addActionListener(helpButtonListener); + helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.help.tooltip")); serialMonitorButton.setVisible(true); serialPlotterButton.setVisible(true); modeBasicButtonMouseListener.setSelected(false); @@ -663,7 +668,10 @@ public class OpenblocksFrame extends JFrame simulateButton.setVisible(true); simulateMenuItem.setVisible(true); simulateMenuItem.registerKeyboardAction(simulateButtonListener, ctrluKeyStroke, JComponent.WHEN_IN_FOCUSED_WINDOW); - simulatorHelpButton.setVisible(true); + //helpButton.setVisible(true); + helpButton.removeActionListener(helpButtonListener); + helpButton.addActionListener(simulatorHelpButtonListener); + helpButton.setToolTipText(uiMessageBundle.getString("ardublock.ui.simulatorHelp.tooltip")); serialMonitorButton.setVisible(false); serialPlotterButton.setVisible(false); modeBasicButtonMouseListener.setSelected(false); @@ -858,10 +866,10 @@ public class OpenblocksFrame extends JFrame buttonPanel.add(saveButton); //topPanel.add(saveAsButton); buttonPanel.add(Box.createRigidArea(new Dimension(15, 0))); //std value 30,0 - buttonPanel.add(simulatorHelpButton); + buttonPanel.add(helpButton); + buttonPanel.add(Box.createRigidArea(new Dimension(30, 0))); //std value 30,0 buttonPanel.add(serialMonitorButton); buttonPanel.add(serialPlotterButton); - //buttonPanel.add(Box.createRigidArea(new Dimension(30, 0))); //std value 30,0 bottomPanel.add(modeBasicButton); bottomPanel.add(modeProButton); diff --git a/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java b/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java index 0ffdbc05b1fe61a23e363aa6f0a261551e6a6394..8ceecd09110c0a7307d6e7dd3f3a0217218c5ce8 100644 --- a/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java +++ b/src/main/java/com/ardublock/ui/listener/HelpButtonListener.java @@ -42,7 +42,7 @@ public class HelpButtonListener implements ActionListener String cssResource ="/com/ardublock/reference/_seitenformatierung.css"; String helpResource ="/com/ardublock/reference/help.html"; String logoResource ="/com/ardublock/reference/_Logo_LGI_page.png"; - String imageResource ="/com/ardublock/reference/abs.png"; + String imageResource ="/com/ardublock/reference/arduBlockHelp2.png"; String tempPath = ""; //get current .jar path for temp files @@ -123,7 +123,7 @@ public class HelpButtonListener implements ActionListener try { InputStream input = getClass().getResourceAsStream(imageResource); if(input != null) { - imageFile = new File(tempPath +"/help.png"); + imageFile = new File(tempPath +"/arduBlockHelp.png"); OutputStream out = new FileOutputStream(imageFile); int read; byte[] bytes = new byte[10000]; diff --git a/src/main/webapp/com/ardublock/reference/ArduBlockHelp.png b/src/main/webapp/com/ardublock/reference/ArduBlockHelp.png new file mode 100644 index 0000000000000000000000000000000000000000..b4895a0eae084b93bf3f33541f1037e4e5d0d34e Binary files /dev/null and b/src/main/webapp/com/ardublock/reference/ArduBlockHelp.png differ diff --git a/src/main/webapp/com/ardublock/reference/abs-beispiel.png b/src/main/webapp/com/ardublock/reference/abs-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/abs-beispiel.png rename to src/main/webapp/com/ardublock/reference/abs-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/abs.html b/src/main/webapp/com/ardublock/reference/abs.html index 35ebfb876e53f6c0915dd3fd77acf0d6da93ffaa..bc7f77bf72c12192a1b4bf87915f6af457e4e6e6 100644 --- a/src/main/webapp/com/ardublock/reference/abs.html +++ b/src/main/webapp/com/ardublock/reference/abs.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -44,7 +44,7 @@ Er ist sozusagen der "Abstand" der Zahl zur 0. Wenn also eine Variable <code>var</code> in den <code>abs</code> Block eingesetzt wird, die den Wert -200 hat, dann ist der Betrag der Variable, die der <code>abs</code> Block ausgeben wird 200. - Negative Vorzeichen werden also zu positiven und positive Vorzeichen bleiben positiv. + Negative Vorzeichen werden also zu Positiven und positive Vorzeichen bleiben positiv. </p> <h2 class="unterueberschrift" id="code">Code</h2> <p> @@ -55,7 +55,7 @@ <br><br> In ArduBlock: <br><br> - <img src="abs-beispiel.png" alt="beispiel-absolut"> + <img src="abs-beispiel-1.png" alt="beispiel-absolut"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/addition-beispiel.png b/src/main/webapp/com/ardublock/reference/addition-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/addition-beispiel.png rename to src/main/webapp/com/ardublock/reference/addition-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/addition.html b/src/main/webapp/com/ardublock/reference/addition.html index 41a95004fa4fca4d6516d7bcdfa3b7ed1f839cf1..61c17cf499389068b1305a6ceeb9c9966646f477 100644 --- a/src/main/webapp/com/ardublock/reference/addition.html +++ b/src/main/webapp/com/ardublock/reference/addition.html @@ -8,7 +8,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -60,7 +60,7 @@ <br><br> In ArduBlock: <br><br> - <img src="addition-beispiel.png" alt="beispiel-addition"> + <img src="addition-beispiel-1.png" alt="beispiel-addition"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/and-beispiel.png b/src/main/webapp/com/ardublock/reference/and-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/and-beispiel.png rename to src/main/webapp/com/ardublock/reference/and-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/and.html b/src/main/webapp/com/ardublock/reference/and.html index 4ce3429734a878ba54cdc1e479dfa29f7495cac0..6a2aa6c7caa7897a5ac104a80675c7657f43a69f 100644 --- a/src/main/webapp/com/ardublock/reference/and.html +++ b/src/main/webapp/com/ardublock/reference/and.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -46,7 +46,7 @@ Diese haben dieselbe Bedeutung. Ein Verwenden von digitalen Variablen oder digitalen Eingängen des Arduinos ist natürlich ebenso möglich. <br><br> - <img src="and-beispiel.png" alt="Beispiel zum und Block" style="border:grey solid 2px;"> + <img src="and-beispiel-1.png" alt="Beispiel zum und Block" style="border:grey solid 2px;"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/arduBlockHelp.png b/src/main/webapp/com/ardublock/reference/arduBlockHelp.png new file mode 100644 index 0000000000000000000000000000000000000000..9fbb37ea6b746601ed2ce9954744bdfbe64865f7 Binary files /dev/null and b/src/main/webapp/com/ardublock/reference/arduBlockHelp.png differ diff --git a/src/main/webapp/com/ardublock/reference/arduBlockHelp2.png b/src/main/webapp/com/ardublock/reference/arduBlockHelp2.png new file mode 100644 index 0000000000000000000000000000000000000000..6755c070ffef404efac5e59e94fe3a9a59139200 Binary files /dev/null and b/src/main/webapp/com/ardublock/reference/arduBlockHelp2.png differ diff --git a/src/main/webapp/com/ardublock/reference/code_comment.html b/src/main/webapp/com/ardublock/reference/code_comment.html index cab7496c6661b0512c2dd1b9ec834f39080ae4c3..d8d073da8888187e7300df516b14ac07a589fd47 100644 --- a/src/main/webapp/com/ardublock/reference/code_comment.html +++ b/src/main/webapp/com/ardublock/reference/code_comment.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/code_comment_head.html b/src/main/webapp/com/ardublock/reference/code_comment_head.html index 19ffa05717c07c497c1d8219cc1196712464439d..d9f00a3aea30d81e596e050bfd8ca2adb90ce3a3 100644 --- a/src/main/webapp/com/ardublock/reference/code_comment_head.html +++ b/src/main/webapp/com/ardublock/reference/code_comment_head.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/constrain-beispiel.png b/src/main/webapp/com/ardublock/reference/constrain-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/constrain-beispiel.png rename to src/main/webapp/com/ardublock/reference/constrain-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/constrain.html b/src/main/webapp/com/ardublock/reference/constrain.html index 84ab126abb6a15fe8059a84060ab7a0e5463e926..2ba165d46491f313ebd7c0ec18101bee775d7272 100644 --- a/src/main/webapp/com/ardublock/reference/constrain.html +++ b/src/main/webapp/com/ardublock/reference/constrain.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -47,7 +47,7 @@ <p> In den <code>Wert</code> Parameter wird die entsprechende Variable eingesetzt, die eingeschränkt werden soll. Hier kann man auch analoge Eingänge einsetzen. - Auch fest programmierte Werte können eingesetzt werden, was allerdings nicht eine sehr sinnvolle Lösung wäre. + Auch fest programmierte Werte können eingesetzt werden, was allerdings nicht eine sehr sinnvolle Lösung wäre, da diese nicht beschränkt werden muss. </p> <h2 class="unterueberschrift" id="unterer_oberer">unterer/ oberer</h2> <p> @@ -63,7 +63,7 @@ <br><br> In ArduBlock: <br><br> - <img src="constrain-beispiel.png" alt="beispiel-einschränken"> + <img src="constrain-beispiel-1.png" alt="beispiel-einschränken"> </p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/delay-beispiel.png b/src/main/webapp/com/ardublock/reference/delay-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/delay-beispiel.png rename to src/main/webapp/com/ardublock/reference/delay-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/delay.html b/src/main/webapp/com/ardublock/reference/delay.html index ed6c05da8b52d0342c2547b52496cca9ce1e8194..50e7955586edc8b39f225d92b6bb32d377e234fb 100644 --- a/src/main/webapp/com/ardublock/reference/delay.html +++ b/src/main/webapp/com/ardublock/reference/delay.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -57,7 +57,7 @@ <br><br> In ArduBlock könnte das so aussehen: <br><br> - <img src="delay-beispiel.png" alt="beispiel-zum-warte-millisekunden-block"> + <img src="delay-beispiel-1.png" alt="beispiel-zum-warte-millisekunden-block"> </p> <h2 class="unterueberschrift">Code</h2> diff --git a/src/main/webapp/com/ardublock/reference/digital-high.html b/src/main/webapp/com/ardublock/reference/digital-high.html index 3ea390cdedfc9b4746baf389f05027d6b5b1df24..aedc9b5c6a0f6a538016cbc6ce05307a3ef553e8 100644 --- a/src/main/webapp/com/ardublock/reference/digital-high.html +++ b/src/main/webapp/com/ardublock/reference/digital-high.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/digital-low.html b/src/main/webapp/com/ardublock/reference/digital-low.html index b1e8a77c4f92ab287259df32e8f8a25f4b044e1c..70ff818941cd21bd9d94169c2c08307ddd4ca7a2 100644 --- a/src/main/webapp/com/ardublock/reference/digital-low.html +++ b/src/main/webapp/com/ardublock/reference/digital-low.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/division-beispiel.png b/src/main/webapp/com/ardublock/reference/division-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/division-beispiel.png rename to src/main/webapp/com/ardublock/reference/division-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/division.html b/src/main/webapp/com/ardublock/reference/division.html index 638d65dacae0931ea4f6ef76acf6c50cfc344901..2ed4ab6b30ed863a95f4cd7585f271f91516d1f9 100644 --- a/src/main/webapp/com/ardublock/reference/division.html +++ b/src/main/webapp/com/ardublock/reference/division.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -46,7 +46,6 @@   + <br>   - <br>   x <br> -   / <br>   % <br> </code> @@ -62,7 +61,7 @@ <br><br> In ArduBlock: <br><br> - <img src="division-beispiel.png" alt="beispiel-addition"> + <img src="division-beispiel-1.png" alt="beispiel-addition"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/else-beispiel.png b/src/main/webapp/com/ardublock/reference/else-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/else-beispiel.png rename to src/main/webapp/com/ardublock/reference/else-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/else.html b/src/main/webapp/com/ardublock/reference/else.html index 68a8f2e1c5998aa2a69977aa8f6fe3a96c37b0f0..446a52e0f43612d0c6c48058c779e268890a320a 100644 --- a/src/main/webapp/com/ardublock/reference/else.html +++ b/src/main/webapp/com/ardublock/reference/else.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -69,7 +69,7 @@ <br><br> So könnte das Beispiel in ArduBlock aussehen: <br><br> - <img src="else-beispiel.png" alt="else-besipiel" style="padding-left: 2px;"> + <img src="else-beispiel-1.png" alt="else-besipiel" style="padding-left: 2px;"> </p> <h2 class="unterueberschrift">Code</h2> diff --git a/src/main/webapp/com/ardublock/reference/elseif-beispiel.png b/src/main/webapp/com/ardublock/reference/elseif-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/elseif-beispiel.png rename to src/main/webapp/com/ardublock/reference/elseif-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/elseif.html b/src/main/webapp/com/ardublock/reference/elseif.html index e03ebe2cf18f0d0d4f8b3cc9e896ea6e06a3d84a..db3b5c68c467bb42b78748e2c0ce1e17fff2e638 100644 --- a/src/main/webapp/com/ardublock/reference/elseif.html +++ b/src/main/webapp/com/ardublock/reference/elseif.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -84,7 +84,7 @@ <br> So könnte das Beispiel in ArduBlock aussehen: <br><br> - <img src="elseif-beispiel.png" alt="elseif-besipiel" style="padding-left: 20px;"> + <img src="elseif-beispiel-1.png" alt="elseif-besipiel" style="padding-left: 20px;"> </p> <h2 class="unterueberschrift">Code</h2> diff --git a/src/main/webapp/com/ardublock/reference/equal-beispiel.png b/src/main/webapp/com/ardublock/reference/equal-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/equal-beispiel.png rename to src/main/webapp/com/ardublock/reference/equal-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/equal.html b/src/main/webapp/com/ardublock/reference/equal.html index ceda805cc4aabc1faac0217e198b8636e83a8bdc..ef31dd8f900367c41eb5f6f9e7bc5d892dd35c44 100644 --- a/src/main/webapp/com/ardublock/reference/equal.html +++ b/src/main/webapp/com/ardublock/reference/equal.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br> Für die fest eingesetzten Zahlenwerte können hier auch analoge Variablen oder analoge Eingänge verwendet werden: <br><br> - <img src="equal-beispiel.png" alt="analog-gleich-beispiel" style="border:grey solid 2px"> + <img src="equal-beispiel-1.png" alt="analog-gleich-beispiel" style="border:grey solid 2px"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/equal_digital-beispiel.png b/src/main/webapp/com/ardublock/reference/equal_digital-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/equal_digital-beispiel.png rename to src/main/webapp/com/ardublock/reference/equal_digital-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/equal_digital.html b/src/main/webapp/com/ardublock/reference/equal_digital.html index 6573ede35cdf9cf783600150e8e0d15a53c8feb9..c1c2001f0ca07208dff32181a76d020ffcd4a566 100644 --- a/src/main/webapp/com/ardublock/reference/equal_digital.html +++ b/src/main/webapp/com/ardublock/reference/equal_digital.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -52,7 +52,7 @@ Diese haben dieselbe Bedeutung. Ein Verwenden von digitalen Variablen oder digitalen Eingängen des Arduinos ist natürlich ebenso möglich. <br><br> - <img src="equal_digital-beispiel.png" alt="nicht-block-beispiel" style="border:grey solid 2px"> + <img src="equal_digital-beispiel-1.png" alt="nicht-block-beispiel" style="border:grey solid 2px"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/false.html b/src/main/webapp/com/ardublock/reference/false.html index 93f5f6ebd96ec40aa53119f7039ae16414bd9fa8..2d44829256f91dd00e6441383bf3be2ff4cc478a 100644 --- a/src/main/webapp/com/ardublock/reference/false.html +++ b/src/main/webapp/com/ardublock/reference/false.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/glue_digital-beispiel.png b/src/main/webapp/com/ardublock/reference/glue_digital-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/glue_digital-beispiel.png rename to src/main/webapp/com/ardublock/reference/glue_digital-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/glue_digital.html b/src/main/webapp/com/ardublock/reference/glue_digital.html index f137179a07a472300100e1fd81b87bd5ecf0a73f..8a920d82cf7e9c394e503e38546b7a59cbb48fcb 100644 --- a/src/main/webapp/com/ardublock/reference/glue_digital.html +++ b/src/main/webapp/com/ardublock/reference/glue_digital.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -55,7 +55,7 @@ <br><br> In ArduBlock: <br><br> - <img src="glue_digital-beispiel.png" alt=""> + <img src="glue_digital-beispiel-1.png" alt=""> <h2 class="unterueberschrift" id="code">Code</h2> <p> Im Code wird der Block durch den Befehl einfach dadurch realisiert, dass zwei <code>Serial.print()</code> Befehle diff --git a/src/main/webapp/com/ardublock/reference/glue_number-beispiel.png b/src/main/webapp/com/ardublock/reference/glue_number-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/glue_number-beispiel.png rename to src/main/webapp/com/ardublock/reference/glue_number-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/glue_number.html b/src/main/webapp/com/ardublock/reference/glue_number.html index 2b92519644325d793aac7cc318c0714ca538388a..23aa9720aa5ea92780de2353424c2bc81f591a24 100644 --- a/src/main/webapp/com/ardublock/reference/glue_number.html +++ b/src/main/webapp/com/ardublock/reference/glue_number.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -55,7 +55,7 @@ <br><br> In ArduBlock: <br><br> - <img src="glue_number-beispiel.png" alt=""> + <img src="glue_number-beispiel-1.png" alt=""> <h2 class="unterueberschrift" id="code">Code</h2> <p> Im Code wird der Block durch den Befehl einfach dadurch realisiert, dass zwei <code>Serial.print()</code> Befehle diff --git a/src/main/webapp/com/ardublock/reference/glue_string-beispiel.png b/src/main/webapp/com/ardublock/reference/glue_string-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/glue_string-beispiel.png rename to src/main/webapp/com/ardublock/reference/glue_string-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/glue_string.html b/src/main/webapp/com/ardublock/reference/glue_string.html index caad6bf35f17b310eb3dcf3880fa52a4b8f3c33a..9ac4e447c289f98de9553cb10cb5e393fe763f8b 100644 --- a/src/main/webapp/com/ardublock/reference/glue_string.html +++ b/src/main/webapp/com/ardublock/reference/glue_string.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -56,7 +56,7 @@ <b style="color: red;">Achtung: </b>Wenn zwischen den beiden Strings ein Leerzeichen sein soll, dann muss dieses im String als normales Zeichen angehängt werden. <br><br> - <img src="glue_string-beispiel.png" alt=""> + <img src="glue_string-beispiel-1.png" alt=""> <br><br> Im Code würde das dann folgendermaßen aussehen (ohne <code>Serial.begin(9600)</code>): <br><br> diff --git a/src/main/webapp/com/ardublock/reference/greater-beispiel.png b/src/main/webapp/com/ardublock/reference/greater-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/greater-beispiel.png rename to src/main/webapp/com/ardublock/reference/greater-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/greater.html b/src/main/webapp/com/ardublock/reference/greater.html index e96465655d8c40270c37cdf93870dc900d1ca196..635d8a6dcc73a67f83156be0521e25346dff312f 100644 --- a/src/main/webapp/com/ardublock/reference/greater.html +++ b/src/main/webapp/com/ardublock/reference/greater.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br> Für die fest eingesetzten Zahlenwerte können hier auch analoge Variablen oder analoge Eingänge verwendet werden: <br><br> - <img src="greater-beispiel.png" alt="größer-analog-beispiel" > + <img src="greater-beispiel-1.png" alt="größer-analog-beispiel" > <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/greater_equal-beispiel.png b/src/main/webapp/com/ardublock/reference/greater_equal-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/greater_equal-beispiel.png rename to src/main/webapp/com/ardublock/reference/greater_equal-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/greater_equal.html b/src/main/webapp/com/ardublock/reference/greater_equal.html index 3f1c5c84c28006028b5673637250960881eb47a0..17392c035d4f7c46565ad09ed646a1ad5a61d250 100644 --- a/src/main/webapp/com/ardublock/reference/greater_equal.html +++ b/src/main/webapp/com/ardublock/reference/greater_equal.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br> Für die fest eingesetzten Zahlenwerte können hier auch analoge Variablen oder analoge Eingänge verwendet werden: <br><br> - <img src="greater_equal-beispiel.png" alt="analog-nicht-gleich-beispiel" style="border:grey solid 2px"> + <img src="greater_equal-beispiel-1.png" alt="analog-nicht-gleich-beispiel" style="border:grey solid 2px"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/help.html b/src/main/webapp/com/ardublock/reference/help.html deleted file mode 100644 index a0ab07b6e40ecd68ed64a89fbce9712ff03910f3..0000000000000000000000000000000000000000 --- a/src/main/webapp/com/ardublock/reference/help.html +++ /dev/null @@ -1,66 +0,0 @@ -<!DOCTYPE html> -<html> - -<link rel="stylesheet" href="_seitenformatierung.css"> - -<body style="margin: 0px;"> - -<div style="border: #284a66; border-style: solid; border-width: 5px;"> - <nav> - <li id="beschreibung">Hilfe</li> - <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - </nav> -</div> - -<div> - <section> - <div id="ueberschrift"> - <p>Hilfe</p> - <h1 style="font-size: 220%;">abs</h1> - </div> - <div> - <div> - <figure> - <img id="block_bild" src = "help.png" alt="help"></img> - <figcaption id="caption"></figcaption> - </figure> - </div> - </div> - </section> -</div> - -<article> - <div> - <h2 class="unterueberschrift" id="Allgemeines">Allgemeines</h2> - <p> - ArduBlock BlaBla - </p> - <h2 class="unterueberschrift" id="Funktionen">Funktionen</h2> - <p> - Der Betrag einer Zahl ist der "Wert" der Zahl ohne die Berücksichtigung des Vorzeichens. - </p> - <h2 class="unterueberschrift" id="Block-Arten">Block-Arten</h2> - <p> - Im Code kann der <code>abs</code> Block mit dem Befehl (<code>abs()</code>) realisiert werden. - Wobei zwischen die Klammern hier die entsprechende Größe eingefügt wird, auf die der Befehl angewendet werden soll. - <br> - <b>Beispiel:</b> Es soll der Betrag der Variable <code>var</code> im seriellen Monitor ausgegeben werden. - <br><br> - In ArduBlock: - <br><br> - <img src="help.png" alt="hilfe"> - <br><br> - Im Code: - <br><br> - <code> - var_betrag = abs( var ); <br> - Serial.print("Der Betrag der Variable var ist: "); <br> - Serial.print(var_betrag ); <br> - </code> - <p> - </div> - -</article> - -</body> -</html> \ No newline at end of file diff --git a/src/main/webapp/com/ardublock/reference/if-beispiel.png b/src/main/webapp/com/ardublock/reference/if-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/if-beispiel.png rename to src/main/webapp/com/ardublock/reference/if-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/if.html b/src/main/webapp/com/ardublock/reference/if.html index c6c9fa9f0b3a5ff7079f5a497b2bc5289e7814f7..6f2fcc8a7e57de6d6b762e17e536e5ded2d9ca43 100644 --- a/src/main/webapp/com/ardublock/reference/if.html +++ b/src/main/webapp/com/ardublock/reference/if.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br> Wenn der Pin 2 auf <code>HIGH</code> gesetzt wird, dann wird damit der Ventilator aktiviert. <br><br> - <img src="if-beispiel.png" alt="if_beispiel" style="padding-left: 20px;"> + <img src="if-beispiel-1.png" alt="if_beispiel" style="padding-left: 20px;"> <br><br> </p> diff --git a/src/main/webapp/com/ardublock/reference/less-beispiel.png b/src/main/webapp/com/ardublock/reference/less-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/less-beispiel.png rename to src/main/webapp/com/ardublock/reference/less-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/less.html b/src/main/webapp/com/ardublock/reference/less.html index cd6b55f9168a2c5319c1af4ad19ba5bd7d0ccca0..30aa4b939ce28f939aaa12a54c1fcfdc40033c29 100644 --- a/src/main/webapp/com/ardublock/reference/less.html +++ b/src/main/webapp/com/ardublock/reference/less.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br> Für die fest eingesetzten Zahlenwerte können hier auch analoge Variablen oder analoge Eingänge verwendet werden: <br><br> - <img src="less-beispiel.png" alt="kleiner-beispiel" style="border:grey solid 2px"> + <img src="less-beispiel-1.png" alt="kleiner-beispiel" style="border:grey solid 2px"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/less_equal-beispiel.png b/src/main/webapp/com/ardublock/reference/less_equal-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/less_equal-beispiel.png rename to src/main/webapp/com/ardublock/reference/less_equal-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/less_equal.html b/src/main/webapp/com/ardublock/reference/less_equal.html index b6b74a373bbe3e4f6ee5ed45e413b754fa1e3bce..fd8eb063ce73fefa96c15cba8bbbba98ac7a8665 100644 --- a/src/main/webapp/com/ardublock/reference/less_equal.html +++ b/src/main/webapp/com/ardublock/reference/less_equal.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br> Für die fest eingesetzten Zahlenwerte können hier auch analoge Variablen oder analoge Eingänge verwendet werden: <br><br> - <img src="less_equal-beispiel.png" alt="kleiner-gleich-beispiel" style="border:grey solid 2px"> + <img src="less_equal-beispiel-1.png" alt="kleiner-gleich-beispiel" style="border:grey solid 2px"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/local_variable_digital.html b/src/main/webapp/com/ardublock/reference/local_variable_digital.html index e87adb13f88cbb20041bc5623b638b708190e817..12b7ebb635016b39247efc28b47bbc31627650a5 100644 --- a/src/main/webapp/com/ardublock/reference/local_variable_digital.html +++ b/src/main/webapp/com/ardublock/reference/local_variable_digital.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/local_variable_number.html b/src/main/webapp/com/ardublock/reference/local_variable_number.html index 16a3888186b0219a94164911e5315dce5d827a26..d4299535de8b6576f5d22c1207f7be2496cfa46e 100644 --- a/src/main/webapp/com/ardublock/reference/local_variable_number.html +++ b/src/main/webapp/com/ardublock/reference/local_variable_number.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/loop.html b/src/main/webapp/com/ardublock/reference/loop.html index e83d0163353164d03b2c91c0dcc33f49287d445e..1e031297db6a821eadf714f3cbb4d6153a360ea9 100644 --- a/src/main/webapp/com/ardublock/reference/loop.html +++ b/src/main/webapp/com/ardublock/reference/loop.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -60,7 +60,7 @@ <br> Dann fängt das Programm wieder von Vorn an. So könnte das Beispiel in ArduBlock aussehen. <br><br> - <img src="loop-beispiel.png" alt="loop_beispiel" style="padding-left: 20px;"> + <img src="loop-beispiel-1.png" alt="loop_beispiel" style="padding-left: 20px;"> <h2 class="unterueberschrift">Code</h2> <p> Im Code für den Arduino wird der Baustein mit der Funktion <code>void loop(){mache}</code> umgesetzt. @@ -81,4 +81,4 @@ </article> </body> -</html> +</html> \ No newline at end of file diff --git a/src/main/webapp/com/ardublock/reference/map-beispiel.png b/src/main/webapp/com/ardublock/reference/map-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/map-beispiel.png rename to src/main/webapp/com/ardublock/reference/map-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/map.html b/src/main/webapp/com/ardublock/reference/map.html index 1cc5458313814aab538eef9841e6ce38cc9ce95e..4867119969c964f8447f5ed4a12941602426d682 100644 --- a/src/main/webapp/com/ardublock/reference/map.html +++ b/src/main/webapp/com/ardublock/reference/map.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -105,7 +105,7 @@ <br><br> In ArduBlock: <br><br> - <img src="map-beispiel.png" alt="beispiel-zum-zuordnen-block"> + <img src="map-beispiel-1.png" alt="beispiel-zum-zuordnen-block"> </p> <h2 class="unterueberschrift" id="wert">Wert</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/map_common-beispiel.png b/src/main/webapp/com/ardublock/reference/map_common-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/map_common-beispiel.png rename to src/main/webapp/com/ardublock/reference/map_common-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/map_common.html b/src/main/webapp/com/ardublock/reference/map_common.html index cc5f1d8d6d8a1b76b71f111bf2b0ff404d13a78c..2ccfb66cb8952906041c388b49df4e13a934fdc1 100644 --- a/src/main/webapp/com/ardublock/reference/map_common.html +++ b/src/main/webapp/com/ardublock/reference/map_common.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -74,7 +74,7 @@ <br><br> In ArduBlock: <br><br> - <img src="map_common-beispiel.png" alt="beispiel-zum-map-common-block"> + <img src="map_common-beispiel-1.png" alt="beispiel-zum-map-common-block"> </p> <h2 class="unterueberschrift" id="wert">Wert</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/max-beispiel.png b/src/main/webapp/com/ardublock/reference/max-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/max-beispiel.png rename to src/main/webapp/com/ardublock/reference/max-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/max.html b/src/main/webapp/com/ardublock/reference/max.html index 28c0a1112315102c8e86d77474c61f7ce57d81e9..e13d44013180db3a89cba021c082fdb91ffd87ee 100644 --- a/src/main/webapp/com/ardublock/reference/max.html +++ b/src/main/webapp/com/ardublock/reference/max.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -54,7 +54,7 @@ <br><br> In ArduBlock würde das so aussehen: <br><br> - <img src="max-beispiel.png" alt="beispiel-max"> + <img src="max-beispiel-1.png" alt="beispiel-max"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/millis.html b/src/main/webapp/com/ardublock/reference/millis.html index ed520e8dffdec0c13536c3c1a45bec77122fc328..490400dd51bdbd5ecb7e1064a8bea5c25c496ada 100644 --- a/src/main/webapp/com/ardublock/reference/millis.html +++ b/src/main/webapp/com/ardublock/reference/millis.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/min-beispiel.png b/src/main/webapp/com/ardublock/reference/min-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/min-beispiel.png rename to src/main/webapp/com/ardublock/reference/min-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/min.html b/src/main/webapp/com/ardublock/reference/min.html index 9edcb9561281b099851e81c9466fcae13ba9c6e6..78aa250600dc740c792441a4038d4cec028ab99e 100644 --- a/src/main/webapp/com/ardublock/reference/min.html +++ b/src/main/webapp/com/ardublock/reference/min.html @@ -8,7 +8,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -56,7 +56,7 @@ <br><br> In ArduBlock würde das so aussehen: <br><br> - <img src="min-beispiel.png" alt="beispiel-min"> + <img src="min-beispiel-1.png" alt="beispiel-min"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/modulo-beispiel.png b/src/main/webapp/com/ardublock/reference/modulo-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/modulo-beispiel.png rename to src/main/webapp/com/ardublock/reference/modulo-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/modulo.html b/src/main/webapp/com/ardublock/reference/modulo.html index e9e26dc7fb8d6880bde63ecf12a548c53c63cebb..369b0e565e6e16c8a8b711d02a9d45bb9f9c73e3 100644 --- a/src/main/webapp/com/ardublock/reference/modulo.html +++ b/src/main/webapp/com/ardublock/reference/modulo.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -87,7 +87,7 @@ <br><br> In ArduBlock: <br><br> - <img src="modulo-beispiel.png" alt="beispiel-modulo"> + <img src="modulo-beispiel-1.png" alt="beispiel-modulo"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/multiplication-beispiel.png b/src/main/webapp/com/ardublock/reference/multiplication-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/multiplication-beispiel.png rename to src/main/webapp/com/ardublock/reference/multiplication-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/multiplication.html b/src/main/webapp/com/ardublock/reference/multiplication.html index 1cbf184cca867d67e204240087c9a5c3d36ec3df..d544c4bf6886fc2e432e1d95ff692b3d647bb6b4 100644 --- a/src/main/webapp/com/ardublock/reference/multiplication.html +++ b/src/main/webapp/com/ardublock/reference/multiplication.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -60,7 +60,7 @@ <br><br> In ArduBlock: <br><br> - <img src="multiplication-beispiel.png" alt="beispiel-multiplikation"> + <img src="multiplication-beispiel-1.png" alt="beispiel-multiplikation"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/not-beispiel.png b/src/main/webapp/com/ardublock/reference/not-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/not-beispiel.png rename to src/main/webapp/com/ardublock/reference/not-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/not.html b/src/main/webapp/com/ardublock/reference/not.html index 642d882cbac9e1eb819d4b25edaff2382a852927..36dc11cea6015f9db2a75fdfc82d2212ad955d2e 100644 --- a/src/main/webapp/com/ardublock/reference/not.html +++ b/src/main/webapp/com/ardublock/reference/not.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -50,7 +50,7 @@ <br><br> In ArduBlock kann diese Funktion folgendermaßen mit einem <code>NICHT</code> Block realisiert werden: <br><br> - <img src="not-beispiel.png" alt="nicht-block-beispiel"> + <img src="not-beispiel-1.png" alt="nicht-block-beispiel"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/not_equal-beispiel.png b/src/main/webapp/com/ardublock/reference/not_equal-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/not_equal-beispiel.png rename to src/main/webapp/com/ardublock/reference/not_equal-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/not_equal.html b/src/main/webapp/com/ardublock/reference/not_equal.html index 7132f99579c73bfab3ce3eca80202a90561ec941..cfaa5378a6c7cfd61a72d2c57566ba120930d03f 100644 --- a/src/main/webapp/com/ardublock/reference/not_equal.html +++ b/src/main/webapp/com/ardublock/reference/not_equal.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br> Für die fest eingesetzten Zahlenwerte können hier auch analoge Variablen oder analoge Eingänge verwendet werden: <br><br> - <img src="not_equal-beispiel.png" alt="analog-nicht-gleich-beispiel" style="border:grey solid 2px"> + <img src="not_equal-beispiel-1.png" alt="analog-nicht-gleich-beispiel" style="border:grey solid 2px"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/not_equal_digital-beispiel.png b/src/main/webapp/com/ardublock/reference/not_equal_digital-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/not_equal_digital-beispiel.png rename to src/main/webapp/com/ardublock/reference/not_equal_digital-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/not_equal_digital.html b/src/main/webapp/com/ardublock/reference/not_equal_digital.html index f16382f91dcc8a2bf78d222fddcef9a0f9a0ca6b..bf87b4741781ed42c6b2a0263f4f8b0c63e78bfc 100644 --- a/src/main/webapp/com/ardublock/reference/not_equal_digital.html +++ b/src/main/webapp/com/ardublock/reference/not_equal_digital.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -52,7 +52,7 @@ Diese haben dieselbe Bedeutung. Ein Verwenden von digitalen Variablen oder digitalen Eingängen des Arduinos ist natürlich ebenso möglich. <br><br> - <img src="not_equal_digital-beispiel.png" alt="nicht-block-beispiel" style="border:grey solid 2px"> + <img src="not_equal_digital-beispiel-1.png" alt="nicht-block-beispiel" style="border:grey solid 2px"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/number.html b/src/main/webapp/com/ardublock/reference/number.html index 45b5ba752c41b47024957984ac9045dc892693ee..1309ba768dafa30ca1e2bf3ee90beb20a7f11057 100644 --- a/src/main/webapp/com/ardublock/reference/number.html +++ b/src/main/webapp/com/ardublock/reference/number.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/or-beispiel.png b/src/main/webapp/com/ardublock/reference/or-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/or-beispiel.png rename to src/main/webapp/com/ardublock/reference/or-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/or.html b/src/main/webapp/com/ardublock/reference/or.html index da373f11c9ec3c0e1790c0aa82e099b9a1abdcef..986eb085f04a747440ad731dc36ea60af04af879 100644 --- a/src/main/webapp/com/ardublock/reference/or.html +++ b/src/main/webapp/com/ardublock/reference/or.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -44,7 +44,7 @@ Diese haben dieselbe Bedeutung. Ein Verwenden von digitalen Variablen oder digitalen Eingängen des Arduinos ist natürlich ebenso möglich. <br><br> - <img src="or-beispiel.png" alt="Beispiel zum digitalRead Block" style="border:grey solid 2px;"> + <img src="or-beispiel-1.png" alt="Beispiel zum digitalRead Block" style="border:grey solid 2px;"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/pin-read-analog-beispiel.png b/src/main/webapp/com/ardublock/reference/pin-read-analog-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/pin-read-analog-beispiel.png rename to src/main/webapp/com/ardublock/reference/pin-read-analog-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/pin-read-analog.html b/src/main/webapp/com/ardublock/reference/pin-read-analog.html index 0d5557d0584e409d01ce46ed50b736fe5d4bd688..10f9fe8d3ddd464ae2507e088d1e5ec6a4f940e1 100644 --- a/src/main/webapp/com/ardublock/reference/pin-read-analog.html +++ b/src/main/webapp/com/ardublock/reference/pin-read-analog.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -81,7 +81,7 @@ <br><br> In ArduBlock könnte diese Funktion dann folgendermaßen aussehen: <br><br> - <img src="pin-read-analog-beispiel.png" alt="Beispiel zum analogRead Block"> + <img src="pin-read-analog-beispiel-1.png" alt="Beispiel zum analogRead Block"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/pin-read-digital-beispiel.png b/src/main/webapp/com/ardublock/reference/pin-read-digital-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/pin-read-digital-beispiel.png rename to src/main/webapp/com/ardublock/reference/pin-read-digital-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/pin-read-digital-pullup.html b/src/main/webapp/com/ardublock/reference/pin-read-digital-pullup.html index d8c846263201266b09dfe9b44820d897b3d358e1..a6fe89c22c771f4060b0fd9c1a1f75faa9ef0dd5 100644 --- a/src/main/webapp/com/ardublock/reference/pin-read-digital-pullup.html +++ b/src/main/webapp/com/ardublock/reference/pin-read-digital-pullup.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/pin-read-digital.html b/src/main/webapp/com/ardublock/reference/pin-read-digital.html index 265404edeaa7d8bd16b773c98286d3a6f8758999..9d38781ed8f3e690b1dcd88a25c3a606a853ffe2 100644 --- a/src/main/webapp/com/ardublock/reference/pin-read-digital.html +++ b/src/main/webapp/com/ardublock/reference/pin-read-digital.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -61,7 +61,7 @@ <br><br> In ArduBlock könnte diese Funktion dann folgendermaßen aussehen: <br><br> - <img src="pin-read-digital-beispiel.png" alt="Beispiel zum digitalRead Block"> + <img src="pin-read-digital-beispiel-1.png" alt="Beispiel zum digitalRead Block"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/pin-write-analog.html b/src/main/webapp/com/ardublock/reference/pin-write-analog.html index 4109fd39b6570cfac5c2e97c801ab3f175e32c9b..fad56f847c00e55d63b5a1adcd7352888b998bc6 100644 --- a/src/main/webapp/com/ardublock/reference/pin-write-analog.html +++ b/src/main/webapp/com/ardublock/reference/pin-write-analog.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/pin-write-digital-beispiel.png b/src/main/webapp/com/ardublock/reference/pin-write-digital-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/pin-write-digital-beispiel.png rename to src/main/webapp/com/ardublock/reference/pin-write-digital-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/pin-write-digital.html b/src/main/webapp/com/ardublock/reference/pin-write-digital.html index cfbc17ec99732489d63ff083a85932e6e8dff964..31217ade87234eefeddc8c3b45407b0678063a00 100644 --- a/src/main/webapp/com/ardublock/reference/pin-write-digital.html +++ b/src/main/webapp/com/ardublock/reference/pin-write-digital.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -67,7 +67,7 @@ Klickt man mit der linken Maustaste auf diesen Pfeil, öffnet sich ein ausklappbares Menü, in welchem dann der Wert auf <code>HIGH</code> bzw. <code>LOW</code> geändert werden kann. </p> - <img style="padding-left: 20px;" src="pin-write-digital-beispiel.png" alt="erklärung_high_low"> + <img style="padding-left: 20px;" src="pin-write-digital-besipiel-1.png" alt="erklärung_high_low"> <h2 class="unterueberschrift" id="code">Code</h2> <p> Im Code für den Arduino wird der Baustein mit der Funktion <code>digitalWrite(Pin, Wert)</code> umgesetzt, wobei hier die Parameter <code>Pin</code>, und <code>Wert</code> wie oben beschrieben @@ -79,4 +79,4 @@ </article> </body> -</html> +</html> \ No newline at end of file diff --git a/src/main/webapp/com/ardublock/reference/program_comment-beispiel.png b/src/main/webapp/com/ardublock/reference/program_comment-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/program_comment-beispiel.png rename to src/main/webapp/com/ardublock/reference/program_comment-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/program_comment.html b/src/main/webapp/com/ardublock/reference/program_comment.html index 06f814eab7639fca5dbcee9ed3ce0c9ac2f8301c..beb38068ffeb26c3d40fc56d0d78b7debd2058d7 100644 --- a/src/main/webapp/com/ardublock/reference/program_comment.html +++ b/src/main/webapp/com/ardublock/reference/program_comment.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -102,7 +102,7 @@ <br> Block: <br><br> - <img src="program_comment-beispiel.png" alt=""> + <img src="program_comment-beispiel-1.png" alt=""> <br><br> Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/random-beispiel.png b/src/main/webapp/com/ardublock/reference/random-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/random-beispiel.png rename to src/main/webapp/com/ardublock/reference/random-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/random.html b/src/main/webapp/com/ardublock/reference/random.html index adbf2c03f4153f3650f6acd14c5e26e3b0680d80..111b1d51e28e898930b7abbbafddf0f0331f049f 100644 --- a/src/main/webapp/com/ardublock/reference/random.html +++ b/src/main/webapp/com/ardublock/reference/random.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -54,7 +54,7 @@ <br><br> In ArduBlock: <br><br> - <img src="random-beispiel.png" alt="beispiel-zufallszahl-eine-grenze"> + <img src="random-beispiel-1.png" alt="beispiel-zufallszahl-eine-grenze"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/random_range-beispiel.png b/src/main/webapp/com/ardublock/reference/random_range-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/random_range-beispiel.png rename to src/main/webapp/com/ardublock/reference/random_range-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/random_range.html b/src/main/webapp/com/ardublock/reference/random_range.html index a1fe8e1650adf82afe2d93d030fec0fc6da0cbed..f693aa63f8e73e537993bb3b028a1499492f241c 100644 --- a/src/main/webapp/com/ardublock/reference/random_range.html +++ b/src/main/webapp/com/ardublock/reference/random_range.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -57,7 +57,7 @@ <br><br> In ArduBlock: <br><br> - <img src="random_range-beispiel.png" alt="beispiel-zufallszahl-zwei-grenzen"> + <img src="random_range-beispiel-1.png" alt="beispiel-zufallszahl-zwei-grenzen"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/repeat-beispiel.png b/src/main/webapp/com/ardublock/reference/repeat-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/repeat-beispiel.png rename to src/main/webapp/com/ardublock/reference/repeat-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/repeat.html b/src/main/webapp/com/ardublock/reference/repeat.html index a2e886879de1a8fed3e40858b907dd897e88d0c5..50a8d632f88cf375004343dee0e75a76225a1df1 100644 --- a/src/main/webapp/com/ardublock/reference/repeat.html +++ b/src/main/webapp/com/ardublock/reference/repeat.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -76,7 +76,7 @@ <br><br> In ArduBlock könnte das so aussehen: <br><br> - <img src="repeat-beispiel.png" alt="beispiel-zum-wiederhole-und-zähle-block"> + <img src="repeat-beispiel-1.png" alt="beispiel-zum-wiederhole-und-zähle-block"> <br> <br> Die Ausgabe im seriellen Monitor sieht dann wie folgt aus: <br> diff --git a/src/main/webapp/com/ardublock/reference/repeat_times-beispiel.png b/src/main/webapp/com/ardublock/reference/repeat_times-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/repeat_times-beispiel.png rename to src/main/webapp/com/ardublock/reference/repeat_times-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/repeat_times.html b/src/main/webapp/com/ardublock/reference/repeat_times.html index fd55365e98cc7b06f8180a840449afba6c0d5066..336f605f2fc83c9380f283aaefea205b9276c4bc 100644 --- a/src/main/webapp/com/ardublock/reference/repeat_times.html +++ b/src/main/webapp/com/ardublock/reference/repeat_times.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -65,7 +65,7 @@ <br><br> In ArduBlock könnte das so aussehen: <br><br> - <img src="repeat_times-beispiel.png" alt="beispiel-zum-wiederhole-block"> + <img src="repeat_times-beispiel-1.png" alt="beispiel-zum-wiederhole-block"> </p> diff --git a/src/main/webapp/com/ardublock/reference/serial_print-beispiel.png b/src/main/webapp/com/ardublock/reference/serial_print-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/serial_print-beispiel.png rename to src/main/webapp/com/ardublock/reference/serial_print-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/serial_print.html b/src/main/webapp/com/ardublock/reference/serial_print.html index 6c03bed24c5159428adbc594ee16c4604d15826a..0ea99ed963bd4a703b670db05d4f9abf2d6879f4 100644 --- a/src/main/webapp/com/ardublock/reference/serial_print.html +++ b/src/main/webapp/com/ardublock/reference/serial_print.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -68,7 +68,7 @@ <br><br> In ArduBlock: <br><br> - <img src="serial_print-beispiel.png" alt=""> + <img src="serial_print-beispiel-1.png" alt=""> <h2 class="unterueberschrift" id="code">Code</h2> <p> Im Code wird der Block durch den Befehl <code>Serial.print()</code> realisiert, wobei zwischen die Klammern hier diff --git a/src/main/webapp/com/ardublock/reference/setter_variable_digital-beispiel.png b/src/main/webapp/com/ardublock/reference/setter_variable_digital-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/setter_variable_digital-beispiel.png rename to src/main/webapp/com/ardublock/reference/setter_variable_digital-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/setter_variable_digital.html b/src/main/webapp/com/ardublock/reference/setter_variable_digital.html index af408702273f7eb326fcbf7aa1c957dccc9c34e5..dd5febd06a2322d44454f615e599719365153635 100644 --- a/src/main/webapp/com/ardublock/reference/setter_variable_digital.html +++ b/src/main/webapp/com/ardublock/reference/setter_variable_digital.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -68,7 +68,7 @@ <br><br> So würde das Beispiel in ArduBlock aussehen: <br><br> - <img src="setter_variable_digital-beispiel.png" alt="beispiel-setze-digitale-variable"> + <img src="setter_variable_digital-beispiel-1.png" alt="beispiel-setze-digitale-variable"> </p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/setter_variable_number-beispiel.png b/src/main/webapp/com/ardublock/reference/setter_variable_number-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/setter_variable_number-beispiel.png rename to src/main/webapp/com/ardublock/reference/setter_variable_number-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/setter_variable_number.html b/src/main/webapp/com/ardublock/reference/setter_variable_number.html index ea133a1407cebf0324c90c5482446dc33363ffc7..fd7b2d23a76e8a7132fedf5e794133271025e269 100644 --- a/src/main/webapp/com/ardublock/reference/setter_variable_number.html +++ b/src/main/webapp/com/ardublock/reference/setter_variable_number.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -74,7 +74,7 @@ <br><br> So würde das Beispiel in ArduBlock aussehen: <br><br> - <img src="setter_variable_number-beispiel.png" alt="beispiel-setze-digitale-variable"> + <img src="setter_variable_number-beispiel-1.png" alt="beispiel-setze-digitale-variable"> </p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/simHelp.html b/src/main/webapp/com/ardublock/reference/simHelp.html index 66e6f11fa246452f83ddaa19f5106fd2df8326d8..1829c867536aa979429ec36abcf3525be976e7a9 100644 --- a/src/main/webapp/com/ardublock/reference/simHelp.html +++ b/src/main/webapp/com/ardublock/reference/simHelp.html @@ -87,8 +87,7 @@ <li>Clear Serial Output - Löschen der bisherigen Ausgabe</li> <li>Autoscroll - Automatisches mitscrollen de-/aktivieren</li> </ul> - Der Wert des Potentiometers kann über den Schieberegler oder mit dem Mausrad (Zeiger über dem Schieberegler) verstellt werden. - </p> + </p> </div> diff --git a/src/main/webapp/com/ardublock/reference/sketch.html b/src/main/webapp/com/ardublock/reference/sketch.html index 2e99a3c92fc52dc0e5c4c5685f7256cfe42dc5d1..52687fb8465c5671b7051eea9da7e97a29a70ce5 100644 --- a/src/main/webapp/com/ardublock/reference/sketch.html +++ b/src/main/webapp/com/ardublock/reference/sketch.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/soft_serial_print-beispiel.png b/src/main/webapp/com/ardublock/reference/soft_serial_print-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/soft_serial_print-beispiel.png rename to src/main/webapp/com/ardublock/reference/soft_serial_print-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/soft_serial_print.html b/src/main/webapp/com/ardublock/reference/soft_serial_print.html index cb3c484f353e3febb46802b5526f02a15d1ebca6..fcd4561c001915a80cf7d756dc72b4671280baec 100644 --- a/src/main/webapp/com/ardublock/reference/soft_serial_print.html +++ b/src/main/webapp/com/ardublock/reference/soft_serial_print.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" class="uebersuchtsbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" class="uebersuchtsbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -80,7 +80,7 @@ <br><br> In ArduBlock: <br><br> - <img src="soft_serial_print-beispiel.png" alt=""> + <img src="soft_serial_print-beispiel-1.png" alt=""> <h2 class="unterueberschrift" id="code">Code</h2> <p> Im Code wird der Block durch den Befehl <code>softSerial.print()</code> realisiert, wobei zwischen die Klammern hier diff --git a/src/main/webapp/com/ardublock/reference/string.html b/src/main/webapp/com/ardublock/reference/string.html index 1774c50e5c5fafefaebd8c429d08e899760da2ec..59edca18f28c429eae3cf690fa01b11f849010d5 100644 --- a/src/main/webapp/com/ardublock/reference/string.html +++ b/src/main/webapp/com/ardublock/reference/string.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/subroutine_com-beispiel.png b/src/main/webapp/com/ardublock/reference/subroutine_com-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/subroutine_com-beispiel.png rename to src/main/webapp/com/ardublock/reference/subroutine_com-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/subroutine_com.html b/src/main/webapp/com/ardublock/reference/subroutine_com.html index 1258c0c63304b296c13208db98a84167aafc8571..9d49f1e359aee0f62a241c596754110a885a392d 100644 --- a/src/main/webapp/com/ardublock/reference/subroutine_com.html +++ b/src/main/webapp/com/ardublock/reference/subroutine_com.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -83,7 +83,7 @@ <br><br> In ArduBlock könnte diese Funktion dann folgendermaßen aussehen: <br><br> - <img src="subroutine_com-beispiel.png" alt="Beispiel zum digitalRead Block"> + <img src="subroutine_com-beispiel-1.png" alt="Beispiel zum digitalRead Block"> <p> <h2 class="unterueberschrift" id="code">Code</h2> <p> diff --git a/src/main/webapp/com/ardublock/reference/subtraction-beispiel.png b/src/main/webapp/com/ardublock/reference/subtraction-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/subtraction-beispiel.png rename to src/main/webapp/com/ardublock/reference/subtraction-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/subtraction.html b/src/main/webapp/com/ardublock/reference/subtraction.html index 8f619c08796c8973a624ce16cc10ff82639dbcc3..c7e53b68a4a33675b69c41384caa6ee5d3b857e4 100644 --- a/src/main/webapp/com/ardublock/reference/subtraction.html +++ b/src/main/webapp/com/ardublock/reference/subtraction.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -60,7 +60,7 @@ <br><br> In ArduBlock: <br><br> - <img src="subtraction-beispiel.png" alt="beispiel-subtraktion"> + <img src="subtraction-beispiel-1.png" alt="beispiel-subtraktion"> <br><br> Im Code: <br><br> diff --git a/src/main/webapp/com/ardublock/reference/true.html b/src/main/webapp/com/ardublock/reference/true.html index 31abf0b9369539d80d6db2adaf55f2c99a402323..0fb2ed7909ffd001b28cd7c9b1df0768a2d6e12b 100644 --- a/src/main/webapp/com/ardublock/reference/true.html +++ b/src/main/webapp/com/ardublock/reference/true.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/variable_digital.html b/src/main/webapp/com/ardublock/reference/variable_digital.html index 244b8910a4973ba26a3e154e9e33aea5efdc20e3..e5e8a6045e1cb64b5abbcee031ac6407d4e2f2f4 100644 --- a/src/main/webapp/com/ardublock/reference/variable_digital.html +++ b/src/main/webapp/com/ardublock/reference/variable_digital.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/variable_number.html b/src/main/webapp/com/ardublock/reference/variable_number.html index 92ab4ce0ef34c7768fbdf3b65f1c75fcc727866f..4885998c4eea4e5e1a8261c9394fc778f7f9fe37 100644 --- a/src/main/webapp/com/ardublock/reference/variable_number.html +++ b/src/main/webapp/com/ardublock/reference/variable_number.html @@ -9,7 +9,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/wait.html b/src/main/webapp/com/ardublock/reference/wait.html index 8074a3413a7c19c49f0326f65b74e10ee83d3c86..dbad3370af618737babc966b04a3165aa550657c 100644 --- a/src/main/webapp/com/ardublock/reference/wait.html +++ b/src/main/webapp/com/ardublock/reference/wait.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> diff --git a/src/main/webapp/com/ardublock/reference/while-beispiel.png b/src/main/webapp/com/ardublock/reference/while-beispiel-1.png similarity index 100% rename from src/main/webapp/com/ardublock/reference/while-beispiel.png rename to src/main/webapp/com/ardublock/reference/while-beispiel-1.png diff --git a/src/main/webapp/com/ardublock/reference/while.html b/src/main/webapp/com/ardublock/reference/while.html index d15e46a58f1f29511903d47ae4aa094000faf0b0..a69c76ba11c3674c5906de2431fd80651348bcc9 100644 --- a/src/main/webapp/com/ardublock/reference/while.html +++ b/src/main/webapp/com/ardublock/reference/while.html @@ -7,7 +7,7 @@ <nav> <li id="beschreibung">Block-Referenz</li> <div style="border: 2px, solid; margin-left: 14px;"><li> <a target="_blank, _tab" href="https://letsgoing.org/"><img id="letsgoing_logo" src="_Logo_LGI_page.png"></a> </li></div> - <li style="float: right;" ><a id="uebersichtbutton" href="https://blockreferenz.letsgoing.org" target="_blank, _tab">Übersicht aller Blöcke</a></li> + <li style="float: right;" ><a id="uebersichtbutton" href="_inhaltsverzeichnis.html" target="_blank, _tab">Übersicht aller Blöcke</a></li> </nav> </div> @@ -68,7 +68,7 @@ Wenn sie die 99 erreicht hat läuft die Schleife dann das letzte mal durch, hier ist die Bedingung das letzte mal erfüllt ist, da gilt 100<100 = falsch. In AurduBlock würde das dann so aussehen: <br><br> - <img src="while-beispiel.png" alt="beispiel-zum-solange-block"> + <img src="while-beispiel-1.png" alt="beispiel-zum-solange-block"> <br><br> Im Code würde das Beispiel dann folgendermaßen aussehen: <br><br>