Fixes to the temp_sensor example.

ThrowTheSwitch · Nov 22, 2023 · 3204939 · 3204939
1 parent 097b3ec
commit 3204939
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/examples/temp_sensor/rakefile_helper.rb b/examples/temp_sensor/rakefile_helper.rb
@@ -199,7 +199,7 @@ def run_tests(test_files)
         next unless header =~ /Mock/
 
         require '../../lib/cmock.rb'
-        @cmock ||= CMock.new($cfg_file)
+        @cmock ||= CMock.new('./targets/' + $cfg_file)
         @cmock.setup_mocks([$cfg['compiler']['source_path'] + header.gsub('Mock', '')])
       end
 
@@ -217,7 +217,7 @@ def run_tests(test_files)
       runner_name = test_base + '_Runner.c'
       if $cfg['compiler']['runner_path'].nil?
         runner_path = $cfg['compiler']['build_path'] + runner_name
-        test_gen = UnityTestRunnerGenerator.new($cfg_file)
+        test_gen = UnityTestRunnerGenerator.new('./targets/' + $cfg_file)
         test_gen.run(test, runner_path)
       else
         runner_path = $cfg['compiler']['runner_path'] + runner_name
@@ -254,7 +254,7 @@ def build_application(main)
     report 'Building application...'
 
     obj_list = []
-    load_configuration($cfg_file)
+    load_configuration('./targets/' + $cfg_file)
     main_path = $cfg['compiler']['source_path'] + main + C_EXTENSION
 
     # Detect dependencies and build required required modules

diff --git a/examples/temp_sensor/src/TemperatureFilter.c b/examples/temp_sensor/src/TemperatureFilter.c
@@ -27,13 +27,16 @@ void TemperatureFilter_ProcessInput(float temperature)
   {
     if (temperature == +INFINITY ||
         temperature == -INFINITY ||
-        temperature == +NAN ||
-        temperature == -NAN)
+        temperature != temperature)
     {
+      /* Check if +/- Infinity or NaN... reset to -Inf in this instance. */
       initialized = FALSE;
-      temperature = -INFINITY;
+      temperatureInCelcius = -INFINITY;
+    }
+    else
+    {
+      /* Otherwise apply our low-pass filter to smooth the values */
+      temperatureInCelcius = (temperatureInCelcius * 0.75f) + (temperature * 0.25);
     }
-
-    temperatureInCelcius = (temperatureInCelcius * 0.75f) + (temperature * 0.25);
   }
 }
diff --git a/examples/temp_sensor/gcc.yml → examples/temp_sensor/targets/gcc.yml b/examples/temp_sensor/gcc.yml → examples/temp_sensor/targets/gcc.yml
diff --git a/examples/temp_sensor/iar_v4.yml → examples/temp_sensor/targets/iar_v4.yml b/examples/temp_sensor/iar_v4.yml → examples/temp_sensor/targets/iar_v4.yml
diff --git a/examples/temp_sensor/iar_v5.yml → examples/temp_sensor/targets/iar_v5.yml b/examples/temp_sensor/iar_v5.yml → examples/temp_sensor/targets/iar_v5.yml
diff --git a/examples/temp_sensor/test/TestTimerInterruptConfigurator.c b/examples/temp_sensor/test/TestTimerInterruptConfigurator.c
@@ -35,7 +35,7 @@ void testResetSystemTimeDelegatesTo_Timer_SetSystemTime_Appropriately(void)
 
 void testConfigureInterruptShouldSetInterruptHandlerAppropriately(void)
 {
-  AT91C_BASE_AIC->AIC_SVR[AT91C_ID_TC0] = (uint32)NULL;
+  AT91C_BASE_AIC->AIC_SVR[AT91C_ID_TC0] = (uint32)0;
   Timer_ConfigureInterrupt();
   TEST_ASSERT_EQUAL((uint32)Timer_InterruptHandler, AT91C_BASE_AIC->AIC_SVR[AT91C_ID_TC0]);
 }