Difference between revisions of "Team:TU Darmstadt/Hardware/MarlinCode"

Line 115: Line 115:
  
 
<div class="verlinked" id="BOM"><h5>Bill of Materials</h5></div>
 
<div class="verlinked" id="BOM"><h5>Bill of Materials</h5></div>
 +
 +
<center><table>
 +
 +
<thead>
 +
        <tr>
 +
          <th>Sample</th>
 +
  <th>name</th>
 +
  <th>color</th>
 +
  <th>migration distance [mm]</th>
 +
  <th>R<sub>f</sub></th>
 +
        </tr>
 +
    </thead>
 +
<tbody>
 +
<tr>
 +
<td>S</td>
 +
<td>solvent</td>
 +
<td>&#8209;</td>
 +
<td>34&nbsp;mm</td>
 +
<td>1</td>
 +
 +
      <tr>
 +
        <td>O</td>
 +
        <td>product&nbsp;(sample&nbsp;B1)</td>
 +
<td>purple</td>
 +
<td>25&nbsp;mm</td>
 +
<td>0,735</td>
 +
      </tr>
 +
      <tr>
 +
        <td>T</td>
 +
        <td>educt&nbsp;(tyrosine)</td>
 +
<td>purple</td>
 +
<td>26&nbsp;mm</td>
 +
<td>0,765</td>
 +
      </tr>
 +
</tbody>
 +
</table></center>
 +
<table>
 +
<thead>
 +
</thead>
 +
<tbody>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
<tr>
 +
 +
</tr>
 +
</tbody>
 +
</table>
 +
 +
 +
 +
 +
 +
 +
 +
 +
 +
  
 
    </div>
 
    </div>

Revision as of 10:50, 19 October 2016

If you can see this message, you do not use Javascript. This Website is best to use with Javascript enabled. Without Javascript enabled, many features including the mobile version are not usable.
Changes inside the Marlin firmware

Oiginal Version:
Marlin Version: 1.1.0-RC7
Source: https://github.com/MarlinFirmware/Marlin, 10/06/16, 12:16 pm

CHanges:

  • File: Configurattion.h
      • line 116: #define BAUDRATE 115200
        line 404: #define USE_XMAX_PLUG
        line 405: #define USE_YMAX_PLUG
        line 406: #define USE_ZMAX_PLUG

        line 423: #define X_MIN_ENDSTOP_INVERTING true
        line 424: #define X_MAX_ENDSTOP_INVERTING true
        line 425: #define Y_MIN_ENDSTOP_INVERTING true
        line 426: #define Y_MAX_ENDSTOP_INVERTING true
        line 427: #define Z_MIN_ENDSTOP_INVERTING true
        line 428: #define Z_MAX_ENDSTOP_INVERTING true

        line 564: #define DISABLE_X true
        line 565: #define DISABLE_Y true
        line 566: #define DISABLE_Z true

        line 598: #define X_HOME_DIR -1
        line 599: #define Y_HOME_DIR -1
        line 600: #define Z_HOME_DIR -1

        line 608: #define X_MIN_POS 0
        line 609: #define Y_MIN_POS 0
        line 610: #define Z_MIN_POS 0
        line 611: #define X_MAX_POS 200
        line 612: #define Y_MAX_POS 200
        line 613: #define Z_MAX_POS 245

        line 743: #define HOMING_FEEDRATE_Z (20*60)

        line 752: #define DEFAULT_AXIS_STEPS_PER_UNIT {80,80,400,500}
        line 753: #define DEFAULT_MAX_FEEDRATE {300, 300, 300, 25} // (mm/sec)
        line 754: #define DEFAULT_MAX_ACCELERATION {3000,3000,100,10000}

    • File: Configuration_adv.h
        • line 328: #define AXIS_RELATIVE_MODES {false, false, false, false}

      • File: endstops.cpp
          • line 303: disable_e0();

        • File pins_RAMPS.h
            • line: //#define Y_MAX_PIN 15

          • File: Marlin_main.cpp
              • line 298: #define PAUSE_PIN_E0 14
                line 306: static int pause_switch_e0 = 0;

                delete line 564-582:
                void setup_pausepin() //Setup pause routine for syringe extruder endstops -MM2S
                {
                #if defined(PAUSE_PIN_E0) && PAUSE_PIN_E0 > -1 //Main Extruder Endstop
                pinMode(PAUSE_PIN_E0,INPUT);
                WRITE(PAUSE_PIN_E0,HIGH);
                pause_switch_e0 = 0;
                #endif
                }

                void pause() //Pause command line - MM2SE
                {
                if (pause_switch_e0 == 0) {
                // enquecommand("G4 P0"); //Inserted to stop the repeation of "M226" Function - MM2SE
                // enquecommand("G4 P0");
                // enquecommand("G4 P0");
                // enquecommand("M226"); //"M226" G-code initiated pause
                pause_switch_e0 = 1;
                }
                }

                Add the following:
                line 8582: #if defined (PAUSE_PIN_E0) && PAUSE_PIN_E0 > -1 //Pause function for syringe extruder endstops - MM2SE
                line 8583: if( 0 == READ(PAUSE_PIN_E0) ) { //Main Exstruder Endstop
                line 8584: pause();
                line 8585: //SERIAL_ECHO("TANGO ALPHA FOXTROTT");
                line 8586: //stepper.endstop_triggered(E_AXIS);
                line 8587: disable_e0();
                line 8588: }
                line 8589: else
                line 8590: pause_switch_e0 = 0;
                line 8591: #endif

            Bill of Materials
            Sample name color migration distance [mm] Rf
            S solvent 34 mm 1
            O product (sample B1) purple 25 mm 0,735
            T educt (tyrosine) purple 26 mm 0,765