SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Set pullup on BTN_BACK pin (#15654)

Browse source
This commit is contained in:
Luu Lac 2019-10-24 12:04:45 -05:00 committed by Scott Lahteine
parent b7db91c46d
commit efeb6efe77
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/ultralcd.cpp
View file

@ -295,6 +295,10 @@ void MarlinUI::init() {
SET_INPUT_PULLUP(BTN_ENC); SET_INPUT_PULLUP(BTN_ENC);
#endif #endif
#if BUTTON_EXISTS(BACK)
SET_INPUT_PULLUP(BTN_BACK);
#endif
#if BUTTON_EXISTS(UP) #if BUTTON_EXISTS(UP)
SET_INPUT(BTN_UP); SET_INPUT(BTN_UP);
#endif #endif

6
Marlin/src/libs/vector_3.cpp
View file

@ -71,9 +71,9 @@ void vector_3::normalize() {
// Apply a rotation to the matrix // Apply a rotation to the matrix
void vector_3::apply_rotation(const matrix_3x3 &matrix) { void vector_3::apply_rotation(const matrix_3x3 &matrix) {
const float _x = x, _y = y, _z = z; const float _x = x, _y = y, _z = z;
x = _x * matrix.vectors[0][0] + _y * matrix.vectors[1][0] + _z * matrix.vectors[2][0]; *this = { matrix.vectors[0][0] * _x + matrix.vectors[1][0] * _y + matrix.vectors[2][0] * _z,
y = _x * matrix.vectors[0][1] + _y * matrix.vectors[1][1] + _z * matrix.vectors[2][1]; matrix.vectors[0][1] * _x + matrix.vectors[1][1] * _y + matrix.vectors[2][1] * _z,
z = _x * matrix.vectors[0][2] + _y * matrix.vectors[1][2] + _z * matrix.vectors[2][2]; matrix.vectors[0][2] * _x + matrix.vectors[1][2] * _y + matrix.vectors[2][2] * _z };
} }
void vector_3::debug(PGM_P const title) { void vector_3::debug(PGM_P const title) {