diff --git a/examples/bmp180_i2c/bmp180_i2c.c b/examples/bmp180_i2c/bmp180_i2c.c index 15c0508..578db67 100644 --- a/examples/bmp180_i2c/bmp180_i2c.c +++ b/examples/bmp180_i2c/bmp180_i2c.c @@ -30,13 +30,13 @@ static xQueueHandle mainqueue; static xTimerHandle timerHandle; // Own BMP180 User Inform Implementation -bool bmp180_i2c_informUser(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperatue, bmp180_press_t pressure) +bool bmp180_i2c_informUser(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperature, bmp180_press_t pressure) { my_event_t ev; ev.event_type = MY_EVT_BMP180; ev.bmp180_data.cmd = cmd; - ev.bmp180_data.temperatue = temperatue; + ev.bmp180_data.temperature = temperature; ev.bmp180_data.pressure = pressure; return (xQueueSend(*resultQueue, &ev, 0) == pdTRUE); @@ -74,7 +74,7 @@ void bmp180_task(void *pvParameters) break; case MY_EVT_BMP180: printf("%s: Received BMP180 Event temp:=%d.%d°C press=%d.%02dhPa\n", __FUNCTION__, \ - (int32_t)ev.bmp180_data.temperatue, abs((int32_t)(ev.bmp180_data.temperatue*10)%10), \ + (int32_t)ev.bmp180_data.temperature, abs((int32_t)(ev.bmp180_data.temperature*10)%10), \ ev.bmp180_data.pressure/100, ev.bmp180_data.pressure%100 ); break; default: diff --git a/examples/cpp_01_tasks/cpp_tasks.cpp b/examples/cpp_01_tasks/cpp_tasks.cpp index 160a0c8..9e381b9 100644 --- a/examples/cpp_01_tasks/cpp_tasks.cpp +++ b/examples/cpp_01_tasks/cpp_tasks.cpp @@ -72,7 +72,7 @@ private: uint32_t count; if(queue.receive(count, 1500) == 0) { - printf("task_2_t::task(): got %lu\n", count); + printf("task_2_t::task(): got %u\n", count); } else { printf("task_2_t::task(): no msg\n"); @@ -103,4 +103,4 @@ extern "C" void user_init(void) task_1.task_create("tsk1"); task_2.task_create("tsk2"); -} \ No newline at end of file +} diff --git a/examples/simple_cplusplus/simple.cpp b/examples/simple_cplusplus/simple.cpp index 8d964fa..1826499 100644 --- a/examples/simple_cplusplus/simple.cpp +++ b/examples/simple_cplusplus/simple.cpp @@ -16,7 +16,7 @@ public: Counter(uint32_t initial_count) { this->_count = initial_count; - printf("Counter initialised with count %ld\r\n", initial_count); + printf("Counter initialised with count %d\r\n", initial_count); } void Increment() @@ -50,7 +50,7 @@ void task1(void *pvParameters) break; } counter->Increment(); - printf("local counter %ld static counter %ld newly allocated counter %ld\r\n", local_counter.getCount(), + printf("local counter %d static counter %d newly allocated counter %d\r\n", local_counter.getCount(), static_counter.getCount(), new_counter->getCount()); vTaskDelay(100); } diff --git a/extras/bmp180/bmp180.c b/extras/bmp180/bmp180.c index 66203b0..7291236 100644 --- a/extras/bmp180/bmp180.c +++ b/extras/bmp180/bmp180.c @@ -75,10 +75,10 @@ static int16_t MD; // Forward declarations // static void bmp180_meassure(const bmp180_command_t* command); -static bool bmp180_informUser_Impl(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperatue, bmp180_press_t pressure); +static bool bmp180_informUser_Impl(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperature, bmp180_press_t pressure); // Set default implementation .. User gets result as bmp180_result_t event -bool (*bmp180_informUser)(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperatue, bmp180_press_t pressure) = bmp180_informUser_Impl; +bool (*bmp180_informUser)(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperature, bmp180_press_t pressure) = bmp180_informUser_Impl; // I2C Driver Task static void bmp180_driver_task(void *pvParameters) @@ -279,12 +279,12 @@ static void bmp180_meassure(const bmp180_command_t* command) } // Default user inform implementation -static bool bmp180_informUser_Impl(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperatue, bmp180_press_t pressure) +static bool bmp180_informUser_Impl(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperature, bmp180_press_t pressure) { bmp180_result_t result; result.cmd = cmd; - result.temperatue = temperatue; + result.temperature = temperature; result.pressure = pressure; return (xQueueSend(*resultQueue, &result, 0) == pdTRUE); diff --git a/extras/bmp180/bmp180.h b/extras/bmp180/bmp180.h index 73709ff..b675130 100644 --- a/extras/bmp180/bmp180.h +++ b/extras/bmp180/bmp180.h @@ -33,7 +33,7 @@ typedef uint32_t bmp180_press_t; typedef struct { uint8_t cmd; - bmp180_temp_t temperatue; + bmp180_temp_t temperature; bmp180_press_t pressure; } bmp180_result_t; @@ -50,6 +50,6 @@ void bmp180_trigger_temperature_measurement(const xQueueHandle* resultQueue); void bmp180_trigger_pressure_measurement(const xQueueHandle* resultQueue); // Give the user the chance to create it's own handler -extern bool (*bmp180_informUser)(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperatue, bmp180_press_t pressure); +extern bool (*bmp180_informUser)(const xQueueHandle* resultQueue, uint8_t cmd, bmp180_temp_t temperature, bmp180_press_t pressure); #endif /* DRIVER_BMP180_H_ */