Skip to content

Commit

Permalink
Align comments to 12*4
Browse files Browse the repository at this point in the history
  • Loading branch information
MaJerle committed Sep 24, 2020
1 parent 19ce2e0 commit 650261a
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion lwow/src/devices/lwow_device_ds18x20.c
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ lwow_ds18x20_get_resolution_raw(lwow_t* const ow, const lwow_rom_t* const rom_id
lwow_read_byte_ex_raw(ow, &br);

lwow_read_byte_ex_raw(ow, &br);
res = ((br & 0x60) >> 0x05) + 9; /* Read configuration byte and calculate bits */
res = ((br & 0x60) >> 0x05) + 9; /* Read configuration byte and calculate bits */
}

return res;
Expand Down
8 changes: 4 additions & 4 deletions lwow/src/include/lwow/devices/lwow_device_ds18x20.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ extern "C" {
* locking mechanism when using with operating system.
*/

#define LWOW_DS18X20_ALARM_DISABLE ((int8_t)-128) /*!< Disable alarm temperature */
#define LWOW_DS18X20_ALARM_NOCHANGE ((int8_t)-127) /*!< Do not modify current alarm settings */
#define LWOW_DS18X20_TEMP_MIN ((int8_t)-55) /*!< Minimum temperature */
#define LWOW_DS18X20_TEMP_MAX ((int8_t)125) /*!< Maximal temperature */
#define LWOW_DS18X20_ALARM_DISABLE ((int8_t)-128)/*!< Disable alarm temperature */
#define LWOW_DS18X20_ALARM_NOCHANGE ((int8_t)-127)/*!< Do not modify current alarm settings */
#define LWOW_DS18X20_TEMP_MIN ((int8_t)-55) /*!< Minimum temperature */
#define LWOW_DS18X20_TEMP_MAX ((int8_t)125) /*!< Maximal temperature */

uint8_t lwow_ds18x20_start_raw(lwow_t* const ow, const lwow_rom_t* const rom_id);
uint8_t lwow_ds18x20_start(lwow_t* const ow, const lwow_rom_t* const rom_id);
Expand Down
2 changes: 1 addition & 1 deletion lwow/src/include/lwow/lwow.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ typedef struct {
*/
typedef lwowr_t (*lwow_search_cb_fn) (lwow_t* const ow, const lwow_rom_t* const rom_id, size_t index, void* arg);

#define LWOW_UNUSED(x) ((void)(x)) /*!< Unused variable macro */
#define LWOW_UNUSED(x) ((void)(x)) /*!< Unused variable macro */

/**
* \brief Assert check function
Expand Down
6 changes: 3 additions & 3 deletions lwow/src/lwow/lwow.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,13 @@ lwow_reset_raw(lwow_t* const ow) {
/* First send reset pulse */
b = OW_RESET_BYTE; /* Set reset sequence byte = 0xF0 */
if (!ow->ll_drv->set_baudrate(9600, ow->arg)) {
return lwowERRBAUD; /* Error setting baudrate */
return lwowERRBAUD; /* Error setting baudrate */
}
if (!ow->ll_drv->tx_rx(&b, &b, 1, ow->arg)) {
return lwowERRTXRX; /* Error with data exchange */
return lwowERRTXRX; /* Error with data exchange */
}
if (!ow->ll_drv->set_baudrate(115200, ow->arg)) {
return lwowERRBAUD; /* Error setting baudrate */
return lwowERRBAUD; /* Error setting baudrate */
}

/* Check if there is reply from any device */
Expand Down

0 comments on commit 650261a

Please sign in to comment.