fix: formatted all files

Author: samruddhi-Rahegaonkar

src/ble/profile/legacy.c

@@ -17,34 +17,34 @@ static gattAttribute_t attr_table[] = {
 };
 
 static bStatus_t write_handler(uint16 connHandle, gattAttribute_t *pAttr,
-				uint8 *pValue, uint16 len, uint16 offset, uint8 method)
+							   uint8 *pValue, uint16 len, uint16 offset, uint8 method)
 {
-	if(gattPermitAuthorWrite(pAttr->permissions)) {
+	if (gattPermitAuthorWrite(pAttr->permissions))
+	{
 		return ATT_ERR_INSUFFICIENT_AUTHOR;
 	}
 
 	uint16_t uuid = BUILD_UINT16(pAttr->type.uuid[0], pAttr->type.uuid[1]);
-	if(uuid == RxCharUUID) {
+	if (uuid == RxCharUUID)
+	{
 		legacy_ble_rx(pValue, len);
 		return SUCCESS;
 	}
 	return ATT_ERR_ATTR_NOT_FOUND;
 }
 
-
 static gattServiceCBs_t service_handlers = {
 	NULL,
 	write_handler,
-	NULL
-};
+	NULL};
 
 int legacy_registerService()
 {
 	uint8 status = SUCCESS;
 
 	status = GATTServApp_RegisterService(attr_table,
-				GATT_NUM_ATTRS(attr_table),
-				GATT_MAX_ENCRYPT_KEY_SIZE,
-				&service_handlers);
+										 GATT_NUM_ATTRS(attr_table),
+										 GATT_MAX_ENCRYPT_KEY_SIZE,
+										 &service_handlers);
 	return (status);
 }

src/ble/profile/ng.c

@@ -34,48 +34,53 @@ static gattAttribute_t attr_table[] = {
 
 #define notiAttr attr_table[4]
 
-
 static bStatus_t write_handler(uint16 connHandle, gattAttribute_t *pAttr,
-                uint8 *pValue, uint16 len, uint16 offset, uint8 method)
+                               uint8 *pValue, uint16 len, uint16 offset, uint8 method)
 {
     PRINT("ble: write_handler(): connHandle: %04X\n", connHandle);
 
-    if (!gattPermitWrite(pAttr->permissions)) {
+    if (!gattPermitWrite(pAttr->permissions))
+    {
         return ATT_ERR_WRITE_NOT_PERMITTED;
     }
-    
+
     uint16_t uuid = BUILD_UINT16(pAttr->type.uuid[0], pAttr->type.uuid[1]);
-    if(uuid == GATT_CLIENT_CHAR_CFG_UUID) {
+    if (uuid == GATT_CLIENT_CHAR_CFG_UUID)
+    {
         bStatus_t ret = GATTServApp_ProcessCCCWriteReq(connHandle, pAttr, pValue, len,
-                offset, GATT_CLIENT_CFG_NOTIFY);
+                                                       offset, GATT_CLIENT_CFG_NOTIFY);
         PRINT("ble: CCCD changed: %02X\n", TxCCCD->value);
         return ret;
     }
 
-    if (uuid == RxCharUUID) {
+    if (uuid == RxCharUUID)
+    {
         return ng_parse(pValue, len);
     }
 
     return ATT_ERR_ATTR_NOT_FOUND;
 }
 
 static bStatus_t read_handler(uint16_t connHandle, gattAttribute_t *pAttr,
-                uint8_t *pValue, uint16_t *pLen, uint16_t offset,
-                uint16_t maxLen, uint8_t method)
+                              uint8_t *pValue, uint16_t *pLen, uint16_t offset,
+                              uint16_t maxLen, uint8_t method)
 {
-    if (!gattPermitRead(pAttr->permissions)) {
+    if (!gattPermitRead(pAttr->permissions))
+    {
         return ATT_ERR_READ_NOT_PERMITTED;
     }
 
     uint16_t uuid = BUILD_UINT16(pAttr->type.uuid[0], pAttr->type.uuid[1]);
-    if(uuid == GATT_CLIENT_CHAR_CFG_UUID) {
+    if (uuid == GATT_CLIENT_CHAR_CFG_UUID)
+    {
         *pLen = 2;
         tmos_memcpy(pValue, pAttr->pValue, *pLen);
         return SUCCESS;
     }
 
-    if (uuid == TxCharUUID) {
-        *pLen = MIN(TxLen-offset, maxLen);
+    if (uuid == TxCharUUID)
+    {
+        *pLen = MIN(TxLen - offset, maxLen);
         tmos_memcpy(pValue, &pAttr->pValue[offset], *pLen);
         return SUCCESS;
     }
@@ -86,23 +91,22 @@ static bStatus_t read_handler(uint16_t connHandle, gattAttribute_t *pAttr,
 static gattServiceCBs_t service_handlers = {
     read_handler,
     write_handler,
-    NULL
-};
+    NULL};
 
 static void connStatus_handler(uint16 connHandle, uint8 changeType)
 {
-    if(connHandle == LOOPBACK_CONNHANDLE)
+    if (connHandle == LOOPBACK_CONNHANDLE)
         return;
 
     // Reset ClientCharConfig if connection has dropped
-    if((changeType == LINKDB_STATUS_UPDATE_REMOVED)
-                || ((changeType == LINKDB_STATUS_UPDATE_STATEFLAGS)
-                && (!linkDB_Up(connHandle)))) {
+    if ((changeType == LINKDB_STATUS_UPDATE_REMOVED) || ((changeType == LINKDB_STATUS_UPDATE_STATEFLAGS) && (!linkDB_Up(connHandle))))
+    {
         GATTServApp_InitCharCfg(connHandle, TxCCCD);
     }
-    if (badge_cfg.ble_always_on) {
-            PRINT("BLE disconnected, restarting advertising due to Always-On\n");
-            ble_enable_advertise();
+    if (badge_cfg.ble_always_on)
+    {
+        PRINT("BLE disconnected, restarting advertising due to Always-On\n");
+        ble_enable_advertise();
     }
 }
 
@@ -113,9 +117,9 @@ int ng_registerService()
     linkDB_Register(connStatus_handler);
 
     status = GATTServApp_RegisterService(attr_table,
-                GATT_NUM_ATTRS(attr_table),
-                GATT_MAX_ENCRYPT_KEY_SIZE,
-                &service_handlers);
+                                         GATT_NUM_ATTRS(attr_table),
+                                         GATT_MAX_ENCRYPT_KEY_SIZE,
+                                         &service_handlers);
     return (status);
 }
 
@@ -127,36 +131,39 @@ static uint8 isNotifyEnabled(uint16 connHandle)
 /**
  * @brief   Send notify to client. Currently support one client connection
  *          only.
- * 
+ *
  * @param   val Value to be sent
  * @param   len length of val. This should not be larger than MTU.
  * @return  bStatus_t
  */
 bStatus_t ng_notify(uint8_t *val, uint8_t len)
 {
-    if(!isNotifyEnabled(TxCCCD->connHandle)) {
+    if (!isNotifyEnabled(TxCCCD->connHandle))
+    {
         PRINT("ble: ng_notify() notify is not enabled\n");
         return bleIncorrectMode;
     }
-    if(len > ATT_GetMTU(TxCCCD->connHandle)) {
+    if (len > ATT_GetMTU(TxCCCD->connHandle))
+    {
         return bleInvalidRange;
     }
 
     attHandleValueNoti_t noti = {
         .handle = notiAttr.handle,
-        .len = len
-    };
+        .len = len};
     noti.pValue = GATT_bm_alloc(TxCCCD->connHandle, ATT_HANDLE_VALUE_NOTI,
-                len, NULL, 0);
-    if (noti.pValue == NULL) {
+                                len, NULL, 0);
+    if (noti.pValue == NULL)
+    {
         return bleMemAllocError;
     }
 
     tmos_memcpy(noti.pValue, val, len);
 
     bStatus_t ret = GATT_Notification(TxCCCD->connHandle, &noti, FALSE);
     GATT_bm_free((gattMsg_t *)&noti, ATT_HANDLE_VALUE_NOTI);
-    if (ret != SUCCESS) {
+    if (ret != SUCCESS)
+    {
         PRINT("ble: noti sending failed\n");
         return ret;
     }

src/ble/setup.c

@@ -1,44 +1,52 @@
-#include <memory.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
 #include "CH58x_common.h"
-
+#include "CH58x_sys.h"
+#include "CH58xBLE_LIB.h"
+
+#include "leddrv.h"
+#include "button.h"
+#include "bmlist.h"
+#include "resource.h"
+#include "animation.h"
+#include "font.h"
+
+#include "power.h"
+#include "data.h"
 #include "config.h"
 #include "debug.h"
+
+#include "ble/setup.h"
+#include "ble/profile.h"
+
+#include "usb/usb.h"
 #include "legacyctrl.h"
-#include "ngctrl.h"
 
 #ifndef BLE_BUFF_LEN
-// MTU = 64 but clients should request new MTU, otherwise default will be 23
-#define BLE_BUFF_LEN (64 + 4)
+#define BLE_BUFF_LEN (64 + 4) // MTU = 64
 #endif
 
 #ifndef BLE_TX_NUM_EVENT
-#define BLE_TX_NUM_EVENT                    1
+#define BLE_TX_NUM_EVENT 1
 #endif
 
 #ifndef BLE_TX_POWER
-#define BLE_TX_POWER                        LL_TX_POWEER_6_DBM
-// #define BLE_TX_POWER                        LL_TX_POWEER_MINUS_16_DBM
+#define BLE_TX_POWER LL_TX_POWEER_6_DBM
+// #define BLE_TX_POWER LL_TX_POWER_MINUS_16_DBM
 #endif
 
 #ifndef BLE_MEMHEAP_SIZE
-#define BLE_MEMHEAP_SIZE                    (1024 * 6)
+#define BLE_MEMHEAP_SIZE (1024 * 6)
 #endif
 
 #ifndef CENTRAL_MAX_CONNECTION
-#define CENTRAL_MAX_CONNECTION              1
+#define CENTRAL_MAX_CONNECTION 1
 #endif
 
 #ifndef BLE_BUFF_NUM
-// The BLE lib automatically stack up Write Long messages in Write handler.
-// A connection will be disconnected if this number is some how not enough.
-#define BLE_BUFF_NUM        (512 / 23)
+#define BLE_BUFF_NUM (512 / 23)
 #endif
 
 #ifndef PERIPHERAL_MAX_CONNECTION
-#define PERIPHERAL_MAX_CONNECTION           1
+#define PERIPHERAL_MAX_CONNECTION 1
 #endif
 
 static __attribute__((aligned(4), section(".noinit")))
@@ -74,9 +82,7 @@ void ble_hardwareInit(void)
 	cfg.TxNumEvent = (uint32_t)BLE_TX_NUM_EVENT;
 	cfg.TxPower = (uint32_t)BLE_TX_POWER;
 	cfg.ConnectNumber = (PERIPHERAL_MAX_CONNECTION & 3) | (CENTRAL_MAX_CONNECTION << 2);
-
 	cfg.SelRTCClock = 1 << 7;
-
 	cfg.rcCB = lsi_calib;
 
 	uint8_t m[6];
@@ -92,14 +98,17 @@ void ble_setup(void)
 	tmos_clockInit();
 	peripheral_init();
 
-	if (badge_cfg.ble_always_on) {
+	if (badge_cfg.ble_always_on)
+	{
 		ble_enable_advertise();
-	} else {
+	}
+	else
+	{
 		ble_disable_advertise();
 	}
 
 	devInfo_registerService();
 	legacy_registerService();
 	batt_registerService();
 	ng_registerService();
-}
+}

src/config.h

@@ -8,11 +8,12 @@
 
 #define SPLASH_MIN_SPEED_T (10) // ms
 
-#define SPLASH_MAX_WIDTH (48) // pixels
+#define SPLASH_MAX_WIDTH (48)  // pixels
 #define SPLASH_MAX_HEIGHT (44) // pixels
 #define SPLASH_MAX_SIZE (ALIGN_1BYTE(SPLASH_MAX_WIDTH) * SPLASH_MAX_HEIGHT)
 
-typedef struct {
+typedef struct
+{
 	// Turn on Bluetooth while in Normal mode and disable Downloads mode
 	uint8_t ble_always_on;
 	char ble_devname[20];
@@ -33,7 +34,6 @@ typedef struct {
 } __attribute__((packed)) badge_cfg_t;
 
 extern badge_cfg_t badge_cfg;
-
 void cfg_init();
 int cfg_writeflash(uint16_t flash_offs, badge_cfg_t *cfg);
 int cfg_readflash(uint16_t flash_offs, badge_cfg_t *cfg);