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.

Sign up for GitHub

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

Jump to bottom

Controlscreen is functional #2

Open
wants to merge 74 commits into
base: master
Choose a base branch
from
Open

Controlscreen is functional #2

wants to merge 74 commits into from

Commits on Apr 6, 2015

  1. Temperatue and homing

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    39390d7 View commit details
    Browse the repository at this point in the history

  2. Added jogging (set increment of 10mm)

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    b176b01 View commit details
    Browse the repository at this point in the history

  3. Send gcode panel

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    26e803a View commit details
    Browse the repository at this point in the history

  4. Shortcuts panel: Motors off, Fans on/off

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    6445fd4 View commit details
    Browse the repository at this point in the history

  5. Fixed UI issue with shortcuts panel

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    002695e View commit details
    Browse the repository at this point in the history

  6. Adjustable XYZ jogging velocity

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    1933a8b View commit details
    Browse the repository at this point in the history

  7. Extruder/Bed heating control

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    9d074e7 View commit details
    Browse the repository at this point in the history

  8. Fixed incorrect bed temperature input reference

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    e705501 View commit details
    Browse the repository at this point in the history

  9. Extrusion and retraction

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    9cf3082 View commit details
    Browse the repository at this point in the history

  10. Jogging increment input field

    @adeebshihadeh
    adeebshihadeh committed Apr 6, 2015
    Configuration menu
    Copy the full SHA
    804dbe8 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2015

  1. Response to commands in commands panel

    @adeebshihadeh
    adeebshihadeh committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    777bb18 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

  1. Print status panel with abort button

    @adeebshihadeh
    adeebshihadeh committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    b7c1a67 View commit details
    Browse the repository at this point in the history

  2. Extrude/Retract are now a button group

    @adeebshihadeh
    adeebshihadeh committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    424cff6 View commit details
    Browse the repository at this point in the history

  3. Automatically update temperature

    @adeebshihadeh
    adeebshihadeh committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    c489728 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2015

  1. Bigger Commands panel

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    76025d2 View commit details
    Browse the repository at this point in the history

  2. Fixed indentation inconsistencies in Controlscreen module.js

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    04e360c View commit details
    Browse the repository at this point in the history

  3. Save auto update temperature preference

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    c90a284 View commit details
    Browse the repository at this point in the history

  4. Added more comments

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    f55c5c0 View commit details
    Browse the repository at this point in the history

  5. Fixed function on POST request fail

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    3d6c0c7 View commit details
    Browse the repository at this point in the history

  6. Get print progress button in Print Status panel

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    d1801b2 View commit details
    Browse the repository at this point in the history

  7. Added Bootbox.js

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    6baefc7 View commit details
    Browse the repository at this point in the history

  8. Abort print confirmation

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    e1f263b View commit details
    Browse the repository at this point in the history

  9. Fans on/off button group

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    1309511 View commit details
    Browse the repository at this point in the history

  10. Fixed indentation inconsistencies in Controlscreen HTML

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    98754d6 View commit details
    Browse the repository at this point in the history

  11. Changed jogging button order

    @adeebshihadeh
    adeebshihadeh committed Apr 10, 2015
    Configuration menu
    Copy the full SHA
    e68b683 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2015

  1. Searches for 'config' instead of 'config.txt'

    @adeebshihadeh
    adeebshihadeh committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    ce820a1 View commit details
    Browse the repository at this point in the history

  2. Homing/Jogging button group

    @adeebshihadeh
    adeebshihadeh committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    2b38ddb View commit details
    Browse the repository at this point in the history

  3. Renamed 'Control' panel to 'Jogging Control'

    @adeebshihadeh
    adeebshihadeh committed Apr 11, 2015
    Configuration menu
    Copy the full SHA
    f2b4a84 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2015

  1. Update to Bootstrap v3.3.4

    adeeb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    5002da3 View commit details
    Browse the repository at this point in the history

  2. Fixed glyphicons directory

    adeeb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    36c82c8 View commit details
    Browse the repository at this point in the history

  3. Commands panel heading glyphicon

    adeeb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    ac8b7fc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1 from quillford/iconography 

    Iconography
    quillford committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    01d2359 View commit details
    Browse the repository at this point in the history

  5. Jogging Control panel glyphicon

    adeeb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    d251277 View commit details
    Browse the repository at this point in the history

  6. Fixed Dropbox logo link

    adeeb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    ec97545 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2015

  1. Moved 'motors off' button to Jogging Control panel

    @adeebshihadeh
    adeebshihadeh committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    d45e63f View commit details
    Browse the repository at this point in the history

  2. Renamed 'Shortcuts' panel to 'Fan Control'

    @adeebshihadeh
    adeebshihadeh committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    c21bb7e View commit details
    Browse the repository at this point in the history

  3. Moved to Bootbox v3

    @adeebshihadeh
    adeebshihadeh committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    8f89ebb View commit details
    Browse the repository at this point in the history

  4. Removed commented code

    @adeebshihadeh
    adeebshihadeh committed Apr 15, 2015
    Configuration menu
    Copy the full SHA
    75f08fa View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2015

  1. Removed miscellanous text in navigation

    @adeebshihadeh
    adeebshihadeh committed Apr 16, 2015
    Configuration menu
    Copy the full SHA
    990fec6 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2015

  1. Merge pull request #2 from quillford/modules 

    Modules
    quillford committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    ccd0c10 View commit details
    Browse the repository at this point in the history

  2. Use updater module for updating temperature

    adeeb committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    6e5c0b4 View commit details
    Browse the repository at this point in the history

  3. Use updater module for updating print progress

    adeeb committed Apr 17, 2015
    Configuration menu
    Copy the full SHA
    69524bd View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2015

  1. Changed abort button from 'No' to 'Cancel'

    quillford committed Apr 18, 2015
    Configuration menu
    Copy the full SHA
    fb1aa4b View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2015

  1. Moved the Console widget to a module

    quillford committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    a2139ab View commit details
    Browse the repository at this point in the history

  2. Combined the consolewidget in machines and the one in gui

    quillford committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    fdc421d View commit details
    Browse the repository at this point in the history

  3. Removed blank widgets

    quillford committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    d3809f2 View commit details
    Browse the repository at this point in the history

  4. Cleaned up consolewidget module

    quillford committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    a651512 View commit details
    Browse the repository at this point in the history

  5. Fixed bug in which widgets would be added again when machine tab is c… 

    …licked
    quillford committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    9942ade View commit details
    Browse the repository at this point in the history

  6. Fixed positioning of console widget

    quillford committed Apr 20, 2015
    Configuration menu
    Copy the full SHA
    497eef6 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2015

  1. Extrusion control widget

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    28da9f8 View commit details
    Browse the repository at this point in the history

  2. Jogging widget to module

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    d462450 View commit details
    Browse the repository at this point in the history

  3. Temperature Control widget to a module

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    fa827f7 View commit details
    Browse the repository at this point in the history

  4. fixed temperaturecontrolwidget name and added fancontrol widget

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    098b986 View commit details
    Browse the repository at this point in the history

  5. Print status widget module

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    db09c88 View commit details
    Browse the repository at this point in the history

  6. Fixed the event that sends gcode in widget modules

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    07ac5b3 View commit details
    Browse the repository at this point in the history

  7. Temperatures widget module

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    219513c View commit details
    Browse the repository at this point in the history

  8. Cleaned up controlscreen module.js

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    c642c1a View commit details
    Browse the repository at this point in the history

  9. Search for '/sd/config.' instead of '/sd/config' for compatability wi… 

    …th more browsers
    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    52b1324 View commit details
    Browse the repository at this point in the history

  10. Use machine name in controlscreen tabs

    quillford committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    57afeb0 View commit details
    Browse the repository at this point in the history

  11. Minor UI tweaks

    @adeebshihadeh
    adeebshihadeh committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    f283dd9 View commit details
    Browse the repository at this point in the history

  12. Added bed temperature to Temperatures widget

    @adeebshihadeh
    adeebshihadeh committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    af2bfc3 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2015

  1. Modified TemperatureControl widget

    @adeebshihadeh
    adeebshihadeh committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    41fd7d4 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2015

  1. Pass machine to controlscreen widgets on_populate_screen rather than … 

    …on_config_parsed
    @adeebshihadeh
    adeebshihadeh committed Apr 23, 2015
    Configuration menu
    Copy the full SHA
    00e8da0 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2015

  1. Support for multiple machines in controlscreen

    quillford committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    04198c9 View commit details
    Browse the repository at this point in the history

  2. Fixed widget machine assignment

    quillford committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    3a2e711 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2015

  1. Fixed placement of widgets when selecting new tab

    quillford committed May 1, 2015
    Configuration menu
    Copy the full SHA
    3740858 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2015

  1. Changed jogging increment to radio buttons

    quillford committed May 2, 2015
    Configuration menu
    Copy the full SHA
    96b7c7c View commit details
    Browse the repository at this point in the history

  2. improved print status widget

    quillford committed May 2, 2015
    Configuration menu
    Copy the full SHA
    8d8c8a3 View commit details
    Browse the repository at this point in the history

  3. improved console widget

    quillford committed May 2, 2015
    Configuration menu
    Copy the full SHA
    33088c0 View commit details
    Browse the repository at this point in the history

  4. fix readme type

    quillford committed May 2, 2015
    Configuration menu
    Copy the full SHA
    096155d View commit details
    Browse the repository at this point in the history

Commits on May 3, 2015

  1. seconds converted to hh:mm:ss

    @adeebshihadeh
    adeebshihadeh committed May 3, 2015
    Configuration menu
    Copy the full SHA
    cd57322 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2015

  1. Added comment to machine name in config

    quillford committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    d51f22b View commit details
    Browse the repository at this point in the history

  2. update bootstrap to v3.3.5

    quillford committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    cb857f3 View commit details
    Browse the repository at this point in the history

  3. fixed bootstrap font path

    quillford committed Jun 24, 2015
    Configuration menu
    Copy the full SHA
    61d38a7 View commit details
    Browse the repository at this point in the history