Compare commits

..

13 Commits

Author SHA1 Message Date
InsanityAutomation ef30d6b692 Merge branch 'bugfix-2.0.x' into ArtilleryX1_2.0_Devel 2021-08-08 15:09:13 -04:00
InsanityAutomation e41ea19899 Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x 2021-08-08 14:31:40 -04:00
Scott Lahteine 5dc5d42e25 🔧 Sanity-check DEFAULT_EJERK with LIN_ADVANCE
See #20649
2021-08-07 16:06:51 -05:00
InsanityAutomation a335ebc422 trim some space to fit 2021-02-24 10:20:36 -05:00
InsanityAutomation 068ab023e7 Merge branch 'bugfix-2.0.x' into ArtilleryX1_2.0_Devel 2021-02-24 10:04:23 -05:00
Marcio T 34cda524c4 LVGL Touch UI followup (#21167) 2021-02-22 22:38:54 -06:00
InsanityAutomation 46923ad7b4 Update Version.h 2021-01-30 18:22:30 -05:00
InsanityAutomation 31610b49c7 Merge branch 'bugfix-2.0.x' into ArtilleryX1_2.0_Devel 2021-01-30 18:22:25 -05:00
InsanityAutomation f0725d7455 Merge branch 'ArtilleryX1_2.0_Devel' of https://github.com/InsanityAutomation/Marlin into ArtilleryX1_2.0_Devel 2020-09-26 12:44:31 -04:00
InsanityAutomation 88a5b104cd Bump 2020-09-26 12:42:45 -04:00
InsanityAutomation 1d4b4f18a6 merge configs 2020-09-26 12:33:56 -04:00
InsanityAutomation 20635c3589 Bump 2020-06-25 19:06:15 -04:00
InsanityAutomation c1ebfaefb5 merge configs 2020-06-21 10:27:19 -04:00
2079 changed files with 34375 additions and 147412 deletions
+2 -3
View File
@@ -66,7 +66,7 @@ jobs:
- mks_robin_lite_maple
- mks_robin_pro_maple
#- mks_robin_nano35_maple
#- STM32F103RE_creality_maple
#- STM32F103RET6_creality_maple
- STM32F103VE_ZM3E4V2_USB_maple
# STM32 (ST) Environments
@@ -75,7 +75,7 @@ jobs:
#- STM32F103RC_btt_USB
- STM32F103RE_btt
- STM32F103RE_btt_USB
- STM32F103RE_creality
- STM32F103RET6_creality
- STM32F103VE_longer
- STM32F407VE_black
- STM32F401VE_STEVAL
@@ -97,7 +97,6 @@ jobs:
- REMRAM_V1
- BTT_SKR_SE_BX
- chitu_f103
- Index_Mobo_Rev03
# Put lengthy tests last
Regular → Executable
+12 -9
View File
@@ -22,16 +22,12 @@
# Generated files
_Version.h
bdf2u8g
marlin_config.json
mczip.h
*.gen
*.sublime-workspace
#
# OS
#
applet/
.DS_Store
*.DS_Store
#
# Misc
@@ -41,6 +37,7 @@ applet/
*.rej
*.bak
*.idea
*.s
*.i
*.ii
*.swp
@@ -111,6 +108,7 @@ tags
*.app
*.i*86
*.x86_64
*.hex
# Debug files
*.dSYM/
@@ -139,19 +137,20 @@ __vm/
vc-fileutils.settings
# Visual Studio Code
.vscode/*
!.vscode/extensions.json
.vscode
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/*.db
#Simulation
imgui.ini
eeprom.dat
spi_flash.bin
#cmake
CMakeLists.txt
src/CMakeLists.txt
CMakeListsPrivate.txt
build/
# CLion
cmake-build-*
@@ -168,3 +167,7 @@ __pycache__
# IOLogger logs
*_log.csv
# Simulation / Native
eeprom.dat
imgui.ini
-11
View File
@@ -1,11 +0,0 @@
{
// See http://go.microsoft.com/fwlink/?LinkId=827846
// for the documentation about the extensions.json format
"recommendations": [
"marlinfirmware.auto-build",
"platformio.platformio-ide"
],
"unwantedRecommendations": [
"ms-vscode.cpptools-extension-pack"
]
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More