From a44bb4970f2b1ab232beff12d39b46ff20f7b48e Mon Sep 17 00:00:00 2001 From: tianjialong Date: Sun, 12 Mar 2023 18:15:29 +0800 Subject: [PATCH] update --- app/MDK-ARM/app.uvguix.29643 | 6 +++--- usersrc/usermain.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/MDK-ARM/app.uvguix.29643 b/app/MDK-ARM/app.uvguix.29643 index 820fc1c..6f61178 100644 --- a/app/MDK-ARM/app.uvguix.29643 +++ b/app/MDK-ARM/app.uvguix.29643 @@ -1883,9 +1883,9 @@ ..\..\usersrc\usermain.c - 42 - 79 - 102 + 0 + 80 + 96 1 0 diff --git a/usersrc/usermain.c b/usersrc/usermain.c index fc79a53..6803847 100644 --- a/usersrc/usermain.c +++ b/usersrc/usermain.c @@ -93,37 +93,37 @@ void set_spi_table_sck(uint8_t startoff) void set_spi_table_mosi(uint8_t startoff, uint8_t txdata) { HAL_UART_Transmit(&huart1, &txdata, 1, 100); - for (size_t i = 0; i < spi_table_type_size; i++) + for (size_t i = 0; i < spi_table_type_size; i+=2) { if (i < startoff) { table[SPI_MOSI_TYPE][i] = 1; + table[SPI_MOSI_TYPE][i+1] = 1; } - else if (i >= startoff && i < (startoff + 8)) + else if ((i >= startoff) && (i < (startoff + 16))) { - (txdata & 0x80) ? (table[SPI_MOSI_TYPE][i] = 1) : (table[SPI_MOSI_TYPE][i] = 0); + table[SPI_MOSI_TYPE][i] = 1; + (txdata & 0x80) ? (table[SPI_MOSI_TYPE][i] = 1),(table[SPI_MOSI_TYPE][i+1] = 1) : (table[SPI_MOSI_TYPE][i] = 0),(table[SPI_MOSI_TYPE][i+1] = 0); txdata = txdata << 1; - HAL_UART_Transmit(&huart1, &txdata, 1, 100); } - else if (i <= spi_table_type_size - 2) + else if (i <= (spi_table_type_size - 2)) { table[SPI_MOSI_TYPE][i] = 0; + table[SPI_MOSI_TYPE][i+1] = 0; } else { table[SPI_MOSI_TYPE][i] = 1; + table[SPI_MOSI_TYPE][i+1] = 1; } } } void dotable(uint8_t txdata) { - int sel_startoff = 4; - int clock_startoff = 5; - int mosi_startoff = 5; - - memset(&table[SPI_MOSI_TYPE][0], 0, spi_table_type_size); - memset(&table[SPI_SCK_TYPE][0], 0, spi_table_type_size); + int sel_startoff = 3; + int clock_startoff = 4; + int mosi_startoff = 4; set_spi_table_sel(sel_startoff); set_spi_table_sck(clock_startoff);