Commit 4b7ebb52 authored by 高士达's avatar 高士达

Merge branch 'CHENJIALE' into 'dev'

Chenjiale

See merge request !63
parents 4dfebd4a 729a2106
; *************************************************************
; *** Scatter-Loading Description File generated by uVision ***
; *************************************************************
LR_IROM1 0x00008000 0x00040000 { ; load region size_region
ER_IROM1 0x00008000 0x00040000 { ; load address = execution address
*.o (RESET, +First)
*(InRoot$$Sections)
.ANY (+RO)
.ANY (+XO)
}
RW_IRAM1 0x20000000 0x00007F00 { ; RW data
.ANY (+RW +ZI)
}
RW_IRAM2 0x20007F00 0x00000100 { ; RW data
.ANY (RW_FUNC_PLL)
}
}
...@@ -312,12 +312,12 @@ ...@@ -312,12 +312,12 @@
#define UnknownPartID 8 // Unknown Part ID #define UnknownPartID 8 // Unknown Part ID
#define SWV 0x100 // 0x100 = 1.00 software version 软件版本号 #define SWV 0x100 // 0x100 = 1.00 software version 软件版本号
#define HWV 0x101 // 0x100 = 1.00 hardware version 硬件版本号 #define HWV 0x103 // 0x100 = 1.00 hardware version 硬件版本号
#define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号 #define BTV 0x100 // 0x100 = 1.00 bootloader version boot程序版本号
#define INTLV 0x111 // 0x100 = 1.00 internal version 内部版本号 #define INTLV 0x112 // 0x100 = 1.00 internal version 内部版本号
#define PROG_Y 0x24 // 0x24 = 2024年, program year #define PROG_Y 0x24 // 0x24 = 2024年, program year
#define PROG_M 0x08 // 0x03 = 3月, program month #define PROG_M 0x08 // 0x03 = 3月, program month
#define PROG_D 0x03 // 0x19 = 19日, program day #define PROG_D 0x14 // 0x19 = 19日, program day
/****************************************************************************** /******************************************************************************
Bootloader Variable Bootloader Variable
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment