ceedling 0.18.0 → 0.19.0

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcConductor.c

@@ -1,42 +1,42 @@
-#include "Types.h"
-#include "AdcConductor.h"
-#include "AdcModel.h"
-#include "AdcHardware.h"
-
-void AdcConductor_Init(void)
-{
-  AdcHardware_Init();
-}
-
-void AdcConductor_Run(void)
-{
-  if (AdcModel_DoGetSample() && AdcHardware_GetSampleComplete())
-  {
-    AdcModel_ProcessInput(AdcHardware_GetSample());
-    AdcHardware_StartConversion();
-  }
-}
-
-bool AdcConductor_JustHereToTest(void)
-{
-    EXAMPLE_STRUCT_T ExampleStruct;
-    ExampleStruct.x = 5;
-    ExampleStruct.y = 7;
-
-    return AdcModel_DoNothingExceptTestASpecialType(ExampleStruct);
-}
-
-bool AdcConductor_AlsoHereToTest(void)
-{
-    EXAMPLE_STRUCT_T example = AdcModel_DoNothingExceptReturnASpecialType();
-
-    return ((example.x == 99) && (example.y == 1));
-}
-
-bool AdcConductor_YetAnotherTest(void)
-{
-    uint32 example = 3;
-
-    return AdModel_DoNothingExceptTestPointers(&example);
-}
-
+#include "Types.h"
+#include "AdcConductor.h"
+#include "AdcModel.h"
+#include "AdcHardware.h"
+
+void AdcConductor_Init(void)
+{
+  AdcHardware_Init();
+}
+
+void AdcConductor_Run(void)
+{
+  if (AdcModel_DoGetSample() && AdcHardware_GetSampleComplete())
+  {
+    AdcModel_ProcessInput(AdcHardware_GetSample());
+    AdcHardware_StartConversion();
+  }
+}
+
+bool AdcConductor_JustHereToTest(void)
+{
+    EXAMPLE_STRUCT_T ExampleStruct;
+    ExampleStruct.x = 5;
+    ExampleStruct.y = 7;
+
+    return AdcModel_DoNothingExceptTestASpecialType(ExampleStruct);
+}
+
+bool AdcConductor_AlsoHereToTest(void)
+{
+    EXAMPLE_STRUCT_T example = AdcModel_DoNothingExceptReturnASpecialType();
+
+    return ((example.x == 99) && (example.y == 1));
+}
+
+bool AdcConductor_YetAnotherTest(void)
+{
+    uint32 example = 3;
+
+    return AdModel_DoNothingExceptTestPointers(&example);
+}
+

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcConductor.h

@@ -1,11 +1,11 @@
-#ifndef _ADCCONDUCTOR_H
-#define _ADCCONDUCTOR_H
-
-void AdcConductor_Init(void);
-void AdcConductor_Run(void);
-
-bool AdcConductor_JustHereToTest(void);
-bool AdcConductor_AlsoHereToTest(void);
-bool AdcConductor_YetAnotherTest(void);
-
-#endif // _ADCCONDUCTOR_H
+#ifndef _ADCCONDUCTOR_H
+#define _ADCCONDUCTOR_H
+
+void AdcConductor_Init(void);
+void AdcConductor_Run(void);
+
+bool AdcConductor_JustHereToTest(void);
+bool AdcConductor_AlsoHereToTest(void);
+bool AdcConductor_YetAnotherTest(void);
+
+#endif // _ADCCONDUCTOR_H

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcHardware.c

@@ -1,27 +1,27 @@
-#include "Types.h"
-#include "AdcHardware.h"
-#include "AdcHardwareConfigurator.h"
-#include "AdcTemperatureSensor.h"
-
-void AdcHardware_Init(void)
-{
-  Adc_Reset();
-  Adc_ConfigureMode();
-  Adc_EnableTemperatureChannel();
-  Adc_StartTemperatureSensorConversion();
-}
-
-void AdcHardware_StartConversion(void)
-{
-  Adc_StartTemperatureSensorConversion();
-}
-
-bool AdcHardware_GetSampleComplete(void)
-{
-  return Adc_TemperatureSensorSampleReady();
-}
-
-uint16 AdcHardware_GetSample(void)
-{
-  return Adc_ReadTemperatureSensor();
-}
+#include "Types.h"
+#include "AdcHardware.h"
+#include "AdcHardwareConfigurator.h"
+#include "AdcTemperatureSensor.h"
+
+void AdcHardware_Init(void)
+{
+  Adc_Reset();
+  Adc_ConfigureMode();
+  Adc_EnableTemperatureChannel();
+  Adc_StartTemperatureSensorConversion();
+}
+
+void AdcHardware_StartConversion(void)
+{
+  Adc_StartTemperatureSensorConversion();
+}
+
+bool AdcHardware_GetSampleComplete(void)
+{
+  return Adc_TemperatureSensorSampleReady();
+}
+
+uint16 AdcHardware_GetSample(void)
+{
+  return Adc_ReadTemperatureSensor();
+}

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcHardware.h

@@ -1,9 +1,9 @@
-#ifndef _ADCHARDWARE_H
-#define _ADCHARDWARE_H
-
-void AdcHardware_Init(void);
-void AdcHardware_StartConversion(void);
-bool AdcHardware_GetSampleComplete(void);
-uint16 AdcHardware_GetSample(void);
-
-#endif // _ADCHARDWARE_H
+#ifndef _ADCHARDWARE_H
+#define _ADCHARDWARE_H
+
+void AdcHardware_Init(void);
+void AdcHardware_StartConversion(void);
+bool AdcHardware_GetSampleComplete(void);
+uint16 AdcHardware_GetSample(void);
+
+#endif // _ADCHARDWARE_H

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcHardwareConfigurator.c

@@ -1,18 +1,18 @@
-#include "Types.h"
-#include "AdcHardwareConfigurator.h"
-#include "ModelConfig.h"
-
-void Adc_Reset(void)
-{
-  AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
-}
-
-void Adc_ConfigureMode(void)
-{
-  AT91C_BASE_ADC->ADC_MR = (((uint32)11) << 8) | (((uint32)4) << 16);
-}
-
-void Adc_EnableTemperatureChannel(void)
-{
-  AT91C_BASE_ADC->ADC_CHER = 0x10;
-}
+#include "Types.h"
+#include "AdcHardwareConfigurator.h"
+#include "ModelConfig.h"
+
+void Adc_Reset(void)
+{
+  AT91C_BASE_ADC->ADC_CR = AT91C_ADC_SWRST;
+}
+
+void Adc_ConfigureMode(void)
+{
+  AT91C_BASE_ADC->ADC_MR = (((uint32)11) << 8) | (((uint32)4) << 16);
+}
+
+void Adc_EnableTemperatureChannel(void)
+{
+  AT91C_BASE_ADC->ADC_CHER = 0x10;
+}

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcHardwareConfigurator.h

@@ -1,10 +1,10 @@
-#ifndef _ADCHARDWARECONFIGURATOR_H
-#define _ADCHARDWARECONFIGURATOR_H
-
-#include "Types.h"
-
-void Adc_Reset(void);
-void Adc_ConfigureMode(void);
-void Adc_EnableTemperatureChannel(void);
-
-#endif // _ADCHARDWARECONFIGURATOR_H
+#ifndef _ADCHARDWARECONFIGURATOR_H
+#define _ADCHARDWARECONFIGURATOR_H
+
+#include "Types.h"
+
+void Adc_Reset(void);
+void Adc_ConfigureMode(void);
+void Adc_EnableTemperatureChannel(void);
+
+#endif // _ADCHARDWARECONFIGURATOR_H

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcModel.c

@@ -1,33 +1,33 @@
-#include "AdcModel.h"
-#include "TaskScheduler.h"
-#include "TemperatureCalculator.h"
-#include "TemperatureFilter.h"
-
-bool AdcModel_DoGetSample(void)
-{
-  return TaskScheduler_DoAdc();
-}
-
-void AdcModel_ProcessInput(uint16 millivolts)
-{
-  TemperatureFilter_ProcessInput(TemperatureCalculator_Calculate(millivolts));
-}
-
-bool AdcModel_DoNothingExceptTestASpecialType(EXAMPLE_STRUCT_T ExampleStruct)
-{
-    //This doesn't really do anything. it's only here to make sure I can compare a struct.
-    return FALSE;
-}
-bool AdModel_DoNothingExceptTestPointers(uint32* pExample)
-{
-    //This doesn't really do anything. it's only here to make sure I can compare a pointer value.
-    return FALSE;
-}
-
-EXAMPLE_STRUCT_T AdcModel_DoNothingExceptReturnASpecialType(void)
-{
-    EXAMPLE_STRUCT_T example; //again, this just is here to test that I can return a struct
-    example.x = 99;
-    example.y = 1;
-    return example;
-}
+#include "AdcModel.h"
+#include "TaskScheduler.h"
+#include "TemperatureCalculator.h"
+#include "TemperatureFilter.h"
+
+bool AdcModel_DoGetSample(void)
+{
+  return TaskScheduler_DoAdc();
+}
+
+void AdcModel_ProcessInput(uint16 millivolts)
+{
+  TemperatureFilter_ProcessInput(TemperatureCalculator_Calculate(millivolts));
+}
+
+bool AdcModel_DoNothingExceptTestASpecialType(EXAMPLE_STRUCT_T ExampleStruct)
+{
+    //This doesn't really do anything. it's only here to make sure I can compare a struct.
+    return FALSE;
+}
+bool AdModel_DoNothingExceptTestPointers(uint32* pExample)
+{
+    //This doesn't really do anything. it's only here to make sure I can compare a pointer value.
+    return FALSE;
+}
+
+EXAMPLE_STRUCT_T AdcModel_DoNothingExceptReturnASpecialType(void)
+{
+    EXAMPLE_STRUCT_T example; //again, this just is here to test that I can return a struct
+    example.x = 99;
+    example.y = 1;
+    return example;
+}

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcModel.h

@@ -1,13 +1,13 @@
-#ifndef _ADCMODEL_H
-#define _ADCMODEL_H
-
-#include "Types.h"
-
-bool AdcModel_DoGetSample(void);
-void AdcModel_ProcessInput(uint16 millivolts);
-
-bool AdcModel_DoNothingExceptTestASpecialType(EXAMPLE_STRUCT_T ExampleStruct);
-bool AdModel_DoNothingExceptTestPointers(uint32* pExample);
-EXAMPLE_STRUCT_T AdcModel_DoNothingExceptReturnASpecialType(void);
-
-#endif // _ADCMODEL_H
+#ifndef _ADCMODEL_H
+#define _ADCMODEL_H
+
+#include "Types.h"
+
+bool AdcModel_DoGetSample(void);
+void AdcModel_ProcessInput(uint16 millivolts);
+
+bool AdcModel_DoNothingExceptTestASpecialType(EXAMPLE_STRUCT_T ExampleStruct);
+bool AdModel_DoNothingExceptTestPointers(uint32* pExample);
+EXAMPLE_STRUCT_T AdcModel_DoNothingExceptReturnASpecialType(void);
+
+#endif // _ADCMODEL_H

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcTemperatureSensor.c

@@ -1,51 +1,51 @@
-#include "Types.h"
-#include "AdcTemperatureSensor.h"
-
-static inline uint32 ConvertAdcCountsToPicovolts(uint32 counts); 
-static inline uint16 ConvertPicovoltsToMillivolts(uint32 picovolts);
-
-//
-// PUBLIC METHODS
-//
-
-void Adc_StartTemperatureSensorConversion(void)
-{
-  AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
-}
-
-bool Adc_TemperatureSensorSampleReady(void)
-{
-  return ((AT91C_BASE_ADC->ADC_SR & AT91C_ADC_EOC4) == AT91C_ADC_EOC4);
-}
-
-uint16 Adc_ReadTemperatureSensor(void)
-{
-  uint32 picovolts = ConvertAdcCountsToPicovolts(AT91C_BASE_ADC->ADC_CDR4);
-  return ConvertPicovoltsToMillivolts(picovolts);
-}
-
-//
-// PRIVATE HELPERS
-//
-
-static inline uint32 ConvertAdcCountsToPicovolts(uint32 counts)
-{
-  // ADC bit weight at 10-bit resolution with 3.0V reference = 2.9296875 mV/LSB
-  uint32 picovoltsPerAdcCount = 2929688;
-
-  // Shift decimal point by 6 places to preserve accuracy in fixed-point math
-  return counts * picovoltsPerAdcCount;
-}
-
-static inline uint16 ConvertPicovoltsToMillivolts(uint32 picovolts)
-{
-  const uint32 halfMillivoltInPicovolts = 500000;
-  const uint32 picovoltsPerMillivolt = 1000000;
-    
-  // Add 0.5 mV to result so that truncation yields properly rounded result
-  picovolts += halfMillivoltInPicovolts;
-
-  // Divide appropriately to convert to millivolts
-  return (uint16)(picovolts / picovoltsPerMillivolt);
-}
-
+#include "Types.h"
+#include "AdcTemperatureSensor.h"
+
+static inline uint32 ConvertAdcCountsToPicovolts(uint32 counts); 
+static inline uint16 ConvertPicovoltsToMillivolts(uint32 picovolts);
+
+//
+// PUBLIC METHODS
+//
+
+void Adc_StartTemperatureSensorConversion(void)
+{
+  AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
+}
+
+bool Adc_TemperatureSensorSampleReady(void)
+{
+  return ((AT91C_BASE_ADC->ADC_SR & AT91C_ADC_EOC4) == AT91C_ADC_EOC4);
+}
+
+uint16 Adc_ReadTemperatureSensor(void)
+{
+  uint32 picovolts = ConvertAdcCountsToPicovolts(AT91C_BASE_ADC->ADC_CDR4);
+  return ConvertPicovoltsToMillivolts(picovolts);
+}
+
+//
+// PRIVATE HELPERS
+//
+
+static inline uint32 ConvertAdcCountsToPicovolts(uint32 counts)
+{
+  // ADC bit weight at 10-bit resolution with 3.0V reference = 2.9296875 mV/LSB
+  uint32 picovoltsPerAdcCount = 2929688;
+
+  // Shift decimal point by 6 places to preserve accuracy in fixed-point math
+  return counts * picovoltsPerAdcCount;
+}
+
+static inline uint16 ConvertPicovoltsToMillivolts(uint32 picovolts)
+{
+  const uint32 halfMillivoltInPicovolts = 500000;
+  const uint32 picovoltsPerMillivolt = 1000000;
+    
+  // Add 0.5 mV to result so that truncation yields properly rounded result
+  picovolts += halfMillivoltInPicovolts;
+
+  // Divide appropriately to convert to millivolts
+  return (uint16)(picovolts / picovoltsPerMillivolt);
+}
+

data/vendor/cmock/examples/{src → temp_sensor/src}/AdcTemperatureSensor.h

@@ -1,10 +1,10 @@
-#ifndef _ADCTEMPERATURESENSOR_H
-#define _ADCTEMPERATURESENSOR_H
-
-#include "Types.h"
-
-void Adc_StartTemperatureSensorConversion(void);
-bool Adc_TemperatureSensorSampleReady(void);
-uint16 Adc_ReadTemperatureSensor(void);
-
-#endif // _ADCTEMPERATURESENSOR_H
+#ifndef _ADCTEMPERATURESENSOR_H
+#define _ADCTEMPERATURESENSOR_H
+
+#include "Types.h"
+
+void Adc_StartTemperatureSensorConversion(void);
+bool Adc_TemperatureSensorSampleReady(void);
+uint16 Adc_ReadTemperatureSensor(void);
+
+#endif // _ADCTEMPERATURESENSOR_H