Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MarlinKimbra
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
machinery
MarlinKimbra
Commits
5c948fc5
Commit
5c948fc5
authored
Jan 30, 2016
by
MagoKimbra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update 4.2.5
parent
c5a9d80d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
Configuration_Version.h
MarlinKimbra/Configuration_Version.h
+1
-1
MarlinKimbra.ino
MarlinKimbra/MarlinKimbra.ino
+2
-2
MK_Main.cpp
MarlinKimbra/module/MK_Main.cpp
+1
-1
language.h
MarlinKimbra/module/language/language.h
+1
-1
No files found.
MarlinKimbra/Configuration_Version.h
View file @
5c948fc5
#ifndef CONFIGURATION_VERSION_H
#ifndef CONFIGURATION_VERSION_H
#define CONFIGURATION_VERSION_H
#define CONFIGURATION_VERSION_H
#define BUILD_VERSION "M
arlinKimbra
4.2.5 dev"
#define BUILD_VERSION "M
K
4.2.5 dev"
#define SHORT_BUILD_VERSION "4.2.5_dev"
#define SHORT_BUILD_VERSION "4.2.5_dev"
#define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__ // build date and time
#define STRING_DISTRIBUTION_DATE __DATE__ " " __TIME__ // build date and time
// It might also be appropriate to define a location where additional information can be found
// It might also be appropriate to define a location where additional information can be found
...
...
MarlinKimbra/MarlinKimbra.ino
View file @
5c948fc5
/**
/**
* M
arlinKimbra
Firmware
* M
K
Firmware
*
*
* Based on Marlin, Sprinter and grbl
* Based on Marlin, Sprinter and grbl
* Copyright (C) 2013 M
agoKimbra
* Copyright (C) 2013 M
K
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
*
*
* This program is free software: you can redistribute it and/or modify
* This program is free software: you can redistribute it and/or modify
...
...
MarlinKimbra/module/MK_Main.cpp
View file @
5c948fc5
/**
/**
* M
arlinKimbra
Firmware
* M
K
Firmware
*
*
* Based on Sprinter and grbl.
* Based on Sprinter and grbl.
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
...
...
MarlinKimbra/module/language/language.h
View file @
5c948fc5
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
#elif MECH(SCARA)
#elif MECH(SCARA)
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Scara EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#define SERIAL_M115_REPORT "FIRMWARE_NAME:MK_" SHORT_BUILD_VERSION " FIRMWARE_URL:" FIRMWARE_URL " PROTOCOL_VERSION:" PROTOCOL_VERSION " MACHINE_TYPE:Scara EXTRUDER_COUNT:" STRINGIFY(EXTRUDERS) " UUID:" MACHINE_UUID "\n"
#endif
#endif
#define MSG_MARLIN "MarlinKimbra"
#define SERIAL_ENQUEUEING "enqueueing \""
#define SERIAL_ENQUEUEING "enqueueing \""
#define SERIAL_POWERUP "PowerUp"
#define SERIAL_POWERUP "PowerUp"
#define SERIAL_EXTERNAL_RESET "External Reset"
#define SERIAL_EXTERNAL_RESET "External Reset"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment