Skip to content

Instantly share code, notes, and snippets.

Avatar

Benjamin Hodgetts Enverex

View GitHub Profile
@Enverex
Enverex / realchangesonly.diff
Created May 28, 2019
Config, Makefile and "date change only" files stripped out
View realchangesonly.diff
diff --git a/marlin-original-clean/Marlin/src/HAL/HAL_STM32F1/HAL.cpp b/marlin-qq-clean/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
index 1534a35..7a27f2a 100644
--- a/marlin-original-clean/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
+++ b/marlin-qq-clean/Marlin/src/HAL/HAL_STM32F1/HAL.cpp
@@ -1,7 +1,7 @@
/**
* Marlin 3D Printer Firmware
*
- * Copyright (C) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
@Enverex
Enverex / marlin.diff
Created May 28, 2019
Marlin Original vs QQ Fork
View marlin.diff
diff --git a/marlin-original-clean/Marlin/Configuration.h b/marlin-qq-clean/Marlin/Configuration.h
index 2b6dbb0..97934a8 100644
--- a/marlin-original-clean/Marlin/Configuration.h
+++ b/marlin-qq-clean/Marlin/Configuration.h
@@ -73,10 +73,10 @@
// User-specified version info of this build to display in [Pronterface, etc] terminal window during
// startup. Implementation of an idea by Prof Braino to inform user that any changes made to this
// build by the user have been successfully uploaded into firmware.
-#define STRING_CONFIG_H_AUTHOR "(none, default config)" // Who made the changes.
+#define STRING_CONFIG_H_AUTHOR "@berghauz, flsun qq-s on mks robin mini with 12864 emulation" // Who made the changes.
View gist:76214627c2ab10ac8c4a7abd6da9b74e
Compiling .pioenvs/mks_robin_mini/src/src/HAL/HAL_STM32F1/u8g_com_stm32duino_fsmc.cpp.o
In file included from Marlin/src/HAL/HAL_STM32F1/../../inc/MarlinConfig.h:41:0,
from Marlin/src/HAL/HAL_STM32F1/HAL.cpp:36:
Marlin/src/HAL/HAL_STM32F1/../../inc/SanityCheck.h:988:3: error: non-constant condition for static assertion
static_assert(FLOOR(float(X_PROBE_OFFSET_FROM_EXTRUDER)) == float(X_PROBE_OFFSET_FROM_EXTRUDER), "X_PROBE_OFFSET_FROM_EXTRUDER must be an integer!");
^~~~~~~~~~~~~
In file included from Marlin/src/HAL/HAL_STM32F1/HAL.h:39:0,
from Marlin/src/HAL/HAL_STM32F1/HAL.cpp:34:
Marlin/src/HAL/HAL_STM32F1/../../core/macros.h:260:27: error: call to non-constexpr function 'float floorf(float)'
#define FLOOR(x) floorf(x)
@Enverex
Enverex / mame-clean.patch
Created Dec 16, 2016
Disable Info/Warnings in MAME Core
View mame-clean.patch
diff --git a/src/frontend/mame/ui/ui.cpp b/src/frontend/mame/ui/ui.cpp
index 9ce3809..bd8efdd 100644
--- a/src/frontend/mame/ui/ui.cpp
+++ b/src/frontend/mame/ui/ui.cpp
@@ -289,6 +289,8 @@ void mame_ui_manager::display_startup_screens(bool first_time)
if (!first_time || (str > 0 && str < 60*5) || &machine().system() == &GAME_NAME(___empty) || (machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
show_gameinfo = show_warnings = show_mandatory_fileman = false;
+ show_gameinfo = show_warnings = show_mandatory_fileman = false;
+
You can’t perform that action at this time.