jessikitty/Marlin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First round merge fixes

Browse Source
This commit is contained in:
InsanityAutomation
2023-08-04 11:13:28 -04:00
parent ebde4ceb35
commit 13395db032
12 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Marlin/Configuration.h
+2 -2
View File
@@ -667,8 +667,8 @@
// Above this temperature the heater will be switched off.
// This can protect components from overheating, but NOT from shorts and failures.
// (Use MINTEMP for thermistor short/failure protection.)
#define HEATER_0_MAXTEMP 315
#define HEATER_1_MAXTEMP 315
#define HEATER_0_MAXTEMP 300
#define HEATER_1_MAXTEMP 300
#define HEATER_2_MAXTEMP 275
#define HEATER_3_MAXTEMP 275
#define HEATER_4_MAXTEMP 275
Marlin/Configuration_adv.h
+1 -1
View File
@@ -923,7 +923,7 @@
#define Z_MULTI_ENDSTOPS // Other Z axes have their own endstops
#endif
#if ENABLED(Z_MULTI_ENDSTOPS)
#define Z2_STOP_PIN _ZMAX_ // Z2 endstop pin override
#define Z2_STOP_PIN Z_MAX_PIN // Z2 endstop pin override
#define Z2_ENDSTOP_ADJUSTMENT 0 // Z2 offset relative to Z endstop
#endif
#ifdef Z3_DRIVER_TYPE
Marlin/src/feature/runout.h
+7 -7
View File
@@ -151,7 +151,7 @@ class TFilamentMonitor : public FilamentMonitorBase {
#if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
if (runout_flags) {
SERIAL_ECHOPGM("Runout Sensors: ");
LOOP_L_N(i, 8) SERIAL_ECHO('0' + TEST(runout_flags, i));
for(int i; i < 8; i++) SERIAL_ECHO('0' + TEST(runout_flags, i));
SERIAL_ECHOPGM(" -> ", extruder);
if (ran_out) SERIAL_ECHOPGM(" RUN OUT");
SERIAL_EOL();
@@ -210,7 +210,7 @@ class FilamentSensorBase {
#undef _INIT_RUNOUT_PIN
#undef INIT_RUNOUT_PIN
}
// Return a bitmask of runout pin states
static uint8_t poll_runout_pins() {
@@ -252,7 +252,7 @@ class FilamentSensorCore : public FilamentSensorBase {
#if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
if (change) {
SERIAL_ECHOPGM("Motion detected:");
LOOP_L_N(e, NUM_RUNOUT_SENSORS)
for(int e; e < NUM_RUNOUT_SENSORS; e++)
if (TEST(change, e)) SERIAL_CHAR(' ', '0' + e);
SERIAL_EOL();
}
@@ -279,7 +279,7 @@ class FilamentSensorCore : public FilamentSensorBase {
poll_motion_sensor();
}
else if (runout.mode[active_extruder] != RM_NONE) {
LOOP_L_N(s, NUM_RUNOUT_SENSORS) {
for(int s = 0; s < NUM_RUNOUT_SENSORS; s++) {
const bool out = poll_runout_state(s);
if (!out) filament_present(s);
#if ENABLED(FILAMENT_RUNOUT_SENSOR_DEBUG)
@@ -308,7 +308,7 @@ class RunoutResponseDelayed {
static float runout_distance_mm[NUM_RUNOUT_SENSORS];
static void reset() {
LOOP_L_N(i, NUM_RUNOUT_SENSORS) filament_present(i);
for(int i = 0; i < NUM_RUNOUT_SENSORS; i++) filament_present(i);
}
static void run() {
@@ -317,7 +317,7 @@ class RunoutResponseDelayed {
const millis_t ms = millis();
if (ELAPSED(ms, t)) {
t = millis() + 1000UL;
LOOP_L_N(i, NUM_RUNOUT_SENSORS)
for(int i; i < NUM_RUNOUT_SENSORS; i++)
SERIAL_ECHOF(i ? F(", ") : F("Remaining mm: "), runout_mm_countdown[i]);
SERIAL_EOL();
}
@@ -326,7 +326,7 @@ class RunoutResponseDelayed {
static uint8_t has_run_out() {
uint8_t runout_flags = 0;
LOOP_L_N(i, NUM_RUNOUT_SENSORS) if (runout_mm_countdown[i] < 0) SBI(runout_flags, i);
for(int i = 0; i < NUM_RUNOUT_SENSORS; i++) if (runout_mm_countdown[i] < 0) SBI(runout_flags, i);
return runout_flags;
}
Marlin/src/gcode/feature/runout/M591.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ void GcodeSuite::M591() {
void GcodeSuite::M591_report(const bool forReplay/*=true*/) {
report_heading_etc(forReplay, F(STR_FILAMENT_RUNOUT_SENSOR));
LOOP_S_L_N(e, 0, NUM_RUNOUT_SENSORS)
for(int e=0; e < NUM_RUNOUT_SENSORS; e++)
SERIAL_ECHOLNPGM(
" M591"
#if MULTI_FILAMENT_SENSOR
Marlin/src/lcd/extui/ia_dwin/Creality_DWIN.cpp
+12 -3
View File
@@ -1517,7 +1517,7 @@ void RTSSHOW::RTS_HandleData()
else
RTS_SndData(2, AutoLevelIcon);
if (ExtUI::getMeshValid())
if (ExtUI::getLevelingIsValid())
{
uint8_t abl_probe_index = 0;
for(uint8_t outer = 0; outer < GRID_MAX_POINTS_Y; outer++)
@@ -2779,7 +2779,7 @@ void onSettingsLoaded(bool success)
{
//SERIAL_ECHOLNPGM_P(PSTR("==onConfigurationStoreRead=="));
#if HAS_MESH
if (ExtUI::getMeshValid())
if (ExtUI::getLevelingIsValid())
{
uint8_t abl_probe_index = 0;
for(uint8_t outer = 0; outer < GRID_MAX_POINTS_Y; outer++)
@@ -2841,7 +2841,7 @@ void onLevelingStart() {
void onLevelingDone() {
#if HAS_MESH
if (ExtUI::getMeshValid())
if (ExtUI::getLevelingIsValid())
{
uint8_t abl_probe_index = 0;
for(uint8_t outer = 0; outer < GRID_MAX_POINTS_Y; outer++)
@@ -2898,6 +2898,15 @@ void onPostprocessSettings()
}
void onSetPowerLoss(const bool onoff)
{
}
void onPowerLoss()
{
}
} // namespace ExtUI
Marlin/src/module/endstops.cpp
+1 -1
View File
@@ -486,7 +486,7 @@ void __O2 Endstops::report_states() {
print_es_state(PROBE_TRIGGERED(), F(STR_Z_PROBE));
#endif
#if HAS_FILAMENT_SENSOR
LOOP_S_LE_N(i, 1, NUM_RUNOUT_SENSORS) {
for(int i = 1; i<NUM_RUNOUT_SENSORS;i++) {
pin_t pin;
switch (i) {
default: continue;
Marlin/src/module/settings.cpp
+5 -5
View File
@@ -895,9 +895,9 @@ void MarlinSettings::postprocess() {
#if HAS_FILAMENT_SENSOR
{
_FIELD_TEST(runout_enabled);
LOOP_L_N(e, NUM_RUNOUT_SENSORS) EEPROM_WRITE(runout.enabled[e]);
LOOP_L_N(e, NUM_RUNOUT_SENSORS) EEPROM_WRITE(runout.runout_distance(e));
LOOP_L_N(e, NUM_RUNOUT_SENSORS) EEPROM_WRITE(runout.mode[e]);
for(int e; e<NUM_RUNOUT_SENSORS; e++) EEPROM_WRITE(runout.enabled[e]);
for(int e; e<NUM_RUNOUT_SENSORS; e++) EEPROM_WRITE(runout.runout_distance(e));
for(int e; e<NUM_RUNOUT_SENSORS; e++) EEPROM_WRITE(runout.mode[e]);
}
#endif
@@ -1915,7 +1915,7 @@ void MarlinSettings::postprocess() {
EEPROM_READ(runout_mode);
if (!validating) {
LOOP_S_L_N(e, 0, NUM_RUNOUT_SENSORS) {
for(int e; e < NUM_RUNOUT_SENSORS; e++) {
runout.enabled[e] = runout_enabled[e];
runout.set_runout_distance(runout_distance_mm[e], e);
runout.mode[e] = runout_mode[e];
@@ -3126,7 +3126,7 @@ void MarlinSettings::reset() {
static_assert(COUNT(frd) == NUM_RUNOUT_SENSORS, "FIL_RUNOUT_DISTANCE_MM must have NUM_RUNOUT_SENSORS values.");
COPY(runout.enabled, fred);
COPY(runout.mode, frm);
LOOP_L_N(e, NUM_RUNOUT_SENSORS) runout.set_runout_distance(frd[e], e);
for(int e; e<NUM_RUNOUT_SENSORS; e++) runout.set_runout_distance(frd[e], e);
runout.reset();
#endif
buildroot/share/PlatformIO/scripts/common-cxxflags.py
+1 -1
View File
@@ -7,7 +7,7 @@ import pioutil
if pioutil.is_pio_build():
Import("env")
env.Replace(PROGNAME="%s_DW7.4.8" % (str(env["PIOENV"])))
env.Replace(PROGNAME="%s_DW9" % (str(env["PIOENV"])))
cxxflags = [
# "-Wno-incompatible-pointer-types",
buildroot/share/PlatformIO/scripts/random-bin.py
+1 -1
View File
@@ -7,5 +7,5 @@ if pioutil.is_pio_build():
from datetime import datetime
Import("env")
env_name = str(env["PIOENV"])
env['PROGNAME'] = "firmware_%s_DW7.4.8" % (env_name)
env['PROGNAME'] = "firmware_%s_DW7.4.9" % (env_name)
#env['PROGNAME'] = datetime.now().strftime("firmware-%Y%m%d-%H%M%S")
ini/stm32f1-maple.ini
+4 -4
View File
@@ -118,7 +118,7 @@ extends = env:STM32F103RE_maple
build_flags = ${env:STM32F103RE_maple.build_flags} -DTEMP_TIMER_CHAN=4
board_build.address = 0x08007000
board_build.ldscript = creality.ld
board_build.rename = firmware-{date}-{time}.bin
board_build.rename = firmware-{date}-{time}
debug_tool = jlink
upload_protocol = jlink
@@ -129,8 +129,8 @@ upload_protocol = jlink
extends = env:STM32F103RC_maple
build_flags = ${env:STM32F103RC_maple.build_flags} -DTEMP_TIMER_CHAN=4
board_build.address = 0x08007000
board_build.ldscript = creality256k.ld
board_build.rename = firmware-{date}-{time}.bin
board_build.ldscript = creality.ld
board_build.rename = firmware-{date}-{time}
debug_tool = jlink
upload_protocol = jlink
@@ -403,7 +403,7 @@ extends = env:STM32F103RE_maple
build_flags = ${STM32F1_maple.build_flags} -DTEMP_TIMER_CHAN=4
board_build.address = 0x08007000
board_build.ldscript = sovol.ld
board_build.rename = firmware-{date}-{time}.bin
board_build.rename = firmware-{date}-{time}
extra_scripts = ${STM32F1_maple.extra_scripts}
buildroot/share/PlatformIO/scripts/custom_board.py
debug_tool = jlink
ini/stm32f1.ini
+1 -1
View File
@@ -121,7 +121,7 @@ debug_tool = stlink
extends = stm32_variant
board_build.variant = MARLIN_F103Rx
board_build.offset = 0x7000
board_build.rename = firmware-{date}-{time}.bin
board_build.rename = firmware-{date}-{time}
board_upload.offset_address = 0x08007000
build_flags = ${stm32_variant.build_flags}
-DMCU_STM32F103RE -DHAL_SD_MODULE_ENABLED
ini/stm32f4.ini
+2 -2
View File
@@ -684,7 +684,7 @@ board = genericSTM32F401RC
board_build.variant = MARLIN_CREALITY_STM32F401RC
board_build.offset = 0x10000
board_upload.offset_address = 0x08010000
board_build.rename = firmware-{date}-{time}.bin
board_build.rename = firmware-{date}-{time}
build_flags = ${stm32_variant.build_flags} -DMCU_STM32F401RC -DSTM32F4
-DSS_TIMER=4 -DTIMER_SERVO=TIM5
-DENABLE_HWSERIAL3 -DTRANSFER_CLOCK_DIV=8
@@ -709,7 +709,7 @@ extends = stm32_variant
board = marlin_CREALITY_STM32F401RE
board_build.offset = 0x10000
board_upload.offset_address = 0x08010000
board_build.rename = firmware-{date}-{time}.bin
board_build.rename = firmware-{date}-{time}
build_flags = ${stm32_variant.build_flags} -DSTM32F401xE -DSTM32F4 -DSTM32F4_UPDATE_FOLDER
build_unflags = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC
monitor_speed = 115200