Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 6b4d7b9
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Tue Oct 25 00:37:23 2022 +0000

    [cron] Bump distribution date (2022-10-25)

commit 6e1f0be
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Mon Oct 24 17:04:55 2022 -0500

    🩹 Allow for last non-servo extruder

commit f4dc9d5
Author: ellensp <530024+ellensp@users.noreply.github.com>
Date:   Tue Oct 25 10:47:23 2022 +1300

    🐛 Fix move_extruder_servo (MarlinFirmware#24908)

commit 81f88fe
Author: InsanityAutomation <38436470+InsanityAutomation@users.noreply.github.com>
Date:   Mon Oct 24 17:44:52 2022 -0400

    🐛 Fix FTDUI Status Screen Timeout (MarlinFirmware#24899)

commit cf2311f
Author: Manuel McLure <manuel@mclure.org>
Date:   Mon Oct 24 14:25:47 2022 -0700

    🩹 Fix spurious "bad command" (MarlinFirmware#24923)

commit 248236b
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Mon Oct 24 00:36:39 2022 +0000

    [cron] Bump distribution date (2022-10-24)

commit aaf34fa
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Sat Oct 22 23:35:31 2022 -0500

    🩹 Fix M593 report

commit 2cad442
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sun Oct 23 00:34:38 2022 +0000

    [cron] Bump distribution date (2022-10-23)

commit 1b31a7c
Author: kurtis-potier-geofabrica <77456752+kurtis-potier-geofabrica@users.noreply.github.com>
Date:   Sat Oct 22 00:13:56 2022 -0400

    🚸 Up to 3 MAX Thermocouples (MarlinFirmware#24898)

commit fd0c6fa
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Oct 21 19:45:20 2022 -0500

    🔧 Clean up unused ESP_WIFI pins

commit ed12526
Author: thinkyhead <thinkyhead@users.noreply.github.com>
Date:   Sat Oct 22 00:33:26 2022 +0000

    [cron] Bump distribution date (2022-10-22)

commit a460b01
Author: tombrazier <68918209+tombrazier@users.noreply.github.com>
Date:   Fri Oct 21 22:34:22 2022 +0100

    🚀 ZV Input Shaping (MarlinFirmware#24797)

commit f8d7090
Author: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date:   Fri Oct 21 15:41:51 2022 -0500

    🔨 gcc-12 for macOS native
  • Loading branch information
rwoelk committed Nov 7, 2022
1 parent fb6dfe6 commit 85d9e53
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
//#define STRING_DISTRIBUTION_DATE "2022-11-07"
//#define STRING_DISTRIBUTION_DATE "2022-10-25"

/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/inc/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* version was tagged.
*/
#ifndef STRING_DISTRIBUTION_DATE
#define STRING_DISTRIBUTION_DATE "2022-11-07"
#define STRING_DISTRIBUTION_DATE "2022-10-25"
#endif

/**
Expand Down
14 changes: 6 additions & 8 deletions Marlin/src/module/temperature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2374,7 +2374,7 @@ void Temperature::updateTemperaturesFromRawValues() {
TERN_(HAS_POWER_MONITOR, power_monitor.capture_values());

#if HAS_HOTEND
static constexpr int8_t temp_dir[HOTENDS] = {
static constexpr int8_t temp_dir[] = {
#if TEMP_SENSOR_IS_ANY_MAX_TC(0)
0
#else
Expand All @@ -2386,21 +2386,19 @@ void Temperature::updateTemperaturesFromRawValues() {
#else
, TEMPDIR(1)
#endif
#endif
#if HOTENDS > 2
#if TEMP_SENSOR_IS_ANY_MAX_TC(2)
, 0
#else
, TEMPDIR(2)
#endif
#endif
#if HOTENDS > 3
#define _TEMPDIR(N) , TEMPDIR(N)
REPEAT_S(3, HOTENDS, _TEMPDIR)
#if HOTENDS > 3
#define _TEMPDIR(N) , TEMPDIR(N)
REPEAT_S(3, HOTENDS, _TEMPDIR)
#endif
#endif
};

HOTEND_LOOP() {
LOOP_L_N(e, COUNT(temp_dir)) {
const raw_adc_t r = temp_hotend[e].getraw();
const bool neg = temp_dir[e] < 0, pos = temp_dir[e] > 0;
if ((neg && r < temp_range[e].raw_max) || (pos && r > temp_range[e].raw_max))
Expand Down

0 comments on commit 85d9e53

Please sign in to comment.