j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Examples: Fix printf argument flags for older example programs

Browse source
This commit is contained in:
Angus Gratton 2015-08-10 14:50:56 +10:00
parent 72670be012
commit 3eee1a9845
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/button/button.c
View file

@ -34,7 +34,7 @@ void buttonPollTask(void *pvParameters)
{ {
taskYIELD(); taskYIELD();
} }
printf("Polled for button press at %dms\r\n", xTaskGetTickCount()*portTICK_RATE_MS); printf("Polled for button press at %ldms\r\n", xTaskGetTickCount()*portTICK_RATE_MS);
vTaskDelay(200 / portTICK_RATE_MS); vTaskDelay(200 / portTICK_RATE_MS);
} }
} }
@ -59,7 +59,7 @@ void buttonIntTask(void *pvParameters)
xQueueReceive(*tsqueue, &button_ts, portMAX_DELAY); xQueueReceive(*tsqueue, &button_ts, portMAX_DELAY);
button_ts *= portTICK_RATE_MS; button_ts *= portTICK_RATE_MS;
if(last < button_ts-200) { if(last < button_ts-200) {
printf("Button interrupt fired at %dms\r\n", button_ts); printf("Button interrupt fired at %ldms\r\n", button_ts);
last = button_ts; last = button_ts;
} }
} }

16
examples/experiments/timers/timers.c
View file

@ -19,8 +19,8 @@ IRAM void dump_frc1_seq(void)
uint32_t f1_a = TIMER_FRC1_COUNT_REG; uint32_t f1_a = TIMER_FRC1_COUNT_REG;
uint32_t f1_b = TIMER_FRC1_COUNT_REG; uint32_t f1_b = TIMER_FRC1_COUNT_REG;
uint32_t f1_c = TIMER_FRC1_COUNT_REG; uint32_t f1_c = TIMER_FRC1_COUNT_REG;
printf("FRC1 sequence 0x%08x 0x%08x 0x%08x\r\n", f1_a, f1_b, f1_c); printf("FRC1 sequence 0x%08lx 0x%08lx 0x%08lx\r\n", f1_a, f1_b, f1_c);
printf("FRC1 deltas %d %d \r\n", f1_b-f1_a, f1_c-f1_b); printf("FRC1 deltas %ld %ld \r\n", f1_b-f1_a, f1_c-f1_b);
} }
IRAM void dump_frc2_seq(void) IRAM void dump_frc2_seq(void)
@ -36,8 +36,8 @@ IRAM void dump_frc2_seq(void)
uint32_t f2_a = TIMER_FRC2_COUNT_REG; uint32_t f2_a = TIMER_FRC2_COUNT_REG;
uint32_t f2_b = TIMER_FRC2_COUNT_REG; uint32_t f2_b = TIMER_FRC2_COUNT_REG;
uint32_t f2_c = TIMER_FRC2_COUNT_REG; uint32_t f2_c = TIMER_FRC2_COUNT_REG;
printf("FRC2 sequence 0x%08x 0x%08x 0x%08x\r\n", f2_a, f2_b, f2_c); printf("FRC2 sequence 0x%08lx 0x%08lx 0x%08lx\r\n", f2_a, f2_b, f2_c);
printf("FRC2 deltas %d %d \r\n", f2_b-f2_a, f2_c-f2_b); printf("FRC2 deltas %ld %ld \r\n", f2_b-f2_a, f2_c-f2_b);
} }
IRAM void dump_timer_regs(const char *msg) IRAM void dump_timer_regs(const char *msg)
@ -55,7 +55,7 @@ IRAM void dump_timer_regs(const char *msg)
for(int i = 0; i < DUMP_SZ; i++) { for(int i = 0; i < DUMP_SZ; i++) {
if(i % 4 == 0) if(i % 4 == 0)
printf("%s0x%02x: ", i ? "\r\n" : "", i*4); printf("%s0x%02x: ", i ? "\r\n" : "", i*4);
printf("%08x ", chunk[i]); printf("%08lx ", chunk[i]);
} }
printf("\r\n"); printf("\r\n");
@ -76,7 +76,7 @@ static volatile uint32_t frc1_last_count_val;
void timerRegTask(void *pvParameters) void timerRegTask(void *pvParameters)
{ {
while(1) { while(1) {
printf("state at task tick count %d:\r\n", xTaskGetTickCount()); printf("state at task tick count %ld:\r\n", xTaskGetTickCount());
dump_timer_regs(""); dump_timer_regs("");
/* /*
@ -86,10 +86,10 @@ void timerRegTask(void *pvParameters)
printf("INUM_MAX count %d\r\n", max_count); printf("INUM_MAX count %d\r\n", max_count);
*/ */
printf("frc1 handler called %d times, last value 0x%08x\r\n", frc1_handler_call_count, printf("frc1 handler called %ld times, last value 0x%08lx\r\n", frc1_handler_call_count,
frc1_last_count_val); frc1_last_count_val);
printf("frc2 handler called %d times, last value 0x%08x\r\n", frc2_handler_call_count, printf("frc2 handler called %ld times, last value 0x%08lx\r\n", frc2_handler_call_count,
frc2_last_count_val); frc2_last_count_val);
vTaskDelay(500 / portTICK_RATE_MS); vTaskDelay(500 / portTICK_RATE_MS);