Formatting improvements

source/Core/BSP/Pinecilv2/ble_peripheral.c

@@ -9,26 +9,31 @@ NOTES
 */
 /****************************************************************************/
 
+#include <FreeRTOS.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <FreeRTOS.h>
 #include <task.h>
-#include "ble_characteristics.h"
+
+#include "types.h"
+
+#include "ble_peripheral.h"
 #include "bluetooth.h"
 #include "conn.h"
 #include "gatt.h"
-#include "hci_core.h"
-#include "uuid.h"
-#include "ble_peripheral.h"
-#include "log.h"
 #include "hal_clock.h"
+#include "hci_core.h"
+#include "log.h"
+#include "uuid.h"
+
+#include "ble_characteristics.h"
 
 bool pds_start;
 
 static void          ble_device_connected(struct bt_conn *conn, u8_t err);
 static void          ble_device_disconnected(struct bt_conn *conn, u8_t reason);
 static void          ble_connection_param_changed(struct bt_conn *conn, u16_t interval, u16_t latency, u16_t timeout);
+struct bt_gatt_attr *get_attr(u8_t index);
 
 static struct bt_conn                *ble_tp_conn;
 static struct bt_gatt_exchange_params exchg_mtu;
@@ -46,9 +51,7 @@ static struct bt_conn_cb ble_tp_conn_callbacks = {
 NAME
     ble_tx_mtu_change_callback
 */
-static void ble_tx_mtu_change_callback(struct bt_conn *conn, u8_t err,
+static void ble_tx_mtu_change_callback(struct bt_conn *conn, u8_t err, struct bt_gatt_exchange_params *params) {
-                               struct bt_gatt_exchange_params *params)
-{
   if (!err) {
     tx_mtu_size = bt_gatt_get_mtu(ble_tp_conn);
     BT_WARN("ble tp echange mtu size success, mtu size: %d", tx_mtu_size);
@@ -60,8 +63,7 @@ static void ble_tx_mtu_change_callback(struct bt_conn *conn, u8_t err,
 NAME
     ble_device_connected
 */
-static void ble_device_connected(struct bt_conn *conn, u8_t err)
+static void ble_device_connected(struct bt_conn *conn, u8_t err) {
-{
   int tx_octets = 0x00fb;
   int tx_time   = 0x0848;
   int ret       = -1;
@@ -98,8 +100,7 @@ static void ble_device_connected(struct bt_conn *conn, u8_t err)
 NAME
     ble_device_disconnected
 */
-static void ble_device_disconnected(struct bt_conn *conn, u8_t reason)
+static void ble_device_disconnected(struct bt_conn *conn, u8_t reason) {
-{
   BT_WARN("Tp disconnected");
 
   if (created_tp_task) {
@@ -119,9 +120,7 @@ NAME
     ble_connection_param_changed
 */
 
-static void ble_connection_param_changed(struct bt_conn *conn, u16_t interval,
+static void ble_connection_param_changed(struct bt_conn *conn, u16_t interval, u16_t latency, u16_t timeout) {
-                              u16_t latency, u16_t timeout)
-{
   BT_INFO("LE conn param updated: int 0x%04x lat %d to %d \r\n", interval, latency, timeout);
 }
 
@@ -129,9 +128,7 @@ static void ble_connection_param_changed(struct bt_conn *conn, u16_t interval,
 NAME
     ble_tp_recv_rd
 */
-static int ble_tp_recv_rd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
+static int ble_tp_recv_rd(struct bt_conn *conn, const struct bt_gatt_attr *attr, void *buf, u16_t len, u16_t offset) {
-                          void *buf, u16_t len, u16_t offset)
-{
   int  size    = 9;
   char data[9] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09};
 
@@ -144,9 +141,7 @@ static int ble_tp_recv_rd(struct bt_conn *conn, const struct bt_gatt_attr *attr,
 NAME
     ble_tp_recv_wr(receive data from client)
 */
-static int ble_tp_recv_wr(struct bt_conn *conn, const struct bt_gatt_attr *attr,
+static int ble_tp_recv_wr(struct bt_conn *conn, const struct bt_gatt_attr *attr, const void *buf, u16_t len, u16_t offset, u8_t flags) {
-                          const void *buf, u16_t len, u16_t offset, u8_t flags)
-{
   BT_WARN("recv data len=%d, offset=%d, flag=%d", len, offset, flags);
   BT_WARN("recv data:%s", bt_hex(buf, len));
 
@@ -167,13 +162,11 @@ static int ble_tp_recv_wr(struct bt_conn *conn, const struct bt_gatt_attr *attr,
   return len;
 }
 
-
 /*************************************************************************
 NAME
     ble_tp_ind_ccc_changed
 */
-static void ble_tp_ind_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
+static void ble_tp_ind_ccc_changed(const struct bt_gatt_attr *attr, u16_t value) {
-{
   int  err     = -1;
   char data[9] = {0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09};
 
@@ -183,22 +176,13 @@ static void ble_tp_ind_ccc_changed(const struct bt_gatt_attr *attr, u16_t value)
   }
 }
 
-
 /*************************************************************************
  *  DEFINE : attrs
  */
 static struct bt_gatt_attr attrs[] = {
     BT_GATT_PRIMARY_SERVICE(BT_UUID_SVC_LIVE_DATA),
 
-    BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_LIVE_SETPOINT_TEMP,
+    BT_GATT_CHARACTERISTIC(BT_UUID_CHAR_BLE_LIVE_SETPOINT_TEMP, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, ble_tp_recv_rd, NULL, NULL),
-                           BT_GATT_CHRC_READ,
-                           BT_GATT_PERM_READ,
-                           ble_tp_recv_rd,
-                           NULL,
-                           NULL),
-
-
-
 
 };
 
@@ -206,20 +190,16 @@ static struct bt_gatt_attr attrs[] = {
 NAME
     get_attr
 */
-struct bt_gatt_attr *get_attr(u8_t index)
+struct bt_gatt_attr *get_attr(u8_t index) {
-{
   return &attrs[index];
 }
 
 static struct bt_gatt_service ble_tp_server = BT_GATT_SERVICE(attrs);
 
-
-
 const char *DEVICE_BLE_NAME = "Pinecil";
 
 // Start advertising with expected default values
-int ble_start_adv(void)
+int ble_start_adv(void) {
-{
   MSG("BLE Starting advertising\n");
   struct bt_le_adv_param adv_param = {
       // options:3, connectable undirected, adv one time
@@ -236,12 +216,9 @@ int ble_start_adv(void)
   return bt_le_adv_start(&adv_param, adv_data, ARRAY_SIZE(adv_data), &adv_data[1], 1);
 }
 
-
-
 // Callback that the ble stack will call once it has been kicked off running
 // We use this to register the handlers (as we know its now ready for them) + start advertising to the world
-void bt_enable_cb(int err)
+void bt_enable_cb(int err) {
-{
   bt_conn_cb_register(&ble_tp_conn_callbacks);
   bt_gatt_service_register(&ble_tp_server);