Skip to content

Commit 7723103

Browse files
cparatacparata
authored
Merge pull request #2 from davideq/main
Fix keyword file
2 parents ee494bd + 0da5a12 commit 7723103

File tree

4 files changed

+87
-55
lines changed

4 files changed

+87
-55
lines changed

‎keywords.txt‎

Lines changed: 84 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,101 @@
11
#######################################
2-
# Syntax Coloring Map For LIS2DW12
2+
# Syntax Coloring Map For LIS2DUXS12
33
#######################################
44

55
#######################################
66
# Datatypes (KEYWORD1)
77
#######################################
88

9-
LIS2DW12Sensor KEYWORD1
9+
LIS2DUXS12Sensor KEYWORD1
1010

1111
#######################################
1212
# Methods and Functions (KEYWORD2)
1313
#######################################
1414

15-
begin KEYWORD2
16-
end KEYWORD2
17-
Enable_X KEYWORD2
18-
Disable_X KEYWORD2
19-
ReadID KEYWORD2
20-
Get_X_Axes KEYWORD2
21-
Get_X_Sensitivity KEYWORD2
22-
Get_X_AxesRaw KEYWORD2
23-
Get_X_ODR KEYWORD2
24-
Set_X_ODR KEYWORD2
25-
Set_X_ODR_With_Mode KEYWORD2
26-
Get_X_FS KEYWORD2
27-
Set_X_FS KEYWORD2
28-
Enable_Wake_Up_Detection KEYWORD2
29-
Disable_Wake_Up_Detection KEYWORD2
30-
Set_Wake_Up_Threshold KEYWORD2
31-
Set_Wake_Up_Duration KEYWORD2
32-
Enable_Inactivity_Detection KEYWORD2
33-
Disable_Inactivity_Detection KEYWORD2
34-
Set_Sleep_Duration KEYWORD2
35-
Enable_6D_Orientation KEYWORD2
36-
Disable_6D_Orientation KEYWORD2
37-
Set_6D_Orientation_Threshold KEYWORD2
38-
Get_6D_Orientation_XL KEYWORD2
39-
Get_6D_Orientation_XH KEYWORD2
40-
Get_6D_Orientation_YL KEYWORD2
41-
Get_6D_Orientation_YH KEYWORD2
42-
Get_6D_Orientation_ZL KEYWORD2
43-
Get_6D_Orientation_ZH KEYWORD2
44-
Get_Event_Status KEYWORD2
45-
Get_FIFO_Num_Samples KEYWORD2
46-
Set_FIFO_Mode KEYWORD2
47-
ReadReg KEYWORD2
48-
WriteReg KEYWORD2
15+
begin KEYWORD2
16+
end KEYWORD2
17+
Enable_X KEYWORD2
18+
Disable_X KEYWORD2
19+
ReadID KEYWORD2
20+
Get_X_Axes KEYWORD2
21+
Get_X_Sensitivity KEYWORD2
22+
Get_X_AxesRaw KEYWORD2
23+
Get_X_ODR KEYWORD2
24+
Set_X_ODR KEYWORD2
25+
Set_X_ODR_With_Mode KEYWORD2
26+
Get_X_FS KEYWORD2
27+
Set_X_FS KEYWORD2
28+
Get_X_DRDY_Status KEYWORD2
29+
Get_FIFO_Num_Samples KEYWORD2
30+
Get_FIFO_Full_Status KEYWORD2
31+
Get_FIFO_Overrun_Status KEYWORD2
32+
Get_FIFO_Watermark_Status KEYWORD2
33+
Set_FIFO_INT1_FIFO_Full KEYWORD2
34+
Set_FIFO_INT1_FIFO_Overrun KEYWORD2
35+
Set_FIFO_INT1_FIFO_Threshold KEYWORD2
36+
Set_FIFO_INT2_FIFO_Full KEYWORD2
37+
Set_FIFO_INT2_FIFO_Overrun KEYWORD2
38+
Set_FIFO_INT2_FIFO_Threshold KEYWORD2
39+
Set_FIFO_Watermark_Level KEYWORD2
40+
Set_FIFO_Stop_On_Fth KEYWORD2
41+
Set_FIFO_Mode KEYWORD2
42+
Get_FIFO_Tag KEYWORD2
43+
Get_FIFO_X_Axes KEYWORD2
44+
Set_FIFO_X_BDR KEYWORD2
45+
Get_X_Event_Status KEYWORD2
46+
Enable_Wake_Up_Detection KEYWORD2
47+
Disable_Wake_Up_Detection KEYWORD2
48+
Set_Wake_Up_Threshold KEYWORD2
49+
Set_Wake_Up_Duration KEYWORD2
50+
Enable_6D_Orientation KEYWORD2
51+
Disable_6D_Orientation KEYWORD2
52+
Set_6D_Orientation_Threshold KEYWORD2
53+
Get_6D_Orientation_XL KEYWORD2
54+
Get_6D_Orientation_XH KEYWORD2
55+
Get_6D_Orientation_YL KEYWORD2
56+
Get_6D_Orientation_YH KEYWORD2
57+
Get_6D_Orientation_ZL KEYWORD2
58+
Get_6D_Orientation_ZH KEYWORD2
59+
Enable_Free_Fall_Detection KEYWORD2
60+
Disable_Free_Fall_Detection KEYWORD2
61+
Set_Free_Fall_Threshold KEYWORD2
62+
Set_Free_Fall_Duration KEYWORD2
63+
Enable_Single_Tap_Detection KEYWORD2
64+
Disable_Single_Tap_Detection KEYWORD2
65+
Enable_Double_Tap_Detection KEYWORD2
66+
Disable_Double_Tap_Detection KEYWORD2
67+
Enable_Triple_Tap_Detection KEYWORD2
68+
Disable_Triple_Tap_Detection KEYWORD2
69+
Set_Tap_Configuration KEYWORD2
70+
Get_Tap_Configuration KEYWORD2
71+
Enable_Tilt_Detection KEYWORD2
72+
Disable_Tilt_Detection KEYWORD2
73+
Enable_Pedometer KEYWORD2
74+
Disable_Pedometer KEYWORD2
75+
Get_Step_Count KEYWORD2
76+
Step_Counter_Reset KEYWORD2
77+
Enable_QVAR KEYWORD2
78+
Disable_QVAR KEYWORD2
79+
Get_QVAR_Status KEYWORD2
80+
Get_QVAR_Data KEYWORD2
81+
Get_QVAR_Impedance KEYWORD2
82+
Set_QVAR_Impedance KEYWORD2
83+
Get_QVAR_Gain KEYWORD2
84+
Set_QVAR_Gain KEYWORD2
85+
Get_MLC_Status KEYWORD2
86+
Get_MLC_Output KEYWORD2
87+
Read_Reg KEYWORD2
88+
Write_Reg KEYWORD2
4989

5090
#######################################
5191
# Constants (LITERAL1)
5292
#######################################
5393

54-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_2G_LOPOW1_MODE LITERAL1
55-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_2G_OTHER_MODES LITERAL1
56-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_4G_LOPOW1_MODE LITERAL1
57-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_4G_OTHER_MODES LITERAL1
58-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_8G_LOPOW1_MODE LITERAL1
59-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_8G_OTHER_MODES LITERAL1
60-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_16G_LOPOW1_MODE LITERAL1
61-
LIS2DW12_ACC_SENSITIVITY_FOR_FS_16G_OTHER_MODES LITERAL1
94+
LIS2DUXS12_I2C_BUS LITERAL1
95+
LIS2DUXS12_SPI_4WIRES_BUS LITERAL1
96+
LIS2DUXS12_SPI_3WIRES_BUS LITERAL1
97+
LIS2DUXS12_I3C_BUS LITERAL1
98+
LIS2DUXS12_X_SENSITIVITY_FOR_FS_2G LITERAL1
99+
LIS2DUXS12_X_SENSITIVITY_FOR_FS_4G LITERAL1
100+
LIS2DUXS12_X_SENSITIVITY_FOR_FS_8G LITERAL1
101+
LIS2DUXS12_X_SENSITIVITY_FOR_FS_16G LITERAL1

‎library.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name=STM32duino LIS2DW12
1+
name=STM32duino LIS2DUXS12
22
version=1.0.0
33
author=SRA
44
maintainer=stm32duino

‎src/LIS2DUXS12Sensor.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,9 +579,8 @@ LIS2DUXS12StatusTypeDef LIS2DUXS12Sensor::Set_X_FS(int32_t FullScale)
579579
* @param val pointer where the value is written
580580
* @retval 0 in case of success, an error code otherwise
581581
*/
582-
LIS2DUXS12StatusTypeDef LIS2DUXS12Sensor::LIS2DUXS12_X_Get_DRDY_Status(uint8_t *val)
582+
LIS2DUXS12StatusTypeDef LIS2DUXS12Sensor::Get_X_DRDY_Status(uint8_t *val)
583583
{
584-
585584
lis2duxs12_status_register_t status;
586585
if (lis2duxs12_read_reg(&reg_ctx, LIS2DUXS12_STATUS, (uint8_t *)&status, 1) != LIS2DUXS12_STATUS_OK) {
587586
return LIS2DUXS12_STATUS_ERROR;

‎src/LIS2DUXS12Sensor.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,6 @@
6161
#define LIS2DUXS12_X_SENSITIVITY_FOR_FS_8G 0.244f /**< Sensitivity value for 8g full scale, Low-power1 mode [mg/LSB] */
6262
#define LIS2DUXS12_X_SENSITIVITY_FOR_FS_16G 0.488f /**< Sensitivity value for 16g full scale, Low-power1 mode [mg/LSB] */
6363

64-
#define LIS2DUXS12_QVAR_GAIN 74.4f /**< Gain value for bits AH_QVAR_GAIN_[1:0] == 1 in AH_QVAR_CFG register, 16 bits [LSB/mV] */
65-
66-
#define LIS2DUXS12_QVAR_GAIN_MULTIPL_0_5X 0.5f /**< Gain multiplier for bits AH_QVAR_GAIN_[1:0] == 0 in AH_QVAR_CFG register [-] */
67-
#define LIS2DUXS12_QVAR_GAIN_MULTIPL_1X 1.0f /**< Gain multiplier for bits AH_QVAR_GAIN_[1:0] == 1 in AH_QVAR_CFG register [-] */
68-
#define LIS2DUXS12_QVAR_GAIN_MULTIPL_2X 2.0f /**< Gain multiplier for bits AH_QVAR_GAIN_[1:0] == 2 in AH_QVAR_CFG register [-] */
69-
#define LIS2DUXS12_QVAR_GAIN_MULTIPL_4X 4.0f /**< Gain multiplier for bits AH_QVAR_GAIN_[1:0] == 3 in AH_QVAR_CFG register [-] */
70-
7164
/* Typedefs ------------------------------------------------------------------*/
7265
typedef enum {
7366
LIS2DUXS12_STATUS_OK = 0,
@@ -162,7 +155,7 @@ class LIS2DUXS12Sensor {
162155
LIS2DUXS12StatusTypeDef Get_X_FS(int32_t *full_scale);
163156
LIS2DUXS12StatusTypeDef Set_X_FS(int32_t full_scale);
164157

165-
LIS2DUXS12StatusTypeDef LIS2DUXS12_X_Get_DRDY_Status(uint8_t *val);
158+
LIS2DUXS12StatusTypeDef Get_X_DRDY_Status(uint8_t *val);
166159

167160
LIS2DUXS12StatusTypeDef Get_FIFO_Num_Samples(uint16_t *NumSamples);
168161
LIS2DUXS12StatusTypeDef Get_FIFO_Full_Status(uint8_t *Status);

0 commit comments

Comments
 (0)