diff --git a/TestTHB2.uvprojx b/TestTHB2.uvprojx deleted file mode 100644 index bfdf96e..0000000 --- a/TestTHB2.uvprojx +++ /dev/null @@ -1,1043 +0,0 @@ - - - - 2.1 - -
### uVision Project, (C) Keil Software
- - - - Target 1 - 0x4 - ARM-ADS - 5060960::V5.06 update 7 (build 960)::.\ARMCC - 0 - - - ARMCM0 - ARM - ARM.CMSIS.5.8.0 - http://www.keil.com/pack/ - IRAM(0x20000000,0x20000) IROM(0x00000000,0x40000) CPUTYPE("Cortex-M0") CLOCK(12000000) ESEL ELITTLE - - - UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0NEW_DEVICE -FS00 -FL040000 -FP0($$Device:ARMCM0$Device\ARM\Flash\NEW_DEVICE.FLM)) - 0 - $$Device:ARMCM0$Device\ARM\ARMCM0\Include\ARMCM0.h - - - - - - - - - - $$Device:ARMCM0$Device\ARM\SVD\ARMCM0.svd - 0 - 0 - - - - - - - 0 - 0 - 0 - 0 - 1 - - .\Objects\ - TestTHB2 - 1 - 0 - 1 - 1 - 1 - .\Listings\ - 1 - 0 - 0 - - 0 - 0 - - - 0 - 0 - 0 - 0 - - - 0 - 0 - - - 0 - 0 - 0 - 0 - - - 1 - 1 - fromelf.exe .\Objects\TestTHB2.axf --i32combined --output .\bin\TestTHB2.hex - fromelf -c -a -d -e -v -o TestTHB2.asm ./Objects/TestTHB2.axf - 0 - 0 - 0 - 0 - - 0 - - - - 0 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 3 - - - 1 - - - SARMCM3.DLL - - DARMCM1.DLL - -pCM0 - SARMCM3.DLL - - TARMCM1.DLL - -pCM0 - - - - 1 - 0 - 0 - 0 - 16 - - - - - 1 - 1 - 0 - 1 - 1 - 4096 - - 1 - BIN\UL2CM3.DLL - "" () - .\ram.ini - - - - 0 - - - - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 1 - 1 - 0 - 1 - 1 - 0 - 0 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 0 - 0 - "Cortex-M0" - - 0 - 0 - 0 - 1 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 8 - 1 - 1 - 0 - 0 - 3 - 3 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x20000000 - 0x20000 - - - 1 - 0x0 - 0x40000 - - - 0 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x0 - 0x0 - - - 1 - 0x20000000 - 0x400 - - - 1 - 0x1fff8000 - 0x1f40 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x0 - 0x0 - - - 0 - 0x1fff6000 - 0x2000 - - - 0 - 0x0 - 0x0 - - - - - - 1 - 4 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 0 - 2 - 0 - 0 - 1 - 0 - 0 - 1 - 1 - 1 - 1 - 0 - 0 - 0 - - -DADV_NCONN_CFG=0x01 -DADV_CONN_CFG=0x02 -DSCAN_CFG=0x04 -DINIT_CFG=0x08 -DBROADCASTER_CFG=0x01 -DOBSERVER_CFG=0x02 -DPERIPHERAL_CFG=0x04 -DCENTRAL_CFG=0x08 - DEBUG_INFO=0 CFG_CP OSAL_CBTIMER_NUM_TASKS=1 MTU_SIZE=247 HOST_CONFIG=4 HCI_TL_NONE=1 ENABLE_LOG_ROM_=0 _BUILD_FOR_DTM_=0 DBG_ROM_MAIN=0 APP_CFG=0 OSALMEM_METRICS=0 PHY_MCU_TYPE=MCU_BUMBEE_M0 CFG_SLEEP_MODE=PWR_MODE_SLEEP DEF_GAPBOND_MGR_ENABLE=0 USE_FS=0 MAX_NUM_LL_CONN=1 - - ..\components\inc;..\components\ble\controller;..\components\osal\include;..\components\common;..\components\ble\include;..\components\ble\hci;..\components\ble\host;..\components\Profiles\ota_app;..\components\Profiles\DevInfo;..\components\Profiles\SimpleProfile;..\components\Profiles\Roles;.\source;..\components\libraries\crc16;..\components\driver\watchdog;..\components\driver\clock;..\components\arch\cm0;..\components\driver\pwrmgr;..\components\driver\uart;..\components\driver\gpio;..\components\driver\timer;..\misc;..\components\driver\log;..\components\libraries\cliface;..\components\driver\key;..\components\driver\pwm;..\components\driver\flash;..\components\libraries\fs;..\components\driver\led_light;..\components\driver\i2c;..\components\Profiles\Batt;..\components\driver\adc - - - - 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 4 - - - - - - - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - - .\scatter_load.sct - - - ..\misc\bb_rom_sym_m0.txt --keep=jump_table_base --keep=global_config - - - - - - - - arch - - - main.c - 1 - .\main.c - - - - - driver - - - uart.c - 1 - ..\components\driver\uart\uart.c - - - clock.c - 1 - ..\components\driver\clock\clock.c - - - gpio.c - 1 - ..\components\driver\gpio\gpio.c - - - timer.c - 1 - ..\components\driver\timer\timer.c - - - watchdog.c - 1 - ..\components\driver\watchdog\watchdog.c - - - pwrmgr.c - 1 - ..\components\driver\pwrmgr\pwrmgr.c - - - my_printf.c - 1 - ..\components\driver\log\my_printf.c - - - key.c - 1 - ..\components\driver\key\key.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - pwm.c - 1 - ..\components\driver\pwm\pwm.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - osal_snv.c - 1 - ..\components\osal\snv\osal_snv.c - - - flash.c - 1 - ..\components\driver\flash\flash.c - - - led_light.c - 1 - ..\components\driver\led_light\led_light.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - fs.c - 1 - ..\components\libraries\fs\fs.c - - - fs.h - 5 - ..\components\libraries\fs\fs.h - - - i2c.c - 1 - ..\components\driver\i2c\i2c.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - - - profile - - - gap.c - 1 - ..\components\profiles\Roles\gap.c - - - gapbondmgr.c - 1 - ..\components\profiles\Roles\gapbondmgr.c - - - 2 - 0 - 0 - 0 - 0 - 1 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - gapgattserver.c - 1 - ..\components\profiles\Roles\gapgattserver.c - - - peripheral.c - 1 - ..\components\profiles\Roles\peripheral.c - - - gattservapp.c - 1 - ..\components\profiles\GATT\gattservapp.c - - - ota_app_service.c - 1 - ..\components\profiles\ota_app\ota_app_service.c - - - sbpProfile_ota.c - 1 - .\source\sbpProfile_ota.c - - - 2 - 0 - 0 - 0 - 0 - 0 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - - - - battservice.c - 1 - ..\components\profiles\Batt\battservice.c - - - devinfoservice.c - 1 - ..\components\profiles\DevInfo\devinfoservice.c - - - - - jump - - - jump_table.c - 1 - ..\misc\jump_table.c - - - - - lib - - - rf.lib - 4 - ..\lib\rf.lib - - - ble_host.lib - 4 - ..\lib\ble_host.lib - - - - - TestTHB2 - - - OSAL_SimpleBLEPeripheral.c - 1 - .\source\OSAL_SimpleBLEPeripheral.c - - - SimpleBLEPeripheral_Main.c - 1 - .\source\SimpleBLEPeripheral_Main.c - - - thb2_main.c - 1 - .\source\thb2_main.c - - - bthome_beacon.c - 1 - .\source\bthome_beacon.c - - - sensors.c - 1 - .\source\sensors.c - - - battery.c - 1 - .\source\battery.c - - - thservice.c - 1 - .\source\thservice.c - - - - - ::CMSIS - - - ::Device - - - 0 - 0 - 0 - 0 - 0 - 1 - 2 - 2 - 2 - 2 - 11 - - - 1 - - - - 2 - 0 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - 0 - 2 - 2 - 2 - 2 - 2 - - - - - - - - - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RTE\Device\ARMCM0\startup_ARMCM0.s - - - - - - - - RTE\Device\ARMCM0\system_ARMCM0.c - - - - - - - - RTE\Device\ARMCM4\startup_ARMCM4.s - - - - - - RTE\Device\ARMCM4\system_ARMCM4.c - - - - - - RTE\Device\ARMCM4_FP\startup_ARMCM4.s - - - - - - RTE\Device\ARMCM4_FP\system_ARMCM4.c - - - - - - - - - - - <Project Info> - 0 - 1 - - - - - diff --git a/rdwr_phy6222.py b/rdwr_phy6222.py index ce34d98..3c4b89b 100644 --- a/rdwr_phy6222.py +++ b/rdwr_phy6222.py @@ -21,7 +21,7 @@ PHY_WR_BLK_SIZE = 0x2000 __progname__ = 'PHY6222 Utility' __filename__ = 'rdwr_phy6222.py' -__version__ = "29.12.23" +__version__ = "03.01.24" def ParseHexFile(hexfile): try: @@ -381,13 +381,7 @@ class phyflasher: raddr = 0x00005414 print ('---- Segments Table -------------------------------------') for ihp in hp: - if ihp[0] == 0x1fff0000: - faddr = 0x00005000 - raddr = faddr - elif ihp[0] == 0x1fff1838: - faddr = 0x00005414 - raddr = faddr - elif (ihp[0] & 0x1fff0000) == 0x1fff0000: + if (ihp[0] & 0x1fff0000) == 0x1fff0000: faddr = raddr raddr += (len(ihp[1])+3) & 0xfffffffc elif (ihp[0] & (~(MAX_FLASH_SIZE-1))) == 0x11000000: diff --git a/src/TestTHB2/main.c b/src/TestTHB2/main.c index 4329af3..d438e89 100644 --- a/src/TestTHB2/main.c +++ b/src/TestTHB2/main.c @@ -210,8 +210,8 @@ static void hal_init(void) .rd_instr = XFRD_FCMD_READ_DUAL }; hal_spif_cache_init(cfg); - LOG_INIT(); hal_gpio_init(); + LOG_INIT(); hal_fs_init(0x1103C000,2); hal_adc_init(); } diff --git a/src/TestTHB2/rdwr_phy6222.py b/src/TestTHB2/rdwr_phy6222.py index ce34d98..3c4b89b 100644 --- a/src/TestTHB2/rdwr_phy6222.py +++ b/src/TestTHB2/rdwr_phy6222.py @@ -21,7 +21,7 @@ PHY_WR_BLK_SIZE = 0x2000 __progname__ = 'PHY6222 Utility' __filename__ = 'rdwr_phy6222.py' -__version__ = "29.12.23" +__version__ = "03.01.24" def ParseHexFile(hexfile): try: @@ -381,13 +381,7 @@ class phyflasher: raddr = 0x00005414 print ('---- Segments Table -------------------------------------') for ihp in hp: - if ihp[0] == 0x1fff0000: - faddr = 0x00005000 - raddr = faddr - elif ihp[0] == 0x1fff1838: - faddr = 0x00005414 - raddr = faddr - elif (ihp[0] & 0x1fff0000) == 0x1fff0000: + if (ihp[0] & 0x1fff0000) == 0x1fff0000: faddr = raddr raddr += (len(ihp[1])+3) & 0xfffffffc elif (ihp[0] & (~(MAX_FLASH_SIZE-1))) == 0x11000000: diff --git a/src/TestTHB2/source/OSAL_SimpleBLEPeripheral.c b/src/TestTHB2/source/OSAL_SimpleBLEPeripheral.c index 73e0b76..9358379 100644 --- a/src/TestTHB2/source/OSAL_SimpleBLEPeripheral.c +++ b/src/TestTHB2/source/OSAL_SimpleBLEPeripheral.c @@ -1,16 +1,9 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - /************************************************************************************************** Filename: OSAL_SimpleBLEPeripheral.c Revised: Revision: Description: This file contains function that allows user setup tasks - - - **************************************************************************************************/ /************************************************************************************************** @@ -123,5 +116,3 @@ void osalInitTasks( void ) SimpleBLEPeripheral_Init( taskID++ ); } #endif -/********************************************************************* -*********************************************************************/ diff --git a/src/TestTHB2/source/SimpleBLEPeripheral_Main.c b/src/TestTHB2/source/SimpleBLEPeripheral_Main.c index 76cce85..404a6c3 100644 --- a/src/TestTHB2/source/SimpleBLEPeripheral_Main.c +++ b/src/TestTHB2/source/SimpleBLEPeripheral_Main.c @@ -1,7 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - /************************************************************************************************** Filename: SimpleBLEPeripheral_Main.c Revised: @@ -53,6 +49,3 @@ int app_main(void) CALL-BACKS **************************************************************************************************/ - -/************************************************************************************************* -**************************************************************************************************/ diff --git a/src/TestTHB2/source/battery.c b/src/TestTHB2/source/battery.c index b43658b..eeaefed 100644 --- a/src/TestTHB2/source/battery.c +++ b/src/TestTHB2/source/battery.c @@ -1,50 +1,3 @@ -/************************************************************************************************** - - Phyplus Microelectronics Limited confidential and proprietary. - All rights reserved. - - IMPORTANT: All rights of this software belong to Phyplus Microelectronics - Limited ("Phyplus"). Your use of this Software is limited to those - specific rights granted under the terms of the business contract, the - confidential agreement, the non-disclosure agreement and any other forms - of agreements as a customer or a partner of Phyplus. You may not use this - Software unless you agree to abide by the terms of these agreements. - You acknowledge that the Software may not be modified, copied, - distributed or disclosed unless embedded on a Phyplus Bluetooth Low Energy - (BLE) integrated circuit, either as a product or is integrated into your - products. Other than for the aforementioned purposes, you may not use, - reproduce, copy, prepare derivative works of, modify, distribute, perform, - display or sell this Software and/or its documentation for any purposes. - - YOU FURTHER ACKNOWLEDGE AND AGREE THAT THE SOFTWARE AND DOCUMENTATION ARE - PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, - INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY, TITLE, - NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL - PHYPLUS OR ITS SUBSIDIARIES BE LIABLE OR OBLIGATED UNDER CONTRACT, - NEGLIGENCE, STRICT LIABILITY, CONTRIBUTION, BREACH OF WARRANTY, OR OTHER - LEGAL EQUITABLE THEORY ANY DIRECT OR INDIRECT DAMAGES OR EXPENSES - INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE - OR CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT - OF SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES - (INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. - -**************************************************************************************************/ - - -/************************************************************** - * COPYRIGHT(c)2018, Phy+. - * All rights reserved. - * - * - * Module Name: battery - * File name: battery.c - * Brief description: - * battery module - * Author: Eagle.Lao - * Data: 2018-02-27 - * Revision:V0.01 - -****************************************************************/ #include "types.h" #include "adc.h" #include "battery.h" diff --git a/src/TestTHB2/source/battery.h b/src/TestTHB2/source/battery.h index 727f1fb..059f39b 100644 --- a/src/TestTHB2/source/battery.h +++ b/src/TestTHB2/source/battery.h @@ -1,45 +1,8 @@ -/************************************************************************************************** - - Phyplus Microelectronics Limited confidential and proprietary. - All rights reserved. - - IMPORTANT: All rights of this software belong to Phyplus Microelectronics - Limited ("Phyplus"). Your use of this Software is limited to those - specific rights granted under the terms of the business contract, the - confidential agreement, the non-disclosure agreement and any other forms - of agreements as a customer or a partner of Phyplus. You may not use this - Software unless you agree to abide by the terms of these agreements. - You acknowledge that the Software may not be modified, copied, - distributed or disclosed unless embedded on a Phyplus Bluetooth Low Energy - (BLE) integrated circuit, either as a product or is integrated into your - products. Other than for the aforementioned purposes, you may not use, - reproduce, copy, prepare derivative works of, modify, distribute, perform, - display or sell this Software and/or its documentation for any purposes. - - YOU FURTHER ACKNOWLEDGE AND AGREE THAT THE SOFTWARE AND DOCUMENTATION ARE - PROVIDED AS IS WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, - INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY, TITLE, - NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL - PHYPLUS OR ITS SUBSIDIARIES BE LIABLE OR OBLIGATED UNDER CONTRACT, - NEGLIGENCE, STRICT LIABILITY, CONTRIBUTION, BREACH OF WARRANTY, OR OTHER - LEGAL EQUITABLE THEORY ANY DIRECT OR INDIRECT DAMAGES OR EXPENSES - INCLUDING BUT NOT LIMITED TO ANY INCIDENTAL, SPECIAL, INDIRECT, PUNITIVE - OR CONSEQUENTIAL DAMAGES, LOST PROFITS OR LOST DATA, COST OF PROCUREMENT - OF SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES - (INCLUDING BUT NOT LIMITED TO ANY DEFENSE THEREOF), OR OTHER SIMILAR COSTS. - -**************************************************************************************************/ - - /************************************************************** - * * Module Name: battery * File name: battery.h * Brief description: * battery module - * Author: Eagle.Lao - * Revision:V0.01 - ****************************************************************/ #ifndef _BATTERY_HEAD_FILE diff --git a/src/TestTHB2/source/halPeripheral.c b/src/TestTHB2/source/halPeripheral.c index 2f43c28..6e51c5d 100644 --- a/src/TestTHB2/source/halPeripheral.c +++ b/src/TestTHB2/source/halPeripheral.c @@ -1,15 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - -/************************************************************************************************** - Filename: gpio_demo.c - Revised: $Date $ - Revision: $Revision $ - - -**************************************************************************************************/ - /********************************************************************* INCLUDES */ @@ -241,5 +229,3 @@ uint16_t cli_demo_light_ctrl(uint32_t argc, uint8_t* argv[]) mode = CLI_strtoi(argv[0], CLI_strlen(argv[0]), 16); return 0; } -/********************************************************************* -*********************************************************************/ diff --git a/src/TestTHB2/source/halPeripheral.h b/src/TestTHB2/source/halPeripheral.h index 72535e4..799e0fb 100644 --- a/src/TestTHB2/source/halPeripheral.h +++ b/src/TestTHB2/source/halPeripheral.h @@ -1,7 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - /************************************************************************************************** Filename: gpio_demo.h Revised: $Date $ @@ -32,8 +28,7 @@ extern "C" */ uint16 HalPeripheral_ProcessEvent( uint8 task_id, uint16 events ); void HalPeripheral_Init(uint8 task_id); -/********************************************************************* -*********************************************************************/ +/********************************************************************/ #ifdef __cplusplus } diff --git a/src/TestTHB2/source/sbpProfile_ota.c b/src/TestTHB2/source/sbpProfile_ota.c index d21f59b..57a6377 100644 --- a/src/TestTHB2/source/sbpProfile_ota.c +++ b/src/TestTHB2/source/sbpProfile_ota.c @@ -1,7 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - /************************************************************************************************** Filename: sbpProfile_ota.c Revised: @@ -9,8 +5,6 @@ Description: This file contains the Simple GATT profile sample GATT service profile for use with the BLE sample application. - - **************************************************************************************************/ /********************************************************************* @@ -455,5 +449,3 @@ bStatus_t simpleProfile_Notify( uint8 param, uint8 len, void *value ) } -/********************************************************************* -*********************************************************************/ diff --git a/src/TestTHB2/source/sbpProfile_ota.h b/src/TestTHB2/source/sbpProfile_ota.h index 009ae78..d6eb7c9 100644 --- a/src/TestTHB2/source/sbpProfile_ota.h +++ b/src/TestTHB2/source/sbpProfile_ota.h @@ -1,7 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - /************************************************************************************************** Filename: sbpProfile_ota.h Revised: @@ -124,9 +120,9 @@ extern bStatus_t SimpleProfile_SetParameter( uint8 param, uint8 len, void *value */ extern bStatus_t SimpleProfile_GetParameter( uint8 param, void *value ); +/*********************************************************************/ + extern bStatus_t simpleProfile_Notify( uint8 param, uint8 len, void *value ); -/********************************************************************* -*********************************************************************/ #ifdef __cplusplus } diff --git a/src/TestTHB2/source/simpleBLEPeripheral.h b/src/TestTHB2/source/simpleBLEPeripheral.h index c360a27..3325ea6 100644 --- a/src/TestTHB2/source/simpleBLEPeripheral.h +++ b/src/TestTHB2/source/simpleBLEPeripheral.h @@ -1,7 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - /************************************************************************************************** Filename: simpleBLEperipheral.h Revised: diff --git a/src/TestTHB2/source/thb2_main.c b/src/TestTHB2/source/thb2_main.c index 3894317..6f77300 100644 --- a/src/TestTHB2/source/thb2_main.c +++ b/src/TestTHB2/source/thb2_main.c @@ -1,14 +1,10 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - /************************************************************************************************** Filename: simpleBLEPeripheral.c Revised: Revision: Description: This file contains the Simple BLE Peripheral sample application - + **************************************************************************************************/ /********************************************************************* @@ -637,5 +633,3 @@ static void simpleProfileChangeCB( uint8 paramID ) } #endif -/********************************************************************* -*********************************************************************/ diff --git a/src/TestTHB2/source/thservice.c b/src/TestTHB2/source/thservice.c index 416cb49..98278cd 100644 --- a/src/TestTHB2/source/thservice.c +++ b/src/TestTHB2/source/thservice.c @@ -1,9 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - - - /********************************************************************* INCLUDES */ @@ -386,6 +380,3 @@ void TH_HandleConnStatusCB( uint16 connHandle, uint8 changeType ) } } - -/********************************************************************* -*********************************************************************/ diff --git a/src/TestTHB2/source/thservice.h b/src/TestTHB2/source/thservice.h index 29276ed..bb6e61d 100644 --- a/src/TestTHB2/source/thservice.h +++ b/src/TestTHB2/source/thservice.h @@ -1,7 +1,3 @@ -/************************************************************************************************** -******* -**************************************************************************************************/ - #ifndef _THSERVICE_H_ #define _THSERVICE_H_ diff --git a/src/components/driver/gpio/gpio.c b/src/components/driver/gpio/gpio.c index ef6f702..5410d68 100644 --- a/src/components/driver/gpio/gpio.c +++ b/src/components/driver/gpio/gpio.c @@ -204,7 +204,7 @@ int hal_gpio_pin_init(gpio_pin_e pin,gpio_dir_t type) if(type == GPIO_OUTPUT) { AP_GPIO->swporta_ddr |= BIT(pin); - //m_gpioCtx.pin_assignments[pin] = GPIO_PIN_ASSI_OUT; + m_gpioCtx.pin_assignments[pin] = GPIO_PIN_ASSI_OUT; } else { diff --git a/src/components/driver/pwrmgr/pwrmgr.c b/src/components/driver/pwrmgr/pwrmgr.c index 5e67706..aa871ab 100644 --- a/src/components/driver/pwrmgr/pwrmgr.c +++ b/src/components/driver/pwrmgr/pwrmgr.c @@ -353,7 +353,7 @@ int hal_pwrmgr_RAM_retention_set(void) int hal_pwrmgr_LowCurrentLdo_enable(void) { - #ifdef CFG_SRAM_RETENTION_LOW_CURRENT_LDO_ENABLE +#ifdef CFG_SRAM_RETENTION_LOW_CURRENT_LDO_ENABLE uint32_t retention_flag; hal_flash_read(0x1100181c,(uint8_t*)&retention_flag,4); @@ -363,9 +363,9 @@ int hal_pwrmgr_LowCurrentLdo_enable(void) } return PPlus_SUCCESS; - #else +#else return PPlus_ERR_FORBIDDEN; - #endif +#endif } int hal_pwrmgr_LowCurrentLdo_disable(void)