mirror of
https://github.com/ThrowTheSwitch/CMock.git
synced 2026-07-28 14:57:49 +00:00
More fixing of warnings after noticing clang was skipping some tests.
This commit is contained in:
@@ -43,7 +43,7 @@ void TemperatureFilter_ProcessInput(float temperature)
|
||||
else
|
||||
{
|
||||
/* Otherwise apply our low-pass filter to smooth the values */
|
||||
temperatureInCelcius = (temperatureInCelcius * 0.75f) + (temperature * 0.25);
|
||||
temperatureInCelcius = (temperatureInCelcius * 0.75f) + (temperature * 0.25f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -43,7 +43,16 @@ void Timer_EnableInterrupt(void)
|
||||
|
||||
static inline void SetInterruptHandler(void)
|
||||
{
|
||||
/* Assigning a function pointer to a void* interrupt vector register is
|
||||
* intentional embedded hardware code; suppress the pedantic warning. */
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Wpedantic"
|
||||
#endif
|
||||
AT91C_BASE_AIC->AIC_SVR[AT91C_ID_TC0] = Timer_InterruptHandler;
|
||||
#ifdef __GNUC__
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
}
|
||||
|
||||
static inline void ConfigureInterruptSourceModeRegister(void)
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <math.h>
|
||||
|
||||
char formattedTemperature[32];
|
||||
char* wakeup = "It's Awesome Time!\n";
|
||||
char wakeup[] = "It's Awesome Time!\n";
|
||||
|
||||
uint8 UsartModel_GetBaudRateRegisterSetting(void)
|
||||
{
|
||||
|
||||
@@ -18,6 +18,6 @@ void Usart_PutChar(char data)
|
||||
#ifdef SIMULATE
|
||||
printf("%c", data);
|
||||
#else
|
||||
AT91C_BASE_US0->US_THR = data;
|
||||
AT91C_BASE_US0->US_THR = (uint8)data;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -22,9 +22,10 @@ void tearDown(void)
|
||||
|
||||
void testShouldInitializeHardwareWhenInitCalled(void)
|
||||
{
|
||||
char wakeup[] = "Hey there!";
|
||||
UsartModel_GetBaudRateRegisterSetting_ExpectAndReturn(4);
|
||||
UsartModel_GetWakeupMessage_ExpectAndReturn("Hey there!");
|
||||
UsartHardware_TransmitString_Expect("Hey there!");
|
||||
UsartModel_GetWakeupMessage_ExpectAndReturn(wakeup);
|
||||
UsartHardware_TransmitString_Expect(wakeup);
|
||||
UsartHardware_Init_Expect(4);
|
||||
|
||||
UsartConductor_Init();
|
||||
@@ -39,9 +40,10 @@ void testRunShouldNotDoAnythingIfSchedulerSaysItIsNotTimeYet(void)
|
||||
|
||||
void testRunShouldGetCurrentTemperatureAndTransmitIfSchedulerSaysItIsTime(void)
|
||||
{
|
||||
char temperature[] = "hey there";
|
||||
TaskScheduler_DoUsart_ExpectAndReturn(TRUE);
|
||||
UsartModel_GetFormattedTemperature_ExpectAndReturn("hey there");
|
||||
UsartHardware_TransmitString_Expect("hey there");
|
||||
UsartModel_GetFormattedTemperature_ExpectAndReturn(temperature);
|
||||
UsartHardware_TransmitString_Expect(temperature);
|
||||
|
||||
UsartConductor_Run();
|
||||
}
|
||||
|
||||
@@ -40,5 +40,6 @@ void testTransmitStringShouldSendDesiredStringOutUsingUsart(void)
|
||||
Usart_PutChar_Expect('l');
|
||||
Usart_PutChar_Expect('o');
|
||||
|
||||
UsartHardware_TransmitString("hello");
|
||||
char msg[] = "hello";
|
||||
UsartHardware_TransmitString(msg);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user