From 7f619cd08013af9ba7ce0f69112c0172ff1ae249 Mon Sep 17 00:00:00 2001 From: ellensp Date: Sat, 10 Apr 2021 16:00:56 +1200 Subject: [PATCH 1/7] enable MEATPACK_ON_SERIAL_PORT_1 in STM32F103RET6_creality test --- buildroot/tests/STM32F103RET6_creality | 1 + 1 file changed, 1 insertion(+) diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality index ef020a33f1c6..710240cc3c37 100755 --- a/buildroot/tests/STM32F103RET6_creality +++ b/buildroot/tests/STM32F103RET6_creality @@ -11,6 +11,7 @@ set -e # use_example_configs "Creality/Ender-3 V2" opt_enable MARLIN_DEV_MODE +opt_enable MEATPACK_ON_SERIAL_PORT_1 exec_test $1 $2 "Ender 3 v2" "$3" use_example_configs "Creality/Ender-3 V2" From 10988f81c7d05f3ad96c9c6e0d81e59102c22881 Mon Sep 17 00:00:00 2001 From: ellensp Date: Sat, 10 Apr 2021 16:18:42 +1200 Subject: [PATCH 2/7] try 2, to add test. --- buildroot/tests/STM32F103RET6_creality | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality index 710240cc3c37..4e0301bdea25 100755 --- a/buildroot/tests/STM32F103RET6_creality +++ b/buildroot/tests/STM32F103RET6_creality @@ -10,9 +10,8 @@ set -e # Build with configs included in the PR # use_example_configs "Creality/Ender-3 V2" -opt_enable MARLIN_DEV_MODE -opt_enable MEATPACK_ON_SERIAL_PORT_1 -exec_test $1 $2 "Ender 3 v2" "$3" +opt_enable MARLIN_DEV_MODE MEATPACK_ON_SERIAL_PORT_1 +exec_test $1 $2 "Ender 3 v2, meatpack" "$3" use_example_configs "Creality/Ender-3 V2" opt_disable CLASSIC_JERK From 437a54f25d91f2fd736a53ec29793ebf27549cec Mon Sep 17 00:00:00 2001 From: ellensp Date: Sat, 10 Apr 2021 16:43:17 +1200 Subject: [PATCH 3/7] add meatpack to ramps --- buildroot/tests/mega2560 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560 index 3c8f720238a1..f40d69ccde75 100755 --- a/buildroot/tests/mega2560 +++ b/buildroot/tests/mega2560 @@ -173,9 +173,9 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3" restore_configs opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \ - LASER_FEATURE LASER_COOLANT_FLOW_METER + LASER_FEATURE LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1 -exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Cooler | Flowmeter | 12864 LCD " "$3" +exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Cooler | Flowmeter | 12864 LCD | meatpack " "$3" # # Test Laser features with 44780 LCD From c119dea0fb7b14b15589aee8dfe0333026e746f1 Mon Sep 17 00:00:00 2001 From: ellensp Date: Sat, 10 Apr 2021 16:51:46 +1200 Subject: [PATCH 4/7] update meatpack.h --- Marlin/src/feature/meatpack.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/feature/meatpack.h b/Marlin/src/feature/meatpack.h index ce8c7465ebd2..a56e65b6cc30 100644 --- a/Marlin/src/feature/meatpack.h +++ b/Marlin/src/feature/meatpack.h @@ -133,7 +133,7 @@ struct MeatpackSerial : public SerialBase > { uint8_t charCount; uint8_t readIndex; - NO_INLINE size_t write(uint8_t c) { return out.write(c); } + NO_INLINE void write(uint8_t c) { out.write(c); } void flush() { out.flush(); } void begin(long br) { out.begin(br); readIndex = 0; } void end() { out.end(); } From a959da007cbd0a8d52efb9fb23322cf9890b76fb Mon Sep 17 00:00:00 2001 From: ellensp Date: Sat, 10 Apr 2021 17:20:30 +1200 Subject: [PATCH 5/7] remove creality tests --- buildroot/tests/STM32F103RET6_creality | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot/tests/STM32F103RET6_creality b/buildroot/tests/STM32F103RET6_creality index 4e0301bdea25..ef020a33f1c6 100755 --- a/buildroot/tests/STM32F103RET6_creality +++ b/buildroot/tests/STM32F103RET6_creality @@ -10,8 +10,8 @@ set -e # Build with configs included in the PR # use_example_configs "Creality/Ender-3 V2" -opt_enable MARLIN_DEV_MODE MEATPACK_ON_SERIAL_PORT_1 -exec_test $1 $2 "Ender 3 v2, meatpack" "$3" +opt_enable MARLIN_DEV_MODE +exec_test $1 $2 "Ender 3 v2" "$3" use_example_configs "Creality/Ender-3 V2" opt_disable CLASSIC_JERK From 0963711c47e04a919d73d5da1ef22db029f85a1c Mon Sep 17 00:00:00 2001 From: ellensp Date: Sat, 10 Apr 2021 17:23:24 +1200 Subject: [PATCH 6/7] add dual serial to expose second bug --- buildroot/tests/mega2560 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildroot/tests/mega2560 b/buildroot/tests/mega2560 index f40d69ccde75..4ed199df2f85 100755 --- a/buildroot/tests/mega2560 +++ b/buildroot/tests/mega2560 @@ -171,11 +171,11 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3" # Test Laser features with 12864 LCD # restore_configs -opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 +opt_set MOTHERBOARD BOARD_RAMPS_14_EFB LCD_LANGUAGE en TEMP_SENSOR_COOLER 1 EXTRUDERS 0 TEMP_SENSOR_1 0 SERIAL_PORT_2 2 opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT EEPROM_SETTINGS EEPROM_BOOT_SILENT EEPROM_AUTO_INIT \ LASER_FEATURE LASER_COOLANT_FLOW_METER MEATPACK_ON_SERIAL_PORT_1 -exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Cooler | Flowmeter | 12864 LCD | meatpack " "$3" +exec_test $1 $2 "REPRAP MEGA2560 RAMPS | Laser Feature | Cooler | Flowmeter | 12864 LCD | meatpack | SERIAL_PORT_2 " "$3" # # Test Laser features with 44780 LCD From ef6d2e37bebacff9863c1762ef532bdf2b9b3b00 Mon Sep 17 00:00:00 2001 From: ellensp Date: Sat, 10 Apr 2021 17:29:32 +1200 Subject: [PATCH 7/7] fix second bug --- Marlin/src/core/serial_hook.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Marlin/src/core/serial_hook.h b/Marlin/src/core/serial_hook.h index 7bc04a5e8865..512ebdec9732 100644 --- a/Marlin/src/core/serial_hook.h +++ b/Marlin/src/core/serial_hook.h @@ -209,11 +209,9 @@ struct MultiSerial : public SerialBase< MultiSerial