andrey/Marlin_FB4S
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'vanilla_fb_2.0.x' into FB4S_WIFI

Browse Source
This commit is contained in:
Sergey
2022-05-17 23:06:09 +03:00
parent 86c0d01a33 abd2f70e8c
commit e8aae407aa
11 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/HAL/DUE/HAL.h
View File

@@ -115,8 +115,8 @@ typedef Servo hal_servo_t;
//
// Interrupts
//
#define sei() noInterrupts()
#define cli() interrupts()
#define sei() interrupts()
#define cli() noInterrupts()
#define CRITICAL_SECTION_START() const bool _irqon = hal.isr_state(); hal.isr_off()
#define CRITICAL_SECTION_END() if (_irqon) hal.isr_on()

2
Marlin/src/HAL/DUE/HAL_MinSerial.cpp → Marlin/src/HAL/DUE/MinSerial.cpp
View File

@@ -25,7 +25,7 @@
#if ENABLED(POSTMORTEM_DEBUGGING)
#include "../shared/HAL_MinSerial.h"
#include "../shared/MinSerial.h"
#include <stdarg.h>

2
Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp → Marlin/src/HAL/LPC1768/MinSerial.cpp
View File

@@ -26,7 +26,7 @@
#if ENABLED(POSTMORTEM_DEBUGGING)
#include "../shared/HAL_MinSerial.h"
#include "../shared/MinSerial.h"
#include <debug_frmwrk.h>
static void TX(char c) { _DBC(c); }

2
Marlin/src/HAL/STM32/HAL_MinSerial.cpp → Marlin/src/HAL/STM32/MinSerial.cpp
View File

@@ -28,7 +28,7 @@
#if ENABLED(POSTMORTEM_DEBUGGING)
#include "../shared/HAL_MinSerial.h"
#include "../shared/MinSerial.h"
#include "watchdog.h"
/* Instruction Synchronization Barrier */

2
Marlin/src/HAL/STM32F1/HAL_MinSerial.cpp → Marlin/src/HAL/STM32F1/MinSerial.cpp
View File

@@ -26,7 +26,7 @@
#if ENABLED(POSTMORTEM_DEBUGGING)
#include "../shared/HAL_MinSerial.h"
#include "../shared/MinSerial.h"
#include "watchdog.h"
#include <libmaple/usart.h>

2
Marlin/src/HAL/shared/HAL_MinSerial.cpp → Marlin/src/HAL/shared/MinSerial.cpp
View File

@@ -19,7 +19,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*
*/
#include "HAL_MinSerial.h"
#include "MinSerial.h"
#if ENABLED(POSTMORTEM_DEBUGGING)

0
Marlin/src/HAL/shared/HAL_MinSerial.h → Marlin/src/HAL/shared/MinSerial.h
View File

2
Marlin/src/HAL/shared/backtrace/backtrace.cpp
View File

@@ -25,7 +25,7 @@
#include "unwinder.h"
#include "unwmemaccess.h"
#include "../HAL_MinSerial.h"
#include "../MinSerial.h"
#include <stdarg.h>
// Dump a backtrace entry

2
Marlin/src/HAL/shared/cpu_exception/exception_arm.cpp
View File

@@ -54,7 +54,7 @@
#include "exception_hook.h"
#include "../backtrace/backtrace.h"
#include "../HAL_MinSerial.h"
#include "../MinSerial.h"
#define HW_REG(X) (*((volatile unsigned long *)(X)))

2
Marlin/src/core/macros.h
View File

@@ -278,7 +278,7 @@
#define NUMERIC_SIGNED(a) (NUMERIC(a) || (a) == '-' || (a) == '+')
#define DECIMAL_SIGNED(a) (DECIMAL(a) || (a) == '-' || (a) == '+')
#define COUNT(a) (sizeof(a)/sizeof(*a))
#define ZERO(a) memset(a,0,sizeof(a))
#define ZERO(a) memset((void*)a,0,sizeof(a))
#define COPY(a,b) do{ \
static_assert(sizeof(a[0]) == sizeof(b[0]), "COPY: '" STRINGIFY(a) "' and '" STRINGIFY(b) "' types (sizes) don't match!"); \
memcpy(&a[0],&b[0],_MIN(sizeof(a),sizeof(b))); \

3
Marlin/src/lcd/menu/menu_motion.cpp
View File

@@ -157,6 +157,7 @@ void _goto_manual_move(const_float_t scale) {
ui.defer_status_screen();
ui.manual_move.menu_scale = scale;
ui.goto_screen(_manual_move_func_ptr);
thermalManager.set_menu_cold_override(true);
}
void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=active_extruder) {
@@ -219,7 +220,7 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
ui.goto_screen([]{
MenuItem_confirm::select_screen(
GET_TEXT(MSG_BUTTON_PROCEED), GET_TEXT(MSG_BACK),
[] { _goto_menu_move_distance_e(); thermalManager.set_menu_cold_override(true); }, nullptr,
_goto_menu_move_distance_e, nullptr,
GET_TEXT(MSG_HOTEND_TOO_COLD), (const char *)nullptr, PSTR("!")
);
});