Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Marlin 1.1.9 for A10M (both with and without 3D Touch) #29

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
*/
#ifndef CONFIGURATION_H
#define CONFIGURATION_H
#define CONFIGURATION_H_VERSION 010107
#define CONFIGURATION_H_VERSION 010110

//===========================================================================
//============================= Getting Started =============================
Expand Down
7,287 changes: 7,287 additions & 0 deletions A10M_marlin1.1.8/Configuration and hex file/no 3d touch/Marlin.ino.mega.hex

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion A10M_marlin1.1.8/Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*/
#ifndef CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H
#define CONFIGURATION_ADV_H_VERSION 010107
#define CONFIGURATION_ADV_H_VERSION 010110

// @section temperature

Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion A10M_marlin1.1.8/Marlin/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10220,7 +10220,7 @@ inline void gcode_M502() {
}
#endif // LIN_ADVANCE

#if HAS_TRINAMIC
#if x
static bool report_tmc_status = false;
const char extended_axis_codes[11][3] = { "X", "X2", "Y", "Y2", "Z", "Z2", "E0", "E1", "E2", "E3", "E4" };
enum TMC_AxisEnum {
Expand Down
8 changes: 4 additions & 4 deletions A10M_marlin1.1.8/Marlin/Version.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
* here we define this default string as the date where the latest release
* version was tagged.
*/
#define STRING_DISTRIBUTION_DATE "2017-12-25 12:00"
#define STRING_DISTRIBUTION_DATE "2018-10-11 14:00"

/**
* Required minimum Configuration.h and Configuration_adv.h file versions.
Expand All @@ -57,8 +57,8 @@
* but not limited to: ADD, DELETE RENAME OR REPURPOSE any directive/option on
* the configuration files.
*/
#define REQUIRED_CONFIGURATION_H_VERSION 010107
#define REQUIRED_CONFIGURATION_ADV_H_VERSION 010107
#define REQUIRED_CONFIGURATION_H_VERSION 010110
#define REQUIRED_CONFIGURATION_ADV_H_VERSION 010110

/**
* The protocol for communication to the host. Protocol indicates communication
Expand All @@ -70,7 +70,7 @@
/**
* Defines a generic printer name to be output to the LCD after booting Marlin.
*/
#define MACHINE_NAME "3D Printer"
#define MACHINE_NAME "Geeetech A10M"

/**
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
Expand Down
20 changes: 20 additions & 0 deletions A10M_marlin1.1.9/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto

# Files with Unix line endings
*.c text eol=lf
*.cpp text eol=lf
*.h text eol=lf
*.ino text eol=lf
*.py text eol=lf
*.sh text eol=lf
*.scad text eol=lf

# Files with native line endings
# *.sln text

# Binary files
*.png binary
*.jpg binary
*.fon binary

145 changes: 145 additions & 0 deletions A10M_marlin1.1.9/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
#
# Marlin 3D Printer Firmware
# Copyright (C) 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
#
# Based on Sprinter and grbl.
# Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

# Our automatic versioning scheme generates the following file
# NEVER put it in the repository
_Version.h

#
# OS
#
applet/
*.DS_Store


#
# Misc
#
*~
*.orig
*.rej
*.bak
*.idea
*.s
*.i
*.ii
*.swp
tags

#
# C++
#
# Compiled Object files
*.slo
*.lo
*.o
*.obj
*.ino.cpp

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod
*.smod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app


#
# C
#
# Object files
*.o
*.ko
*.obj
*.elf

# Precompiled Headers
*.gch
*.pch

# Libraries
*.lib
*.a
*.la
*.lo

# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib

# Executables
*.exe
*.out
*.app
*.i*86
*.x86_64
*.hex

# Debug files
*.dSYM/
*.su

# PlatformIO files/dirs
.pio*
.pioenvs
.piolibdeps
lib/readme.txt

#Visual Studio
*.sln
*.vcxproj
*.vcxproj.filters
Release/
Debug/
__vm/
.vs/
vc-fileutils.settings

#VScode
.vscode
.vscode/c_cpp_properties.json

#cmake
CMakeLists.txt
Marlin/CMakeLists.txt
CMakeListsPrivate.txt

#CLion
cmake-build-*
Loading