|
|
|
|
52
|
git checkout $IMPORT || exit
|
52
|
git checkout $IMPORT || exit
|
53
|
|
53
|
|
54
|
# Reset from the latest complete state
|
54
|
# Reset from the latest complete state
|
55
|
- #git reset --hard master
|
|
|
|
|
55
|
+ #git reset --hard bugfix-2.0.x
|
56
|
|
56
|
|
57
|
cp "$MARLINREPO/Marlin/"Configuration*.h "$CDEF/"
|
57
|
cp "$MARLINREPO/Marlin/"Configuration*.h "$CDEF/"
|
58
|
#git add . && git commit -m "Changes from Marlin ($(date '+%Y-%m-%d %H:%M'))."
|
58
|
#git add . && git commit -m "Changes from Marlin ($(date '+%Y-%m-%d %H:%M'))."
|
|
|
|
|
99
|
# DEBUG: Commit the original config files for comparison
|
99
|
# DEBUG: Commit the original config files for comparison
|
100
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Commit for comparison" >/dev/null
|
100
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Commit for comparison" >/dev/null
|
101
|
|
101
|
|
102
|
- # Init Cartesian configurations to default
|
|
|
103
|
- echo "- Initializing configs to default state..."
|
|
|
|
|
102
|
+ # Init Cartesian/SCARA/TPARA configurations to default
|
|
|
103
|
+ echo "- Initializing Cartesian/SCARA/TPARA configs to default state..."
|
104
|
|
104
|
|
105
|
find "$CEXA" -name $BC ! -path */delta/* -print0 \
|
105
|
find "$CEXA" -name $BC ! -path */delta/* -print0 \
|
106
|
| while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
|
106
|
| while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
|
|
|
|
|
108
|
| while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
|
108
|
| while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
|
109
|
|
109
|
|
110
|
# DEBUG: Commit the reset for review
|
110
|
# DEBUG: Commit the reset for review
|
111
|
- ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Cartesian/SCARA configs..." >/dev/null
|
|
|
|
|
111
|
+ ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Cartesian/SCARA/TPARA configs..." >/dev/null
|
112
|
|
112
|
|
113
|
# Create base Delta configurations
|
113
|
# Create base Delta configurations
|
114
|
cp "$CDEF"/* "$CEXA/delta/generic"
|
114
|
cp "$CDEF"/* "$CEXA/delta/generic"
|
|
|
|
|
121
|
# DEBUG: Commit Generic Delta changes for review
|
121
|
# DEBUG: Commit Generic Delta changes for review
|
122
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Apply Generic Delta..." >/dev/null
|
122
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Apply Generic Delta..." >/dev/null
|
123
|
|
123
|
|
|
|
124
|
+ # Reset all Delta configs to the generic version
|
124
|
find "$CEXA/delta" -name $BC ! -path */generic/* -print0 \
|
125
|
find "$CEXA/delta" -name $BC ! -path */generic/* -print0 \
|
125
|
| while read -d $'\0' F ; do cp "$CEXA/delta/generic/$BC" "$F" ; done
|
126
|
| while read -d $'\0' F ; do cp "$CEXA/delta/generic/$BC" "$F" ; done
|
126
|
find "$CEXA/delta" -name $AC ! -path */generic/* -print0 \
|
127
|
find "$CEXA/delta" -name $AC ! -path */generic/* -print0 \
|
127
|
| while read -d $'\0' F ; do cp "$CEXA/delta/generic/$AC" "$F" ; done
|
128
|
| while read -d $'\0' F ; do cp "$CEXA/delta/generic/$AC" "$F" ; done
|
128
|
|
129
|
|
129
|
- # DEBUG: Commit the reset for review
|
|
|
|
|
130
|
+ # DEBUG: Commit the Delta reset for review
|
130
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Delta configs..." >/dev/null
|
131
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset Delta configs..." >/dev/null
|
131
|
|
132
|
|
132
|
- # SCARA configurations
|
|
|
|
|
133
|
+ # Reset all SCARA configs to the default cartesian
|
133
|
find "$CEXA/SCARA" -name $BC \
|
134
|
find "$CEXA/SCARA" -name $BC \
|
134
|
| while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
|
135
|
| while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
|
135
|
find "$CEXA/SCARA" -name $AC \
|
136
|
find "$CEXA/SCARA" -name $AC \
|
136
|
| while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
|
137
|
| while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
|
137
|
|
138
|
|
138
|
- # DEBUG: Commit the reset for review or...
|
|
|
|
|
139
|
+ # DEBUG: Commit the SCARA reset for review
|
139
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset SCARA..." >/dev/null
|
140
|
((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset SCARA..." >/dev/null
|
140
|
|
141
|
|
|
|
142
|
+ # Reset all TPARA configs to the default cartesian
|
|
|
143
|
+ find "$CEXA/TPARA" -name $BC \
|
|
|
144
|
+ | while read -d $'\0' F ; do cp "$CDEF/$BC" "$F" ; done
|
|
|
145
|
+ find "$CEXA/TPARA" -name $AC \
|
|
|
146
|
+ | while read -d $'\0' F ; do cp "$CDEF/$AC" "$F" ; done
|
|
|
147
|
+
|
|
|
148
|
+ # DEBUG: Commit the TPARA reset for review
|
|
|
149
|
+ ((COMMIT_STEPS)) && git add . >/dev/null && git commit -m "Reset TPARA..." >/dev/null
|
|
|
150
|
+
|
141
|
# Update the %VERSION% in the README.md file
|
151
|
# Update the %VERSION% in the README.md file
|
142
|
SED=$(which gsed || which sed)
|
152
|
SED=$(which gsed || which sed)
|
143
|
VERS=$( echo $EXPORT | $SED 's/release-//' )
|
153
|
VERS=$( echo $EXPORT | $SED 's/release-//' )
|