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

Version 1.1 #121

Draft
wants to merge 39 commits into
base: master
Choose a base branch
from
Draft

Version 1.1 #121

wants to merge 39 commits into from

Commits on May 28, 2023

  1. + Added experimental support for fullscreen video mode, including pr… 

    …int progress
    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    1cd5503 View commit details
    Browse the repository at this point in the history

  2. * Fixed incorrect css selector

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    8fdc005 View commit details
    Browse the repository at this point in the history

  3. - Remove col-xxl-* assignments, as they break default view of home tab

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    83287e6 View commit details
    Browse the repository at this point in the history

  4. * Use bi_icon "fullscreen" for fullscreen button

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    7341e13 View commit details
    Browse the repository at this point in the history

  5. * Dynamically change column sizing on fullscreen change.

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    be41ea3 View commit details
    Browse the repository at this point in the history

  6. Adding mechanism for entering an emulated fullscreen from url param, … 

    …cannot enter native fullscreen without interaction
    @billyjbryant @chrivers
    billyjbryant authored and chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    30098e0 View commit details
    Browse the repository at this point in the history

  7. Set background to transparent for emulated fullscreen

    @billyjbryant @chrivers
    billyjbryant authored and chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    a443fd9 View commit details
    Browse the repository at this point in the history

  8. Less important

    @billyjbryant @chrivers
    billyjbryant authored and chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    9e0b4fb View commit details
    Browse the repository at this point in the history

  9. Fixing broken JS if the fullscreen param isn't provided

    @billyjbryant @chrivers
    billyjbryant authored and chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    b8ddaed View commit details
    Browse the repository at this point in the history

  10. Fixing issue where #vmain fullscreen-emulate was being applied to body 

    Re-added the for header/footer to override bootstraps d-flex
    @billyjbryant @chrivers
    billyjbryant authored and chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    c8ea9af View commit details
    Browse the repository at this point in the history

  11. Simplified how fullscreen-emulate is applied

    @billyjbryant @chrivers
    billyjbryant authored and chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    da72690 View commit details
    Browse the repository at this point in the history

  12. CSS & JS Improvements

    @billyjbryant @chrivers
    billyjbryant authored and chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    aeb26b4 View commit details
    Browse the repository at this point in the history

  13. Chrivers/next/overlay-experiments (#114) 

    This PR implements a full-screen button on the video stream, that
switches ankerctl to a full-screen view, with the print job status on
the right hand side.

@billyjbryant implemented an "emulated fullscreen mode" that can be activated by `?fullscreen=1` as an url parameter.
    @chrivers
    chrivers authored May 28, 2023
    Configuration menu
    Copy the full SHA
    1f66c19 View commit details
    Browse the repository at this point in the history

  14. Adding gcode upload form to home 

    Set config upload to accept .json files
    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    efab937 View commit details
    Browse the repository at this point in the history

  15. Updated upload form to function 

    Split upload action to a new function so both gcode upload 'cli' & 'web' could use the same function

Updated way modal is displayed to allow reuse
    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    86e32ce View commit details
    Browse the repository at this point in the history

  16. Fixed issue where modal popped up even if there was no file in the input

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    8590acd View commit details
    Browse the repository at this point in the history

  17. Minor fixes

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    97c697d View commit details
    Browse the repository at this point in the history

  18. Removing text from modal-inner

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    38735de View commit details
    Browse the repository at this point in the history

  19. Fixing modal not getting message 

    Fixing no return not causing page to reload
    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    5e2606d View commit details
    Browse the repository at this point in the history

  20. Removing try/except in upload_file_to_printer

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    83d34a0 View commit details
    Browse the repository at this point in the history

  21. Drop unused param

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    e2499c0 View commit details
    Browse the repository at this point in the history

  22. Moved upload form to new modal

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    c92456f View commit details
    Browse the repository at this point in the history

  23. Reverting some auto formatting

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    06ea5d7 View commit details
    Browse the repository at this point in the history

  24. Updating the upload function

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    64359d3 View commit details
    Browse the repository at this point in the history

  25. Updating Tab names

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    5a584d5 View commit details
    Browse the repository at this point in the history

  26. A-B Test for Print button 

    A: Print as popup modal with separate button

B: Print as separate page with menu button
    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    688c0bf View commit details
    Browse the repository at this point in the history

  27. Removing Print option A and improving the print tab 

    Fixing auto-formatting for the bajillionth time
    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    71c6202 View commit details
    Browse the repository at this point in the history

  28. Removing url_for from web.util

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    1d60550 View commit details
    Browse the repository at this point in the history

  29. Dropping unused logging in web.util 

    Adding docstring to upload_file_to_printer
    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    4441cb3 View commit details
    Browse the repository at this point in the history

  30. Cleaning up javascript left-overs from the A-B test

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    92b1d9b View commit details
    Browse the repository at this point in the history

  31. Minor fixes

    @billyjbryant
    billyjbryant committed May 28, 2023
    Configuration menu
    Copy the full SHA
    606c1c1 View commit details
    Browse the repository at this point in the history

  32. * Revert unrelated formatting changes

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    3b7a851 View commit details
    Browse the repository at this point in the history

  33. - Revert "print" button code

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    cc7705c View commit details
    Browse the repository at this point in the history

  34. * Fixed incorrect nesting of column <div>s

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    b222fd4 View commit details
    Browse the repository at this point in the history

  35. - Remove excessive styling classes, and inline styles

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    2713156 View commit details
    Browse the repository at this point in the history

  36. * Fix layout bug: the print upload card is not a modal

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    2aaa30c View commit details
    Browse the repository at this point in the history

  37. * Make upload form a bit wider (column layout 2-8-2 instead of 3-6-3)

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    7ffbd0f View commit details
    Browse the repository at this point in the history

  38. * Shorter description for upload form

    @chrivers
    chrivers committed May 28, 2023
    Configuration menu
    Copy the full SHA
    be18b7a View commit details
    Browse the repository at this point in the history

  39. Print from the web interface (#113) 

    ### Description

This PR adds a new upload button to the home page that allows for
uploading gcode files directly from the Web UI

### Preview


![image](https://github.com/Ankermgmt/ankermake-m5-protocol/assets/3013565/4a09ab27-0719-4dcc-a521-eac8e2512268)

### Console logs:

```sh
[*] FileTransferService: Requesting start
[*] FileTransferService: Worker started
[*] Going to upload 12729275 bytes as 'wall-honeycomb-224x190size_mk3s__0.20mm_PLA_M5.gcode'
[*] Requesting file transfer..
[*] TOPIC [/phone/maker/AK7ZRG0C35700749/notice]
[*] Sending file metadata..
[*] Sending file contents..
[*] TOPIC [/phone/maker/AK7ZRG0C35700749/notice]
[*] TOPIC [/phone/maker/AK7ZRG0C35700749/notice]
[*] TOPIC [/phone/maker/AK7ZRG0C35700749/notice]
[*] TOPIC [/phone/maker/AK7ZRG0C35700749/notice]
[*] File upload complete. Requesting print start of job.
[*] Successfully sent print job
[*] FileTransferService: Requesting stop
[*] FileTransferService: Worker stopped
```

### Testing PPPP print-file
To ensure that `pppp print-file` continues to work I tested it as well: 

```sh
billy  …/ankermake-m5-protocol   web-gcode-upload $  ♥ 08:34  ./ankerctl.py pppp print-file -n /mnt/c/Users/billy/OneDrive/Documents/3dPrinterSD/0_SLICED/FDM/wall-honeycomb-224x190size\(mk3s\)_0.20mm_PLA_M5.gcode 
[*] Trying connect to printer Vulcan (USPRAKM-008574-TPUPS) over pppp using ip 192.168.4.145
[*] Established pppp connection
[*] Going to upload 12729275 bytes as 'wall-honeycomb-224x190size_mk3s__0.20mm_PLA_M5.gcode'
[*] Requesting file transfer..
[*] Sending file metadata..
[*] Sending file contents..
100%|████████████████████████████████████████████████████████████████████████████████████████████| 12.1M/12.1M [00:18<00:00, 694kb/s]
[*] File upload complete
```

Fixes: #112
    @chrivers
    chrivers authored May 28, 2023
    Configuration menu
    Copy the full SHA
    2add2e6 View commit details
    Browse the repository at this point in the history