Skip to content

Commit

Permalink
#257 Fix deprecated workflow commands in build (#259)
Browse files Browse the repository at this point in the history
* Fix deprecated workflow commands in build

* Fix path syntax, update README to fix #258
  • Loading branch information
vintagepc authored Oct 6, 2020
1 parent 920d4e8 commit 9bf93ca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,7 @@ jobs:
run: |
C:\tools\cygwin\cygwinsetup.exe -qgnNdO -R C:/tools/cygwin -s http://mirrors.kernel.org/sourceware/cygwin/ -P cmake,make,libelf-devel,gcc-core,gcc-g++,libstdc++-6-devel,git,libglut-devel,libGLEW-devel,libSDL_sound-devel,libSDL-devel,avr-gcc,python2,libpng-devel
shell: cmd
- name: Set ENV
run: |
echo '::set-env name=PATH::C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin'

- name: Checkout ${{ github.event.pull_request.head.ref }}
uses: actions/[email protected]
if: ${{ github.event.pull_request }}
Expand All @@ -188,13 +186,15 @@ jobs:
cd MK404
mkdir build
cd build
set PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin
bash.exe -c "cmake -DCMAKE_BUILD_TYPE=RELEASE .."
shell: cmd

- name: Build
run: |
cd ${{runner.workspace}}\MK404\build
pwd
set PATH=C:\tools\cygwin\bin;C:\tools\cygwin\usr\bin
bash.exe -c "make -j2"
shell: cmd

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Cache permissions
run: sudo chmod -R 744 packages

- uses: openrndr/setup-opengl@v1
- uses: openrndr/setup-opengl@21a61c3
- run: |
xvfb-run glxinfo
ls -l
Expand Down
19 changes: 3 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ Remaining To-Dos of note:
Be sure to check out the [Historical timeline](https://github.com/vintagepc/MK404/wiki/Historical-Timeline) to get a peek at the growth of MK404.

- ![CI Build](https://github.com/vintagepc/MK404/workflows/CI%20Build/badge.svg) ![Code Lint](https://github.com/vintagepc/MK404/workflows/Code%20Lint/badge.svg) ![Automated Tests](https://github.com/vintagepc/MK404/workflows/Automated%20Tests/badge.svg) (Don't be alarmed if the tests are failing, they are relatively new and it's possible they are more fragile than we'd like...)
- **The simulator can complete a self test!**


For a detailed list of features, see [Features And Capabilities](https://github.com/vintagepc/MK404/wiki/Features-and-Capabilities-Summary). The below is a brief summary of the more visually appealing entries.


![](https://user-images.githubusercontent.com/53943260/80157964-63404880-8595-11ea-9bfe-55668a0d4807.png)
Expand All @@ -22,21 +24,6 @@ Be sure to check out the [Historical timeline](https://github.com/vintagepc/MK40

![](https://github.com/vintagepc/MK404/wiki/images/Advanced_gfx.png)

- Bootloader works
- LCD works. Brightness support has been fixed.
- Encoder and buttons are simulated
- Power panic (fake button) is wired up
- 2 UARTS are defined but not attached externally by default. Can be enabled by passing "-s" to access the primary serial port. UART2 is used for the MMU.
- Thermistors are defined for the bed, PINDA, ambient and hotend. Bed/PINDA read higher than expected over 40C due to code in the official firmware (prusa3d#2601)
- Fans have been attached, and can be controlled by the PWM output (or manually overridden to simulate conditions).
- Heater behaviour has been implemented. A Hotend heater is attached and appears functional. Same goes for the heatbed.
- PINDA simulation is present for both MBL and xyz cal. Toggle "sheet on bed" flag with the 'Y' key.
- Simulated SD card
- TMC2130s are sufficiently simulated for general operations.
- Motor/positioning tracking present.
- SPI flash for language support works, but because PTYs lack DTR it must be done either in two stages, or using the example script to trigger a reset at the right time.
- The timer bug has been resolved using a customized build of SimAVR.
- Flash/eeprom is persisted between reboots.
- Virtual MMU support:

![](https://github.com/vintagepc/MK404/wiki/images/MMU2.png)
Expand Down

0 comments on commit 9bf93ca

Please sign in to comment.