Skip to content

Commit

Permalink
Add a memory card image to "package" the upgrade. Includes supporting…
Browse files Browse the repository at this point in the history
… files
  • Loading branch information
aegean-odyssey committed Dec 19, 2019
1 parent 74d1133 commit 47d028d
Show file tree
Hide file tree
Showing 51 changed files with 2,879,046 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
/*.map
/*.otx
/*.elf
/*.zip
/build/
/build/**
/Marlin/
Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ before_install:
script:
- docker run -v $(pwd):/root ao:travis su -l -c "make all"

before_deploy:
- docker run -v $(pwd):/root ao:travis su -l -c "make -C uSDCard all"

deploy:
provider: releases
edge: true
Expand All @@ -22,6 +25,6 @@ deploy:
tags: true
overwrite: true
file_glob: true
file: mpmd_marlin_1.1.x-*.{bin,otx,map,elf}
file: mpmd_marlin_1.1.x-*.{bin,otx,map,elf,zip}
prerelease: true
target_commitish: master
50 changes: 50 additions & 0 deletions uSDCard/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
# uSDCard -

PROJECT = mpmd_marlin_1.1.x-uSDCard
VERSION = 00
RELEASE = 01

MPMD_MARLIN = mpmd_marlin_1.1.x-119r??-05Alimit.bin

# use the path to the Makefile as our reference
ZD := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))

# firmware to include
FIRMWARE := $(realpath ${ZD}..)/${MPMD_MARLIN}
VERSION := **_$(basename $(notdir $(wildcard ${FIRMWARE})))_**

# root directory of card image
CONTENTS = ${ZD}contents

.PHONY : all clean distclean card deploy

card : distclean
# # create gcode utilities
${ZD}util-setup-gcode.sh
# # copy models
mkdir -p ${CONTENTS}/models
cp ${ZD}models/*.stl ${CONTENTS}/models/
cp ${ZD}models/*.gcode ${CONTENTS}/
# # files overwritten when "zipped"
cp README.md ${CONTENTS}/
touch ${CONTENTS}/firmware.bin
touch ${CONTENTS}/fcupdate.flg

all : card deploy

deploy : ${ZD}${PROJECT}.zip
mv $< ..

${ZD}${PROJECT}.zip : ${CONTENTS} ${FIRMWARE} README.md
sed -i '1s/^/${VERSION}\n/' $</README.md
cp ${FIRMWARE} $</firmware.bin
rm -f $@
cd $^ && zip -r $@ .

${CONTENTS} : card

distclean : clean
rm -fR ${CONTENTS}

clean :
rm -f .*~ *~ *.o *.d *.a
18 changes: 18 additions & 0 deletions uSDCard/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# 3D PRINTABLE MODELS

### Monoprice Cat _(original with alternate start gcode)_
* monoprice_cat.gcode

### (#3DBenchy)[https://www.thingiverse.com/thing:763622]
* 3DBenchy.stl
* 3DBenchy.gcode

### (maneki-neko -money cat- by bs3)[https://www.thingiverse.com/thing:923108]
* money_cat.stl
* money_cat.gcode
* money_cat_fill.stl
* money_cat_fill.gcode

### (Treefrog by MorenaP)[https://www.thingiverse.com/thing:18479]
* treefrog_45_cut.stl
* treefreg_45_cut.gcode
Loading

0 comments on commit 47d028d

Please sign in to comment.