@@ -150,7 +150,7 @@ typedef struct
150
150
__IO uint32_t SMPR; /*!< ADC sampling time register, Address offset: 0x14 */
151
151
uint32_t RESERVED1; /*!< Reserved, 0x18 */
152
152
uint32_t RESERVED2; /*!< Reserved, 0x1C */
153
- __IO uint32_t TR1; /*!< ADC analog watchdog 1 threshold register, Address offset: 0x20 */
153
+ __IO uint32_t TR; /*!< ADC analog watchdog 1 threshold register, Address offset: 0x20 */
154
154
__IO uint32_t RESERVED3; /*!< Reserved, 0x24 */
155
155
__IO uint32_t CHSELR; /*!< ADC group regular sequencer register, Address offset: 0x28 */
156
156
__IO uint32_t RESERVED4; /*!< Reserved, 0x2C */
@@ -163,6 +163,10 @@ typedef struct
163
163
__IO uint32_t CALFACT; /*!< ADC Calibration factor register, Address offset: 0xB4 */
164
164
} ADC_TypeDef;
165
165
166
+ /* Legacy registers naming */
167
+ #define TR1 TR
168
+
169
+
166
170
typedef struct
167
171
{
168
172
uint32_t RESERVED1; /*!< Reserved, Address offset: ADC1 base address + 0x300 */
@@ -1293,38 +1297,67 @@ typedef struct
1293
1297
#define ADC_SMPR_SMPSEL18_Msk (0x1UL << ADC_SMPR_SMPSEL18_Pos) /*!< 0x04000000 */
1294
1298
#define ADC_SMPR_SMPSEL18 ADC_SMPR_SMPSEL18_Msk /*!< ADC channel 18 sampling time selection */
1295
1299
1296
- /******************** Bit definition for ADC_TR1 register *******************/
1297
- #define ADC_TR1_LT1_Pos (0U)
1298
- #define ADC_TR1_LT1_Msk (0xFFFUL << ADC_TR1_LT1_Pos) /*!< 0x00000FFF */
1299
- #define ADC_TR1_LT1 ADC_TR1_LT1_Msk /*!< ADC analog watchdog 1 threshold low */
1300
- #define ADC_TR1_LT1_0 (0x001UL << ADC_TR1_LT1_Pos) /*!< 0x00000001 */
1301
- #define ADC_TR1_LT1_1 (0x002UL << ADC_TR1_LT1_Pos) /*!< 0x00000002 */
1302
- #define ADC_TR1_LT1_2 (0x004UL << ADC_TR1_LT1_Pos) /*!< 0x00000004 */
1303
- #define ADC_TR1_LT1_3 (0x008UL << ADC_TR1_LT1_Pos) /*!< 0x00000008 */
1304
- #define ADC_TR1_LT1_4 (0x010UL << ADC_TR1_LT1_Pos) /*!< 0x00000010 */
1305
- #define ADC_TR1_LT1_5 (0x020UL << ADC_TR1_LT1_Pos) /*!< 0x00000020 */
1306
- #define ADC_TR1_LT1_6 (0x040UL << ADC_TR1_LT1_Pos) /*!< 0x00000040 */
1307
- #define ADC_TR1_LT1_7 (0x080UL << ADC_TR1_LT1_Pos) /*!< 0x00000080 */
1308
- #define ADC_TR1_LT1_8 (0x100UL << ADC_TR1_LT1_Pos) /*!< 0x00000100 */
1309
- #define ADC_TR1_LT1_9 (0x200UL << ADC_TR1_LT1_Pos) /*!< 0x00000200 */
1310
- #define ADC_TR1_LT1_10 (0x400UL << ADC_TR1_LT1_Pos) /*!< 0x00000400 */
1311
- #define ADC_TR1_LT1_11 (0x800UL << ADC_TR1_LT1_Pos) /*!< 0x00000800 */
1312
-
1313
- #define ADC_TR1_HT1_Pos (16U)
1314
- #define ADC_TR1_HT1_Msk (0xFFFUL << ADC_TR1_HT1_Pos) /*!< 0x0FFF0000 */
1315
- #define ADC_TR1_HT1 ADC_TR1_HT1_Msk /*!< ADC Analog watchdog 1 threshold high */
1316
- #define ADC_TR1_HT1_0 (0x001UL << ADC_TR1_HT1_Pos) /*!< 0x00010000 */
1317
- #define ADC_TR1_HT1_1 (0x002UL << ADC_TR1_HT1_Pos) /*!< 0x00020000 */
1318
- #define ADC_TR1_HT1_2 (0x004UL << ADC_TR1_HT1_Pos) /*!< 0x00040000 */
1319
- #define ADC_TR1_HT1_3 (0x008UL << ADC_TR1_HT1_Pos) /*!< 0x00080000 */
1320
- #define ADC_TR1_HT1_4 (0x010UL << ADC_TR1_HT1_Pos) /*!< 0x00100000 */
1321
- #define ADC_TR1_HT1_5 (0x020UL << ADC_TR1_HT1_Pos) /*!< 0x00200000 */
1322
- #define ADC_TR1_HT1_6 (0x040UL << ADC_TR1_HT1_Pos) /*!< 0x00400000 */
1323
- #define ADC_TR1_HT1_7 (0x080UL << ADC_TR1_HT1_Pos) /*!< 0x00800000 */
1324
- #define ADC_TR1_HT1_8 (0x100UL << ADC_TR1_HT1_Pos) /*!< 0x01000000 */
1325
- #define ADC_TR1_HT1_9 (0x200UL << ADC_TR1_HT1_Pos) /*!< 0x02000000 */
1326
- #define ADC_TR1_HT1_10 (0x400UL << ADC_TR1_HT1_Pos) /*!< 0x04000000 */
1327
- #define ADC_TR1_HT1_11 (0x800UL << ADC_TR1_HT1_Pos) /*!< 0x08000000 */
1300
+ /******************** Bit definition for ADC_TR register *******************/
1301
+ #define ADC_TR_LT_Pos (0U)
1302
+ #define ADC_TR_LT_Msk (0xFFFUL << ADC_TR_LT_Pos) /*!< 0x00000FFF */
1303
+ #define ADC_TR_LT ADC_TR_LT_Msk /*!< ADC analog watchdog 1 threshold low */
1304
+ #define ADC_TR_LT_0 (0x001UL << ADC_TR_LT_Pos) /*!< 0x00000001 */
1305
+ #define ADC_TR_LT_1 (0x002UL << ADC_TR_LT_Pos) /*!< 0x00000002 */
1306
+ #define ADC_TR_LT_2 (0x004UL << ADC_TR_LT_Pos) /*!< 0x00000004 */
1307
+ #define ADC_TR_LT_3 (0x008UL << ADC_TR_LT_Pos) /*!< 0x00000008 */
1308
+ #define ADC_TR_LT_4 (0x010UL << ADC_TR_LT_Pos) /*!< 0x00000010 */
1309
+ #define ADC_TR_LT_5 (0x020UL << ADC_TR_LT_Pos) /*!< 0x00000020 */
1310
+ #define ADC_TR_LT_6 (0x040UL << ADC_TR_LT_Pos) /*!< 0x00000040 */
1311
+ #define ADC_TR_LT_7 (0x080UL << ADC_TR_LT_Pos) /*!< 0x00000080 */
1312
+ #define ADC_TR_LT_8 (0x100UL << ADC_TR_LT_Pos) /*!< 0x00000100 */
1313
+ #define ADC_TR_LT_9 (0x200UL << ADC_TR_LT_Pos) /*!< 0x00000200 */
1314
+ #define ADC_TR_LT_10 (0x400UL << ADC_TR_LT_Pos) /*!< 0x00000400 */
1315
+ #define ADC_TR_LT_11 (0x800UL << ADC_TR_LT_Pos) /*!< 0x00000800 */
1316
+
1317
+ #define ADC_TR_HT_Pos (16U)
1318
+ #define ADC_TR_HT_Msk (0xFFFUL << ADC_TR_HT_Pos) /*!< 0x0FFF0000 */
1319
+ #define ADC_TR_HT ADC_TR_HT_Msk /*!< ADC Analog watchdog 1 threshold high */
1320
+ #define ADC_TR_HT_0 (0x001UL << ADC_TR_HT_Pos) /*!< 0x00010000 */
1321
+ #define ADC_TR_HT_1 (0x002UL << ADC_TR_HT_Pos) /*!< 0x00020000 */
1322
+ #define ADC_TR_HT_2 (0x004UL << ADC_TR_HT_Pos) /*!< 0x00040000 */
1323
+ #define ADC_TR_HT_3 (0x008UL << ADC_TR_HT_Pos) /*!< 0x00080000 */
1324
+ #define ADC_TR_HT_4 (0x010UL << ADC_TR_HT_Pos) /*!< 0x00100000 */
1325
+ #define ADC_TR_HT_5 (0x020UL << ADC_TR_HT_Pos) /*!< 0x00200000 */
1326
+ #define ADC_TR_HT_6 (0x040UL << ADC_TR_HT_Pos) /*!< 0x00400000 */
1327
+ #define ADC_TR_HT_7 (0x080UL << ADC_TR_HT_Pos) /*!< 0x00800000 */
1328
+ #define ADC_TR_HT_8 (0x100UL << ADC_TR_HT_Pos) /*!< 0x01000000 */
1329
+ #define ADC_TR_HT_9 (0x200UL << ADC_TR_HT_Pos) /*!< 0x02000000 */
1330
+ #define ADC_TR_HT_10 (0x400UL << ADC_TR_HT_Pos) /*!< 0x04000000 */
1331
+ #define ADC_TR_HT_11 (0x800UL << ADC_TR_HT_Pos) /*!< 0x08000000 */
1332
+
1333
+ /* Legacy definitions */
1334
+ #define ADC_TR1_LT1 ADC_TR_LT
1335
+ #define ADC_TR1_LT1_0 ADC_TR_LT_0
1336
+ #define ADC_TR1_LT1_1 ADC_TR_LT_1
1337
+ #define ADC_TR1_LT1_2 ADC_TR_LT_2
1338
+ #define ADC_TR1_LT1_3 ADC_TR_LT_3
1339
+ #define ADC_TR1_LT1_4 ADC_TR_LT_4
1340
+ #define ADC_TR1_LT1_5 ADC_TR_LT_5
1341
+ #define ADC_TR1_LT1_6 ADC_TR_LT_6
1342
+ #define ADC_TR1_LT1_7 ADC_TR_LT_7
1343
+ #define ADC_TR1_LT1_8 ADC_TR_LT_8
1344
+ #define ADC_TR1_LT1_9 ADC_TR_LT_9
1345
+ #define ADC_TR1_LT1_10 ADC_TR_LT_10
1346
+ #define ADC_TR1_LT1_11 ADC_TR_LT_11
1347
+
1348
+ #define ADC_TR1_HT1 ADC_TR_HT
1349
+ #define ADC_TR1_HT1_0 ADC_TR_HT_0
1350
+ #define ADC_TR1_HT1_1 ADC_TR_HT_1
1351
+ #define ADC_TR1_HT1_2 ADC_TR_HT_2
1352
+ #define ADC_TR1_HT1_3 ADC_TR_HT_3
1353
+ #define ADC_TR1_HT1_4 ADC_TR_HT_4
1354
+ #define ADC_TR1_HT1_5 ADC_TR_HT_5
1355
+ #define ADC_TR1_HT1_6 ADC_TR_HT_6
1356
+ #define ADC_TR1_HT1_7 ADC_TR_HT_7
1357
+ #define ADC_TR1_HT1_8 ADC_TR_HT_8
1358
+ #define ADC_TR1_HT1_9 ADC_TR_HT_9
1359
+ #define ADC_TR1_HT1_10 ADC_TR_HT_10
1360
+ #define ADC_TR1_HT1_11 ADC_TR_HT_11
1328
1361
1329
1362
/******************** Bit definition for ADC_CHSELR register ****************/
1330
1363
#define ADC_CHSELR_CHSEL_Pos (0U)
0 commit comments