zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Followup to "no status for serial::write" (#21577)

Browse source
This commit is contained in:
ellensp 2021-04-11 08:35:45 +12:00 committed by Scott Lahteine
parent 9a31702a75
commit 4e9eb95830
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/src/core/serial_hook.h
View file

@ -209,11 +209,9 @@ struct MultiSerial : public SerialBase< MultiSerial<Serial0T, Serial1T, offset,
static constexpr uint8_t SecondOutput = (Usage << (offset + step)); static constexpr uint8_t SecondOutput = (Usage << (offset + step));
static constexpr uint8_t Both = FirstOutput | SecondOutput; static constexpr uint8_t Both = FirstOutput | SecondOutput;
NO_INLINE size_t write(uint8_t c) { NO_INLINE void write(uint8_t c) {
size_t ret = 0; if (portMask.enabled(FirstOutput)) serial0.write(c);
if (portMask.enabled(FirstOutput)) ret = serial0.write(c); if (portMask.enabled(SecondOutput)) serial1.write(c);
if (portMask.enabled(SecondOutput)) ret = serial1.write(c) | ret;
return ret;
} }
NO_INLINE void msgDone() { NO_INLINE void msgDone() {
if (portMask.enabled(FirstOutput)) serial0.msgDone(); if (portMask.enabled(FirstOutput)) serial0.msgDone();

2
Marlin/src/feature/meatpack.h
View file

@ -133,7 +133,7 @@ struct MeatpackSerial : public SerialBase <MeatpackSerial < SerialT >> {
uint8_t charCount; uint8_t charCount;
uint8_t readIndex; 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 flush() { out.flush(); }
void begin(long br) { out.begin(br); readIndex = 0; } void begin(long br) { out.begin(br); readIndex = 0; }
void end() { out.end(); } void end() { out.end(); }

6
buildroot/tests/mega2560
View file

@ -171,11 +171,11 @@ exec_test $1 $2 "Azteeg X3 | Mixing Extruder (x5) | Gradient Mix | Greek" "$3"
# Test Laser features with 12864 LCD # Test Laser features with 12864 LCD
# #
restore_configs 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 \ 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 | SERIAL_PORT_2 " "$3"
# #
# Test Laser features with 44780 LCD # Test Laser features with 44780 LCD