Skip to content

Commit 13683dd

Browse files
authored
Merge pull request #2 from cparata/main
Fix spell check errors
2 parents 9022ef2 + 74670f6 commit 13683dd

File tree

5 files changed

+25
-24
lines changed

5 files changed

+25
-24
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
dout
1+
dout
2+
apon

src/rfal_rfst25r3916.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ ReturnCode RfalRfST25R3916Class::rfalStartTransceive(const rfalTransceiveContext
870870
/* Clear FIFO, Clear and Enable the Interrupts */
871871
rfalPrepareTransceive();
872872

873-
/* Disable our field upon a Rx reEnable on AP2P */
873+
/* Disable our field upon a Rx re-enable on AP2P */
874874
if (rfalIsModeActiveComm(gRFAL.mode)) {
875875
st25r3916TxOff();
876876
}
@@ -1215,7 +1215,7 @@ void RfalRfST25R3916Class::rfalTransceiveTx(void)
12151215
uint16_t tmp;
12161216
ReturnCode ret;
12171217

1218-
/* Supress warning in case NFC-V feature is disabled */
1218+
/* Suppress warning in case NFC-V feature is disabled */
12191219
ret = ERR_NONE;
12201220
NO_WARNING(ret);
12211221

@@ -1560,7 +1560,7 @@ void RfalRfST25R3916Class::rfalTransceiveRx(void)
15601560
}
15611561

15621562
if ((irqs & ST25R3916_IRQ_MASK_RX_REST) != 0U) {
1563-
/* RX_REST indicates that Receiver has been reseted due to EMD, therefore a RXS + RXE should *
1563+
/* RX_REST indicates that Receiver has been reset due to EMD, therefore a RXS + RXE should *
15641564
* follow if a good reception is followed within the valid initial timeout */
15651565

15661566
/* Check whether NRT has expired already, if so signal a timeout */
@@ -2041,7 +2041,7 @@ ReturnCode RfalRfST25R3916Class::rfalISO14443ATransceiveShortFrame(rfal14443ASho
20412041
/* Disable Collision interrupt */
20422042
st25r3916DisableInterrupts((ST25R3916_IRQ_MASK_COL));
20432043

2044-
/* ReEnable CRC on Rx */
2044+
/* Re-enable CRC on Rx */
20452045
st25r3916ClrRegisterBits(ST25R3916_REG_AUX, ST25R3916_REG_AUX_no_crc_rx);
20462046

20472047
return ret;
@@ -2066,7 +2066,7 @@ ReturnCode RfalRfST25R3916Class::rfalISO14443ATransceiveAnticollisionFrame(uint8
20662066
}
20672067

20682068
/*******************************************************************************/
2069-
/* Set speficic Analog Config for Anticolission if needed */
2069+
/* Set specific Analog Config for Anticolission if needed */
20702070
rfalSetAnalogConfig((RFAL_ANALOG_CONFIG_POLL | RFAL_ANALOG_CONFIG_TECH_NFCA | RFAL_ANALOG_CONFIG_BITRATE_COMMON | RFAL_ANALOG_CONFIG_ANTICOL));
20712071

20722072

@@ -2141,7 +2141,7 @@ ReturnCode RfalRfST25R3916Class::rfalISO14443ATransceiveAnticollisionFrame(uint8
21412141
/* Disable anti collision again */
21422142
st25r3916ClrRegisterBits(ST25R3916_REG_ISO14443A_NFC, ST25R3916_REG_ISO14443A_NFC_antcl);
21432143

2144-
/* ReEnable CRC on Rx */
2144+
/* Re-enable CRC on Rx */
21452145
st25r3916ClrRegisterBits(ST25R3916_REG_AUX, ST25R3916_REG_AUX_no_crc_rx);
21462146
/*******************************************************************************/
21472147

@@ -2165,7 +2165,7 @@ ReturnCode RfalRfST25R3916Class::rfalISO15693TransceiveAnticollisionFrame(uint8_
21652165
}
21662166

21672167
/*******************************************************************************/
2168-
/* Set speficic Analog Config for Anticolission if needed */
2168+
/* Set specific Analog Config for Anticolission if needed */
21692169
rfalSetAnalogConfig((RFAL_ANALOG_CONFIG_POLL | RFAL_ANALOG_CONFIG_TECH_NFCV | RFAL_ANALOG_CONFIG_BITRATE_COMMON | RFAL_ANALOG_CONFIG_ANTICOL));
21702170

21712171

@@ -2298,7 +2298,7 @@ ReturnCode RfalRfST25R3916Class::rfalFeliCaPoll(rfalFeliCaPollSlots slots, uint1
22982298
/* Upon timeout the full Poll Delay + (Slot time)*(nbSlots) has expired */
22992299
timeout = true;
23002300
} else {
2301-
/* Reception done, reEnabled Rx for following Slot */
2301+
/* Reception done, re-enabled Rx for following Slot */
23022302
st25r3916ExecuteCommand(ST25R3916_CMD_UNMASK_RECEIVE_DATA);
23032303
st25r3916ExecuteCommand(ST25R3916_CMD_RESET_RXGAIN);
23042304

@@ -2450,7 +2450,7 @@ ReturnCode RfalRfST25R3916Class::rfalWakeUpModeStart(const rfalWakeUpConfig *con
24502450

24512451
/*******************************************************************************/
24522452
/* Check if AAT is enabled. If so disable en bit to give time for the Voltage *
2453-
* on the to varicaps to settle and have a stable reference measurment */
2453+
* on the to varicaps to settle and have a stable reference measurement */
24542454
if (st25r3916CheckReg(ST25R3916_REG_IO_CONF2, ST25R3916_REG_IO_CONF2_aat_en, ST25R3916_REG_IO_CONF2_aat_en) && !gRFAL.wum.cfg.swTagDetect) {
24552455
st25r3916ClrRegisterBits(ST25R3916_REG_OP_CONTROL, ST25R3916_REG_OP_CONTROL_en);
24562456
delay(RFAL_ST25R3916_AAT_SETTLE_OFF);

src/rfal_rfst25r3916.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ typedef struct {
119119

120120
/*! Struct that holds counters to control the FIFO on Tx and Rx */
121121
typedef struct {
122-
uint16_t expWL; /*!< The amount of bytes expected to be Tx when a WL interrupt occours */
122+
uint16_t expWL; /*!< The amount of bytes expected to be Tx when a WL interrupt occurs */
123123
uint16_t bytesTotal; /*!< Total bytes to be transmitted OR the total bytes received */
124124
uint16_t bytesWritten;/*!< Amount of bytes already written on FIFO (Tx) OR read (RX) from FIFO and written on rxBuffer*/
125125
uint8_t status[ST25R3916_FIFO_STATUS_LEN]; /*!< FIFO Status Registers */
@@ -315,7 +315,7 @@ typedef struct {
315315
* ISO15693 2000 8.4 t1 MIN = 4192/fc
316316
* ISO15693 2009 9.1 t1 MIN = 4320/fc
317317
* Digital 2.1 B.5 FDTV,LISTEN,MIN = 4310/fc
318-
* Set FDT Listen one step earlier than on the more recent spec versions for greater interoprability
318+
* Set FDT Listen one step earlier than on the more recent spec versions for greater interoperability
319319
*/
320320
#define RFAL_FDT_LISTEN_V_ADJUSTMENT 64U
321321

@@ -968,7 +968,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
968968
*
969969
* This function the power level is measured in maximum load conditions and
970970
* the regulated voltage reference is set to 250mV below this level.
971-
* Execution of this function lasts arround 5ms.
971+
* Execution of this function lasts around 5ms.
972972
*
973973
* The regulated voltages will be set to the result of Adjust Regulators
974974
*
@@ -1354,7 +1354,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
13541354
* auto-increment feature. That is, after each read the address pointer
13551355
* inside the ST25R3916 gets incremented automatically.
13561356
*
1357-
* \param[in] reg: Address of the frist register to read from.
1357+
* \param[in] reg: Address of the first register to read from.
13581358
* \param[in] values: pointer to a buffer where the result shall be written to.
13591359
* \param[in] length: Number of registers to be read out.
13601360
*
@@ -1389,7 +1389,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
13891389
* auto-increment feature. That is, after each write the address pointer
13901390
* inside the ST25R3916 gets incremented automatically.
13911391
*
1392-
* \param[in] reg: Address of the frist register to write.
1392+
* \param[in] reg: Address of the first register to write.
13931393
* \param[in] values: pointer to a buffer containing the values to be written.
13941394
* \param[in] length: Number of values to be written.
13951395
*
@@ -1692,7 +1692,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
16921692
* \param[in] tmo : time in milliseconds until timeout occurs. If set to 0
16931693
* the functions waits forever.
16941694
*
1695-
* \return : 0 if timeout occured otherwise a mask indicating the cleared
1695+
* \return : 0 if timeout occurred otherwise a mask indicating the cleared
16961696
* interrupts.
16971697
*
16981698
*****************************************************************************
@@ -1704,7 +1704,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
17041704
* \brief Get status for the given interrupt
17051705
*
17061706
* This function is used to check whether the interrupt given by \a mask
1707-
* has occured. If yes the interrupt gets cleared. This function returns
1707+
* has occurred. If yes the interrupt gets cleared. This function returns
17081708
* only status bits which are inside \a mask.
17091709
*
17101710
* \param[in] mask : mask indicating the interrupt to check for.
@@ -1720,7 +1720,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
17201720
* \brief Init the 3916 interrupt
17211721
*
17221722
* This function is used to check whether the interrupt given by \a mask
1723-
* has occured.
1723+
* has occurred.
17241724
*
17251725
*****************************************************************************
17261726
*/
@@ -1751,7 +1751,7 @@ class RfalRfST25R3916Class : public RfalRfClass {
17511751
*****************************************************************************
17521752
* \brief ISR Service routine
17531753
*
1754-
* This function modiefies the interupt
1754+
* This function modiefies the interrupt
17551755
*****************************************************************************
17561756
*/
17571757
void st25r3916Isr(void);

src/st25r3916.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void RfalRfST25R3916Class::st25r3916Deinitialize(void)
131131
{
132132
st25r3916DisableInterrupts(ST25R3916_IRQ_MASK_ALL);
133133

134-
/* Disabe Tx and Rx, Keep OSC On */
134+
/* Disable Tx and Rx, Keep OSC On */
135135
st25r3916TxRxOff();
136136

137137
return;
@@ -253,7 +253,7 @@ ReturnCode RfalRfST25R3916Class::st25r3916CalibrateCapacitiveSensor(uint8_t *res
253253
/* Execute automatic calibration */
254254
ret = st25r3916ExecuteCommandAndGetResult(ST25R3916_CMD_CALIBRATE_C_SENSOR, ST25R3916_REG_CAP_SENSOR_RESULT, ST25R3916_TOUT_CALIBRATE_CAP_SENSOR, &res);
255255

256-
/* Check wether the calibration was successull */
256+
/* Check whether the calibration was successull */
257257
if (((res & ST25R3916_REG_CAP_SENSOR_RESULT_cs_cal_end) != ST25R3916_REG_CAP_SENSOR_RESULT_cs_cal_end) ||
258258
((res & ST25R3916_REG_CAP_SENSOR_RESULT_cs_cal_err) == ST25R3916_REG_CAP_SENSOR_RESULT_cs_cal_err) || (ret != ERR_NONE)) {
259259
return ERR_IO;

src/st25r3916.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ struct st25r3916StreamConfig {
9595
#define ST25R3916_CMD_RESPONSE_RF_COLLISION_N 0xC9U /*!< NFC transmit with Response RF Collision Avoidance */
9696
#define ST25R3916_CMD_GOTO_SENSE 0xCDU /*!< Passive target logic to Sense/Idle state */
9797
#define ST25R3916_CMD_GOTO_SLEEP 0xCEU /*!< Passive target logic to Sleep/Halt state */
98-
#define ST25R3916_CMD_MASK_RECEIVE_DATA 0xD0U /*!< Mask recive data */
99-
#define ST25R3916_CMD_UNMASK_RECEIVE_DATA 0xD1U /*!< Unmask recive data */
98+
#define ST25R3916_CMD_MASK_RECEIVE_DATA 0xD0U /*!< Mask receive data */
99+
#define ST25R3916_CMD_UNMASK_RECEIVE_DATA 0xD1U /*!< Unmask receive data */
100100
#define ST25R3916_CMD_AM_MOD_STATE_CHANGE 0xD2U /*!< AM Modulation state change */
101-
#define ST25R3916_CMD_MEASURE_AMPLITUDE 0xD3U /*!< Measure singal amplitude on RFI inputs */
101+
#define ST25R3916_CMD_MEASURE_AMPLITUDE 0xD3U /*!< Measure signal amplitude on RFI inputs */
102102
#define ST25R3916_CMD_RESET_RXGAIN 0xD5U /*!< Reset RX Gain */
103103
#define ST25R3916_CMD_ADJUST_REGULATORS 0xD6U /*!< Adjust regulators */
104104
#define ST25R3916_CMD_CALIBRATE_DRIVER_TIMING 0xD8U /*!< Starts the sequence to adjust the driver timing */

0 commit comments

Comments
 (0)