Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Marlin/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@
* ================================================================
* Analog Thermocouple Boards
* ================================================================
* -18 : ADS1118 with Thermocouple, e.g., Mightyboard rev G/H
* -4 : AD8495 with Thermocouple
* -1 : AD595 with Thermocouple
*
Expand Down
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 "2026-07-04"
//#define STRING_DISTRIBUTION_DATE "2026-07-06"

/**
* The protocol for communication to the host. Protocol indicates communication
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/feature/bedlevel/abl/bbl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ void LevelingBilinear::print_leveling_grid(const bed_mesh_t* _z_values/*=nullptr
// The requested point requires extrapolating two points beyond the mesh.
// These values are only requested for the edges of the mesh, which are always an actual mesh point,
// and do not require interpolation. When interpolation is not needed, this "Mesh + 2" point is
// cancelled out in virt_cmr and does not impact the result. Return 0.0 rather than
// canceled out in virt_cmr and does not impact the result. Return 0.0 rather than
// making this function more complex by extrapolating two points.
return 0.0;
}
Expand Down
10 changes: 10 additions & 0 deletions Marlin/src/inc/Conditionals-4-adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,11 @@
#define TEMP_SENSOR_0_IS_AD8495 1
#elif TEMP_SENSOR_0 == -1
#define TEMP_SENSOR_0_IS_AD595 1
#elif TEMP_SENSOR_0 == -18
#define HAS_ADS1118 1
#define TEMP_SENSOR_0_IS_ADS1118 1
#define TEMP_SENSOR_0_ADS_TMIN 0
#define TEMP_SENSOR_0_ADS_TMAX 1024
#elif TEMP_SENSOR_0 > 0
#define TEMP_SENSOR_0_IS_THERMISTOR 1
#if TEMP_SENSOR_0 == 1000
Expand Down Expand Up @@ -540,6 +545,11 @@
#define TEMP_SENSOR_1_IS_AD8495 1
#elif TEMP_SENSOR_1 == -1
#define TEMP_SENSOR_1_IS_AD595 1
#elif TEMP_SENSOR_1 == -18
#define HAS_ADS1118 1
#define TEMP_SENSOR_1_IS_ADS1118 1
#define TEMP_SENSOR_1_ADS_TMIN 0
#define TEMP_SENSOR_1_ADS_TMAX 1024
#elif TEMP_SENSOR_1 > 0
#define TEMP_SENSOR_1_IS_THERMISTOR 1
#if TEMP_SENSOR_1 == 1000
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 "2026-07-04"
#define STRING_DISTRIBUTION_DATE "2026-07-06"
#endif

/**
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/inc/Warnings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@
#warning "Warning! Don't use dummy thermistors (998/999) for final build!"
#endif

#if ANY_THERMISTOR_IS(-18)
#warning "ADS1118 support (-18) is in development"
#endif

#if NONE(HAS_RESUME_CONTINUE, HOST_PROMPT_SUPPORT, UNIT_TEST, NO_USER_FEEDBACK_WARNING)
#warning "Your Configuration provides no method to acquire user feedback! (Define NO_USER_FEEDBACK_WARNING to suppress this warning.)"
#endif
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -807,7 +807,7 @@ void ChironTFT::panelProcess(uint8_t req) {
}
}
else
tftSendLn(AC_msg_start_probing); // Just enter levelling menu
tftSendLn(AC_msg_start_probing); // Just enter leveling menu
break;

case 31: // A31 Adjust all Probe Points
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/extui/anycubic_vyper/dgus_tft.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ namespace Anycubic {
// Signal Board has reset
tftSendLn(AC_msg_main_board_has_reset);

// Enable levelling and Disable end stops during print
// Enable leveling and Disable end stops during print
// as Z home places nozzle above the bed so we need to allow it past the end stops
injectCommands(AC_cmnd_enable_leveling);

Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ namespace LanguageNarrow_en {
LSTR MSG_MESH_MAX_Y = _UxGT("Mesh Y Maximum");
LSTR MSG_MESH_AMAX = _UxGT("Maximize Area");
LSTR MSG_MESH_CENTER = _UxGT("Center Area");
LSTR MSG_MESH_CANCEL = _UxGT("Mesh cancelled");
LSTR MSG_MESH_CANCEL = _UxGT("Mesh canceled");
LSTR MSG_M48_OUT_OF_BOUNDS = _UxGT("Probe out of bounds");
LSTR MSG_IDEX_DUPE_GAP = _UxGT("Duplicate X-Gap");
LSTR MSG_UBL_TILT_MESH = _UxGT("Tilt Mesh");
Expand Down
Loading
Loading