版本提交操作过程

ticy@ubuntu:~$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/home/ticy/.ssh/id_rsa): 
/home/ticy/.ssh/id_rsa already exists.
Overwrite (y/n)? 
ticy@ubuntu:~$ ll
total 164
drwxr-xr-x 21 ticy ticy  4096 Mar  6 18:44 ./
drwxr-xr-x  3 root root  4096 Sep  7 04:48 ../
drwxr-x---  2 ticy ticy  4096 Sep 12 03:18 .android/
-rw-------  1 ticy ticy  3630 Mar  6 18:42 .bash_history
-rw-r--r--  1 ticy ticy   220 Sep  7 04:48 .bash_logout
-rw-r--r--  1 ticy ticy  3771 Sep  7 04:48 .bashrc
drwx------ 15 ticy ticy  4096 Feb 28 00:37 .cache/
drwx------ 18 ticy ticy  4096 Sep 12 02:54 .config/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Desktop/
-rw-r--r--  1 ticy ticy    25 Sep  7 05:46 .dmrc
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Documents/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Downloads/
-rw-r--r--  1 ticy ticy  8980 Sep  7 04:48 examples.desktop
drwx------  2 ticy ticy  4096 Sep 12 02:54 .gconf/
-rw-rw-r--  1 ticy ticy   141 Sep 10 09:02 .gitconfig
drwx------  3 ticy ticy  4096 Mar  6 18:44 .gnupg/
-rw-------  1 ticy ticy  9540 Mar  6 18:44 .ICEauthority
drwx------  3 ticy ticy  4096 Sep  7 05:50 .local/
-rw-r--r--  1 root root    70 Sep 12 02:10 minicom.log
drwx------  5 ticy ticy  4096 Sep 12 02:11 .mozilla/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Music/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Pictures/
-rw-r--r--  1 ticy ticy   655 Sep  7 04:48 .profile
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Public/
drwxr-xr-x  2 ticy ticy  4096 Sep 10 02:39 .rpmdb/
drwxrwxrwx  7 ticy ticy  4096 Mar  4 22:28 share/
drwx------  2 ticy ticy  4096 Mar  6 18:42 .ssh/
-rw-r--r--  1 ticy ticy     0 Sep  7 10:32 .sudo_as_admin_successful
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Templates/
-rw-r--r--  1 ticy ticy 12288 Jan 11 01:10 .test1.swp
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Videos/
drwxr-xr-x  2 ticy ticy  4096 Jan 11 01:03 .vim/
-rw-------  1 ticy ticy   936 Jan 11 01:03 .viminfo
-rw-------  1 ticy ticy    51 Mar  6 18:44 .Xauthority
-rw-------  1 ticy ticy    82 Mar  6 18:44 .xsession-errors
-rw-------  1 ticy ticy    82 Mar  1 18:05 .xsession-errors.old
ticy@ubuntu:~$ rm -rf .ssh/
ticy@ubuntu:~$ ssh-keygen
Generating public/private rsa key pair.
Enter file in which to save the key (/home/ticy/.ssh/id_rsa): 
Created directory '/home/ticy/.ssh'.
Enter passphrase (empty for no passphrase): 
Enter same passphrase again: 
Your identification has been saved in /home/ticy/.ssh/id_rsa.
Your public key has been saved in /home/ticy/.ssh/id_rsa.pub.
The key fingerprint is:
SHA256:YJ7V+v3fJRXWGZ8Tn6NTMZb74O2OQzFlRZqGQx8oFwE ticy@ubuntu
The key's randomart image is:
+---[RSA 2048]----+
|          E.++.B=|
|         ...oo.=#|
|      o . .oo =%=|
|     o + .   oB.+|
|      o S    + =o|
|         . .  +.o|
|          . .....|
|             ..o+|
|              o++|
+----[SHA256]-----+
ticy@ubuntu:~$ cd .ssh
ticy@ubuntu:~/.ssh$ ll
total 16
drwx------  2 ticy ticy 4096 Mar  6 18:48 ./
drwxr-xr-x 21 ticy ticy 4096 Mar  6 18:48 ../
-rw-------  1 ticy ticy 1675 Mar  6 18:48 id_rsa
-rw-r--r--  1 ticy ticy  393 Mar  6 18:48 id_rsa.pub
ticy@ubuntu:~/.ssh$ ll
total 20
drwx------  2 ticy ticy 4096 Mar  6 18:49 ./
drwxr-xr-x 21 ticy ticy 4096 Mar  6 18:48 ../
-rwxrw-rw-  1 ticy ticy   56 Mar  6 18:47 config*  //复制添加（外部文件）
-rw-------  1 ticy ticy 1675 Mar  6 18:48 id_rsa
-rw-r--r--  1 ticy ticy  393 Mar  6 18:48 id_rsa.pub
ticy@ubuntu:~/.ssh$ sudo chmod 600 config
[sudo] password for ticy: 
ticy@ubuntu:~/.ssh$ cat id_rsa.pub 
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCkRkLTju2X1GTYm3n8GX/nDy3c0Ylf+J7ugYNzv43kpR5PNLnL6juiih2Os7rcddVZDMHSWNUVwgHrWXdzyVDmzvglJRCRpLCxAlrVqJ3omMFejVb7vLFthbVz0y3hjdRElY/7CTSXXNRji34EKeWdmEcLY9RLmsj5gkcIlqd1skFsJLUSqGpNU2fJnR96cBiRZAWRmyhaci89nVVzDhoJnExVFzfOmtDM3TDykGf2mvtZWrDb+c0JSFe56mLvi/p2KzqSwyR2ehmc6M+dWv7ji6ILXWBmYVr+L/D1tYMFtoZNcgfvNy5Vx3o9vCzQ7Le73Z5D7ga8cCHC/xT7dajn ticy@ubuntu
ticy@ubuntu:~/.ssh$ ssh -p 29418 [email protected]
The authenticity of host '[10.10.204.22]:29418 ([10.10.204.22]:29418)' can't be established.
RSA key fingerprint is SHA256:4jByLHQqnNg7b2fylSD1ADY0AqXtW75ImkF5owZhU6w.
Are you sure you want to continue connecting (yes/no)? yes
Warning: Permanently added '[10.10.204.22]:29418' (RSA) to the list of known hosts.

  ****    Welcome to Gerrit Code Review    ****

  Hi mengtiancui, you have successfully connected over SSH.

  Unfortunately, interactive shells are disabled.
  To clone a hosted Git repository, use:

  git clone ssh://[email protected]:29418/REPOSITORY_NAME.git

Connection to 10.10.204.22 closed.
ticy@ubuntu:~/.ssh$ cd ..
ticy@ubuntu:~$ ll
total 164
drwxr-xr-x 21 ticy ticy  4096 Mar  6 18:48 ./
drwxr-xr-x  3 root root  4096 Sep  7 04:48 ../
drwxr-x---  2 ticy ticy  4096 Sep 12 03:18 .android/
-rw-------  1 ticy ticy  3630 Mar  6 18:42 .bash_history
-rw-r--r--  1 ticy ticy   220 Sep  7 04:48 .bash_logout
-rw-r--r--  1 ticy ticy  3771 Sep  7 04:48 .bashrc
drwx------ 15 ticy ticy  4096 Feb 28 00:37 .cache/
drwx------ 18 ticy ticy  4096 Sep 12 02:54 .config/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Desktop/
-rw-r--r--  1 ticy ticy    25 Sep  7 05:46 .dmrc
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Documents/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Downloads/
-rw-r--r--  1 ticy ticy  8980 Sep  7 04:48 examples.desktop
drwx------  2 ticy ticy  4096 Sep 12 02:54 .gconf/
-rw-rw-r--  1 ticy ticy   141 Sep 10 09:02 .gitconfig
drwx------  3 ticy ticy  4096 Mar  6 18:44 .gnupg/
-rw-------  1 ticy ticy  9540 Mar  6 18:44 .ICEauthority
drwx------  3 ticy ticy  4096 Sep  7 05:50 .local/
-rw-r--r--  1 root root    70 Sep 12 02:10 minicom.log
drwx------  5 ticy ticy  4096 Sep 12 02:11 .mozilla/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Music/
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Pictures/
-rw-r--r--  1 ticy ticy   655 Sep  7 04:48 .profile
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Public/
drwxr-xr-x  2 ticy ticy  4096 Sep 10 02:39 .rpmdb/
drwxrwxrwx  7 ticy ticy  4096 Mar  4 22:28 share/
drwx------  2 ticy ticy  4096 Mar  6 18:50 .ssh/
-rw-r--r--  1 ticy ticy     0 Sep  7 10:32 .sudo_as_admin_successful
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Templates/
-rw-r--r--  1 ticy ticy 12288 Jan 11 01:10 .test1.swp
drwxr-xr-x  2 ticy ticy  4096 Sep  7 05:50 Videos/
drwxr-xr-x  2 ticy ticy  4096 Jan 11 01:03 .vim/
-rw-------  1 ticy ticy   936 Jan 11 01:03 .viminfo
-rw-------  1 ticy ticy    51 Mar  6 18:44 .Xauthority
-rw-------  1 ticy ticy    82 Mar  6 18:44 .xsession-errors
-rw-------  1 ticy ticy    82 Mar  1 18:05 .xsession-errors.old
ticy@ubuntu:~$ cd share/
ticy@ubuntu:~/share$ ll
total 93956
drwxrwxrwx  7 ticy   ticy        4096 Mar  4 22:28 ./
drwxr-xr-x 21 ticy   ticy        4096 Mar  6 18:48 ../
drwxr-xr-x 16 nobody nogroup     4096 Feb 24 23:10 20190208_Bes2300_TWS_NAPA/
drwxr-xr-x 18 nobody nogroup     4096 Mar  1 01:48 INP-Napa_Earbuds_am3d_for_ces/
drwxr-xr-x 17 nobody nogroup     4096 Mar  5 00:19 INP-Napa_Earbuds_eq_anc_for_ces/
-rwxr--r--  1 nobody nogroup 92549424 Mar  4 22:27 INP-Napa_Earbuds_eq_anc_for_ces__T0305.rar*
drwxr-xr-x 17 nobody nogroup     4096 Feb 18 17:21 INP-Napa_Earbuds_LBRT/
drwxr-xr-x 17 nobody nogroup     4096 Feb 11 22:45 INP-Napa_Earbuds_lbrt_for_ces/
-rwxrwxrwx  1 nobody nogroup  3622394 Sep 10 01:30 repo.tar.gz*
-rw-------  1 ticy   ticy        1679 Sep 10 08:19 share
ticy@ubuntu:~/share$ mkdir work
ticy@ubuntu:~/share$ cd work/
ticy@ubuntu:~/share/work$ git clone ssh://[email protected]:29418/napa
Cloning into 'napa'...
remote: Counting objects: 2329, done
remote: Finding sources: 100% (2329/2329)
remote: Total 2329 (delta 527), reused 2323 (delta 527)
Receiving objects: 100% (2329/2329), 15.11 MiB | 29.68 MiB/s, done.
Resolving deltas: 100% (527/527), done.
Checking connectivity... done.
ticy@ubuntu:~/share/work$ git branch -a
fatal: Not a git repository (or any of the parent directories): .git
ticy@ubuntu:~/share/work$ cd napa/
ticy@ubuntu:~/share/work/napa$ ll
total 12
drwxrwxr-x 3 ticy ticy 4096 Mar  6 18:51 ./
drwxrwxr-x 3 ticy ticy 4096 Mar  6 18:51 ../
drwxrwxr-x 8 ticy ticy 4096 Mar  6 18:51 .git/
ticy@ubuntu:~/share/work/napa$ git branch -a
* master
  remotes/origin/HEAD -> origin/master
  remotes/origin/am3d
  remotes/origin/eq_anc
  remotes/origin/lbrt
  remotes/origin/master
ticy@ubuntu:~/share/work/napa$ git checkout am3d
Branch am3d set up to track remote branch am3d from origin.
Switched to a new branch 'am3d'
ticy@ubuntu:~/share/work/napa$ ll
total 96
drwxrwxr-x 16 ticy ticy  4096 Mar  6 18:52 ./
drwxrwxr-x  3 ticy ticy  4096 Mar  6 18:51 ../
drwxrwxr-x  3 ticy ticy  4096 Mar  6 18:52 AM3D_interface/
drwxrwxr-x  3 ticy ticy  4096 Mar  6 18:52 AM3D_lib/
drwxrwxr-x  3 ticy ticy  4096 Mar  6 18:52 Am3d_Tools/
drwxrwxr-x 18 ticy ticy  4096 Mar  6 18:52 apps/
drwxrwxr-x  5 ticy ticy  4096 Mar  6 18:52 config/
drwxrwxr-x  8 ticy ticy  4096 Mar  6 18:52 .git/
-rwxrwxr-x  1 ticy ticy  1280 Mar  6 18:52 .gitignore*
-rwxrwxr-x  1 ticy ticy 25615 Mar  6 18:52 Makefile*
drwxrwxr-x  4 ticy ticy  4096 Mar  6 18:52 mbed/
drwxrwxr-x  6 ticy ticy  4096 Mar  6 18:52 platform/
drwxrwxr-x  4 ticy ticy  4096 Mar  6 18:52 rtos/
drwxrwxr-x  3 ticy ticy  4096 Mar  6 18:52 scripts/
drwxrwxr-x 24 ticy ticy  4096 Mar  6 18:52 services/
drwxrwxr-x  4 ticy ticy  4096 Mar  6 18:52 tests/
drwxrwxr-x  3 ticy ticy  4096 Mar  6 18:52 thirdparty/
drwxrwxr-x 13 ticy ticy  4096 Mar  6 18:52 utils/
ticy@ubuntu:~/share/work/napa$ git status
On branch am3d
Your branch is up-to-date with 'origin/am3d'.
Changes not staged for commit:
  (use "git add ..." to update what will be committed)
  (use "git checkout -- ..." to discard changes in working directory)

    modified:   apps/napa/max17050_driver.cpp
    modified:   apps/napa/uart_command.cpp
    modified:   apps/napa/uart_command.h
    modified:   config/best2300_tws/tgt_hardware.h
    modified:   config/best2300_tws_anc/tgt_hardware.h

no changes added to commit (use "git add" and/or "git commit -a")
ticy@ubuntu:~/share/work/napa$ git diff
diff --git a/apps/napa/max17050_driver.cpp b/apps/napa/max17050_driver.cpp
index 9482514..944cf9b 100755
--- a/apps/napa/max17050_driver.cpp
+++ b/apps/napa/max17050_driver.cpp
@@ -53,7 +53,8 @@
 #define MODELSCALING   (1)
 
 /* the battery design capacity ,unit:mAh */
-#define MAX17050_BATTERY_DESIGN_CAPACITY       (24.3468)
+#define MAX17050_BATTERY_DESIGN_CAPACITY    (356.949)^M
+#define LISHEN_MAX17050_BATTERY_DESIGN_CAPACITY (24.3468)^M
 /* the sense resistance value ,unit:ohm */
 #define MAX17050_R_SENSE                               (0.01)
 
@@ -65,17 +66,37 @@
 /* !!!!!!need modify     the recovery value of the voltage (3.88V -- 0x61)*/
 #define MAX17050_VEMPTY_RECOVERY_VALUE (0x61)
 
+/*add by ticy0225*/^M
+#define MAX17050_RCOMP0_VALUE        (0x0025)^M
+#define MAX17050_TEMPCO_VALUE        (0x1f30)^M
+#define MAX17050_ICHG_TERM_VALUE (0x0140)^M
+#define MAX17050_TGAIN_VALUE     (0x00)^M
+#define MAX17050_TOFF_VALUE          (0x00)^M
+#define MAX17050_QRESIDUAL00_VALUE   (0x1680)^M
+#define MAX17050_QRESIDUAL10_VALUE   (0x0c80)^M
+#define MAX17050_QRESIDUAL20_VALUE   (0x0780)^M
+#define MAX17050_QRESIDUAL30_VALUE   (0x0580)^M
+^M
+^M
+^M
+/* Lishen model */^M
+^M
+^M
+#define        LISHEN_MAX17050_RCOMP0_VALUE            (0x001f)^M
+#define LISHEN_MAX17050_TEMPCO_VALUE           (0x141c)^M
+#define        LISHEN_MAX17050_ICHG_TERM_VALUE (0x0008)^M
+#define        LISHEN_MAX17050_TGAIN_VALUE             (0x00)^M
+#define        LISHEN_MAX17050_TOFF_VALUE                      (0x00)^M
+#define        LISHEN_MAX17050_QRESIDUAL00_VALUE       (0x1684)^M
+#define        LISHEN_MAX17050_QRESIDUAL10_VALUE       (0x0b04)^M
+#define        LISHEN_MAX17050_QRESIDUAL20_VALUE       (0x0584)^M
+#define        LISHEN_MAX17050_QRESIDUAL30_VALUE       (0x0486)^M
+^M
+^M
+/* end add by ticy */^M
+^M
+^M
 
-/* !!!!!!do not know how to calcute this value need modify */
-#define        MAX17050_RCOMP0_VALUE           (0x001f)
-#define MAX17050_TEMPCO_VALUE          (0x141c)
-#define        MAX17050_ICHG_TERM_VALUE        (0x0008)
-#define        MAX17050_TGAIN_VALUE            (0x00)
-#define        MAX17050_TOFF_VALUE                     (0x00)
-#define        MAX17050_QRESIDUAL00_VALUE      (0x1684)
-#define        MAX17050_QRESIDUAL10_VALUE      (0x0b04)
-#define        MAX17050_QRESIDUAL20_VALUE      (0x0584)
-#define        MAX17050_QRESIDUAL30_VALUE      (0x0486)
 
 /* !!!!!!Changes may need to be made later  */
 #define MAX17050_FULL_CAP_VALUE        (MAX17050_BATTERY_DESIGN_CAPACITY * MAX17050_R_SENSE * 200)
@@ -93,11 +114,25 @@
 /* 6 mins ,from user guide pdf */
 #define MAX17050_RELAX_DT              0x0b
 
-static /* const */ uint16_t characterization_table_arr0[16] ={0x9940,0xb6c0,0xb810,0xba10,0xbbe0,0xbdc0,0xbe30,0xc010,0xc260,0xc470,0xc980,0xcea0,0xd130,0xd490,0xd7c0,0xdac0};
 
-static /* const */ uint16_t characterization_table_arr1[16] ={0x00d0,0x1100,0x0fc0,0x0ff0,0x13f0,0x1390,0x1240,0x0d60,0x0bb0,0x0750,0x06f0,0x07a0,0x0690,0x07a0,0x05f0,0x05f0};
+/*add by ticy*/^M
+static /* const */ uint16_t characterization_table_arr0[16] ={0x9140,0xb2b0,0xb7d0,0xb8d0,0xbac0,0xbbc0,0xbcd0,0xbe50,0xbf20,0xc000,0xc200,0xc500,0xc790,0xca40,0xcca0,0xd200};^M
+static /* const */ uint16_t characterization_table_arr1[16] ={0x0030,0x07c0,0x1540,0x10e0,0x15f0,0x19d0,0x1b20,0x1c80,0x1bc0,0x0fe0,0x0b70,0x0e00,0x0850,0x0ae0,0x01f0,0x01f0};^M
+static /* const */ uint16_t characterization_table_arr2[16] ={0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200,0x0200};^M
+^M
+^M
+^M
+^M
+^M
+^M
+static /* const */ uint16_t lishen_characterization_table_arr0[16] ={0x9940,0xb6c0,0xb810,0xba10,0xbbe0,0xbdc0,0xbe30,0xc010,0xc260,0xc470,0xc980,0xcea0,0xd130,0xd490,0xd7c0,0xdac0};^M
+static /* const */ uint16_t lishen_characterization_table_arr1[16] ={0x00d0,0x1100,0x0fc0,0x0ff0,0x13f0,0x1390,0x1240,0x0d60,0x0bb0,0x0750,0x06f0,0x07a0,0x0690,0x07a0,0x05f0,0x05f0};^M
+static /* const */ uint16_t lishen_characterization_table_arr2[16] ={0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100};^M
+^M
+/* end add by ticy */^M
+^M
+^M
 
-static /* const */ uint16_t characterization_table_arr2[16] ={0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100,0x0100};
 /* end add by geeker***************************************************************************************************/
 
 #if 1
@@ -319,7 +354,8 @@ static int max17050_por_conf__(void)
                     EL:                        1       turn on the Empty Learning feature
                */
                write_value = 0x2603;
-       }else{  /* Disable Empty Learning */
+       }^M
+       else{   /* Disable Empty Learning */^M
                /* the only different between enable and disable empty learning is the LSB set to 1 or 0*/
                write_value = 0x2602;
        }
@@ -375,7 +411,7 @@ static int max17050_por_conf__(void)
                /* Read16Registers (0xA0) */
                max17050_i2c_read_32byte_memory(0xa0,tmp_read_buffer);
                if(0 != memcmp(characterization_table_arr2,tmp_read_buffer,32)){
-                       MAX17050_TRACE("max17050 0x90 memory not match !");
+                       MAX17050_TRACE("max17050 0xA0 memory not match !");^M
                        ++retry_count;
                        continue;
                }
@@ -908,7 +944,17 @@ int max17050_config(uint8_t identify_battery,max17050_saved_config_t *saved_conf
                        return ret;
        }
 
+/*^M
+    for(uint8_t i = 0; i <= 0xff ; i++)^M
+       {^M
+        read_value = 0;^M
+               max17050_i2c_read_register(i,(uint8_t *)(&read_value));^M
+               MAX17050_TRACE("0x%x : 0x%x",i,read_value);^M
+       }^M
+       */^M
        return ret;
+^M
+       ^M
 }
 
 /**
@@ -960,6 +1006,7 @@ static int max17050_get_soc_value__(uint16_t *soc)
 
        /* when por ,the value is incorrect , return -1 */
        max17050_i2c_read_register(MAX17050_STATUS,(uint8_t *)(&read_value));
+       TRACE("=== %d ====",read_value);^M
        if(read_value & MAX17050_STATUS_POR_MASK){
                return -1;
        }
diff --git a/apps/napa/uart_command.cpp b/apps/napa/uart_command.cpp
index ec25587..5e8df7b 100755
--- a/apps/napa/uart_command.cpp
+++ b/apps/napa/uart_command.cpp
@@ -760,7 +760,7 @@ void uart_get_earbud_version_reply_data_handler(uint8_t *paramPtr, uint8_t param
 
     uart_send_data.send_data[0] = 0x10;
     uart_send_data.send_data[1] = 0x00;
-    uart_send_data.send_data[2] = 0x17;
+    uart_send_data.send_data[2] = 0x18;
   
     TRACE("the earbud addr is:");
     DUMP8("0x%02x ", &uart_send_data.send_data, 3);
@@ -806,6 +806,7 @@ UART_COMMAND_T uartCommand[] =
         {UART_COMMAND_ENTER_OTA_MODE, 1, false,NULL, uart_enter_ota_mode}, //0x66
 
        {UART_COMMAND_GET_EARBUD_VERSION, 3, false, uart_get_earbud_version_reply_data_handler, NULL},//0x04
+               {UART_COMMAND_PAIRED__EACH_OTHER, 3, true, uart_charger_box_interactive_event_reply_data_handler, uart_put_in_charger_box_handler},//0x77
 
 };
 
diff --git a/apps/napa/uart_command.h b/apps/napa/uart_command.h
index c7b73aa..7e099e0 100755
--- a/apps/napa/uart_command.h
+++ b/apps/napa/uart_command.h
@@ -48,6 +48,7 @@ typedef enum
         UART_COMMAND_REPORT_BT_ADDR = 0x62,
 
        UART_COMMAND_ENTER_OTA_MODE = 0x66,
+       UART_COMMAND_PAIRED__EACH_OTHER=0x77
        
 }UART_COMMAND_E;
 
diff --git a/config/best2300_tws/tgt_hardware.h b/config/best2300_tws/tgt_hardware.h
index a9139a7..6d4f4e2 100755
--- a/config/best2300_tws/tgt_hardware.h
+++ b/config/best2300_tws/tgt_hardware.h
@@ -107,7 +107,7 @@ extern uint8_t bt_addr[6];
 #define ANALOG_ADC_GAIN2    0x4
 
 
-#define CODEC_SADC_VOL (12)
+#define CODEC_SADC_VOL (10)
 
 #define ZERODB_DIG_DAC_REGVAL (21)
 
diff --git a/config/best2300_tws_anc/tgt_hardware.h b/config/best2300_tws_anc/tgt_hardware.h
index 1180c6a..824f238 100755
--- a/config/best2300_tws_anc/tgt_hardware.h
+++ b/config/best2300_tws_anc/tgt_hardware.h
@@ -125,7 +125,7 @@ extern uint8_t bt_addr[6];
 #define ANALOG_ADC_GAIN2    0x4
 
 
-#define CODEC_SADC_VOL (15)
+#define CODEC_SADC_VOL (10)
 
 #define ZERODB_DIG_DAC_REGVAL (21)
 
ticy@ubuntu:~/share/work/napa$ git add .
ticy@ubuntu:~/share/work/napa$ git status
On branch am3d
Your branch is up-to-date with 'origin/am3d'.
Changes to be committed:
  (use "git reset HEAD ..." to unstage)

    modified:   apps/napa/max17050_driver.cpp
    modified:   apps/napa/uart_command.cpp
    modified:   apps/napa/uart_command.h
    modified:   config/best2300_tws/tgt_hardware.h
    modified:   config/best2300_tws_anc/tgt_hardware.h

ticy@ubuntu:~/share/work/napa$ git commit -m "Add battery model and call volume reduction and add binaural pairing success communication protocol" 

*** Please tell me who you are.

Run

  git config --global user.email "[email protected]"
  git config --global user.name "Your Name"

to set your account's default identity.
Omit --global to set the identity only in this repository.

fatal: unable to auto-detect email address (got 'ticy@ubuntu.(none)')
ticy@ubuntu:~/share/work/napa$ git config --global user.name ticy.meng
ticy@ubuntu:~/share/work/napa$ git config --global user.email [email protected]
ticy@ubuntu:~/share/work/napa$ git config --list
url.ssh://[email protected]:29418.insteadof=NJLOCALSERVER
url.ssh://[email protected]:29418.insteadof=NJLOCALSERVER
user.name=ticy.meng
[email protected]
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
remote.origin.url=ssh://[email protected]:29418/napa
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
branch.master.remote=origin
branch.master.merge=refs/heads/master
branch.am3d.remote=origin
branch.am3d.merge=refs/heads/am3d
ticy@ubuntu:~/share/work/napa$ git commit -m "Add battery model and call volume reduction and add binaural pairing success communication protocol"[am3d a8f7e9e] Add battery model and call volume reduction and add binaural pairing success communication protocol
 5 files changed, 68 insertions(+), 19 deletions(-)
ticy@ubuntu:~/share/work/napa$ git log
commit a8f7e9eb8e3ccd95bab4189ffac186388a13b1a4
Author: ticy.meng
Date:   Wed Mar 6 19:27:27 2019 -0800

    Add battery model and call volume reduction and add binaural pairing success communication protocol

commit b0384d451c1f9b71153efa6eaadc7d3ce8f8d6cb
Author: nydia.guo
Date:   Mon Mar 4 21:45:20 2019 -0800

    update alango new lib and add 5k vcp_wb.c
    
    Change-Id: I58c0486827cefc5829d8b36b2b6dd0f643aa7d50

commit 964885d7089bb9d4a22ec4fafffc753577b88372
Author: nydia.guo
Date:   Sun Mar 3 19:29:22 2019 -0800

    add napa am3d codes
    
    Change-Id: I2127b6f66e489ca609e219fb720dea3fab79f72d

commit 5f8193e689415c39d5948cf2e7bb846229cd7da4
Author: guonihong
Date:   Sat Mar 2 17:39:13 2019 +0800

    Initial empty repository
ticy@ubuntu:~/share/work/napa$ git push origin HEAD:refs/for/am3d
Counting objects: 12, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 1.97 KiB | 0 bytes/s, done.
Total 12 (delta 10), reused 0 (delta 0)
remote: Resolving deltas: 100% (10/10)
remote: Processing changes: refs: 1, done    
remote: ERROR: missing Change-Id in commit message footer
remote: 
remote: Hint: To automatically insert Change-Id, install the hook:
remote:   gitdir=$(git rev-parse --git-dir); scp -p -P 29418 [email protected]:hooks/commit-msg ${gitdir}/hooks/
remote: And then amend the commit:
remote:   git commit --amend
remote: 
To ssh://[email protected]:29418/napa
 ! [remote rejected] HEAD -> refs/for/am3d (missing Change-Id in commit message footer)
error: failed to push some refs to 'ssh://[email protected]:29418/napa'
ticy@ubuntu:~/share/work/napa$ gitdir=$(git rev-parse --git-dir); scp -p -P 29418 [email protected]:hooks/commit-msg ${gitdir}/hooks/
commit-msg                                                                                                      100% 4362     4.3KB/s   00:00    
ticy@ubuntu:~/share/work/napa$ git commit --amend
[am3d 4fa0350] Add battery model and call volume reduction and add binaural pairing success communication protocol
 Date: Wed Mar 6 19:27:27 2019 -0800
 5 files changed, 68 insertions(+), 19 deletions(-)
ticy@ubuntu:~/share/work/napa$ git push origin HEAD:refs/for/am3d
Counting objects: 12, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (12/12), done.
Writing objects: 100% (12/12), 2.01 KiB | 0 bytes/s, done.
Total 12 (delta 10), reused 0 (delta 0)
remote: Resolving deltas: 100% (10/10)
remote: Processing changes: new: 1, refs: 1, done    
remote: (W) 4fa0350: commit subject >65 characters; use shorter first paragraph
remote: (W) 4fa0350: too many commit message lines longer than 70 characters; manually wrap lines
remote: 
remote: New Changes:
remote:   http://10.10.204.22:8080/4001 Add battery model and call volume reduction and add binaural pairing success ...
remote: 
To ssh://[email protected]:29418/napa
 * [new branch]      HEAD -> refs/for/am3d