GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 13:58:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,283 Commits 290 Branches 260 Tags
Commit Graph

47 Commits

Author SHA1 Message Date
ckielstra
4c233e75f4 Spelling 2016-04-08 11:06:24 +02:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1' 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
 2016-03-17 15:24:00 +01:00
Jaime van Kessel
2df91d8e0b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 14:44:37 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling 
CURA-1102
 2016-03-17 14:44:09 +01:00
Ghostkeeper
4507560e30
Codestyle: Whitespace around operators 
A space on both sides around binary operators. A space after the comma.

Contributes to issue CURA-1102.
 2016-03-17 11:53:11 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling 
CURA-1102
 2016-03-16 15:18:11 +01:00
Thomas-Karl Pietrowski
148c13ac31 Removing unused imports, fixing a indent and adding more logging 
* Added the logging here, because it was called "except Exception as e:", so "e" seems to be something relevant.
 2016-03-15 12:55:08 +01:00
Thomas-Karl Pietrowski
3b58d1e2a5 Removing unused import of "os" 2016-03-14 15:38:05 +01:00
Ghostkeeper
3690eafb72 Add filter_by_machine parameter to USBPrinting 
This was an oversight. When the filter_by_machine feature was added, we didn't think of the USB printing output device. The feature has no meaning here, since USB printing only supports g-code. Just ignore it.
 2016-03-10 10:46:54 +01:00
daid
743b403b29 Whole bunch of um-pep8 style fixes. 2015-11-27 13:50:44 +01:00
Arjen Hiemstra
37c977cea6 Properly end firmware update procedure and catch errors during firmware update 
Contributes to CURA-274
 2015-10-30 13:46:58 +01:00
Arjen Hiemstra
e7e833bfcf Fix firmware update to properly report progress 
CURA-274 #Ready-for-Review
 2015-10-26 13:00:10 +01:00
Tamara Hogenhout
861b535f9d Implementing missing functionalities on the addmachine -> add original wizard 
contributes to #CURA-256
 2015-10-14 11:53:53 +02:00
Arjen Hiemstra
5b2cdb8012 Update RemovableDrive and USB output devices to use the new file_name parameter 
Contributes to CURA-183
 2015-09-23 18:21:04 +02:00
Jaime van Kessel
635ec0b683 Added more logging to usb printing 2015-09-23 11:04:41 +02:00
Jaime van Kessel
9380dacbed Small fix to USB printing which should fix the issues for printrbots 2015-09-18 15:24:21 +02:00
Jaime van Kessel
51415a0c53 Updated logging & resuffled auto baud list to improve speed 2015-09-17 11:08:25 +02:00
Jaime van Kessel
4808f52f59 Fixed heatup bed command in checking wizard 2015-09-17 10:43:56 +02:00
Jaime van Kessel
529617bc06 Removed state check that broke connection for printrbot 2015-08-25 14:44:50 +02:00
Jaime van Kessel
9b6ed1f0ee Added self to output device signals 2015-08-25 13:34:25 +02:00
Jaime van Kessel
86b6f60809 Added status events to usb printer 2015-08-25 11:36:44 +02:00
Jaime van Kessel
07c19498f1 Added rudementary 3 point bed leveling 2015-08-19 16:47:48 +02:00
Jaime van Kessel
18497329db Fixed typo 2015-08-19 14:37:49 +02:00
Jaime van Kessel
7fda5e9a39 Endstop now stops listening upon destruction 2015-08-19 14:35:35 +02:00
Jaime van Kessel
d146801da6 Added heated bed check 2015-08-19 11:35:02 +02:00
Jaime van Kessel
f0a358d175 Added heater check 2015-08-19 11:18:58 +02:00
Jaime van Kessel
d683a6b77b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 10:27:41 +02:00
Jaime van Kessel
8dce3a6f8c Added endstop switch check to wizard 2015-08-19 10:27:32 +02:00
Arjen Hiemstra
7e2b89ec54 Fix a merge issue with USBPrinting 2015-08-18 18:08:44 +02:00
Arjen Hiemstra
a425036c4c Merge branch '15.06' 
* 15.06:
  Fix poor visibility of MessageStack against grid
  Fix USB printer detection and reconnect after firmware update on MacOSX
  Correct the icon for the Cura .desktop file
  Bump version
  support defaults to ZigZag instead of Lines
  Fix the platform activity check
 2015-08-18 17:59:16 +02:00
Jaime van Kessel
04b8961297 Updates to ensure that usb printing now works via output device API 2015-08-12 15:19:20 +02:00
Arjen Hiemstra
9d3b36e3ae Fix USB printer detection and reconnect after firmware update on MacOSX 
Rather than sending an M105 only after receiving a line with T:, always
send M105 when we are trying to detect baudrate, otherwise we can end
up in an undefined state.

Contributes to #82
 2015-07-27 18:50:10 +02:00
Arjen Hiemstra
d659e5b8b8 Merge branch '15.06' 
Conflicts:
	cura/CuraApplication.py
 2015-07-15 00:38:29 +02:00
Arjen Hiemstra
c1d8e204b7 Increase baud rate detection timeout and do not send \n between M105 
Improves printer detection rate on MacOSX

Contributes to #82
 2015-07-15 00:19:35 +02:00
Arjen Hiemstra
89b175bc5c Merge branch '15.06' 
* 15.06:
  Do not cause "dictionary changed size during iteration" errors when changing view
  Adds an idle-state for the layerview slider
  Adds an idle-state for the safebutton
  Sets the platform activity on true when a model is loaded
  Sets the platform activity on true when a model is loaded
  Create functions that get & set platform activity
  Send M104 to set the temperature to 0
  Do not store files that fail to load in recent files
 2015-07-13 13:52:33 +02:00
Arjen Hiemstra
6859481fd4 Send M104 to set the temperature to 0 
This makes it possible to continue communication after cancelling a
print.

Contributes to #82
 2015-07-10 16:02:01 +02:00
Arjen Hiemstra
a83bcedb22 Catch errors when trying to close the connection thread 
Contributes to #82
 2015-07-09 16:34:04 +02:00
Arjen Hiemstra
032e27c68c Merge branch '15.06' 2015-07-08 13:03:05 +02:00
Arjen Hiemstra
a9f109fd74 Fix USB printing on Linux 
Contributes to #82
 2015-07-07 11:30:00 +02:00
Arjen Hiemstra
a429e362ad Merge branch '15.06' 
* 15.06:
  Update changelog
  Correct the bottom offset we add when setting the volume for scale to max
  Display progress information during processing of layer data
  If findObject returns none but object_id != 0 use the selected object
  Offset the displayed rotation angle so it does not overlap the mouse cursor
  Abort attempts to connect if an error is thrown when connecting to the serial port
  Fix recent files on Windows
  Defer opening the webbrowser until the next run of the event loop
  Disable slicing and platform physics when an operation is being performed
  Rework LayerData mesh generation for improved performance
  Performance: Only calculate the platform center once, not for every poly
  Add application icons for all three platforms
 2015-06-24 12:06:39 +02:00
Arjen Hiemstra
d28f84d732 Abort attempts to connect if an error is thrown when connecting to the serial port 
This fixes an issue where thread.join() would be called from the current thread
which fails.
 2015-06-23 12:29:05 +02:00
Jaime van Kessel
b5fda5b835 Added exception handling to listen thread join 2015-06-05 13:26:51 +02:00
Jaime van Kessel
95d4b34f06 Added exception handling to listen thread join 2015-06-04 11:12:31 +02:00
Jaime van Kessel
7fda5c84e7 Added extra exception catching for thread joining 2015-06-02 15:35:15 +02:00
Arjen Hiemstra
9d7e460b50 Add missing copyright headers 
Fixes #5
 2015-05-11 12:18:05 +02:00
Arjen Hiemstra
0a6562a8f1 Style: Use "" for strings not '' 2015-05-06 18:32:54 +02:00
Arjen Hiemstra
63e8cf72a3 Add 'plugins/USBPrinting/' from commit 'b28ca0881a6c2564f5447476f7b21de5645c10bd' 
git-subtree-dir: plugins/USBPrinting
git-subtree-mainline: 3823afd8cca1fe92b69082d51d0d50946b904e91
git-subtree-split: b28ca0881a6c2564f5447476f7b21de5645c10bd
 2015-04-30 12:30:37 +02:00