From 9804469a30a877a830e115361b0b78859eaa4d67 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Wed, 11 Dec 2019 03:50:14 +0100 Subject: cell fixed; cell voice test passed --- code/esp32/components/eos/include/cell.h | 17 +++++++++++++---- code/esp32/components/eos/include/eos.h | 2 +- code/esp32/components/eos/include/msgq.h | 11 +++++++++++ code/esp32/components/eos/include/net.h | 1 + 4 files changed, 26 insertions(+), 5 deletions(-) (limited to 'code/esp32/components/eos/include') diff --git a/code/esp32/components/eos/include/cell.h b/code/esp32/components/eos/include/cell.h index 61da67a..f3eb89d 100644 --- a/code/esp32/components/eos/include/cell.h +++ b/code/esp32/components/eos/include/cell.h @@ -6,13 +6,22 @@ #define EOS_CELL_MTYPE_DATA_START 2 #define EOS_CELL_MTYPE_DATA_STOP 3 -#define EOS_CELL_MTYPE_AUDIO_START 2 -#define EOS_CELL_MTYPE_AUDIO_STOP 3 +#define EOS_CELL_MTYPE_AUDIO_START 4 +#define EOS_CELL_MTYPE_AUDIO_STOP 5 + +#define EOS_CELL_UART_MODE_NONE 0 +#define EOS_CELL_UART_MODE_PPP 1 +#define EOS_CELL_UART_MODE_RELAY 2 void eos_pcm_init(void); -ssize_t eos_pcm_write(void *data, size_t size); -void eos_pcm_call(void); + +ssize_t eos_pcm_read(unsigned char *data, size_t size); +int eos_pcm_push(unsigned char *data, size_t size); +void eos_pcm_start(void); +void eos_pcm_stop(void); void eos_modem_init(void); ssize_t eos_modem_write(void *data, size_t size); void eos_modem_set_mode(char mode); + +void eos_cell_init(void); \ No newline at end of file diff --git a/code/esp32/components/eos/include/eos.h b/code/esp32/components/eos/include/eos.h index e9a67d4..97e1530 100644 --- a/code/esp32/components/eos/include/eos.h +++ b/code/esp32/components/eos/include/eos.h @@ -10,7 +10,7 @@ #define EOS_TASK_SSIZE_UART 4096 #define EOS_TASK_SSIZE_I2S 4096 -#define EOS_TASK_SSIZE_NET_XCHG 4096 +#define EOS_TASK_SSIZE_NET_XCHG 8192 #define EOS_TASK_SSIZE_UDP_RCVR 4096 diff --git a/code/esp32/components/eos/include/msgq.h b/code/esp32/components/eos/include/msgq.h index 9c9c757..f5d5a31 100644 --- a/code/esp32/components/eos/include/msgq.h +++ b/code/esp32/components/eos/include/msgq.h @@ -17,3 +17,14 @@ typedef struct EOSMsgQ { void eos_msgq_init(EOSMsgQ *msgq, EOSMsgItem *array, uint8_t size); int eos_msgq_push(EOSMsgQ *msgq, unsigned char type, unsigned char *buffer, uint16_t len, uint8_t flags); void eos_msgq_pop(EOSMsgQ *msgq, unsigned char *type, unsigned char **buffer, uint16_t *len, uint8_t *flags); + +typedef struct EOSBufQ { + uint8_t idx_r; + uint8_t idx_w; + uint8_t size; + unsigned char **array; +} EOSBufQ; + +void eos_bufq_init(EOSBufQ *bufq, unsigned char **array, uint8_t size); +int eos_bufq_push(EOSBufQ *bufq, unsigned char *buffer); +unsigned char *eos_bufq_pop(EOSBufQ *bufq); diff --git a/code/esp32/components/eos/include/net.h b/code/esp32/components/eos/include/net.h index abf2893..df1bd0d 100644 --- a/code/esp32/components/eos/include/net.h +++ b/code/esp32/components/eos/include/net.h @@ -23,5 +23,6 @@ typedef void (*eos_net_fptr_t) (unsigned char, unsigned char *, uint16_t); void eos_net_init(void); unsigned char *eos_net_alloc(void); +void eos_net_free(unsigned char *buf); int eos_net_send(unsigned char mtype, unsigned char *buffer, uint16_t len, uint8_t flags); void eos_net_set_handler(unsigned char mtype, eos_net_fptr_t handler); \ No newline at end of file -- cgit v1.2.3