diff options
| author | David Runge <dave@sleepmap.de> | 2016-03-11 12:30:27 +0100 |
|---|---|---|
| committer | David Runge <dave@sleepmap.de> | 2016-03-11 12:30:27 +0100 |
| commit | 1339b8e7b05d70e2e5aefb5d4898d46039870767 (patch) | |
| tree | 97694009c889d75fdd794236fa4c14d5cb32da71 /.arduino | |
| parent | b7be00a2818fdc2c5b47a318a67c95bde3fda7f1 (diff) | |
| parent | 4fddd5572d8ae4ddb8f56278c2945b10ed3ce3cb (diff) | |
| download | dotfiles-1339b8e7b05d70e2e5aefb5d4898d46039870767.tar.gz dotfiles-1339b8e7b05d70e2e5aefb5d4898d46039870767.tar.bz2 dotfiles-1339b8e7b05d70e2e5aefb5d4898d46039870767.tar.xz dotfiles-1339b8e7b05d70e2e5aefb5d4898d46039870767.zip | |
Merge branch 'master' of sleepmap.de:dotfiles
* 'master' of sleepmap.de:dotfiles:
.gitignore: Adding further processing, arduino, qtpass, weather configs and cache folders to ignore list.
.config/SuperCollider/sc_ide_conf.yaml: Post 3.7 settings
.config/psd/.psd.conf: Removing backup from the index
.config/conky/side: Changing to execpi for dig launch.
Reversing the hostname check.
.tmux.conf: Adding own scripts to status-right, removing tpm.
bin/get_*: Adding helper scripts to be used in tmux.
.processing/language.txt: Adding default language setting.
.arduino/preferences.txt: updating sketch stuff
.mutt/*: Updating footer.
.config/gtk-3.0/settings.ini: Removing dark-theme settings, as they make fields in browsers unusable. Thx gnome!
Diffstat (limited to '.arduino')
| -rw-r--r-- | .arduino/preferences.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.arduino/preferences.txt b/.arduino/preferences.txt index 28ebc18..27d7c03 100644 --- a/.arduino/preferences.txt +++ b/.arduino/preferences.txt @@ -43,13 +43,13 @@ last.ide.1.0.6.daterun=1411912958 last.ide.1.0.6.hardwarepath=/usr/share/arduino/hardware last.ide.1.6.0.daterun=1424022507 last.ide.1.6.0.hardwarepath=/usr/share/arduino/hardware -last.ide.1.6.7.daterun=1453680150 +last.ide.1.6.7.daterun=1456069632 last.ide.1.6.7.hardwarepath=/usr/share/arduino/hardware -last.screen.height=1440 -last.screen.width=2560 +last.screen.height=768 +last.screen.width=1366 last.serial.location=1277,707,1286,736 last.sketch.count=1 -last.sketch0.location=1277,-2,1286,1445,632,0 +last.sketch0.location=-3,-5,1372,776,212,0 last.sketch0.path=/home/dave/git/sketchbooks/arduino-sketchbook/firmware/firmware.ino launcher=xdg-open platform.auto_file_type_associations=true @@ -61,7 +61,7 @@ preproc.save_build_files=false preproc.substitute_floats=true preproc.substitute_unicode=true preproc.web_colors=true -programmer=arduino:stk500 +programmer=arduino:usbasp proxy.manual.hostname= proxy.manual.password= proxy.manual.port= @@ -82,10 +82,10 @@ run.window.bgcolor=#DFDFDF serial.databits=8 serial.debug_rate=9600 serial.parity=N -serial.port=/dev/ttyUSB0 -serial.port.file=ttyUSB0 +serial.port=/dev/ttyACM0 +serial.port.file=ttyACM0 serial.stopbits=1 -sketchbook.path=/home/dave/git/sketchbooks/arduino-sketchbook +sketchbook.path=/home/dave/git/sketchbooks/arduino-sketchbook/ software=ARDUINO target=arduino target_package=arduino |