From 60bc5eec80beeb3569d0282ec6be2232ccf06846 Mon Sep 17 00:00:00 2001 From: Alan Johnston Date: Tue, 30 Oct 2018 07:26:18 -0400 Subject: [PATCH] cw spacing cleanup --- cw/cw_main.c | 10 ++++++++++ radio.cw | Bin 55200 -> 55248 bytes 2 files changed, 10 insertions(+) diff --git a/cw/cw_main.c b/cw/cw_main.c index 69b9c2af..ebf219a9 100644 --- a/cw/cw_main.c +++ b/cw/cw_main.c @@ -158,6 +158,8 @@ int encode_header(uint8_t *buffer, int avail) { int count = 0; count += add_space(&buffer[count]); count += add_space(&buffer[count]); + count += add_space(&buffer[count]); + count += add_space(&buffer[count]); count += add_dash(&buffer[count], 1); // c count += add_dot(&buffer[count], 1); @@ -170,6 +172,7 @@ int encode_header(uint8_t *buffer, int avail) { count += add_dash(&buffer[count], 1); count += add_space(&buffer[count]); + count += add_space(&buffer[count]); count += add_space(&buffer[count]); count += add_dot(&buffer[count], 4); // h @@ -178,6 +181,7 @@ int encode_header(uint8_t *buffer, int avail) { count += add_dot(&buffer[count], 2); // i count += add_space(&buffer[count]); + count += add_space(&buffer[count]); count += add_space(&buffer[count]); count += add_dot(&buffer[count], 4); // h @@ -186,6 +190,7 @@ int encode_header(uint8_t *buffer, int avail) { count += add_dot(&buffer[count], 2); // i count += add_space(&buffer[count]); + count += add_space(&buffer[count]); count += add_space(&buffer[count]); count += add_space(&buffer[count]); @@ -210,24 +215,29 @@ int encode_tlm(uint8_t *buffer, int channel, int val1, int val2, int val3, int v count += encode_digit(&buffer[count], upper_digit(val1)); count += encode_digit(&buffer[count], lower_digit(val1)); + count += add_space(&buffer[count]); count += add_space(&buffer[count]); count += encode_digit(&buffer[count], channel); // for channel 1, encodes 1bb count += encode_digit(&buffer[count], upper_digit(val2)); count += encode_digit(&buffer[count], lower_digit(val2)); + count += add_space(&buffer[count]); count += add_space(&buffer[count]); count += encode_digit(&buffer[count], channel); // for channel 1, encodes 1cc count += encode_digit(&buffer[count], upper_digit(val3)); count += encode_digit(&buffer[count], lower_digit(val3)); + count += add_space(&buffer[count]); count += add_space(&buffer[count]); count += encode_digit(&buffer[count], channel); // for channel 1, encodes 1dd count += encode_digit(&buffer[count], upper_digit(val4)); count += encode_digit(&buffer[count], lower_digit(val4)); + count += add_space(&buffer[count]); + count += add_space(&buffer[count]); count += add_space(&buffer[count]); //printf("DEBUG count: %d avail: %d \n", count, avail); diff --git a/radio.cw b/radio.cw index e980f3d516bb03905d82a95b63c4836f690c2587..f101a012470bbb7ffc08a087d22fd54c746ea3bc 100755 GIT binary patch delta 6734 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 Kht+=G?EeF$HFqrGgA~J+tjutNVPH8@S=jJ?G8+ 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