diff --git a/AT32F403A_407_periph_lib_V2.1.7.chm b/AT32F403A_407_periph_lib_V2.1.8.chm
similarity index 73%
rename from AT32F403A_407_periph_lib_V2.1.7.chm
rename to AT32F403A_407_periph_lib_V2.1.8.chm
index 4ccecd6d..dff335ee 100644
Binary files a/AT32F403A_407_periph_lib_V2.1.7.chm and b/AT32F403A_407_periph_lib_V2.1.8.chm differ
diff --git a/document/ReleaseNotes_AT32F403A_407_Firmware_Library.pdf b/document/ReleaseNotes_AT32F403A_407_Firmware_Library.pdf
index a576034b..0eddc9cb 100644
Binary files a/document/ReleaseNotes_AT32F403A_407_Firmware_Library.pdf and b/document/ReleaseNotes_AT32F403A_407_Firmware_Library.pdf differ
diff --git a/libraries/cmsis/cm4/device_support/at32f403a_407.h b/libraries/cmsis/cm4/device_support/at32f403a_407.h
index e7ef125f..8ef0493a 100644
--- a/libraries/cmsis/cm4/device_support/at32f403a_407.h
+++ b/libraries/cmsis/cm4/device_support/at32f403a_407.h
@@ -161,7 +161,7 @@ extern "C" {
   */
 #define __AT32F403A_407_LIBRARY_VERSION_MAJOR    (0x02) /*!< [31:24] major version */
 #define __AT32F403A_407_LIBRARY_VERSION_MIDDLE   (0x01) /*!< [23:16] middle version */
-#define __AT32F403A_407_LIBRARY_VERSION_MINOR    (0x07) /*!< [15:8]  minor version */
+#define __AT32F403A_407_LIBRARY_VERSION_MINOR    (0x08) /*!< [15:8]  minor version */
 #define __AT32F403A_407_LIBRARY_VERSION_RC       (0x00) /*!< [7:0]  release candidate */
 #define __AT32F403A_407_LIBRARY_VERSION          ((__AT32F403A_407_LIBRARY_VERSION_MAJOR << 24)  | \
                                                   (__AT32F403A_407_LIBRARY_VERSION_MIDDLE << 16) | \
diff --git a/libraries/drivers/src/at32f403a_407_adc.c b/libraries/drivers/src/at32f403a_407_adc.c
index 943a9952..47ee90f5 100644
--- a/libraries/drivers/src/at32f403a_407_adc.c
+++ b/libraries/drivers/src/at32f403a_407_adc.c
@@ -737,10 +737,10 @@ uint32_t adc_combine_ordinary_conversion_data_get(void)
   *         ADC1, ADC2, ADC3.
   * @param  adc_preempt_channel: select the preempt channel.
   *         this parameter can be one of the following values:
-  *         - ADC_PREEMPTED_CHANNEL_1
-  *         - ADC_PREEMPTED_CHANNEL_2
-  *         - ADC_PREEMPTED_CHANNEL_3
-  *         - ADC_PREEMPTED_CHANNEL_4
+  *         - ADC_PREEMPT_CHANNEL_1
+  *         - ADC_PREEMPT_CHANNEL_2
+  *         - ADC_PREEMPT_CHANNEL_3
+  *         - ADC_PREEMPT_CHANNEL_4
   * @retval the conversion data for selection preempt channel.
   */
 uint16_t adc_preempt_conversion_data_get(adc_type *adc_x, adc_preempt_channel_type adc_preempt_channel)
diff --git a/middlewares/usbd_class/audio_hid/audio_hid_desc.c b/middlewares/usbd_class/audio_hid/audio_hid_desc.c
index a25edad3..97eee49a 100644
--- a/middlewares/usbd_class/audio_hid/audio_hid_desc.c
+++ b/middlewares/usbd_class/audio_hid/audio_hid_desc.c
@@ -502,7 +502,7 @@ ALIGNED_HEAD uint8_t g_usbd_audio_hid_report[USBD_AUHID_HID_SIZ_REPORT_DESC] ALI
   0x85, HID_REPORT_ID_6,                 /*     REPORT_ID (0xF0)           */
   0x09, 0x06,                            /*     USAGE                      */
   0x15, 0x00,                            /*     LOGICAL_MINIMUM (0)        */
-  0x26, 0x00,0xff,                       /*     LOGICAL_MAXIMUM (255)      */
+  0x26, 0xFF,0x00,                       /*     LOGICAL_MAXIMUM (255)      */
   0x75, 0x08,                            /*     REPORT_SIZE (8)            */
   0x95, 0x3F,                            /*     REPORT_COUNT (64)          */
   0x91, 0x02,                            /*     OUTPUT(Data,Var,Abs,Vol)   */
@@ -512,7 +512,7 @@ ALIGNED_HEAD uint8_t g_usbd_audio_hid_report[USBD_AUHID_HID_SIZ_REPORT_DESC] ALI
   0x85, HID_REPORT_ID_6,                 /*     REPORT_ID (0xF0)           */
   0x09, 0x07,                            /*     USAGE                      */
   0x15, 0x00,                            /*     LOGICAL_MINIMUM (0)        */
-  0x26, 0x00,0xff,                       /*     LOGICAL_MAXIMUM (255)      */
+  0x26, 0xFF,0x00,                       /*     LOGICAL_MAXIMUM (255)      */
   0x75, 0x08,                            /*     REPORT_SIZE (8)            */
   0x95, 0x3F,                            /*     REPORT_COUNT (64)          */
   0x81, 0x82,                            /*     INPUT(Data,Var,Abs,Vol)    */
diff --git a/middlewares/usbd_class/custom_hid/custom_hid_desc.c b/middlewares/usbd_class/custom_hid/custom_hid_desc.c
index 237a1f98..4b07dd8a 100644
--- a/middlewares/usbd_class/custom_hid/custom_hid_desc.c
+++ b/middlewares/usbd_class/custom_hid/custom_hid_desc.c
@@ -237,7 +237,7 @@ ALIGNED_HEAD uint8_t g_usbd_custom_hid_report[USBD_CUSHID_SIZ_REPORT_DESC] ALIGN
   0x85, HID_REPORT_ID_6,                 /*     REPORT_ID (0xF0)           */
   0x09, 0x06,                            /*     USAGE                      */
   0x15, 0x00,                            /*     LOGICAL_MINIMUM (0)        */
-  0x26, 0x00,0xff,                       /*     LOGICAL_MAXIMUM (255)      */
+  0x26, 0xFF,0x00,                       /*     LOGICAL_MAXIMUM (255)      */
   0x75, 0x08,                            /*     REPORT_SIZE (8)            */
   0x95, 0x3F,                            /*     REPORT_COUNT (64)          */
   0x91, 0x02,                            /*     OUTPUT(Data,Var,Abs,Vol)   */
@@ -247,7 +247,7 @@ ALIGNED_HEAD uint8_t g_usbd_custom_hid_report[USBD_CUSHID_SIZ_REPORT_DESC] ALIGN
   0x85, HID_REPORT_ID_6,                 /*     REPORT_ID (0xF0)           */
   0x09, 0x07,                            /*     USAGE                      */
   0x15, 0x00,                            /*     LOGICAL_MINIMUM (0)        */
-  0x26, 0x00,0xff,                       /*     LOGICAL_MAXIMUM (255)      */
+  0x26, 0xFF,0x00,                       /*     LOGICAL_MAXIMUM (255)      */
   0x75, 0x08,                            /*     REPORT_SIZE (8)            */
   0x95, 0x3F,                            /*     REPORT_COUNT (64)          */
   0x81, 0x82,                            /*     INPUT(Data,Var,Abs,Vol)    */
diff --git a/project/at_start_f403a/examples/i2s/halfduplex_dma/src/main.c b/project/at_start_f403a/examples/i2s/halfduplex_dma/src/main.c
index 62166f0d..6ba8f71e 100644
--- a/project/at_start_f403a/examples/i2s/halfduplex_dma/src/main.c
+++ b/project/at_start_f403a/examples/i2s/halfduplex_dma/src/main.c
@@ -88,7 +88,7 @@ static void i2s_config(void)
   dma_init_struct.memory_base_addr = (uint32_t)i2s3_buffer_tx;
   dma_init_struct.memory_data_width = DMA_MEMORY_DATA_WIDTH_HALFWORD;
   dma_init_struct.memory_inc_enable = TRUE;
-  dma_init_struct.peripheral_base_addr = (uint32_t)0x40003C0C;
+  dma_init_struct.peripheral_base_addr = (uint32_t)&(SPI3->dt);
   dma_init_struct.peripheral_data_width = DMA_PERIPHERAL_DATA_WIDTH_HALFWORD;
   dma_init_struct.peripheral_inc_enable = FALSE;
   dma_init_struct.priority = DMA_PRIORITY_HIGH;
@@ -97,7 +97,7 @@ static void i2s_config(void)
 
   dma_init_struct.direction = DMA_DIR_PERIPHERAL_TO_MEMORY;
   dma_init_struct.memory_base_addr = (uint32_t)i2s2_buffer_rx;
-  dma_init_struct.peripheral_base_addr = (uint32_t)0x4000380C;
+  dma_init_struct.peripheral_base_addr = (uint32_t)&(SPI2->dt);
   dma_init(DMA1_CHANNEL4, &dma_init_struct);
 
   crm_periph_clock_enable(CRM_SPI3_PERIPH_CLOCK, TRUE);
diff --git a/project/at_start_f403a/examples/rtc/calendar/src/rtc.c b/project/at_start_f403a/examples/rtc/calendar/src/rtc.c
index f8c57fc8..7acdd60f 100644
--- a/project/at_start_f403a/examples/rtc/calendar/src/rtc.c
+++ b/project/at_start_f403a/examples/rtc/calendar/src/rtc.c
@@ -329,7 +329,6 @@ void rtc_time_get(void)
         }
         else
         {
-          temp1++;
           break;
         }
       }
diff --git a/project/at_start_f403a/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c b/project/at_start_f403a/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c
index 8f937b2e..b5f027aa 100644
--- a/project/at_start_f403a/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c
+++ b/project/at_start_f403a/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c
@@ -86,7 +86,7 @@ static void spi_config(void)
   dma_init_struct.memory_base_addr = (uint32_t)spi2_rx_buffer;
   dma_init_struct.memory_data_width = DMA_MEMORY_DATA_WIDTH_BYTE;
   dma_init_struct.memory_inc_enable = TRUE;
-  dma_init_struct.peripheral_base_addr = (uint32_t)0x4000380C;
+  dma_init_struct.peripheral_base_addr = (uint32_t)&(SPI2->dt);
   dma_init_struct.peripheral_data_width = DMA_PERIPHERAL_DATA_WIDTH_BYTE;
   dma_init_struct.peripheral_inc_enable = FALSE;
   dma_init_struct.priority = DMA_PRIORITY_MEDIUM;
diff --git a/project/at_start_f407/examples/i2s/halfduplex_dma/src/main.c b/project/at_start_f407/examples/i2s/halfduplex_dma/src/main.c
index 7e6fca55..fe7d2bcd 100644
--- a/project/at_start_f407/examples/i2s/halfduplex_dma/src/main.c
+++ b/project/at_start_f407/examples/i2s/halfduplex_dma/src/main.c
@@ -88,7 +88,7 @@ static void i2s_config(void)
   dma_init_struct.memory_base_addr = (uint32_t)i2s3_buffer_tx;
   dma_init_struct.memory_data_width = DMA_MEMORY_DATA_WIDTH_HALFWORD;
   dma_init_struct.memory_inc_enable = TRUE;
-  dma_init_struct.peripheral_base_addr = (uint32_t)0x40003C0C;
+  dma_init_struct.peripheral_base_addr = (uint32_t)&(SPI3->dt);
   dma_init_struct.peripheral_data_width = DMA_PERIPHERAL_DATA_WIDTH_HALFWORD;
   dma_init_struct.peripheral_inc_enable = FALSE;
   dma_init_struct.priority = DMA_PRIORITY_HIGH;
@@ -97,7 +97,7 @@ static void i2s_config(void)
 
   dma_init_struct.direction = DMA_DIR_PERIPHERAL_TO_MEMORY;
   dma_init_struct.memory_base_addr = (uint32_t)i2s2_buffer_rx;
-  dma_init_struct.peripheral_base_addr = (uint32_t)0x4000380C;
+  dma_init_struct.peripheral_base_addr = (uint32_t)&(SPI2->dt);
   dma_init(DMA1_CHANNEL4, &dma_init_struct);
 
   crm_periph_clock_enable(CRM_SPI3_PERIPH_CLOCK, TRUE);
diff --git a/project/at_start_f407/examples/rtc/calendar/src/rtc.c b/project/at_start_f407/examples/rtc/calendar/src/rtc.c
index ce8e2eae..d4a2a5d0 100644
--- a/project/at_start_f407/examples/rtc/calendar/src/rtc.c
+++ b/project/at_start_f407/examples/rtc/calendar/src/rtc.c
@@ -329,7 +329,6 @@ void rtc_time_get(void)
         }
         else
         {
-          temp1++;
           break;
         }
       }
diff --git a/project/at_start_f407/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c b/project/at_start_f407/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c
index ab98e2d3..8eb44f15 100644
--- a/project/at_start_f407/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c
+++ b/project/at_start_f407/examples/spi/use_jtagpin_hardwarecs_dma/src/main.c
@@ -86,7 +86,7 @@ static void spi_config(void)
   dma_init_struct.memory_base_addr = (uint32_t)spi2_rx_buffer;
   dma_init_struct.memory_data_width = DMA_MEMORY_DATA_WIDTH_BYTE;
   dma_init_struct.memory_inc_enable = TRUE;
-  dma_init_struct.peripheral_base_addr = (uint32_t)0x4000380C;
+  dma_init_struct.peripheral_base_addr = (uint32_t)&(SPI2->dt);
   dma_init_struct.peripheral_data_width = DMA_PERIPHERAL_DATA_WIDTH_BYTE;
   dma_init_struct.peripheral_inc_enable = FALSE;
   dma_init_struct.priority = DMA_PRIORITY_MEDIUM;