diff --git a/Core/Inc/main.h b/Core/Inc/main.h
index dfbc541..a85962a 100644
--- a/Core/Inc/main.h
+++ b/Core/Inc/main.h
@@ -57,8 +57,6 @@ void Error_Handler(void);
/* USER CODE END EFP */
/* Private defines -----------------------------------------------------------*/
-#define SPI1_NSS_Pin GPIO_PIN_4
-#define SPI1_NSS_GPIO_Port GPIOA
#define RADIO_RST_Pin GPIO_PIN_0
#define RADIO_RST_GPIO_Port GPIOB
#define WS2812_Pin GPIO_PIN_11
diff --git a/Core/Src/gpio.c b/Core/Src/gpio.c
index a6643b5..c2ce754 100644
--- a/Core/Src/gpio.c
+++ b/Core/Src/gpio.c
@@ -50,17 +50,17 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOB_CLK_ENABLE();
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(SPI1_NSS_GPIO_Port, SPI1_NSS_Pin, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(GPIOA, GPIO_PIN_4, GPIO_PIN_RESET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOB, RADIO_RST_Pin|RADIO_RXEN_Pin|RADIO_TXEN_Pin, GPIO_PIN_RESET);
- /*Configure GPIO pin : SPI1_NSS_Pin */
- GPIO_InitStruct.Pin = SPI1_NSS_Pin;
+ /*Configure GPIO pin : PA4 */
+ GPIO_InitStruct.Pin = GPIO_PIN_4;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
- HAL_GPIO_Init(SPI1_NSS_GPIO_Port, &GPIO_InitStruct);
+ HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/*Configure GPIO pin : RADIO_RST_Pin */
GPIO_InitStruct.Pin = RADIO_RST_Pin;
diff --git a/Core/Src/main.c b/Core/Src/main.c
index 16c9e2c..a568383 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -296,17 +296,13 @@ HAL_GPIO_WritePin(RADIO_NSS_PORT, RADIO_NSS_PIN, GPIO_PIN_RESET);
HAL_SPI_TransmitReceive(&hspi1, tx, rx, 3, 100);
HAL_GPIO_WritePin(RADIO_NSS_PORT, RADIO_NSS_PIN, GPIO_PIN_SET);
-/* 3. 打印结果 */
printf("tx: %02X %02X %02X\n", tx[0], tx[1], tx[2]);
printf("rx: %02X %02X %02X\n", rx[0], rx[1], rx[2]);
-/* 4. 判断 */
-if (rx[1] == 0xFF && rx[2] == 0xFF)
- printf("-> MISO 全高,SPI 没回话\n");
-else if (rx[1] == 0x00 && rx[2] == 0x00)
- printf("-> MISO 全低,可能短地\n");
-else if (rx[1] == 0x40 || rx[2] == 0x40)
- printf("-> SPI 双向 OK!\n");
+ uint8_t id=1;
+Radio.ReadRegisters(0x00, &id, 1); // 读 Chip Mode 寄存器
+printf("Reg00=%d (expect 0x40 or 0xFF)\r\n", id);
+
printf( "\n\n\r SX1281 Ping Pong Demo Application. %s\n\n\r", FIRMWARE_VERSION );
printf( "\n\n\r Radio firmware version 0x%x\n\n\r", Radio.GetFirmwareVersion( ) );
@@ -378,16 +374,33 @@ else if (rx[1] == 0x40 || rx[2] == 0x40)
#error "Please select the mode of operation for the Ping Ping demo"
#endif
- Radio.SetStandby( STDBY_RC );
- Radio.SetPacketType( modulationParams.PacketType );
- Radio.SetModulationParams( &modulationParams );
- Radio.SetPacketParams( &packetParams );
- Radio.SetRfFrequency( RF_FREQUENCY );
- Radio.SetBufferBaseAddresses( 0x00, 0x00 );
- Radio.SetTxParams( TX_OUTPUT_POWER, RADIO_RAMP_02_US );
-
- SX1281SetPollingMode( );
+ Radio.SetStandby( STDBY_RC );
+ Radio.SetPacketType( modulationParams.PacketType );
+ Radio.SetModulationParams( &modulationParams );
+ Radio.SetPacketParams( &packetParams );
+ Radio.SetRfFrequency( RF_FREQUENCY );
+ Radio.SetBufferBaseAddresses( 0x00, 0x00 );
+ Radio.SetTxParams( TX_OUTPUT_POWER, RADIO_RAMP_02_US );
+ Radio.SetStandby( STDBY_RC );
+ switch(modulationParams.Params.LoRa.SpreadingFactor){
+ case LORA_SF5:
+ case LORA_SF6:
+ Radio.WriteRegister(0x0925,0x1E);
+ break;
+ case LORA_SF7:
+ case LORA_SF8:
+ Radio.WriteRegister(0x0925,0x37);
+ break;
+ case LORA_SF9:
+ case LORA_SF10:
+ case LORA_SF11:
+ case LORA_SF12:
+ Radio.WriteRegister(0x0925,0x32);
+ break;
+ }
+// SX1281SetPollingMode( );
+ SX1281SetInterruptMode();
#if defined( MODE_BLE )
// only used in GENERIC and BLE mode
Radio.SetSyncWord( 1, ( uint8_t[] ){ 0xDD, 0xA0, 0x96, 0x69, 0xDD } );
@@ -405,18 +418,24 @@ else if (rx[1] == 0x40 || rx[2] == 0x40)
// GpioWrite( LED_TX_PORT, LED_TX_PIN, 0 );
// GpioWrite( LED_RX_PORT, LED_RX_PIN, 0 );
- Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
-
- Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
- AppState = APP_LOWPOWER;
- /* 人为触发一次发送,验证整条通路 */
-static uint8_t once = 1;
-if (once) {
- once = 0;
- uint8_t ping[] = "PING";
- Radio.SendPayload(ping, 4, (TickTime_t){RADIO_TICK_SIZE_1000_US, 100});
- printf("Force TX\n");
-}
+
+ AppState = APP_LOWPOWER;
+
+
+
+// Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+
+// Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// //Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+// Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, 0xFFFF } );
+
+ Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+ Radio.SendPayload((uint8_t*)"12345",5, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE });
+
+ uint8_t status;
+Radio.ReadRegisters(0x01, &status, 1); // 读取状态寄存器
+printf("Status=%d\n", status);
/* USER CODE END 2 */
/* Infinite loop */
@@ -426,189 +445,196 @@ if (once) {
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
- static uint8_t once = 1;
-if (once) {
- once = 0;
- uint8_t ping[] = "PING";
- Radio.SetDioIrqParams(TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE);
- Radio.SendPayload(ping, 4, (TickTime_t){RADIO_TICK_SIZE_1000_US, 100});
- printf("Force TX -> should RX myself\r\n");
-}
-// uint16_t irq = Radio.GetIrqStatus();
-//if (irq) printf("IRQ=0x%04X\r\n", irq);
- static uint8_t fifty = 0;
-if(fifty<50){
- fifty++;
- uint8_t id;
-Radio.ReadRegisters(0x00, &id, 1); // 读 Chip Mode 寄存器
-printf("Reg00=0x%02X (expect 0x40 or 0xFF)\r\n", id);
-}
- SX1281ProcessIrqs( );
+// static uint8_t once = 1;
+//if (once) {
+// once = 0;
+// uint8_t ping[] = "PING";
+// Radio.SetDioIrqParams(TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE);
+// Radio.SendPayload(ping, 4, (TickTime_t){RADIO_TICK_SIZE_1000_US, 100});
+// printf("Force TX -> should RX myself\r\n");
+//}
+
- switch( AppState )
- {
- case APP_RX:
- AppState = APP_LOWPOWER;
- // GpioWrite( LED_RX_PORT, LED_RX_PIN, GpioRead( LED_RX_PORT, LED_RX_PIN ) ^ 1 );
- Radio.GetPayload( Buffer, &BufferSize, BUFFER_SIZE );
- #if defined( MODE_BLE )
- // Remove the 2st bytes that are BLE header from Buffer
- memcpy( Buffer, Buffer+2, PINGPONGSIZE );
- #endif // MODE_BLE
- if( isMaster == true )
- {
- if( BufferSize > 0 )
- {
- if( strncmp( ( const char* )Buffer, ( const char* )PongMsg, PINGPONGSIZE ) == 0 )
- {
- printf( "...Pong\r\n" );
- #if defined( MODE_BLE )
- memcpy( Buffer, ble_header_adv.Serial, 2 );
- memcpy( Buffer+2, PingMsg, PINGPONGSIZE );
- #else
- memcpy( Buffer, PingMsg, PINGPONGSIZE );
- #endif
- Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
- }
- else if( strncmp( ( const char* )Buffer, ( const char* )PingMsg, PINGPONGSIZE ) == 0 )
- {
- // A master already exists then become a slave
- printf( "...Ping - switch to Slave\r\n" );
- isMaster = false;
- #if defined( MODE_BLE )
- memcpy( Buffer, ble_header_adv.Serial, 2 );
- memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
- #else
- memcpy( Buffer, PongMsg, PINGPONGSIZE );
- #endif
- Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
- }
- else // valid reception but neither a PING or a PONG message
- { // Set device as master ans start again
- isMaster = true;
- #if defined( MODE_BLE )
- memcpy( Buffer, ble_header_adv.Serial, 2 );
- memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
- Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
- #else
- Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
- #endif
- }
- }
- }
- else
- {
- if( BufferSize > 0 )
- {
- if( strncmp( ( const char* )Buffer, ( const char* )PingMsg, PINGPONGSIZE ) == 0 )
- {
- printf( "...Ping\r\n" );
- #if defined( MODE_BLE )
- ble_header_adv.Fields.length = PINGPONGSIZE + 2;
- memcpy( Buffer, ble_header_adv.Serial, 2 );
- memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
- #else
- memcpy( Buffer, PongMsg, PINGPONGSIZE );
- #endif
- Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
- }
- else // valid reception but not a PING as expected
- {
- printf( "...Unexpected packet - switch to master\r\n" );
- isMaster = true;
- Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
- }
- }
- }
- break;
+ SX1281ProcessIrqs( );
+ HAL_Delay(1000);
+
- case APP_TX:
- AppState = APP_LOWPOWER;
- // GpioWrite( LED_TX_PORT, LED_TX_PIN, GpioRead( LED_TX_PORT, LED_TX_PIN ) ^ 1 );
- if( isMaster == true )
- {
- printf( "Ping...\r\n" );
- }
- else
- {
- printf( "Pong...\r\n" );
- }
- Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
- break;
+ uint16_t irq = Radio.GetIrqStatus();
+if (irq) printf("IRQ=0x%04X\r\n", irq);
+
+ uint8_t tx[3] = {0x48, 0x00, 0x00}; // 读 Reg00
+uint8_t rx[3] = {0};
+HAL_GPIO_WritePin(RADIO_NSS_PORT, RADIO_NSS_PIN, GPIO_PIN_RESET);
+HAL_SPI_TransmitReceive(&hspi1, tx, rx, 3, 100);
+HAL_GPIO_WritePin(RADIO_NSS_PORT, RADIO_NSS_PIN, GPIO_PIN_SET);
+printf("tx: %02X %02X %02X\n", tx[0], tx[1], tx[2]);
+printf("rx: %02X %02X %02X\n", rx[0], rx[1], rx[2]);
- case APP_RX_TIMEOUT:
- AppState = APP_LOWPOWER;
- if( isMaster == true )
- {
- // Send the next PING frame
- #if defined( MODE_BLE )
- ble_header_adv.Fields.length = PINGPONGSIZE + 2;
- memcpy( Buffer, ble_header_adv.Serial, 2 );
- memcpy( Buffer+2, PingMsg, PINGPONGSIZE );
- #else
- memcpy( Buffer, PingMsg, PINGPONGSIZE );
- #endif
- Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
- }
- else
- {
- Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
- }
- break;
- case APP_RX_ERROR:
- AppState = APP_LOWPOWER;
- // We have received a Packet with a CRC error, send reply as if packet was correct
- if( isMaster == true )
- {
- // Send the next PING frame
- #if defined( MODE_BLE )
- ble_header_adv.Fields.length = PINGPONGSIZE + 2;
- memcpy( Buffer, ble_header_adv.Serial, 2 );
- memcpy( Buffer+2, PingMsg, PINGPONGSIZE );
- #else
- memcpy( Buffer, PingMsg, PINGPONGSIZE );
- #endif
- Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
- }
- else
- {
- // Send the next PONG frame
- #if defined( MODE_BLE )
- ble_header_adv.Fields.length = PINGPONGSIZE + 2;
- memcpy( Buffer, ble_header_adv.Serial, 2 );
- memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
- #else
- memcpy( Buffer, PongMsg, PINGPONGSIZE );
- #endif
- Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
- }
- break;
+// switch( AppState )
+// {
+// case APP_RX:
+// AppState = APP_LOWPOWER;
+// // GpioWrite( LED_RX_PORT, LED_RX_PIN, GpioRead( LED_RX_PORT, LED_RX_PIN ) ^ 1 );
+// Radio.GetPayload( Buffer, &BufferSize, BUFFER_SIZE );
+// #if defined( MODE_BLE )
+// // Remove the 2st bytes that are BLE header from Buffer
+// memcpy( Buffer, Buffer+2, PINGPONGSIZE );
+// #endif // MODE_BLE
+// if( isMaster == true )
+// {
+// if( BufferSize > 0 )
+// {
+// if( strncmp( ( const char* )Buffer, ( const char* )PongMsg, PINGPONGSIZE ) == 0 )
+// {
+// printf( "...Pong\r\n" );
+// #if defined( MODE_BLE )
+// memcpy( Buffer, ble_header_adv.Serial, 2 );
+// memcpy( Buffer+2, PingMsg, PINGPONGSIZE );
+// #else
+// memcpy( Buffer, PingMsg, PINGPONGSIZE );
+// #endif
+// Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
+// }
+// else if( strncmp( ( const char* )Buffer, ( const char* )PingMsg, PINGPONGSIZE ) == 0 )
+// {
+// // A master already exists then become a slave
+// printf( "...Ping - switch to Slave\r\n" );
+// isMaster = false;
+// #if defined( MODE_BLE )
+// memcpy( Buffer, ble_header_adv.Serial, 2 );
+// memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
+// #else
+// memcpy( Buffer, PongMsg, PINGPONGSIZE );
+// #endif
+// Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
+// }
+// else // valid reception but neither a PING or a PONG message
+// { // Set device as master ans start again
+// isMaster = true;
+// #if defined( MODE_BLE )
+// memcpy( Buffer, ble_header_adv.Serial, 2 );
+// memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
+// Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
+// #else
+// Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+// #endif
+// }
+// }
+// }
+// else
+// {
+// if( BufferSize > 0 )
+// {
+// if( strncmp( ( const char* )Buffer, ( const char* )PingMsg, PINGPONGSIZE ) == 0 )
+// {
+// printf( "...Ping\r\n" );
+// #if defined( MODE_BLE )
+// ble_header_adv.Fields.length = PINGPONGSIZE + 2;
+// memcpy( Buffer, ble_header_adv.Serial, 2 );
+// memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
+// #else
+// memcpy( Buffer, PongMsg, PINGPONGSIZE );
+// #endif
+// Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
+// }
+// else // valid reception but not a PING as expected
+// {
+// printf( "...Unexpected packet - switch to master\r\n" );
+// isMaster = true;
+// Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+// }
+// }
+// }
+// break;
- case APP_TX_TIMEOUT:
- AppState = APP_LOWPOWER;
- Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
- Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
- break;
+// case APP_TX:
+// AppState = APP_LOWPOWER;
+// // GpioWrite( LED_TX_PORT, LED_TX_PIN, GpioRead( LED_TX_PORT, LED_TX_PIN ) ^ 1 );
+// if( isMaster == true )
+// {
+// printf( "Ping...\r\n" );
+// }
+// else
+// {
+// printf( "Pong...\r\n" );
+// }
+// Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+// break;
- case APP_LOWPOWER:
- break;
+// case APP_RX_TIMEOUT:
+// AppState = APP_LOWPOWER;
+// if( isMaster == true )
+// {
+// // Send the next PING frame
+// #if defined( MODE_BLE )
+// ble_header_adv.Fields.length = PINGPONGSIZE + 2;
+// memcpy( Buffer, ble_header_adv.Serial, 2 );
+// memcpy( Buffer+2, PingMsg, PINGPONGSIZE );
+// #else
+// memcpy( Buffer, PingMsg, PINGPONGSIZE );
+// #endif
+// Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
+// }
+// else
+// {
+// Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+// }
+// break;
- default:
- // Set low power
- break;
- }
+// case APP_RX_ERROR:
+// AppState = APP_LOWPOWER;
+// // We have received a Packet with a CRC error, send reply as if packet was correct
+// if( isMaster == true )
+// {
+// // Send the next PING frame
+// #if defined( MODE_BLE )
+// ble_header_adv.Fields.length = PINGPONGSIZE + 2;
+// memcpy( Buffer, ble_header_adv.Serial, 2 );
+// memcpy( Buffer+2, PingMsg, PINGPONGSIZE );
+// #else
+// memcpy( Buffer, PingMsg, PINGPONGSIZE );
+// #endif
+// Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
+// }
+// else
+// {
+// // Send the next PONG frame
+// #if defined( MODE_BLE )
+// ble_header_adv.Fields.length = PINGPONGSIZE + 2;
+// memcpy( Buffer, ble_header_adv.Serial, 2 );
+// memcpy( Buffer+2, PongMsg, PINGPONGSIZE );
+// #else
+// memcpy( Buffer, PongMsg, PINGPONGSIZE );
+// #endif
+// Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SendPayload( Buffer, BufferSize, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE } );
+// }
+// break;
+
+// case APP_TX_TIMEOUT:
+// AppState = APP_LOWPOWER;
+// Radio.SetDioIrqParams( RxIrqMask, RxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+// Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+// break;
+
+// case APP_LOWPOWER:
+// break;
+
+// default:
+// // Set low power
+// break;
+// }
}
/* USER CODE END 3 */
@@ -658,32 +684,53 @@ void SystemClock_Config(void)
void OnTxDone( void )
{
AppState = APP_TX;
+ printf( "<>>>>>>>>OnTxDone\n\r" );
+ Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+ Radio.SendPayload((uint8_t*)"12345",5, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE });
}
void OnRxDone( void )
{
AppState = APP_RX;
+ //printf( "<>>>>>>>>OnRxDone\n\r" );
+ BufferSize = 0;
+ Radio.GetPayload( Buffer, &BufferSize, BUFFER_SIZE );
+ Buffer[BufferSize+1] = 0;
+ //printf("size = %d ,%s",BufferSize,Buffer);
+ printf("OnRxDone\r\n");
+ printf("%d",Buffer);
+ //Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
}
void OnTxTimeout( void )
{
- AppState = APP_TX_TIMEOUT;
+ AppState = APP_TX_TIMEOUT;
printf( "<>>>>>>>>TXE\n\r" );
+ Radio.SetDioIrqParams( TxIrqMask, TxIrqMask, IRQ_RADIO_NONE, IRQ_RADIO_NONE );
+ Radio.SendPayload((uint8_t*)"12345",5, ( TickTime_t ){ RX_TIMEOUT_TICK_SIZE, TX_TIMEOUT_VALUE });
+
}
void OnRxTimeout( void )
{
AppState = APP_RX_TIMEOUT;
+ printf( "<>>>>>>>>OnRxTimeout\n\r" );
+ //Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+ Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, 0xFFFF } );
+
}
void OnRxError( IrqErrorCode_t errorCode )
{
- AppState = APP_RX_ERROR;
+ AppState = APP_RX_ERROR;
printf( "RXE<>>>>>>>>\n\r" );
+ Radio.SetRx( ( TickTime_t ) { RX_TIMEOUT_TICK_SIZE, RX_TIMEOUT_VALUE } );
+
}
void OnCadDone( bool channelActivityDetected )
{
+ printf( "<>>>>>>>>OnCadDone\n\r" );
}
/* USER CODE END 4 */
diff --git a/Core/Src/spi.c b/Core/Src/spi.c
index 82d7550..20f36a7 100644
--- a/Core/Src/spi.c
+++ b/Core/Src/spi.c
@@ -45,7 +45,7 @@ void MX_SPI1_Init(void)
hspi1.Init.CLKPolarity = SPI_POLARITY_LOW;
hspi1.Init.CLKPhase = SPI_PHASE_1EDGE;
hspi1.Init.NSS = SPI_NSS_SOFT;
- hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_8;
+ hspi1.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16;
hspi1.Init.FirstBit = SPI_FIRSTBIT_MSB;
hspi1.Init.TIMode = SPI_TIMODE_DISABLE;
hspi1.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE;
diff --git a/MDK-ARM/MR16.uvguix.yxm23 b/MDK-ARM/MR16.uvguix.yxm23
index 0045ff2..163d1df 100644
--- a/MDK-ARM/MR16.uvguix.yxm23
+++ b/MDK-ARM/MR16.uvguix.yxm23
@@ -15,17 +15,17 @@
38003
Registers
- 124 79
+ 124 100
346
Code Coverage
- 877 603
+ 877 100
204
Performance Analyzer
- 1037 155 155 133
+ 1037 155 155 100
@@ -90,28 +90,28 @@
44
- 2
- 3
+ 0
+ 1
- -1
- -1
+ -32000
+ -32000
-1
-1
- 124
- 68
- 1113
- 965
+ 156
+ 91
+ 1136
+ 951
0
- 1786
- 010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000001000000160000000A000000010000001E443A5C435542454D585C4D5231365C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF2C443A5C435542454D585C4D5231365C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000FFDC7800FFFFFFFF26443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C726164696F2E680000000007726164696F2E6800000000BECEA100FFFFFFFF2B443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C7378313238312D68616C2E63000000000C7378313238312D68616C2E6300000000F0A0A100FFFFFFFF28443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C68772D6770696F2E63000000000968772D6770696F2E6300000000BCA8E100FFFFFFFF28443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C68772D6770696F2E68000000000968772D6770696F2E68000000009CC1B600FFFFFFFF27443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C68772D7370692E68000000000868772D7370692E6800000000F7B88600FFFFFFFF28443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C68772D756172742E68000000000968772D756172742E6800000000D9ADC200FFFFFFFF46443A5C435542454D585C4D5231365C447269766572735C434D5349535C4465766963655C53545C53544D3332463178785C496E636C7564655C73746D33326631303378622E68000000000D73746D33326631303378622E6800000000A5C2D700FFFFFFFF28443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C68772D756172742E63000000000968772D756172742E6300000000B3A6BE00FFFFFFFF27443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C68772D7370692E63000000000868772D7370692E6300000000EAD6A300FFFFFFFF26443A5C435542454D585C4D5231365C436F72655C5372635C73746D3332663178785F69742E63000000000E73746D3332663178785F69742E6300000000F6FA7D00FFFFFFFF23443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C68772E63000000000468772E6300000000B5E99D00FFFFFFFF1D443A5C435542454D585C4D5231365C557365725C6273705C7370692E6300000000057370692E63000000005FC3CF00FFFFFFFF27443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C7378313238312E6300000000087378313238312E6300000000C1838300FFFFFFFF3F443A5C435542454D585C4D5231365C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C2E63000000000F73746D3332663178785F68616C2E6300000000CACAD500FFFFFFFF44443A5C435542454D585C4D5231365C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F756172742E63000000001473746D3332663178785F68616C5F756172742E6300000000C5D4F200FFFFFFFF43443A5C435542454D585C4D5231365C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F7370692E63000000001373746D3332663178785F68616C5F7370692E6300000000FFDC7800FFFFFFFF44443A5C435542454D585C4D5231365C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F6770696F2E63000000001473746D3332663178785F68616C5F6770696F2E6300000000BECEA100FFFFFFFF1F443A5C435542454D585C4D5231365C436F72655C5372635C75736172742E63000000000775736172742E6300000000F0A0A100FFFFFFFF27443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C7378313238312E6800000000087378313238312E6800000000BCA8E100FFFFFFFF27443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C626F617264732E680000000008626F617264732E68000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000D900000066000000AB06000082030000
+ 468
+ 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000400000002000000010000002C443A5C435542454D585C4D5231365C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000C5D4F200FFFFFFFF1E443A5C435542454D585C4D5231365C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF3F443A5C435542454D585C4D5231365C447269766572735C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C2E63000000000F73746D3332663178785F68616C2E6300000000BECEA100FFFFFFFF26443A5C435542454D585C4D5231365C7378313238312D6472697665722D635C726164696F2E680000000007726164696F2E6800000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000003C0100000A0100006804000006030000
@@ -134,7 +134,7 @@
16
- D900000066000000F0040000F8000000
+ 3C0100000A010000530500009C010000
@@ -150,7 +150,7 @@
0
16
- 0300000066000000D200000052030000
+ 0300000066000000D200000032020000
16
@@ -170,7 +170,7 @@
0
16
- 0300000066000000D200000052030000
+ 0300000066000000D200000032020000
16
@@ -450,7 +450,7 @@
0
16
- 0300000066000000D200000052030000
+ 0300000066000000D200000032020000
16
@@ -470,7 +470,7 @@
0
16
- 0300000066000000D200000052030000
+ 0300000066000000D200000032020000
16
@@ -490,7 +490,7 @@
0
16
- 0000000083030000AB06000001040000
+ 000000006302000005040000E1020000
16
@@ -526,11 +526,11 @@
0
32767
0
- 4096
+ 32768
0
16
- 030000008603000002040000E8030000
+ 030000006602000002040000C8020000
16
@@ -1150,7 +1150,7 @@
0
16
- 0300000066000000D200000060020000
+ 0300000066000000D200000032020000
16
@@ -1166,11 +1166,11 @@
0
32767
0
- 4096
+ 32768
0
16
- 030000008603000002040000E8030000
+ 030000006602000002040000C8020000
16
@@ -1186,11 +1186,11 @@
0
32767
0
- 4096
+ 32768
0
16
- 030000008603000002040000E8030000
+ 030000006602000002040000C8020000
16
@@ -1246,11 +1246,11 @@
0
32767
0
- 4096
+ 32768
0
16
- 030000008603000002040000E8030000
+ 030000006602000002040000C8020000
16
@@ -1266,11 +1266,11 @@
0
32767
0
- 4096
+ 32768
0
16
- 030000008603000002040000E8030000
+ 030000006602000002040000C8020000
16
@@ -1730,7 +1730,7 @@
0
16
- 0000000001040000AB06000014040000
+ 00000000E102000005040000F4020000
16
@@ -1799,7 +1799,7 @@
3312
- 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFD9000000E1000000F0040000E5000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000D900000066000000F0040000F8000000D90000004F000000F0040000E10000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF170400004F0000001B04000033020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000001B04000066000000F00400004A0200001B0400004F000000F00400003302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD50000004F000000D90000006B030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000D500000090020000000000004F000000D50000006B0300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000001F020000F00400002302000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003A020000F0040000E00200000000000023020000F0040000C902000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF78020000230200007C020000C902000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000006B030000AB0600006F030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000940200000504000026030000000000006F030000AB060000010400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
+ 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFD9000000E1000000F0040000E5000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000000000003C0100000A010000530500009C010000D90000004F000000F0040000E10000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF170400004F0000001B04000033020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000007E0400000A01000053050000EE0200001B0400004F000000F00400003302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD50000004F000000D90000004B020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000630000000A0100003801000006030000000000004F000000D50000004B0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000001F020000F00400002302000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000063000000DE02000053050000840300000000000023020000F0040000C902000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF78020000230200007C020000C902000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000004B020000050400004F020000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000630000000A030000680400009C030000000000004F02000005040000E10200000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
59392
@@ -1871,11 +1871,11 @@
0
16
- 8A050000E5000000AB06000057030000
+ E6020000E50000000504000037020000
16
- D605000080010000F7060000F2030000
+ 49030000A001000068040000F2020000
@@ -1891,7 +1891,7 @@
0
16
- 0300000066000000D20000003E030000
+ 0300000066000000D20000001E020000
16
@@ -1911,7 +1911,7 @@
0
16
- 0300000066000000D20000003E030000
+ 0300000066000000D20000001E020000
16
@@ -1931,7 +1931,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -1951,7 +1951,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -1971,7 +1971,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -1991,7 +1991,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2031,7 +2031,7 @@
0
16
- DC00000066000000A8060000C8000000
+ DC0000006600000002040000C8000000
16
@@ -2051,7 +2051,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2071,7 +2071,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2091,7 +2091,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2111,7 +2111,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2131,7 +2131,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2151,7 +2151,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2171,7 +2171,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2191,7 +2191,7 @@
0
16
- 0300000066000000D20000003E030000
+ 0300000066000000D20000001E020000
16
@@ -2211,7 +2211,7 @@
0
16
- 0300000066000000D20000003E030000
+ 0300000066000000D20000001E020000
16
@@ -2251,7 +2251,7 @@
0
16
- 000000005B030000AB06000001040000
+ 000000003B02000005040000E1020000
16
@@ -2291,7 +2291,7 @@
0
16
- D900000063000000AB060000E1000000
+ D90000006300000005040000E1000000
16
@@ -2311,7 +2311,7 @@
0
16
- DC00000066000000A8060000C8000000
+ DC0000006600000002040000C8000000
16
@@ -2371,7 +2371,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2391,7 +2391,7 @@
0
16
- DC00000066000000A8060000C8000000
+ DC0000006600000002040000C8000000
16
@@ -2411,7 +2411,7 @@
0
16
- DC00000066000000A8060000C8000000
+ DC0000006600000002040000C8000000
16
@@ -2431,7 +2431,7 @@
0
16
- DC00000066000000A8060000C8000000
+ DC0000006600000002040000C8000000
16
@@ -2451,7 +2451,7 @@
0
16
- DC00000066000000A8060000C8000000
+ DC0000006600000002040000C8000000
16
@@ -2891,7 +2891,7 @@
0
16
- 0300000066000000D20000003E030000
+ 0300000066000000D20000001E020000
16
@@ -2951,7 +2951,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -2971,7 +2971,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -3031,7 +3031,7 @@
0
16
- DC00000066000000A8060000C8000000
+ DC0000006600000002040000C8000000
16
@@ -3471,7 +3471,7 @@
0
16
- 0000000001040000AB06000014040000
+ 00000000E102000005040000F4020000
16
@@ -3531,7 +3531,7 @@
0
16
- 8D050000FC000000A80600003E030000
+ E9020000FC000000020400001E020000
16
@@ -3540,14 +3540,14 @@
3415
- 000000000C000000000000000040000001000000FFFFFFFFFFFFFFFF86050000E50000008A050000570300000100000002000010040000000100000077FEFFFF9801000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000FFFF02000B004354616262656450616E650040000001000000D605000080010000F7060000F20300008A050000E5000000AB0600005703000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000020000001000000FFFFFFFFFFFFFFFFD9000000E1000000AB060000E5000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D6010000458900000180002000000100000025010000EA000000F70600007C010000D90000004F000000AB060000E10000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF170400004F0000001B04000033020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C300000180004000000000000067040000EA0000003C050000CE0200001B0400004F000000F00400003302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD50000004F000000D900000057030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000004C000000EA00000021010000F2030000000000004F000000D5000000570300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000057030000AB0600005B03000001000000010000100400000001000000000000000000000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFF550300005B030000590300000104000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000033020000F004000037020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000000000004C000000D20200003C050000640300000000000037020000F0040000C90200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
+ 000000000C000000000000000040000001000000FFFFFFFFFFFFFFFFE2020000E5000000E60200003702000001000000020000100400000001000000B4FEFFFFD501000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000FFFF02000B004354616262656450616E65004000000100000049030000A001000068040000F2020000E6020000E5000000050400003702000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000020000001000000FFFFFFFFFFFFFFFFD9000000E100000005040000E5000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000018000200000010000003C0100000A010000680400009C010000D90000004F00000005040000E10000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF170400004F0000001B04000033020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000007E0400000A01000053050000EE0200001B0400004F000000F00400003302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD50000004F000000D900000037020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000630000000A01000038010000F2020000000000004F000000D5000000370200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000037020000050400003B02000001000000010000100400000001000000000000000000000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFF550300005B030000590300000104000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000033020000F004000037020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000063000000F202000053050000840300000000000037020000F0040000C90200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000
59392
File
3039
- 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001653583132383148616C52656164526567697374657273960000000000000014001653583132383148616C526561645265676973746572730C52656164526567697374657209632D3E706172616D7329732D3E666565646261636B2E747269672E666565646261636B2E726F746F725F6162735F616E676C6511636D642D3E6C6173745F66697265636D640C666565646261636B5F72706D1448414C5F554152545F526563656976655F444D41134D585F5553415254335F554152545F496E6974184253505F43414E5F526567697374657243616C6C6261636B136874696D312E496E7374616E63652D3E4152520E73746D3332667878785F69742E63067072696E74661F43414E5F72656D6F74655F7472616E736D697373696F6E5F72657175657374142043414E5F6964656E7469666965725F74797065034944450E43414E5F333530385F4D325F4944116765745F6D6F746F725F6D6561737572650654585F4F4B20124D50555F4949435F576169745F41636B282938696620286932635F77726974652873742E68772D3E616464722C2073742E7265672D3E7077725F6D676D745F312C20312C206461746129290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000
+ 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001653583132383148616C52656164526567697374657273960000000000000014001653583132383148616C526561645265676973746572730C52656164526567697374657209632D3E706172616D7329732D3E666565646261636B2E747269672E666565646261636B2E726F746F725F6162735F616E676C6511636D642D3E6C6173745F66697265636D640C666565646261636B5F72706D1448414C5F554152545F526563656976655F444D41134D585F5553415254335F554152545F496E6974184253505F43414E5F526567697374657243616C6C6261636B136874696D312E496E7374616E63652D3E4152520E73746D3332667878785F69742E63067072696E74661F43414E5F72656D6F74655F7472616E736D697373696F6E5F72657175657374142043414E5F6964656E7469666965725F74797065034944450E43414E5F333530385F4D325F4944116765745F6D6F746F725F6D6561737572650654585F4F4B20124D50555F4949435F576169745F41636B282938696620286932635F77726974652873742E68772D3E616464722C2073742E7265672D3E7077725F6D676D745F312C20312C206461746129290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000
1423
@@ -3579,7 +3579,7 @@
Debug
2362
- 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000
+ 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000
898
@@ -3603,201 +3603,39 @@
0
100
- 10
-
- ../Core/Src/main.c
- 23
- 261
- 284
- 1
-
- 0
-
+ 2
startup_stm32f103xb.s
0
- 125
+ 126
132
0
0
- ..\sx1281-driver-c\radio.h
- 0
- 131
- 139
- 1
-
- 0
-
-
- ..\sx1281-driver-c\sx1281-hal.c
- 0
- 79
- 128
- 1
-
- 0
-
-
- ..\sx1281-driver-c\hw-gpio.c
- 35
- 254
- 268
- 1
-
- 0
-
-
- ..\sx1281-driver-c\hw-gpio.h
- 13
- 1
- 10
- 1
-
- 0
-
-
- ..\sx1281-driver-c\hw-spi.h
- 0
- 1
- 4
- 1
-
- 0
-
-
- ..\sx1281-driver-c\hw-uart.h
- 0
- 1
- 4
- 1
-
- 0
-
-
- ../Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h
- 0
- 106
- 125
- 1
-
- 0
-
-
- ..\sx1281-driver-c\hw-uart.c
- 0
- 2
- 3
- 1
-
- 0
-
-
- ..\sx1281-driver-c\hw-spi.c
- 2
- 31
- 60
- 1
-
- 0
-
-
- ../Core/Src/stm32f1xx_it.c
- 0
- 81
- 89
- 1
-
- 0
-
-
- ..\sx1281-driver-c\hw.c
- 0
- 1
- 13
- 1
-
- 0
-
-
- ..\User\bsp\spi.c
- 0
- 30
- 40
- 1
-
- 0
-
-
- ..\sx1281-driver-c\sx1281.c
- 26
- 99
- 100
+ ../Core/Src/main.c
+ 4
+ 565
+ 434
1
0
../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c
- 0
- 141
- 142
+ 3
+ 302
+ 309
1
0
- ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c
+ ..\sx1281-driver-c\radio.h
0
- 3185
- 3189
- 1
-
- 0
-
-
- ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c
- 0
- 1322
- 1326
- 1
-
- 0
-
-
- ../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c
- 0
- 422
- 438
- 1
-
- 0
-
-
- ../Core/Src/usart.c
- 0
- 60
- 61
- 1
-
- 0
-
-
- ..\sx1281-driver-c\sx1281.h
- 0
- 1
- 1
- 1
-
- 0
-
-
- ..\sx1281-driver-c\boards.h
- 30
- 1
- 6
+ 236
+ 242
1
0
diff --git a/MDK-ARM/MR16.uvoptx b/MDK-ARM/MR16.uvoptx
index 0f02b49..76c9c9a 100644
--- a/MDK-ARM/MR16.uvoptx
+++ b/MDK-ARM/MR16.uvoptx
@@ -26,7 +26,7 @@
0x4
ARM-ADS
- 12000000
+ 16000000
1
1
@@ -160,6 +160,11 @@
1
AppState
+
+ 2
+ 1
+ Buffer
+
0
diff --git a/MDK-ARM/MR16/MR16.axf b/MDK-ARM/MR16/MR16.axf
index 53904f8..7859651 100644
Binary files a/MDK-ARM/MR16/MR16.axf and b/MDK-ARM/MR16/MR16.axf differ
diff --git a/MDK-ARM/MR16/MR16.build_log.htm b/MDK-ARM/MR16/MR16.build_log.htm
index a469d12..5baa933 100644
--- a/MDK-ARM/MR16/MR16.build_log.htm
+++ b/MDK-ARM/MR16/MR16.build_log.htm
@@ -22,22 +22,14 @@ Dialog DLL: TCM.DLL V1.48.0.0
Project:
D:\CUBEMX\MR16\MDK-ARM\MR16.uvprojx
-Project File Date: 11/20/2025
+Project File Date: 11/22/2025
Output:
*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'D:\cangming\ARM\ARMCC\Bin'
Build target 'MR16'
Note: source file '..\User\bsp\gpio.c' - object file renamed from 'MR16\gpio.o' to 'MR16\gpio_1.o'.
Note: source file '..\User\bsp\spi.c' - object file renamed from 'MR16\spi.o' to 'MR16\spi_1.o'.
-compiling spi.c...
-compiling hw-spi.c...
-..\sx1281-driver-c\hw-spi.c(55): warning: #177-D: function "wait_done" was declared but never referenced
- static void wait_done(void)
-..\sx1281-driver-c\hw-spi.c: 1 warning, 0 errors
-linking...
-Program Size: Code=19708 RO-data=680 RW-data=92 ZI-data=10676
-FromELF: creating hex file...
-"MR16\MR16.axf" - 0 Error(s), 1 Warning(s).
+"MR16\MR16.axf" - 0 Error(s), 0 Warning(s).
Software Packages used:
@@ -61,7 +53,7 @@ Package Vendor: Keil
* Component: ARM::CMSIS:CORE:5.4.0
Include file: CMSIS\Core\Include\tz_context.h
-Build Time Elapsed: 00:00:01
+Build Time Elapsed: 00:00:00