diff options
| author | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2020-12-06 17:44:11 +0300 |
|---|---|---|
| committer | Alexey 'Cluster' Avdyukhin <clusterrr@clusterrr.com> | 2020-12-06 17:44:11 +0300 |
| commit | 77ea77c7c5fb3f4c519e002166708695e6bde4a7 (patch) | |
| tree | 17c253aba7e715ef789a625a4aecc30094388c1b | |
| parent | 618c35420fa2c3275c984fe75a4145cb3e8ed1b7 (diff) | |
Minor refactoring
| -rw-r--r-- | comm.c | 119 |
1 files changed, 64 insertions, 55 deletions
@@ -51,61 +51,70 @@ void comm_send_byte(uint8_t data) void comm_proceed(uint8_t data)
{
- if (comm_recv_error && data != 'F') return;
- comm_recv_error = 0;
- if (!comm_recv_pos)
- {
- comm_recv_crc = 0;
- comm_recv_done = 0;
- }
- comm_recv_crc= calc_crc8(comm_recv_crc, data);
- unsigned int l = comm_recv_pos-4;
- switch (comm_recv_pos)
- {
- case 0:
- if (data != 'F')
- {
- comm_recv_error = 1;
- comm_start(COMMAND_ERROR_INVALID, 0);
- }
- break;
- case 1:
- comm_recv_command = data;
- break;
- case 2:
- comm_recv_length = data;
- break;
- case 3:
- comm_recv_length |= (uint16_t)data << 8;
- break;
- default:
- if (l >= sizeof(recv_buffer))
- {
- comm_recv_pos = 0;
- comm_recv_error = 1;
- comm_start(COMMAND_ERROR_OVERFLOW, 0);
- return;
- }
- else if (l < comm_recv_length)
- {
- recv_buffer[l] = data;
- } else if (l == comm_recv_length)
- {
- if (!comm_recv_crc)
- {
- comm_recv_done = 1;
- }
- else
- {
- comm_recv_error = 1;
- comm_start(COMMAND_ERROR_CRC, 0);
- }
- comm_recv_pos = 0;
- return;
- }
- break;
- }
- comm_recv_pos++;
+ if (comm_recv_error && data != 'F')
+ return;
+ comm_recv_error = 0;
+ if (!comm_recv_pos)
+ {
+ comm_recv_crc = 0;
+ comm_recv_done = 0;
+ }
+ comm_recv_crc = calc_crc8(comm_recv_crc, data);
+ switch (comm_recv_pos)
+ {
+ case 0:
+ {
+ if (data != 'F')
+ {
+ comm_recv_error = 1;
+ comm_start(COMMAND_ERROR_INVALID, 0);
+ }
+ }
+ break;
+ case 1:
+ {
+ comm_recv_command = data;
+ }
+ break;
+ case 2:
+ {
+ comm_recv_length = data;
+ }
+ break;
+ case 3:
+ {
+ comm_recv_length |= (uint16_t) data << 8;
+ }
+ break;
+ default:
+ {
+ uint16_t pos = comm_recv_pos - 4;
+ if (pos >= sizeof(recv_buffer))
+ {
+ comm_recv_pos = 0;
+ comm_recv_error = 1;
+ comm_start(COMMAND_ERROR_OVERFLOW, 0);
+ return;
+ } else if (pos < comm_recv_length)
+ {
+ recv_buffer[pos] = data;
+ } else if (pos == comm_recv_length)
+ {
+ if (!comm_recv_crc)
+ {
+ comm_recv_done = 1;
+ } else
+ {
+ comm_recv_error = 1;
+ comm_start(COMMAND_ERROR_CRC, 0);
+ }
+ comm_recv_pos = 0;
+ return;
+ }
+ }
+ break;
+ }
+ comm_recv_pos++;
}
void comm_init()
|