diff -r b4658776abb6 -r 9ffa9d727d80 src/hp34comm.h --- a/src/hp34comm.h Tue Dec 05 00:59:57 2017 +0100 +++ b/src/hp34comm.h Mon Nov 05 23:18:37 2018 +0100 @@ -22,18 +22,18 @@ char value[MAX_BUFF+1]; unsigned long id; } CMD; - + HPSerial(PinName tx, PinName rx); bool cmd_available(void); bool pop(CMD& cmd); bool cmd_buf_full(void); unsigned int nerrors(uint8_t errorno); - + void startup(void); void send(const uint8_t *buf, uint8_t size); void sendkey(uint8_t keycode); - + private: void pushCmd(uint8_t cmd, uint8_t size, char *payload); void rxIrq(void); @@ -57,7 +57,6 @@ // global state machine typedef enum { GSTATE_STARTING, - GSTATE_STARTING2, GSTATE_IDLE, GSTATE_TX, GSTATE_RX, @@ -66,18 +65,18 @@ /* gstate_t do_start(); */ /* gstate_t do_send(); */ /* gstate_t do_receive(); */ - + /* typedef gstate_t(HPSerial::*gstatemethod)(); */ /* statemethod const gstate_table[NUM_GSTATES] = { */ /* &HPSerial::do_start, */ /* &HPSerial::do_send, */ /* &HPSerial::do_receive, */ /* }; */ - + /* gstate_t run_gstate(gstate_t cur_state); */ private: gstate_t cur_gstate; - + public: // transmission state machine typedef enum { @@ -89,7 +88,7 @@ STATE_EOT, NUM_STATES} state_t; state_t state() {return cur_state;}; - + private: typedef struct state_data { uint8_t cmd; @@ -99,7 +98,6 @@ } state_data_t; void _startup(void); - void _startup2(void); state_t do_state_initial(uint8_t c=0x00); state_t do_state_command(uint8_t c); state_t do_state_payload_size(uint8_t c); @@ -108,9 +106,9 @@ state_t do_state_eot(uint8_t c=0x00); void send_ack(uint8_t c); - + typedef state_t(HPSerial::*statemethod)(uint8_t c); - static statemethod state_table[NUM_STATES]; + static statemethod state_table[NUM_STATES]; state_t run_state(state_t cur_state, uint8_t c); state_t cur_state;