vcs.slashdirt.org Git - sw/tic2json.git/commitdiff

diff --git a/embedded/ARM-Mbed/mbed-os-tic2json/main.cpp b/embedded/ARM-Mbed/mbed-os-tic2json/main.cpp

index 297130603a1ea64690155161f256c3b390a2f1ee..8fd9586b540fc2bedc4d98ad288891b858314b64 100644 (file)

--- a/embedded/ARM-Mbed/mbed-os-tic2json/main.cpp

+++ b/embedded/ARM-Mbed/mbed-os-tic2json/main.cpp

}

extern "C" {

- void tic2json_main(void);

+ void tic2json_main(FILE * yyin);

}

int main()

{

while (true)

- tic2json_main();

+ tic2json_main(stdin);

return 0;

}

diff --git a/embedded/ESP-RTOS/esptic/main/main.c b/embedded/ESP-RTOS/esptic/main/main.c

index e3f8a842f7ee0babf81b7faa1d68c7292b98ca34..3ff4e9ed4c95a6a499770b47a0de29f48c8bdbdc 100644 (file)

--- a/embedded/ESP-RTOS/esptic/main/main.c

+++ b/embedded/ESP-RTOS/esptic/main/main.c

* - TICV02: max stack 5816, max heap: 3764+80

*/

+#include <stdio.h>

+

#include "freertos/FreeRTOS.h"

#include "freertos/task.h"

#include "esp_vfs_dev.h"

#include "driver/uart.h"

-void tic2json_main(void);

+void tic2json_main(FILE * yyin);

void app_main(void)

{

esp_vfs_dev_uart_use_driver(CONFIG_ESPTIC_UART_NUM);

while (1)

- tic2json_main();

+ tic2json_main(stdin);

}

diff --git a/embedded/Pico/picotic/picotic.c b/embedded/Pico/picotic/picotic.c

index 3febd63417ba4d526eea90d993923148ac6488eb..731ca9e9456ede887d6ecdeec6e31d141c7d69ce 100644 (file)

--- a/embedded/Pico/picotic/picotic.c

+++ b/embedded/Pico/picotic/picotic.c

* Receives TIC on RX, outputs JSON on TX.

*/

+#include <stdio.h>

+

#include "pico/stdio_uart.h"

#include "hardware/uart.h"

#define TICBAUDRATE 1200

#endif

-void tic2json_main(void);

+void tic2json_main(FILE * yyin);

int main()

{

uart_set_format(UART_ID, 7, 1, UART_PARITY_EVEN);

while (1)

- tic2json_main();

+ tic2json_main(stdin);

return 0;

}

diff --git a/tic2json.c b/tic2json.c

index 399b884c799405987ed56d117cab371f5ae50bd4..cb0ed04c514c51e348b8a67849b3b5d55317118c 100644 (file)

--- a/tic2json.c

+++ b/tic2json.c

#else /* BAREBUILD */

+extern FILE *ticv01yyin;

+extern FILE *ticv02yyin;

+

#ifdef PRINT2BUF

/**

* tic2json_main(), print to buffer variant.

+ * @param yyin the FILE to read TIC frames from

* @param buf an allocated buffer to write JSON data to

* @param size the size of the buffer

* @param an optional callback to call after each printed frame, before the buffer content is overwritten.

*/

-void tic2json_main(char * buf, size_t size, tic2json_framecb_t cb)

+void tic2json_main(FILE * yyin, char * buf, size_t size, tic2json_framecb_t cb)

#else

-void tic2json_main(void)

+void tic2json_main(FILE * yyin)

#endif

{

ticinit();

ticprintf("%c", tp.framedelims[0]);

#if defined(TICV01)

+ ticv01yyin = yyin;

ticv01yyparse();

ticv01yylex_destroy();

#elif defined(TICV02)

+ ticv02yyin = yyin;

ticv02yyparse();

ticv02yylex_destroy();

#else