Skip to content

Commit f6282aa

Browse files
mluis1mluis1
committed
Issue #914 - Changed utilities.h SUCCESS/FAIL definition by an enumeration LMN_STATUS_OK/LMN_STATUS_ERROR
1 parent 691086a commit f6282aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+466
-462
lines changed

‎src/boards/B-L072Z-LRWAN1/board.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ void SystemClockConfig( void )
259259
RCC_OscInitStruct.PLL.PLLDIV = RCC_PLLDIV_3;
260260
if( HAL_RCC_OscConfig( &RCC_OscInitStruct ) != HAL_OK )
261261
{
262-
assert_param( FAIL );
262+
assert_param( LMN_STATUS_ERROR );
263263
}
264264

265265
RCC_ClkInitStruct.ClockType = (RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2);
@@ -269,14 +269,14 @@ void SystemClockConfig( void )
269269
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
270270
if( HAL_RCC_ClockConfig( &RCC_ClkInitStruct, FLASH_LATENCY_1 ) != HAL_OK )
271271
{
272-
assert_param( FAIL );
272+
assert_param( LMN_STATUS_ERROR );
273273
}
274274

275275
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC;
276276
PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
277277
if( HAL_RCCEx_PeriphCLKConfig( &PeriphClkInit ) != HAL_OK )
278278
{
279-
assert_param( FAIL );
279+
assert_param( LMN_STATUS_ERROR );
280280
}
281281

282282
HAL_SYSTICK_Config( HAL_RCC_GetHCLKFreq( ) / 1000 );

‎src/boards/B-L072Z-LRWAN1/eeprom-board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#include "utilities.h"
2525
#include "eeprom-board.h"
2626

27-
uint8_t EepromMcuWriteBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
27+
LmnStatus_t EepromMcuWriteBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
2828
{
29-
uint8_t status = FAIL;
29+
LmnStatus_t status = LMN_STATUS_ERROR;
3030

3131
assert_param( ( DATA_EEPROM_BASE + addr ) >= DATA_EEPROM_BASE );
3232
assert_param( buffer != NULL );
@@ -46,30 +46,30 @@ uint8_t EepromMcuWriteBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
4646
}
4747
}
4848
CRITICAL_SECTION_END( );
49-
status = SUCCESS;
49+
status = LMN_STATUS_OK;
5050
}
5151

5252
HAL_FLASHEx_DATAEEPROM_Lock( );
5353
return status;
5454
}
5555

56-
uint8_t EepromMcuReadBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
56+
LmnStatus_t EepromMcuReadBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
5757
{
5858
assert_param( ( DATA_EEPROM_BASE + addr ) >= DATA_EEPROM_BASE );
5959
assert_param( buffer != NULL );
6060
assert_param( size < ( DATA_EEPROM_BANK2_END - DATA_EEPROM_BASE ) );
6161

6262
memcpy1( buffer, ( uint8_t* )( DATA_EEPROM_BASE + addr ), size );
63-
return SUCCESS;
63+
return LMN_STATUS_OK;
6464
}
6565

6666
void EepromMcuSetDeviceAddr( uint8_t addr )
6767
{
68-
assert_param( FAIL );
68+
assert_param( LMN_STATUS_ERROR );
6969
}
7070

71-
uint8_t EepromMcuGetDeviceAddr( void )
71+
LmnStatus_t EepromMcuGetDeviceAddr( void )
7272
{
73-
assert_param( FAIL );
73+
assert_param( LMN_STATUS_ERROR );
7474
return 0;
7575
}

‎src/boards/B-L072Z-LRWAN1/gpio-board.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void GpioMcuInit( Gpio_t *obj, PinNames pin, PinModes mode, PinConfigs config, P
6969
}
7070
else
7171
{
72-
assert_param( FAIL );
72+
assert_param( LMN_STATUS_ERROR );
7373
}
7474

7575
GPIO_InitStructure.Pin = obj->pinIndex ;
@@ -254,7 +254,7 @@ void GpioMcuWrite( Gpio_t *obj, uint32_t value )
254254
{
255255
if( obj == NULL )
256256
{
257-
assert_param( FAIL );
257+
assert_param( LMN_STATUS_ERROR );
258258
}
259259
// Check if pin is not connected
260260
if( obj->pin == NC )
@@ -278,7 +278,7 @@ void GpioMcuToggle( Gpio_t *obj )
278278
{
279279
if( obj == NULL )
280280
{
281-
assert_param( FAIL );
281+
assert_param( LMN_STATUS_ERROR );
282282
}
283283

284284
// Check if pin is not connected
@@ -303,7 +303,7 @@ uint32_t GpioMcuRead( Gpio_t *obj )
303303
{
304304
if( obj == NULL )
305305
{
306-
assert_param( FAIL );
306+
assert_param( LMN_STATUS_ERROR );
307307
}
308308
// Check if pin is not connected
309309
if( obj->pin == NC )

‎src/boards/B-L072Z-LRWAN1/i2c-board.c‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -106,27 +106,27 @@ void I2cSetAddrSize( I2c_t *obj, I2cAddrSize addrSize )
106106
I2cInternalAddrSize = addrSize;
107107
}
108108

109-
uint8_t I2cMcuWriteBuffer( I2c_t *obj, uint8_t deviceAddr, uint8_t *buffer, uint16_t size )
109+
LmnStatus_t I2cMcuWriteBuffer( I2c_t *obj, uint8_t deviceAddr, uint8_t *buffer, uint16_t size )
110110
{
111-
uint8_t status = FAIL;
111+
LmnStatus_t status = LMN_STATUS_ERROR;
112112

113-
status = ( HAL_I2C_Master_Transmit( &I2cHandle, deviceAddr, buffer, size, 2000 ) == HAL_OK ) ? SUCCESS : FAIL;
113+
status = ( HAL_I2C_Master_Transmit( &I2cHandle, deviceAddr, buffer, size, 2000 ) == HAL_OK ) ? LMN_STATUS_OK : LMN_STATUS_ERROR;
114114

115115
return status;
116116
}
117117

118-
uint8_t I2cMcuReadBuffer( I2c_t *obj, uint8_t deviceAddr, uint8_t *buffer, uint16_t size )
118+
LmnStatus_t I2cMcuReadBuffer( I2c_t *obj, uint8_t deviceAddr, uint8_t *buffer, uint16_t size )
119119
{
120-
uint8_t status = FAIL;
120+
LmnStatus_t status = LMN_STATUS_ERROR;
121121

122-
status = ( HAL_I2C_Master_Receive( &I2cHandle, deviceAddr, buffer, size, 2000 ) == HAL_OK ) ? SUCCESS : FAIL;
122+
status = ( HAL_I2C_Master_Receive( &I2cHandle, deviceAddr, buffer, size, 2000 ) == HAL_OK ) ? LMN_STATUS_OK : LMN_STATUS_ERROR;
123123

124124
return status;
125125
}
126126

127-
uint8_t I2cMcuWriteMemBuffer( I2c_t *obj, uint8_t deviceAddr, uint16_t addr, uint8_t *buffer, uint16_t size )
127+
LmnStatus_t I2cMcuWriteMemBuffer( I2c_t *obj, uint8_t deviceAddr, uint16_t addr, uint8_t *buffer, uint16_t size )
128128
{
129-
uint8_t status = FAIL;
129+
LmnStatus_t status = LMN_STATUS_ERROR;
130130
uint16_t memAddSize = 0;
131131

132132
if( I2cInternalAddrSize == I2C_ADDR_SIZE_8 )
@@ -137,14 +137,14 @@ uint8_t I2cMcuWriteMemBuffer( I2c_t *obj, uint8_t deviceAddr, uint16_t addr, uin
137137
{
138138
memAddSize = I2C_MEMADD_SIZE_16BIT;
139139
}
140-
status = ( HAL_I2C_Mem_Write( &I2cHandle, deviceAddr, addr, memAddSize, buffer, size, 2000 ) == HAL_OK ) ? SUCCESS : FAIL;
140+
status = ( HAL_I2C_Mem_Write( &I2cHandle, deviceAddr, addr, memAddSize, buffer, size, 2000 ) == HAL_OK ) ? LMN_STATUS_OK : LMN_STATUS_ERROR;
141141

142142
return status;
143143
}
144144

145-
uint8_t I2cMcuReadMemBuffer( I2c_t *obj, uint8_t deviceAddr, uint16_t addr, uint8_t *buffer, uint16_t size )
145+
LmnStatus_t I2cMcuReadMemBuffer( I2c_t *obj, uint8_t deviceAddr, uint16_t addr, uint8_t *buffer, uint16_t size )
146146
{
147-
uint8_t status = FAIL;
147+
LmnStatus_t status = LMN_STATUS_ERROR;
148148
uint16_t memAddSize = 0;
149149

150150
if( I2cInternalAddrSize == I2C_ADDR_SIZE_8 )
@@ -155,16 +155,16 @@ uint8_t I2cMcuReadMemBuffer( I2c_t *obj, uint8_t deviceAddr, uint16_t addr, uint
155155
{
156156
memAddSize = I2C_MEMADD_SIZE_16BIT;
157157
}
158-
status = ( HAL_I2C_Mem_Read( &I2cHandle, deviceAddr, addr, memAddSize, buffer, size, 2000 ) == HAL_OK ) ? SUCCESS : FAIL;
158+
status = ( HAL_I2C_Mem_Read( &I2cHandle, deviceAddr, addr, memAddSize, buffer, size, 2000 ) == HAL_OK ) ? LMN_STATUS_OK : LMN_STATUS_ERROR;
159159

160160
return status;
161161
}
162162

163-
uint8_t I2cMcuWaitStandbyState( I2c_t *obj, uint8_t deviceAddr )
163+
LmnStatus_t I2cMcuWaitStandbyState( I2c_t *obj, uint8_t deviceAddr )
164164
{
165-
uint8_t status = FAIL;
165+
LmnStatus_t status = LMN_STATUS_ERROR;
166166

167-
status = ( HAL_I2C_IsDeviceReady( &I2cHandle, deviceAddr, 300, 4096 ) == HAL_OK ) ? SUCCESS : FAIL;
167+
status = ( HAL_I2C_IsDeviceReady( &I2cHandle, deviceAddr, 300, 4096 ) == HAL_OK ) ? LMN_STATUS_OK : LMN_STATUS_ERROR;
168168

169169
return status;
170170
}

‎src/boards/B-L072Z-LRWAN1/spi-board.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ uint16_t SpiInOut( Spi_t *obj, uint16_t outData )
145145

146146
if( ( obj == NULL ) || ( SpiHandle[obj->SpiId].Instance ) == NULL )
147147
{
148-
assert_param( FAIL );
148+
assert_param( LMN_STATUS_ERROR );
149149
}
150150

151151
__HAL_SPI_ENABLE( &SpiHandle[obj->SpiId] );

‎src/boards/B-L072Z-LRWAN1/uart-board.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,29 +76,29 @@ void UartMcuConfig( Uart_t *obj, UartMode_t mode, uint32_t baudrate, WordLength_
7676
{
7777
if( obj->FifoTx.Data == NULL )
7878
{
79-
assert_param( FAIL );
79+
assert_param( LMN_STATUS_ERROR );
8080
}
8181
UartHandle.Init.Mode = UART_MODE_TX;
8282
}
8383
else if( mode == RX_ONLY )
8484
{
8585
if( obj->FifoRx.Data == NULL )
8686
{
87-
assert_param( FAIL );
87+
assert_param( LMN_STATUS_ERROR );
8888
}
8989
UartHandle.Init.Mode = UART_MODE_RX;
9090
}
9191
else if( mode == RX_TX )
9292
{
9393
if( ( obj->FifoTx.Data == NULL ) || ( obj->FifoRx.Data == NULL ) )
9494
{
95-
assert_param( FAIL );
95+
assert_param( LMN_STATUS_ERROR );
9696
}
9797
UartHandle.Init.Mode = UART_MODE_TX_RX;
9898
}
9999
else
100100
{
101-
assert_param( FAIL );
101+
assert_param( LMN_STATUS_ERROR );
102102
}
103103

104104
if( wordLength == UART_8_BIT )
@@ -158,7 +158,7 @@ void UartMcuConfig( Uart_t *obj, UartMode_t mode, uint32_t baudrate, WordLength_
158158

159159
if( HAL_UART_Init( &UartHandle ) != HAL_OK )
160160
{
161-
assert_param( FAIL );
161+
assert_param( LMN_STATUS_ERROR );
162162
}
163163

164164
HAL_NVIC_SetPriority( USART2_IRQn, 1, 0 );

‎src/boards/NAMote72/board.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ void SystemClockConfig( void )
463463
RCC_OscInitStruct.PLL.PLLDIV = RCC_PLL_DIV3;
464464
if( HAL_RCC_OscConfig( &RCC_OscInitStruct ) != HAL_OK )
465465
{
466-
assert_param( FAIL );
466+
assert_param( LMN_STATUS_ERROR );
467467
}
468468

469469
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK |
@@ -474,14 +474,14 @@ void SystemClockConfig( void )
474474
RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
475475
if( HAL_RCC_ClockConfig( &RCC_ClkInitStruct, FLASH_LATENCY_1 ) != HAL_OK )
476476
{
477-
assert_param( FAIL );
477+
assert_param( LMN_STATUS_ERROR );
478478
}
479479

480480
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_RTC;
481481
PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSE;
482482
if( HAL_RCCEx_PeriphCLKConfig( &PeriphClkInit ) != HAL_OK )
483483
{
484-
assert_param( FAIL );
484+
assert_param( LMN_STATUS_ERROR );
485485
}
486486

487487
HAL_SYSTICK_Config( HAL_RCC_GetHCLKFreq( ) / 1000 );

‎src/boards/NAMote72/eeprom-board.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
#include "utilities.h"
2525
#include "eeprom-board.h"
2626

27-
uint8_t EepromMcuWriteBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
27+
LmnStatus_t EepromMcuWriteBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
2828
{
29-
uint8_t status = FAIL;
29+
LmnStatus_t status = LMN_STATUS_ERROR;
3030

3131
assert_param( ( FLASH_EEPROM_BASE + addr ) >= FLASH_EEPROM_BASE );
3232
assert_param( buffer != NULL );
@@ -46,30 +46,30 @@ uint8_t EepromMcuWriteBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
4646
}
4747
}
4848
CRITICAL_SECTION_END( );
49-
status = SUCCESS;
49+
status = LMN_STATUS_OK;
5050
}
5151

5252
HAL_FLASHEx_DATAEEPROM_Lock( );
5353
return status;
5454
}
5555

56-
uint8_t EepromMcuReadBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
56+
LmnStatus_t EepromMcuReadBuffer( uint16_t addr, uint8_t *buffer, uint16_t size )
5757
{
5858
assert_param( ( FLASH_EEPROM_BASE + addr ) >= FLASH_EEPROM_BASE );
5959
assert_param( buffer != NULL );
6060
assert_param( size < ( FLASH_EEPROM_END - FLASH_EEPROM_BASE ) );
6161

6262
memcpy1( buffer, ( uint8_t* )( FLASH_EEPROM_BASE + addr ), size );
63-
return SUCCESS;
63+
return LMN_STATUS_OK;
6464
}
6565

6666
void EepromMcuSetDeviceAddr( uint8_t addr )
6767
{
68-
assert_param( FAIL );
68+
assert_param( LMN_STATUS_ERROR );
6969
}
7070

71-
uint8_t EepromMcuGetDeviceAddr( void )
71+
LmnStatus_t EepromMcuGetDeviceAddr( void )
7272
{
73-
assert_param( FAIL );
73+
assert_param( LMN_STATUS_ERROR );
7474
return 0;
7575
}

‎src/boards/NAMote72/gpio-board.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ void GpioMcuWrite( Gpio_t *obj, uint32_t value )
263263
{
264264
if( obj == NULL )
265265
{
266-
assert_param( FAIL );
266+
assert_param( LMN_STATUS_ERROR );
267267
}
268268
// Check if pin is not connected
269269
if( obj->pin == NC )
@@ -287,7 +287,7 @@ void GpioMcuToggle( Gpio_t *obj )
287287
{
288288
if( obj == NULL )
289289
{
290-
assert_param( FAIL );
290+
assert_param( LMN_STATUS_ERROR );
291291
}
292292

293293
// Check if pin is not connected
@@ -312,7 +312,7 @@ uint32_t GpioMcuRead( Gpio_t *obj )
312312
{
313313
if( obj == NULL )
314314
{
315-
assert_param( FAIL );
315+
assert_param( LMN_STATUS_ERROR );
316316
}
317317
// Check if pin is not connected
318318
if( obj->pin == NC )

0 commit comments

Comments
 (0)