From bfd20a37b1f16b0e2094f233a5d32c617a6cce66 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 9 Feb 2019 08:22:56 +0000 Subject: [PATCH] Fixed bug #1011. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12648 110e8d01-0319-4d1e-a829-52ad28d1bb01 --- os/nil/include/ch.h | 6 +++++- readme.txt | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/os/nil/include/ch.h b/os/nil/include/ch.h index 1e58b43f3..43cedf119 100644 --- a/os/nil/include/ch.h +++ b/os/nil/include/ch.h @@ -279,7 +279,7 @@ #if (CH_LICENSE_FEATURES != CH_FEATURES_FULL) && \ (CH_LICENSE_FEATURES != CH_FEATURES_INTERMEDIATE) && \ - (CH_LICENSE_FEATURES == CH_FEATURES_BASIC) + (CH_LICENSE_FEATURES != CH_FEATURES_BASIC) #error "invalid CH_LICENSE_FEATURES setting" #endif @@ -303,6 +303,10 @@ #undef CH_CFG_ST_TIMEDELTA #define CH_CFG_ST_TIMEDELTA 0 +/* Messages restricted.*/ +#undef CH_CFG_USE_MESSAGES +#define CH_CFG_USE_MESSAGES FALSE + #endif /* CH_LICENSE_FEATURES == CH_FEATURES_BASIC */ #if !defined(_CHIBIOS_NIL_CONF_) diff --git a/readme.txt b/readme.txt index 6f0d16be2..b66b3fdb8 100644 --- a/readme.txt +++ b/readme.txt @@ -85,6 +85,8 @@ - HAL: Added a new interface for range-finder devices (used by EX). - HAL: Added mcuconf.h updater tool for STM32F407 (backported to 19.1.1). - NIL: Integrated NIL 4.0. +- FIX: Fixed wrong license restriction check in Nil (bug #1011) + (backported to 19.1.1)(backported to 18.2.3). - FIX: Fixed uninitialized variables in STM32 DMA drivers (bug #1010) (backported to 19.1.1). - FIX: Fixed wrong mcuconf.h in some testex demos related to STM32F407