Sanity-check illegal native USB (#20047)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
parent
3afa6e526b
commit
a1ec49feda
@ -2294,6 +2294,20 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
|
|||||||
#error "GRAPHICAL_TFT_UPSCALE must be set to 2 or 3."
|
#error "GRAPHICAL_TFT_UPSCALE must be set to 2 or 3."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Some boards forbid the use of -1 Native USB
|
||||||
|
*/
|
||||||
|
#if ENABLED(BOARD_NO_NATIVE_USB)
|
||||||
|
#undef BOARD_NO_NATIVE_USB
|
||||||
|
#if SERIAL_PORT == -1
|
||||||
|
#error "SERIAL_PORT is set to -1, but the MOTHERBOARD has no native USB support. Set SERIAL_PORT to a valid value for your board."
|
||||||
|
#elif SERIAL_PORT_2 == -1
|
||||||
|
#error "SERIAL_PORT_2 is set to -1, but the MOTHERBOARD has no native USB support. Set SERIAL_PORT_2 to a valid value for your board."
|
||||||
|
#elif LCD_SERIAL_PORT == -1
|
||||||
|
#error "LCD_SERIAL_PORT is set to -1, but the MOTHERBOARD has no native USB support. Set LCD_SERIAL_PORT to a valid value for your board."
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Serial displays require a dedicated serial port
|
* Serial displays require a dedicated serial port
|
||||||
*/
|
*/
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if NOT_TARGET(__STM32F1__, __STM32F4__)
|
#if NOT_TARGET(__STM32F1__)
|
||||||
#error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -32,6 +32,8 @@
|
|||||||
#define BOARD_INFO_NAME "Chitu3D"
|
#define BOARD_INFO_NAME "Chitu3D"
|
||||||
#define DEFAULT_MACHINE_NAME "STM32F103RET6"
|
#define DEFAULT_MACHINE_NAME "STM32F103RET6"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
// Enable I2C_EEPROM for testing
|
// Enable I2C_EEPROM for testing
|
||||||
//#define I2C_EEPROM
|
//#define I2C_EEPROM
|
||||||
|
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if NOT_TARGET(__STM32F1__, __STM32F4__)
|
#if NOT_TARGET(__STM32F1__)
|
||||||
#error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -32,6 +32,8 @@
|
|||||||
#define BOARD_INFO_NAME "Chitu3D V5"
|
#define BOARD_INFO_NAME "Chitu3D V5"
|
||||||
#define DEFAULT_MACHINE_NAME "STM32F103ZET6"
|
#define DEFAULT_MACHINE_NAME "STM32F103ZET6"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if NOT_TARGET(__STM32F1__, __STM32F4__)
|
#if NOT_TARGET(__STM32F1__)
|
||||||
#error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -32,6 +32,8 @@
|
|||||||
#define BOARD_INFO_NAME "Chitu3D"
|
#define BOARD_INFO_NAME "Chitu3D"
|
||||||
#define DEFAULT_MACHINE_NAME "STM32F103ZET6"
|
#define DEFAULT_MACHINE_NAME "STM32F103ZET6"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -26,9 +26,7 @@
|
|||||||
|
|
||||||
#if NOT_TARGET(__STM32F1__)
|
#if NOT_TARGET(__STM32F1__)
|
||||||
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#endif
|
#elif HOTENDS > 1 || E_STEPPERS > 1
|
||||||
|
|
||||||
#if HOTENDS > 1 || E_STEPPERS > 1
|
|
||||||
#error "CREALITY supports up to 1 hotends / E-steppers. Comment out this line to continue."
|
#error "CREALITY supports up to 1 hotends / E-steppers. Comment out this line to continue."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -39,6 +37,8 @@
|
|||||||
#define DEFAULT_MACHINE_NAME "Ender 3 V2"
|
#define DEFAULT_MACHINE_NAME "Ender 3 V2"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// EEPROM
|
// EEPROM
|
||||||
//
|
//
|
||||||
|
@ -38,6 +38,8 @@
|
|||||||
#define BOARD_INFO_NAME "FLSun HiSpeedV1"
|
#define BOARD_INFO_NAME "FLSun HiSpeedV1"
|
||||||
#define BOARD_WEBSITE_URL "github.com/Foxies-CSTL"
|
#define BOARD_WEBSITE_URL "github.com/Foxies-CSTL"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||||
//
|
//
|
||||||
|
@ -21,12 +21,12 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#ifndef __STM32F1__
|
#if NOT_TARGET(__STM32F1__)
|
||||||
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_INFO_NAME "FLY_MINI"
|
#define BOARD_INFO_NAME "FLY_MINI"
|
||||||
#define BOARD_WEBSITE_URL "github.com/FLYmaker"
|
#define BOARD_WEBSITE_URL "github.com/FLYmaker"
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -28,6 +28,8 @@
|
|||||||
#define BOARD_INFO_NAME "FYSETC AIO II"
|
#define BOARD_INFO_NAME "FYSETC AIO II"
|
||||||
#define BOARD_WEBSITE_URL "fysetc.com"
|
#define BOARD_WEBSITE_URL "fysetc.com"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
#define pins_v2_20190128 // new pins define
|
#define pins_v2_20190128 // new pins define
|
||||||
|
@ -29,11 +29,12 @@
|
|||||||
|
|
||||||
#define BOARD_INFO_NAME "FYSETC Cheetah"
|
#define BOARD_INFO_NAME "FYSETC Cheetah"
|
||||||
#define BOARD_WEBSITE_URL "fysetc.com"
|
#define BOARD_WEBSITE_URL "fysetc.com"
|
||||||
// https://github.com/FYSETC/Cheetah
|
|
||||||
|
|
||||||
// Ignore temp readings during development.
|
// Ignore temp readings during development.
|
||||||
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
|
//#define BOGUS_TEMPERATURE_GRACE_PERIOD 2000
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
#if EITHER(NO_EEPROM_SELECTED, FLASH_EEPROM_EMULATION)
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
||||||
#define DEFAULT_MACHINE_NAME "STM32F103VET6"
|
#define DEFAULT_MACHINE_NAME "STM32F103VET6"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//#define DISABLE_DEBUG
|
//#define DISABLE_DEBUG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
||||||
#define DEFAULT_MACHINE_NAME "STM32F103VET6"
|
#define DEFAULT_MACHINE_NAME "STM32F103VET6"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//#define DISABLE_DEBUG
|
//#define DISABLE_DEBUG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
||||||
#define DEFAULT_MACHINE_NAME "STM32F103VET6"
|
#define DEFAULT_MACHINE_NAME "STM32F103VET6"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//#define DISABLE_DEBUG
|
//#define DISABLE_DEBUG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
#define BOARD_INFO_NAME "GTM32 Pro VB"
|
||||||
#define DEFAULT_MACHINE_NAME "M201"
|
#define DEFAULT_MACHINE_NAME "M201"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//#define DISABLE_DEBUG
|
//#define DISABLE_DEBUG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -33,8 +33,11 @@
|
|||||||
#elif HOTENDS > 1 || E_STEPPERS > 1
|
#elif HOTENDS > 1 || E_STEPPERS > 1
|
||||||
#error "JGAurora 32-bit board only supports 1 hotend / E-stepper. Comment out this line to continue."
|
#error "JGAurora 32-bit board only supports 1 hotend / E-stepper. Comment out this line to continue."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_INFO_NAME "JGAurora A5S A1 board"
|
#define BOARD_INFO_NAME "JGAurora A5S A1 board"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
#ifndef STM32_XL_DENSITY
|
#ifndef STM32_XL_DENSITY
|
||||||
#define STM32_XL_DENSITY
|
#define STM32_XL_DENSITY
|
||||||
#endif
|
#endif
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
#define BOARD_INFO_NAME "Longer3D"
|
#define BOARD_INFO_NAME "Longer3D"
|
||||||
#define ALFAWISE_UX0 // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
|
#define ALFAWISE_UX0 // Common to all Longer3D STM32F1 boards (used for Open drain mosfets)
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//#define DISABLE_DEBUG // We still want to debug with STLINK...
|
//#define DISABLE_DEBUG // We still want to debug with STLINK...
|
||||||
#define DISABLE_JTAG // We free the jtag pins (PA15) but keep STLINK
|
#define DISABLE_JTAG // We free the jtag pins (PA15) but keep STLINK
|
||||||
// Release PB4 (STEP_X_PIN) from JTAG NRST role.
|
// Release PB4 (STEP_X_PIN) from JTAG NRST role.
|
||||||
|
@ -35,6 +35,8 @@
|
|||||||
|
|
||||||
#define BOARD_INFO_NAME "MKS Robin"
|
#define BOARD_INFO_NAME "MKS Robin"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||||
//
|
//
|
||||||
|
@ -35,6 +35,8 @@
|
|||||||
|
|
||||||
#define BOARD_INFO_NAME "MKS Robin e3p"
|
#define BOARD_INFO_NAME "MKS Robin e3p"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||||
//
|
//
|
||||||
|
@ -29,6 +29,8 @@
|
|||||||
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
|
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
|
||||||
|
|
||||||
//#define DISABLE_DEBUG
|
//#define DISABLE_DEBUG
|
||||||
|
@ -32,6 +32,8 @@
|
|||||||
#endif
|
#endif
|
||||||
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
|
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//#define DISABLE_DEBUG
|
//#define DISABLE_DEBUG
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
|
@ -36,6 +36,8 @@
|
|||||||
#endif
|
#endif
|
||||||
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
|
#define BOARD_WEBSITE_URL "github.com/makerbase-mks"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//#define DISABLE_DEBUG
|
//#define DISABLE_DEBUG
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
|
|
||||||
#define BOARD_INFO_NAME "MKS Robin Mini"
|
#define BOARD_INFO_NAME "MKS Robin Mini"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||||
//
|
//
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
|
|
||||||
#define BOARD_INFO_NAME "MKS Robin Nano"
|
#define BOARD_INFO_NAME "MKS Robin Nano"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||||
//
|
//
|
||||||
|
@ -35,6 +35,8 @@
|
|||||||
|
|
||||||
#define BOARD_INFO_NAME "MKS Robin nano V2.0"
|
#define BOARD_INFO_NAME "MKS Robin nano V2.0"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||||
//
|
//
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
|
|
||||||
#define BOARD_INFO_NAME "MKS Robin pro"
|
#define BOARD_INFO_NAME "MKS Robin pro"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
//
|
//
|
||||||
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
// Release PB4 (Y_ENABLE_PIN) from JTAG NRST role
|
||||||
//
|
//
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#if NOT_TARGET(__STM32F1__, __STM32F4__)
|
#if NOT_TARGET(__STM32F1__)
|
||||||
#error "Oops! Select an STM32F1/4 board in 'Tools > Board.'"
|
#error "Oops! Select an STM32F1 board in 'Tools > Board.'"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -35,6 +35,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define BOARD_INFO_NAME "Trigorilla Pro"
|
#define BOARD_INFO_NAME "Trigorilla Pro"
|
||||||
|
|
||||||
|
#define BOARD_NO_NATIVE_USB
|
||||||
|
|
||||||
#define DISABLE_JTAG
|
#define DISABLE_JTAG
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -8,7 +8,7 @@ set -e
|
|||||||
|
|
||||||
restore_configs
|
restore_configs
|
||||||
opt_set MOTHERBOARD BOARD_MKS_ROBIN_LITE
|
opt_set MOTHERBOARD BOARD_MKS_ROBIN_LITE
|
||||||
opt_set SERIAL_PORT -1
|
opt_set SERIAL_PORT 1
|
||||||
opt_enable EEPROM_SETTINGS
|
opt_enable EEPROM_SETTINGS
|
||||||
opt_enable SDSUPPORT
|
opt_enable SDSUPPORT
|
||||||
exec_test $1 $2 "Default Configuration with Fallback SD EEPROM"
|
exec_test $1 $2 "Default Configuration with Fallback SD EEPROM"
|
||||||
|
@ -8,6 +8,8 @@ set -e
|
|||||||
|
|
||||||
use_example_configs Mks/Robin_Pro
|
use_example_configs Mks/Robin_Pro
|
||||||
opt_enable EMERGENCY_PARSER
|
opt_enable EMERGENCY_PARSER
|
||||||
|
opt_set SERIAL_PORT 3
|
||||||
|
opt_disable SERIAL_PORT_2
|
||||||
opt_set SDCARD_CONNECTION LCD
|
opt_set SDCARD_CONNECTION LCD
|
||||||
opt_set X_DRIVER_TYPE TMC2209
|
opt_set X_DRIVER_TYPE TMC2209
|
||||||
opt_set Y_DRIVER_TYPE TMC2130
|
opt_set Y_DRIVER_TYPE TMC2130
|
||||||
|
Loading…
Reference in New Issue
Block a user