Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix BFT corruption when using compressed data on STM32duino #22134

Merged
merged 4 commits into from
Jun 14, 2021
Merged

fix BFT corruption when using compressed data on STM32duino #22134

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d46f181
fix BFT corruption when compressed
Jun 14, 2021
66d1255
Update binary_stream.h
thinkyhead Jun 14, 2021
9de38c1
drop EITHER(ARDUINO_ARCH_STM32F1, STM32F1)
Jun 14, 2021
cc421b6
align always
thinkyhead Jun 14, 2021
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
14 changes: 3 additions & 11 deletions Marlin/src/feature/binary_stream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
#include "../inc/MarlinConfig.h"

#define BINARY_STREAM_COMPRESSION

#if ENABLED(BINARY_STREAM_COMPRESSION)
#include "../libs/heatshrink/heatshrink_decoder.h"
// STM32 (and others?) require a word-aligned buffer for SD card transfers via DMA
static __attribute__((aligned(sizeof(size_t)))) uint8_t decode_buffer[512] = {};
static heatshrink_decoder hsd;
#endif

inline bool bs_serial_data_available(const serial_index_t index) {
Expand All @@ -37,16 +39,6 @@ inline int bs_read_serial(const serial_index_t index) {
return SERIAL_IMPL.read(index);
}

#if ENABLED(BINARY_STREAM_COMPRESSION)
static heatshrink_decoder hsd;
#if BOTH(ARDUINO_ARCH_STM32F1, SDIO_SUPPORT)
// STM32 requires a word-aligned buffer for SD card transfers via DMA
static __attribute__((aligned(sizeof(size_t)))) uint8_t decode_buffer[512] = {};
#else
static uint8_t decode_buffer[512] = {};
#endif
#endif

class SDFileTransferProtocol {
private:
struct Packet {
Expand Down