Bump
This commit is contained in:
@@ -2,10 +2,10 @@
|
||||
#
|
||||
# generate_version
|
||||
#
|
||||
# Make a _Version.h file
|
||||
# Make a Version.h file to accompany CUSTOM_VERSION_FILE
|
||||
#
|
||||
|
||||
DIR=${1:-"Marlin/src/inc"}
|
||||
DIR=${1:-"Marlin"}
|
||||
|
||||
# MRCC3=$( git merge-base HEAD upstream/bugfix-2.0.x 2>/dev/null )
|
||||
# MRCC2=$( git merge-base HEAD upstream/bugfix-1.1.x 2>/dev/null )
|
||||
@@ -44,7 +44,30 @@ SOURCE_CODE_URL=$(awk -F'"' \
|
||||
WEBSITE_URL=$(awk -F'"' \
|
||||
'/#define WEBSITE_URL/{ print $2 }' < "${DIR}/Version.h")
|
||||
|
||||
cat > "${DIR}/_Version.h" <<EOF
|
||||
cat > "${DIR}/Version.h" <<EOF
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2019 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||
*
|
||||
* Based on Sprinter and grbl.
|
||||
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* THIS FILE IS AUTOMATICALLY GENERATED DO NOT MANUALLY EDIT IT.
|
||||
* IT DOES NOT GET COMMITTED TO THE REPOSITORY.
|
||||
@@ -53,15 +76,69 @@ cat > "${DIR}/_Version.h" <<EOF
|
||||
* Version: ${VERSION}
|
||||
*/
|
||||
|
||||
#define BUILD_UNIX_DATETIME "${BUILDATE}"
|
||||
#define STRING_DISTRIBUTION_DATE "${DISTDATE}"
|
||||
/**
|
||||
* Marlin release version identifier
|
||||
*/
|
||||
#ifndef SHORT_BUILD_VERSION
|
||||
#define SHORT_BUILD_VERSION "${SHORT_BUILD_VERSION}"
|
||||
#endif
|
||||
|
||||
#define SHORT_BUILD_VERSION "${SHORT_BUILD_VERSION}"
|
||||
#define DETAILED_BUILD_VERSION "${DETAILED_BUILD_VERSION}"
|
||||
/**
|
||||
* Verbose version identifier which should contain a reference to the location
|
||||
* from where the binary was downloaded or the source code was compiled.
|
||||
*/
|
||||
#ifndef DETAILED_BUILD_VERSION
|
||||
#define DETAILED_BUILD_VERSION "${DETAILED_BUILD_VERSION}"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* The STRING_DISTRIBUTION_DATE represents when the binary file was built,
|
||||
* here we define this default string as the date where the latest release
|
||||
* version was tagged.
|
||||
*/
|
||||
#ifndef STRING_DISTRIBUTION_DATE
|
||||
#define STRING_DISTRIBUTION_DATE "${DISTDATE}"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* The protocol for communication to the host. Protocol indicates communication
|
||||
* standards such as the use of ASCII, "echo:" and "error:" line prefixes, etc.
|
||||
* (Other behaviors are given by the firmware version and capabilities report.)
|
||||
*/
|
||||
#ifndef PROTOCOL_VERSION
|
||||
#define PROTOCOL_VERSION "${PROTOCOL_VERSION}"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Defines a generic printer name to be output to the LCD after booting Marlin.
|
||||
*/
|
||||
#ifndef MACHINE_NAME
|
||||
#define MACHINE_NAME "${MACHINE_NAME}"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* The SOURCE_CODE_URL is the location where users will find the Marlin Source
|
||||
* Code which is installed on the device. In most cases —unless the manufacturer
|
||||
* has a distinct Github fork— the Source Code URL should just be the main
|
||||
* Marlin repository.
|
||||
*/
|
||||
#ifndef SOURCE_CODE_URL
|
||||
#define SOURCE_CODE_URL "${SOURCE_CODE_URL}"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Default generic printer UUID.
|
||||
*/
|
||||
#ifndef DEFAULT_MACHINE_UUID
|
||||
#define DEFAULT_MACHINE_UUID "${DEFAULT_MACHINE_UUID}"
|
||||
#endif
|
||||
|
||||
/**
|
||||
* The WEBSITE_URL is the location where users can get more information such as
|
||||
* documentation about a specific Marlin release.
|
||||
*/
|
||||
#ifndef WEBSITE_URL
|
||||
#define WEBSITE_URL "${WEBSITE_URL}"
|
||||
#endif
|
||||
|
||||
#define PROTOCOL_VERSION "${PROTOCOL_VERSION}"
|
||||
#define MACHINE_NAME "${MACHINE_NAME}"
|
||||
#define SOURCE_CODE_URL "${SOURCE_CODE_URL}"
|
||||
#define DEFAULT_MACHINE_UUID "${DEFAULT_MACHINE_UUID}"
|
||||
#define WEBSITE_URL "${WEBSITE_URL}"
|
||||
EOF
|
||||
|
||||
+1
-1
@@ -5,4 +5,4 @@ for define in env['CPPDEFINES']:
|
||||
if define[0] == "VECT_TAB_ADDR":
|
||||
env['CPPDEFINES'].remove(define)
|
||||
env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08007000"))
|
||||
env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/STM32F1_SKR_MINI.ld")
|
||||
env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/STM32F103RC_SKR_MINI.ld")
|
||||
+1
-1
@@ -5,7 +5,7 @@ for define in env['CPPDEFINES']:
|
||||
if define[0] == "VECT_TAB_ADDR":
|
||||
env['CPPDEFINES'].remove(define)
|
||||
env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
|
||||
env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/longer_STM32.ld")
|
||||
env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/STM32F103VE_longer.ld")
|
||||
|
||||
# Rename ${PROGNAME}.bin and save it as 'project.bin' (No encryption on the Longer3D)
|
||||
def encrypt(source, target, env):
|
||||
@@ -10,6 +10,7 @@ env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/mks_robin.ld")
|
||||
# Encrypt ${PROGNAME}.bin and save it as 'Robin.bin'
|
||||
def encrypt(source, target, env):
|
||||
import os
|
||||
import sys
|
||||
|
||||
key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
|
||||
|
||||
@@ -22,6 +23,8 @@ def encrypt(source, target, env):
|
||||
byte = firmware.read(1)
|
||||
if position >= 320 and position < 31040:
|
||||
byte = chr(ord(byte) ^ key[position & 31])
|
||||
if sys.version_info[0] > 2:
|
||||
byte = bytes(byte, 'latin1')
|
||||
robin.write(byte)
|
||||
position += 1
|
||||
finally:
|
||||
|
||||
@@ -10,6 +10,7 @@ env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/mks_robin_lite.l
|
||||
# Encrypt ${PROGNAME}.bin and save it as 'mksLite.bin'
|
||||
def encrypt(source, target, env):
|
||||
import os
|
||||
import sys
|
||||
|
||||
key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
|
||||
|
||||
@@ -22,6 +23,8 @@ def encrypt(source, target, env):
|
||||
byte = firmware.read(1)
|
||||
if position >= 320 and position < 31040:
|
||||
byte = chr(ord(byte) ^ key[position & 31])
|
||||
if sys.version_info[0] > 2:
|
||||
byte = bytes(byte, 'latin1')
|
||||
robin.write(byte)
|
||||
position += 1
|
||||
finally:
|
||||
|
||||
@@ -10,6 +10,7 @@ env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/mks_robin_mini.l
|
||||
# Encrypt ${PROGNAME}.bin and save it as 'Robin_mini.bin'
|
||||
def encrypt(source, target, env):
|
||||
import os
|
||||
import sys
|
||||
|
||||
key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
|
||||
|
||||
@@ -22,6 +23,8 @@ def encrypt(source, target, env):
|
||||
byte = firmware.read(1)
|
||||
if position >= 320 and position < 31040:
|
||||
byte = chr(ord(byte) ^ key[position & 31])
|
||||
if sys.version_info[0] > 2:
|
||||
byte = bytes(byte, 'latin1')
|
||||
robin.write(byte)
|
||||
position += 1
|
||||
finally:
|
||||
|
||||
@@ -10,6 +10,7 @@ env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/mks_robin_nano.l
|
||||
# Encrypt ${PROGNAME}.bin and save it as 'Robin_nano.bin'
|
||||
def encrypt(source, target, env):
|
||||
import os
|
||||
import sys
|
||||
|
||||
key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
|
||||
|
||||
@@ -22,6 +23,8 @@ def encrypt(source, target, env):
|
||||
byte = firmware.read(1)
|
||||
if position >= 320 and position < 31040:
|
||||
byte = chr(ord(byte) ^ key[position & 31])
|
||||
if sys.version_info[0] > 2:
|
||||
byte = bytes(byte, 'latin1')
|
||||
robin.write(byte)
|
||||
position += 1
|
||||
finally:
|
||||
|
||||
@@ -62,7 +62,7 @@ OLDWD=`pwd`
|
||||
#
|
||||
# By default loop through all languages
|
||||
#
|
||||
LANGS_DEFAULT="an bg ca cz da de el el-gr en es eu fi fr gl hr it jp-kana ko_KR nl pl pt pt-br ru sk tr uk vi zh_CN zh_TW test"
|
||||
LANGS_DEFAULT="an bg ca cz da de el el_gr en es eu fi fr gl hr it jp_kana ko_KR nl pl pt pt_br ru sk tr uk vi zh_CN zh_TW test"
|
||||
|
||||
#
|
||||
# Generate data for language list MARLIN_LANGS or all if not provided
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -16,13 +16,15 @@ BRANCH=${INFO[5]}
|
||||
|
||||
git push --set-upstream origin $BRANCH
|
||||
|
||||
TOOL=$(which gnome-open xdg-open open | awk '{ print $1 }')
|
||||
which xdg-open >/dev/null && TOOL=xdg-open
|
||||
which gnome-open >/dev/null && TOOL=gnome-open
|
||||
which open >/dev/null && TOOL=open
|
||||
URL="https://github.com/$FORK/$REPO/commits/$BRANCH"
|
||||
|
||||
if [ -z "$TOOL" ]; then
|
||||
if [ -z "$OPEN" ]; then
|
||||
echo "Can't find a tool to open the URL:"
|
||||
echo $URL
|
||||
else
|
||||
echo "Viewing commits on $BRANCH..."
|
||||
"$TOOL" "$URL"
|
||||
"$OPEN" "$URL"
|
||||
fi
|
||||
|
||||
@@ -16,14 +16,16 @@ BRANCH=${INFO[5]}
|
||||
[[ $ORG == "MarlinFirmware" && $REPO == "MarlinDocumentation" ]] || { echo "Wrong repository." 1>&2; exit 1; }
|
||||
|
||||
opensite() {
|
||||
TOOL=$(which gnome-open xdg-open open | awk '{ print $1 }')
|
||||
which xdg-open >/dev/null && TOOL=xdg-open
|
||||
which gnome-open >/dev/null && TOOL=gnome-open
|
||||
which open >/dev/null && TOOL=open
|
||||
URL="http://127.0.0.1:4000/"
|
||||
if [ -z "$TOOL" ]; then
|
||||
if [ -z "$OPEN" ]; then
|
||||
echo "Can't find a tool to open the URL:"
|
||||
echo $URL
|
||||
else
|
||||
echo "Opening preview site in the browser..."
|
||||
"$TOOL" "$URL"
|
||||
"$OPEN" "$URL"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -23,15 +23,17 @@ OLDBRANCH=${INFO[5]}
|
||||
# See if it's been pushed yet
|
||||
if [ -z "$(git branch -vv | grep ^\* | grep \\[origin)" ]; then firstpush; fi
|
||||
|
||||
TOOL=$(which gnome-open xdg-open open | awk '{ print $1 }')
|
||||
which xdg-open >/dev/null && TOOL=xdg-open
|
||||
which gnome-open >/dev/null && TOOL=gnome-open
|
||||
which open >/dev/null && TOOL=open
|
||||
URL="https://github.com/$ORG/$REPO/compare/$TARG...$FORK:$BRANCH?expand=1"
|
||||
|
||||
if [ -z "$TOOL" ]; then
|
||||
if [ -z "$OPEN" ]; then
|
||||
echo "Can't find a tool to open the URL:"
|
||||
echo $URL
|
||||
else
|
||||
echo "Opening a New PR Form..."
|
||||
"$TOOL" "$URL"
|
||||
"$OPEN" "$URL"
|
||||
fi
|
||||
|
||||
[[ $BRANCH != $OLDBRANCH ]] && git checkout $OLDBRANCH
|
||||
|
||||
@@ -77,15 +77,17 @@ else
|
||||
git push -f origin
|
||||
fi
|
||||
|
||||
TOOL=$(which gnome-open xdg-open open | awk '{ print $1 }')
|
||||
which xdg-open >/dev/null && TOOL=xdg-open
|
||||
which gnome-open >/dev/null && TOOL=gnome-open
|
||||
which open >/dev/null && TOOL=open
|
||||
URL="https://github.com/$ORG/$REPO/compare/$TARG...$FORK:$BRANCH?expand=1"
|
||||
|
||||
if [ -z "$TOOL" ]; then
|
||||
if [ -z "$OPEN" ]; then
|
||||
echo "Can't find a tool to open the URL:"
|
||||
echo $URL
|
||||
else
|
||||
echo "Opening a New PR Form..."
|
||||
"$TOOL" "$URL"
|
||||
"$OPEN" "$URL"
|
||||
fi
|
||||
|
||||
fi
|
||||
@@ -116,14 +118,16 @@ git checkout gh-pages || { echo "Something went wrong!"; exit 1; }
|
||||
rsync -av ${TMPFOLDER}/ ./
|
||||
|
||||
opensite() {
|
||||
TOOL=$(which gnome-open xdg-open open | awk '{ print $1 }')
|
||||
which xdg-open >/dev/null && TOOL=xdg-open
|
||||
which gnome-open >/dev/null && TOOL=gnome-open
|
||||
which open >/dev/null && TOOL=open
|
||||
URL="http://marlinfw.org/"
|
||||
if [ -z "$TOOL" ]; then
|
||||
if [ -z "$OPEN" ]; then
|
||||
echo "Can't find a tool to open the URL:"
|
||||
echo $URL
|
||||
else
|
||||
echo "Opening the site in the browser..."
|
||||
"$TOOL" "$URL"
|
||||
"$OPEN" "$URL"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -11,11 +11,13 @@ MFINFO=$(mfinfo) || exit 1
|
||||
[[ -d Marlin/src ]] || { echo "Please 'cd' up to repo root." ; exit 1 ; }
|
||||
|
||||
TESTPATH=buildroot/share/tests
|
||||
STATE_FILE=$( echo ./.pio/.mftestrc )
|
||||
|
||||
shopt -s extglob nocasematch
|
||||
|
||||
# Get test
|
||||
# Get the environment and test number from the command
|
||||
TESTENV=${1:-'-'}
|
||||
CHOICE=${2:-0}
|
||||
|
||||
# Allow shorthand for test name
|
||||
case $TESTENV in
|
||||
@@ -28,8 +30,8 @@ case $TESTENV in
|
||||
m128) TESTENV='megaatmega1280' ;;
|
||||
m256) TESTENV='megaatmega2560' ;;
|
||||
mega) TESTENV='megaatmega2560' ;;
|
||||
stm) TESTENV='STM32F103R' ;;
|
||||
f1) TESTENV='STM32F103R' ;;
|
||||
stm) TESTENV='STM32F103RE' ;;
|
||||
f1) TESTENV='STM32F103RE' ;;
|
||||
f4) TESTENV='STM32F4' ;;
|
||||
f7) TESTENV='STM32F7' ;;
|
||||
teensy) TESTENV='teensy31' ;;
|
||||
@@ -37,6 +39,15 @@ case $TESTENV in
|
||||
t32) TESTENV='teensy31' ;;
|
||||
t35) TESTENV='teensy35' ;;
|
||||
t36) TESTENV='teensy35' ;;
|
||||
# Build with the last-built env
|
||||
-r) [[ -f "$STATE_FILE" ]] || { echo "No previous (-r) build state found." ; exit 1 ; }
|
||||
read TESTENV <"$STATE_FILE"
|
||||
platformio run --project-dir . -e $TESTENV
|
||||
exit
|
||||
;;
|
||||
# A -y may come first
|
||||
-y) TESTENV=${2:-'-'} ; CHOICE=${3:-0} ;;
|
||||
-[a-z]) echo "Unknown flag $TESTENV" ; exit 1 ;;
|
||||
-) ;;
|
||||
esac
|
||||
|
||||
@@ -77,9 +88,6 @@ OUT=$( cat $TESTPATH/$TESTENV-tests 2>/dev/null ) || { echo "Can't find test '$T
|
||||
# TODO: List test descriptions with numbers
|
||||
TESTCOUNT=$( awk "/$ISEXEC/{a++}END{print a}" <<<"$OUT" )
|
||||
|
||||
# Get the entered or interactive test index
|
||||
CHOICE=${2:-0}
|
||||
|
||||
# User entered a number?
|
||||
(( CHOICE && CHOICE > TESTCOUNT )) && { echo "Invalid test index '$CHOICE' (1-$TESTCOUNT)." ; exit 1 ; }
|
||||
|
||||
@@ -135,6 +143,16 @@ echo "$OUT" | {
|
||||
done
|
||||
}
|
||||
|
||||
# Get a -y parameter the lazy way
|
||||
[[ "$2" == "-y" || "$3" == "-y" ]] && BUILD_YES='Y'
|
||||
|
||||
# Build the test too?
|
||||
echo ; read -p "Build $TESTENV test #$CHOICE (y/N) ? " BUILD_YES
|
||||
[[ $BUILD_YES == 'Y' || $BUILD_YES == 'Yes' ]] && platformio run --project-dir . -e $TESTENV
|
||||
if [[ $BUILD_YES != 'Y' ]]; then
|
||||
echo
|
||||
read -p "Build $TESTENV test #$CHOICE (y/N) ? " BUILD_YES
|
||||
fi
|
||||
|
||||
[[ $BUILD_YES == 'Y' || $BUILD_YES == 'Yes' ]] && {
|
||||
platformio run --project-dir . -e $TESTENV
|
||||
echo "$TESTENV" >"$STATE_FILE"
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@ set -e
|
||||
backup_ramps # pins_set is used below...
|
||||
|
||||
restore_configs
|
||||
opt_set LCD_LANGUAGE bg
|
||||
opt_set MOTHERBOARD BOARD_RAMPS4DUE_EFB
|
||||
opt_set TEMP_SENSOR_0 -2
|
||||
opt_set TEMP_SENSOR_BED 2
|
||||
@@ -23,7 +24,7 @@ opt_enable S_CURVE_ACCELERATION EEPROM_SETTINGS GCODE_MACROS \
|
||||
AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
|
||||
SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE CALIBRATION_GCODE \
|
||||
BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
|
||||
FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
|
||||
FWRETRACT ARC_SUPPORT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
|
||||
PSU_CONTROL AUTO_POWER_CONTROL \
|
||||
SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER \
|
||||
PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL \
|
||||
@@ -37,8 +38,10 @@ exec_test $1 $2 "RAMPS4DUE_EFB with ABL (Bilinear), EXTENSIBLE_UI, S-Curve, many
|
||||
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_RADDS
|
||||
opt_enable USE_XMAX_PLUG USE_YMAX_PLUG BLTOUCH AUTO_BED_LEVELING_BILINEAR \
|
||||
Z_TRIPLE_STEPPER_DRIVERS Z_TRIPLE_ENDSTOPS Z_STEPPER_AUTO_ALIGN ENDSTOPPULLUPS
|
||||
opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
|
||||
Z_TRIPLE_STEPPER_DRIVERS Z_TRIPLE_ENDSTOPS Z_STEPPER_AUTO_ALIGN \
|
||||
Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS
|
||||
#LULZBOT_TOUCH_UI LCD_ALEPHOBJECTS_CLCD_UI OTHER_PIN_LAYOUT
|
||||
opt_add Z2_MAX_ENDSTOP_INVERTING false
|
||||
opt_add Z3_MAX_ENDSTOP_INVERTING false
|
||||
pins_set ramps/RAMPS X_MAX_PIN -1
|
||||
@@ -51,6 +54,7 @@ exec_test $1 $2 "RADDS with ABL (Bilinear), Z_TRIPLE_STEPPER_DRIVERS and Z_STEPP
|
||||
# Test SWITCHING_EXTRUDER
|
||||
#
|
||||
restore_configs
|
||||
opt_set LCD_LANGUAGE fi
|
||||
opt_set MOTHERBOARD BOARD_RAMPS4DUE_EEF
|
||||
opt_set EXTRUDERS 2
|
||||
opt_set NUM_SERVOS 1
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build tests for STM32F1 malyanM200
|
||||
# Build tests for STM32F103CB Malyan M200
|
||||
#
|
||||
|
||||
# exit on first failure
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build tests for STM32F1 Bigtreetech (SKR Mini v1.1)
|
||||
# Build tests for STM32F103RC Bigtreetech (SKR Mini v1.1)
|
||||
#
|
||||
|
||||
# exit on first failure
|
||||
@@ -0,0 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build tests for STM32F103RC Bigtreetech (SKR Mini E3)
|
||||
#
|
||||
|
||||
# exit on first failure
|
||||
set -e
|
||||
|
||||
#
|
||||
# Build with the default configurations
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_BIGTREE_SKR_MINI_E3
|
||||
opt_set SERIAL_PORT 1
|
||||
opt_set SERIAL_PORT_2 -1
|
||||
exec_test $1 $2 "Bigtreetech SKR Mini E3 - Basic Configuration"
|
||||
|
||||
# clean up
|
||||
restore_configs
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build tests for STM32F1 FYSETC
|
||||
# Build tests for STM32F103RC FYSETC
|
||||
#
|
||||
|
||||
# exit on first failure
|
||||
@@ -10,7 +10,7 @@ set -e
|
||||
# Build with the default configurations
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_STM32F103R
|
||||
opt_set MOTHERBOARD BOARD_STM32F103RE
|
||||
opt_set EXTRUDERS 2
|
||||
opt_set SERIAL_PORT -1
|
||||
opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT \
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Build tests for esp32
|
||||
# Build tests for ESP32
|
||||
#
|
||||
|
||||
# exit on first failure
|
||||
@@ -10,7 +10,7 @@ set -e
|
||||
# Build with the default configurations
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_ESP32
|
||||
opt_set MOTHERBOARD BOARD_ESPRESSIF_ESP32
|
||||
opt_enable WIFISUPPORT GCODE_MACROS BAUD_RATE_GCODE
|
||||
opt_set "WIFI_SSID \"ssid\""
|
||||
opt_set "WIFI_PWD \"password\""
|
||||
|
||||
@@ -16,6 +16,7 @@ set -e
|
||||
# Test MESH_BED_LEVELING feature, with LCD
|
||||
#
|
||||
restore_configs
|
||||
opt_set LCD_LANGUAGE an
|
||||
opt_enable SPINDLE_FEATURE ULTIMAKERCONTROLLER LCD_BED_LEVELING \
|
||||
MESH_BED_LEVELING ENABLE_LEVELING_FADE_HEIGHT MESH_G28_REST_ORIGIN \
|
||||
G26_MESH_VALIDATION MESH_EDIT_MENU
|
||||
|
||||
@@ -25,22 +25,25 @@ opt_set TEMP_SENSOR_1 1
|
||||
opt_set TEMP_SENSOR_BED 2
|
||||
opt_set GRID_MAX_POINTS_X 16
|
||||
opt_set FANMUX0_PIN 53
|
||||
opt_disable USE_WATCHDOG
|
||||
opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER LCD_PROGRESS_BAR LCD_PROGRESS_BAR_TEST \
|
||||
PIDTEMPBED FIX_MOUNTED_PROBE Z_SAFE_HOMING CODEPENDENT_XY_HOMING \
|
||||
EEPROM_SETTINGS SDSUPPORT SD_REPRINT_LAST_SELECTED_FILE BINARY_FILE_TRANSFER \
|
||||
BLINKM PCA9632 RGB_LED RGB_LED_R_PIN RGB_LED_G_PIN RGB_LED_B_PIN LED_CONTROL_MENU \
|
||||
NEOPIXEL_LED CASE_LIGHT_ENABLE CASE_LIGHT_USE_NEOPIXEL CASE_LIGHT_MENU \
|
||||
NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE FILAMENT_RUNOUT_DISTANCE_MM FILAMENT_RUNOUT_SENSOR \
|
||||
AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
|
||||
PID_PARAMS_PER_HOTEND PID_AUTOTUNE_MENU PID_EDIT_MENU \
|
||||
NOZZLE_PARK_FEATURE FILAMENT_RUNOUT_SENSOR FILAMENT_RUNOUT_DISTANCE_MM \
|
||||
ADVANCED_PAUSE_FEATURE FILAMENT_LOAD_UNLOAD_GCODES FILAMENT_UNLOAD_ALL_EXTRUDERS \
|
||||
AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DISTINCT_E_FACTORS \
|
||||
SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE \
|
||||
BACKLASH_COMPENSATION BACKLASH_GCODE BAUD_RATE_GCODE BEZIER_CURVE_SUPPORT \
|
||||
FWRETRACT ARC_P_CIRCLES CNC_WORKSPACE_PLANES CNC_COORDINATE_SYSTEMS \
|
||||
PSU_CONTROL AUTO_POWER_CONTROL POWER_LOSS_RECOVERY POWER_LOSS_PIN POWER_LOSS_STATE \
|
||||
SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER \
|
||||
SLOW_PWM_HEATERS THERMAL_PROTECTION_CHAMBER LIN_ADVANCE \
|
||||
PINS_DEBUGGING MAX7219_DEBUG M114_DETAIL
|
||||
opt_set TEMP_SENSOR_CHAMBER 3
|
||||
opt_set HEATER_CHAMBER_PIN 45
|
||||
exec_test $1 $2 "RAMPS with 2 extruders, RepRap LCD, Linear ABL, LEDs, and many options"
|
||||
exec_test $1 $2 "RAMPS, 2 extruders, LCD/SD, Probe, ABL-Linear, PLR, LEDs, many options"
|
||||
|
||||
#
|
||||
# Test a probeless build of AUTO_BED_LEVELING_UBL, with lots of extruders
|
||||
@@ -48,6 +51,7 @@ exec_test $1 $2 "RAMPS with 2 extruders, RepRap LCD, Linear ABL, LEDs, and many
|
||||
use_example_configs AnimationExample
|
||||
opt_set SHOW_CUSTOM_BOOTSCREEN
|
||||
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
|
||||
opt_set LCD_LANGUAGE fr
|
||||
opt_set EXTRUDERS 5
|
||||
opt_set TEMP_SENSOR_1 1
|
||||
opt_set TEMP_SENSOR_2 5
|
||||
@@ -58,7 +62,8 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU
|
||||
REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING BOOT_MARLIN_LOGO_SMALL \
|
||||
SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT SCROLL_LONG_FILENAMES \
|
||||
EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \
|
||||
MULTI_NOZZLE_DUPLICATION JUNCTION_DEVIATION LIN_ADVANCE QUICK_HOME \
|
||||
MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE QUICK_HOME \
|
||||
LCD_SET_PROGRESS_MANUALLY PRINT_PROGRESS_SHOW_DECIMALS SHOW_REMAINING_TIME \
|
||||
BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
|
||||
exec_test $1 $2 "Azteeg X3 Pro with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more"
|
||||
|
||||
@@ -66,7 +71,7 @@ exec_test $1 $2 "Azteeg X3 Pro with 5 extruders, RRDFGSC, probeless UBL, Linear
|
||||
# Add a Sled Z Probe, use UBL Cartesian moves, use Japanese language
|
||||
#
|
||||
opt_enable Z_PROBE_SLED SKEW_CORRECTION SKEW_CORRECTION_FOR_Z SKEW_CORRECTION_GCODE
|
||||
opt_set LCD_LANGUAGE jp-kana
|
||||
opt_set LCD_LANGUAGE jp_kana
|
||||
opt_disable SEGMENT_LEVELED_MOVES
|
||||
opt_enable BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET DOUBLECLICK_FOR_Z_BABYSTEPPING BABYSTEP_HOTEND_Z_OFFSET BABYSTEP_DISPLAY_TOTAL M114_DETAIL
|
||||
exec_test $1 $2 "... Sled Z Probe, Skew, UBL Cartesian moves, Japanese, and Z probe BABYSTEPPING"
|
||||
@@ -76,10 +81,11 @@ exec_test $1 $2 "... Sled Z Probe, Skew, UBL Cartesian moves, Japanese, and Z pr
|
||||
# ...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES
|
||||
#
|
||||
restore_configs
|
||||
opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
|
||||
AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL
|
||||
opt_set LCD_LANGUAGE zh_CN
|
||||
opt_set NUM_SERVOS 1
|
||||
opt_enable NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK
|
||||
opt_enable ZONESTAR_LCD Z_PROBE_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE BOOT_MARLIN_LOGO_ANIMATED \
|
||||
AUTO_BED_LEVELING_3POINT DEBUG_LEVELING_FEATURE EEPROM_SETTINGS EEPROM_CHITCHAT M114_DETAIL \
|
||||
NO_VOLUMETRICS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES AUTOTEMP G38_PROBE_TARGET JOYSTICK
|
||||
exec_test $1 $2 "RAMPS with ZONESTAR_LCD, Servo Probe, 3-Point ABL, DEBUG_LEVELING_FEATURE, EEPROM, G38, and more"
|
||||
|
||||
#
|
||||
@@ -87,6 +93,7 @@ exec_test $1 $2 "RAMPS with ZONESTAR_LCD, Servo Probe, 3-Point ABL, DEBUG_LEVELI
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_MINIRAMBO
|
||||
opt_set LCD_LANGUAGE de
|
||||
opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT \
|
||||
ULTIMAKERCONTROLLER SDSUPPORT PCA9632 LCD_INFO_MENU \
|
||||
AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
|
||||
@@ -104,6 +111,7 @@ exec_test $1 $2 "MINIRAMBO with M100, PWM_MOTOR_CURRENT, PRINTCOUNTER, etc."
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
|
||||
opt_set LCD_LANGUAGE el_gr
|
||||
opt_enable MIXING_EXTRUDER GRADIENT_MIX GRADIENT_VTOOL CR10_STOCKDISPLAY
|
||||
opt_set MIXING_STEPPERS 5
|
||||
opt_set LCD_LANGUAGE ru
|
||||
@@ -114,6 +122,7 @@ exec_test $1 $2 "Mixing Extruder with 5 steppers, Cyrillic"
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_RUMBA
|
||||
opt_set LCD_LANGUAGE pt
|
||||
opt_set EXTRUDERS 2
|
||||
opt_set TEMP_SENSOR_1 1
|
||||
opt_enable USE_XMAX_PLUG DUAL_X_CARRIAGE
|
||||
@@ -140,6 +149,7 @@ exec_test $1 $2 "DUAL_X_CARRIAGE"
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
|
||||
opt_set LCD_LANGUAGE it
|
||||
opt_set EXTRUDERS 2
|
||||
opt_set TEMP_SENSOR_1 -4
|
||||
opt_set SERVO_DELAY "{ 300, 300, 300 }"
|
||||
@@ -243,11 +253,11 @@ exec_test $1 $2 "Many less common options"
|
||||
#
|
||||
#restore_configs
|
||||
#opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT
|
||||
#for lang in an bg ca cz da de el el-gr en es eu fi fr gl hr it jp-kana nl pl pt pt-br ru sk tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff"; done
|
||||
#for lang in an bg ca cz da de el el_gr en es eu fi fr gl hr it jp_kana nl pl pt pt_br ru sk tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff"; done
|
||||
#
|
||||
#restore_configs
|
||||
#opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER SDSUPPORT
|
||||
#for lang in an bg ca cz da de el el-gr en es eu fi fr gl hr it jp-kana nl pl pt pt-br ru sk tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff"; done
|
||||
#for lang in an bg ca cz da de el el_gr en es eu fi fr gl hr it jp_kana nl pl pt pt_br ru sk tr uk vi zh_CN zh_TW test; do opt_set LCD_LANGUAGE $lang; echo "compile with language $lang ..."; exec_test $1 $2 "Stuff"; done
|
||||
|
||||
######## Example Configurations ##############
|
||||
#
|
||||
@@ -265,6 +275,7 @@ exec_test $1 $2 "Full-featured CR-10S config"
|
||||
#
|
||||
# Delta Config (generic) + ABL bilinear + BLTOUCH
|
||||
use_example_configs delta/generic
|
||||
opt_set LCD_LANGUAGE cz
|
||||
opt_enable REPRAP_DISCOUNT_SMART_CONTROLLER DELTA_CALIBRATION_MENU AUTO_BED_LEVELING_BILINEAR BLTOUCH BLTOUCH_FORCE_5V_MODE
|
||||
exec_test $1 $2 "Delta Config (generic) + ABL bilinear + BLTOUCH"
|
||||
|
||||
@@ -272,6 +283,7 @@ exec_test $1 $2 "Delta Config (generic) + ABL bilinear + BLTOUCH"
|
||||
# Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS
|
||||
#
|
||||
use_example_configs delta/generic
|
||||
opt_set LCD_LANGUAGE ko_KR
|
||||
opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 Z_PROBE_ALLEN_KEY EEPROM_SETTINGS EEPROM_CHITCHAT \
|
||||
OLED_PANEL_TINYBOY2 MESH_EDIT_GFX_OVERLAY
|
||||
exec_test $1 $2 "Delta Config (generic) + UBL + ALLEN_KEY + OLED_PANEL_TINYBOY2 + EEPROM_SETTINGS"
|
||||
@@ -292,6 +304,7 @@ exec_test $1 $2 "Delta Config (FLSUN AC because it's complex)"
|
||||
# SCARA with TMC2130
|
||||
#
|
||||
use_example_configs SCARA
|
||||
opt_set LCD_LANGUAGE es
|
||||
opt_enable USE_ZMIN_PLUG FIX_MOUNTED_PROBE AUTO_BED_LEVELING_BILINEAR PAUSE_BEFORE_DEPLOY_STOW \
|
||||
EEPROM_SETTINGS EEPROM_CHITCHAT ULTIMAKERCONTROLLER M114_DETAIL \
|
||||
MONITOR_DRIVER_STATUS STEALTHCHOP_XY STEALTHCHOP_Z STEALTHCHOP_E HYBRID_THRESHOLD SENSORLESS_HOMING SQUARE_WAVE_STEPPING
|
||||
@@ -306,6 +319,7 @@ exec_test $1 $2 "SCARA with TMC2130, TMC2209, and TMC2660"
|
||||
# Test mixed TMC config
|
||||
#
|
||||
restore_configs
|
||||
opt_set LCD_LANGUAGE vi
|
||||
opt_set X_DRIVER_TYPE TMC2160
|
||||
opt_set Y_DRIVER_TYPE TMC5160
|
||||
opt_set Z_DRIVER_TYPE TMC2208
|
||||
|
||||
@@ -13,14 +13,14 @@ opt_set MOTHERBOARD BOARD_TEENSY31_32
|
||||
exec_test $1 $2 "Teensy3.1 with default config"
|
||||
|
||||
#
|
||||
# Test as many features together as possible
|
||||
# Test many features together
|
||||
#
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_TEENSY31_32
|
||||
opt_set TEMP_SENSOR_0 1
|
||||
opt_set TEMP_SENSOR_BED 1
|
||||
opt_enable EEPROM_SETTINGS FILAMENT_WIDTH_SENSOR CALIBRATION_GCODE BAUD_RATE_GCODE \
|
||||
FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
|
||||
FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR DEBUG_LEVELING_FEATURE Z_MIN_PROBE_REPEATABILITY_TEST \
|
||||
BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET PRINTCOUNTER SLOW_PWM_HEATERS PIDTEMPBED \
|
||||
INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
|
||||
NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE PARK_HEAD_ON_PAUSE \
|
||||
|
||||
@@ -34,7 +34,7 @@ Before you install AutoBuildMarlin you'll first need to [Install PlatformIO in V
|
||||
|
||||
Icon|Action
|
||||
----|------
|
||||
|Start **PIO Build** to test your Marlin build
|
||||
|Start **PIO Clean** to delete old build files
|
||||
|Start **PIO Upload** to install Marlin on your board
|
||||
|Start **PIO Upload (traceback)** to install Marlin with debugging
|
||||
|Start **Marlin Build** to test your Marlin build
|
||||
|Start **Marlin Upload** to install Marlin on your board
|
||||
|Start **Marlin Upload (traceback)** to install Marlin with debugging
|
||||
|Start **Marlin Clean** to delete old build files
|
||||
|
||||
@@ -7,34 +7,34 @@ function activate(context) {
|
||||
console.log('Extension "AutoBuildMarlin" is now active!');
|
||||
|
||||
var NEXT_TERM_ID = 1;
|
||||
var pio_build = vscode.commands.registerCommand('piobuild', function () {
|
||||
var mf_build = vscode.commands.registerCommand('mfbuild', function () {
|
||||
vscode.commands.executeCommand('workbench.action.files.saveAll');
|
||||
const terminal = vscode.window.createTerminal(`AB Build #${NEXT_TERM_ID++}`);
|
||||
const terminal = vscode.window.createTerminal(`Marlin Build #${NEXT_TERM_ID++}`);
|
||||
terminal.show(true);
|
||||
terminal.sendText("python buildroot/share/atom/auto_build.py build");
|
||||
});
|
||||
var pio_clean = vscode.commands.registerCommand('pioclean', function () {
|
||||
const terminal = vscode.window.createTerminal(`AB Clean #${NEXT_TERM_ID++}`);
|
||||
terminal.show(true);
|
||||
terminal.sendText("python buildroot/share/atom/auto_build.py clean");
|
||||
});
|
||||
var pio_upload = vscode.commands.registerCommand('pioupload', function () {
|
||||
var mf_upload = vscode.commands.registerCommand('mfupload', function () {
|
||||
vscode.commands.executeCommand('workbench.action.files.saveAll');
|
||||
const terminal = vscode.window.createTerminal(`AB Upload #${NEXT_TERM_ID++}`);
|
||||
const terminal = vscode.window.createTerminal(`Marlin Upload #${NEXT_TERM_ID++}`);
|
||||
terminal.show(true);
|
||||
terminal.sendText("python buildroot/share/atom/auto_build.py upload");
|
||||
});
|
||||
var pio_traceback = vscode.commands.registerCommand('piotraceback', function () {
|
||||
var mf_traceback = vscode.commands.registerCommand('mftraceback', function () {
|
||||
vscode.commands.executeCommand('workbench.action.files.saveAll');
|
||||
const terminal = vscode.window.createTerminal(`AB Traceback #${NEXT_TERM_ID++}`);
|
||||
const terminal = vscode.window.createTerminal(`Marlin Traceback #${NEXT_TERM_ID++}`);
|
||||
terminal.show(true);
|
||||
terminal.sendText("python buildroot/share/atom/auto_build.py traceback");
|
||||
});
|
||||
var mf_clean = vscode.commands.registerCommand('mfclean', function () {
|
||||
const terminal = vscode.window.createTerminal(`Marlin Clean #${NEXT_TERM_ID++}`);
|
||||
terminal.show(true);
|
||||
terminal.sendText("python buildroot/share/atom/auto_build.py clean");
|
||||
});
|
||||
|
||||
context.subscriptions.push(pio_build);
|
||||
context.subscriptions.push(pio_clean);
|
||||
context.subscriptions.push(pio_upload);
|
||||
context.subscriptions.push(pio_traceback);
|
||||
context.subscriptions.push(mf_build);
|
||||
context.subscriptions.push(mf_upload);
|
||||
context.subscriptions.push(mf_traceback);
|
||||
context.subscriptions.push(mf_clean);
|
||||
}
|
||||
exports.activate = activate;
|
||||
|
||||
|
||||
@@ -6,65 +6,69 @@
|
||||
"publisher": "marlinfirmware",
|
||||
"icon": "logo.svg",
|
||||
"engines": {
|
||||
"vscode": "^1.23.0"
|
||||
"vscode": "^1.32.0"
|
||||
},
|
||||
"enableProposedApi": true,
|
||||
"categories": [
|
||||
"Other"
|
||||
],
|
||||
"activationEvents": [
|
||||
"onCommand:piobuild",
|
||||
"onCommand:pioclean",
|
||||
"onCommand:pioupload",
|
||||
"onCommand:piotraceback"
|
||||
"onCommand:mfbuild",
|
||||
"onCommand:mfclean",
|
||||
"onCommand:mfupload",
|
||||
"onCommand:mftraceback"
|
||||
],
|
||||
"main": "./extension",
|
||||
"contributes": {
|
||||
"viewsContainers": {
|
||||
"activitybar": [
|
||||
{
|
||||
"id": "auto-build",
|
||||
"title": "Auto Build Marlin",
|
||||
"id": "autoBuildVC",
|
||||
"title": "Marlin Build",
|
||||
"icon": "resources/AB.svg"
|
||||
}
|
||||
]
|
||||
},
|
||||
"views": {
|
||||
"auto-build": [
|
||||
"autoBuildVC": [
|
||||
{
|
||||
"id": "autobuild",
|
||||
"name": " "
|
||||
"id": "autoBuildView",
|
||||
"name": "Build…"
|
||||
},
|
||||
{
|
||||
"id": "marlinView",
|
||||
"name": "Marlin Info"
|
||||
}
|
||||
]
|
||||
},
|
||||
"commands": [
|
||||
{
|
||||
"command": "piobuild",
|
||||
"title": "PIO Build",
|
||||
"command": "mfbuild",
|
||||
"title": "Build",
|
||||
"icon": {
|
||||
"light": "resources/B48x48_light.svg",
|
||||
"dark": "resources/B48x48_dark.svg"
|
||||
}
|
||||
},
|
||||
{
|
||||
"command": "pioupload",
|
||||
"title": "PIO Upload",
|
||||
"command": "mfupload",
|
||||
"title": "Upload",
|
||||
"icon": {
|
||||
"light": "resources/U48x48_light.svg",
|
||||
"dark": "resources/U48x48_dark.svg"
|
||||
}
|
||||
},
|
||||
{
|
||||
"command": "piotraceback",
|
||||
"title": "PIO Upload (traceback)",
|
||||
"command": "mftraceback",
|
||||
"title": "Upload (traceback)",
|
||||
"icon": {
|
||||
"light": "resources/T48x48_light.svg",
|
||||
"dark": "resources/T48x48_dark.svg"
|
||||
}
|
||||
},
|
||||
{
|
||||
"command": "pioclean",
|
||||
"title": "PIO Clean",
|
||||
"command": "mfclean",
|
||||
"title": "Clean",
|
||||
"icon": {
|
||||
"light": "resources/C48x48_light.svg",
|
||||
"dark": "resources/C48x48_dark.svg"
|
||||
@@ -74,20 +78,24 @@
|
||||
"menus": {
|
||||
"view/title": [
|
||||
{
|
||||
"command": "piobuild",
|
||||
"group": "navigation@1"
|
||||
"command": "mfbuild",
|
||||
"group": "navigation@1",
|
||||
"when": "view == autoBuildView || view == marlinView"
|
||||
},
|
||||
{
|
||||
"command": "pioupload",
|
||||
"group": "navigation@2"
|
||||
"command": "mfupload",
|
||||
"group": "navigation@2",
|
||||
"when": "view == autoBuildView || view == marlinView"
|
||||
},
|
||||
{
|
||||
"command": "piotraceback",
|
||||
"group": "navigation@3"
|
||||
"command": "mftraceback",
|
||||
"group": "navigation@3",
|
||||
"when": "view == autoBuildView || view == marlinView"
|
||||
},
|
||||
{
|
||||
"command": "pioclean",
|
||||
"group": "navigation@4"
|
||||
"command": "mfclean",
|
||||
"group": "navigation@4",
|
||||
"when": "view == autoBuildView || view == marlinView"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -100,10 +108,10 @@
|
||||
"test": "npm run compile && node ./node_modules/vscode/bin/test"
|
||||
},
|
||||
"devDependencies": {
|
||||
"vscode": "^1.1.17",
|
||||
"typescript": "^2.6.1",
|
||||
"tslint": "^5.8.0",
|
||||
"@types/node": "^7.0.43",
|
||||
"@types/vscode": "^1.34.0",
|
||||
"typescript": "^3.5.1",
|
||||
"tslint": "^5.16.0",
|
||||
"@types/node": "^10.14.17",
|
||||
"@types/mocha": "^2.2.42"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user