MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fix Mixer calculations for 32-bit processors (#12293)

Browse Source
This commit is contained in:
AnHardt 2018-11-01 20:38:45 +01:00 committed by Scott Lahteine
parent 549d11225a
commit 74bbb13008
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/src/feature/mixing.h
View File

@ -27,14 +27,15 @@
#define MIXER_ACCU_SIGNED
typedef uint8_t mixer_color_t;
typedef int8_t mixer_accu_t;
#define COLOR_A_MASK 0x80
#define COLOR_MASK 0x7F
#else
typedef uint_fast16_t mixer_color_t;
typedef uint_fast16_t mixer_accu_t;
#define COLOR_A_MASK 0x8000
#define COLOR_MASK 0x7FFF
#endif
#define COLOR_A_MASK _BV(sizeof(mixer_color_t) * 8 - 1) // 0x80 or 0x8000
#define COLOR_MASK (COLOR_A_MASK - 1) // 0x7F or 0x7FFF
#ifndef MIXING_VIRTUAL_TOOLS
#define MIXING_VIRTUAL_TOOLS 1
#endif
@ -42,8 +43,14 @@
#ifdef RETRACT_SYNC_MIXING
#define NR_MIXING_VIRTUAL_TOOLS (MIXING_VIRTUAL_TOOLS + 1)
#define MIXER_AUTORETRACT_TOOL MIXING_VIRTUAL_TOOLS
#if NR_MIXING_VIRTUAL_TOOLS > 255
#error("MIXING_VIRTUAL_TOOLS must be <= 254!");
#endif
#else
#define NR_MIXING_VIRTUAL_TOOLS (MIXING_VIRTUAL_TOOLS)
#if NR_MIXING_VIRTUAL_TOOLS > 255
#error("MIXING_VIRTUAL_TOOLS must be <= 255!");
#endif
#endif
#define MIXER_STEPPER_LOOP(VAR) \