Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ssavickiy #47

Merged
merged 593 commits into from
May 9, 2020
Merged
Changes from 1 commit
Commits
Show all changes
593 commits
Select commit Hold shift + click to select a range
6633482
Add TMC micro-steps sanity check (#17044)
sjasonsmith Mar 2, 2020
624ab24
Suppress thisItemNr warning (#17049)
ellensp Mar 2, 2020
af23c04
Don't define 'valptr' if unused (#17048)
ellensp Mar 2, 2020
5aa5287
Fix ambiguous type
thinkyhead Mar 2, 2020
9bd6dec
fix #33
ursoft Mar 2, 2020
ad4a9eb
Fix G34 probing range/error bug (#17052)
jufimu12 Mar 2, 2020
552f7a9
Default on/off for Power Loss Recovery (#17051)
InsanityAutomation Mar 2, 2020
e0c0173
Fix nested comment warning (#17045)
thisiskeithb Mar 2, 2020
eb4d512
Keep name around for old configs
thinkyhead Mar 2, 2020
646599d
Finish M900 updates
thinkyhead Mar 2, 2020
d3e232d
Add single extruder LIN_ADVANCE test
thinkyhead Mar 2, 2020
07e22d1
Neopixel on LPC uses GPIO toggling
thinkyhead Mar 2, 2020
12d05e4
[cron] Bump distribution date (2020-03-03)
thinkyhead Mar 3, 2020
af62d7f
Fix MMU test
thinkyhead Mar 3, 2020
4827664
fix #34
ursoft Mar 3, 2020
5171e9d
No more direct G28 calls
thinkyhead Mar 3, 2020
3a07b44
Asynchronous M114 and (R)ealtime position option (#17032)
thinkyhead Mar 3, 2020
5e28b0f
Minor EEPROM cleanup
thinkyhead Mar 3, 2020
0ad94d6
Software SPI for 12864 fix #31
ursoft Mar 3, 2020
39399dc
fix #1
ursoft Mar 3, 2020
c083728
General code cleanup
thinkyhead Mar 2, 2020
83a60f1
Fix EEPROM compile errors
thinkyhead Mar 3, 2020
fd1af01
mftest: Set machine name
thinkyhead Mar 3, 2020
efc739a
Use BED_MAXTEMP for PTC_MAX_BED_TEMP (#17061)
thisiskeithb Mar 3, 2020
a698bfd
Update FYSETC S6 pins/variants (#17056)
GerogeFu Mar 3, 2020
72b63e9
Fix TEMP_PROBE_PIN for SKR 1.4
thinkyhead Mar 3, 2020
57cbec3
fix #36
ursoft Mar 3, 2020
ab1863a
[cron] Bump distribution date (2020-03-04)
thinkyhead Mar 4, 2020
df6e7ac
fix #35 в основном за счет кеширования
ursoft Mar 4, 2020
07fe5b6
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Mar 4, 2020
7709261
Move shared code to wait_for_bed_heating
thinkyhead Mar 4, 2020
70863fb
Avoid name conflict with 'UART'
thinkyhead Mar 3, 2020
d4ac785
Allow Z_STOP_PIN override on SKR 1.4 (#17063)
thinkyhead Mar 4, 2020
631addb
SAMD51 SoftwareSerial (#17041)
thinkyhead Mar 4, 2020
7e58739
[cron] Bump distribution date (2020-03-05)
thinkyhead Mar 5, 2020
0578e9b
Move SENSORLESS_PROBING to the probes section
thinkyhead Mar 5, 2020
e3da86f
Fix SKR test for ONBOARD SD
thinkyhead Mar 5, 2020
5a6daa7
Fix CI test for SENSORLESS_PROBING
thinkyhead Mar 5, 2020
c0801e9
Define Z_MIN_PROBE_PIN for Cohesion 3D Remix
thinkyhead Mar 5, 2020
f0248c9
Update Turkish language (#17070)
thinkyhead Mar 5, 2020
3a72b0f
Update Chinese (TW) language (#17071)
thinkyhead Mar 5, 2020
459a0da
[cron] Bump distribution date (2020-03-06)
thinkyhead Mar 6, 2020
6d18f71
Fix M0/M1 message string
thinkyhead Mar 6, 2020
6cd99e6
Add pins to the pins debug list
thinkyhead Mar 5, 2020
ca4423e
Clean up pins debugging
thinkyhead Mar 5, 2020
1da49d0
Non-blocking Max7219 test pattern
thinkyhead Mar 6, 2020
913de02
Change PID dummy value to NAN
thinkyhead Mar 6, 2020
3b14158
[cron] Bump distribution date (2020-03-07)
thinkyhead Mar 7, 2020
e9f451b
Pins debug followup
thinkyhead Mar 7, 2020
8ff25a9
Max7219 init last
thinkyhead Mar 7, 2020
c99773b
Max7219 suspend/resume
thinkyhead Mar 7, 2020
7b9eb23
Emergency Parser dumb terminal compatibility
thinkyhead Mar 7, 2020
3db784f
More pins debugging cleanup
thinkyhead Mar 6, 2020
20f9340
Add / correct comments
thinkyhead Mar 2, 2020
5eb6fb1
[cron] Bump distribution date (2020-03-08)
thinkyhead Mar 8, 2020
64d0929
More useful ENABLED / DISABLED macros (#17054)
thinkyhead Mar 8, 2020
2a71e4f
Revert that wack backoff
thinkyhead Mar 8, 2020
b21edce
More general SD_DETECT_INVERTED override
thinkyhead Mar 8, 2020
57f4887
[ToolChanger] Lock the current tool at power-up (#17093)
MangaValk Mar 8, 2020
982197b
Fixes for Z4 axis, CS pins (#17097)
thinkyhead Mar 8, 2020
7f490c0
[cron] Bump distribution date (2020-03-09)
thinkyhead Mar 9, 2020
1d944a7
fix #37
ursoft Mar 9, 2020
b579f5d
Move 'last_pause_state' closer to usage
thinkyhead Mar 8, 2020
7674bef
DOGM SPI delay is less common
thinkyhead Mar 9, 2020
0f39386
Make BOOTSCREEN_TIMEOUT generally available
thinkyhead Mar 9, 2020
13118db
Additional numtostr functions
thinkyhead Mar 9, 2020
b553077
Add debug logging for setup()
thinkyhead Mar 8, 2020
972d1bf
Ensure welcome message
thinkyhead Mar 9, 2020
8799f8b
[cron] Bump distribution date (2020-03-10)
thinkyhead Mar 10, 2020
8f66dbf
SD_DETECT_INVERTED => SD_DETECT_STATE (#17112)
thinkyhead Mar 10, 2020
8bbcbc5
Fix Z4 stepper indirection macros (#17107)
Mar 10, 2020
9bff67b
Always look for PLR file, but more quickly
thinkyhead Mar 10, 2020
4e3a793
Fix broken enqueue_P
thinkyhead Mar 10, 2020
a31b733
[cron] Bump distribution date (2020-03-11)
thinkyhead Mar 11, 2020
e700455
Tweaks to finishSDPrinting (#17082)
thinkyhead Mar 11, 2020
627aa8d
Fix G34, add HOME_AFTER_G34 option (#17108)
jufimu12 Mar 11, 2020
d78fbce
Fix pio environments for Anet 1.x (#17109)
kreuzhofer Mar 11, 2020
bd44f04
M220 print FR percentage (#17101)
guruathwal Mar 11, 2020
550489c
fix #38
ursoft Mar 11, 2020
868d4ac
fix #23
ursoft Mar 11, 2020
eb6c992
Announce SD file open
thinkyhead Mar 11, 2020
23c5701
Apply soft limits to joystick jogging (#17114)
vector76 Mar 11, 2020
201c991
Fix and update DGUS displays (#17072)
GerogeFu Mar 11, 2020
abcf01d
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Mar 11, 2020
f29d6f8
Revert Anet 1.x envs change (#17120)
kreuzhofer Mar 11, 2020
924fa60
Non-const REMEMBER needed for RESTORE
thinkyhead Mar 11, 2020
112245e
More explicit EEPROM types (#17127)
thinkyhead Mar 11, 2020
8bad6e1
Fix STM32 _WRITE macro parameter (#17121)
bigtreetech Mar 11, 2020
318a166
Fix M810 macro multiple use
thinkyhead Mar 11, 2020
1f55986
[cron] Bump distribution date (2020-03-12)
thinkyhead Mar 12, 2020
8c11eca
[cron] Bump distribution date (2020-03-13)
thinkyhead Mar 13, 2020
4e96a01
Use arduinoststm32 3.x for FYSETC S6 (#17131)
sjasonsmith Mar 13, 2020
9c759e5
Fix BAUD_RATE_GCODE, etc. (#17135)
sjasonsmith Mar 13, 2020
59cb146
Fix DUGS / DGUS typo
thinkyhead Mar 13, 2020
7070ea0
Add OnPidTuning event to Malyan LCD (#17143)
nick-diel Mar 13, 2020
aa32c47
Shorten German BLTouch menu item names (#17151)
GeminiServer Mar 13, 2020
81b0548
Fix Emergency Parser stuck state
thinkyhead Mar 13, 2020
7ec45f4
Fix end of short (auto0.g) prints
thinkyhead Mar 13, 2020
ad980a7
M0 Q preserve status
thinkyhead Mar 13, 2020
6bead0c
Shorter paths to HAL, ExtUI (#17156)
thinkyhead Mar 13, 2020
983a8ce
[cron] Bump distribution date (2020-03-14)
thinkyhead Mar 14, 2020
a96be32
Fix G26 corrupted position
thinkyhead Mar 12, 2020
118bd2f
Apply loop shorthand macros (#17159)
thinkyhead Mar 14, 2020
cee07f3
Quad Z leveling, G34 (R)ecalculate (#17122)
InsanityAutomation Mar 14, 2020
8b2d55e
Config version 020005
thinkyhead Mar 14, 2020
9f85165
Allow Tool Offset adjustments to have another digit of precision
Roxy-3D Mar 14, 2020
5c1970a
[cron] Bump distribution date (2020-03-15)
thinkyhead Mar 15, 2020
41ffe98
Fix LCD progress bar
thinkyhead Mar 15, 2020
095a112
Add a global machine state
thinkyhead Mar 14, 2020
090a90a
Add EEPROM_BOOT_SILENT option
thinkyhead Mar 10, 2020
695e014
Do later mounting of LCD-based SD
thinkyhead Mar 10, 2020
406d4df
#39 - скорость и слои
ursoft Mar 15, 2020
358b95e
#35 improved
ursoft Mar 15, 2020
8518729
Fix incorrect type on ubl_storage_slot (#17170)
ktand Mar 15, 2020
c398737
Fix Z after ABL Bilinear G29 with fade
thinkyhead Mar 15, 2020
3b987df
Fix G34 Z lower, extra "BLTOUCH" debug line (#17175)
GMagician Mar 15, 2020
775a429
Configurable SLOWDOWN divisor (#17171)
InsanityAutomation Mar 15, 2020
a662079
[cron] Bump distribution date (2020-03-16)
thinkyhead Mar 16, 2020
2fc0df1
Shorter LCD remaining time to prevent overlap (#17181)
pmjdebruijn Mar 16, 2020
b14c933
LPC1768 EEPROM fallback to flash, add overrides (#17184)
thinkyhead Mar 16, 2020
f6e80d5
Fix Z_MIN_PROBE_PIN on SKR 1.4 (#17187)
thinkyhead Mar 16, 2020
c167222
[cron] Bump distribution date (2020-03-17)
thinkyhead Mar 17, 2020
230364c
мелкие исправления
ursoft Mar 17, 2020
40922c7
Fix MKS SBASE 1.6 E1 heater pin (#17191)
ellensp Mar 17, 2020
e5dcab8
ARMED support for TMC UART, probe temp (#17186)
ktand Mar 17, 2020
e8205af
Apply HAS_TMC_UART to pins files
thinkyhead Mar 17, 2020
1f58242
More decimal places for babystep / Z probe offset (#17195)
JoePrints Mar 17, 2020
c768605
Add Copymaster3D board (#17188)
RasmusAaen Mar 17, 2020
252178f
[cron] Bump distribution date (2020-03-18)
thinkyhead Mar 18, 2020
abea6d5
Tweak some lambdas
thinkyhead Mar 18, 2020
83eec68
New Controller Fan options and M710 gcode (#17149)
GeminiServer Mar 18, 2020
de45ac4
Implement CONTROLLER_FAN_USE_Z_ONLY
thinkyhead Mar 18, 2020
84dec5d
Add M42 M, improve M43 (#17173)
InsanityAutomation Mar 18, 2020
14daf1e
[cron] Bump distribution date (2020-03-19)
thinkyhead Mar 19, 2020
9abe928
#41 исправлена порча памяти в меню движения по оси Z
ursoft Mar 19, 2020
71db5c1
Fix FYSETC mini 12864 init / glitches (#17209)
GerogeFu Mar 19, 2020
1738c13
[cron] Bump distribution date (2020-03-20)
thinkyhead Mar 20, 2020
42b7fd7
fix #41
ursoft Mar 20, 2020
198f5af
fix #26
ursoft Mar 20, 2020
3151856
[cron] Bump distribution date (2020-03-21)
thinkyhead Mar 21, 2020
04cea86
Split up STM32 pins files (#17212)
thinkyhead Mar 21, 2020
29874b2
[cron] Bump distribution date (2020-03-22)
thinkyhead Mar 22, 2020
1674df0
Stay at v0.91 of USBComposite for STM32F1
thinkyhead Mar 21, 2020
7988e31
whitespace
thinkyhead Mar 22, 2020
e62b52d
Use pin/port names for CHITU pins
thinkyhead Mar 22, 2020
9340a33
Add a pins formatting script
thinkyhead Mar 22, 2020
2c325c2
Format some pins files
thinkyhead Mar 22, 2020
d5cae7b
fix #39
ursoft Mar 22, 2020
2460a3d
Fix custom version file include
thinkyhead Mar 22, 2020
e7a9f17
Tweak serial port descriptions
thinkyhead Mar 22, 2020
27c281e
[cron] Bump distribution date (2020-03-23)
thinkyhead Mar 23, 2020
717c216
Fix Copymaster Y_MAX pin (#17267)
RasmusAaen Mar 23, 2020
fe154fa
Fix CONTROLLER_FAN options compile
thinkyhead Mar 22, 2020
580d314
Skip impossible PWM sanity-checks
thinkyhead Mar 22, 2020
adb7a88
Fix an unused var warning
thinkyhead Mar 23, 2020
cd4060a
Add USB serial support to SERIAL_PORT_2 on DUE (#17245)
ellensp Mar 23, 2020
e3ebbe2
DGUS updates (#17260)
GerogeFu Mar 23, 2020
c87d730
Fix extra M114 output line
thinkyhead Mar 23, 2020
edd6f6c
[cron] Bump distribution date (2020-03-24)
thinkyhead Mar 24, 2020
bef9b9b
Delay after homing_backoff for CoreXY sensorless homing (#17273)
rado79 Mar 24, 2020
3260228
Sanity-check CORE backlash axes (#17279)
mkpfalz Mar 24, 2020
4113481
Fix limits on acceleration editing (#17280)
MarkMan0 Mar 24, 2020
41e944d
Fix Emergency Parser on DUE (#17276)
ellensp Mar 24, 2020
7455bb0
Add SoftwareSerialM for MKS Robin (#17207)
thinkyhead Mar 24, 2020
68face8
Sanity check CONTROLLERFAN_SECS
thinkyhead Mar 24, 2020
5d515c3
Adjust for timing shift on Max7219 displays on AVR's
Roxy-3D Mar 24, 2020
075a86b
Update LCD timing on Formbot T-Rex 2+ machines
Roxy-3D Mar 24, 2020
0aeee64
[cron] Bump distribution date (2020-03-25)
thinkyhead Mar 25, 2020
1986e1c
Allow PID_DEBUG to be turned on and off (#17284)
Roxy-3D Mar 25, 2020
652927a
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
ursoft Mar 25, 2020
f2ed18d
M303 followup
thinkyhead Mar 25, 2020
c86ee57
Drop old comment
thinkyhead Mar 25, 2020
4dea020
[cron] Bump distribution date (2020-03-26)
thinkyhead Mar 26, 2020
adb6334
Use "dist" instead of "delta" for clarity
thinkyhead Mar 25, 2020
0175189
Allow G2_PWM to be slimmer
thinkyhead Mar 26, 2020
dd67812
motion.cpp: HAS_DIST_MM_ARG
thinkyhead Mar 26, 2020
5ec1a8b
Fix M0 unused var warning
thinkyhead Mar 25, 2020
5c150c0
Update Russian language (#17290)
Acenotass Mar 26, 2020
8122468
Update Italian language (#17293)
GMagician Mar 26, 2020
d6a4c30
Tweak ui.finish_status
thinkyhead Mar 26, 2020
54a12ee
Tweak eeprom storage type
thinkyhead Mar 25, 2020
0a281af
Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marl…
ursoft Mar 26, 2020
98ef161
[cron] Bump distribution date (2020-03-27)
thinkyhead Mar 27, 2020
517a9d6
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Mar 27, 2020
99afd00
small fixes after merge
ursoft Mar 27, 2020
3655e24
Fix SD finished ExtUI / host action (#17285)
InsanityAutomation Mar 27, 2020
129b270
QSPI EEPROM for SAMD51 (#17292)
GMagician Mar 27, 2020
bed41af
Fix Stepper PWM menu (#17298)
InsanityAutomation Mar 27, 2020
8752fbd
Store case light brightness in EEPROM (#17307)
mathiasvr Mar 27, 2020
e71b25a
[cron] Bump distribution date (2020-03-28)
thinkyhead Mar 28, 2020
de648bf
Add Funmat HT V4.0 board support (#17305)
InsanityAutomation Mar 28, 2020
53fe572
Limited backlash editing with Core kinematics (#17281)
thinkyhead Mar 28, 2020
a849909
Simplify TWIBus debug
thinkyhead Mar 28, 2020
747b964
Clean up user-wait, SD completion (#17315)
thinkyhead Mar 28, 2020
b02d662
fix #42
ursoft Mar 28, 2020
2f7e5cf
Fix typo...
Roxy-3D Mar 28, 2020
fc74c6a
[cron] Bump distribution date (2020-03-29)
thinkyhead Mar 29, 2020
b35dc5f
Fix Trigorilla 1.4 missing spaces
oscarsan1 Mar 29, 2020
add34aa
Fix STM32F1 USB Composite Dependency
thisiskeithb Mar 28, 2020
fc11e72
Fix extra unskew call
thinkyhead Mar 29, 2020
765a9f3
do_pause_e_move => unscaled_e_move
thinkyhead Mar 29, 2020
d029a09
Minor HAL cleanup
thinkyhead Mar 29, 2020
223aa5c
No unscaled_e_move for CNC
thinkyhead Mar 29, 2020
9b886c2
Load balance some tests
thinkyhead Mar 29, 2020
747a4bb
[cron] Bump distribution date (2020-03-30)
thinkyhead Mar 30, 2020
6c4e0b6
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Mar 30, 2020
0ea26d5
[cron] Bump distribution date (2020-03-31)
thinkyhead Mar 31, 2020
96ab16a
Pulldown for all FastIO headers
thinkyhead Mar 31, 2020
528907c
Additional TERN macros
thinkyhead Mar 31, 2020
e0e87ca
Fix last arc segment
thinkyhead Mar 31, 2020
ac0a7f2
Fix Fysetc stm32flash usage (#17331)
trouch Mar 31, 2020
c759729
STM32F1: Restore M43 build support (#17336)
tpruvot Mar 31, 2020
d83ad6f
Improve / fix FTDI EVE Touch UI (#17338)
marciot Mar 31, 2020
e7f020f
Shorten some internal pin names
thinkyhead Mar 31, 2020
5236889
[cron] Bump distribution date (2020-04-01)
thinkyhead Apr 1, 2020
178ca2b
Fix M710 report formatting (#17356)
margaale Apr 1, 2020
192c7c2
Fix extra TMC serial begin calls (#17351)
simon-jouet Apr 1, 2020
c47bdae
[cron] Bump distribution date (2020-04-02)
thinkyhead Apr 2, 2020
7f5dc7b
More 8 extruders (TMC) support
thinkyhead Apr 1, 2020
514afdd
Minor code cleanup
thinkyhead Apr 1, 2020
62e8c2d
Fix up 'system' includes
thinkyhead Apr 2, 2020
f263782
Fix ESP32 eeprom flag
thinkyhead Apr 2, 2020
9f86dde
Clean up UI declarations, apply TERN_
thinkyhead Apr 2, 2020
555a90e
fix #32
ursoft Apr 2, 2020
e45f047
fix #45
ursoft Apr 6, 2020
3460acc
fix #45
ursoft Apr 6, 2020
ecd2288
voltage
ssavickiy Apr 8, 2020
27d3eeb
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Apr 8, 2020
d26bc97
fix #33
ursoft Apr 9, 2020
9384f73
fix #33
ursoft Apr 9, 2020
a2bce9d
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Apr 9, 2020
fff8bd1
fix typo in #34
Apr 12, 2020
b8c726e
уточнил оранжевый и желтый цвета под свой дисплей
ursoft Apr 18, 2020
a5cfb66
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Apr 20, 2020
c32f37f
Переключил TMC2208 UART на 256 шагов вместо 16
ssavickiy Apr 20, 2020
4b20493
отключил интерполяцию для всех, принудительно 64 микрошага на экструд…
ssavickiy Apr 20, 2020
459c183
таймаут дисплея измени до 15 минут, отрабатывал не так как надо в нач…
ssavickiy Apr 20, 2020
731a58a
Revert "Переключил TMC2208 UART на 256 шагов вместо 16"
ssavickiy Apr 20, 2020
7a4e905
Revert "отключил интерполяцию для всех, принудительно 64 микрошага на…
ssavickiy Apr 20, 2020
e677533
вернул настройки tmc как было до экспериментов с микрошагами
ssavickiy Apr 20, 2020
2346714
поправил под актуальный pid e
ssavickiy Apr 20, 2020
5174ae5
fix #46
ursoft Apr 20, 2020
6a0783a
Merge branch 'bugfix-2.0.x-UltiSteel' into ssavickiy
ssavickiy Apr 20, 2020
cdcdf76
10 минут таймаут дисплея
ssavickiy Apr 20, 2020
8412472
убрал la понизил скорость кулера на хотенде
ssavickiy Apr 23, 2020
fa0a381
двигатели 900 ма
ssavickiy Apr 28, 2020
7202b53
Update Configuration_adv.h
ssavickiy May 9, 2020
a95b5db
update
ssavickiy May 9, 2020
bd0938a
Merge branch 'bugfix-2.0.x-UltiSteel-ssavickiy' into ssavickiy
ssavickiy May 9, 2020
8c56c8a
Revert "Merge branch 'bugfix-2.0.x-UltiSteel-ssavickiy' into ssavickiy"
ssavickiy May 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
small fixes after merge
ursoft committed Mar 27, 2020
commit 99afd00b056106c73681adc4ee72dca604b2f5fa
2 changes: 1 addition & 1 deletion Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
@@ -1218,7 +1218,7 @@
*
* :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE', 'LCD_AND_ONBOARD' ]
*/
#define SDCARD_CONNECTION LCD //_AND_ONBOARD
#define SDCARD_CONNECTION LCD_AND_ONBOARD

#endif // SDSUPPORT

4 changes: 4 additions & 0 deletions Marlin/src/feature/pause.cpp
Original file line number Diff line number Diff line change
@@ -409,7 +409,11 @@ bool pause_print(const float &retract, const xyz_pos_t &park_point, const float
}
#endif

#if (GITHUB_USER==URSOFT)
//return false; // unable to reach safe temperature, but need pause
#else
return false; // unable to reach safe temperature
#endif
}

// Indicate that the printer is paused
8 changes: 6 additions & 2 deletions Marlin/src/module/endstops.cpp
Original file line number Diff line number Diff line change
@@ -820,8 +820,12 @@ void Endstops::update() {
if (true
#if ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
&& z_probe_enabled
//#elif HAS_CUSTOM_PROBE_PIN /* stop on Zmin also, not only probe */
// && !z_probe_enabled
#elif HAS_CUSTOM_PROBE_PIN
#if (GITHUB_USER==URSOFT)
/* stop on Zmin also, not only probe */
#else
&& !z_probe_enabled
#endif
#endif
) PROCESS_ENDSTOP_Z(MIN);
#endif
4 changes: 2 additions & 2 deletions Marlin/src/sd/Sd2Card.cpp
Original file line number Diff line number Diff line change
@@ -42,8 +42,8 @@
#else
HardwareSPI<> SPI_LCD;
#endif
SoftwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB;
//HardwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB, 1> SPI_OB; //much slower!!?
//SoftwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB> SPI_OB; //much slower because of diff pins for Software SPI
HardwareSPI<SCK_PIN_OB, MISO_PIN_OB, MOSI_PIN_OB, 1> SPI_OB;

#define spiSend(P) (isOnBoard() ? SPI_OB.spiSend(P) : SPI_LCD.spiSend(P))
#define spiRead(P1, P2) (isOnBoard() ? SPI_OB.spiRead(P1, P2) : SPI_LCD.spiRead(P1, P2))