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

M876 usbprtdialog A3IDES-594 #244

Merged
merged 20 commits into from Feb 25, 2020
Merged

M876 usbprtdialog A3IDES-594 #244

merged 20 commits into from Feb 25, 2020

Commits on Feb 14, 2020

  1. Moved M876 to stubs

    @RadekVana
    RadekVana committed Feb 14, 2020
    Copy the full SHA
    f5c946f View commit details
    Browse the repository at this point in the history

  2. Update to submodule with removed file

    @RadekVana
    RadekVana committed Feb 14, 2020
    Copy the full SHA
    2cb9842 View commit details
    Browse the repository at this point in the history

  3. fix paths

    @RadekVana
    RadekVana committed Feb 14, 2020
    Copy the full SHA
    2f83be9 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2020

  1. Added M876 dialog creation support

    @RadekVana
    RadekVana committed Feb 17, 2020
    Copy the full SHA
    ee27a54 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. chechk reopen same screen

    @RadekVana
    RadekVana committed Feb 18, 2020
    Copy the full SHA
    8e8d5db View commit details
    Browse the repository at this point in the history

  2. dialog callback

    @RadekVana
    RadekVana committed Feb 18, 2020
    Copy the full SHA
    dde9f84 View commit details
    Browse the repository at this point in the history

  3. automatic unloop dunction for screens

    @RadekVana
    RadekVana committed Feb 18, 2020
    Copy the full SHA
    a6efe39 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2020

  1. screen timeout blacklist is an array now

    @RadekVana
    RadekVana committed Feb 19, 2020
    Copy the full SHA
    01ecfcc View commit details
    Browse the repository at this point in the history

  2. added screen printing serial

    @RadekVana
    RadekVana committed Feb 19, 2020
    Copy the full SHA
    94aea22 View commit details
    Browse the repository at this point in the history

  3. removed accidently added nonflash conf

    @RadekVana
    RadekVana committed Feb 19, 2020
    Copy the full SHA
    2c93a61 View commit details
    Browse the repository at this point in the history

  4. reverse same id check in screen_open - caused gui disfunctionality

    @RadekVana
    RadekVana committed Feb 19, 2020
    Copy the full SHA
    43ed07f View commit details
    Browse the repository at this point in the history

  5. bugfix - return accidently removed code

    @RadekVana
    RadekVana committed Feb 19, 2020
    Copy the full SHA
    6a66f41 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2020

  1. callback version of octoprint screen 

    those callbacks are wrong (calling them from nested guiloop like in msg box can dmg memory) have to rewrite
    @RadekVana
    RadekVana committed Feb 21, 2020
    Copy the full SHA
    17fc33a View commit details
    Browse the repository at this point in the history

  2. ensure guiloop is not nested - no pending dialog 

    added nesting counter
    @RadekVana
    RadekVana committed Feb 21, 2020
    Copy the full SHA
    17dc196 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'UPSTREAM/master' into M876_USBPRTDIALOG 

    # Conflicts:
#	lib/Marlin
#	src/common/marlin_client.c
#	src/common/marlin_events.h
#	src/common/marlin_server.cpp
#	src/gui/guimain.c
    @RadekVana
    RadekVana committed Feb 21, 2020
    Copy the full SHA
    39291c3 View commit details
    Browse the repository at this point in the history

  4. merge conflict

    @RadekVana
    RadekVana committed Feb 21, 2020
    Copy the full SHA
    6560157 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2020

  1. removed some comments, unused file, some minor code reformating

    @RadekVana
    RadekVana committed Feb 24, 2020
    Copy the full SHA
    da2ea5a View commit details
    Browse the repository at this point in the history

  2. code formating

    @RadekVana
    RadekVana committed Feb 24, 2020
    Copy the full SHA
    f8d9e0e View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2020

  1. changes requested by David (name fix, added comment)

    @RadekVana
    RadekVana committed Feb 25, 2020
    Copy the full SHA
    d79539d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'UPSTREAM/master' into M876_USBPRTDIALOG 

    # Conflicts:
#	lib/Marlin
    @RadekVana
    RadekVana committed Feb 25, 2020
    Copy the full SHA
    a2a9fbd View commit details
    Browse the repository at this point in the history