diff --git a/miosix/config/Makefile.inc b/miosix/config/Makefile.inc index 27d51a8531aa52579ad4852e2bf2745cc43b44eb..96aa67de73f3a5a0272877a5aac7ad2c1e5841cc 100644 --- a/miosix/config/Makefile.inc +++ b/miosix/config/Makefile.inc @@ -485,7 +485,6 @@ ifeq ($(OPT_BOARD),stm32f429zi_skyward_homeone) endif ##--------------------------------------------------------------------------- -- ## stm32f429zi_skyward_rogallina ## ifeq ($(OPT_BOARD),stm32f429zi_skyward_rogallina) @@ -519,7 +518,6 @@ ifeq ($(OPT_BOARD),stm32f429zi_skyward_rogallina) endif ##--------------------------------------------------------------------------- -- ## stm32f401re_nucleo ## @@ -566,7 +564,7 @@ endif ## a new board or porting Miosix to a new architecture ## ############################################################################ -ifneq ($(MAKEFILE_VERSION),1.07) +ifneq ($(MAKEFILE_VERSION),1.07S) $(info You are using an incompatible makefile. Make sure it matches \ the one distributed with the current version of the kernel) $(error Error) diff --git a/miosix/config/miosix_settings.h b/miosix/config/miosix_settings.h index 440baad13543cce4b77abed653bf05ee045c1b46..8b603de2a2fb2dc53b7eeece0cd0f8f31bea9a87 100644 --- a/miosix/config/miosix_settings.h +++ b/miosix/config/miosix_settings.h @@ -34,7 +34,7 @@ // The PARSING_FROM_IDE is because Netbeans gets confused by this, it is never // defined when compiling the code. #ifndef PARSING_FROM_IDE -#error This error is a reminder that you have not edited miosix_settings.h yet. +//#error This error is a reminder that you have not edited miosix_settings.h yet. #endif //PARSING_FROM_IDE /** @@ -149,7 +149,7 @@ const unsigned char MAX_OPEN_FILES=8; * mode, so to use debugging it is necessary to disable sleep in the idle thread. * By default it is not defined (idle thread calls sleep). */ -//#define JTAG_DISABLE_SLEEP +#define JTAG_DISABLE_SLEEP /// Minimum stack size (MUST be divisible by 4) const unsigned int STACK_MIN=256; @@ -221,6 +221,7 @@ const unsigned int STACK_FILL=0xbbbbbbbb; #error "You are using a too old compiler. Get the latest one from https://miosix.org/wiki/index.php?title=Miosix_Toolchain" #endif + /** * \} */