User Tools

Site Tools


bukobot-marlin-firmware-file-changes

Link to this comparison view

bukobot-marlin-firmware-file-changes [2012/12/20 23:15]
buildrob created
bukobot-marlin-firmware-file-changes [2012/12/21 00:29] (current)
buildrob
Line 2: Line 2:
  
 This version of the firmware was forked from the main Marlin Github repository (https://​github.com/​ErikZalm/​Marlin) on 10 Oct 2012. The git head id of the repository is: This version of the firmware was forked from the main Marlin Github repository (https://​github.com/​ErikZalm/​Marlin) on 10 Oct 2012. The git head id of the repository is:
-[[https://​github.com/​ErikZalm/​Marlin/​tree/​bc27d809fb4232abd33c85f33ec2bb78d7ce3444|bc27d809fb4232abd33c85f33ec2bb78d7ce3444]].+[[https://​github.com/​ErikZalm/​Marlin/​tree/​bc27d809fb4232abd33c85f33ec2bb78d7ce3444|bc27d809fb4232abd33c85f33ec2bb78d7ce3444]]. The sections below list each of the file differences between each of the Bukobot firmware releases and the github head at that time.
  
-The sections below list the file difference ​between each of the Bukobot firmware releases and the head at that time.+The difference ​was generated by using the following steps:
  
-The difference was generated by executing the following command using the steps: +  - Create a local clone of the Marlin github repository (using the github client). 
- +  ​- ​Open a github command window (using the github client). 
-1) Create a local clone of the Marlin github repository (using the github client). +  ​- ​Checkout the repository at the time it was branched using the following command: <​code>​git checkout -f bc27d809fb4232abd33c85f33ec2bb78d7ce3444</​code>​ 
-2) Open a github command window (using the github client). +  ​- ​Copy the released bukobot firmware into the directory where you have done the checkout. 
-3) Checkout the repository at the time it was branched using the following command: +  ​- ​Display configuration file differences using the following commands: <​code>​git diff Marlin/​Configuration.h 
-<​code>​git checkout -f bc27d809fb4232abd33c85f33ec2bb78d7ce3444</​code>​ +git diff Marlin/​Configuration_adv.h</​code>​ (The file changes are also visible from the github client).
-4) Copy the released bukobot firmware into the directory where you have done the checkout. +
-5) Display configuration file differences using the following commands: +
-<​code>​git diff Marlin/​Configuration.h +
-git diff Marlin/​Configuration_adv.h</​code>​ +
-(The file changes are also visible from the github client).+
  
 Configuration.h and Configuration_adv.h were the only two files which were changed in all versions. Configuration.h and Configuration_adv.h were the only two files which were changed in all versions.
  
-===== Azteeg ​X3 Marlin Firmware Changes =====+===== Azteeg ​X1 Marlin Firmware Changes =====
  
-==== Bukobot ​Duo (Azteeg X3) ====+==== Bukobot ​Vanilla/​Green/​Mini Green ====
  
-=== Configuration.h ​===+== Configuration.h ==
 <​code>​ <​code>​
 diff --git a/​Marlin/​Configuration.h b/​Marlin/​Configuration.h diff --git a/​Marlin/​Configuration.h b/​Marlin/​Configuration.h
-index 06eea46..4dedd3d ​100644+index 06eea46..73193d2 ​100644
 --- a/​Marlin/​Configuration.h --- a/​Marlin/​Configuration.h
 +++ b/​Marlin/​Configuration.h +++ b/​Marlin/​Configuration.h
Line 46: Line 41:
  #​ifndef MOTHERBOARD  #​ifndef MOTHERBOARD
 -#define MOTHERBOARD 7 -#define MOTHERBOARD 7
-+#define MOTHERBOARD ​34++#define MOTHERBOARD ​62
  #​endif  #​endif
    
Line 131: Line 126:
  #​define DEFAULT_EJERK ​                ​5.0 ​   // (mm/sec)  #​define DEFAULT_EJERK ​                ​5.0 ​   // (mm/sec)
    
-@@ -278,14 +283,14 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th+@@ -278,10 +283,10 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
  // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).  ​  // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).  ​
  // M502 - reverts to the default "​factory settings"​. ​ You still need to store them in EEPROM afterwards if you want to.  // M502 - reverts to the default "​factory settings"​. ​ You still need to store them in EEPROM afterwards if you want to.
Line 144: Line 139:
  //LCD and SD support  //LCD and SD support
  //#​define ULTRA_LCD ​ //general lcd support, also 16x2  //#​define ULTRA_LCD ​ //general lcd support, also 16x2
--//#define SDSUPPORT // Enable SD Card Support in Hardware Console 
-+#define SDSUPPORT // Enable SD Card Support in Hardware Console 
-  
- //#​define ULTIMAKERCONTROLLER //as available from the ultimaker online store. 
- //#​define ULTIPANEL ​ //the ultipanel as on thingiverse 
 @@ -305,12 +310,12 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th @@ -305,12 +310,12 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
    #​define LCD_HEIGHT 4    #​define LCD_HEIGHT 4
Line 177: Line 167:
 </​code>​ </​code>​
  
-=== Configuration_adv.h ​===+== Configuration_adv.h ==
  
 <​code>​ <​code>​
 diff --git a/​Marlin/​Configuration_adv.h b/​Marlin/​Configuration_adv.h diff --git a/​Marlin/​Configuration_adv.h b/​Marlin/​Configuration_adv.h
-index ecdc833..a129cd5 ​100644+index ecdc833..40885a4 ​100644
 --- a/​Marlin/​Configuration_adv.h --- a/​Marlin/​Configuration_adv.h
 +++ b/​Marlin/​Configuration_adv.h +++ b/​Marlin/​Configuration_adv.h
Line 195: Line 185:
  #​define EXTRUDER_RUNOUT_ESTEPS 14. //mm filament  #​define EXTRUDER_RUNOUT_ESTEPS 14. //mm filament
  #​define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed  #​define EXTRUDER_RUNOUT_SPEED 1500.  //extrusion speed
-@@ -69,7 +69,7 @@ 
- //​=========================================================================== 
-  
- // This defines the number of extruders 
--#define EXTRUDERS 1 
-+#define EXTRUDERS 2 
-  
- #​define ENDSTOPS_ONLY_FOR_HOMING // If defined the endstops will only be used for homing 
 </​code> ​ </​code> ​
  
-==== Bukobot Vanilla with Azteeg X3 upgrade ​====+====Azteeg X3 Marlin Firmware Changes =====
  
-The changes are the same as the Bukobot ​Duo except that +==== Bukobot ​Vanilla/​Green/​Mini Green with Azteeg X3 upgrade ====
  
-<​code>​ +The changes are the same as the //Bukobot Vanilla (Azteeg X1)// except that you should change
-#define EXTRUDERS 1 +
-</code>+
  
-is set in Configuration_adv.h+<​code>#​define MOTHERBOARD 62</​code>​ 
 +to  
 +<​code>#​define MOTHERBOARD 34</​code>​
  
-===== Azteeg X1 Marlin Firmware Changes =====+as well as 
 + 
 +<​code>//#​define SDSUPPORT // Enable SD Card Support in Hardware Console</​code>​ 
 +to 
 +<​code>#​define SDSUPPORT // Enable SD Card Support in Hardware Console</​code>​ 
 + 
 +in Configuration.h 
 + 
 +==== Bukobot Duo ==== 
 + 
 +The changes are the same as the //Bukobot Vanilla/​Green/​Mini Green with Azteeg X3 upgrade// except that you should also change 
 + 
 +<​code>#​define EXTRUDERS 1</​code>​ 
 +to  
 +<​code>#​define EXTRUDERS 2</​code>​ 
 + 
 +in Configuration_adv.h
bukobot-marlin-firmware-file-changes.1356066940.txt.gz · Last modified: 2012/12/20 23:15 by buildrob