Commit graph

2914 commits

Author SHA1 Message Date
make-ing
3d68517cd7 added octoprintUnconfigured and octoprintUnreleased ko.observable() 2015-09-14 15:03:32 +02:00
Gina Häußge
d7485d288e cherry picked from 93763a5563 foosel/OctoPrint 2015-09-14 14:52:15 +02:00
Gina Häußge
fc63f95385 Also provide branch info to UI/on socket
(cherry picked from commit cc8dcef)
2015-09-14 13:05:25 +02:00
Gina Häußge
d0fadb1b6f atomic_write context to save configs first to temp file, then move
Should prevent corruption of files
(cherry picked from commit c6d0290)
2015-09-14 12:17:17 +02:00
make-ing
10dc7e4976 changed dafault update branch to grblautoupdate for testing 2015-09-14 11:58:27 +02:00
Gina Häußge
cacc6524a1 cherry-pick 13d7d5f2f6 from foosel/OctoPrint 2015-09-14 11:13:19 +02:00
make-ing
2a2696ff9a added new update script git-pull.py to update_script setting 2015-09-11 14:55:57 +02:00
make-ing
65bff81d35 added ne update script git-pull (copied from update-octoprint.py) 2015-09-11 14:52:58 +02:00
make-ing
912bb4ab1f changed update_script 2015-09-11 13:33:27 +02:00
make-ing
2db9724004 changed update_script 2015-09-11 12:34:14 +02:00
make-ing
f094056590 changed update_script string 2015-09-11 12:27:47 +02:00
make-ing
30a5a45147 changed update_script to "cd {target}; git pull" 2015-09-11 11:45:05 +02:00
make-ing
4b29593877 changed empty update_script string to pwd 2015-09-11 11:28:13 +02:00
make-ing
aa918ad980 added update_script and restart key to default values 2015-09-11 11:18:56 +02:00
make-ing
2f04ef43d5 changed all plugin branches to stable-1.2.2 2015-09-11 11:00:25 +02:00
make-ing
304c0919a7 chaned defualt settings in update software 2015-09-10 11:52:17 +02:00
Gina Häußge
6132fe2da9 SWU: Don't use display versions for "current" in github_commit configs
(cherry picked from commit 58c6abc)
2015-09-10 11:41:42 +02:00
make-ing
17f7e1171d changed default settings for testing 2015-09-10 10:50:34 +02:00
make-ing
48cbe8eded added update plugin default values from old config.yml 2015-09-09 15:14:31 +02:00
make-ing
2cb5b0246c fixed grbl travel settup problem when switching to senior 2015-09-09 14:06:30 +02:00
make-ing
d37ce77460 fixed position update bug after grbl flashing 2015-09-09 12:45:24 +02:00
make-ing
bb964b3d75 added new grbl.hex and changed the grblVersionRequirement.yml accordingly 2015-09-08 17:54:06 +02:00
make-ing
1052141be4 changed default settings of serial port to /dev/MrBeam 2015-09-08 14:40:50 +02:00
make-ing
469f2cb3f1 removed debug messages after avrdude bug fix 2015-09-07 15:59:58 +02:00
make-ing
dabcca4297 try to fix grbl flashing problem on pi 2015-09-07 11:07:05 +02:00
make-ing
e5cc1361c6 fixed grbl version string bug; fixed grbl.hex not found flashing bug 2015-09-05 13:09:57 +02:00
Teja
c482a487f6 bugfix. path of grblVersionString was wrong. 2015-09-04 20:02:54 +02:00
Teja
4f655bf306 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-04 18:58:27 +02:00
Teja
5554fc258e bugfix. don't send eeprom writing commands during printing 2015-09-04 18:57:55 +02:00
make-ing
6f1c9ed8d9 changed grbl version regex to be non-greedy 2015-09-04 18:14:55 +02:00
make-ing
bc4e0f2e35 *try to fix grbl version bug (No such file or directory: 'src/octoprint/util/grblVersionRequirement.yml') with change in setup.py and moving of grblVersionRequirement.yml and grbl.hex into new grbl folder 2015-09-04 18:10:33 +02:00
make-ing
d714e907c5 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-04 17:27:32 +02:00
make-ing
46347cc95b fixed grbl version regexp bug 2015-09-04 17:26:45 +02:00
Teja
85b43b5598 Merge branch 'mrbeam' of https://github.com/mrbeam/OctoPrint into mrbeam 2015-09-04 12:23:30 +02:00
Teja
a0f7fddec7 bugfix. 2015-09-04 12:23:12 +02:00
make-ing
5b70cfb3e5 changed error handling of grbl flashing to only flash once and if an error
occurs the state is changed to STATE_CLOSED_WITH_ERROR
2015-09-04 11:40:22 +02:00
Teja
010e2cfa92 flashing visualization fixed. uploaded up to date grbl version. 2015-09-04 11:15:36 +02:00
Teja
1c018ec277 added visual flashing bar. 2015-09-02 12:04:21 +02:00
make-ing
28bf9364f6 working version of flashing ui 2015-09-02 11:04:38 +02:00
make-ing
f4e0801853 added flashing state to ui (not working) 2015-09-02 10:38:51 +02:00
make-ing
39bd1b4375 added functionality to send new working area size to grbl after change of profile 2015-09-01 17:15:36 +02:00
Teja
54af60cdd2 new blueprint API from octoproint v2 plugin interface. improved usability. 2015-09-01 13:06:50 +02:00
make-ing
221c6de990 Merge branch 'grblautoupdate' into mrbeam 2015-09-01 08:53:31 +02:00
Teja
9ab6650b07 fixes #43 2015-08-31 20:10:51 +02:00
Teja
11ab4509cb moved grbl binary to a non-machine-specific name 2015-08-31 18:47:24 +02:00
make-ing
0632bb5fdf -added new machine state (STATE_FLASHING)
-added required grbl hex file to flash
2015-08-27 15:10:05 +02:00
make-ing
4e76574bb9 added grbl version comparison and check to see if required version is detected.
If the right grbl version is not detected, the arduino is flashed with the right
hex file.
2015-08-25 16:46:32 +02:00
Teja
ed82f46f57 bugfix. disable convert button during slicing 2015-08-22 18:51:56 +02:00
Teja
7c9fbda690 updated safety notice 2015-08-22 17:16:21 +02:00
Teja
cf70b4e80a bugfix. fan must be switched on before any gcode file is streamed. 2015-08-20 15:34:20 +02:00