diff --git a/examples/chapter12_04a/chapter12_04a.sln b/examples/chapter12_04a/chapter12_04a.sln index 186cc9fbc..6dcb76862 100644 --- a/examples/chapter12_04a/chapter12_04a.sln +++ b/examples/chapter12_04a/chapter12_04a.sln @@ -11,21 +11,17 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Release|x64 = Release|x64 - target bl602_sifive_e24_riscv|x64 = target bl602_sifive_e24_riscv|x64 target stm32f100|x64 = target stm32f100|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.Debug|x64.ActiveCfg = target bl602_sifive_e24_riscv|x64 - {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.Release|x64.ActiveCfg = target bl602_sifive_e24_riscv|x64 - {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target bl602_sifive_e24_riscv|x64.ActiveCfg = target bl602_sifive_e24_riscv|x64 - {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target bl602_sifive_e24_riscv|x64.Build.0 = target bl602_sifive_e24_riscv|x64 + {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.Debug|x64.ActiveCfg = target stm32f100|x64 + {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.Release|x64.ActiveCfg = target stm32f100|x64 {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target stm32f100|x64.ActiveCfg = target stm32f100|x64 {30CE370B-40F3-4BCD-8986-64AAFF8971BD}.target stm32f100|x64.Build.0 = target stm32f100|x64 {C8B59726-9319-45C3-8F11-F9F388FB6A2C}.Debug|x64.ActiveCfg = Debug|x64 {C8B59726-9319-45C3-8F11-F9F388FB6A2C}.Debug|x64.Build.0 = Debug|x64 {C8B59726-9319-45C3-8F11-F9F388FB6A2C}.Release|x64.ActiveCfg = Release|x64 {C8B59726-9319-45C3-8F11-F9F388FB6A2C}.Release|x64.Build.0 = Release|x64 - {C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target bl602_sifive_e24_riscv|x64.ActiveCfg = Release|x64 {C8B59726-9319-45C3-8F11-F9F388FB6A2C}.target stm32f100|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution diff --git a/examples/chapter12_04a/readme.md b/examples/chapter12_04a/readme.md index f65fc1b61..288390737 100644 --- a/examples/chapter12_04a/readme.md +++ b/examples/chapter12_04a/readme.md @@ -1,4 +1,4 @@ -# Example Chapter12_04a (variation 32-bit controller) +# Example Chapter12_04a (variation 32-bit microcontroller) ## Benchmarking Floating-Point Calculations Example chapter12_04a performs a variety of floating-point @@ -14,9 +14,10 @@ is used. ## Hardware Setup -In this particular example, we have simply used a commercially-available -the open-platform STM32F100 Value Line Discovery Kit placed on a breadboard -with soldered-on pins. +In this particular example, we have simply used +the commercially-available, open-platform +[STM32F100 Value Line Discovery Kit](https://www.st.com/en/evaluation-tools/stm32vldiscovery.html) +placed on a breadboard with soldered-on pins. The wiring is straightforward. The blinking LED uses the blue colored user LED controlled by pin `portc.8`. The benchmark toggle pin is `portb.9`. diff --git a/examples/chapter12_04a/target.vcxproj b/examples/chapter12_04a/target.vcxproj index eb29f5690..0b847e190 100644 --- a/examples/chapter12_04a/target.vcxproj +++ b/examples/chapter12_04a/target.vcxproj @@ -1,14 +1,6 @@  - - target bl602_sifive_e24_riscv - Win32 - - - target bl602_sifive_e24_riscv - x64 - target stm32f100 Win32 @@ -25,21 +17,11 @@ 10.0 - - Makefile - Unicode - true - Makefile Unicode true - - Makefile - Unicode - true - Makefile Unicode @@ -53,18 +35,10 @@ Makefile - - Makefile - v141 - Makefile v141 - - Makefile - v143 - Makefile v143 @@ -80,60 +54,34 @@ - - - - - - <_ProjectFileVersion>10.0.30319.1 - $(SolutionDir)bin $(SolutionDir)bin - $(OutDir) $(OutDir) - Build\Build.bat AVR Build\Build.bat AVR - Build\Build.bat AVR Build\Build.bat AVR - Build\Build.bat AVR rebuild Build\Build.bat AVR rebuild - Build\Build.bat AVR rebuild Build\Build.bat AVR rebuild - Target\Build\Build.bat avr clean_all Target\Build\Build.bat avr clean_all - Target\Build\Build.bat bl602_sifive_e24_riscv clean_all Target\Build\Build.bat stm32f100 clean_all - $(OutDir)\app_flash.hex $(OutDir)\app_flash.hex - $(OutDir)\app_flash.hex $(OutDir)\app_flash.hex - $(NMakePreprocessorDefinitions) $(NMakePreprocessorDefinitions) - $(NMakePreprocessorDefinitions) $(NMakePreprocessorDefinitions) - $(ProjectDir)/Cpp; $(ProjectDir)/Cpp/Hal/AVR;$(NMakeIncludeSearchPath) $(ProjectDir)/Cpp; $(ProjectDir)/Cpp/Hal/AVR;$(NMakeIncludeSearchPath) - $(ProjectDir)/Cpp; $(ProjectDir)/Cpp/Hal/AVR;$(NMakeIncludeSearchPath) $(ProjectDir)/Cpp; $(ProjectDir)/Cpp/Hal/AVR;$(NMakeIncludeSearchPath) - $(NMakeForcedIncludes) $(NMakeForcedIncludes) - $(NMakeForcedIncludes) $(NMakeForcedIncludes) - $(NMakeAssemblySearchPath) $(NMakeAssemblySearchPath) - $(NMakeAssemblySearchPath) $(NMakeAssemblySearchPath) - $(NMakeForcedUsingAssemblies) $(NMakeForcedUsingAssemblies) - $(NMakeForcedUsingAssemblies) $(NMakeForcedUsingAssemblies) Build\Build.bat R8C Build\Build.bat R8C @@ -151,33 +99,19 @@ $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) $(NMakeForcedUsingAssemblies) - Target\Build\Build.bat avr Target\Build\Build.bat avr - Target\Build\Build.bat bl602_sifive_e24_riscv Target\Build\Build.bat stm32f100 - Target\Build\Build.bat avr rebuild Target\Build\Build.bat avr rebuild - Target\Build\Build.bat bl602_sifive_e24_riscv rebuild Target\Build\Build.bat stm32f100 rebuild - - - $(SolutionDir)src\util\STL $(SolutionDir)src\util\STL_C++XX_stdfloat $(SolutionDir)src $(SolutionDir)src\mcal\avr $(SolutionDir)src\util\STL $(SolutionDir)src\util\STL_C++XX_stdfloat $(SolutionDir)src $(SolutionDir)src\mcal\avr - $(SolutionDir)src\util\STL $(SolutionDir)src\util\STL_C++XX_stdfloat $(SolutionDir)src $(SolutionDir)src\mcal\avr $(SolutionDir)src\util\STL $(SolutionDir)src\util\STL_C++XX_stdfloat $(SolutionDir)src $(SolutionDir)src\mcal\avr - - - - - - Build\Build.bat AVR Build\Build.bat AVR @@ -195,29 +129,17 @@ $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) $(NMakeForcedUsingAssemblies) - - - - - - - - - - - - @@ -230,21 +152,11 @@ $(SolutionDir)..\Bin\App.log - - - $(SolutionDir)..\Bin\App.log - - $(SolutionDir)..\Bin\App.log - - - $(SolutionDir)..\Bin\App.log - - $(SolutionDir)..\Bin\App.log diff --git a/examples/chapter12_04a/target/micros/stm32f100/make/stm32f100_flags.gmk b/examples/chapter12_04a/target/micros/stm32f100/make/stm32f100_flags.gmk index 38db32969..d44e6bf28 100644 --- a/examples/chapter12_04a/target/micros/stm32f100/make/stm32f100_flags.gmk +++ b/examples/chapter12_04a/target/micros/stm32f100/make/stm32f100_flags.gmk @@ -24,7 +24,7 @@ TGT_ALLFLAGS = -O2 \ -mno-unaligned-access \ -mno-long-calls -TGT_CFLAGS = -std=c99 \ +TGT_CFLAGS = -std=c11 \ -Wunsuffixed-float-constants \ $(TGT_ALLFLAGS) diff --git a/examples/readme.md b/examples/readme.md index c9cfae6b2..9eef5b1b3 100644 --- a/examples/readme.md +++ b/examples/readme.md @@ -104,7 +104,7 @@ This example makes straightforward use of preemptive multitasking scheduling wit Example ![chapter12_04](https://github.com/ckormanyos/real-time-cpp/tree/master/examples/chapter12_04) Benchmarking Floating-Point Calculations.\ This example performs a variety of floating-point calculations of selected special functions of pure and applied mathematics. -Example ![chapter12_04a](https://github.com/ckormanyos/real-time-cpp/tree/master/examples/chapter12_04a) Benchmarking Floating-Point Calculations (32-bit variation).\ +Example ![chapter12_04a](https://github.com/ckormanyos/real-time-cpp/tree/master/examples/chapter12_04a) Benchmarking Floating-Point Calculations (variation 32-bit microcontroller).\ The same special functions and arguments are used as in Example Chapter12_04. In variation 12_04a, however, the open-platform STM32F100 Value Line Discovery Kit placed on a breadboard is used.