diff --git a/appveyor.yml b/appveyor.yml index 852f68776..00285d935 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ install: - if not exist build64 mkdir build64 - cd build64 - cmake -DBUILD_CLAR=OFF -DTHREADSAFE=ON -G "Visual Studio 15 2017 Win64" .. - - cmake --build . + - cmake --build . - cd c:\projects\fritzing-app\src\lib - curl -fsSL https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.zip -o boost_1_70_0.zip - 7z x boost_1_70_0.zip diff --git a/docker/release-linux.sh b/docker/release-linux.sh index 9e2a4f467..c54d9aaeb 100755 --- a/docker/release-linux.sh +++ b/docker/release-linux.sh @@ -2,4 +2,3 @@ set -xe docker run -v "$(pwd):/home/conan/fritzing" -w /home/conan/fritzing fritzing/build:xenial docker/xvfb-release-helper.sh "$1" - diff --git a/docker/xvfb-release-helper.sh b/docker/xvfb-release-helper.sh index 0cb356444..8f835dd9b 100755 --- a/docker/xvfb-release-helper.sh +++ b/docker/xvfb-release-helper.sh @@ -1,4 +1,4 @@ #!/bin/bash set -xe -xvfb-run ./tools/linux_release_script/release.sh "$1" \ No newline at end of file +xvfb-run ./tools/linux_release_script/release.sh "$1" diff --git a/pri/autoroute.pri b/pri/autoroute.pri index 79074981a..e555d81d9 100644 --- a/pri/autoroute.pri +++ b/pri/autoroute.pri @@ -24,7 +24,7 @@ src/autoroute/cmrouter/tileutils.h \ src/autoroute/mazerouter/mazerouter.h \ src/autoroute/zoomcontrols.h \ src/autoroute/drc.h \ - + SOURCES += \ src/autoroute/autorouter.cpp \ src/autoroute/cmrouter/cmrouter.cpp \ diff --git a/pri/connectors.pri b/pri/connectors.pri index 2dacea4eb..d72a1e033 100644 --- a/pri/connectors.pri +++ b/pri/connectors.pri @@ -21,14 +21,14 @@ src/connectors/connectoritem.h \ src/connectors/nonconnectoritem.h \ src/connectors/connectorshared.h \ src/connectors/ercdata.h \ -src/connectors/svgidlayer.h - +src/connectors/svgidlayer.h + SOURCES += \ src/connectors/bus.cpp \ src/connectors/busshared.cpp \ src/connectors/connector.cpp \ -src/connectors/connectoritem.cpp \ -src/connectors/nonconnectoritem.cpp \ +src/connectors/connectoritem.cpp \ +src/connectors/nonconnectoritem.cpp \ src/connectors/connectorshared.cpp \ src/connectors/ercdata.cpp \ -src/connectors/svgidlayer.cpp +src/connectors/svgidlayer.cpp diff --git a/pri/dialogs.pri b/pri/dialogs.pri index ffe34f693..13595023d 100644 --- a/pri/dialogs.pri +++ b/pri/dialogs.pri @@ -20,7 +20,7 @@ HEADERS += src/dialogs/prefsdialog.h \ src/dialogs/recoverydialog.h \ src/dialogs/setcolordialog.h \ src/dialogs/translatorlistmodel.h - + SOURCES += src/dialogs/prefsdialog.cpp \ src/dialogs/pinlabeldialog.cpp \ src/dialogs/groundfillseeddialog.cpp \ diff --git a/pri/dock.pri b/pri/dock.pri index 0217b4654..4a525c974 100644 --- a/pri/dock.pri +++ b/pri/dock.pri @@ -16,10 +16,7 @@ HEADERS += \ src/dock/layerpalette.h \ - + SOURCES += \ src/dock/layerpalette.cpp \ - - - diff --git a/pri/eagle.pri b/pri/eagle.pri index 6a92dfff5..27ec719db 100644 --- a/pri/eagle.pri +++ b/pri/eagle.pri @@ -13,7 +13,6 @@ # along with Fritzing. If not, see . # ********************************************************************/ -HEADERS += src/eagle/fritzing2eagle.h - -SOURCES += src/eagle/fritzing2eagle.cpp +HEADERS += src/eagle/fritzing2eagle.h +SOURCES += src/eagle/fritzing2eagle.cpp diff --git a/pri/help.pri b/pri/help.pri index 3b6dfa2f6..590903ae0 100644 --- a/pri/help.pri +++ b/pri/help.pri @@ -15,7 +15,7 @@ HEADERS += src/help/aboutbox.h \ src/help/firsttimehelpdialog.h \ src/help/tipsandtricks.h - + SOURCES += src/help/aboutbox.cpp \ src/help/firsttimehelpdialog.cpp \ src/help/tipsandtricks.cpp diff --git a/pri/infoview.pri b/pri/infoview.pri index 929f49bfe..494d23c84 100644 --- a/pri/infoview.pri +++ b/pri/infoview.pri @@ -13,8 +13,6 @@ # along with Fritzing. If not, see . # ********************************************************************/ -HEADERS += src/infoview/htmlinfoview.h - -SOURCES += src/infoview/htmlinfoview.cpp - +HEADERS += src/infoview/htmlinfoview.h +SOURCES += src/infoview/htmlinfoview.cpp diff --git a/pri/items.pri b/pri/items.pri index 531f1161e..a70b2f580 100644 --- a/pri/items.pri +++ b/pri/items.pri @@ -14,8 +14,8 @@ # ********************************************************************/ HEADERS += \ - src/items/breadboard.h \ - src/items/capacitor.h \ + src/items/breadboard.h \ + src/items/capacitor.h \ src/items/clipablewire.h \ src/items/dip.h \ src/items/groundplane.h \ @@ -51,7 +51,7 @@ HEADERS += \ SOURCES += \ - src/items/breadboard.cpp \ + src/items/breadboard.cpp \ src/items/capacitor.cpp \ src/items/clipablewire.cpp \ src/items/dip.cpp \ @@ -81,7 +81,7 @@ SOURCES += \ src/items/screwterminal.cpp \ src/items/stripboard.cpp \ src/items/symbolpaletteitem.cpp \ - src/items/tracewire.cpp \ + src/items/tracewire.cpp \ src/items/via.cpp \ src/items/virtualwire.cpp \ src/items/wire.cpp \ diff --git a/pri/kitchensink.pri b/pri/kitchensink.pri index 7d73f8f51..7285fb8e8 100644 --- a/pri/kitchensink.pri +++ b/pri/kitchensink.pri @@ -26,8 +26,8 @@ HEADERS += \ src/sketchtoolbutton.h \ src/viewgeometry.h \ src/viewlayer.h \ - src/waitpushundostack.h - + src/waitpushundostack.h + SOURCES += \ src/commands.cpp \ src/debugdialog.cpp \ @@ -41,6 +41,4 @@ SOURCES += \ src/sketchtoolbutton.cpp \ src/viewgeometry.cpp \ src/viewlayer.cpp \ - src/waitpushundostack.cpp - - + src/waitpushundostack.cpp diff --git a/pri/mainwindow.pri b/pri/mainwindow.pri index bbe4a71c7..bb2193aac 100644 --- a/pri/mainwindow.pri +++ b/pri/mainwindow.pri @@ -17,14 +17,12 @@ HEADERS += \ src/mainwindow/fritzingwindow.h \ src/mainwindow/mainwindow.h \ src/mainwindow/sketchareawidget.h \ - + SOURCES += \ src/mainwindow/fdockwidget.cpp \ src/mainwindow/fritzingwindow.cpp \ src/mainwindow/mainwindow.cpp \ - src/mainwindow/mainwindow_export.cpp \ + src/mainwindow/mainwindow_export.cpp \ src/mainwindow/mainwindow_menu.cpp \ src/mainwindow/mainwindow_dock.cpp \ src/mainwindow/sketchareawidget.cpp \ - - diff --git a/pri/model.pri b/pri/model.pri index f6d40b360..89727d8c8 100644 --- a/pri/model.pri +++ b/pri/model.pri @@ -17,11 +17,11 @@ HEADERS += \ src/model/modelpart.h \ src/model/modelpartshared.h \ src/model/palettemodel.h \ - src/model/sketchmodel.h - + src/model/sketchmodel.h + SOURCES += \ src/model/modelbase.cpp \ src/model/modelpart.cpp \ src/model/modelpartshared.cpp \ src/model/palettemodel.cpp \ - src/model/sketchmodel.cpp + src/model/sketchmodel.cpp diff --git a/pri/partseditor.pri b/pri/partseditor.pri index b7198b0ce..f42de3197 100644 --- a/pri/partseditor.pri +++ b/pri/partseditor.pri @@ -55,7 +55,7 @@ HEADERS += \ src/partseditor/kicadmoduledialog.h \ src/partseditor/hashpopulatewidget.h \ src/partseditor/baseremovebutton.h \ - + SOURCES += \ # src/partseditor/editabledatewidget.cpp \ diff --git a/pri/program.pri b/pri/program.pri index f716a123e..f94ba8097 100644 --- a/pri/program.pri +++ b/pri/program.pri @@ -23,7 +23,7 @@ HEADERS += \ src/program/programtab.h \ src/program/programwindow.h \ src/program/syntaxer.h \ - src/program/trienode.h \ + src/program/trienode.h \ src/program/console.h \ src/program/consolewindow.h \ src/program/consolesettings.h \ @@ -31,7 +31,7 @@ HEADERS += \ src/program/platformarduino.h \ src/program/platformpicaxe.h \ src/program/platformlaunchpad.h - + SOURCES += \ src/program/highlighter.cpp \ src/program/programtab.cpp \ diff --git a/pri/quazip.pri b/pri/quazip.pri index de14b992a..545607269 100644 --- a/pri/quazip.pri +++ b/pri/quazip.pri @@ -34,5 +34,4 @@ SOURCES += \ src/lib/quazip/quazipfile.cpp \ src/lib/quazip/quazipnewinfo.cpp \ src/lib/quazip/unzip.c \ - src/lib/quazip/zip.c - + src/lib/quazip/zip.c diff --git a/pri/sketch.pri b/pri/sketch.pri index 505dad36f..575ca8901 100644 --- a/pri/sketch.pri +++ b/pri/sketch.pri @@ -21,8 +21,8 @@ HEADERS += \ src/sketch/sketchwidget.h \ src/sketch/welcomeview.h \ src/sketch/zoomablegraphicsview.h \ - - + + SOURCES += \ src/sketch/fgraphicsscene.cpp \ src/sketch/breadboardsketchwidget.cpp \ @@ -30,5 +30,5 @@ SOURCES += \ src/sketch/pcbsketchwidget.cpp \ src/sketch/schematicsketchwidget.cpp \ src/sketch/sketchwidget.cpp \ - src/sketch/welcomeview.cpp \ + src/sketch/welcomeview.cpp \ src/sketch/zoomablegraphicsview.cpp \ diff --git a/pri/svg.pri b/pri/svg.pri index 59e20ba1f..52163b5c6 100644 --- a/pri/svg.pri +++ b/pri/svg.pri @@ -29,7 +29,7 @@ HEADERS += src/svg/svgfilesplitter.h \ src/svg/gedaelementparser.h \ src/svg/gedaelementgrammar_p.h \ src/svg/gedaelementlexer.h - + SOURCES += src/svg/svgfilesplitter.cpp \ src/svg/svgpathparser.cpp \ src/svg/svgpathgrammar.cpp \ diff --git a/pri/translations.pri b/pri/translations.pri index 09a2caca1..ebdd3854b 100644 --- a/pri/translations.pri +++ b/pri/translations.pri @@ -51,6 +51,3 @@ TRANSLATIONS += translations/fritzing_de.ts \ translations/fritzing_vi.ts \ translations/fritzing_zh_cn.ts \ translations/fritzing_zh_tw.ts \ - - - diff --git a/pri/version.pri b/pri/version.pri index 1196c081d..0f3d9accf 100644 --- a/pri/version.pri +++ b/pri/version.pri @@ -23,10 +23,9 @@ HEADERS += \ SOURCES += \ src/version/modfiledialog.cpp \ src/version/updatedialog.cpp \ - src/version/version.cpp \ - src/version/versionchecker.cpp \ + src/version/version.cpp \ + src/version/versionchecker.cpp \ src/version/partschecker.cpp FORMS += \ src/version/modfiledialog.ui - diff --git a/resources/bins/pe.fzb b/resources/bins/pe.fzb index af48eb5de..c91d79237 100644 --- a/resources/bins/pe.fzb +++ b/resources/bins/pe.fzb @@ -2,7 +2,7 @@ Parts Editor Parts - + @@ -24,8 +24,8 @@ - - + + diff --git a/resources/fonts/NOTICE b/resources/fonts/NOTICE index c5b1efa7a..f7bd78d21 100644 --- a/resources/fonts/NOTICE +++ b/resources/fonts/NOTICE @@ -187,4 +187,3 @@ of your accepting any such warranty or additional liability. END OF TERMS AND CONDITIONS - diff --git a/resources/images/splash/splash.xml b/resources/images/splash/splash.xml index 3849f2183..2247303e9 100644 --- a/resources/images/splash/splash.xml +++ b/resources/images/splash/splash.xml @@ -1,7 +1,7 @@ - + diff --git a/resources/parts/core/boardlogoimage.fzp b/resources/parts/core/boardlogoimage.fzp index 8267c7eca..3195e1394 100644 --- a/resources/parts/core/boardlogoimage.fzp +++ b/resources/parts/core/boardlogoimage.fzp @@ -38,7 +38,7 @@ - + diff --git a/resources/parts/core/boardlogoimage_one_layer.fzp b/resources/parts/core/boardlogoimage_one_layer.fzp index 907d690b0..dc40e553a 100644 --- a/resources/parts/core/boardlogoimage_one_layer.fzp +++ b/resources/parts/core/boardlogoimage_one_layer.fzp @@ -38,7 +38,7 @@ - + diff --git a/resources/parts/core/pad.fzp b/resources/parts/core/pad.fzp index 0ca9f82eb..183e66695 100644 --- a/resources/parts/core/pad.fzp +++ b/resources/parts/core/pad.fzp @@ -54,7 +54,7 @@

- + diff --git a/resources/parts/core/pad0.fzp b/resources/parts/core/pad0.fzp index cad672ee0..652ee1278 100644 --- a/resources/parts/core/pad0.fzp +++ b/resources/parts/core/pad0.fzp @@ -54,7 +54,7 @@

- + diff --git a/resources/parts/core/via.fzp b/resources/parts/core/via.fzp index 19fb40c59..3f96c9128 100644 --- a/resources/parts/core/via.fzp +++ b/resources/parts/core/via.fzp @@ -54,7 +54,7 @@

- + diff --git a/resources/parts/core/wire.fzp b/resources/parts/core/wire.fzp index df3c79d13..0798ef992 100644 --- a/resources/parts/core/wire.fzp +++ b/resources/parts/core/wire.fzp @@ -10,7 +10,7 @@ fritzing core - wire + wire diff --git a/resources/parts/svg/core/breadboard/30.20perfboard.svg b/resources/parts/svg/core/breadboard/30.20perfboard.svg index 41a2dc7a2..997cf7fc4 100644 --- a/resources/parts/svg/core/breadboard/30.20perfboard.svg +++ b/resources/parts/svg/core/breadboard/30.20perfboard.svg @@ -601,8 +601,8 @@ M2682.5,2000a17.5,17.5 0 1 0 35,0 17.5,17.5 0 1 0 -35,0z M2782.5,2000a17.5,17.5 0 1 0 35,0 17.5,17.5 0 1 0 -35,0z M2882.5,2000a17.5,17.5 0 1 0 35,0 17.5,17.5 0 1 0 -35,0z M2982.5,2000a17.5,17.5 0 1 0 35,0 17.5,17.5 0 1 0 -35,0z -" /> - +" /> + diff --git a/resources/parts/svg/core/breadboard/wire.svg b/resources/parts/svg/core/breadboard/wire.svg index 26f707b98..c0bec6519 100644 --- a/resources/parts/svg/core/breadboard/wire.svg +++ b/resources/parts/svg/core/breadboard/wire.svg @@ -4,7 +4,7 @@ xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" - width="1in" height="1in" + width="1in" height="1in" viewBox="0 0 100 100" > diff --git a/resources/parts/svg/core/icon/breadboard_text.svg b/resources/parts/svg/core/icon/breadboard_text.svg index e2372d44f..a2c2f0d60 100644 --- a/resources/parts/svg/core/icon/breadboard_text.svg +++ b/resources/parts/svg/core/icon/breadboard_text.svg @@ -5,7 +5,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32.003px" height="32.003px" viewBox="0 0 32.003 32.003" xml:space="preserve"> - + - + diff --git a/resources/parts/svg/core/icon/copper1_text.svg b/resources/parts/svg/core/icon/copper1_text.svg index 7fc83b722..945ada44f 100644 --- a/resources/parts/svg/core/icon/copper1_text.svg +++ b/resources/parts/svg/core/icon/copper1_text.svg @@ -4,7 +4,7 @@ - + diff --git a/resources/parts/svg/core/icon/note.svg b/resources/parts/svg/core/icon/note.svg index 5973fdf8e..7edd7e08c 100644 --- a/resources/parts/svg/core/icon/note.svg +++ b/resources/parts/svg/core/icon/note.svg @@ -7,14 +7,14 @@ viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve"> - + - + - + diff --git a/resources/parts/svg/core/icon/schematic_frame_icon.svg b/resources/parts/svg/core/icon/schematic_frame_icon.svg index ffd7fef16..061239507 100644 --- a/resources/parts/svg/core/icon/schematic_frame_icon.svg +++ b/resources/parts/svg/core/icon/schematic_frame_icon.svg @@ -6,7 +6,7 @@ viewBox="0 0 400 400" enable-background="new 0 0 400 400" xml:space="preserve"> - + diff --git a/resources/parts/svg/core/icon/schematic_text.svg b/resources/parts/svg/core/icon/schematic_text.svg index 2bb983230..7d0eeca30 100644 --- a/resources/parts/svg/core/icon/schematic_text.svg +++ b/resources/parts/svg/core/icon/schematic_text.svg @@ -5,7 +5,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32.003px" height="32.003px" viewBox="0 0 32.003 32.003" xml:space="preserve"> - + - + diff --git a/resources/parts/svg/core/icon/wireicon.svg b/resources/parts/svg/core/icon/wireicon.svg index 79c9095cc..4e35c8371 100644 --- a/resources/parts/svg/core/icon/wireicon.svg +++ b/resources/parts/svg/core/icon/wireicon.svg @@ -264,9 +264,9 @@ - + - + - - diff --git a/resources/properties.xml b/resources/properties.xml index 33cf2e206..97d072efa 100644 --- a/resources/properties.xml +++ b/resources/properties.xml @@ -1,11 +1,11 @@ - + - + @@ -26,7 +26,7 @@ - + @@ -43,30 +43,30 @@ - + - + - + - + - + @@ -74,7 +74,7 @@ - + @@ -95,16 +95,16 @@ - + - + - + - + @@ -115,7 +115,7 @@ - + @@ -134,16 +134,16 @@ - + - + - + - + @@ -154,7 +154,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -195,17 +195,17 @@ - - - - - - - + + + + + + + - + @@ -213,24 +213,24 @@ - + - + - + - + - - + + - + - - + + - + \ No newline at end of file diff --git a/resources/ratsnestcolors.xml b/resources/ratsnestcolors.xml index f00fab3ce..e7dc90789 100644 --- a/resources/ratsnestcolors.xml +++ b/resources/ratsnestcolors.xml @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - diff --git a/resources/styles/fritzing.qss b/resources/styles/fritzing.qss index 67d6fdf4e..1f180f098 100644 --- a/resources/styles/fritzing.qss +++ b/resources/styles/fritzing.qss @@ -1,4 +1,4 @@ -/* ########### the partseditor window ############## +/* ########### the partseditor window ############## ################################################ ################################################ ################################################ */ @@ -8,10 +8,10 @@ font-size: 11px; color: #fff; font-family:Droid Sans; - background-color:#666666; + background-color:#666666; } - + #PEToolView::title { border:1px solid #b1b1b1; } @@ -51,7 +51,7 @@ LayerPalette QObject { color:#333; show-decoration-selected: 0; } - + #PEToolView QTreeWidget::item:selected { background:#dadada; @@ -59,7 +59,7 @@ LayerPalette QObject { border:none; show-decoration-selected: 0; } - + #PEToolView QTreeWidget::item:selected:!active { background:transparent; color:#333; @@ -90,7 +90,7 @@ QDialog QTabWidget::pane, #pe_tabs::pane { /*the tab-window*/ - padding: 0px 0px 0px 0px; + padding: 0px 0px 0px 0px; border:none; background:#d9d9d9; margin:0px; @@ -100,13 +100,13 @@ QDialog QTabWidget::pane, } QDialog QTabWidget::tab-bar, -#pe_tabs::tab-bar +#pe_tabs::tab-bar /*this is the complete tab-bar*/ { - top: 0px; - left: 10px; + top: 0px; + left: 10px; right: 0px; - font-family: Droid Sans; + font-family: Droid Sans; font-size:14px; font-weight: regular; background: #b1b1b1; @@ -114,10 +114,10 @@ QDialog QTabWidget::tab-bar, } QDialog QTabWidget QTabBar::tab, -#pe_tabs QTabBar::tab +#pe_tabs QTabBar::tab { margin: 0px 10px -1px 10px; - font-family: Droid Sans; + font-family: Droid Sans; font-size:14px; font-weight: regular; min-height: 35px; @@ -126,7 +126,7 @@ QDialog QTabWidget QTabBar::tab, } QDialog QTabWidget QTabBar::tab:selected, -#pe_tabs QTabBar::tab:selected +#pe_tabs QTabBar::tab:selected /*the active tab*/ { font-family: Droid Sans; @@ -140,9 +140,9 @@ QDialog QTabWidget QTabBar::tab:selected, } QDialog QTabWidget QTabBar::tab:selected:hover, -#pe_tabs QTabBar::tab:selected:hover +#pe_tabs QTabBar::tab:selected:hover /*the active tab hover*/ -{ +{ font-family: Droid Sans; font-size:14px; background-color: transparent; @@ -153,9 +153,9 @@ QDialog QTabWidget QTabBar::tab:selected:hover, background-image: url(:/resources/images/icons/segmentedSwitcherXActiveFocusHover.png); } -QDialog QTabWidget QTabBar::tab:!selected, +QDialog QTabWidget QTabBar::tab:!selected, #pe_tabs QTabBar::tab:!selected { -/*the inactive tabs*/ +/*the inactive tabs*/ background-color: transparent; font-family: Droid Sans; font-size:14px; @@ -165,10 +165,10 @@ QDialog QTabWidget QTabBar::tab:!selected, background-image: url(:/resources/images/icons/segmentedSwitcherXInactiveFocusHover.png); } -QDialog QTabWidget QTabBar::tab:!selected:hover, - #pe_tabs QTabBar::tab:!selected:hover +QDialog QTabWidget QTabBar::tab:!selected:hover, + #pe_tabs QTabBar::tab:!selected:hover /*the inactive tab- hover*/ - { + { background-color: transparent; font-family: Droid Sans; font-size:14px; @@ -213,8 +213,8 @@ QDialog QTabWidget QToolButton::left-arrow:pressed, background-position: center; } - -/* ########### the main window and general things ############## + +/* ########### the main window and general things ############## ################################################ ################################################ ################################################ */ @@ -257,42 +257,42 @@ QStatusBar { -QScrollBar:vertical { - border: 0px; - background:rgba(255,255,255,10); - width:10px; - margin: 0px 0px 0px 0px; - } - -QScrollBar::handle:vertical { +QScrollBar:vertical { + border: 0px; + background:rgba(255,255,255,10); + width:10px; + margin: 0px 0px 0px 0px; + } + +QScrollBar::handle:vertical { border: 2px solid #b2b2b2; border-radius: 2px; background: #b2b2b2; - min-height: 5px; - + min-height: 5px; + } - -QScrollBar::add-line:vertical { - background: none; - height: 1px; - subcontrol-position: bottom; - subcontrol-origin: margin; + +QScrollBar::add-line:vertical { + background: none; + height: 1px; + subcontrol-position: bottom; + subcontrol-origin: margin; } - -QScrollBar::sub-line:vertical { - background:none; - height: 1px; - subcontrol-position: top; - subcontrol-origin: margin; - } - + +QScrollBar::sub-line:vertical { + background:none; + height: 1px; + subcontrol-position: top; + subcontrol-origin: margin; + } + QScrollBar:horizontal { - border: 0px; - background:rgba(255,255,255,10); - height:10px; - margin: 0px 0px 0px 0px; + border: 0px; + background:rgba(255,255,255,10); + height:10px; + margin: 0px 0px 0px 0px; } QScrollBar::handle:horizontal @@ -300,27 +300,27 @@ QScrollBar::handle:horizontal border: 2px solid #b2b2b2; border-radius: 2px; background: #b2b2b2; - min-width: 5px; + min-width: 5px; } - + QScrollBar::add-line:horizontal { - background: none; - width: 1px; + background: none; + width: 1px; subcontrol-position: right; subcontrol-origin: margin; } - + QScrollBar::sub-line:horizontal { - background:none; - width: 1px; + background:none; + width: 1px; subcontrol-position: left; subcontrol-origin: margin; } QScrollBar::add-page:vertical, -QScrollBar::sub-page:vertical +QScrollBar::sub-page:vertical { background: transparent; } @@ -335,7 +335,7 @@ QDoubleSpinBox { font-size: 11px; color: #000; border: none; - + } PCBSketchWidget QObject QDoubleSpinBox::down-button, @@ -457,7 +457,7 @@ QMenu::item:selected { QMenu::separator { background-color: #c1c1c1; height:1px; -} +} QMenu::indicator { width: 15px; @@ -480,49 +480,49 @@ QMenu::item:disabled:selected { QCheckBox::indicator:checked, QMenu::indicator:non-exclusive:checked { image: url(:/resources/images/icons/check.png); - background-color:transparent; - border:none; + background-color:transparent; + border:none; } - + QCheckBox::indicator:checked:selected, QMenu::indicator:non-exclusive:checked:selected { image: url(:/resources/images/icons/checkhover.png); - background-color:transparent; - border:none; + background-color:transparent; + border:none; } - + QCheckBox::indicator:unchecked, QMenu::indicator:non-exclusive:unchecked { /*the checkbox for the mainmenu */ image: url(:/resources/images/icons/nocheck.png); - background-color:transparent; - border:transparent; - + background-color:transparent; + border:transparent; + } - + QCheckBox::indicator:unchecked:selected, QMenu::indicator:non-exclusive:unchecked:selected { image: url(:/resources/images/icons/check.png); - background-color:transparent; - border:none; + background-color:transparent; + border:none; } - - + + /*########### MAIN WINDOW TABBAR #################*/ /*the tab-window*/ -#mainTabBar { +#mainTabBar { qproperty-iconSize: 36px; font-family: Droid Sans; font-size:14px; font-weight: regular; margin-left:10px; } - -#sketch_tabs::pane + +#sketch_tabs::pane { /*the tab-window*/ - padding: 0px 0px 0px 0px; + padding: 0px 0px 0px 0px; border:none; background:#e6eef2; margin:0px; @@ -534,10 +534,10 @@ QMenu::indicator:non-exclusive:unchecked:selected { #sketch_tabs::tab-bar /*this is the complete tab-bar*/ { - top: 0px; - left: 10px; + top: 0px; + left: 10px; right: 0px; - font-family: Droid Sans; + font-family: Droid Sans; font-size:14px; font-weight: regular; background: #b1b1b1; @@ -546,13 +546,13 @@ QMenu::indicator:non-exclusive:unchecked:selected { -#sketch_tabs QTabBar::tab +#sketch_tabs QTabBar::tab { margin: 0px 10px -1px 0px; min-width: 150px; max-width: 150px; font-family: Droid Sans; - font-size:14px; + font-size:14px; font-weight: regular; } @@ -573,7 +573,7 @@ QMenu::indicator:non-exclusive:unchecked:selected { #sketch_tabs QTabBar::tab:selected:hover /*the active tab hover*/ -{ +{ font-family: Droid Sans; font-size:14px; background-color: transparent; @@ -585,7 +585,7 @@ QMenu::indicator:non-exclusive:unchecked:selected { } #sketch_tabs QTabBar::tab:!selected{ -/*the inactive tabs*/ +/*the inactive tabs*/ background-color: transparent; font-family: Droid Sans; font-size:14px; @@ -597,7 +597,7 @@ QMenu::indicator:non-exclusive:unchecked:selected { #sketch_tabs QTabBar::tab:!selected:hover /*the inactive tab- hover*/ - { + { background-color: transparent; font-family: Droid Sans; font-size:14px; @@ -621,20 +621,20 @@ WelcomeView { WelcomeView QFrame { border-bottom: 8px solid #d9d9d9; - font-family: Droid Sans; + font-family: Droid Sans; } WelcomeView QFrame QLabel { border:0px; - font-family: Droid Sans; + font-family: Droid Sans; } - + /* -------- position of WS"content-blocks" ------------ */ #recentFrame { margin: 10px 0px 13px 15px; padding-bottom:5px; background: #fff; - border-bottom: 8px solid #d9d9d9; + border-bottom: 8px solid #d9d9d9; font: Droid Sans; font-family: Droid Sans; max-width: 350px; @@ -644,7 +644,7 @@ WelcomeView QFrame QLabel { { margin: 0px 0px 13px 15px; background: #fff; - border-bottom: 8px solid #d9d9d9; + border-bottom: 8px solid #d9d9d9; font: Droid Sans; font-family: Droid Sans; max-width: 350px; @@ -655,19 +655,19 @@ min-width: 220px; #blogFrame { margin: 10px 15px 13px 15px; background: #fff; - border-bottom: 8px solid #d9d9d9; + border-bottom: 8px solid #d9d9d9; font: Droid Sans; font-family: Droid Sans; - max-width: 820px; + max-width: 820px; } #shopFrame { margin: 0px 15px 13px 15px; background: #fff; - border-bottom: 8px solid #d9d9d9; + border-bottom: 8px solid #d9d9d9; font: Droid Sans; font-family: Droid Sans; - max-width: 820px; + max-width: 820px; } @@ -675,7 +675,7 @@ min-width: 220px; /*#####this is used in blog/projects and shop/fab frame*/ #wsSwitchableFrameHeader -{ +{ border-bottom: 1px solid #c4c4c4; padding: 8px 0px 8px 0px; margin:0px 5px 0px 5px; @@ -684,8 +684,8 @@ min-width: 220px; min-height:18px; max-height:18px; background:#fff; - -} + +} #headerTitle1 { font-size:14px; @@ -714,7 +714,7 @@ min-width: 220px; } -/* ----------- WS-"recentItem"-block ------------- */ +/* ----------- WS-"recentItem"-block ------------- */ #recentTitleFrame { border-bottom: 1px solid #c4c4c4; margin:0px 5px 0px 5px; @@ -725,11 +725,11 @@ min-width: 220px; background:#fff; padding:0px; font-family: Droid Sans; - + } - + #recentTitle -{ +{ font-size:14px; font-weight:bold; color:#323232; @@ -738,7 +738,7 @@ min-width: 220px; margin-right:2px; font-family: Droid Sans; max-height:16px; -} +} @@ -752,12 +752,12 @@ min-width: 220px; min-height:14px; max-height:22px; background:transparent; - - } + + } #recentList { - + border:none; margin: 5px 5px 5px 5px; padding:0px; @@ -766,7 +766,7 @@ min-width: 220px; background:#fff; font: regular Droid Sans; - } + } #recentList::item { @@ -781,7 +781,7 @@ min-width: 220px; font-family: Droid Sans; min-height:14px; max-height:24px; - } + } #recentList::item:selected { @@ -797,16 +797,16 @@ max-height:24px; min-height:14px; max-height:24px; - } + } -#recentSpace +#recentSpace { padding:0px; margin:0px 5px; border-bottom: 1px solid #c4c4c4; max-height:1px; background:transparent; -} +} #recentText { @@ -833,7 +833,7 @@ background:transparent; } -/* ----------- WS-"blog"-block ------------- */ +/* ----------- WS-"blog"-block ------------- */ /******* this is the styling for the blog-frame-title ***********/ @@ -845,7 +845,7 @@ background:transparent; #blogList { - + border:none; margin: 5px 5px 5px 5px; padding:0px; @@ -858,19 +858,19 @@ background:transparent; qproperty-titleTextColor: #000; qproperty-titleTextFontFamily: Droid Sans; - qproperty-titleTextFontSize:14px; - qproperty-titleTextExtraLeading:3px; + qproperty-titleTextFontSize:14px; + qproperty-titleTextExtraLeading:3px; qproperty-introTextColor: #656565; qproperty-introTextFontFamily:Droid Sans; - qproperty-introTextFontSize:12px; - qproperty-introTextExtraLeading:5px; + qproperty-introTextFontSize:12px; + qproperty-introTextExtraLeading:5px; qproperty-dateTextColor: #656565; qproperty-dateTextFontFamily: Droid Sans; qproperty-dateTextFontSize:10px; -} +} #blogList::item { @@ -880,14 +880,14 @@ background:transparent; background:#fff; font-weight: regular; font-family: Droid Sans; - border-bottom:1px solid #d4d4d4; + border-bottom:1px solid #d4d4d4; } /******* this is the styling for the blog-footer ***********/ - + #blogLogo { background:#fff; min-height:22px; @@ -895,13 +895,13 @@ background:transparent; } -/* ----------- WC-"tip"-block ------------- */ +/* ----------- WC-"tip"-block ------------- */ #tipFrame { background: #D5E1E9; border-bottom: 8px solid #A9C6D6; } - + #tipTitle { color: #77ACC2; border-bottom: none; @@ -912,7 +912,7 @@ background:transparent; font-weight:bold; min-height:18px; max-height:18px; -} +} #tipScrollArea { border:none; @@ -923,38 +923,38 @@ background:transparent; #tipScrollArea QScrollBar { border:none; - + } -#tipScrollArea QScrollBar:vertical{ - border: 0px; - background:#D5E1E9; - width:10px; - margin: 0px; - } - -#tipScrollArea QScrollBar::handle:vertical{ +#tipScrollArea QScrollBar:vertical{ + border: 0px; + background:#D5E1E9; + width:10px; + margin: 0px; + } + +#tipScrollArea QScrollBar::handle:vertical{ border: 2px solid #77ACC2; border-radius: 2px; background: #77ACC2; - min-height: 0px; - + min-height: 0px; + } - -#tipScrollArea QScrollBar::add-line:vertical{ - background: #D5E1E9; - height: 10px; - subcontrol-position: bottom; - subcontrol-origin: margin; + +#tipScrollArea QScrollBar::add-line:vertical{ + background: #D5E1E9; + height: 10px; + subcontrol-position: bottom; + subcontrol-origin: margin; + } + +#tipScrollArea QScrollBar::sub-line:vertical{ + background:#D5E1E9; + height: 10px; + subcontrol-position: top; + subcontrol-origin: margin; } - -#tipScrollArea QScrollBar::sub-line:vertical{ - background:#D5E1E9; - height: 10px; - subcontrol-position: top; - subcontrol-origin: margin; - } - + #tip { background: #D5E1E9; @@ -971,10 +971,10 @@ background:transparent; #tipFooterFrame{ margin:5px 10px 5px 10px; border-bottom:none; - + } - -/* ----------- WS-"shop+fab"-block ------------- */ + +/* ----------- WS-"shop+fab"-block ------------- */ #shopContentFrame, #fabContentFrame { @@ -984,7 +984,7 @@ background:transparent; font-family: Droid Sans; margin:5px; height:100%; - + } @@ -997,18 +997,18 @@ background:transparent; margin:0px; padding:0px; } - + #shopContentTextFrame, #fabContentTextFrame{ margin: 5px 5px 5px 15px; border:none; min-width:200px; - + } -#shopContentTextHeadline, +#shopContentTextHeadline, #fabContentTextHeadline { font-size:16px; font-weight:bold; @@ -1026,7 +1026,7 @@ background:transparent; min-height:65px; background:#fff; } - + #shopContentTextCaption, #fabContentTextCaption { @@ -1038,9 +1038,9 @@ background:#fff; } #blogFooterFrame, -#shopFooterFrame, +#shopFooterFrame, #fabFooterFrame { - border-top:1px solid #c4c4c4; + border-top:1px solid #c4c4c4; background:transparent; border-bottom:none; margin:0px 5px 8px 5px; @@ -1070,7 +1070,7 @@ background:#fff; text-align: center; color:#fff; font-weight:bold; - + } QProgressBar::chunk { @@ -1078,9 +1078,9 @@ background:#fff; width: 10px; text-align: center; font-family: Droid Sans; - + } - + /* ############ tooltips for the partsbin and toolbar NOT the main window ########*/ QToolTip { border: 1px solid #fff; @@ -1092,7 +1092,7 @@ background:#fff; font-family: Droid Sans; } - + /* ############## RADIOBUTTON STYLING ###########*/ QWidget QRadioButton::indicator, QRadioButton::indicator { @@ -1100,18 +1100,18 @@ QRadioButton::indicator { height: 13px; background:transparent; } - + QWidget QRadioButton::indicator::unchecked, QRadioButton::indicator::unchecked { image: url(:/resources/images/icons/nocheck.png); background:transparent; } - + QWidget QRadioButton::indicator:unchecked:hover, QRadioButton::indicator:unchecked:hover { image: url(:/resources/images/icons/checkhover.png); } - + QWidget QRadioButton::indicator:unchecked:pressed, QRadioButton::indicator:unchecked:pressed { image: url(:/resources/images/icons/checkactive.png); @@ -1121,12 +1121,12 @@ QWidget QRadioButton::indicator:checked, QRadioButton::indicator::checked { image: url(:/resources/images/icons/check.png); } - + QWidget QRadioButton::indicator:checked:hover, QRadioButton::indicator:checked:hover { image: url(:/resources/images/icons/checkhover.png); } - + QWidget QRadioButton::indicator:checked:pressed, QRadioButton::indicator:checked:pressed { image: url(:/resources/images/icons/checkactive.png); @@ -1143,7 +1143,7 @@ QRadioButton::indicator:checked:pressed { font-size:16px; border: 0px; background-color: transparent; - margin-top: 8px; + margin-top: 8px; margin-bottom: 5px; } @@ -1191,7 +1191,7 @@ QRadioButton::indicator:checked:pressed { color: rgb(214,50,34); border: none; padding:5px 5px 0px 5px; - + } #sketchAreaToolbar QToolButton { /*all the button styleing*/ @@ -1223,7 +1223,7 @@ QRadioButton::indicator:checked:pressed { #sketchAreaToolbar QToolButton::menu-button { /*the little arrow to open the submenu*/ border: none; - /* background-image: none; */ + /* background-image: none; */ margin-top: 28px; margin-right:20px; background:transparent; @@ -1232,21 +1232,21 @@ QRadioButton::indicator:checked:pressed { float:right; } -#sketchAreaToolbar QToolButton::menu-arrow { +#sketchAreaToolbar QToolButton::menu-arrow { image: url(:/resources/images/icons/smalToolarrow-normal.png); border: none; padding: 4px; background:transparent; } -#sketchAreaToolbar QToolButton::menu-arrow:open { +#sketchAreaToolbar QToolButton::menu-arrow:open { border: none; image: url(:/resources/images/icons/smalToolarrow-pressed.png); padding: 4px; background:transparent; } -#sketchAreaToolbar QToolButton::menu-arrow:disabled{ +#sketchAreaToolbar QToolButton::menu-arrow:disabled{ border: none; image: url(:/resources/images/icons/smalToolarrow-inactive.png); padding-top: 0px; @@ -1276,7 +1276,7 @@ QRadioButton::indicator:checked:pressed { margin:5px 10px 5px 5px; } - + #sketchAreaToolbar #shareProjectButton:pressed { color:#fff; border-bottom: 5px solid #148d50; @@ -1286,7 +1286,7 @@ QRadioButton::indicator:checked:pressed { width:80px; margin:5px 10px 5px 5px; } - + #sketchAreaToolbar #orderFabButton{ color:#fff; @@ -1317,7 +1317,7 @@ QRadioButton::indicator:checked:pressed { width:80px; margin:5px 10px 5px 5px; } - + /* ################### zoomslider #################### */ QSlider::groove:horizontal { /*this is the slider - "line" */ @@ -1330,7 +1330,7 @@ QSlider::groove:horizontal { /*this is the slider - "line" */ QSlider::handle:horizontal { /*this is the handle: it needs negative margin to be "bigger" than the slider - "line" */ - width:10px; + width:10px; height:10px; margin-top: -4px; margin-bottom: -4px; @@ -1436,7 +1436,7 @@ FDockWidget::title { padding-left: 6px; padding-top: 2px; padding-bottom: 0px; - + } FDockWidget::close-button, FDockWidget::float-button { @@ -1502,13 +1502,13 @@ background:#d9d9d9; } -HtmlInfoView QScrollBar:vertical { - border: 0px; - background:rgba(255,255,255,10); - width:10px; - margin: 0px 0px 0px 0px; - } - +HtmlInfoView QScrollBar:vertical { + border: 0px; + background:rgba(255,255,255,10); + width:10px; + margin: 0px 0px 0px 0px; + } + #infoViewMainFrame { background-color: #d9d9d9; border: 0px; @@ -1535,7 +1535,7 @@ HtmlInfoView QScrollBar:vertical { padding: 0px; } -#iconLabel { +#iconLabel { background-color: #fff; } @@ -1561,9 +1561,9 @@ HtmlInfoView QScrollBar:vertical { padding: 0px 0px 1px 0px; font-size: 11px; font-weight: normal; - color: #323232; - background: #d9d9d9; - /*just the part description title, not the part main-title*/ + color: #323232; + background: #d9d9d9; + /*just the part description title, not the part main-title*/ } @@ -1748,7 +1748,7 @@ HtmlInfoView QScrollBar:vertical { } /* the title if you have a "advanced settings" box - i.e. gereric ics */ -#infoViewGroupBox { +#infoViewGroupBox { border: 1px solid gray; font-size: 11px; font-weight: bold; @@ -1809,7 +1809,7 @@ margin:0; padding: 0px; max-height: 28px; height: 28px; - + } #partsBinHeaderSeparator { @@ -1838,7 +1838,7 @@ PartsBinIconView { } PartsBinIconView QPushButton{ - padding: 3px; + padding: 3px; selection-background-color: #b1b1b1; background-color:#d9d9d9; border: 0; @@ -1857,7 +1857,7 @@ PartsBinListView::item:selected { color:#333; border:none; } - + PartsBinListView::item:selected:!active { background:#dadada; color:#333; @@ -1889,7 +1889,7 @@ PartsBinPaletteWidget InfoGraphicsView #partsBinContainer { - + background-color: #d9d9d9; /*background of parts library*/ border-top: 1px solid #b1b1b1; } @@ -1928,7 +1928,7 @@ StackTabBar::tab:!selected { } StackTabBar::tab:!selected:hover { - background-color: #ececec; + background-color: #ececec; /*the hover status of the library buttons*/ } @@ -2032,14 +2032,14 @@ QUndoView { background: #d9d9d9; show-decoration-selected: 1; } - + QUndoView::item:selected { background:#b1b1b1; color:#333; border:none; } - + QUndoView::item:selected:!active { background:#dadada; color:#333; @@ -2120,8 +2120,8 @@ QUndoView::item:hover { #aboutText { border: 0px; - background-color: transparent; - margin-top: 0px; + background-color: transparent; + margin-top: 0px; margin-bottom: 0px; } @@ -2134,7 +2134,7 @@ MainWindow { qproperty-fireQuoteDelay: 250; /* milliseconds */ background:#aaa; } - + SketchWidget { border: 0px; font-weight: bold; @@ -2175,7 +2175,7 @@ SearchLineEdit { font-family: Droid Sans, LucidaSans, Tahoma, Arial, sans-serif; border: 1px solid #8c8c8c; } - + /*############# aboutbox ################*/ @@ -2205,7 +2205,7 @@ QDialog QFrame QLabel { PCBSketchWidget QDialogButtonBox, QDialog QDialogButtonBox, -QDialogButtonBox +QDialogButtonBox { font-size: 11px; /*min-width: 100px;*/ @@ -2238,7 +2238,7 @@ QDialog QDialogButtonBox:hover, QDialogButtonBox:hover, QDialog QPushButton:hover { background: #fff; - + } PCBSketchWidget QDialogButtonBox:on, diff --git a/resources/styles/newpartseditor.qss b/resources/styles/newpartseditor.qss index f3b3c76e8..abd0ff8a4 100644 --- a/resources/styles/newpartseditor.qss +++ b/resources/styles/newpartseditor.qss @@ -33,7 +33,7 @@ -/*try to change tab-menu without luck ... +/*try to change tab-menu without luck ... QTabWidget#peTabs ::item { background-image:none; @@ -46,43 +46,43 @@ QTabWidget#peTabs{ color:#00f; font-weight:bold; background-image:none; - } - + } + QTabWidget#peTabs ::pane { border: 10px solid #f0f; background-image:none; } - + QWidget#peTabs ::pane { border: 10px solid #f0f; background-image:none; } - + #peTabs QMenu { background:#f0f; background-image:none; font-size: 10px; font-weight: bold; - - } - + + } + QMenu#peTabs { background:#f0f; background-image:none; font-size: 10px; font-weight: bold; - - } + + } */ - + /* the Infos in the right window. */ QLabel{ background:transparent; background-image:none; font-size: 11px; - } - + } + QComboBox, QPushButton, QPushButton:enabled, @@ -106,9 +106,9 @@ QPushButton:hover{ background:#666; font-size:11px; } - -QComboBox:pressed, + +QComboBox:pressed, QPushButton:pressed{ background-image:none; color: #d9d9d9; @@ -127,7 +127,7 @@ QPushButton:disabled{ } /* drop-down buton of the combobox */ - + QComboBox::drop-down:button { background: transparent; border:none; @@ -172,7 +172,7 @@ QSplitter::handle { width: 4px; color: #666666; background-color: #666666; -} +} /* spinbox styling for connector position */ QDoubleSpinBox { @@ -180,7 +180,7 @@ QDoubleSpinBox { font-size: 11px; color: #000; border: none; - + } QDoubleSpinBox::down-button { @@ -215,11 +215,11 @@ QTableView { background-image:none; image:none; } - + QTreeWidgetItem { selection-background-color: #f0f; background-image:none; image:none; } - + */ \ No newline at end of file diff --git a/resources/styles/partseditor.qss b/resources/styles/partseditor.qss index 6c5c484b7..8379e0991 100644 --- a/resources/styles/partseditor.qss +++ b/resources/styles/partseditor.qss @@ -7,7 +7,7 @@ } PartSpecificationsWidget { - padding: 0px; + padding: 0px; margin: 0px; border: 0px; border-top: 2px solid #52182C; @@ -85,14 +85,14 @@ ConnectorsInfoWidget #title { } PartEditorViewsWidget { - + } PartSpecificationsWidget HashPopulateWidget, PartSpecificationsWidget PartEditorViewsWidget, PartSpecificationsWidget AbstractEditableLabelWidget, ConnectorsInfoWidget { - background-color: #B2B2B2; + background-color: #B2B2B2; border-top-left-radius: 10px; border-top-right-radius: 10px; } @@ -133,15 +133,15 @@ AbstractEditableLabelWidget QLabel { } #partsEditor QTabWidget::pane { - padding: 0px; + padding: 0px; margin: 0px; border: 0px; - + position: absolute; } #partsEditor QTabWidget::tab-bar { - left: 5px; + left: 5px; top: 5px; } @@ -153,11 +153,11 @@ AbstractEditableLabelWidget QLabel { padding-bottom: 4px; padding-left: 6px; padding-right: 6px; - color: #821F09; + color: #821F09; border-bottom: 0px; min-width: 6.5em; max-width: 6.5em; - + margin: 0; padding: 0; min-height: 1.5em; @@ -177,7 +177,7 @@ AbstractEditableLabelWidget QLabel { #partsEditor QTabBar::tab:!selected:hover { border: #F23926; -} +} #scroll_test { @@ -248,11 +248,11 @@ PartsEditorViewsWidget { font-size:12px; border:none; height: 34px; - + } - -#partsEditor QComboBox:pressed, + +#partsEditor QComboBox:pressed, #partsEditor QPushButton:pressed{ background-image:none; color: #d9d9d9; @@ -261,7 +261,7 @@ PartsEditorViewsWidget { border:none; height: 34px; } - + #partsEditor QComboBox:disabled, #partsEditor QPushButton:disabled{ background-image:none; diff --git a/resources/styles/programwindow.qss b/resources/styles/programwindow.qss index 90628ef7a..cd1ca0e1f 100644 --- a/resources/styles/programwindow.qss +++ b/resources/styles/programwindow.qss @@ -8,19 +8,19 @@ #programmingWindow QTabWidget::tab-bar { /*top: %2px;*/ - left: 10px; + left: 10px; right: 10px; - /*top: 5px;*/ + /*top: 5px;*/ background-color: #ff0; color: #f0f; } /*this is the background around the tab-frames*/ -#programmingWindow QTabWidget::pane { +#programmingWindow QTabWidget::pane { /*top: %1px; the value is swapped in at runtime in ProgramWindow::setup() */ - padding: 0px; - margin-top: 0px; + padding: 0px; + margin-top: 0px; border: 0px; background: none; } @@ -42,7 +42,7 @@ } /*the active tab*/ -#programmingWindow QTabBar::tab:selected { +#programmingWindow QTabBar::tab:selected { background-color: #1c1a18; border: none; font-weight: book; @@ -50,7 +50,7 @@ } /*the inactive tabs*/ -#programmingWindow QTabBar::tab:!selected { +#programmingWindow QTabBar::tab:!selected { border: none; color: #999999; font-weight: book; @@ -59,7 +59,7 @@ /*the inactive and active tab-hover-effect */ #programmingWindow QTabBar::tab:!selected:hover -{ +{ background-color: #474141; border:none; color: #c1c1c1; @@ -85,7 +85,7 @@ /*the actual code area */ -#programmingWindow #code { +#programmingWindow #code { color: #ede0ce; background-color: #1c1a18; padding-top: 8px; @@ -96,7 +96,7 @@ /* the splitter/drag handle between code and console */ #programmingWindow QSplitterHandle, -#programmingWindow #splitter { +#programmingWindow #splitter { background: #5f5453; background-color: #5f5453; color: #5f5453; @@ -105,7 +105,7 @@ /* console output window */ #programmingWindow #console { background-color: #8c8686; - color: #3c3936; + color: #3c3936; border: 0px; padding-top: 8px; padding-left: 8px; @@ -174,11 +174,11 @@ font-size:12px; border:none; height: 34px; - + } - -#programmingWindow QComboBox:pressed, + +#programmingWindow QComboBox:pressed, #programmingWindow QPushButton:pressed{ color: #d9d9d9; background:#821f09; @@ -186,7 +186,7 @@ border:none; height: 34px; } - + #programmingWindow QComboBox:disabled, #programmingWindow QPushButton:disabled{ @@ -199,17 +199,17 @@ /* drop-down button of the combobox */ #programmingWindow QComboBox::drop-down:button { - border:none; + border:none; } #programmingWindow QComboBox::drop-down:hover { - border:none; + border:none; } #programmingWindow QComboBox::drop-down:on { - border:none; + border:none; } #programmingWindow QComboBox::drop-down:selected { - border:none; + border:none; } #programmingWindow QComboBox::down-arrow { image: url(:/resources/images/icons/combobox-arrow.png); @@ -225,41 +225,41 @@ #toolBarComboBox QAbstractItemView::item { color: #000; - border-bottom: 5px solid white; margin:3px; + border-bottom: 5px solid white; margin:3px; } #toolBarComboBox QAbstractItemView::item:selected { - border-bottom: 5px solid black; margin:3px; + border-bottom: 5px solid black; margin:3px; } /* scroll bars */ -#programmingWindow QScrollBar:vertical { - border: 0px; - background:rgba(255,255,255,10); - width:10px; - margin: 0px 0px 0px 0px; - } - -#programmingWindow QScrollBar::handle:vertical { +#programmingWindow QScrollBar:vertical { + border: 0px; + background:rgba(255,255,255,10); + width:10px; + margin: 0px 0px 0px 0px; + } + +#programmingWindow QScrollBar::handle:vertical { border: 2px solid #b2b2b2; border-radius: 2px; background: #b2b2b2; - min-height: 5px; + min-height: 5px; } - -#programmingWindow QScrollBar::add-line:vertical { - background: none; - height: 1px; - subcontrol-position: bottom; - subcontrol-origin: margin; + +#programmingWindow QScrollBar::add-line:vertical { + background: none; + height: 1px; + subcontrol-position: bottom; + subcontrol-origin: margin; + } + +#programmingWindow QScrollBar::sub-line:vertical { + background:none; + height: 1px; + subcontrol-position: top; + subcontrol-origin: margin; } - -#programmingWindow QScrollBar::sub-line:vertical { - background:none; - height: 1px; - subcontrol-position: top; - subcontrol-origin: margin; - } /* Serial Monitor Console */ @@ -270,7 +270,7 @@ } -/* not used styling +/* not used styling */ @@ -300,5 +300,3 @@ /* */ - - diff --git a/resources/styles/updatedialog.css b/resources/styles/updatedialog.css index a70217d62..61e6208e7 100644 --- a/resources/styles/updatedialog.css +++ b/resources/styles/updatedialog.css @@ -1,16 +1,15 @@ -table { +table { border-width: 1px 1px 1px 1px; - border-spacing: 2px; - border-style: outset outset outset outset; - border-color: white white white white; - border-collapse: separate; background-color: white; + border-spacing: 2px; + border-style: outset outset outset outset; + border-color: white white white white; + border-collapse: separate; background-color: white; } table td { - border-width: 1px 1px 1px 1px; + border-width: 1px 1px 1px 1px; padding: 1px 1px 1px 1px; - border-style: inset inset inset inset; + border-style: inset inset inset inset; border-color: white white white white; background-color: rgb(255, 250, 250); } - diff --git a/resources/system_icons/linux/fritzing.xml b/resources/system_icons/linux/fritzing.xml index 21c2d8fab..2743487d3 100644 --- a/resources/system_icons/linux/fritzing.xml +++ b/resources/system_icons/linux/fritzing.xml @@ -1,6 +1,6 @@ - + Fritzing Parts Bin diff --git a/resources/templates/generic_female_10thin_pin_header_schem_template.txt b/resources/templates/generic_female_10thin_pin_header_schem_template.txt index 19d44c9a7..71b083452 100644 --- a/resources/templates/generic_female_10thin_pin_header_schem_template.txt +++ b/resources/templates/generic_female_10thin_pin_header_schem_template.txt @@ -4,4 +4,3 @@ %2 - diff --git a/resources/templates/generic_male_pin_header_bread_2nd_template.txt b/resources/templates/generic_male_pin_header_bread_2nd_template.txt index e4d0532a4..92afef635 100644 --- a/resources/templates/generic_male_pin_header_bread_2nd_template.txt +++ b/resources/templates/generic_male_pin_header_bread_2nd_template.txt @@ -1,4 +1,4 @@ - + diff --git a/resources/templates/generic_male_pin_header_bread_template.txt b/resources/templates/generic_male_pin_header_bread_template.txt index 65c58dd0c..983a570a6 100644 --- a/resources/templates/generic_male_pin_header_bread_template.txt +++ b/resources/templates/generic_male_pin_header_bread_template.txt @@ -1,4 +1,4 @@ - + diff --git a/resources/templates/generic_rounded_female_pin_header_bread_2nd_template.txt b/resources/templates/generic_rounded_female_pin_header_bread_2nd_template.txt index 35cd422dd..93a0f67a3 100644 --- a/resources/templates/generic_rounded_female_pin_header_bread_2nd_template.txt +++ b/resources/templates/generic_rounded_female_pin_header_bread_2nd_template.txt @@ -4,15 +4,14 @@ - + - + - diff --git a/resources/templates/generic_rounded_female_pin_header_bread_template.txt b/resources/templates/generic_rounded_female_pin_header_bread_template.txt index 68a3c50ff..3a3439598 100644 --- a/resources/templates/generic_rounded_female_pin_header_bread_template.txt +++ b/resources/templates/generic_rounded_female_pin_header_bread_template.txt @@ -4,15 +4,14 @@ - + - + - diff --git a/resources/templates/generic_sip_bread_template.txt b/resources/templates/generic_sip_bread_template.txt index 428562dd3..eb9de3d5d 100644 --- a/resources/templates/generic_sip_bread_template.txt +++ b/resources/templates/generic_sip_bread_template.txt @@ -1,28 +1,28 @@ - - - + + - + - + IC - + diff --git a/resources/templates/generic_sip_connectorFzpTemplate.txt b/resources/templates/generic_sip_connectorFzpTemplate.txt index 1940d4c89..e8348a8f1 100644 --- a/resources/templates/generic_sip_connectorFzpTemplate.txt +++ b/resources/templates/generic_sip_connectorFzpTemplate.txt @@ -12,4 +12,3 @@

- \ No newline at end of file diff --git a/resources/templates/perfboard_boardLayerTemplate.txt b/resources/templates/perfboard_boardLayerTemplate.txt index e5447743d..236930855 100644 --- a/resources/templates/perfboard_boardLayerTemplate.txt +++ b/resources/templates/perfboard_boardLayerTemplate.txt @@ -1,8 +1,8 @@ - +%5" /> + %8 \ No newline at end of file diff --git a/resources/templates/stripboards.xml b/resources/templates/stripboards.xml index de2a2682a..623d12183 100644 --- a/resources/templates/stripboards.xml +++ b/resources/templates/stripboards.xml @@ -1,8 +1,8 @@ - \ No newline at end of file diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Blink/Blink.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Blink/Blink.ino index dc0e579a1..c20bb9760 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Blink/Blink.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Blink/Blink.ino @@ -1,19 +1,19 @@ /* Blink - + Schaltet eine LED im Rythmus von einer Sekunde an und aus - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int led = 13; // ganzzahlige Variable led wird deklariert void setup() { // die setup()-Methode wird einmal ausgeführt - pinMode(led, OUTPUT); + pinMode(led, OUTPUT); } void loop() { // die loop()-Methode wird immer wiederholt - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(1000); // hält das Programm für 1000 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(1000); // hält das Programm für 1000 Millisekunden an diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Fading/Fading.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Fading/Fading.ino index 8950c0a7b..28b116059 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Fading/Fading.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Fading/Fading.ino @@ -1,25 +1,23 @@ /* Fading dimmt eine LED langsam an und aus - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int ledPin = 9; // ledPin wird deklariert -void setup(){ +void setup(){ // die analoge Ausgabe muss nicht im Setup initialisiert werden -} - -void loop(){ - for(int leuchtwert = 0; leuchtwert <= 255; leuchtwert++) { // fadeValue wird in Fünferschritten hochgezählt - analogWrite(ledPin, leuchtwert); // und als analoger Wert an die LED übertragen - delay(2); // kurze Wartezeit - } - for(int leuchtwert = 255; leuchtwert >= 0; leuchtwert--) { // fadeValue wird in Fünferschritten runtergezählt - analogWrite(ledPin, leuchtwert); // und als analoger Wert an die LED übertragen - delay(2); // kurze Wartezeit - } } - +void loop(){ + for(int leuchtwert = 0; leuchtwert <= 255; leuchtwert++) { // fadeValue wird in Fünferschritten hochgezählt + analogWrite(ledPin, leuchtwert); // und als analoger Wert an die LED übertragen + delay(2); // kurze Wartezeit + } + for(int leuchtwert = 255; leuchtwert >= 0; leuchtwert--) { // fadeValue wird in Fünferschritten runtergezählt + analogWrite(ledPin, leuchtwert); // und als analoger Wert an die LED übertragen + delay(2); // kurze Wartezeit + } +} diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/FlipFlop/FlipFlop.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/FlipFlop/FlipFlop.ino index 2108703ca..ba2d7ce1a 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/FlipFlop/FlipFlop.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/FlipFlop/FlipFlop.ino @@ -1,22 +1,22 @@ /* Flip Flop schaltet mittels eines Tasters zwischen zwei LEDs hin und her - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int tasterPin=2; // Pin an dem der Taster angeschlossen ist int grueneLED=9; // Pin an dem die grüne LED angeschlossen ist -int roteLED=10; // Pin an dem die rote LED angeschlossen ist +int roteLED=10; // Pin an dem die rote LED angeschlossen ist void setup(){ pinMode(tasterPin, INPUT); // Taster Pin wird als INPUT initialisiert pinMode(grueneLED, OUTPUT); // LED Pin wird als OUTPUT initialisiert - pinMode(roteLED, OUTPUT); // LED Pin wird als OUTPUT initialisiert + pinMode(roteLED, OUTPUT); // LED Pin wird als OUTPUT initialisiert } void loop(){ - if (digitalRead(tasterPin)==LOW){ // wenn der Taster gedrückt ist (LOW) + if (digitalRead(tasterPin)==LOW){ // wenn der Taster gedrückt ist (LOW) digitalWrite(grueneLED, HIGH); // grüne LED einschalten digitalWrite(roteLED, LOW); // rote LED abschalten } else { // sonst diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Lauflicht/Lauflicht.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Lauflicht/Lauflicht.ino index 39ceb9612..3c6968566 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Lauflicht/Lauflicht.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Lauflicht/Lauflicht.ino @@ -1,13 +1,13 @@ /* Lauflicht - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int pinsGesamt=8; // deklariert die ganzzahlige Variable pinsGesamt int pins[] = {2,3,4,5,6,7,8,9}; // deklariert das Array pins[] -void setup() { +void setup() { for (int i=0; i0; i-=5){ - analogWrite(motor_Speed,i); + analogWrite(motor_Speed,i); delay(20); } - digitalWrite(motor_A,LOW); + digitalWrite(motor_A,LOW); digitalWrite(motor_B,HIGH); for (int i=0; i<256; i+=5){ analogWrite(motor_Speed,i); @@ -37,5 +37,3 @@ void loop(){ delay(20); } } - - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Nachtlicht/Nachtlicht.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Nachtlicht/Nachtlicht.ino index fcb53a388..1fb526514 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Nachtlicht/Nachtlicht.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Nachtlicht/Nachtlicht.ino @@ -1,13 +1,13 @@ /* Nachtlicht blendet Farben durch - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int LEDGreen=9; // LEDGreen Pins wird deklariert int LEDBlue=10; // LEDBlue Pins wird deklariert -int LEDRed=11; // LEDRed Pins wird deklariert +int LEDRed=11; // LEDRed Pins wird deklariert void setup(){ pinMode(LEDRed,OUTPUT); // Pin wird als OUTPUT initialisiert @@ -23,27 +23,25 @@ void loop(){ analogWrite(LEDGreen,0); // LED wird abgeschaltet } else if (frame<300) { // wenn frame < 300 analogWrite(LEDRed,map(frame,150,300,255,0)); // LED wird ausgedimmt - analogWrite(LEDBlue,map(frame,150,300,0,255)); // LED wird angedimmt + analogWrite(LEDBlue,map(frame,150,300,0,255)); // LED wird angedimmt analogWrite(LEDGreen,0); // LED wird abgeschaltet } else if (frame<450) { // wenn frame < 450 > blau analogWrite(LEDRed,0); // LED wird abgeschaltet analogWrite(LEDBlue,255); // LED wird eingeschaltet - analogWrite(LEDGreen,0); // LED wird abgeschaltet + analogWrite(LEDGreen,0); // LED wird abgeschaltet } else if (frame<600) { // wenn frame < 600 analogWrite(LEDRed,0); // LED wird abgeschaltet - analogWrite(LEDBlue,map(frame,450,600,255,0)); // LED wird ausgedimmt + analogWrite(LEDBlue,map(frame,450,600,255,0)); // LED wird ausgedimmt analogWrite(LEDGreen,map(frame,450,600,0,255)); // LED wird angedimmt } else if (frame<750) { // wenn frame < 750 > grün analogWrite(LEDRed,0); // LED wird abgeschaltet - analogWrite(LEDBlue,0); // LED wird abgeschaltet + analogWrite(LEDBlue,0); // LED wird abgeschaltet analogWrite(LEDGreen,255); // LED wird abgeschaltet } else if (frame<900) { // wenn frame < 900 analogWrite(LEDRed,map(frame,750,900,0,255)); // LED wird angedimmt - analogWrite(LEDBlue,0); // LED wird abgeschaltet + analogWrite(LEDBlue,0); // LED wird abgeschaltet analogWrite(LEDGreen,map(frame,750,900,255,0)); // LED wird ausgedimmt } delay(10); // kurze Pause } } - - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/PingPong/PingPong.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/PingPong/PingPong.ino index fe2c0191c..4c7335035 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/PingPong/PingPong.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/PingPong/PingPong.ino @@ -1,7 +1,7 @@ /* Ping Pong Spiel LED-Matrix und zwei Potis für ein Pingpong Spiel - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -18,7 +18,7 @@ int pot1Pin=18; // Pin an dem das Potenti int pot2Pin=19; // Pin an dem das Potentiometer von Spieler 2 angeschlossen ist int image[8][8]={ // Bild, das auf der Matrix gezeigt wird. 1 = LED an, 0 = LED aus -{0,0,0,0,0,0,0,0}, +{0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, @@ -26,21 +26,21 @@ int image[8][8]={ // Bild, das auf der Matr {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0} -}; +}; int death[8][8]={ // Alles an -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, {1,1,1,1,1,1,1,1} -}; +}; int death2[8][8]={ // Totenkopf -{0,1,1,1,1,1,0,0}, +{0,1,1,1,1,1,0,0}, {1,1,1,1,1,1,1,0}, {1,0,0,1,0,0,1,0}, {1,1,1,1,1,1,1,0}, @@ -48,10 +48,10 @@ int death2[8][8]={ // Totenkopf {0,1,0,1,0,1,0,0}, {0,1,0,1,0,1,0,0}, {0,0,0,0,0,0,0,0} -}; +}; int blank[8][8]={ // alles aus -{0,0,0,0,0,0,0,0}, +{0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, @@ -59,14 +59,14 @@ int blank[8][8]={ // alles aus {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0} -}; +}; long theTimer; // Timervariable int gameState=0; // speichert den Spielmodus int animations=300; // speichert die Dauer der Zwischenbilder -float ballXSpeed = 1; // speichert die Beschleunigung in X-Richtung +float ballXSpeed = 1; // speichert die Beschleunigung in X-Richtung float ballXPosition=4; // speichert die Ballposition als reale Zahl float ballYSpeed = 0; // speichert die Beschleunigung in Y-Richtung @@ -81,14 +81,14 @@ int player2Position=3; // speichert die Paddel int gameSpeed; // speichert die aktuelle Spielgeschwindigkeit void setup(){ - for (int i=0; i<8; i++){ // Alle Pins werden als OUTPUT deklariert + for (int i=0; i<8; i++){ // Alle Pins werden als OUTPUT deklariert pinMode(reihenPins[i],OUTPUT); pinMode(spaltenPins[i],OUTPUT); } } void draw(){ - for (int y=0; y<8; y++){ // zeilenweise werden + for (int y=0; y<8; y++){ // zeilenweise werden for (int x=0; x<8; x++){ // von links nach rechts alle Einträge des Arrays geprüft if (image[x][y]==1){ // ist der Eintrag = 1 digitalWrite(spaltenPins[x],HIGH); // wird der Spaltenpin eingeschalten @@ -114,8 +114,8 @@ void update(){ ballXSpeed=1; } else { ballXSpeed=-1; - } - theTimer=millis(); + } + theTimer=millis(); gameState=1; break; case 1: // Spiel aktiv @@ -126,27 +126,27 @@ void update(){ player1Position=map(analogRead(pot1Pin),0,1023,0,6); // liest die Position von Spieler 1 aus player2Position=map(analogRead(pot2Pin),0,1023,0,6); // liest die Position von Spieler 2 aus - - image[player1Position][0]=1; // Paddel Player 1 darstellen - image[player1Position+1][0]=1; // Paddel Player 1 darstellen - image[player2Position][7]=1; // Paddel Player 2 darstellen - image[player2Position+1][7]=1; // Paddel Player 2 darstellen - + + image[player1Position][0]=1; // Paddel Player 1 darstellen + image[player1Position+1][0]=1; // Paddel Player 1 darstellen + image[player2Position][7]=1; // Paddel Player 2 darstellen + image[player2Position+1][7]=1; // Paddel Player 2 darstellen + if (millis()>theTimer+gameSpeed){ // timer für Spielgeschwindigkeit - if (gameSpeed>50) gameSpeed-=3; // spiel wird beschleunigt + if (gameSpeed>50) gameSpeed-=3; // spiel wird beschleunigt theTimer=millis(); // neuer Timer wird gesetzt - image[imageYPosition][imageXPosition]=0; // alte Position wird überschrieben + image[imageYPosition][imageXPosition]=0; // alte Position wird überschrieben ballXPosition+=ballXSpeed; // Update der Position - ballYPosition+=ballYSpeed; // Update der Position - + ballYPosition+=ballYSpeed; // Update der Position + if (ballYPosition>=7) ballYSpeed*=-1; // Koolision unterer Rand if (ballYPosition<=0) ballYSpeed*=-1; // Koolision oberer Rand ballYPosition=constrain(ballYPosition,0,7); // verhindert, dass Werte kleiner 0 oder größer 7 erreicht werden - ballXPosition=constrain(ballXPosition,0,7); // verhindert, dass Werte kleiner 0 oder größer 7 erreicht werden + ballXPosition=constrain(ballXPosition,0,7); // verhindert, dass Werte kleiner 0 oder größer 7 erreicht werden imageYPosition=round(ballYPosition); - imageXPosition=round(ballXPosition); - + imageXPosition=round(ballXPosition); + if ((ballXPosition>=6)&&(image[imageYPosition][7]==1)) { // wenn der Ball den Rand erreicht und das Paddel trifft ballXSpeed*=-1; // Ball wird reflektiert ballYSpeed=random(-2,3); // Abprallwinkel bekommt Zufallskomponente @@ -161,12 +161,12 @@ void update(){ } if (ballXPosition<=0){ // Ball im Aus - gameState=2; // Spiel verloren Modus wird aktiviert + gameState=2; // Spiel verloren Modus wird aktiviert theTimer=millis(); // neuer Timer wird gesetzt } image[imageYPosition][imageXPosition]=1; // neue Position wird eingeschalten - + } break; case 2: // Spiel verloren, kurze Nachleuchtzeit diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Potentiometer/Potentiometer.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Potentiometer/Potentiometer.ino index 56713eda8..6ce0e642f 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Potentiometer/Potentiometer.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Potentiometer/Potentiometer.ino @@ -1,7 +1,7 @@ /* Potentiometer zwei LEDs werden mit einem Potentiometer gesteuert - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -17,9 +17,7 @@ void loop(){ int value = analogRead(potPin); // die Variable value speichert den Wert des Potentiometers int redValue = map(value,0,1023,0,255); // diser wird mit der Map-Funktion umgerechnet - hier von 0 bis 255, int greenValue = map(value,0,1023,255,0); // hier von 255 - 0 - + analogWrite(ledRed,redValue); // die umgerechneten Werte analogWrite(ledGreen,greenValue); // werden an beide LEDs gesendet } - - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Servo/Servo.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Servo/Servo.ino index a41dc9a62..cc9e9e019 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Servo/Servo.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Servo/Servo.ino @@ -1,25 +1,25 @@ /* Servo ein Potentiometer steuert die Position eines Servos - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ #include // einbinden der Servo Bibliothek (library) - + Servo myservo; // erzeugt ein Servo-Objekt int potpin = 0 ; // Potentiometer-Pin wird deklariert int val; // val speichert den Wert des Potentiometers zwischen - -void setup() -{ + +void setup() +{ myservo.attach(9); // verbindet das Servoobjekt an Pin 9 -} - -void loop() -{ +} + +void loop() +{ val = analogRead(potpin); // Potentiometer-Wert wird ausgelesen val = map(val, 0, 1023, 0, 179); // und in den Wertebereich von 0 bis 179 überführt myservo.write(val); // stellt den Servo auf den Wert val delay(15); // wartet, damit sich der Servo drehen kann -} +} diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Synthesizer/Synthesizer.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Synthesizer/Synthesizer.ino index 577070c53..007bfd653 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Synthesizer/Synthesizer.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Synthesizer/Synthesizer.ino @@ -1,7 +1,7 @@ /* Synthesizer erzeugt eine Frequenzschema aus den Werten zweier Potientiometer - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -28,7 +28,7 @@ void play(int myToneHeight) { // play-Methode void loop() { toneHeight=analogRead(potPin1); // Tonhöhe ist Wert vom Potentiometer 1 lfo=analogRead(potPin2); // lfo ist Wert vom Potentiometer 1 - + for (int i = (lfo/10); i > 0; i--) { // Tonhöhe steigend in Abhängigkeit des lfo Wertes play(toneHeight); } diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_1/Uebung1_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_1/Uebung1_1.ino index b2e2eb5d1..60e5e51f7 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_1/Uebung1_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_1/Uebung1_1.ino @@ -1,29 +1,29 @@ /* Übung 1_1 Blink Rhythmus Dieses programm lässt eine LED in einem Rhythmus blinken. - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int led = 13; // ganzzahlige Variable led wird deklariert void setup() { // die setup()-Methode wird einmal ausgeführt - pinMode(led, OUTPUT); + pinMode(led, OUTPUT); } void loop() { // die loop()-Methode wird immer wiederholt - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(200); // hält das Programm für 200 Millisekunden an - - digitalWrite(led, HIGH); // schaltet die LED ein + + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(200); // hält das Programm für 200 Millisekunden an - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(1000); // hält das Programm für 1000 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab - delay(1000); // hält das Programm für 1000 Millisekunden an + delay(1000); // hält das Programm für 1000 Millisekunden an } diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2a/Uebung1_2a.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2a/Uebung1_2a.ino index 72015f1b8..43bbd3d41 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2a/Uebung1_2a.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2a/Uebung1_2a.ino @@ -4,59 +4,59 @@ * kurz-kurz-kurz = S * lang-lang-lang = O * kurz-kurz-kurz = S - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int led = 13; // ganzzahlige Variable led wird deklariert void setup() { // die setup()-Methode wird einmal ausgeführt - pinMode(led, OUTPUT); + pinMode(led, OUTPUT); } void loop() { // die loop()-Methode wird immer wiederholt - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(200); // hält das Programm für 200 Millisekunden an - - digitalWrite(led, HIGH); // schaltet die LED ein + + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(200); // hält das Programm für 200 Millisekunden an - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(200); // hält das Programm für 200 Millisekunden an - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(500); // hält das Programm für 500 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(500); // hält das Programm für 500 Millisekunden an - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(500); // hält das Programm für 500 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab - delay(500); // hält das Programm für 500 Millisekunden an - - digitalWrite(led, HIGH); // schaltet die LED ein + delay(500); // hält das Programm für 500 Millisekunden an + + digitalWrite(led, HIGH); // schaltet die LED ein delay(500); // hält das Programm für 500 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab - delay(500); // hält das Programm für 500 Millisekunden an - - digitalWrite(led, HIGH); // schaltet die LED ein + delay(500); // hält das Programm für 500 Millisekunden an + + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(200); // hält das Programm für 200 Millisekunden an - - digitalWrite(led, HIGH); // schaltet die LED ein + + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab delay(200); // hält das Programm für 200 Millisekunden an - digitalWrite(led, HIGH); // schaltet die LED ein + digitalWrite(led, HIGH); // schaltet die LED ein delay(200); // hält das Programm für 200 Millisekunden an digitalWrite(led, LOW); // schaltet die LED ab - delay(2000); // hält das Programm für 2000 Millisekunden an + delay(2000); // hält das Programm für 2000 Millisekunden an } diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2b/Uebung1_2b.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2b/Uebung1_2b.ino index 966fb1b78..675dd7f9b 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2b/Uebung1_2b.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung1_2b/Uebung1_2b.ino @@ -4,7 +4,7 @@ * kurz-kurz-kurz = S * lang-lang-lang = O * kurz-kurz-kurz = S - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -12,7 +12,7 @@ int led = 13; // ganzzahlige Variable led wird dek char signals[] = {'.','.','.','-','-','-','.','.','.'}; // variable speichert die Signale: . = kurz, - = lang void setup() { // die setup()-Methode wird einmal ausgeführt - pinMode(led, OUTPUT); + pinMode(led, OUTPUT); } void loop() { // die loop()-Methode wird immer wiederholt @@ -24,5 +24,5 @@ void loop() { // die loop()-Methode wird immer wie if (signals[i]=='.') delay(200); // wenn signals an der Stelle i einen Punkt hat, warte kurz if (signals[i]=='-') delay(500); // wenn signals an der Stelle i einen Strich hat, warte lang } - delay(2000); // hält das Programm für 2000 Millisekunden an + delay(2000); // hält das Programm für 2000 Millisekunden an } diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung2_1/Uebung2_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung2_1/Uebung2_1.ino index 5c054b878..b5fded716 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung2_1/Uebung2_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung2_1/Uebung2_1.ino @@ -1,13 +1,13 @@ /* Lauflicht von beiden Seiten - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int pinsGesamt=8; // deklariert die ganzzahlige Variable pinsGesamt int pins[] = {2,3,4,5,6,7,8,9}; // deklariert das Array pins[] -void setup() { +void setup() { for (int i=0; i=1; i=i-1){ // Lauflicht her digitalWrite(pins[i], HIGH); // LED an der Stelle i einschalten - digitalWrite(pins[7-i], HIGH); // LED an der Stelle 7-i einschalten + digitalWrite(pins[7-i], HIGH); // LED an der Stelle 7-i einschalten delay(100); // hält das Programm für 100 Millisekunden an digitalWrite(pins[i], LOW); // LED an der Stelle i ausschalten - digitalWrite(pins[7-i], LOW); // LED an der Stelle 7-i ausschalten + digitalWrite(pins[7-i], LOW); // LED an der Stelle 7-i ausschalten } } - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_1/Uebung3_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_1/Uebung3_1.ino index 144480fd1..6713c7678 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_1/Uebung3_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_1/Uebung3_1.ino @@ -1,7 +1,7 @@ /* Matrix Übung LED-Matrix zeigt ein anderes Bild - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -15,8 +15,8 @@ int spaltenPins[8] = {13,8,17,10,5,16,4,14}; // Anschlüsse der Spaltenpins am // int spaltenPins[8] = {13,8,57,10,5,56,4,54}; // Anschlüsse der Spaltenpins am Arduino int image[8][8]={ // Bild, das auf der Matrix gezeigt wird. 1 = LED an, 0 = LED aus - -{0,0,1,1,0,1,1,0}, + +{0,0,1,1,0,1,1,0}, {0,1,0,0,1,0,0,1}, {0,1,0,0,0,0,0,1}, {0,0,1,0,0,0,1,0}, @@ -25,17 +25,17 @@ int image[8][8]={ // Bild, das auf der Matrix gezei {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0} -}; +}; void setup(){ - for (int i=0; i<8; i++){ // Alle Pins werden als OUTPUT declariert + for (int i=0; i<8; i++){ // Alle Pins werden als OUTPUT declariert pinMode(reihenPins[i],OUTPUT); pinMode(spaltenPins[i],OUTPUT); } } void loop(){ - for (int y=0; y<8; y++){ // zeilenweise werden + for (int y=0; y<8; y++){ // zeilenweise werden for (int x=0; x<8; x++){ // von links nach rechts alle Einträge des Arrays geprüft if (image[x][y]==1){ // ist der Eintrag = 1 digitalWrite(spaltenPins[x],HIGH); // wird der Spaltenpin eingeschalten diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_2/Uebung3_2.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_2/Uebung3_2.ino index 7c52aa5e6..20dba8911 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_2/Uebung3_2.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung3_2/Uebung3_2.ino @@ -1,7 +1,7 @@ /* Matrix Übung LED-Matrix zeigt eine kleine Animation - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -20,8 +20,8 @@ long timer=0; // Timervariable int timeOut=200; // wie lange soll jedes Bild angezeigt werden (ms) int image[2][8][8]={{ // erstes Bild, das auf der Matrix gezeigt wird - -{0,1,0,0,0,0,1,0}, + +{0,1,0,0,0,0,1,0}, {1,1,1,0,0,1,1,1}, {0,1,0,0,0,0,1,0}, {0,0,0,1,1,0,0,0}, @@ -31,8 +31,8 @@ int image[2][8][8]={{ // erstes Bild, das auf der Matrix gezeigt wird {0,0,1,1,1,1,0,0} },{ // zweites Bild, das auf der Matrix gezeigt wird - -{1,0,1,0,0,1,0,1}, + +{1,0,1,0,0,1,0,1}, {0,1,0,0,0,0,1,0}, {1,0,1,0,0,1,0,1}, {0,0,0,1,1,0,0,0}, @@ -42,10 +42,10 @@ int image[2][8][8]={{ // erstes Bild, das auf der Matrix gezeigt wird {0,0,1,1,1,1,0,0} } -}; +}; void setup(){ - for (int i=0; i<8; i++){ // Alle Pins werden als OUTPUT deklariert + for (int i=0; i<8; i++){ // Alle Pins werden als OUTPUT deklariert pinMode(reihenPins[i],OUTPUT); pinMode(spaltenPins[i],OUTPUT); } @@ -57,7 +57,7 @@ void loop(){ if (imageNr==0) imageNr=1; // wenn Bild 0 angezeigt wird, soll nur Bild 1 angezeigt werden else imageNr=0; // wenn Bild 1 angezeigt wird, soll nur Bild 0 angezeigt werden } - for (int y=0; y<8; y++){ // zeilenweise werden + for (int y=0; y<8; y++){ // zeilenweise werden for (int x=0; x<8; x++){ // von links nach rechts alle Einträge des Arrays geprüft if (image[imageNr][x][y]==1){ // ist der Eintrag = 1 digitalWrite(spaltenPins[x],HIGH); // wird der Spaltenpin eingeschalten diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung4_1/Uebung4_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung4_1/Uebung4_1.ino index 08cdc9a75..73f46924e 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung4_1/Uebung4_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung4_1/Uebung4_1.ino @@ -1,13 +1,13 @@ /* Flip Flop Übung schaltet mittels eines Tasters zwischen zwei LEDs hin und her - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int tasterPin=2; // Pin an dem der Taster angeschlossen ist int grueneLED=9; // Pin an dem die grüne LED angeschlossen ist -int roteLED=10; // Pin an dem die rote LED angeschlossen ist +int roteLED=10; // Pin an dem die rote LED angeschlossen ist int zustand=1; // speichert den Zustand des Programmes : 1 = gruen, -1 = rot boolean tasterAusgeloest=false; // speichert, ob der Taster gerade gedrückt wurde @@ -15,7 +15,7 @@ boolean tasterAusgeloest=false; // speichert, ob der Taster gerade gedrü void setup(){ pinMode(tasterPin, INPUT); // Taster Pin wird als INPUT initialisiert pinMode(grueneLED, OUTPUT); // LED Pin wird als OUTPUT initialisiert - pinMode(roteLED, OUTPUT); // LED Pin wird als OUTPUT initialisiert + pinMode(roteLED, OUTPUT); // LED Pin wird als OUTPUT initialisiert } void loop(){ @@ -23,12 +23,12 @@ void loop(){ tasterAusgeloest=true; // diese Variable und die Abfrage in der letzten Zeile verhindern ein dauerndes Umschalten, probiere aus, was passiert, wenn Du diese Zeile weglässt zustand=zustand*-1; // der Zustand wird umgekehrt } - + if (digitalRead(tasterPin)==HIGH){ // wenn der Taster nicht gedrückt wird tasterAusgeloest=false; // wird tasterAusgelöst auf falsch gesetzt } - if (zustand==-1){ // wenn der Zustand -1 ist + if (zustand==-1){ // wenn der Zustand -1 ist digitalWrite(grueneLED, HIGH); // grüne LED einschalten digitalWrite(roteLED, LOW); // rote LED abschalten } else { // sonst diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung6_1/Uebung6_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung6_1/Uebung6_1.ino index fb223f054..0cd0226bd 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung6_1/Uebung6_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Uebung6_1/Uebung6_1.ino @@ -1,28 +1,26 @@ /* Fading dimmt zwei LEDs langsam an und aus - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int led1Pin = 9; // led1Pin wird deklariert int led2Pin = 10; // led2Pin wird deklariert -void setup(){ +void setup(){ // die analoge Ausgabe muss nicht im Setup initialisiert werden -} - -void loop(){ - for(int leuchtwert = 0; leuchtwert <= 255; leuchtwert++) { // fadeValue wird in Fünferschritten hochgezählt - analogWrite(led1Pin, leuchtwert); // und als analoger Wert an die LED übertragen - analogWrite(led2Pin, 255-leuchtwert); // 255-leuchtwert erzeugt genau das umgekehrte Verhalten - delay(2); // kurze Wartezeit - } - for(int leuchtwert = 255; leuchtwert >= 0; leuchtwert--) { // fadeValue wird in Fünferschritten runtergezählt - analogWrite(led1Pin, leuchtwert); // und als analoger Wert an die LED übertragen - analogWrite(led2Pin, 255-leuchtwert); // 255-leuchtwert erzeugt genau das umgekehrte Verhalten - delay(2); // kurze Wartezeit - } } - +void loop(){ + for(int leuchtwert = 0; leuchtwert <= 255; leuchtwert++) { // fadeValue wird in Fünferschritten hochgezählt + analogWrite(led1Pin, leuchtwert); // und als analoger Wert an die LED übertragen + analogWrite(led2Pin, 255-leuchtwert); // 255-leuchtwert erzeugt genau das umgekehrte Verhalten + delay(2); // kurze Wartezeit + } + for(int leuchtwert = 255; leuchtwert >= 0; leuchtwert--) { // fadeValue wird in Fünferschritten runtergezählt + analogWrite(led1Pin, leuchtwert); // und als analoger Wert an die LED übertragen + analogWrite(led2Pin, 255-leuchtwert); // 255-leuchtwert erzeugt genau das umgekehrte Verhalten + delay(2); // kurze Wartezeit + } +} diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Wahrsager/Wahrsager.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Wahrsager/Wahrsager.ino index 52a496bb4..67d1cacb5 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Wahrsager/Wahrsager.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Fritzing Creator Kit/Wahrsager/Wahrsager.ino @@ -1,15 +1,15 @@ /* Wahrsager schaltet zwischen fünf LEDs um die Zukunft vorher zu sagen - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int pins[] = {8,9,10,11,12}; // Pins der einzelnen LEDs werden in einem Array gespeichert int tiltPin = 3; // Pin-Nummer des Neigungsschalters wird deklariert -void setup() { - for (int i=0; i<5; i=i+1){ +void setup() { + for (int i=0; i<5; i=i+1){ pinMode(pins[i] , OUTPUT); // LED Pins werden als OUTPUTS deklariert } pinMode(tiltPin,INPUT); // Pin des Neigungsschalters wird als INPUT deklariert diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/RGB/RGB.pde b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/RGB/RGB.pde index 6841abba3..44b0191de 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/RGB/RGB.pde +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/RGB/RGB.pde @@ -1,7 +1,7 @@ -import processing.serial.*; -import cc.arduino.*; +import processing.serial.*; +import cc.arduino.*; -Arduino meinArduino; +Arduino meinArduino; int potPin=0; int value; @@ -21,7 +21,7 @@ int oldBlue; void setup() { size(255,300,P3D); println(Serial.list()); // List all the available serial ports: - meinArduino = new Arduino(this, Arduino.list()[4], 57600); + meinArduino = new Arduino(this, Arduino.list()[4], 57600); noStroke(); } @@ -31,12 +31,12 @@ void graphics(int theValue){ fill(100); rect(0,20,width,20); rect(0,60,width,20); - rect(0,100,width,20); + rect(0,100,width,20); fill(255,0,0); rect(0,20,redX,20); fill(0,255,0); rect(0,60,greenX,20); fill(0,0,255); rect(0,100,blueX,20); colorMode(HSB, 100); - fill(value,100,100); + fill(value,100,100); rect(0,160,width,height); } @@ -58,7 +58,7 @@ void draw(){ } graphics(value); - + if (redX!=oldRed){ meinArduino.analogWrite(redPin,redX); oldRed=redX; diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus/TwitterSaurus.pde b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus/TwitterSaurus.pde index 5a51617aa..30072b753 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus/TwitterSaurus.pde +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus/TwitterSaurus.pde @@ -4,9 +4,9 @@ import ddf.minim.*; /* TwitterSaurus - Dieses Programm sucht nach einem Suchbegriff auf Twitter. Wenn ein neuer Beitrag geschrieben wird, + Dieses Programm sucht nach einem Suchbegriff auf Twitter. Wenn ein neuer Beitrag geschrieben wird, wird ein Sound ausgelöst und ein Servo dreht sich. Er bewegt das Maul des Dinosauriers des Fritzing Creator Kits. - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -30,7 +30,7 @@ TwitterFactory twitterFactory; int servoPin=10; // Servo an Arduino-Pin -void setup(){ +void setup(){ size(400,200); // legt die Größe des Programmfensters fest ConfigurationBuilder cb = new ConfigurationBuilder(); // ConfigurationBuilder für Twitter cb.setOAuthConsumerKey("uzr17kGYqhgNDjTBNQd1qA"); // Hier muss Dein ConsumerKey eingegeben werden @@ -40,12 +40,12 @@ void setup(){ twitterFactory = new TwitterFactory(cb.build()); // öffnet eine Verbindung zu Twitter twitter = twitterFactory.getInstance(); - + minim = new Minim(this); // Minim (Bibliothek für die Soundausgabe) wird initialisiert sound1 = minim.loadSample("sound1.wav"); // Sounddatei wird geladen font = loadFont("OCRAStd-14.vlw"); // Font-Datei wird geladen textFont(font); // Font wird initialisiert - println(Arduino.list()); // Alle seriellen Geräte werden in einer Liste ausgegeben, die Nummer für das Arduino muss + println(Arduino.list()); // Alle seriellen Geräte werden in einer Liste ausgegeben, die Nummer für das Arduino muss arduino = new Arduino(this, Arduino.list()[4]); // hier übergeben werden: Arduino.list()[nummer] arduino.pinMode(servoPin, Arduino.OUTPUT); // Servo Pin wird im Arduino als Output festgelegt } @@ -54,7 +54,7 @@ void alertMe(){ sound1.trigger(); // Soundsample wird abgespielt arduino.analogWrite(servoPin, 120); // Servo wird gedreht delay(500); // warten - arduino.analogWrite(servoPin, 20); // Servo wird gedreht + arduino.analogWrite(servoPin, 20); // Servo wird gedreht delay(500); // warten } @@ -65,7 +65,7 @@ void twitterConnect(){ for (Status status : result.getTweets()) { println("@" + status.getUser().getScreenName() + ":" + status.getText()); currentMessage="@" + status.getUser().getScreenName() + ":" + status.getText(); - } + } } catch (TwitterException e) { // bei Fehler println("Couldn't connect: " + e); // Fehlermeldung wird ausgegeben @@ -78,11 +78,10 @@ void draw(){ timer=millis(); // timer wird neu gestartet } - if (currentMessage.equals(lastMessage) == false) { // wenn aktuelle Nachricht anders als letzte Nachricht ist + if (currentMessage.equals(lastMessage) == false) { // wenn aktuelle Nachricht anders als letzte Nachricht ist background(0); // Hindergrund füllen text(currentMessage, 10, 20,width-20,height-40); // Tweet als Text ausgeben alertMe(); // Methodenaufruf lastMessage=currentMessage; // letzteNachricht auf aktuelle Nachricht senden } } - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus/code/twitter4j-core-3.0.3.jar b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus/code/twitter4j-core-3.0.3.jar deleted file mode 100644 index b9394f43c..000000000 Binary files a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus/code/twitter4j-core-3.0.3.jar and /dev/null differ diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus2/TwitterSaurus2.pde b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus2/TwitterSaurus2.pde index 758306ee6..35377b66c 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus2/TwitterSaurus2.pde +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-de/Processing/TwitterSaurus2/TwitterSaurus2.pde @@ -1,28 +1,28 @@ /* - + Just a simple Processing and Twitter thingy majiggy - + RobotGrrl.com - + Code licensed under: CC-BY - + */ - + // First step is to register your Twitter application at dev.twitter.com // Once registered, you will have the info for the OAuth tokens // You can get the Access token info by clicking on the button on the // right on your twitter app's page // Good luck, and have fun! - + // This is where you enter your Oauth info static String OAuthConsumerKey = "uzr17kGYqhgNDjTBNQd1qA"; static String OAuthConsumerSecret = "ZZUfCHruwv4d6Tn9uGz0UGebxfn4oQDikv3NeCbd14"; - + // This is where you enter your Access Token info static String AccessToken = "221060254-8MJIyVpXotDhemKaJKVN88L1FlCcndToB8y143LU"; static String AccessTokenSecret = "A2R7IkcSniMnBHYeRK02umHoIvrsHQAdx4NaMq6toY"; - + // Just some random variables kicking around String myTimeline; java.util.List statuses = null; @@ -35,29 +35,29 @@ TwitterFactory twitterFactory; RequestToken requestToken; String[] theSearchTweets = new String[11]; - - - + + + void setup() { - + size(100,100); background(0); - + connectTwitter(); //sendTweet("Hey from Simple Processing woop woop #loadedsith #robotgirl"); //getTimeline(); -getSearchTweets(); - +getSearchTweets(); + } - - + + void draw() { - + background(0); - + } - - + + // Initial connection void connectTwitter() { ConfigurationBuilder cb = new ConfigurationBuilder(); @@ -69,47 +69,47 @@ twitterFactory = new TwitterFactory(cb.build()); twitter = twitterFactory.getInstance(); println("connected"); } - + // Sending a tweet void sendTweet(String t) { - + try { Status status = twitter.updateStatus(t); println("Successfully updated the status to [" + status.getText() + "]."); } catch(TwitterException e) { println("Send tweet: " + e + " Status code: " + e.getStatusCode()); } - + } - - + + // Loading up the access token private static AccessToken loadAccessToken(){ return new AccessToken(AccessToken, AccessTokenSecret); } - - + + // Get your tweets void getTimeline() { - + try { statuses = twitter.getUserTimeline(); } catch(TwitterException e) { println("Get timeline: " + e + " Status code: " + e.getStatusCode()); } - + for(int i=0; i=1; i=i-1){ // chasing left (except the outer leds) digitalWrite(pins[i], HIGH); // switching the LED at position i on digitalWrite(pins[7-i], HIGH); // switching the LED at position 7-i on delay(100); // stopping the program for 100 milliseconds digitalWrite(pins[i], LOW); // switching the LED at position i off - digitalWrite(pins[7-i], LOW); // switching the LED at position 7-i off + digitalWrite(pins[7-i], LOW); // switching the LED at position 7-i off } } - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_1/Exercise3_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_1/Exercise3_1.ino index 7a90f6dd6..dcb4ad899 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_1/Exercise3_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_1/Exercise3_1.ino @@ -1,7 +1,7 @@ /* Matrix Exercise LED-Matrix displaying a different image - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -16,7 +16,7 @@ int colPins[8] = {13,8,17,10,5,16,4,14}; // matrix columns connected to the Ar int image[8][8]={ // the image shown on the matrix : 1 = LED on, 0 = LED off -{0,0,1,1,0,1,1,0}, +{0,0,1,1,0,1,1,0}, {0,1,0,0,1,0,0,1}, {0,1,0,0,0,0,0,1}, {0,0,1,0,0,0,1,0}, @@ -25,18 +25,18 @@ int image[8][8]={ // the image shown on the matrix {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0} -}; +}; void setup(){ - for (int i=0; i<8; i++){ // all pins are declared as outputs + for (int i=0; i<8; i++){ // all pins are declared as outputs pinMode(rowPins[i],OUTPUT); pinMode(colPins[i],OUTPUT); } } void loop(){ - for (int y=0; y<8; y++){ // rowwise - for (int x=0; x<8; x++){ // check all entries of the array from left to right + for (int y=0; y<8; y++){ // rowwise + for (int x=0; x<8; x++){ // check all entries of the array from left to right if (image[x][y]==1){ // is the entry 1 digitalWrite(colPins[x],HIGH); // switch on column pin } else { // else diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_2/Exercise3_2.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_2/Exercise3_2.ino index e94a89b62..9a5504ee6 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_2/Exercise3_2.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise3_2/Exercise3_2.ino @@ -1,7 +1,7 @@ /* Matrix LED-Matrix displaying a little animation - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -20,8 +20,8 @@ long timer=0; // timer variable int timeOut=200; // time an image should be displayed (ms) int image[2][8][8]={{ // the first image displayed on the matrix - -{0,1,0,0,0,0,1,0}, + +{0,1,0,0,0,0,1,0}, {1,1,1,0,0,1,1,1}, {0,1,0,0,0,0,1,0}, {0,0,0,1,1,0,0,0}, @@ -31,8 +31,8 @@ int image[2][8][8]={{ // the first image displayed on t {0,0,1,1,1,1,0,0} },{ // the second image displayed on the matrix - -{1,0,1,0,0,1,0,1}, + +{1,0,1,0,0,1,0,1}, {0,1,0,0,0,0,1,0}, {1,0,1,0,0,1,0,1}, {0,0,0,1,1,0,0,0}, @@ -42,10 +42,10 @@ int image[2][8][8]={{ // the first image displayed on t {0,0,1,1,1,1,0,0} } -}; +}; void setup(){ - for (int i=0; i<8; i++){ // all pins are declared as outputs + for (int i=0; i<8; i++){ // all pins are declared as outputs pinMode(rowPins[i],OUTPUT); pinMode(colPins[i],OUTPUT); } @@ -57,8 +57,8 @@ void loop(){ if (imageNr==0) imageNr=1; // if image 0 was displayed, display image 1 else imageNr=0; // if image 1 was displayed, display image 0 } - for (int y=0; y<8; y++){ // rowwise - for (int x=0; x<8; x++){ // check all entries of the array from left to right + for (int y=0; y<8; y++){ // rowwise + for (int x=0; x<8; x++){ // check all entries of the array from left to right if (image[imageNr][x][y]==1){ // is the entry 1 digitalWrite(colPins[x],HIGH); // switch on column pin } else { // else diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise4_1/Exercise4_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise4_1/Exercise4_1.ino index 66a9db74e..1b3024b21 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise4_1/Exercise4_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise4_1/Exercise4_1.ino @@ -1,21 +1,21 @@ /* Flip Flop switching between two LEDs using a button - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int buttonPin=2; // Pin where the button is attached int greenLED=9; // Pin where the green LED is attached -int redLED=10; // Pin where the red LED is attached +int redLED=10; // Pin where the red LED is attached int state=1; // store the state of the program : 1 = green, -1 = red boolean buttonPressed=false; // stpre if a button was pressed void setup(){ - pinMode(buttonPin, INPUT); // button is initialised as INPUT - pinMode(greenLED, OUTPUT); // green LED pin is initialised as OUTPUT - pinMode(redLED, OUTPUT); // red LED pin is initialised as OUTPUT + pinMode(buttonPin, INPUT); // button is initialised as INPUT + pinMode(greenLED, OUTPUT); // green LED pin is initialised as OUTPUT + pinMode(redLED, OUTPUT); // red LED pin is initialised as OUTPUT } void loop(){ @@ -23,7 +23,7 @@ void loop(){ buttonPressed=true; // this line of code stops the state from flipping unnecessarily - see what happens if you comment it out state=-state; // the state is reversed } - + if (digitalRead(buttonPin)==HIGH){ // if the button is not pressed anymore buttonPressed=false; // the flag buttonPressed is set to false } diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise6_1/Exercise6_1.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise6_1/Exercise6_1.ino index 638f1ce55..a56521677 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise6_1/Exercise6_1.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Exercise6_1/Exercise6_1.ino @@ -1,28 +1,26 @@ /* Fading fading two LEDs slowly on and off - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int led1Pin = 9; // led1Pin is declared int led2Pin = 10; // led2Pin is declared -void setup(){ - // no need to declare the analog output in the setup -} - -void loop(){ - for(int fadeValue = 0; fadeValue <= 255; fadeValue += 5) { // fadeValue is counted up in steps of five - analogWrite(led1Pin, fadeValue); // and sent to the led as an analog value - analogWrite(led2Pin, 255-fadeValue); // 255-fadeValue produces the opposite fading behavior - delay(2); // short stop - } - for(int fadeValue = 255; fadeValue >= 0; fadeValue -= 5) { // fadeValue is counted down in steps of five - analogWrite(led1Pin, fadeValue); // and sent to the led as an analog value - analogWrite(led2Pin, 255-fadeValue); // 255-fadeValue produces the opposite fading behavior - delay(2); // short stop - } +void setup(){ + // no need to declare the analog output in the setup } - +void loop(){ + for(int fadeValue = 0; fadeValue <= 255; fadeValue += 5) { // fadeValue is counted up in steps of five + analogWrite(led1Pin, fadeValue); // and sent to the led as an analog value + analogWrite(led2Pin, 255-fadeValue); // 255-fadeValue produces the opposite fading behavior + delay(2); // short stop + } + for(int fadeValue = 255; fadeValue >= 0; fadeValue -= 5) { // fadeValue is counted down in steps of five + analogWrite(led1Pin, fadeValue); // and sent to the led as an analog value + analogWrite(led2Pin, 255-fadeValue); // 255-fadeValue produces the opposite fading behavior + delay(2); // short stop + } +} diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fading/Fading.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fading/Fading.ino index 61e90f9dd..e6fce0343 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fading/Fading.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fading/Fading.ino @@ -1,25 +1,23 @@ /* Fading fading an LED slowly on and off again - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int ledPin = 9; // ledPin is declared -void setup(){ - // no need to declare the analog output in the setup -} +void setup(){ + // no need to declare the analog output in the setup +} -void loop(){ +void loop(){ for(int fadeValue = 0; fadeValue <= 255; fadeValue += 5) { // fadeValue is counted up in steps of five analogWrite(ledPin, fadeValue); // and sent to the led as an analog value - delay(2); // short stop - } + delay(2); // short stop + } for(int fadeValue = 255; fadeValue >= 0; fadeValue -= 5) { // fadeValue is counted down in steps of five - analogWrite(ledPin, fadeValue); // and sent to the led as an analog value - delay(2); // short stop - } + analogWrite(ledPin, fadeValue); // and sent to the led as an analog value + delay(2); // short stop + } } - - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/FlipFlop/FlipFlop.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/FlipFlop/FlipFlop.ino index c7f18bbb4..61f09fbb3 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/FlipFlop/FlipFlop.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/FlipFlop/FlipFlop.ino @@ -1,22 +1,22 @@ /* Flip Flop switching between two LEDs using a button - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ int buttonPin=2; // Pin where the button is attached int greenLED=9; // Pin where the green LED is attached -int redLED=10; // Pin where the red LED is attached +int redLED=10; // Pin where the red LED is attached void setup(){ - pinMode(buttonPin, INPUT); // button is initialised as INPUT - pinMode(greenLED, OUTPUT); // green LED pin is initialised as OUTPUT - pinMode(redLED, OUTPUT); // red LED pin is initialised as OUTPUT + pinMode(buttonPin, INPUT); // button is initialised as INPUT + pinMode(greenLED, OUTPUT); // green LED pin is initialised as OUTPUT + pinMode(redLED, OUTPUT); // red LED pin is initialised as OUTPUT } void loop(){ - if (digitalRead(buttonPin)==LOW){ // if the button is pressed (LOW) + if (digitalRead(buttonPin)==LOW){ // if the button is pressed (LOW) digitalWrite(greenLED, HIGH); // switch on green LED digitalWrite(redLED, LOW); // switch off red LED } else { // else (if button is not pressed) diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fortuneteller/Fortuneteller.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fortuneteller/Fortuneteller.ino index 4dd1ba17e..af9b7f2fb 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fortuneteller/Fortuneteller.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Fortuneteller/Fortuneteller.ino @@ -1,15 +1,15 @@ /* fortune teller switching between five LEDs to tell the future - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creatorkit. */ int pins[] = {8,9,10,11,12}; // the pins of the LEDs are stored in an array int tiltPin = 3; // pin number where the tilt switch is attached -void setup() { - for (int i=0; i<5; i=i+1){ +void setup() { + for (int i=0; i<5; i=i+1){ pinMode(pins[i] , OUTPUT); // LED pins are declared as outputs } pinMode(tiltPin,INPUT); // pin of the tilt switch is declared as input @@ -20,8 +20,8 @@ void loop() { if (digitalRead(tiltPin)==HIGH){ // when the tilt switch is open for (int i=0; i<5; i=i+1){ // all the LEDs digitalWrite(pins[i],LOW); // get switched off - } // - int myRandom=random(0,5); // a random LED + } // + int myRandom=random(0,5); // a random LED digitalWrite(pins[myRandom],HIGH); // is switched on delay(20); // the program is waiting to breath } diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Matrix/Matrix.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Matrix/Matrix.ino index e26eb9bad..806bcec1f 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Matrix/Matrix.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Matrix/Matrix.ino @@ -1,7 +1,7 @@ /* Matrix LED-Matrix displaying image - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -15,8 +15,8 @@ int colPins[8] = {13,8,17,10,5,16,4,14}; // matrix columns connected to the Ar // int colPins[8] = {13,8,57,10,5,56,4,54}; // matrix columns connected to the Arduino int image[8][8]={ // the image displayed on the matrix : 1 = LED on, 0 = LED off - -{0,1,0,0,0,0,1,0}, + +{0,1,0,0,0,0,1,0}, {1,1,1,0,0,1,1,1}, {0,1,0,0,0,0,1,0}, {0,0,0,1,1,0,0,0}, @@ -25,18 +25,18 @@ int image[8][8]={ // the image displayed on the ma {0,1,1,1,1,1,1,0}, {0,0,1,1,1,1,0,0} -}; +}; void setup(){ - for (int i=0; i<8; i++){ // all pins are declared as outputs + for (int i=0; i<8; i++){ // all pins are declared as outputs pinMode(rowPins[i],OUTPUT); pinMode(colPins[i],OUTPUT); } } void loop(){ - for (int y=0; y<8; y++){ // rowwise - for (int x=0; x<8; x++){ // check all entries of the array from left to right + for (int y=0; y<8; y++){ // rowwise + for (int x=0; x<8; x++){ // check all entries of the array from left to right if (image[x][y]==1){ // is the entry 1 digitalWrite(colPins[x],HIGH); // switch on column pin } else { // else diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Motor/Motor.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Motor/Motor.ino index cda7f18ef..4f3848213 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Motor/Motor.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Motor/Motor.ino @@ -1,7 +1,7 @@ /* Motor turning a motor clock then counter clock wise - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creatorkit. */ @@ -17,7 +17,7 @@ void setup(){ void loop(){ digitalWrite(motor_A,HIGH); // motor A pin switched to HIGH (+5V) digitalWrite(motor_B,LOW); // motor B pin switched to LOW (GND) - for (int i=0; i<256; i+=5){ // count up to 255 in steps of five + for (int i=0; i<256; i+=5){ // count up to 255 in steps of five analogWrite(motor_Speed,i); // and write it as speed to the speed pin delay(20); // wait 20 ms } @@ -26,9 +26,9 @@ void loop(){ delay(20); // wait 20 ms } - digitalWrite(motor_A,LOW); // motor A pin switched to HIGH (GND) + digitalWrite(motor_A,LOW); // motor A pin switched to HIGH (GND) digitalWrite(motor_B,HIGH); // motor B pin switched to LOW (+5V) - for (int i=0; i<256; i+=5){ // count up to 255 in steps of five + for (int i=0; i<256; i+=5){ // count up to 255 in steps of five analogWrite(motor_Speed,i); // and write it as speed to the speed pin delay(20); // wait 20 ms } @@ -37,5 +37,3 @@ void loop(){ delay(20); // wait 20 ms } } - - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Nightlight/Nightlight.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Nightlight/Nightlight.ino index 374644c74..0c3e5015c 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Nightlight/Nightlight.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Nightlight/Nightlight.ino @@ -1,7 +1,7 @@ /* night light fading through the colors of a rainbow - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creatorkit. */ @@ -16,34 +16,32 @@ void setup(){ } void loop(){ - for (int frame=0; frame<900; frame++){ // frame is counted up from 0 to 900 + for (int frame=0; frame<900; frame++){ // frame is counted up from 0 to 900 if (frame<150) { // if frame < 150 => red analogWrite(LEDRed,255); // LED switched on analogWrite(LEDBlue,0); // switch off LED analogWrite(LEDGreen,0); // switch off LED } else if (frame<300) { // if frame < 300 analogWrite(LEDRed,map(frame,150,300,255,0)); // fade off LED - analogWrite(LEDBlue,map(frame,150,300,0,255)); // fade on LED + analogWrite(LEDBlue,map(frame,150,300,0,255)); // fade on LED analogWrite(LEDGreen,0); // switch off LED } else if (frame<450) { // if frame < 450 => blue analogWrite(LEDRed,0); // switch off LED analogWrite(LEDBlue,255); // switch on LED - analogWrite(LEDGreen,0); // switch off LED + analogWrite(LEDGreen,0); // switch off LED } else if (frame<600) { // if frame < 600 analogWrite(LEDRed,0); // switch off LED - analogWrite(LEDBlue,map(frame,450,600,255,0)); // fade off LED + analogWrite(LEDBlue,map(frame,450,600,255,0)); // fade off LED analogWrite(LEDGreen,map(frame,450,600,0,255)); // fade on LED } else if (frame<750) { // if frame < 750 => green analogWrite(LEDRed,0); // switch off LED - analogWrite(LEDBlue,0); // switch off LED + analogWrite(LEDBlue,0); // switch off LED analogWrite(LEDGreen,255); // switch off LED } else if (frame<900) { // if frame < 900 analogWrite(LEDRed,map(frame,750,900,0,255)); // fade on LED - analogWrite(LEDBlue,0); // switch off LED + analogWrite(LEDBlue,0); // switch off LED analogWrite(LEDGreen,map(frame,750,900,255,0)); // fade off LED } delay(10); // short break } } - - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/PingPong/PingPong.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/PingPong/PingPong.ino index 9377973ca..4f8850014 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/PingPong/PingPong.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/PingPong/PingPong.ino @@ -1,7 +1,7 @@ /* Ping Pong game LED-Matrix is used to play Ping Pong - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -17,8 +17,8 @@ int colPins[8] = {13,8,17,10,5,16,4,14}; // matrix columns connected to the Ar int pot1Pin=18; // declaring the pin for player 1's potentiometer int pot2Pin=19; // declaring the pin for player 2's potentiometer -int image[8][8]={ // clear -{0,0,0,0,0,0,0,0}, +int image[8][8]={ // clear +{0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, @@ -26,21 +26,21 @@ int image[8][8]={ // clear {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0} -}; +}; int death[8][8]={ // all on -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, -{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, +{1,1,1,1,1,1,1,1}, {1,1,1,1,1,1,1,1} -}; +}; int death2[8][8]={ // skull -{0,1,1,1,1,1,0,0}, +{0,1,1,1,1,1,0,0}, {1,1,1,1,1,1,1,0}, {1,0,0,1,0,0,1,0}, {1,1,1,1,1,1,1,0}, @@ -48,10 +48,10 @@ int death2[8][8]={ // skull {0,1,0,1,0,1,0,0}, {0,1,0,1,0,1,0,0}, {0,0,0,0,0,0,0,0} -}; +}; int blank[8][8]={ // all off -{0,0,0,0,0,0,0,0}, +{0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, @@ -59,14 +59,14 @@ int blank[8][8]={ // all off {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0}, {0,0,0,0,0,0,0,0} -}; +}; long theTimer; // timer variable int gameState=0; // storing the game status int animations=300; // storing the duration of the images between the games -float ballXSpeed = 1; // storing the x acceleration +float ballXSpeed = 1; // storing the x acceleration float ballXPosition=4; // storing the ball position as number float ballYSpeed = 0; // storing the y acceleration @@ -88,13 +88,13 @@ void setup(){ } void draw(){ - for (int y=0; y<8; y++){ // rowwise + for (int y=0; y<8; y++){ // rowwise for (int x=0; x<8; x++){ // from left to right, entries are checked if (image[x][y]==1){ // if entry equals 1 digitalWrite(colPins[x],HIGH); // the column pin is switched on } else { // else digitalWrite(colPins[x],LOW); // the column pin is switched off - } + } } digitalWrite(rowPins[y],LOW); // switch the row pin to LOW (because it is the cathod of the LED LOW menas ON) delayMicroseconds(1000); // stop the program for 1 seconds @@ -114,8 +114,8 @@ void update(){ ballXSpeed=1; } else { ballXSpeed=-1; - } - theTimer=millis(); + } + theTimer=millis(); gameState=1; break; case 1: // game active @@ -126,27 +126,27 @@ void update(){ player1Position=map(analogRead(pot1Pin),0,1023,0,6); // reading the position of player 1 player2Position=map(analogRead(pot2Pin),0,1023,0,6); // reading the position of player 2 - - image[player1Position][0]=1; // paddle player 1 display + + image[player1Position][0]=1; // paddle player 1 display image[player1Position+1][0]=1; // paddle player 1 display image[player2Position][7]=1; // paddle player 2 display image[player2Position+1][7]=1; // paddle player 2 display - + if (millis()>theTimer+gameSpeed){ // timer for game speed if (gameSpeed>50) gameSpeed-=3; // accelerate game theTimer=millis(); // set new timer image[imageYPosition][imageXPosition]=0; // overwrite old position ballXPosition+=ballXSpeed; // update position - ballYPosition+=ballYSpeed; // update position - + ballYPosition+=ballYSpeed; // update position + if (ballYPosition>=7) ballYSpeed*=-1; // collision bottom border if (ballYPosition<=0) ballYSpeed*=-1; // collision top border ballYPosition=constrain(ballYPosition,0,7); // constrain values between 0 and 7 ballXPosition=constrain(ballXPosition,0,7); // constrain values between 0 and 7 - imageYPosition=round(ballYPosition); - imageXPosition=round(ballXPosition); - + imageYPosition=round(ballYPosition); + imageXPosition=round(ballXPosition); + if ((ballXPosition>=6)&&(image[imageYPosition][7]==1)) { // if ball hits a paddle ballXSpeed*=-1; // reflect the ball ballYSpeed=random(-2,3); // random reflection angle @@ -166,9 +166,9 @@ void update(){ } image[imageYPosition][imageXPosition]=1; // set new image position - + } - break; + break; case 2: // game was lost if (millis()>theTimer+gameSpeed){ // wait for a short time theTimer=millis(); diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Potentiometer/Potentiometer.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Potentiometer/Potentiometer.ino index 5565e2fe9..7267ab300 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Potentiometer/Potentiometer.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Potentiometer/Potentiometer.ino @@ -1,7 +1,7 @@ /* potentiometer two LEDs are controlled by a potentiometer - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -17,9 +17,7 @@ void loop(){ int value = analogRead(potPin); // this variable stores the value from the potentiometer int redValue = map(value,0,1023,0,255); // mapped from a range of 0 to 1023 to a range of 0 to 255 for the red LED, int greenValue = map(value,0,1023,255,0); // and for the green mapped to the reverse range from 255 to 0 - + analogWrite(ledRed,redValue); // the recalculated values are analogWrite(ledGreen,greenValue); // send to the LEDs as analog values } - - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Servo/Servo.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Servo/Servo.ino index 8e206ae58..fd7b278b9 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Servo/Servo.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Servo/Servo.ino @@ -1,25 +1,25 @@ /* Servo a potentiometer controls the position of a servo - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ #include // include the library Servo.h - + Servo myservo; // creates a servo object int potpin = 0 ; // potentiometer pin declaration int val; // val stores the position of the potentiometer - -void setup() -{ + +void setup() +{ myservo.attach(9); // connects a servo object to pin 9 -} - -void loop() -{ +} + +void loop() +{ val = analogRead(potpin); // potentiometer value is read out val = map(val, 0, 1023, 0, 179); // and mapped to the range 0 to 179 myservo.write(val); // turning the servo to the angle in val delay(15); // give the servo time to react -} +} diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Synthesizer/Synthesizer.ino b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Synthesizer/Synthesizer.ino index f9f5643ad..35cc9a628 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Synthesizer/Synthesizer.ino +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Fritzing Creator Kit/Synthesizer/Synthesizer.ino @@ -1,7 +1,7 @@ /* Synthesizer creating sound from electronics - + This example is part of the Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -20,15 +20,15 @@ void setup() { void play(int myToneHeight) { // play method digitalWrite(buzzerPin, HIGH); // piezo is switched on - delayMicroseconds(myToneHeight); // stopping time influenced by toneHeight + delayMicroseconds(myToneHeight); // stopping time influenced by toneHeight digitalWrite(buzzerPin, LOW); // piezo is switched off - delayMicroseconds(myToneHeight); // stopping time influenced by toneHeight + delayMicroseconds(myToneHeight); // stopping time influenced by toneHeight } void loop() { toneHeight=analogRead(potPin1); // toneheight is value of potentiometer 1 lfo=analogRead(potPin2); // lfo is value of potentiometer 2 - + for (int i = (lfo/10); i > 0; i--) { // toneheight rising depending on lfo play(toneHeight); // execute play method } diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/RGB/RGB.pde b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/RGB/RGB.pde index 6841abba3..44b0191de 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/RGB/RGB.pde +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/RGB/RGB.pde @@ -1,7 +1,7 @@ -import processing.serial.*; -import cc.arduino.*; +import processing.serial.*; +import cc.arduino.*; -Arduino meinArduino; +Arduino meinArduino; int potPin=0; int value; @@ -21,7 +21,7 @@ int oldBlue; void setup() { size(255,300,P3D); println(Serial.list()); // List all the available serial ports: - meinArduino = new Arduino(this, Arduino.list()[4], 57600); + meinArduino = new Arduino(this, Arduino.list()[4], 57600); noStroke(); } @@ -31,12 +31,12 @@ void graphics(int theValue){ fill(100); rect(0,20,width,20); rect(0,60,width,20); - rect(0,100,width,20); + rect(0,100,width,20); fill(255,0,0); rect(0,20,redX,20); fill(0,255,0); rect(0,60,greenX,20); fill(0,0,255); rect(0,100,blueX,20); colorMode(HSB, 100); - fill(value,100,100); + fill(value,100,100); rect(0,160,width,height); } @@ -58,7 +58,7 @@ void draw(){ } graphics(value); - + if (redX!=oldRed){ meinArduino.analogWrite(redPin,redX); oldRed=redX; diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus/TwitterSaurus.pde b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus/TwitterSaurus.pde index 5a51617aa..30072b753 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus/TwitterSaurus.pde +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus/TwitterSaurus.pde @@ -4,9 +4,9 @@ import ddf.minim.*; /* TwitterSaurus - Dieses Programm sucht nach einem Suchbegriff auf Twitter. Wenn ein neuer Beitrag geschrieben wird, + Dieses Programm sucht nach einem Suchbegriff auf Twitter. Wenn ein neuer Beitrag geschrieben wird, wird ein Sound ausgelöst und ein Servo dreht sich. Er bewegt das Maul des Dinosauriers des Fritzing Creator Kits. - + Dieses Beispiel aus dem Fritzing Creator Kit: www.fritzing.org/creator-kit. */ @@ -30,7 +30,7 @@ TwitterFactory twitterFactory; int servoPin=10; // Servo an Arduino-Pin -void setup(){ +void setup(){ size(400,200); // legt die Größe des Programmfensters fest ConfigurationBuilder cb = new ConfigurationBuilder(); // ConfigurationBuilder für Twitter cb.setOAuthConsumerKey("uzr17kGYqhgNDjTBNQd1qA"); // Hier muss Dein ConsumerKey eingegeben werden @@ -40,12 +40,12 @@ void setup(){ twitterFactory = new TwitterFactory(cb.build()); // öffnet eine Verbindung zu Twitter twitter = twitterFactory.getInstance(); - + minim = new Minim(this); // Minim (Bibliothek für die Soundausgabe) wird initialisiert sound1 = minim.loadSample("sound1.wav"); // Sounddatei wird geladen font = loadFont("OCRAStd-14.vlw"); // Font-Datei wird geladen textFont(font); // Font wird initialisiert - println(Arduino.list()); // Alle seriellen Geräte werden in einer Liste ausgegeben, die Nummer für das Arduino muss + println(Arduino.list()); // Alle seriellen Geräte werden in einer Liste ausgegeben, die Nummer für das Arduino muss arduino = new Arduino(this, Arduino.list()[4]); // hier übergeben werden: Arduino.list()[nummer] arduino.pinMode(servoPin, Arduino.OUTPUT); // Servo Pin wird im Arduino als Output festgelegt } @@ -54,7 +54,7 @@ void alertMe(){ sound1.trigger(); // Soundsample wird abgespielt arduino.analogWrite(servoPin, 120); // Servo wird gedreht delay(500); // warten - arduino.analogWrite(servoPin, 20); // Servo wird gedreht + arduino.analogWrite(servoPin, 20); // Servo wird gedreht delay(500); // warten } @@ -65,7 +65,7 @@ void twitterConnect(){ for (Status status : result.getTweets()) { println("@" + status.getUser().getScreenName() + ":" + status.getText()); currentMessage="@" + status.getUser().getScreenName() + ":" + status.getText(); - } + } } catch (TwitterException e) { // bei Fehler println("Couldn't connect: " + e); // Fehlermeldung wird ausgegeben @@ -78,11 +78,10 @@ void draw(){ timer=millis(); // timer wird neu gestartet } - if (currentMessage.equals(lastMessage) == false) { // wenn aktuelle Nachricht anders als letzte Nachricht ist + if (currentMessage.equals(lastMessage) == false) { // wenn aktuelle Nachricht anders als letzte Nachricht ist background(0); // Hindergrund füllen text(currentMessage, 10, 20,width-20,height-40); // Tweet als Text ausgeben alertMe(); // Methodenaufruf lastMessage=currentMessage; // letzteNachricht auf aktuelle Nachricht senden } } - diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus/code/twitter4j-core-3.0.3.jar b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus/code/twitter4j-core-3.0.3.jar deleted file mode 100644 index b9394f43c..000000000 Binary files a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus/code/twitter4j-core-3.0.3.jar and /dev/null differ diff --git a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus2/TwitterSaurus2.pde b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus2/TwitterSaurus2.pde index 758306ee6..35377b66c 100644 --- a/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus2/TwitterSaurus2.pde +++ b/sketches/core/Fritzing Creator Kit DE+EN/creator-kit-en/Processing/TwitterSaurus2/TwitterSaurus2.pde @@ -1,28 +1,28 @@ /* - + Just a simple Processing and Twitter thingy majiggy - + RobotGrrl.com - + Code licensed under: CC-BY - + */ - + // First step is to register your Twitter application at dev.twitter.com // Once registered, you will have the info for the OAuth tokens // You can get the Access token info by clicking on the button on the // right on your twitter app's page // Good luck, and have fun! - + // This is where you enter your Oauth info static String OAuthConsumerKey = "uzr17kGYqhgNDjTBNQd1qA"; static String OAuthConsumerSecret = "ZZUfCHruwv4d6Tn9uGz0UGebxfn4oQDikv3NeCbd14"; - + // This is where you enter your Access Token info static String AccessToken = "221060254-8MJIyVpXotDhemKaJKVN88L1FlCcndToB8y143LU"; static String AccessTokenSecret = "A2R7IkcSniMnBHYeRK02umHoIvrsHQAdx4NaMq6toY"; - + // Just some random variables kicking around String myTimeline; java.util.List statuses = null; @@ -35,29 +35,29 @@ TwitterFactory twitterFactory; RequestToken requestToken; String[] theSearchTweets = new String[11]; - - - + + + void setup() { - + size(100,100); background(0); - + connectTwitter(); //sendTweet("Hey from Simple Processing woop woop #loadedsith #robotgirl"); //getTimeline(); -getSearchTweets(); - +getSearchTweets(); + } - - + + void draw() { - + background(0); - + } - - + + // Initial connection void connectTwitter() { ConfigurationBuilder cb = new ConfigurationBuilder(); @@ -69,47 +69,47 @@ twitterFactory = new TwitterFactory(cb.build()); twitter = twitterFactory.getInstance(); println("connected"); } - + // Sending a tweet void sendTweet(String t) { - + try { Status status = twitter.updateStatus(t); println("Successfully updated the status to [" + status.getText() + "]."); } catch(TwitterException e) { println("Send tweet: " + e + " Status code: " + e.getStatusCode()); } - + } - - + + // Loading up the access token private static AccessToken loadAccessToken(){ return new AccessToken(AccessToken, AccessTokenSecret); } - - + + // Get your tweets void getTimeline() { - + try { statuses = twitter.getUserTimeline(); } catch(TwitterException e) { println("Get timeline: " + e + " Status code: " + e.getStatusCode()); } - + for(int i=0; i - + - + @@ -109,7 +109,7 @@ - + @@ -142,8 +142,8 @@ - - + + @@ -174,8 +174,8 @@ - - + + @@ -194,8 +194,8 @@ - - + + @@ -220,11 +220,11 @@ - + - + - + @@ -233,20 +233,20 @@ - - - + + + - + - + - + @@ -260,7 +260,7 @@ - + @@ -270,51 +270,51 @@ - + - + - + - + - + - + - + - + - + @@ -322,10 +322,10 @@ - + - + @@ -338,16 +338,16 @@ - + - + - + @@ -355,20 +355,20 @@ - + - + - + @@ -388,7 +388,7 @@ - + @@ -408,12 +408,12 @@ - + - + @@ -433,12 +433,12 @@ - + - + @@ -449,9 +449,9 @@ - + - + ## Connector pins #for $pin in $pinList diff --git a/tools/scripts/obsolete/dilPackageGenerator/dilpackage_svg.tmpl b/tools/scripts/obsolete/dilPackageGenerator/dilpackage_svg.tmpl index 415ab4217..07da7865b 100644 --- a/tools/scripts/obsolete/dilPackageGenerator/dilpackage_svg.tmpl +++ b/tools/scripts/obsolete/dilPackageGenerator/dilpackage_svg.tmpl @@ -40,7 +40,7 @@ #set $m3 = $midY + 2.9 ## 19.4 #set $m4 = $midY + 5 ## 21.5 #set $m5 = $midY -1.5 ## 14.97 (15) -#set $m6 = $midY -2.75 ## 13.75 +#set $m6 = $midY -2.75 ## 13.75 #set $m7 = $midY -2.9 ## 13.58 (13.6) ## midoffset #set $midOff = $midY - 10.5 ## 5.99 (6.0) @@ -62,7 +62,7 @@ #end for -## +## ## Stuff in the middle diff --git a/tools/scripts/obsolete/dilPackageGenerator/generator.py b/tools/scripts/obsolete/dilPackageGenerator/generator.py index 51bba23e7..3217fe950 100644 --- a/tools/scripts/obsolete/dilPackageGenerator/generator.py +++ b/tools/scripts/obsolete/dilPackageGenerator/generator.py @@ -32,10 +32,10 @@ Run it in the commandline with this: python generator.py [-f] [-n numberOfPins] [--narrow|--medium|--wide|--extrawide] TITLE ["text on chip"] - + To get the full help about these options and arguments use python generator.py --help - + """ @@ -54,9 +54,9 @@ SVG_SCHEMATIC_TEMPLATE_FILE = 'dilpackage_schematic_svg.tmpl' PARTFILE_TEMPLATE_FILE = 'dilpackage_fzp.tmpl' FOOTPRINTS_DIRECTORY = "pcb" -availablePackages = {'narrow': [4, 6, 8, 14, 16, 18, 20, 22, 24, 28], - 'medium': [8, 14, 16, 18, 20, 22, 24, 28], - 'wide': [28, 32, 36, 40, 42, 44, 48], +availablePackages = {'narrow': [4, 6, 8, 14, 16, 18, 20, 22, 24, 28], + 'medium': [8, 14, 16, 18, 20, 22, 24, 28], + 'wide': [28, 32, 36, 40, 42, 44, 48], 'extra': [64] } letterAppendixForType = {'narrow': 'N', 'medium': 'M', 'wide': 'W', 'extra': 'X'} @@ -86,7 +86,7 @@ Default number of pins is 6. --narrow, --medium, --wide, --extrawide - argument indicating is whether to create a wide or narrow package. + argument indicating is whether to create a wide or narrow package. Has to be '--narrow', '--medium', '--wide' or '--extrawide'. Narrow means bridging 3 pins. (300 mil) Medium means bridging 4 pins. (400 mil) @@ -98,7 +98,7 @@ the title of the IC Package (e.g. 555Timer) A folder named TITLE will be created and all images and xml will be created therein. This argument must be given. - + "text on chip" the text which is printed on the chip If more than one word is used, it needs to be in quotes. (") @@ -194,7 +194,7 @@ def main(argv=None): numberOfPins = value if option in ("--narrow", "--medium", "--wide", "--extrawide"): wideOrNarrow = option[2:] - + # argument processing if args: packageName = args.pop(0) @@ -207,7 +207,7 @@ def main(argv=None): if args: # More arguments than we are able to handle print >> sys.stderr, "\nWarning: Superfluous arguments are discarded: %s" % (args) - + # Check validity of number of pins pinsPattern = re.compile(r'\d+') if numberOfPins and pinsPattern.match(numberOfPins): @@ -220,13 +220,13 @@ def main(argv=None): # Get the config config = ConfigParser.ConfigParser() config.readfp(open(getConfigFile('defaults.cfg'))) - + print "packageName : %s" % packageName print "numberOfPins: %s" % numberOfPins print "forceFlag : %s" % forceFlag print "textOnChip : %s" % textOnChip print "wideMediumOrNarrow: %s" % wideOrNarrow - + # Test if the number of pins is an existing DIL Package if not (numberOfPins in availablePackages[wideOrNarrow]): print >> sys.stderr, """\nWarning: Number of pins is wrong for DIL Package:\n\tDIL packages with %d pins do not exits in the %s package.\n\tThe script will continue, but you might not be able to create a correct PCB\n\twith the resulting part.""" % (numberOfPins, wideOrNarrow) @@ -234,7 +234,7 @@ def main(argv=None): if (ARGUMENT_DEBUG): # Exit For debugging: sys.exit() - + # Check if the directory did not already exist try: os.mkdir(packageName) @@ -243,7 +243,7 @@ def main(argv=None): print >> sys.stderr, "\nError: The directory %s already exists. Script aborted. Use -f to override\n\t for help use --help" % (packageName) return 2 output = packageName - + # Setup default values metaData = {} metaData['moduleID'] = makeUUID() @@ -271,8 +271,8 @@ def main(argv=None): else: # extra wide sL['height'] = 93 - sL['heightInch'] = "%.2fin" % (sL['height'] / 100.0) # the template svg is 100 ppi - + sL['heightInch'] = "%.2fin" % (sL['height'] / 100.0) # the template svg is 100 ppi + # For schematic sL['schematicWidth'] = 110 # Prepare the pins for the breadboard and schematic @@ -287,7 +287,7 @@ def main(argv=None): aPin['connectorPadName'] = "connector%dpad" % (num) aPin['connectorTerminalName'] = "connector%dterminal" % (num) if num < (numberOfPins / 2): - # Bottom row (breadboard) + # Bottom row (breadboard) aPin['startX'] = (num * 10) + 3.5 aPin['startPinY'] = sL['height'] - 4.34 # 28.66 aPin['startTermY'] = sL['height'] - 3 # 30 @@ -304,7 +304,7 @@ def main(argv=None): aPin['schematicTextAnchor'] = "end" else: # Top row (breadboard) - aPin['startX'] = ((numberOfPins - num) * 10) - 6.5 # 3.5 + aPin['startX'] = ((numberOfPins - num) * 10) - 6.5 # 3.5 aPin['startPinY'] = 0 aPin['startTermY'] = 0 aPin['startLegY'] = 0 @@ -318,20 +318,20 @@ def main(argv=None): aPin['schematicLegX2'] = sL['schematicWidth'] + 63.15 aPin['schematicTextX'] = sL['schematicWidth'] + 36 aPin['schematicTextAnchor'] = "start" - pinList.append(aPin) + pinList.append(aPin) sL['pinList'] = pinList # Breadboard & Icon Measurements sL['width'] = 10 * (numberOfPins / 2) - sL['widthInch'] = "%.2fin" % (sL['width'] / 100.0) # the template svg is 100 ppi + sL['widthInch'] = "%.2fin" % (sL['width'] / 100.0) # the template svg is 100 ppi sL['nMiddlePins'] = (numberOfPins / 2) - 2 # Schematic Measurements sL['schematicWidthViewBox'] = sL['schematicWidth'] + 64.3 # 84.3px sL['schematicWidthPx'] = "%.1fpx" % (sL['schematicWidthViewBox']) sL['schematicHeightViewBox'] = (26 * (numberOfPins / 2)) + 6.3 # 174.3px - sL['schematicHeightPx'] = "%.1fpx" % (sL['schematicHeightViewBox']) + sL['schematicHeightPx'] = "%.1fpx" % (sL['schematicHeightViewBox']) sL['schematicHeight'] = (26 * (numberOfPins / 2)) + 4 # 82 - sL['schematicMiddleX'] = (sL['schematicWidth'] / 2) + 32.15 # 87.15 + sL['schematicMiddleX'] = (sL['schematicWidth'] / 2) + 32.15 # 87.15 sL['schematicMiddleY'] = (sL['schematicHeight'] / 2) + 7 # 48 # General sL['textOnChip'] = textOnChip @@ -364,7 +364,7 @@ def main(argv=None): t = Template(file=getTemplatefile(PARTFILE_TEMPLATE_FILE), searchList = [sL]) # TODO make this fzp writeOutFileInSubDirectoryWithData(output, "", "%s.fzp" % (shortFileName), t) - + print "Ready" print """---------------------------------------------------------------- diff --git a/tools/scripts/obsolete/footgen/footgen.py b/tools/scripts/obsolete/footgen/footgen.py index a2fecbae7..7e14f10ac 100644 --- a/tools/scripts/obsolete/footgen/footgen.py +++ b/tools/scripts/obsolete/footgen/footgen.py @@ -113,7 +113,7 @@ def ballpos(ball_name): count = count +1 col = int(col) return [col,row] - + # expand B1:C5 to list of balls def expandexpr(inputbuf): # single ball has no : @@ -123,7 +123,7 @@ def expandexpr(inputbuf): expanded = "" pos1 = ballpos(inputbuf[:inputbuf.find(":")]) pos2 = ballpos(inputbuf[inputbuf.find(":")+1:]) - # Make sure order is increasing + # Make sure order is increasing if pos1[0]>pos2[0]: tmp = pos1[0] pos1[0] = pos2[0] @@ -153,7 +153,7 @@ def expandomitlist(omitlist): expandedlist = expandedlist + expandexpr(tmpbuf) # debug: print expandedlist return expandedlist - + def findattr(attrlist, name): for attribute in attrlist: if attribute[0]==name: @@ -197,7 +197,7 @@ def padctr(x,y,height,width,clear,mask,pinname): x2 = x + linelength/2 y1 = y y2 = y - return pad(x1,y1,x2,y2,linewidth,clear,mask,pinname,"square") + return pad(x1,y1,x2,y2,linewidth,clear,mask,pinname,"square") # ball is a zero length round pad def ball(x, y, dia, clear, mask, name): @@ -398,7 +398,7 @@ def so(attrlist): soelt = soelt + rowofpads([-rowpos,-skew], pitch, "down", padwidth, padheight, 1, pins/2, maskclear, polyclear) soelt = soelt + rowofpads([rowpos,skew], pitch, "up", padwidth, padheight, 1+pins/2, pins/2, maskclear, polyclear) silkboxheight = max(pitch*(pins-2)/2+padheight+2*silkoffset,silkboxheight) - + silky = silkboxheight/2 len = 0 print "EP" + str(ep) @@ -407,7 +407,7 @@ def so(attrlist): len = (rect - ep) / 2 if ep: soelt = soelt + pad(0,len,0,-len,ep,polyclear,maskclear,str(pins+1),"rect") - + # Inside box with notched corner as submitted in patch by PRB if(silkstyle == "inside"): silkx = width/2 - silkoffset @@ -570,7 +570,7 @@ def genpart(attributes): else: print "Unknown type "+parttype print "" - return "" + return "" def inquotes(origstring): quotepos = re.search("\".*\"", origstring) @@ -590,7 +590,7 @@ def str2pcbunits(dist): return int(0.5 + val * 100) elif dist[number.end():].find("in")!=-1: return int(0.5 + val * 100000) - return int(val+0.5) + return int(val+0.5) import sys #import string @@ -645,6 +645,6 @@ def str2pcbunits(dist): validline = 1 if not validline: print "Ignoring garbage at line %d :%s" % (linenum, line) - + print "%d lines read" % linenum sys.exit(0) diff --git a/tools/scripts/obsolete/footgen/footprintdata b/tools/scripts/obsolete/footgen/footprintdata index e5ab52595..1a0e8f000 100644 --- a/tools/scripts/obsolete/footgen/footprintdata +++ b/tools/scripts/obsolete/footgen/footprintdata @@ -248,7 +248,7 @@ part "SFP-base" # incomplete, needs mounting holes and more ep = 3 mm rect = 6 mm part "SFP-base" # incomplete, needs mounting holes and more - rect = 0 + rect = 0 ep = 0 skew = 0 # end SOIC diff --git a/tools/scripts/obsolete/fp2fzfp/fp2fzfp.py b/tools/scripts/obsolete/fp2fzfp/fp2fzfp.py index d7f73826c..de02c274d 100644 --- a/tools/scripts/obsolete/fp2fzfp/fp2fzfp.py +++ b/tools/scripts/obsolete/fp2fzfp/fp2fzfp.py @@ -1,8 +1,8 @@ #pcb object reader - loads gEDA PCB files into python tree structure # caveats: -# 1. comments are escaped except for the case where the # characer appears -# in a quoted string... probably need to fix the regex -# 2. currently this parser assumes proper line breaks - this may choke on +# 1. comments are escaped except for the case where the # characer appears +# in a quoted string... probably need to fix the regex +# 2. currently this parser assumes proper line breaks - this may choke on # some poorly formatted files - need to use a different tokenizer than string.splitlines() import re @@ -33,18 +33,18 @@ def findBrackets(obj): cIndex = obj.find('[') mIndex = obj.find('(') - + #TODO use an exception #both are -1 - parse error if((cIndex == -1) and (mIndex == -1)): print "PCB Parse Error on string: " + obj return None, None - + if(((cIndex < mIndex) and (cIndex != -1)) or (mIndex == -1)): return "[", "]" else: return "(", ")" - + def splitObj(obj): lBracket, rBracket = findBrackets(obj) if not(lBracket): @@ -54,7 +54,7 @@ def splitObj(obj): tag = tag.strip() params = params.rstrip(rBracket) return tag, sep, params - + def toXML(tag, attrDict, sep): rtn = "<" + tag if(sep == "["): @@ -64,12 +64,12 @@ def toXML(tag, attrDict, sep): for key in attrDict.keys(): rtn = rtn + " " + key + '="' + attrDict[key] + '"' rtn = rtn + ">" - return rtn - + return rtn + def tokenize(instr, index=0, depth=0): pcbObj = instr[index].strip() sp = depth*" " - + if pcbObj == "(": #print "decending..." index = index + 1 @@ -85,15 +85,14 @@ def tokenize(instr, index=0, depth=0): outfile.write(sp + toXML(tag, paramdict, sep) + "\n") if (instr[index+1].strip() != "("): outfile.write(sp + "\n") - + return index + 1 - + idx = 0 -outfile = open(sys.argv[2],"w") +outfile = open(sys.argv[2],"w") while(idx < len(cleaned)-1): idx = tokenize(cleaned, index=idx) - + outfile.close() - diff --git a/tools/scripts/obsolete/fp2fzfp/pcbkeys.py b/tools/scripts/obsolete/fp2fzfp/pcbkeys.py index 6da032225..a91c4b272 100644 --- a/tools/scripts/obsolete/fp2fzfp/pcbkeys.py +++ b/tools/scripts/obsolete/fp2fzfp/pcbkeys.py @@ -19,7 +19,7 @@ tagMap["ElementLine"] = [["X1","Y1","X2","Y2","Thickness"]] tagMap["ElementArc"] = [["X","Y","Width","Height","StartAngle","DeltaAngle",\ "Thickness"]] -tagMap["Attribute"] = [["Name","Value"]] +tagMap["Attribute"] = [["Name","Value"]] tagMap["Mark"] = [["Y","X"]] def getNextAttr(attributes): @@ -42,41 +42,41 @@ def getNextAttr(attributes): def makeDict(tag, attributes): """ - splits a list of attributes given a tag and returns a dict with + splits a list of attributes given a tag and returns a dict with attributed names as keys. If the tag is not in the lookup table, an empty dict is returned. """ if(not(tagMap.has_key(tag))): return {} - + #attrList = attributes.split() - + attrList = [] while(attributes != ""): attr, attributes = getNextAttr(attributes) attrList.append(attr) - + tagList = None for selection in tagMap[tag]: if len(selection) == len(attrList): tagList = selection - + #no possible mapping found - should throw an exeption actually if(not(tagList)): return {} - + #attrListCleaned = [] - + #strip quotes #for attr in attrList: # if attr[0] == '"': # tmp1, tmp2, attr = attr.partition('"') # attr, tmp1, tmp2 = attr.rpartition('"') # attrListCleaned.append(attr) - + #merge the two into a dictionary rtn = {} for i in xrange(len(tagList)): rtn[tagList[i]] = attrList[i] - + return rtn diff --git a/tools/scripts/obsolete/fp2fzfp/svggen.py b/tools/scripts/obsolete/fp2fzfp/svggen.py index 3ac79f88b..becb3d88a 100644 --- a/tools/scripts/obsolete/fp2fzfp/svggen.py +++ b/tools/scripts/obsolete/fp2fzfp/svggen.py @@ -8,16 +8,16 @@ class SVGGen(xml.dom.minidom.Element): def __init__(self, xmlFile, debug=False): self.debug = debug self._svg = xml.dom.minidom.Document - + def getSvgFile(self): # spits out a string with the generated SVG return self._svgFile - + def _drawNode(self, node): # renders a node to SVG self._debug("drawing node: ") tag = node.nodeName.lower() - + if tag == "pin": self._debug("pin") self._drawPin(node) @@ -36,34 +36,34 @@ def _drawNode(self, node): else: #TODO: throw an exception self._debug("error - cannot render unrecognized tag") - + def _drawPin(self, node): # render a pin to SVG pass - + def _drawPad(self, node): # render a copper pad to SVG pass - + def _drawElementLine(self, node): # render a silkscreen line pass - + def _drawElementArc(self, node): # render a silkscreen circular arc pass - + def _drawMark(self, node): # render the center point mark pass - + def minMax(self, x, y, strokeWidth): """ check to see if the coordinates are within the viewbox adjusts if necessary """ pass - + def _debug(self, msg): if self.debug: print msg diff --git a/tools/scripts/obsolete/fullbreadboardgenerator/breadboard_svg.tmpl b/tools/scripts/obsolete/fullbreadboardgenerator/breadboard_svg.tmpl index c9fb1fb39..99169429b 100644 --- a/tools/scripts/obsolete/fullbreadboardgenerator/breadboard_svg.tmpl +++ b/tools/scripts/obsolete/fullbreadboardgenerator/breadboard_svg.tmpl @@ -26,7 +26,7 @@ #end for #end for - + diff --git a/tools/scripts/obsolete/fullbreadboardgenerator/documentation/breadboard_generator.html b/tools/scripts/obsolete/fullbreadboardgenerator/documentation/breadboard_generator.html index 203e9c31f..7cdb3fc11 100644 --- a/tools/scripts/obsolete/fullbreadboardgenerator/documentation/breadboard_generator.html +++ b/tools/scripts/obsolete/fullbreadboardgenerator/documentation/breadboard_generator.html @@ -41,21 +41,21 @@

Usage

   54     sL['title'] = "My Breadboard"
    55     sL['moduleID'] = "MyBreadboardModuleID"
    56     sL['svgFile'] = "myBreadboard.svg"
-   57 
+   57
    58     sL['label'] = "Breadboard"
    59     sL['taxonomy'] = "prototyping.breadboard.breadboard.breadboard0"

And then there you'll find some other variables (and properties of the rowProps and lineProps dict) which specify exactly how your breadboard looks:

-
   65     # Rows 
+
   65     # Rows
    66     rowHeight = 5 # You probably never need to change this, but who knows
    67     rowsInterBlockSpacing = 2
    68     rowProps['startsAtX'] = -1
    69     rowProps['startsAtYWithLetter'] = 'A'
    70     rowProps['segmentLength'] = 64
    71     rowProps['interSegmentSpacing'] = 2
-   72     rowProps['numberOfSegments'] = 1    
-   73         
+   72     rowProps['numberOfSegments'] = 1
+   73
    74     # Lines
    75     numberOfLinesPerSet = 2
    76     interRowsLinesSpacing = 2
diff --git a/tools/scripts/obsolete/fullbreadboardgenerator/documentation/resources/guide_style.css b/tools/scripts/obsolete/fullbreadboardgenerator/documentation/resources/guide_style.css
index c145b70a5..a136c9d6e 100644
--- a/tools/scripts/obsolete/fullbreadboardgenerator/documentation/resources/guide_style.css
+++ b/tools/scripts/obsolete/fullbreadboardgenerator/documentation/resources/guide_style.css
@@ -22,11 +22,11 @@ body {
 }
 
 #content {
-	max-width: 55em;	
+	max-width: 55em;
 }
 
 p {
-max-width: 45em;	
+max-width: 45em;
 }
 
 a, a.hover, a.link, a.visited {
@@ -97,4 +97,3 @@ pre.textmate-source span.selected {
 	background: #0F0F0F;
 	color: #FFF356;
 }
-
diff --git a/tools/scripts/obsolete/fullbreadboardgenerator/generator.py b/tools/scripts/obsolete/fullbreadboardgenerator/generator.py
index 6de4e66d5..6b60ff25a 100644
--- a/tools/scripts/obsolete/fullbreadboardgenerator/generator.py
+++ b/tools/scripts/obsolete/fullbreadboardgenerator/generator.py
@@ -45,27 +45,27 @@
 def setup():
 	# Edit these variables below to generate different breadboards
 	#
-	# sL = searchList, a dict to use with the template 
+	# sL = searchList, a dict to use with the template
 	sL['title'] = "Half-Breadboard"
 	sL['moduleID'] = "HalfBreadboardModuleID"
 	sL['svgFile'] = "halfBreadboard.svg"
 
 	sL['label'] = "Bread"
 	sL['taxonomy'] = "prototyping.breadboard.breadboard.halfbreadboard"
-	
+
 	# Most breadboards have rows and lines.
 	# Rows are 5 holes verticaly
 	# Lines are power/ground lines running horizontaly
-	
-	# Rows 
+
+	# Rows
 	rowHeight = 5 # You probably never need to change this, but who knows
 	rowsInterBlockSpacing = 2
 	rowProps['startsAtX'] = -1
 	rowProps['startsAtYWithLetter'] = 'A'
 	rowProps['segmentLength'] = 32
 	rowProps['interSegmentSpacing'] = 2
-	rowProps['numberOfSegments'] = 1	
-		
+	rowProps['numberOfSegments'] = 1
+
 	# Lines
 	numberOfLinesPerSet = 2
 	interRowsLinesSpacing = 2
@@ -76,7 +76,7 @@ def setup():
 	lineProps['interSegmentSpacing'] = 2
 	lineProps['numberOfSegments'] = 1
 	lineProps['endsAtYWithLetter'] = 'Z'
-	
+
 	# Layout
 	boardLayout.append( ("lines", numberOfLinesPerSet) )
 	boardLayout.append( ("spacing", interRowsLinesSpacing) )
@@ -85,7 +85,7 @@ def setup():
 	boardLayout.append( ("rows", rowHeight) )
 	boardLayout.append( ("spacing", interRowsLinesSpacing) )
 	boardLayout.append( ("lines", numberOfLinesPerSet) )
-	
+
 	return
 
 def displayUsage():
@@ -118,7 +118,7 @@ def displayUsage():
 def makeUUID():
     "creates an 8 character hex UUID"
     return str(uuid.uuid1())
-    
+
 def makeDate():
     "creates a date formatted as YYYY-MM-DD"
     return date.today().isoformat()
@@ -160,7 +160,7 @@ def main():
 		if (numberOfRowCols + numberOfLines) > 26:
 			print "TO MUCH LINES OR ROWS. The script does not know how to name them right. Aborting generation of part"
 			sys.exit()
-	
+
 		# Make Nets
 		maxSizeX = 0
 		incrementalY = 0
@@ -215,7 +215,7 @@ def main():
 							maxSizeX = incrementalX - lineProps['interSegmentSpacing'] + lineProps['startAtX']
 				incrLineYLetterOrd += line + 1
 			incrementalY += item[1]
-		
+
 		# Add these nets to the searchList
 		sL['rows'] = rowNets
 		sL['lines'] = lineNets
@@ -228,7 +228,7 @@ def main():
 		sizeDict['realWidth'] = "%.4fin" % (totalX / 90.0)
 		sizeDict['realHeight'] = "%.4fin" % (totalY / 90.0)
 		sL['size'] = sizeDict
-		
+
 		if len(sys.argv) >= 3 and sys.argv[2] == 'fzp':
 			metaData = {}
 			metaData['moduleID'] = makeUUID()
diff --git a/tools/scripts/obsolete/genAllParts.py b/tools/scripts/obsolete/genAllParts.py
index 46451faf6..8857ef1de 100644
--- a/tools/scripts/obsolete/genAllParts.py
+++ b/tools/scripts/obsolete/genAllParts.py
@@ -1,23 +1,23 @@
 # usage:
 #    genAllParts.py -d  -a  -o 
-#    
+#
 #     is a folder, with subfolders, containing fzp files.  In each fzp file in the directory or its children
 #    add a ref to that part to the all parts bin.  if add obsolete is true, then add obsolete files
 
 import getopt, sys, os, re
-    
+
 def usage():
     print """
 usage:
     genAllParts.py -d [directory]+ -a [all parts bin filename] -o [add obsolete: t or f]
-    
-    each directory is a folder containing fzp files.  
+
+    each directory is a folder containing fzp files.
     In each fzp file in the directory or its subfolders,
     add a ref to that fzp file to the all parts bin.  Skip obsolete if add obsolete is not true
     """
-    
-  	
-	   
+
+
+
 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "hd:a:o:", ["help", "directory", "allparts", "obsolete"])
@@ -29,7 +29,7 @@ def main():
     inputDirs = []
     allPartsBinFilename = ""
     allowObsolete = 0
-    
+
     for o, a in opts:
         #print o
         #print a
@@ -45,14 +45,14 @@ def main():
 
         else:
             assert False, "unhandled option"
-    
+
     if(len(inputDirs) <= 0):
         usage()
         sys.exit(2)
     if(not(allPartsBinFilename)):
         usage()
         sys.exit(2)
-     
+
     outfile = open(allPartsBinFilename, "w")
     outfile.write("""
 
@@ -61,11 +61,11 @@ def main():
 """)
 
     skip = ['NoteModuleID', 'GroupModuleID']
-    
+
     for inputDir in inputDirs:
         for root, dirs, files in os.walk(inputDir, topdown=False):
             for filename in files:
-                if (filename.endswith(".fzp")):  
+                if (filename.endswith(".fzp")):
                     allow = 1
                     if (not allowObsolete) and (root.find("obsolete") >= 0):
                         allow = 0
@@ -92,8 +92,8 @@ def main():
 
 
 
-               
-    outfile.write("""  
+
+    outfile.write("""
     
 
     """)
@@ -102,4 +102,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
diff --git a/tools/scripts/obsolete/resistorSetGenerator/resistorSetGenerator.py b/tools/scripts/obsolete/resistorSetGenerator/resistorSetGenerator.py
index d4b4ef679..ecf466042 100644
--- a/tools/scripts/obsolete/resistorSetGenerator/resistorSetGenerator.py
+++ b/tools/scripts/obsolete/resistorSetGenerator/resistorSetGenerator.py
@@ -36,15 +36,15 @@
 help_message = """
 Usage:
 	resistorSetGenerator.py -s [Resistor Set] -o [Output Dir] -b [Existing Resistor Bin]
-	
+
 	Resistor Set          - the named set of standard resistors that should be generated
 					        Possible values are: E3, E6, E12, E24 for the E3Set, E6Set etc.
-					
+
 	Output Dir            - the location where the output files are written
-	
+
 	Existing Resistor Bin - the Fritzing bin file (.fzb) from which this script should try
 	                        to find the matching moduleID's. If no bin is given, all new
-	                        resistors with new moduleID's will be generated. 
+	                        resistors with new moduleID's will be generated.
 """
 
 
@@ -118,7 +118,7 @@ def getExistingResistorsFromBin(filename):
 	else:
 		print >> sys.stderr, "No Fritzing bin file: %s found" % (fileName)
 		sys.exit(2)
-	
+
 
 def writeOutFileInSubDirectoryWithData(outputDir,  subDirectory, fileName, data):
 	outputDir = os.path.join(outputDir, subDirectory)
@@ -136,12 +136,12 @@ def main(argv=None):
 			opts, args = getopt.getopt(argv[1:], "ho:s:b:", ["help", "output=", "set=", "bin="])
 		except getopt.error, msg:
 			raise Usage(msg)
-		
+
 		output = "."
 		verbose = False
 		namedSet = None
 		existingBin = None
-	
+
 		# option processing
 		for option, value in opts:
 			if option in ("-h", "--help"):
@@ -152,24 +152,24 @@ def main(argv=None):
 				namedSet = value
 			if option in ("-b", "--bin"):
 				existingBin = value
-		
+
 		if(not(namedSet) or not(output)):
 			# print >> sys.stderr, "No Resistor Set or Output Dir specified"
 			raise Usage("Error: No Resistor Set or Output Dir specified")
-		
+
 		config = ConfigParser.ConfigParser()
 		config.readfp(open(getConfigFile('defaults.cfg')))
-		
+
 		resistorSet = valuesAndColors_forResistors.resistorSetForSetName(namedSet)
 		print "number of resistors in set: %d" % (len(resistorSet))
-		
+
 		# Analyzing bin for existing resistor moduleID's
 		existingResistors = []
 		if existingBin:
 			print "analyzing bin for existing resistor moduleID's ..."
 			existingResistors = getExistingResistorsFromBin(existingBin)
 			existingResistorsValues = [r['value'] for r in existingResistors]
-			
+
 		resistorBin = []
 		skipThisResistor = False
 		for r in resistorSet:
@@ -177,7 +177,7 @@ def main(argv=None):
 			metaData = {}
 			resistorInBin = {}
 			resistanceString = valuesAndColors_forResistors.valueStringFromValue(r)
-			# check if this resistor doesn't have a moduleID already 
+			# check if this resistor doesn't have a moduleID already
 			if existingResistors and (resistanceString in existingResistorsValues):
 				if (not config.getboolean('ExistingResistors', 'regenerateExitsingParts')):
 					# Don't regnerate this resistor (leave it out the new set)
@@ -220,7 +220,7 @@ def main(argv=None):
 			sL['resistors'] = resistorBin
 			fzb = Template(file=getTemplatefile("bin_fzb.tmpl"), searchList = [sL])
 			writeOutFileInSubDirectoryWithData(output, "bin", "%sBin.fzb" % (namedSet), fzb)
-	
+
 	except Usage, err:
 		print >> sys.stderr, sys.argv[0].split("/")[-1] + ": " + str(err.msg)
 		print >> sys.stderr, "\t for help use --help"
@@ -229,4 +229,3 @@ def main(argv=None):
 
 if __name__ == "__main__":
 	sys.exit(main())
-	
\ No newline at end of file
diff --git a/tools/scripts/obsolete/resistorSetGenerator/resistor_breadboard_svg.tmpl b/tools/scripts/obsolete/resistorSetGenerator/resistor_breadboard_svg.tmpl
index 0f9f9d32f..e57663d9c 100644
--- a/tools/scripts/obsolete/resistorSetGenerator/resistor_breadboard_svg.tmpl
+++ b/tools/scripts/obsolete/resistorSetGenerator/resistor_breadboard_svg.tmpl
@@ -3,7 +3,7 @@
 
 
 
 
diff --git a/tools/scripts/obsolete/resistorSetGenerator/valuesAndColors_forResistors.py b/tools/scripts/obsolete/resistorSetGenerator/valuesAndColors_forResistors.py
index f3ad54619..0f94cf004 100644
--- a/tools/scripts/obsolete/resistorSetGenerator/valuesAndColors_forResistors.py
+++ b/tools/scripts/obsolete/resistorSetGenerator/valuesAndColors_forResistors.py
@@ -36,7 +36,7 @@
 E24Set = [100, 110, 120, 130, 150, 160, 180, 200, 220, 240, 270, 300, 330, 360, 390, 430, 470, 510, 560, 620, 680, 750, 820, 910]
 
 NamedSets = {'e3': E3Set, 'e6': E6Set, 'e12': E12Set, 'e24': E24Set}
- 
+
 SetMultiplication = [0.1, 1, 10, 100, 1000, 10000]
 letterDict = { 'k': 1000, 'M': 1000000, 'G': 1000000000}
 
@@ -105,11 +105,11 @@ def hexColorsForResistorValue(value):
 def main():
 	resistorSet = resistorSetForSetName('E6Set')
 	print resistorSet
-	
+
 	for r in resistorSet:
 		print valueStringFromValue(r)
 		print hexColorsForResistorValue(r)
-	
+
 	print "number of resistors in set: %d" % (len(resistorSet))
 	for r in resistorSet:
 		# Printing the value
diff --git a/tools/scripts/obsolete/svnremove.py b/tools/scripts/obsolete/svnremove.py
index e661d3dc6..d70d03023 100644
--- a/tools/scripts/obsolete/svnremove.py
+++ b/tools/scripts/obsolete/svnremove.py
@@ -1,6 +1,6 @@
 # usage:
 #    svnremove.py -d [directory]
-#    
+#
 #    directory is a folder containing .svn directories.
 #    recursively delete all .svn folders
 
@@ -11,13 +11,13 @@ def usage():
     print """
 usage:
     svnremove.py -d [directory]
-    
-    directory is a folder containing .svn directories.  
+
+    directory is a folder containing .svn directories.
     recursively delete all .svn folders
     """
-    
-    
-       
+
+
+
 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "hd:", ["help", "directory"])
@@ -29,7 +29,7 @@ def main():
     outputDir = None
     findtext = ""
     gotnot = 0
-    
+
     for o, a in opts:
         #print o
         #print a
@@ -40,19 +40,19 @@ def main():
             sys.exit(2)
         else:
             assert False, "unhandled option"
-    
+
     if(not(outputDir)):
         usage()
         sys.exit(2)
-     
-    
+
+
     for root, dirs, files in os.walk(outputDir, topdown=False):
         for dirname in dirs:
-            if dirname == ".svn":  
+            if dirname == ".svn":
                 removeall(os.path.join(root, dirname))
                 print "removing", os.path.join(root, dirname)
 
-               
+
 def removeall(top):
     for root, dirs, files in os.walk(top, topdown=False):
         for name in files:
@@ -63,9 +63,8 @@ def removeall(top):
                 os.chmod(fullname, stat.S_IWRITE)
             os.remove(fullname)
         for name in dirs:
-            os.rmdir(os.path.join(root, name))	
+            os.rmdir(os.path.join(root, name))
     os.rmdir(top)
-    
+
 if __name__ == "__main__":
     main()
-
diff --git a/tools/scripts/renamefz.py b/tools/scripts/renamefz.py
index 7593f983f..be1983be8 100644
--- a/tools/scripts/renamefz.py
+++ b/tools/scripts/renamefz.py
@@ -2,7 +2,7 @@
 # lots of borrowing from http://code.activestate.com/recipes/252508-file-unzip/
 
 import getopt, sys, os, os.path, re, zipfile, shutil
-    
+
 def usage():
     print """
 usage:
@@ -10,7 +10,7 @@ def usage():
 
 For each fzz file in the from directory, make sure the .fz name matches the .fzz name.  Probably safest to make a copy of the from directory first
 """
-           
+
 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "hf:", ["help", "from"])
@@ -19,9 +19,9 @@ def main():
         print str(err) # will print something like "option -a not recognized"
         usage()
         return
-    
+
     inputdir = None
-    
+
     for o, a in opts:
         #print o
         #print a
@@ -31,12 +31,12 @@ def main():
             print "unhandled option",o
             usage()
             return
-    
+
     if not(inputdir):
         print "missing 'from' argument"
         usage()
         return
-        
+
     try:
         import zlib
         compression = zipfile.ZIP_DEFLATED
@@ -47,10 +47,10 @@ def main():
         for fzz in files:
             if not fzz.endswith('.fzz'):
                 continue
-                
+
             #print fzz
             fzzpath = os.path.join(root, fzz)
-            
+
             tempDir = inputdir + os.sep + "___temp___"
             shutil.rmtree(tempDir, 1)
             os.mkdir(tempDir)
@@ -58,23 +58,23 @@ def main():
             zf = zipfile.ZipFile(fzzpath)
             zf.extractall(tempDir)
             zf.close()
-            
+
             fzzbase = os.path.splitext(fzz)[0]
-            
+
             renamed = False
             for fz in os.listdir(tempDir):
                 if fz.endswith(".ino"):
                     print "got ino", fzzpath
-                    
+
                 if not fz.endswith(".fz"):
                     continue
-                    
+
                 fzbase = os.path.splitext(fz)[0]
-            
+
                 if fzbase == fzzbase:
                     continue
-                    
-                try: 
+
+                try:
                     fzpath = os.path.join(tempDir, fz)
                     newpath = os.path.join(tempDir, fzzbase + ".fz")
                     print "renaming", fzzpath
@@ -82,7 +82,7 @@ def main():
                     os.rename(fzpath, newpath)
                 except:
                     print "exception", fzpath, sys.exc_info()[0]
-                    pass    
+                    pass
 
             # helpful examples in http://www.doughellmann.com/PyMOTW/zipfile/
 
@@ -97,6 +97,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-
-
diff --git a/tools/scripts/replace.py b/tools/scripts/replace.py
index 3d5c4f7e0..debde7f11 100644
--- a/tools/scripts/replace.py
+++ b/tools/scripts/replace.py
@@ -1,26 +1,26 @@
 # usage:
 #    replace.py -d  -f  -r  -s 
-#    
+#
 #     is a folder, with subfolders, containing  files.  In each  file in the directory or its children
 #    replace  with 
 
 import sys, os, re
 import optparse
-    
+
 def usage():
     print """
 usage:
     replace.py -d [directory] -f [text] -r [replace] -s [suffix]
-    
-    directory is a folder containing [suffix] files.  
+
+    directory is a folder containing [suffix] files.
     In each [suffix] file in the directory or its subfolders,
     replace [text] with [replace]
     """
-    
-    
-       
+
+
+
 def main():
-        
+
     parser = optparse.OptionParser()
     parser.add_option('-s', '--suffix', dest="suffix" )
     parser.add_option('-d', '--directory', dest="directory")
@@ -32,7 +32,7 @@ def main():
         parser.error("directory argument not given")
         usage()
         return
-    
+
     if not options.find:
         parser.error("find argument not given")
         usage()
@@ -47,23 +47,23 @@ def main():
     findtext = options.find
     replacetext = options.replace
     suffix = options.suffix
-    
-    
+
+
     if not(outputDir):
         usage()
         return
-    
+
     if findtext.startswith('"') or findtext.startswith("'"):
         findtext = findtext[1:-1]
-     
+
     if replacetext.startswith('"') or replacetext.startswith("'"):
         replacetext = replacetext[1:-1]
-     
+
     print "replace text",findtext,"with",replacetext,"in", suffix,"files"
-    
+
     for root, dirs, files in os.walk(outputDir, topdown=False):
         for filename in files:
-            if (filename.endswith(suffix)):  
+            if (filename.endswith(suffix)):
                 infile = open(os.path.join(root, filename), "r")
                 svg = infile.read();
                 infile.close();
@@ -74,11 +74,10 @@ def main():
                     outfile = open(os.path.join(root, filename), "w")
                     outfile.write(svg);
                     outfile.close()
-                    print "{0}".format(os.path.join(root, filename)) 
+                    print "{0}".format(os.path.join(root, filename))
+
+
+
 
-               
-  
-    
 if __name__ == "__main__":
     main()
-
diff --git a/tools/scripts/resetversion.py b/tools/scripts/resetversion.py
index f6dc27e39..34112c14f 100644
--- a/tools/scripts/resetversion.py
+++ b/tools/scripts/resetversion.py
@@ -2,7 +2,7 @@
 # lots of borrowing from http://code.activestate.com/recipes/252508-file-unzip/
 
 import getopt, sys, os, os.path, re, zipfile, shutil
-    
+
 def usage():
     print """
 usage:
@@ -10,7 +10,7 @@ def usage():
 
 Change the version number of the fz file in the fzz files in from directory.  Probably safest to make a copy of from directory first
 """
-           
+
 def main():
     try:
         opts, args = getopt.getopt(sys.argv[1:], "hf:", ["help", "from"])
@@ -19,9 +19,9 @@ def main():
         print str(err) # will print something like "option -a not recognized"
         usage()
         return
-    
+
     inputdir = None
-    
+
     for o, a in opts:
         #print o
         #print a
@@ -31,12 +31,12 @@ def main():
             print "unhandled option",o
             usage()
             return
-    
+
     if not(inputdir):
         print "missing 'from' argument"
         usage()
         return
-        
+
     try:
         import zlib
         compression = zipfile.ZIP_DEFLATED
@@ -47,10 +47,10 @@ def main():
         for fzz in files:
             if not fzz.endswith('.fzz'):
                 continue
-                
+
             print fzz
             fzzpath = os.path.join(root, fzz)
-            
+
             tempDir = inputdir + os.sep + "___temp___"
             shutil.rmtree(tempDir, 1)
             os.mkdir(tempDir)
@@ -58,12 +58,12 @@ def main():
             zf = zipfile.ZipFile(fzzpath)
             zf.extractall(tempDir)
             zf.close()
-            
+
             for fz in os.listdir(tempDir):
                 if not fz.endswith(".fz"):
                     continue
-                    
-                try: 
+
+                try:
                     fzpath = os.path.join(tempDir, fz)
                     infile = open(fzpath, "rb")
                     #print "opened", fzpath
@@ -72,10 +72,10 @@ def main():
                     os.remove(fzpath)
                     outfile = open(fzpath, 'wb')
                     outfile.write( xml.replace('fritzingVersion="0.8.6', 'fritzingVersion="0.8.5'))
-                    outfile.close()   
+                    outfile.close()
                 except:
                     print "exception", fzpath, sys.exc_info()[0]
-                    pass    
+                    pass
 
             # helpful examples in http://www.doughellmann.com/PyMOTW/zipfile/
 
@@ -89,6 +89,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-
-
diff --git a/translations/fritzing_ar.ts b/translations/fritzing_ar.ts
index ca9afa1ce..2809f3483 100644
--- a/translations/fritzing_ar.ts
+++ b/translations/fritzing_ar.ts
@@ -5177,7 +5177,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_bg.ts b/translations/fritzing_bg.ts
index 11e1cbe34..7d437b9a8 100644
--- a/translations/fritzing_bg.ts
+++ b/translations/fritzing_bg.ts
@@ -5200,10 +5200,10 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
-        Файлът с изображение „%1“ не може да бъде зареден: 
+        Файлът с изображение „%1“ не може да бъде зареден:
 
 %2
 
diff --git a/translations/fritzing_bn.ts b/translations/fritzing_bn.ts
index b9b67a87a..493448160 100644
--- a/translations/fritzing_bn.ts
+++ b/translations/fritzing_bn.ts
@@ -812,7 +812,7 @@ A custom board svg typically has one or two silkscreen layers and one board laye
         
         The image from %1 can be loaded, but %2
 Use the file?
-        % 1 থেকে চিত্র %2'লোড' করতে পারেন, কিন্ত 
+        % 1 থেকে চিত্র %2'লোড' করতে পারেন, কিন্ত
 এই ফাইল ব্যবহার করে 
         ইমেজ %1 ধারন সম্ভব,কিন্তু%2
 এইফাইল ব্যবহাের?
@@ -2257,7 +2257,7 @@ It is also possible to choose a connector as a ground fill seed by right-clickin
         
         No part with those characteristics.
 We're working to avoid this message, and only let you choose between properties that do exist
-        ঐসব কোনো পার্টসে  নাই।  
+        ঐসব কোনো পার্টসে  নাই।
 
     আমরা এই বার্তা বাদ দেবার চেষ্টা করছি এবং শুধু যেসব ধর্ম যোগ করা আছে  সেইগুলাই পছন্দ করতে দিব।
     
@@ -5513,7 +5513,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_cs.ts b/translations/fritzing_cs.ts
index 809d637cd..b8bd2b7dc 100644
--- a/translations/fritzing_cs.ts
+++ b/translations/fritzing_cs.ts
@@ -5177,7 +5177,7 @@ Důvod: %2 (chyb.kód %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_da.ts b/translations/fritzing_da.ts
index 53c89ce96..729346278 100644
--- a/translations/fritzing_da.ts
+++ b/translations/fritzing_da.ts
@@ -5293,7 +5293,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_de.ts b/translations/fritzing_de.ts
index 2edac98a4..1cc986d34 100644
--- a/translations/fritzing_de.ts
+++ b/translations/fritzing_de.ts
@@ -5191,10 +5191,10 @@ Ursache: %2 (Fehlercode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
-        Bilddatei '%1' konnte nicht geladen werden: 
+        Bilddatei '%1' konnte nicht geladen werden:
 
 %2
     
diff --git a/translations/fritzing_el.ts b/translations/fritzing_el.ts
index 9d35166ac..a7eb34190 100644
--- a/translations/fritzing_el.ts
+++ b/translations/fritzing_el.ts
@@ -5183,10 +5183,10 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
-        Αδυναμία φόρτωσης του αρχείου εικόνας '%1': 
+        Αδυναμία φόρτωσης του αρχείου εικόνας '%1':
 %2
     
     
diff --git a/translations/fritzing_en.ts b/translations/fritzing_en.ts
index f71d7fc4e..48f84f286 100644
--- a/translations/fritzing_en.ts
+++ b/translations/fritzing_en.ts
@@ -5145,7 +5145,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_es.ts b/translations/fritzing_es.ts
index 83765875f..6efbe7156 100644
--- a/translations/fritzing_es.ts
+++ b/translations/fritzing_es.ts
@@ -5428,7 +5428,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_et.ts b/translations/fritzing_et.ts
index 0a35b7258..52c95ddd6 100644
--- a/translations/fritzing_et.ts
+++ b/translations/fritzing_et.ts
@@ -5145,7 +5145,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_fa.ts b/translations/fritzing_fa.ts
index d30ac34b2..5852230fe 100644
--- a/translations/fritzing_fa.ts
+++ b/translations/fritzing_fa.ts
@@ -5293,7 +5293,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_fr.ts b/translations/fritzing_fr.ts
index 1483ab31c..bf336bd6d 100644
--- a/translations/fritzing_fr.ts
+++ b/translations/fritzing_fr.ts
@@ -4180,7 +4180,7 @@ Go ahead and save?
         Impossible d'analyser le fichier fzp %1
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         Impossible de charger le fichier d'images '%1'
diff --git a/translations/fritzing_gl.ts b/translations/fritzing_gl.ts
index b6d771183..79adea295 100644
--- a/translations/fritzing_gl.ts
+++ b/translations/fritzing_gl.ts
@@ -5145,7 +5145,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_hi.ts b/translations/fritzing_hi.ts
index d4a3e46ce..026b1dbb6 100644
--- a/translations/fritzing_hi.ts
+++ b/translations/fritzing_hi.ts
@@ -5145,7 +5145,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_hu.ts b/translations/fritzing_hu.ts
index 699976b91..ffab7388f 100644
--- a/translations/fritzing_hu.ts
+++ b/translations/fritzing_hu.ts
@@ -5137,7 +5137,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_id.ts b/translations/fritzing_id.ts
index 836dd1d82..987330cc0 100644
--- a/translations/fritzing_id.ts
+++ b/translations/fritzing_id.ts
@@ -5137,7 +5137,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_it.ts b/translations/fritzing_it.ts
index 02784f772..688a997b2 100644
--- a/translations/fritzing_it.ts
+++ b/translations/fritzing_it.ts
@@ -1146,7 +1146,7 @@ It is also possible to choose a connector as a ground fill seed by right-clickin
         connected to %n item(s)
         
             connesso a %n elemento(i)
-        
+
         
             
         
@@ -1581,7 +1581,7 @@ It is also possible to choose a connector as a ground fill seed by right-clickin
         %1 of %2 nets routed - %n connector(s) still to be routed
         
             %1 di %2 reti instradate - %n connettore(i) ancora da instradare
-        
+
         
             
         
@@ -4182,7 +4182,7 @@ Go ahead and save?
         
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
@@ -5561,7 +5561,7 @@ Fritzing continuerà a funzionare, ma non sarà possibile cambiare le proprietà
     
         The part that you have just added,
 is already there, we won't add it again, right?
-        Il componente che hai appena aggiunto, 
+        Il componente che hai appena aggiunto,
 &egrave; gi&agrave; stato inserito, non vuoi aggiungerne un'altro, giusto?
     
     
diff --git a/translations/fritzing_ja.ts b/translations/fritzing_ja.ts
index 823bf26ed..c42b0dc7e 100644
--- a/translations/fritzing_ja.ts
+++ b/translations/fritzing_ja.ts
@@ -4178,7 +4178,7 @@ Go ahead and save?
         
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_ko.ts b/translations/fritzing_ko.ts
index 7b45d5334..dfc310309 100644
--- a/translations/fritzing_ko.ts
+++ b/translations/fritzing_ko.ts
@@ -5155,7 +5155,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_mk.ts b/translations/fritzing_mk.ts
index 09335479a..39adaec3f 100644
--- a/translations/fritzing_mk.ts
+++ b/translations/fritzing_mk.ts
@@ -5309,7 +5309,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_mr.ts b/translations/fritzing_mr.ts
index 5c8f1d277..23e10cc4b 100644
--- a/translations/fritzing_mr.ts
+++ b/translations/fritzing_mr.ts
@@ -5301,7 +5301,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_nl.ts b/translations/fritzing_nl.ts
index 62d4fb5d8..6afe6d7b2 100644
--- a/translations/fritzing_nl.ts
+++ b/translations/fritzing_nl.ts
@@ -557,7 +557,7 @@
     
         The image from %1 can be loaded, but %2
 Use the file?
-        De afbeelding van %1 kan geladen worden, maar %2 
+        De afbeelding van %1 kan geladen worden, maar %2
 Wil je het bestand gebruiken?
     
     
@@ -4212,10 +4212,10 @@ Doorgaan en opslaan?
         Fritzing ondersteunt momenteel alleen OCRA en Droid lettertypen--de lettertypen in '%1' zijn hierdoor vervangen
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
-        Niet mogelijk om afbeeldingsbestand '%1' te laden: 
+        Niet mogelijk om afbeeldingsbestand '%1' te laden:
 
 %2
     
diff --git a/translations/fritzing_pl.ts b/translations/fritzing_pl.ts
index 05b49fa68..7cb7ffed8 100644
--- a/translations/fritzing_pl.ts
+++ b/translations/fritzing_pl.ts
@@ -5153,7 +5153,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_pt_br.ts b/translations/fritzing_pt_br.ts
index c464819cd..7ca62513f 100644
--- a/translations/fritzing_pt_br.ts
+++ b/translations/fritzing_pt_br.ts
@@ -4208,10 +4208,10 @@ Vá em frente e salve?
         Fritzing atualmente suporta apenas as fontes OCRA e Droid--estas foram substituidas pelas fontes '%1'
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
-        Não foi possivel carregar o arquivo de imagem '%1': 
+        Não foi possivel carregar o arquivo de imagem '%1':
 
 %2
     
diff --git a/translations/fritzing_pt_pt.ts b/translations/fritzing_pt_pt.ts
index 1d6ed9bb5..b94a7dd74 100644
--- a/translations/fritzing_pt_pt.ts
+++ b/translations/fritzing_pt_pt.ts
@@ -4381,7 +4381,7 @@ Go ahead and save?
         
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_ro.ts b/translations/fritzing_ro.ts
index 9d4bfc59e..92614b0c1 100644
--- a/translations/fritzing_ro.ts
+++ b/translations/fritzing_ro.ts
@@ -5210,10 +5210,10 @@ Motivul: %2 (cod eroare %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
-        Nu se poate încărca fișierul imagine '%1': 
+        Nu se poate încărca fișierul imagine '%1':
 
 %2
     
diff --git a/translations/fritzing_ru.ts b/translations/fritzing_ru.ts
index 9e09dc482..b73243143 100644
--- a/translations/fritzing_ru.ts
+++ b/translations/fritzing_ru.ts
@@ -5196,7 +5196,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         Не удалось загрузить файл изображения '%1':
@@ -7070,7 +7070,7 @@ shift key swaps scroll axis
         
         Sorry, we have a problem with the swapping mechanism.
 Fritzing still works, but you won't be able to change parts properties.
-        К сожалению, у нас есть проблема с механизмом подкачки. 
+        К сожалению, у нас есть проблема с механизмом подкачки.
 Fritzing по-прежнему работает, но вы не сможете изменить свойства компонентов.
     
     
@@ -7380,7 +7380,7 @@ Fritzing по-прежнему работает, но вы не сможете 
         
         The part that you have just added,
 is already there, we won't add it again, right?
-        Компонент, который Вы только что добавили, 
+        Компонент, который Вы только что добавили,
 уже там есть, мы не можем добавить его снова, верно?
     
     
diff --git a/translations/fritzing_sk.ts b/translations/fritzing_sk.ts
index 74ddc8b6f..ebb27fb85 100644
--- a/translations/fritzing_sk.ts
+++ b/translations/fritzing_sk.ts
@@ -5164,7 +5164,7 @@ Dôvod: %2 (chyb.kód %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_sl.ts b/translations/fritzing_sl.ts
index b08c782d8..561effaa2 100644
--- a/translations/fritzing_sl.ts
+++ b/translations/fritzing_sl.ts
@@ -5317,7 +5317,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_sr.ts b/translations/fritzing_sr.ts
index b37cc2776..6aa8f94f8 100644
--- a/translations/fritzing_sr.ts
+++ b/translations/fritzing_sr.ts
@@ -5309,7 +5309,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_sv.ts b/translations/fritzing_sv.ts
index d56a73c8e..236bb7052 100644
--- a/translations/fritzing_sv.ts
+++ b/translations/fritzing_sv.ts
@@ -5145,7 +5145,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_th.ts b/translations/fritzing_th.ts
index cac1a7b2f..cc0986b25 100644
--- a/translations/fritzing_th.ts
+++ b/translations/fritzing_th.ts
@@ -4167,7 +4167,7 @@ Go ahead and save?
         
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_tr.ts b/translations/fritzing_tr.ts
index 16016b162..2a12cdb8c 100644
--- a/translations/fritzing_tr.ts
+++ b/translations/fritzing_tr.ts
@@ -5190,7 +5190,7 @@ Neden: '%2' (hatakodu %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         '%1' görüntü dosyası yüklenemiyor:
diff --git a/translations/fritzing_uk.ts b/translations/fritzing_uk.ts
index 2ff6132a3..e7ce313ba 100644
--- a/translations/fritzing_uk.ts
+++ b/translations/fritzing_uk.ts
@@ -5356,7 +5356,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         Не вдалось завантажити файл зображення '%1':
diff --git a/translations/fritzing_ur.ts b/translations/fritzing_ur.ts
index bac0ef41d..c601d1a6a 100644
--- a/translations/fritzing_ur.ts
+++ b/translations/fritzing_ur.ts
@@ -5301,7 +5301,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/fritzing_vi.ts b/translations/fritzing_vi.ts
index 131ff60e9..251e0ab87 100644
--- a/translations/fritzing_vi.ts
+++ b/translations/fritzing_vi.ts
@@ -5181,7 +5181,7 @@ Nguyên nhân: %2 (mã lỗi:%3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         Không thể tải tập tin hình ảnh '%1':
diff --git a/translations/fritzing_zh_cn.ts b/translations/fritzing_zh_cn.ts
index 73cf399ca..b40171e43 100644
--- a/translations/fritzing_zh_cn.ts
+++ b/translations/fritzing_zh_cn.ts
@@ -4196,7 +4196,7 @@ Go ahead and save?
         Fritzing当前只支持OCRA和Droid字体--这些已经被替换为字体'%1'
     
     
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         不能载入图像文件'%1':
diff --git a/translations/fritzing_zh_tw.ts b/translations/fritzing_zh_tw.ts
index 1dacf4817..e8d03a261 100644
--- a/translations/fritzing_zh_tw.ts
+++ b/translations/fritzing_zh_tw.ts
@@ -5143,7 +5143,7 @@ Reason: %2 (errcode %3)
     
     
         
-        Unable to load image file '%1': 
+        Unable to load image file '%1':
 
 %2
         
diff --git a/translations/syntax/arduino.xml b/translations/syntax/arduino.xml
index 64c7d9f6a..9e8f53f17 100644
--- a/translations/syntax/arduino.xml
+++ b/translations/syntax/arduino.xml
@@ -23,7 +23,7 @@
        union 
        while 
     
-    
+
     
       boolean 
       byte 
@@ -50,7 +50,7 @@
       void 
       word 
      
-     
+
      
       abs 
       acos 
@@ -177,7 +177,7 @@
         
         
         
-              
+        
 	      
         
         
diff --git a/translations/syntax/picaxe.xml b/translations/syntax/picaxe.xml
index e75cef0b5..35cbd2a9e 100644
--- a/translations/syntax/picaxe.xml
+++ b/translations/syntax/picaxe.xml
@@ -823,7 +823,7 @@
         
         
         
-              
+        
         
         
         
diff --git a/translations/syntax/styles.xml b/translations/syntax/styles.xml
index 3e56656b5..a178e1612 100644
--- a/translations/syntax/styles.xml
+++ b/translations/syntax/styles.xml
@@ -1,7 +1,7 @@
 
 
 
-       
+