Skip to content

Commit

Permalink
v004 updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThomasToka
ThomasToka committed Jul 23, 2023
1 parent 782a92d commit 3f64061
Show file tree
Hide file tree
Showing 8 changed files with 392 additions and 164 deletions.
50 changes: 31 additions & 19 deletions Marlin/Configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,19 +119,23 @@
#define MACHINE_TYPE "Ender-3 S1 Pro"
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
#if GRID_MAX_POINTS_X == 5
#define FIRMWARE_VERSION "abl5x5-v003-byTT"
#define FIRMWARE_VERSION "abl5x5-v004-byTT"
#elif GRID_MAX_POINTS_X == 7
#define FIRMWARE_VERSION "abl7x7-v003-byTT"
#define FIRMWARE_VERSION "abl7x7-v004-byTT"
#elif GRID_MAX_POINTS_X == 9
#define FIRMWARE_VERSION "abl9x9-v004-byTT"
#elif GRID_MAX_POINTS_X == 10
#define FIRMWARE_VERSION "abl10x10-v003-byTT"
#define FIRMWARE_VERSION "abl10x10-v004-byTT"
#endif
#else
#if GRID_MAX_POINTS_X == 5
#define FIRMWARE_VERSION "ubl5x5-v003-byTT"
#define FIRMWARE_VERSION "ubl5x5-v004-byTT"
#elif GRID_MAX_POINTS_X == 7
#define FIRMWARE_VERSION "ubl7x7-v003-byTT"
#define FIRMWARE_VERSION "ubl7x7-v004-byTT"
#elif GRID_MAX_POINTS_X == 9
#define FIRMWARE_VERSION "ubl9x9-v004-byTT"
#elif GRID_MAX_POINTS_X == 10
#define FIRMWARE_VERSION "ubl10x10-v003-byTT"
#define FIRMWARE_VERSION "ubl10x10-v004-byTT"
#endif
#endif
#define SCREEN_VERSION "UI20"
Expand Down Expand Up @@ -167,19 +171,23 @@
#define MACHINE_TYPE "Ender-3 S1 Plus"
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
#if GRID_MAX_POINTS_X == 5
#define FIRMWARE_VERSION "abl5x5-v003-byTT"
#define FIRMWARE_VERSION "abl5x5-v004-byTT"
#elif GRID_MAX_POINTS_X == 7
#define FIRMWARE_VERSION "abl7x7-v003-byTT"
#define FIRMWARE_VERSION "abl7x7-v004-byTT"
#elif GRID_MAX_POINTS_X == 9
#define FIRMWARE_VERSION "abl9x9-v004-byTT"
#elif GRID_MAX_POINTS_X == 10
#define FIRMWARE_VERSION "abl10x10-v003-byTT"
#define FIRMWARE_VERSION "abl10x10-v004-byTT"
#endif
#else
#if GRID_MAX_POINTS_X == 5
#define FIRMWARE_VERSION "ubl5x5-v003-byTT"
#define FIRMWARE_VERSION "ubl5x5-v004-byTT"
#elif GRID_MAX_POINTS_X == 7
#define FIRMWARE_VERSION "ubl7x7-v003-byTT"
#define FIRMWARE_VERSION "ubl7x7-v004-byTT"
#elif GRID_MAX_POINTS_X == 9
#define FIRMWARE_VERSION "ubl9x9-v004-byTT"
#elif GRID_MAX_POINTS_X == 10
#define FIRMWARE_VERSION "ubl10x10-v003-byTT"
#define FIRMWARE_VERSION "ubl10x10-v004-byTT"
#endif
#endif
#define SCREEN_VERSION "v1.0.1-byTT"
Expand Down Expand Up @@ -214,14 +222,16 @@
#define SOFTVERSION SHORT_BUILD_VERSION
#define MACHINE_TYPE "Ender-3 S1"
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
#define FIRMWARE_VERSION "abl5x5-v002-byTT"
#define FIRMWARE_VERSION "abl5x5-v004-byTT"
#else
#if GRID_MAX_POINTS_X == 5
#define FIRMWARE_VERSION "ubl5x5-v002-byTT"
#define FIRMWARE_VERSION "ubl5x5-v004-byTT"
#elif GRID_MAX_POINTS_X == 7
#define FIRMWARE_VERSION "ubl7x7-v002-byTT"
#define FIRMWARE_VERSION "ubl7x7-v004-byTT"
#elif GRID_MAX_POINTS_X == 9
#define FIRMWARE_VERSION "ubl9x9-v004-byTT"
#elif GRID_MAX_POINTS_X == 10
#define FIRMWARE_VERSION "ubl10x10-v002-byTT"
#define FIRMWARE_VERSION "ubl10x10-v004-byTT"
#endif
#endif
#define SCREEN_VERSION "v1.0.1-byTT"
Expand Down Expand Up @@ -259,11 +269,13 @@
#define FIRMWARE_VERSION "abl5x5-byTT"
#else
#if GRID_MAX_POINTS_X == 5
#define FIRMWARE_VERSION "ubl5x5-byTT"
#define FIRMWARE_VERSION "ubl5x5-v004-byTT"
#elif GRID_MAX_POINTS_X == 7
#define FIRMWARE_VERSION "ubl7x7-byTT"
#define FIRMWARE_VERSION "ubl7x7-v004-byTT"
#elif GRID_MAX_POINTS_X == 9
#define FIRMWARE_VERSION "ubl9x9-v004-byTT"
#elif GRID_MAX_POINTS_X == 10
#define FIRMWARE_VERSION "ubl10x10-byTT"
#define FIRMWARE_VERSION "ubl10x10-v004-byTT"
#endif
#endif
#define SCREEN_VERSION "v1.0.1-byTT"
Expand Down
7 changes: 6 additions & 1 deletion Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,11 @@ void unified_bed_leveling::shift_mesh_height() {
#if GRID_MAX_POINTS_X == 7
rtscheck.RTS_SndData(ExchangePageBase + 94, ExchangepageAddr);
change_page_font = 94;
#endif
#endif
#if GRID_MAX_POINTS_X == 9
rtscheck.RTS_SndData(ExchangePageBase + 96, ExchangepageAddr);
change_page_font = 96;
#endif
#if GRID_MAX_POINTS_X == 10
rtscheck.RTS_SndData(ExchangePageBase + 95, ExchangepageAddr);
change_page_font = 95;
Expand All @@ -882,6 +886,7 @@ void unified_bed_leveling::shift_mesh_height() {
queue.enqueue_one(F("G29 P1 C T"));
}
rtscheck.RTS_SndData(lang, AUTO_LEVELING_START_TITLE_VP);
leveling_running = 0;
RTS_AutoBedLevelPage();
#endif

Expand Down
9 changes: 7 additions & 2 deletions Marlin/src/gcode/bedlevel/abl/G29.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,11 @@ G29_TYPE GcodeSuite::G29() {
#if GRID_MAX_POINTS_X == 7
rtscheck.RTS_SndData(ExchangePageBase + 94, ExchangepageAddr);
change_page_font = 94;
#endif
#endif
#if GRID_MAX_POINTS_X == 9
rtscheck.RTS_SndData(ExchangePageBase + 96, ExchangepageAddr);
change_page_font = 96;
#endif
#if GRID_MAX_POINTS_X == 10
rtscheck.RTS_SndData(ExchangePageBase + 95, ExchangepageAddr);
change_page_font = 95;
Expand Down Expand Up @@ -1045,7 +1049,8 @@ G29_TYPE GcodeSuite::G29() {

#if ENABLED(E3S1PRO_RTS)
queue.enqueue_one_P(PSTR("M420 S1"));
queue.enqueue_one_P(PSTR("M500"));
queue.enqueue_one_P(PSTR("M500"));
leveling_running = 0;
rtscheck.RTS_SndData(lang, AUTO_LEVELING_START_TITLE_VP);
RTS_AutoBedLevelPage();
#endif
Expand Down
Loading

0 comments on commit 3f64061

Please sign in to comment.