Skip to content

Commit

Permalink
all own Stuff together (Preview and optimazions...)
Browse files Browse the repository at this point in the history
downgrade to last remote (+1 squashed commits)

Squashed commits:

[e5e7d02] # This is a combination of 3 commits.

get some own features from xx-dev (+17 squashed commit)

Squashed commit:

[cfcb3ae] nrmal setting for SP Printer

[fc09ed8] das war nach dem Rebase trotzdem nötig... ?? (+36 squashed commit)

Squashed commit:

[18e885f176] reste von 2.0.2i

(cherry picked from commit f4bca9d)

[a751f00523] correct default setting for platformio: used at initalisation of .vscode

[ed4a219b85] mergebug fixing

[3b2850c786] branch name Update: >bugfix-SP

[fb891d3b85] lost merge items

[a0f3c63e77] Merge branch 'Jy/bugfix-JyersUI-2.0.2i' into feature/add_Jyers202i
handish merged (outside git)

[bf30301469] cleanUp

[c0cb524684] clean Version Infos

[3772ebdefb] use version.h for SW-Info-data

[7062b610a5] old bugfix made in Jyers repo

[df286cf64f] speed Up (copy from ProUI)

[4798e442c2] smart debug

[4fdce84aca] delete redundant files / macros

[bb1e31e93e] redefine EXTRUDE_MINTEMP to stored data, conditionally to DRYRUN state

[562cfeea69] keyboard: turn around key selection

(cherry picked from commit 94eee50)

[4ed136c333] prepare for debugging pause functionality

[dd5dfefd36] get Jyers-LCD from Jyers-Fork repro: branch bugfix-JyersUI

[994851cd6e] Konfigurationen

[06652795c9] Probe 3D-Touch eingebaut

[666289fd31] add build date and time to Info screen
simplify the SP-changes

[2ce80f8cc8] CrealityEnhanced UI
3point mounted Bed for Creality_Enhanced_UI
+rebasing

[d075648757] - Jyers UI
- 3 point bed for JyersUI
- bed size 230x230
- label SP#3 (+1 squashed commits)

Squashed commits:

[6adee20474] Revert "disable leveling if doing E only movement"

This reverts commit 6a17be5. (+1 squashed commits)

Squashed commits:

[fa1073f56e] disable leveling if doing E only movement

[9dff6a89ea] cleanUp ubl to enable debugging of other modules

[af0e0d38fe] load/unload/Pause (not working correct)

[b18ebac8ad] filename scrolling fixed (print screen and filelist)

[0a303d3515] initial Z-homing delete to speed up

[80de7d206e] startup code for Ender 3v2 with UBL

[cd4043972b] ubl mesh: 7x6 points;
Z homing at middle of bed

[348469e65d] speed up manual levelling;
activate remaining time;
fix points for UBL tilt "G29 J";
UBL mesh to 8x8

[7672351c3a] usefull settings for my Hardware with Jyers UI (based on Jyers-config);
start UBL always in the middle of bed;
Info (SW-Build-Datum) auch bei Jyers

[894008be55] Konfigurationen

[715f1fab1d] Probe 3D-Touch eingebaut

[b16612036d] add build date and time to Info screen
simplify the SP-changes

[b8deea40b7] CrealityEnhanced UI
3point mounted Bed for Creality_Enhanced_UI
+rebasing

[ec3faa2337] - Jyers UI
- 3 point bed for JyersUI
- bed size 230x230
- label SP#3 (+1 squashed commits)

Squashed commits:

[6adee20474] Revert "disable leveling if doing E only movement"

This reverts commit 6a17be5. (+1 squashed commits)

Squashed commits:

[fa1073f56e] disable leveling if doing E only movement

[3cea0a0] 🐛 Some EEPROM size fixes (MarlinFirmware#24113)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

[4a17589] [cron] Bump distribution date (2022-05-08)

[198ef1e] 🎨 Misc. code cleanup

[9e43ec9] 🔨 Improved mfprep script

[1a9e8c0] 🔧 Fix Neo RGB sanity check (MarlinFirmware#24146)

[e43f420] 📌 Use ESP3DLib master branch (MarlinFirmware#24140)

[5f4ec82] ✏️Fix Markforged endstops/G38 (MarlinFirmware#24141)

[2a88cc0] [cron] Bump distribution date (2022-05-07)

[505ab1b] 🔨 Use first g++ in path for 'native' targets

[659b417] 🔨 Prevent build attribute define conflicts

[a5b57a0] [cron] Bump distribution date (2022-05-06)

[6e90272] 🩹 Bring G425 report up to date

Followup to MarlinFirmware#23112

[9d6b4a2] 🔧 Move LASER_COOLANT_FLOW_METER to LASER_FEATURE

[3cea0a0] 🐛 Some EEPROM size fixes (MarlinFirmware#24113)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

[e234002] nrmal setting for SP Printer

[a4a8f02] das war nach dem Rebase trotzdem nötig... ?? (+36 squashed commit)

Squashed commit:

[18e885f176] reste von 2.0.2i

(cherry picked from commit f4bca9d)

[a751f00523] correct default setting for platformio: used at initalisation of .vscode

[ed4a219b85] mergebug fixing

[3b2850c786] branch name Update: >bugfix-SP

[fb891d3b85] lost merge items

[a0f3c63e77] Merge branch 'Jy/bugfix-JyersUI-2.0.2i' into feature/add_Jyers202i
handish merged (outside git)

[bf30301469] cleanUp

[c0cb524684] clean Version Infos

[3772ebdefb] use version.h for SW-Info-data

[7062b610a5] old bugfix made in Jyers repo

[df286cf64f] speed Up (copy from ProUI)

[4798e442c2] smart debug

[4fdce84aca] delete redundant files / macros

[bb1e31e93e] redefine EXTRUDE_MINTEMP to stored data, conditionally to DRYRUN state

[562cfeea69] keyboard: turn around key selection

(cherry picked from commit 94eee50)

[4ed136c333] prepare for debugging pause functionality

[dd5dfefd36] get Jyers-LCD from Jyers-Fork repro: branch bugfix-JyersUI

[994851cd6e] Konfigurationen

[06652795c9] Probe 3D-Touch eingebaut

[666289fd31] add build date and time to Info screen
simplify the SP-changes

[2ce80f8cc8] CrealityEnhanced UI
3point mounted Bed for Creality_Enhanced_UI
+rebasing

[d075648757] - Jyers UI
- 3 point bed for JyersUI
- bed size 230x230
- label SP#3 (+1 squashed commits)

Squashed commits:

[6adee20474] Revert "disable leveling if doing E only movement"

This reverts commit 6a17be5. (+1 squashed commits)

Squashed commits:

[fa1073f56e] disable leveling if doing E only movement

[9dff6a89ea] cleanUp ubl to enable debugging of other modules

[af0e0d38fe] load/unload/Pause (not working correct)

[b18ebac8ad] filename scrolling fixed (print screen and filelist)

[0a303d3515] initial Z-homing delete to speed up

[80de7d206e] startup code for Ender 3v2 with UBL

[cd4043972b] ubl mesh: 7x6 points;
Z homing at middle of bed

[348469e65d] speed up manual levelling;
activate remaining time;
fix points for UBL tilt "G29 J";
UBL mesh to 8x8

[7672351c3a] usefull settings for my Hardware with Jyers UI (based on Jyers-config);
start UBL always in the middle of bed;
Info (SW-Build-Datum) auch bei Jyers

[894008be55] Konfigurationen

[715f1fab1d] Probe 3D-Touch eingebaut

[b16612036d] add build date and time to Info screen
simplify the SP-changes

[b8deea40b7] CrealityEnhanced UI
3point mounted Bed for Creality_Enhanced_UI
+rebasing

[ec3faa2337] - Jyers UI
- 3 point bed for JyersUI
- bed size 230x230
- label SP#3 (+1 squashed commits)

Squashed commits:

[6adee20474] Revert "disable leveling if doing E only movement"

This reverts commit 6a17be5. (+1 squashed commits)

Squashed commits:

[fa1073f56e] disable leveling if doing E only movement

[3cea0a0] 🐛 Some EEPROM size fixes (MarlinFirmware#24113)

Co-authored-by: Scott Lahteine <github@thinkyhead.com>

nrmal setting for SP Printer

get some own features from xx-dev
  • Loading branch information
thisiskeithb authored and Frank0587 committed May 27, 2022
1 parent 81a6834 commit 4367236
Show file tree
Hide file tree
Showing 377 changed files with 2,546 additions and 436 deletions.
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"marlinfirmware.auto-build",
"platformio.platformio-ide"
],
"unwantedRecommendations": [
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4367236

Please sign in to comment.