diff --git a/.github/workflows/Tasmota_build_development.yml.off b/.github/workflows/Tasmota_build_development.yml.off
deleted file mode 100644
index dd86c2e37..000000000
--- a/.github/workflows/Tasmota_build_development.yml.off
+++ /dev/null
@@ -1,1385 +0,0 @@
-name: Build_firmware_development
-
-on:
-  workflow_dispatch:  # Manually start a workflow
-  push:
-    branches: development
-    paths-ignore:
-    - '.github/**' # Ignore changes towards the .github directory
-    - '**.md' # Do no build if *.md files changes
-
-jobs:
-
-  tasmota:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-minimal:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-minimal
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-lite:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-lite
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-knx:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-knx
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-sensors:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-sensors
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-display:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-display
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-ir:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-ir
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-zbbridge:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-zbbridge
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-zigbee:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-zigbee
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-AF:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-AF
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-BG:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-BG
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-BR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-BR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-CN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-CN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-CZ:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-CZ
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-DE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-DE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-ES:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-ES
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-FR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-FR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-FY:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-FY
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-GR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-GR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-HE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-HE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-HU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-HU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-IT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-IT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-KO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-KO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-NL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-NL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-PL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-PL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-PT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-PT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-RO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-RO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-RU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-RU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-SE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-SE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-SK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-SK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-TR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-TR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-TW:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-TW
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-UK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-UK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota-VN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota-VN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32solo1:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32solo1
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-webcam:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-webcam
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-odroidgo:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-odroidgo
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-core2:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-core2
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-bluetooth:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-bluetooth
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-display:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-display
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-lvgl:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-lvgl
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-ir:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-ir
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-  tasmota32c3:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32c3
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-  tasmota32-AF:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-AF
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-BG:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-BG
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-BR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-BR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-CN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-CN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-CZ:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-CZ
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-DE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-DE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-ES:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-ES
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-FR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-FR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-FY:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-FY
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-GR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-GR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-HE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-HE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-HU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-HU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-IT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-IT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-KO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-KO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-NL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-NL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-PL:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-PL
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-PT:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-PT
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-RO:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-RO
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-RU:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-RU
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-SE:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-SE
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-SK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-SK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-TR:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-TR
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-TW:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-TW
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-UK:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-UK
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  tasmota32-VN:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      uses: actions/setup-python@v1
-    - name: Install dependencies
-      run: |
-        pip install -U platformio
-    - name: Run PlatformIO
-      run: |
-        platformio run -e tasmota32-VN
-    - uses: actions/upload-artifact@v2
-      with:
-        name: firmware
-        path: ./build_output
-
-
-  Upload:
-    needs: [tasmota-VN, tasmota32-VN, tasmota32-TW, tasmota32-TR]
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-    - uses: actions/download-artifact@v2
-      with:
-        name: firmware
-        path: ./mv_firmware
-    - name: Display structure of downloaded files
-      run: ls -R
-      working-directory: ./mv_firmware
-    - name: Move firmware files in sub-folders
-      run: |
-        mkdir -p ./firmware/tasmota/languages
-        mkdir -p ./firmware/tasmota32/languages
-        mkdir -p ./firmware/map
-        [ ! -f ./mv_firmware/map/* ] || mv ./mv_firmware/map/* ./firmware/map/
-        [ ! -f ./mv_firmware/firmware/tasmota.* ] || mv ./mv_firmware/firmware/tasmota.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-sensors.* ] || mv ./mv_firmware/firmware/tasmota-sensors.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-minimal.* ] || mv ./mv_firmware/firmware/tasmota-minimal.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-lite.* ] || mv ./mv_firmware/firmware/tasmota-lite.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-ir*.* ] || mv ./mv_firmware/firmware/tasmota-ir*.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-display.* ] || mv ./mv_firmware/firmware/tasmota-display.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-knx.* ] || mv ./mv_firmware/firmware/tasmota-knx.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-zbbridge.* ] || mv ./mv_firmware/firmware/tasmota-zbbridge.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota-zigbee.* ] || mv ./mv_firmware/firmware/tasmota-zigbee.* ./firmware/tasmota/
-        [ ! -f ./mv_firmware/firmware/tasmota32.* ] || mv ./mv_firmware/firmware/tasmota32.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32solo1*.* ] || mv ./mv_firmware/firmware/tasmota32solo1*.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32-ir*.* ] || mv ./mv_firmware/firmware/tasmota32-ir*.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32-display.* ] || mv ./mv_firmware/firmware/tasmota32-display.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32-lvgl.* ] || mv ./mv_firmware/firmware/tasmota32-lvgl.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32-web*.* ] || mv ./mv_firmware/firmware/tasmota32-web*.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32-odroidgo.* ] || mv ./mv_firmware/firmware/tasmota32-odroidgo.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32-core2.* ] || mv ./mv_firmware/firmware/tasmota32-core2.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32-bluetooth.* ] || mv ./mv_firmware/firmware/tasmota32-bluetooth.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./firmware/tasmota32/
-        [ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./firmware/tasmota32/languages/
-        [ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./firmware/tasmota/languages/
-    - name: Display files to transfer
-      run: ls -R ./*
-    - name: Push Firmware files to https://github.com/arendst/Tasmota-firmware
-      uses: Jason2866/copy_file_to_another_repo_action@main
-      env:
-        API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
-      with:
-        source_file: 'firmware'
-        destination_repo: 'arendst/Tasmota-firmware'
-        user_email: 'github-actions@github.com'
-        user_name: 'github-actions'
-    - name: Creat trigger.txt
-      run: |
-         echo ${GITHUB_SHA}  &> trigger.txt
-         echo "$(<trigger.txt)"
-    - name: Push trigger.txt to start workflow in repo https://github.com/arendst/Tasmota-firmware
-      uses: Jason2866/copy_file_to_another_repo_action@main
-      env:
-        API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
-      with:
-        source_file: 'trigger.txt'
-        destination_repo: 'arendst/Tasmota-firmware'
-        destination_branch: 'action-development'
-        user_email: 'github-actions@github.com'
-        user_name: 'github-actions'
diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml
index 148f18202..4639fde5e 100644
--- a/.github/workflows/Tasmota_build_master.yml
+++ b/.github/workflows/Tasmota_build_master.yml
@@ -1365,28 +1365,35 @@ jobs:
         [ ! -f ./mv_firmware/firmware/tasmota32c3*.* ] || mv ./mv_firmware/firmware/tasmota32c3*.* ./release-firmware/tasmota32/
         [ ! -f ./mv_firmware/firmware/tasmota32* ] || mv ./mv_firmware/firmware/tasmota32* ./release-firmware/tasmota32/languages/
         [ ! -f ./mv_firmware/firmware/* ] || mv ./mv_firmware/firmware/* ./release-firmware/tasmota/languages/
-    - name: Display files
+    - name: Display files to transfer
       run: ls -R ./*
-    - name: Push Firmware files to https://github.com/arendst/Tasmota-firmware
+    - name: Push Firmware files to tmp_copy repo
       uses: Jason2866/copy_file_to_another_repo_action@main
       env:
         API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
       with:
         source_file: 'release-firmware'
-        destination_repo: 'arendst/Tasmota-firmware'
+        destination_repo: 'arendst/tmp_copy'
+        destination_branch: 'firmware'
         user_email: 'github-actions@github.com'
         user_name: 'github-actions'
+
+  Start_final_copy:
+    needs: Upload
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
     - name: Creat trigger.txt
       run: |
          echo ${GITHUB_SHA}  &> trigger.txt
          echo "$(<trigger.txt)"
-    - name: Push trigger.txt to start workflow in repo https://github.com/arendst/Tasmota-firmware
+    - name: Push trigger.txt to start workflow copy in tmp repo
       uses: Jason2866/copy_file_to_another_repo_action@main
       env:
         API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
       with:
         source_file: 'trigger.txt'
-        destination_repo: 'arendst/Tasmota-firmware'
+        destination_repo: 'arendst/tmp_copy'
         destination_branch: 'action-master'
         user_email: 'github-actions@github.com'
         user_name: 'github-actions'
diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
index 41629dbab..2ffca53b7 100644
--- a/.github/workflows/build_all_the_things.yml
+++ b/.github/workflows/build_all_the_things.yml
@@ -3,6 +3,7 @@ name: Tasmota CI
 on:
   workflow_dispatch:
   pull_request:
+    branches: development
     paths:
       - '**.c'
       - '**.cpp'
diff --git a/BUILDS.md b/BUILDS.md
index 483ac04c8..975e34d24 100644
--- a/BUILDS.md
+++ b/BUILDS.md
@@ -2,236 +2,237 @@
 
 ESP8266 / ESP32
 
-m = minimal, l = lite, t = tasmota, k = knx, s = sensors, i = ir, d = display
+l = lite, t = tasmota, k = knx, s = sensors, i = ir, d = display
 
-| Feature or Sensor     | m | l | t     | k | s | i | d | Remarks
-|-----------------------|---|---|-------|---|---|---|---|--------
-| MY_LANGUAGE en_GB     | x | x | x / x | x | x | x | x |
-| USE_UFILESYS          | - | - | - / x | - | - | - | - |
-| USE_ARDUINO_OTA       | - | - | - / - | - | - | - | - |
-| USE_DOMOTICZ          | - | - | x / x | x | x | x | - |
-| USE_HOME_ASSISTANT    | - | - | x / x | x | x | x | - |
-| USE_MQTT_TLS          | - | - | - / - | - | - | - | - |
-| USE_MQTT_TLS_CA_CERT  | - | - | - / - | - | - | - | - |
-| USE_MQTT_AWS_IOT      | - | - | - / - | - | - | - | - |
-| USE_4K_RSA            | - | - | - / - | - | - | - | - |
-| USE_TELEGRAM          | - | - | - / - | - | - | - | - |
-| USE_KNX               | - | - | - / x | x | - | - | - |
-| USE_WEBSERVER         | x | x | x / x | x | x | x | x |
-| USE_JAVASCRIPT_ES6    | - | - | - / - | - | - | - | - |
-| USE_WEBSEND_RESPONSE  | - | - | - / - | - | - | - | - |
-| USE_EMULATION_HUE     | - | x | x / x | - | x | - | - |
-| USE_EMULATION_WEMO    | - | x | x / x | - | x | - | - |
-| USE_DISCOVERY         | - | - | - / - | - | - | - | - |
-| WEBSERVER_ADVERTISE   | - | - | x / - | x | - | - | x |
-| MQTT_HOST_DISCOVERY   | - | - | - / - | - | - | - | - |
-| USE_TIMERS            | - | x | x / x | x | x | x | x |
-| USE_TIMERS_WEB        | - | x | x / x | x | x | x | x |
-| USE_SUNRISE           | - | x | x / x | x | x | x | x |
-| USE_RULES             | - | x | x / x | x | x | x | x |
-| USE_SCRIPT            | - | - | - / - | - | - | - | - |
-| USE_EXPRESSION        | - | - | - / - | - | - | - | - |
-| SUPPORT_IF_STATEMENT  | - | - | - / - | - | - | - | - |
-| USE_HOTPLUG           | - | - | - / - | - | - | - | - |
-| USE_PROMETHEUS        | - | - | - / - | - | - | - | - |
-| USE_PING              | - | - | - / - | - | - | - | - |
-|                       |   |   |       |   |   |   |   |
-| Feature or Sensor     | m | l | t     | k | s | i | d | Remarks
-| ROTARY_V1             | - | - | x / x | - | x | - | - |
-| USE_SONOFF_RF         | - | - | x / - | x | x | - | - |
-| USE_RF_FLASH          | - | - | x / - | x | x | - | - |
-| USE_SONOFF_SC         | - | - | x / - | x | x | - | - |
-| USE_TUYA_MCU          | - | x | x / - | x | x | - | x |
-| USE_ARMTRONIX_DIMMERS | - | - | x / - | x | - | - | - |
-| USE_PS_16_DZ          | - | - | x / - | x | - | - | - |
-| USE_SONOFF_IFAN       | - | - | x / - | x | - | - | - |
-| USE_BUZZER            | - | - | x / x | x | x | - | - |
-| USE_ARILUX_RF         | - | - | x / - | x | - | - | - |
-| USE_SHUTTER           | - | - | x / x | x | - | - | - |
-| USE_DEEPSLEEP         | - | - | x / x | - | x | - | - |
-| USE_EXS_DIMMER        | - | - | x / - | x | - | - | - |
-| USE_DEVICE_GROUPS     | - | - | x / x | - | - | - | - |
-| USE_PWM_DIMMER        | - | - | x / - | x | - | - | - |
-| USE_KEELOQ            | - | - | - / - | - | - | - | - |
-| USE_SONOFF_D1         | - | - | x / - | x | - | - | - |
-| USE_SHELLY_DIMMER     | - | - | x / - | - | - | - | - |
-| USE_AC_ZERO_CROSS_DIMMER | - | - | x / x | x | x | x | x |
-|                       |   |   |       |   |   |   |   |
-| Feature or Sensor     | m | l | t     | k | s | i | d | Remarks
-| USE_LIGHT             | - | x | x / x | x | x | x | x |
-| USE_WS2812            | - | - | x / x | x | x | - | x |
-| USE_WS2812_DMA        | - | - | - / - | - | - | - | - |
-| USE_MY92X1            | - | - | x / - | x | x | - | x |
-| USE_SM16716           | - | - | x / - | x | x | - | x |
-| USE_SM2135            | - | - | x / - | x | x | - | x |
-| USE_SONOFF_L1         | - | - | x / - | x | x | - | x |
-| USE_ELECTRIQ_MOODL    | - | - | x / - | x | x | - | x |
-|                       |   |   |       |   |   |   |   |
-| USE_ENERGY_SENSOR     | - | x | x / x | x | x | - | - |
-| USE_ENERGY_DUMMY      | - | x | x / x | x | x | - | - |
-| USE_PZEM004T          | - | - | x / x | x | x | - | - |
-| USE_PZEM_AC           | - | - | x / x | x | x | - | - |
-| USE_PZEM_DC           | - | - | x / x | x | x | - | - |
-| USE_MCP39F501         | - | x | x / - | x | x | - | - |
-| USE_SDM72             | - | - | - / x | - | x | - | - |
-| USE_SDM120            | - | - | - / x | - | x | - | - |
-| USE_SDM630            | - | - | - / x | - | x | - | - |
-| USE_DDS2382           | - | - | - / x | - | x | - | - |
-| USE_DDSU666           | - | - | - / x | - | x | - | - |
-| USE_SOLAX_X1          | - | - | - / - | - | - | - | - |
-| USE_LE01MR            | - | - | - / - | - | - | - | - |
-| USE_BL09XX            | - | x | x / x | x | x | - | - |
-| USE_TELEINFO          | - | - | - / - | - | - | - | - |
-| USE_IEM3000           | - | - | - / - | - | - | - | - |
-| USE_WE517             | - | - | - / - | - | - | - | - |
-|                       |   |   |       |   |   |   |   |
-| USE_ADC_VCC           | x | x | - / - | - | - | x | - |
-| USE_COUNTER           | - | - | x / x | x | x | - | x |
-| USE_DS18x20           | - | - | x / x | x | x | - | x |
-| USE_DHT               | - | - | x / x | x | x | - | x |
-| USE_MAX31855          | - | - | - / x | - | x | - | - |
-| USE_MAX31865          | - | - | - / - | - | - | - | - |
-| USE_THERMOSTAT        | - | - | - / - | - | - | - | - |
-| USE_LMT01             | - | - | - / x | - | x | - | - |
-|                       |   |   |       |   |   |   |   |
-| Feature or Sensor     | m | l | t     | k | s | i | d | Remarks
-| USE_I2C               | - | - | x / x | x | x | - | x |
-| USE_SHT               | - | - | - / x | - | x | - | - |
-| USE_HTU               | - | - | - / x | - | x | - | - |
-| USE_BMP               | - | - | - / x | - | x | - | - |
-| USE_BME680            | - | - | - / x | - | x | - | - |
-| USE_BH1750            | - | - | - / x | - | x | - | - |
-| USE_VEML6070          | - | - | - / x | - | x | - | - |
-| USE_ADS1115           | - | - | - / x | - | x | - | - |
-| USE_INA219            | - | - | - / x | - | x | - | - |
-| USE_INA226            | - | - | - / - | - | - | - | - |
-| USE_SHT3X             | - | - | - / x | - | x | - | - |
-| USE_TSL2561           | - | - | - / - | - | - | - | - |
-| USE_TSL2591           | - | - | - / - | - | - | - | - |
-| USE_MGS               | - | - | - / x | - | x | - | - |
-| USE_SGP30             | - | - | - / x | - | x | - | - |
-| USE_SI1145            | - | - | - / - | - | - | - | - |
-| USE_LM75AD            | - | - | - / x | - | x | - | - |
-| USE_APDS9960          | - | - | - / - | - | - | - | - |
-| USE_MCP230xx          | - | - | - / - | - | - | - | - |
-| USE_PCA9685           | - | - | - / - | - | - | - | - |
-| USE_MPR121            | - | - | - / - | - | - | - | - |
-| USE_CCS811            | - | - | - / - | - | x | - | - |
-| USE_CCS811_V2         | - | - | - / x | - | - | - | - |
-| USE_MPU6050           | - | - | - / - | - | - | - | - |
-| USE_DS3231            | - | - | - / - | - | - | - | - |
-| USE_MGC3130           | - | - | - / - | - | - | - | - |
-| USE_MAX44009          | - | - | - / - | - | - | - | - |
-| USE_SCD30             | - | - | - / x | - | x | - | - |
-| USE_SCD40             | - | - | - / x | - | - | - | - |
-| USE_SPS30             | - | - | - / - | - | - | - | - |
-| USE_ADE7953           | - | - | x / x | x | x | - | x |
-| USE_VL53L0X           | - | - | - / x | - | x | - | - |
-| USE_MLX90614          | - | - | - / - | - | - | - | - |
-| USE_CHIRP             | - | - | - / - | - | - | - | - |
-| USE_PAJ7620           | - | - | - / - | - | - | - | - |
-| USE_PCF8574           | - | - | - / - | - | - | - | - |
-|                       |   |   |       |   |   |   |   |
-| Feature or Sensor     | m | l | t     | k | s | i | d | Remarks
-| USE_HIH6              | - | - | - / x | - | x | - | - |
-| USE_DHT12             | - | - | - / x | - | x | - | - |
-| USE_DS1624            | - | - | - / x | - | x | - | - |
-| USE_AHT1x             | - | - | - / - | - | - | - | - |
-| USE_HDC1080           | - | - | - / - | - | - | - | - |
-| USE_WEMOS_MOTOR_V1    | - | - | - / x | - | x | - | - |
-| USE_IAQ               | - | - | - / x | - | x | - | - |
-| USE_AS3935            | - | - | - / x | - | x | - | - |
-| USE_VEML6075          | - | - | - / - | - | - | - | - |
-| USE_VEML7700          | - | - | - / - | - | - | - | - |
-| USE_MCP9808           | - | - | - / - | - | - | - | - |
-| USE_HP303B            | - | - | - / - | - | - | - | - |
-| USE_EZOCO2            | - | - | - / - | - | - | - | - |
-| USE_EZODO             | - | - | - / - | - | - | - | - |
-| USE_EZOEC             | - | - | - / - | - | - | - | - |
-| USE_EZOFLO            | - | - | - / - | - | - | - | - |
-| USE_EZOHUM            | - | - | - / - | - | - | - | - |
-| USE_EZOO2             | - | - | - / - | - | - | - | - |
-| USE_EZOORP            | - | - | - / - | - | - | - | - |
-| USE_EZOPH             | - | - | - / - | - | - | - | - |
-| USE_EZOPMP            | - | - | - / - | - | - | - | - |
-| USE_EZOPRS            | - | - | - / - | - | - | - | - |
-| USE_EZORGB            | - | - | - / - | - | - | - | - |
-| USE_EZORTD            | - | - | - / - | - | - | - | - |
-| USE_SEESAW_SOIL       | - | - | - / - | - | - | - | - |
-| USE_TOF10120          | - | - | - / - | - | - | - | - |
-| USE_AM2320            | - | - | - / - | - | - | - | - |
-| USE_T67XX             | - | - | - / - | - | - | - | - |
-| USE_HM330X            | - | - | - / - | - | - | - | - |
-|                       |   |   |       |   |   |   |   |
-| Feature or Sensor     | m | l | t     | k | s | i | d | Remarks
-| USE_SPI               | - | - | - / - | - | - | - | x |
-| USE_RC522             | - | - | - / - | - | - | - | - |
-| USE_MHZ19             | - | - | - / x | - | x | - | - |
-| USE_SENSEAIR          | - | - | - / x | - | x | - | - |
-| USE_PMS5003           | - | - | - / x | - | x | - | - |
-| USE_NOVA_SDS          | - | - | - / x | - | x | - | - |
-| USE_HPMA              | - | - | - / x | - | x | - | - |
-| USE_SERIAL_BRIDGE     | - | - | x / x | x | x | - | x |
-| USE_MP3_PLAYER        | - | - | - / x | - | x | - | - |
-| USE_AZ7798            | - | - | - / - | - | - | - | - |
-| USE_PN532_HSU         | - | - | - / x | - | x | - | - |
-| USE_RDM6300           | - | - | - / x | - | x | - | - |
-| USE_IBEACON           | - | - | - / x | - | x | - | - |
-| USE_GPS               | - | - | - / - | - | - | - | - |
-| USE_HM10              | - | - | - / - | - | x | - | - |
-| USE_HRXL              | - | - | - / x | - | x | - | - |
-| USE_TASMOTA_CLIENT    | - | - | - / - | - | - | - | - |
-| USE_OPENTHERM         | - | - | - / - | - | - | - | - |
-| USE_MIEL_HVAC         | - | - | - / - | - | - | - | - |
-| USE_PROJECTOR_CTRL    | - | - | - / - | - | - | - | - |
-| USE_AS608             | - | - | - / - | - | - | - | - |
-| USE_TCP_BRIDGE        | - | - | - / - | - | - | - | - | zbbridge
-|                       |   |   |       |   |   |   |   |
-| USE_NRF24             | - | - | - / - | - | - | - | - |
-| USE_MIBLE             | - | - | - / - | - | - | - | - |
-| USE_ZIGBEE            | - | - | - / - | - | - | - | - |
-| USE_ZIGBEE_ZNP        | - | - | - / - | - | - | - | - |
-| USE_ZIGBEE_EZSP       | - | - | - / - | - | - | - | - | Sonoff ZbBridge
-|                       |   |   |       |   |   |   |   |
-| USE_IR_REMOTE         | - | - | x / - | x | x | x | x |
-| USE_IR_RECEIVE        | - | - | x / - | x | x | x | x |
-| USE_IR_REMOTE_FULL    | - | - | - / - | - | - | x | - | Enable ALL protocols
-|                       |   |   |       |   |   |   |   |
-| USE_SR04              | - | - | - / - | - | x | - | - |
-| USE_DYP               | - | - | - / - | - | - | - | - |
-| USE_TM1638            | - | - | - / x | - | x | - | - |
-| USE_HX711             | - | - | - / x | - | x | - | - |
-| USE_TX2x_WIND_SENSOR  | - | - | - / - | - | - | - | - |
-| USE_WINDMETER         | - | - | - / - | - | - | - | - |
-| USE_RC_SWITCH         | - | - | - / x | - | x | - | - |
-| USE_RF_SENSOR         | - | - | - / x | - | x | - | - | AlectoV2 only
-| USE_HRE               | - | - | - / x | - | x | - | - |
-| USE_A4988_STEPPER     | - | - | - / - | - | - | - | - |
-| USE_NEOPOOL           | - | - | - / - | - | - | - | - |
-|                       |   |   |       |   |   |   |   |
-| Feature or Sensor     | m | l | t     | k | s | i | d | Remarks
-| USE_DISPLAY           | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_LCD       | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_SSD1306   | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_MATRIX    | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_SH1106    | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_ILI9341   | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_EPAPER_29 | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_EPAPER_42 | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_SSD1351   | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_RA8876    | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_ST7789    | - | - | - / - | - | - | - | x |
-| USE_DISPLAY_TM1637    | - | - | - / - | - | - | - | x |
-|                       |   |   |       |   |   |   |   |
-| USE_FT5206            | - | - | - / - | - | - | - | - |
-| USE_FTC532            | - | - | - / - | - | - | - | - |
-| USE_BS814A2           | - | - | - / - | - | - | - | - |
-|                       |   |   |       |   |   |   |   |
-| ESP32 Feature         | m | l | t     | k | s | i | d | Remarks
-| USE_HALLEFFECT        |   |   |   / x |   |   |   |   |
-| USE_MI_ESP32          |   |   |   / x |   |   |   |   | See SetOption115
-| USE_IBEACON_ESP32     |   |   |   / - |   |   |   |   |
-| USE_WEBCAM            |   |   |   / - |   |   |   |   |
-| USE_ETHERNET          |   |   |   / - |   |   |   |   |
-| USE_I2S_AUDIO         |   |   |   / - |   |   |   |   |
-| USE_TTGO_WATCH        |   |   |   / - |   |   |   |   |
+Note: `minimal` variant is not listed as it shouldn't be used outside of the [upgrading](https://tasmota.github.io/docs/Upgrading/) process.
+
+| Feature or Sensor     | l | t     | k | s | i | d | Remarks
+|-----------------------|---|-------|---|---|---|---|--------
+| MY_LANGUAGE en_GB     | x | x / x | x | x | x | x |
+| USE_UFILESYS          | - | - / x | - | - | - | - |
+| USE_ARDUINO_OTA       | - | - / - | - | - | - | - |
+| USE_DOMOTICZ          | - | x / x | x | x | x | - |
+| USE_HOME_ASSISTANT    | - | x / x | x | x | x | - |
+| USE_MQTT_TLS          | - | - / - | - | - | - | - |
+| USE_MQTT_AWS_IOT      | - | - / - | - | - | - | - |
+| USE_4K_RSA            | - | - / - | - | - | - | - |
+| USE_TELEGRAM          | - | - / - | - | - | - | - |
+| USE_KNX               | - | - / x | x | - | - | - |
+| USE_WEBSERVER         | x | x / x | x | x | x | x |
+| USE_JAVASCRIPT_ES6    | - | - / - | - | - | - | - |
+| USE_WEBSEND_RESPONSE  | - | - / - | - | - | - | - |
+| USE_EMULATION_HUE     | x | x / x | - | x | - | - |
+| USE_EMULATION_WEMO    | x | x / x | - | x | - | - |
+| USE_DISCOVERY         | - | - / - | - | - | - | - |
+| WEBSERVER_ADVERTISE   | - | x / - | x | - | - | x |
+| MQTT_HOST_DISCOVERY   | - | - / - | - | - | - | - |
+| USE_TIMERS            | x | x / x | x | x | x | x |
+| USE_TIMERS_WEB        | x | x / x | x | x | x | x |
+| USE_SUNRISE           | x | x / x | x | x | x | x |
+| USE_RULES             | x | x / x | x | x | x | x |
+| USE_SCRIPT            | - | - / - | - | - | - | - |
+| USE_EXPRESSION        | - | - / - | - | - | - | - |
+| SUPPORT_IF_STATEMENT  | - | - / - | - | - | - | - |
+| USE_HOTPLUG           | - | - / - | - | - | - | - |
+| USE_PROMETHEUS        | - | - / - | - | - | - | - |
+| USE_PING              | - | - / - | - | - | - | - |
+|                       |   |       |   |   |   |   |
+| Feature or Sensor     | l | t     | k | s | i | d | Remarks
+| ROTARY_V1             | - | x / x | - | x | - | - |
+| USE_SONOFF_RF         | - | x / - | x | x | - | - |
+| USE_RF_FLASH          | - | x / - | x | x | - | - |
+| USE_SONOFF_SC         | - | x / - | x | x | - | - |
+| USE_TUYA_MCU          | x | x / - | x | x | - | x |
+| USE_ARMTRONIX_DIMMERS | - | x / - | x | - | - | - |
+| USE_PS_16_DZ          | - | x / - | x | - | - | - |
+| USE_SONOFF_IFAN       | - | x / - | x | - | - | - |
+| USE_BUZZER            | - | x / x | x | x | - | - |
+| USE_ARILUX_RF         | - | x / - | x | - | - | - |
+| USE_SHUTTER           | - | x / x | x | - | - | - |
+| USE_DEEPSLEEP         | - | x / x | - | x | - | - |
+| USE_EXS_DIMMER        | - | x / - | x | - | - | - |
+| USE_DEVICE_GROUPS     | - | x / x | - | - | - | - |
+| USE_PWM_DIMMER        | - | x / - | x | - | - | - |
+| USE_KEELOQ            | - | - / - | - | - | - | - |
+| USE_SONOFF_D1         | - | x / - | x | - | - | - |
+| USE_SHELLY_DIMMER     | - | x / - | - | - | - | - |
+| USE_AC_ZERO_CROSS_DIMMER | - | x / x | x | x | x | x |
+|                       |   |       |   |   |   |   |
+| Feature or Sensor     | l | t     | k | s | i | d | Remarks
+| USE_LIGHT             | x | x / x | x | x | x | x |
+| USE_WS2812            | - | x / x | x | x | - | x |
+| USE_WS2812_DMA        | - | - / - | - | - | - | - |
+| USE_MY92X1            | - | x / - | x | x | - | x |
+| USE_SM16716           | - | x / - | x | x | - | x |
+| USE_SM2135            | - | x / - | x | x | - | x |
+| USE_SONOFF_L1         | - | x / - | x | x | - | x |
+| USE_ELECTRIQ_MOODL    | - | x / - | x | x | - | x |
+|                       |   |       |   |   |   |   |
+| USE_ENERGY_SENSOR     | x | x / x | x | x | - | - |
+| USE_ENERGY_DUMMY      | x | x / x | x | x | - | - |
+| USE_PZEM004T          | - | x / x | x | x | - | - |
+| USE_PZEM_AC           | - | x / x | x | x | - | - |
+| USE_PZEM_DC           | - | x / x | x | x | - | - |
+| USE_MCP39F501         | x | x / - | x | x | - | - |
+| USE_SDM72             | - | - / x | - | x | - | - |
+| USE_SDM120            | - | - / x | - | x | - | - |
+| USE_SDM630            | - | - / x | - | x | - | - |
+| USE_DDS2382           | - | - / x | - | x | - | - |
+| USE_DDSU666           | - | - / x | - | x | - | - |
+| USE_SOLAX_X1          | - | - / - | - | - | - | - |
+| USE_LE01MR            | - | - / - | - | - | - | - |
+| USE_BL09XX            | x | x / x | x | x | - | - |
+| USE_TELEINFO          | - | - / - | - | - | - | - |
+| USE_IEM3000           | - | - / - | - | - | - | - |
+| USE_WE517             | - | - / - | - | - | - | - |
+|                       |   |       |   |   |   |   |
+| USE_ADC_VCC           | x | - / - | - | - | x | - |
+| USE_COUNTER           | - | x / x | x | x | - | x |
+| USE_DS18x20           | - | x / x | x | x | - | x |
+| USE_DHT               | - | x / x | x | x | - | x |
+| USE_MAX31855          | - | - / x | - | x | - | - |
+| USE_MAX31865          | - | - / - | - | - | - | - |
+| USE_THERMOSTAT        | - | - / - | - | - | - | - |
+| USE_LMT01             | - | - / x | - | x | - | - |
+|                       |   |       |   |   |   |   |
+| Feature or Sensor     | l | t     | k | s | i | d | Remarks
+| USE_I2C               | - | x / x | x | x | - | x |
+| USE_SHT               | - | - / x | - | x | - | - |
+| USE_HTU               | - | - / x | - | x | - | - |
+| USE_BMP               | - | - / x | - | x | - | - |
+| USE_BME680            | - | - / x | - | x | - | - |
+| USE_BH1750            | - | - / x | - | x | - | - |
+| USE_VEML6070          | - | - / x | - | x | - | - |
+| USE_ADS1115           | - | - / x | - | x | - | - |
+| USE_INA219            | - | - / x | - | x | - | - |
+| USE_INA226            | - | - / - | - | - | - | - |
+| USE_SHT3X             | - | - / x | - | x | - | - |
+| USE_TSL2561           | - | - / - | - | - | - | - |
+| USE_TSL2591           | - | - / - | - | - | - | - |
+| USE_MGS               | - | - / x | - | x | - | - |
+| USE_SGP30             | - | - / x | - | x | - | - |
+| USE_SI1145            | - | - / - | - | - | - | - |
+| USE_LM75AD            | - | - / x | - | x | - | - |
+| USE_APDS9960          | - | - / - | - | - | - | - |
+| USE_MCP230xx          | - | - / - | - | - | - | - |
+| USE_PCA9685           | - | - / - | - | - | - | - |
+| USE_MPR121            | - | - / - | - | - | - | - |
+| USE_CCS811            | - | - / - | - | x | - | - |
+| USE_CCS811_V2         | - | - / x | - | - | - | - |
+| USE_MPU6050           | - | - / - | - | - | - | - |
+| USE_DS3231            | - | - / - | - | - | - | - |
+| USE_MGC3130           | - | - / - | - | - | - | - |
+| USE_MAX44009          | - | - / - | - | - | - | - |
+| USE_SCD30             | - | - / x | - | x | - | - |
+| USE_SCD40             | - | - / x | - | - | - | - |
+| USE_SPS30             | - | - / - | - | - | - | - |
+| USE_ADE7953           | - | x / x | x | x | - | x |
+| USE_VL53L0X           | - | - / x | - | x | - | - |
+| USE_MLX90614          | - | - / - | - | - | - | - |
+| USE_CHIRP             | - | - / - | - | - | - | - |
+| USE_PAJ7620           | - | - / - | - | - | - | - |
+| USE_PCF8574           | - | - / - | - | - | - | - |
+|                       |   |       |   |   |   |   |
+| Feature or Sensor     | l | t     | k | s | i | d | Remarks
+| USE_HIH6              | - | - / x | - | x | - | - |
+| USE_DHT12             | - | - / x | - | x | - | - |
+| USE_DS1624            | - | - / x | - | x | - | - |
+| USE_AHT1x             | - | - / - | - | - | - | - |
+| USE_HDC1080           | - | - / - | - | - | - | - |
+| USE_WEMOS_MOTOR_V1    | - | - / x | - | x | - | - |
+| USE_IAQ               | - | - / x | - | x | - | - |
+| USE_AS3935            | - | - / x | - | x | - | - |
+| USE_VEML6075          | - | - / - | - | - | - | - |
+| USE_VEML7700          | - | - / - | - | - | - | - |
+| USE_MCP9808           | - | - / - | - | - | - | - |
+| USE_HP303B            | - | - / - | - | - | - | - |
+| USE_EZOCO2            | - | - / - | - | - | - | - |
+| USE_EZODO             | - | - / - | - | - | - | - |
+| USE_EZOEC             | - | - / - | - | - | - | - |
+| USE_EZOFLO            | - | - / - | - | - | - | - |
+| USE_EZOHUM            | - | - / - | - | - | - | - |
+| USE_EZOO2             | - | - / - | - | - | - | - |
+| USE_EZOORP            | - | - / - | - | - | - | - |
+| USE_EZOPH             | - | - / - | - | - | - | - |
+| USE_EZOPMP            | - | - / - | - | - | - | - |
+| USE_EZOPRS            | - | - / - | - | - | - | - |
+| USE_EZORGB            | - | - / - | - | - | - | - |
+| USE_EZORTD            | - | - / - | - | - | - | - |
+| USE_SEESAW_SOIL       | - | - / - | - | - | - | - |
+| USE_TOF10120          | - | - / - | - | - | - | - |
+| USE_AM2320            | - | - / - | - | - | - | - |
+| USE_T67XX             | - | - / - | - | - | - | - |
+| USE_HM330X            | - | - / - | - | - | - | - |
+|                       |   |       |   |   |   |   |
+| Feature or Sensor     | l | t     | k | s | i | d | Remarks
+| USE_SPI               | - | - / - | - | - | - | x |
+| USE_RC522             | - | - / - | - | - | - | - |
+| USE_MHZ19             | - | - / x | - | x | - | - |
+| USE_SENSEAIR          | - | - / x | - | x | - | - |
+| USE_PMS5003           | - | - / x | - | x | - | - |
+| USE_NOVA_SDS          | - | - / x | - | x | - | - |
+| USE_HPMA              | - | - / x | - | x | - | - |
+| USE_SERIAL_BRIDGE     | - | x / x | x | x | - | x |
+| USE_MP3_PLAYER        | - | - / x | - | x | - | - |
+| USE_AZ7798            | - | - / - | - | - | - | - |
+| USE_PN532_HSU         | - | - / x | - | x | - | - |
+| USE_RDM6300           | - | - / x | - | x | - | - |
+| USE_IBEACON           | - | - / x | - | x | - | - |
+| USE_GPS               | - | - / - | - | - | - | - |
+| USE_HM10              | - | - / - | - | x | - | - |
+| USE_HRXL              | - | - / x | - | x | - | - |
+| USE_TASMOTA_CLIENT    | - | - / - | - | - | - | - |
+| USE_OPENTHERM         | - | - / - | - | - | - | - |
+| USE_MIEL_HVAC         | - | - / - | - | - | - | - |
+| USE_PROJECTOR_CTRL    | - | - / - | - | - | - | - |
+| USE_AS608             | - | - / - | - | - | - | - |
+| USE_TCP_BRIDGE        | - | - / - | - | - | - | - | zbbridge
+|                       |   |       |   |   |   |   |
+| USE_NRF24             | - | - / - | - | - | - | - |
+| USE_MIBLE             | - | - / - | - | - | - | - |
+| USE_ZIGBEE            | - | - / - | - | - | - | - |
+| USE_ZIGBEE_ZNP        | - | - / - | - | - | - | - |
+| USE_ZIGBEE_EZSP       | - | - / - | - | - | - | - | Sonoff ZbBridge
+|                       |   |       |   |   |   |   |
+| USE_IR_REMOTE         | - | x / - | x | x | x | x |
+| USE_IR_RECEIVE        | - | x / - | x | x | x | x |
+| USE_IR_REMOTE_FULL    | - | - / - | - | - | x | - | Enable ALL protocols
+|                       |   |       |   |   |   |   |
+| USE_SR04              | - | - / - | - | x | - | - |
+| USE_DYP               | - | - / - | - | - | - | - |
+| USE_TM1638            | - | - / x | - | x | - | - |
+| USE_HX711             | - | - / x | - | x | - | - |
+| USE_TX2x_WIND_SENSOR  | - | - / - | - | - | - | - |
+| USE_WINDMETER         | - | - / - | - | - | - | - |
+| USE_RC_SWITCH         | - | - / x | - | x | - | - |
+| USE_RF_SENSOR         | - | - / x | - | x | - | - | AlectoV2 only
+| USE_HRE               | - | - / x | - | x | - | - |
+| USE_A4988_STEPPER     | - | - / - | - | - | - | - |
+| USE_NEOPOOL           | - | - / - | - | - | - | - |
+|                       |   |       |   |   |   |   |
+| Feature or Sensor     | l | t     | k | s | i | d | Remarks
+| USE_DISPLAY           | - | - / - | - | - | - | x |
+| USE_DISPLAY_LCD       | - | - / - | - | - | - | x |
+| USE_DISPLAY_SSD1306   | - | - / - | - | - | - | x |
+| USE_DISPLAY_MATRIX    | - | - / - | - | - | - | x |
+| USE_DISPLAY_SH1106    | - | - / - | - | - | - | x |
+| USE_DISPLAY_ILI9341   | - | - / - | - | - | - | x |
+| USE_DISPLAY_EPAPER_29 | - | - / - | - | - | - | x |
+| USE_DISPLAY_EPAPER_42 | - | - / - | - | - | - | x |
+| USE_DISPLAY_SSD1351   | - | - / - | - | - | - | x |
+| USE_DISPLAY_RA8876    | - | - / - | - | - | - | x |
+| USE_DISPLAY_ST7789    | - | - / - | - | - | - | x |
+| USE_DISPLAY_TM1637    | - | - / - | - | - | - | x |
+|                       |   |       |   |   |   |   |
+| USE_FT5206            | - | - / - | - | - | - | - |
+| USE_FTC532            | - | - / - | - | - | - | - |
+| USE_BS814A2           | - | - / - | - | - | - | - |
+|                       |   |       |   |   |   |   |
+| ESP32 Feature         | l | t     | k | s | i | d | Remarks
+| USE_HALLEFFECT        |   |   / x |   |   |   |   |
+| USE_MI_ESP32          |   |   / x |   |   |   |   | See SetOption115
+| USE_IBEACON_ESP32     |   |   / - |   |   |   |   |
+| USE_WEBCAM            |   |   / - |   |   |   |   |
+| USE_ETHERNET          |   |   / - |   |   |   |   |
+| USE_I2S_AUDIO         |   |   / - |   |   |   |   |
+| USE_TTGO_WATCH        |   |   / - |   |   |   |   |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3b35f9f4..e5d9a8633 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,19 +3,46 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased] - Development
 
-## [10.0.0.3]
+## [10.1.0.1]
+
+## [Released]
+
+## [10.1.0] 20211208
+- Release Noelle
+
+### Added
+- Berry added ``tcpclient``
+
+## [10.0.0.4] 20211208
+### Added
+- (Internal) Support for FUNC_BUTTON_MULTI_PRESSED in (light)drivers
+- Support for GPE Multi color smart light as sold by Action in the Netherlands
+- Support for 74xx595 8-bit shift registers (#13921)
+
+### Changed
+- (Internal) Range conversion edge values
+- NimBLE to v.1.3.3
+- MQTT TLS dual mode (CA or fingeprint) in same firmware, ``SetOption132 1`` to force fingerprint
+- Toolchains for ESP32x changed from 8.4.0-2021r1 to 8.4.0-2021r2
+
+### Fixed
+- Tuya dimmer range issue (#13849)
+- BLE Memory leak with update NimBLE v.1.3.1 to v.1.3.3
+- Compile error BLE EQ3 driver with core 2.0.x (#13948)
+
+## [10.0.0.3] 20211130
 ### Added
 - Shutter support for venetian blinds with tilt control
-- Autoconfiguration for ESP32 and variants
+- ESP32 Autoconfiguration
 - ESP32 fix leftover GPIO configuration after restart
 - ESP32 Proof of Concept Sonoff SPM with limited functionality (switching and energy monitoring) (#13447)
 - WS2812 scheme 13 stairs effect (#13595)
-- Preliminary support for Tasmota Apps (.tapp extesions)
-- Berry support for neopixel (WS2812, SK6812)
+- ESP32 Preliminary support for Tasmota Apps (.tapp extesions)
+- ESP32 Berry support for neopixel (WS2812, SK6812)
 - Command ``IfxPeriod `` to overrule ``Teleperiod`` for Influx messages (#13750)
-- OTA over HTTPS (ESP32x only)
-- Berry add ``import re`` regex module
-- Add HTTPS support to ``WebQuery`` (ESP32x only)
+- ESP32 OTA over HTTPS
+- ESP32 Berry ``import re`` regex module
+- ESP32 HTTPS support to ``WebQuery``
 
 ### Changed
 - ESP8266 Gratuitous ARP enabled and set to 60 seconds (#13623)
@@ -61,8 +88,6 @@ All notable changes to this project will be documented in this file.
 - Discovery of shutters (#13572)
 - ESP32-C3 OneWire as used by DS18x20 (#13583)
 
-## [Released]
-
 ## [10.0.0] 20211019
 - Release Norman
 
diff --git a/FIRMWARE.md b/FIRMWARE.md
index e2eb172b7..610cc6fba 100644
--- a/FIRMWARE.md
+++ b/FIRMWARE.md
@@ -18,7 +18,7 @@ See [CHANGELOG.md](https://github.com/arendst/Tasmota/blob/development/tasmota/C
 
 ## Development
 
-[![Dev Version](https://img.shields.io/badge/development%20version-v10.0.x.x-blue.svg)](https://github.com/arendst/Tasmota)
+[![Dev Version](https://img.shields.io/badge/development%20version-v10.1.x.x-blue.svg)](https://github.com/arendst/Tasmota)
 [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://ota.tasmota.com/tasmota/)
 [![Tasmota CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+CI%22)
 [![Tasmota ESP32 CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20ESP32%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+ESP32+CI%22)
diff --git a/README.md b/README.md
index 111536ba8..b41539308 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Easy initial installation of Tasmota can be performed using the [Tasmota WebInst
 
 ## Development
 
-[![Dev Version](https://img.shields.io/badge/development%20version-v10.0.x.x-blue.svg)](https://github.com/arendst/Tasmota)
+[![Dev Version](https://img.shields.io/badge/development%20version-v10.1.x.x-blue.svg)](https://github.com/arendst/Tasmota)
 [![Download Dev](https://img.shields.io/badge/download-development-yellow.svg)](http://ota.tasmota.com/tasmota/)
 [![Tasmota CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+CI%22)
 [![Tasmota ESP32 CI](https://github.com/arendst/Tasmota/workflows/Tasmota%20ESP32%20CI/badge.svg)](https://github.com/arendst/Tasmota/actions?query=workflow%3A%22Tasmota+ESP32+CI%22)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 985262bd6..e7b2dcdb3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -66,12 +66,12 @@ Latest released binaries can be downloaded from
 - http://ota.tasmota.com/tasmota/release
 
 Historical binaries can be downloaded from
-- http://ota.tasmota.com/tasmota/release-10.0.0
+- http://ota.tasmota.com/tasmota/release-10.1.0
 
 The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota/release/tasmota.bin.gz``
 
 ### ESP32 based
-The following binary downloads have been compiled with ESP32/Arduino library core version **1.0.7.4**.
+The following binary downloads have been compiled with ESP32/Arduino library core version **2.0.1.1**.
 
 - **tasmota32.bin** = The Tasmota version with most drivers including additional sensors and KNX for 4M+ flash.  **RECOMMENDED RELEASE BINARY**
 - **tasmota32c3.bin** = The Tasmota version with most drivers including additional sensors and KNX for ESP32-C3 and 4M+ flash.
@@ -90,7 +90,7 @@ Latest released binaries can be downloaded from
 - http://ota.tasmota.com/tasmota32/release
 
 Historical binaries can be downloaded from
-- http://ota.tasmota.com/tasmota32/release-10.0.0
+- http://ota.tasmota.com/tasmota32/release-10.1.0
 
 The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmota.com/tasmota32/release/tasmota32.bin``
 
@@ -100,36 +100,13 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 
 [Complete list](BUILDS.md) of available feature and sensors.
 
-## Changelog v10.0.0.3
+## Changelog v10.1.0.1
 ### Added
-- 1 second heartbeat GPIO
-- ESP32 Berry add module ``python_compat`` to be closer to Python syntax [#13428](https://github.com/arendst/Tasmota/issues/13428)
-- ESP32 Proof of Concept Sonoff SPM with limited functionality (switching and energy monitoring) [#13447](https://github.com/arendst/Tasmota/issues/13447)
-- Command ``TcpConfig`` for TCPBridge protocol configuration [#13565](https://github.com/arendst/Tasmota/issues/13565)
-- Support for HDC2010 temperature/humidity sensor by Luc Boudreau [#13633](https://github.com/arendst/Tasmota/issues/13633)
-- WS2812 scheme 13 stairs effect [#13595](https://github.com/arendst/Tasmota/issues/13595)
-- Command ``IfxPeriod `` to overrule ``Teleperiod`` for Influx messages [#13750](https://github.com/arendst/Tasmota/issues/13750)
 
 ### Breaking Changed
-- ESP32-S2 TSettings memory usage fixed to 4096 bytes regression from v9.5.0.8
 
 ### Changed
-- ESP32 core library from v1.0.7.4 to v2.0.1
-- ESP32-C3 core library from v2.0.0-post to v2.0.1
-- IRremoteESP8266 library from v2.7.20 to v2.8.0
-- File editor no-wrap [#13427](https://github.com/arendst/Tasmota/issues/13427)
-- ESP8266 Gratuitous ARP enabled and set to 60 seconds [#13623](https://github.com/arendst/Tasmota/issues/13623)
-- Ethernet hostname ending in ``_eth`` to ``-eth`` according to RFC952
 
 ### Fixed
-- Initial reset RTC memory based variables like EnergyToday and EnergyTotal
-- ESP32 Telegram compile error [#13435](https://github.com/arendst/Tasmota/issues/13435)
-- SML compile error [#13441](https://github.com/arendst/Tasmota/issues/13441)
-- GUI checkbox MQTT TLS not saved regression from v9.2.0.3 [#13442](https://github.com/arendst/Tasmota/issues/13442)
-- Discovery of shutters [#13572](https://github.com/arendst/Tasmota/issues/13572)
-- ESP32-C3 OneWire as used by DS18x20 [#13583](https://github.com/arendst/Tasmota/issues/13583)
-- ESP32 analog NTC temperature calculation [#13703](https://github.com/arendst/Tasmota/issues/13703)
 
 ### Removed
-- ILI9488 driver in favour of Universal Display driver [#13719](https://github.com/arendst/Tasmota/issues/13719)
-
diff --git a/TEMPLATES.md b/TEMPLATES.md
index cea550f41..5e9531452 100644
--- a/TEMPLATES.md
+++ b/TEMPLATES.md
@@ -2,11 +2,12 @@
 
 # Templates
 
-Find below the available templates as of October 2021. More template information can be found in the [Tasmota Device Templates Repository](http://blakadder.github.io/templates)
+Find below the available templates as of December 2021. More template information can be found in the [Tasmota Device Templates Repository](http://blakadder.github.io/templates)
 
-## Addressable LED Controller
+## Addressable LED
 ```
 Athom 2812b                  {"NAME":"LS2812B-TAS","GPIO":[32,0,1376,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
+BlitzWolf IC Smart RGB Magic  {"NAME":"BW-LT31","GPIO":[0,0,32,1376,0,0,0,0,0,1088,0,0,0,0],"FLAG":0,"BASE":18,"CMND":"SO37 24"}
 cod.m WLAN Pixel Controller v0.6  {"NAME":"cod.m Pixel Controller","GPIO":[32,0,1376,0,0,0,0,0,544,0,0,0,0,0],"FLAG":0,"BASE":18}
 ESP01 NeoPixel Ring          {"NAME":"ESP-01S-RGB-LED-v1.0","GPIO":[1,1,1376,1,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
 SP501E WS2812B               {"NAME":"SP501E","GPIO":[0,32,0,1376,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
@@ -19,6 +20,7 @@ BlitzWolf 400ml              {"NAME":"BW-FUN3","GPIO":[0,2272,0,2304,0,0,0,0,0,0
 Brilex 400ml                 {"NAME":"BrilexDiffuser","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
 Essential Oil 400ml          {"NAME":"XD800W","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 GD-30W 300ml                 {"NAME":"GD-30W","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
+Gernems 400 ml               {"NAME":"YX-088","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1|TuyaMCU 61,2|TuyaMCU 62,3|TuyaMCU|12,5|TuyaMCU 63,6|TuyaMCU 21,7|TuyaMCU 24,8|TuyaRGB 3|DimmerRange 1,255|TuyaEnumList 1,2|TuyaEnumList 2,2|TuyaEnumList 3,1"}
 Kbaybo 300ml                 {"NAME":"K-H25","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 Kogan 500ml                  {"NAME":"Kogan Difuser","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
 Maxcio 400ml                 {"NAME":"MaxcioDiffuser","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
@@ -40,7 +42,7 @@ Anoopsyche 9W 800lm          {"NAME":"Anoop-CW-WW","GPIO":[0,0,0,0,0,416,0,0,0,4
 Arlec Smart 1350lm PAR38     {"NAME":"Arlec GLD302HA","GPIO":[0,0,0,0,0,0,0,0,417,0,416,0,0,0],"FLAG":0,"BASE":18}
 Arlec Smart 9.5W 806lm       {"NAME":"Arlec GLD110HA","GPIO":[0,0,0,0,0,416,0,0,0,417,0,0,0,0],"FLAG":0,"BASE":48}
 Arlec Smart 9.5W 806lm       {"NAME":"Arlec CCT","GPIO":[0,0,0,0,0,416,0,0,0,417,0,0,0,0],"FLAG":0,"BASE":48}
-Arlec Smart R80 9.5W 806lm   {"NAME":"Arlec GLD115HA","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,0],"FLAG":0,"BASE":48}
+Arlec Smart R80 9.5W 806lm   {"NAME":"Arlec R80","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,0],"FLAG":0,"BASE":48}
 BlitzWolf A70 9W 900lm       {"NAME":"BW-LT29","GPIO":[0,0,0,0,0,0,0,0,0,449,0,416,0,0],"FLAG":0,"BASE":18}
 BrilliantSmart 20696 9W 900lm  {"NAME":"Brilliant20696","GPIO":[0,0,0,0,0,0,0,0,417,0,416,0,0,0],"FLAG":0,"BASE":18}
 BrilliantSmart 20697 9W 900lm  {"NAME":"Brilliant20696","GPIO":[0,0,0,0,0,0,0,0,417,0,416,0,0,0],"FLAG":0,"BASE":18}
@@ -128,12 +130,6 @@ Wipro Garnet NS9100 810lm    {"NAME":"WiproSmartBulb","GPIO":[0,0,0,0,417,0,0,0,
 Wyze A19 800lm               {"NAME":"Wyze Bulb","GPIO":[5728,0,0,0,0,0,0,0,0,416,417,0,0,0],"FLAG":0,"BASE":48}
 ```
 
-## Camera
-```
-Ai-Thinker DIY Kit           {"NAME":"AITHINKER CAM","GPIO":[4992,1,672,1,416,5088,1,1,1,6720,736,704,1,1,5089,5090,0,5091,5184,5152,0,5120,5024,5056,0,0,0,0,4928,576,5094,5095,5092,0,0,5093],"FLAG":0,"BASE":2}
-Wireles Tag DIY Kit          {"NAME":"WT-ESP32-CAM","GPIO":[4992,1,1,1,1,5088,0,0,1,1,1,1,1,0,5089,5090,0,5091,5184,5152,0,5120,5024,5056,0,0,0,0,4928,0,5094,5095,5092,0,0,5093],"FLAG":0,"BASE":2}
-```
-
 ## Ceiling Light
 ```
 BAZZ 14" RGBCCT              {"NAME":"WF19129W","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
@@ -152,8 +148,11 @@ LOLAsmart Uranus White 70 cm  {"NAME":"lola smart","GPIO":[0,0,0,1088,416,419,0,
 LSC 20W 1400lm White Ambiance  {"NAME":"LSC RGBCW LED","GPIO":[0,0,0,0,0,0,0,0,4064,0,4032,0,0,0],"FLAG":0,"BASE":18}
 Luminea 24W CCT              {"NAME":"Luminea NX6205-944","GPIO":[0,0,0,0,0,0,0,0,449,0,416,0,0,0],"FLAG":0,"BASE":48}
 LVL 300mm Round              {"NAME":"LVL 300m Round 24W Ceiling LED","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,0],"FLAG":0,"BASE":48}
+Nedis CCT 800lm              {"NAME":"NEDIS WIFILAW10WT","GPIO":[0,0,0,0,0,0,0,0,417,0,416,0,0,0],"FLAG":0,"BASE":18}
+Nedis RGBCCT 1200lm          {"NAME":"Nedis RGB","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
 Oeegoo 15W RGBCCT            {"NAME":"Oeegoo RGBCCT","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Offdarks Star Fine RGBCCT 60W 40mm  {"NAME":"Offdarks","GPIO":[0,0,0,0,417,416,0,0,419,420,418,0,0,0],"FLAG":0,"BASE":18}
+Polux UFO RGBCCT 48W         {"NAME":"Polux 313924","GPIO":[0,0,0,0,416,417,0,0,418,419,420,0,0,0],"FLAG":0,"BASE":18}
 SMRTLite LED Panel           {"NAME":"SMRTLite","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
 Spectrum Smart Nymphea 36W CCT  {"NAME":"Nymphea_36w","GPIO":[0,0,0,0,0,416,0,0,0,417,0,0,0,0],"FLAG":0,"BASE":18}
 Taloya 12" 24W CCT Main and RGB Ambient  {"NAME":"Taloya GA300-24W-AI-WEMG","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
@@ -184,6 +183,11 @@ MS-108 In-Wall               {"NAME":"MS-108","GPIO":[0,0,0,0,161,160,0,0,224,0,
 QS-WIFI-C01-RF               {"NAME":"Shutter-QS-WIFI-C01","GPIO":[0,0,1,0,288,0,0,0,32,33,224,225,0,0],"FLAG":0,"BASE":18}
 ```
 
+## Curtain Motor
+```
+Steren                       {"NAME":"Steren_SHOME-155","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54,"CMND":"SO54 1|SO20 1|TuyaMCU 61,1|TuyaMCU 21,2|TuyaMCU 27,3|TuyaMCU 97,5|TuyaMCU 11,6|TuyaMCU 62,7|TuyaMCU 63,8|TuyaMCU 81,9|TuyaMCU 98,10|TuyaMCU 82,11"}
+```
+
 ## Curtain Switch
 ```
 Anccy                        {"NAME":"Anccy Shutter","GPIO":[544,0,289,34,226,33,0,0,32,224,290,225,288,0],"FLAG":0,"BASE":18}
@@ -198,12 +202,15 @@ Konesky                      {"NAME":"KingArt","GPIO":[544,0,289,162,226,32,0,0,
 LoraTap SC400W-EU            {"NAME":"Loratap SC400W","GPIO":[544,0,0,34,0,32,0,0,33,225,0,224,0,0],"FLAG":0,"BASE":18}
 LoraTap SC411WSC-EU RF Remote  {"NAME":"Loratap","GPIO":[0,0,0,34,226,32,0,0,33,225,0,224,0,0],"FLAG":0,"BASE":18}
 Maxcio WF-CS01               {"NAME":"Maxcio","GPIO":[544,0,289,162,226,33,0,0,32,224,290,225,288,0],"FLAG":0,"BASE":18}
+Moes RF                      {"NAME":"Moes WS-EUR-CW","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 SCS86-03AJAI                 {"NAME":"ESE86-03AJAI","GPIO":[544,227,289,34,226,33,0,0,32,224,290,225,288,0],"FLAG":0,"BASE":18}
 Teekar SYS-CS 01             {"NAME":"Teekar-Tag","GPIO":[320,0,544,33,225,162,0,0,0,224,321,258,32,0],"FLAG":0,"BASE":18}
 Teepao                       {"NAME":"Teepao","GPIO":[576,322,226,33,225,34,0,0,320,224,321,0,32,0],"FLAG":0,"BASE":18}
 WF-CS01                      {"NAME":"ShutterSwitch","GPIO":[544,227,289,34,226,33,0,0,32,224,290,225,288,0],"FLAG":0,"BASE":18,"CMND":"Rule1 1"}
 WF-CS02                      {"NAME":"WF-CS02 Tuya","GPIO":[544,0,289,162,226,33,0,0,32,224,290,225,288,0],"FLAG":0,"BASE":18}
+WuyunElek                    {"NAME":"MILOS Jalousie","GPIO":[1,0,224,225,1,320,0,0,32,33,34,226,0,0],"FLAG":0,"BASE":18}
 Zemismart                    {"NAME":"Zemismart","GPIO":[544,0,0,162,290,161,0,0,160,224,226,225,0,0],"FLAG":0,"BASE":18}
+Zemismart Backlit            {"NAME":"WF-CS01","GPIO":[544,227,289,34,226,161,0,0,160,224,290,225,288,0],"FLAG":0,"BASE":18}
 ```
 
 ## DIN Relay
@@ -214,7 +221,9 @@ OpenEnergyMonitor WiFi MQTT Thermostat  {"NAME":"MQTT-RELAY","GPIO":[32,0,1,0,0,
 Sinotimer                    {"NAME":"TM608","GPIO":[32,0,0,0,2720,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":18}
 Sinotimer                    {"NAME":"Sinotimer TM60","GPIO":[0,0,0,0,0,288,0,0,224,160,0,0,0,0],"FLAG":0,"BASE":18}
 Sohan DIN Circuit Breaker 1P 50A  {"NAME":"RDCBC-1P","GPIO":[32,0,0,0,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":1}
+Sonoff Smart Stackable Power Meter  {"NAME":"Sonoff SPM (POC2)","GPIO":[1,0,1,0,3200,5536,0,0,1,1,1,0,3232,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,544,1,1,32,1,0,0,1],"FLAG":0,"BASE":1}
 TOMZN 2P 63/80A Circuit Breaker  {"NAME":"TOMZN","GPIO":[0,0,0,0,0,0,0,0,64,224,0,0,288,0],"FLAG":0,"BASE":18}
+TOMZN 4P 80A Circuit Breaker  {"NAME":"TOMZN4","GPIO":[32,0,0,0,0,0,0,0,224,288,0,0,0,0],"FLAG":0,"BASE":18}
 ```
 
 ## Dehumidifier
@@ -225,21 +234,29 @@ Vacplus 50 Pint              {"NAME":"VacPlus Dehumidifier","GPIO":[0,0,0,0,0,0,
 
 ## Development Board
 ```
+Adafruit ESP32 Feather       {"NAME":"HUZZAH32","GPIO":[0,0,0,0,4709,0,1,1,1,288,1,1,1,1,0,1,0,0,608,640,0,4705,4704,1,0,0,0,0,1,1,4706,4710,4708,0,0,4707],"FLAG":0,"BASE":1}
 Adafruit HUZZAH              {"NAME":"Huzzah","GPIO":[32,0,320,0,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":18}
+Ai-Thinker Camera            {"NAME":"AITHINKER CAM","GPIO":[4992,1,672,1,416,5088,1,1,1,6720,736,704,1,1,5089,5090,0,5091,5184,5152,0,5120,5024,5056,0,0,0,0,4928,576,5094,5095,5092,0,0,5093],"FLAG":0,"BASE":2}
+Ai-Thinker ESP32-C3          "Not available"
+Ai-Thinker ESP32-S2F NodeMCU  "Not available"
 AZ-Envy Environmental Sensor  {"NAME":"AZ Envy","GPIO":[32,0,320,0,640,608,0,0,0,0,0,0,0,4704],"FLAG":0,"BASE":18}
 ESP32 Lite V1.0.0            {"NAME":"ESP32 Lite V1.0.0","GPIO":[1,0,1,0,1,1,0,0,1,1,1,1,1,1,1,1,0,0,0,1,0,1,1,1,0,0,0,0,1,1,1,1,0,0,0,0],"FLAG":0,"BASE":1}
 LC Technology MicroPython Maker  {"NAME":"LC-ESP-Python","GPIO":[1,1,544,1,1,1,1,1,1,1,1,1,1,1],"FLAG":0,"BASE":18}
-LilyGO TTGO T-Internet-POE   {"NAME":"LilyGO T-Internet-POE","GPIO":[0,1,1,1,1,1,1,1,1,1,1,1,1,1,5600,1,0,1,1,5568,0,1,1,1,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1}
+LilyGO T-OI Plus v1.2 ESP32-C3  "Not available"
+LilyGO T7 v1.5               {"NAME":"LilyGO T7 V1.5","GPIO":[1,1,1,1,1,1,0,0,0,0,0,0,0,0,1,544,0,0,0,1,0,1,1,1,0,0,0,0,0,1,1,4704,1,0,0,1],"FLAG":0,"BASE":1}
+LilyGO TTGO ESP32 Ethernet   {"NAME":"T-Internet-POE v1.2","GPIO":[0,1,1,1,1,1,1,1,1,1,1,1,1,1,5600,1,0,1,1,5568,0,1,1,1,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1,"CMND":"EthType 0|EthClockMode 1|EthAddress 0"}
 M5Stack Atom Lite ESP32      {"NAME":"M5Stack Atom Lite","GPIO":[1,1,1,1,1,1,1,1,1056,1,1,1,1,1,1,1,0,1,1,1,0,1,640,1376,0,0,0,0,608,1,1,1,1,0,0,32],"FLAG":0,"BASE":1}
+Mostly Robots Wemos D1 4 Channel MOSFET Shield  {"NAME":"MOSFET","GPIO":[1,1,288,1,1,1,1,1,226,225,227,224,1,1],"FLAG":0,"BASE":18}
 Olimex ESP32-POE Ethernet    {"NAME":"Olimex ESP32-PoE","GPIO":[1,1,1,1,1,1,0,0,5536,1,1,1,1,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1}
 QuinLED 2 Channel            {"NAME":"QuinLED 2 channel","GPIO":[416,0,417,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
 Silicognition wESP32         {"NAME":"wESP32","GPIO":[0,0,1,0,1,1,0,0,1,1,1,1,5568,5600,1,0,0,0,0,1,0,0,0,0,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1}
 TZT ESP8266 Weather Station Kit  {"NAME":"TZT Weather Station","GPIO":[32,0,640,0,1,1184,0,0,1,1,608,1,1,1],"FLAG":0,"BASE":18}
 WifInfo - Teleinfo Server    {"NAME":"WifInfo","GPIO":[1376,1,1,5152,640,608,1,1,1,1,1,1,1,1],"FLAG":0,"BASE":18}
+Wireles Tag Camera           {"NAME":"WT-ESP32-CAM","GPIO":[4992,1,1,1,1,5088,0,0,1,1,1,1,1,0,5089,5090,0,5091,5184,5152,0,5120,5024,5056,0,0,0,0,4928,0,5094,5095,5092,0,0,5093],"FLAG":0,"BASE":2}
 Wireless Tag ESP32 Ethernet  {"NAME":"WT32-ETH01","GPIO":[1,1,1,1,1,1,0,0,1,0,1,1,3840,576,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,1,1,0,1,1,0,0,1],"FLAG":0,"BASE":1}
 Witty Cloud                  {"NAME":"Witty Cloud","GPIO":[1,1,320,1,32,1,0,0,417,418,1,416,1,4704],"FLAG":0,"BASE":32}
 Yison ESP-01/ESP-202         {"NAME":"Yison Dev Board","GPIO":[259,544,258,1,260,261,1,1,416,418,257,417,256,1],"FLAG":0,"BASE":18}
-ZiGate-Ethernet              {"NAME":"ZIGATE-ETH","GPIO":[1,1,1,1,1,1,0,0,1,0,1,1,3840,576,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,0,1,1,0,1,1,0,0,1],"FLAG":0,"BASE":18,"CMND":"EthClockMode 3 | EthAddress 1"}
+ZiGate-Ethernet              {"NAME":"ZIGATE-ETH","GPIO":[1,1,1,1,1,1,0,0,1,0,1,1,3840,576,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,0,1,1,0,1,1,0,0],"FLAG":0,"BASE":18,"CMND":"EthClockMode 3 | EthAddress 1"}
 ```
 
 ## Dimmable
@@ -326,6 +343,7 @@ Xiaomi Philips MUE4088RT     {"NAME":"Xiaomi Philips","GPIO":[0,0,0,0,0,0,0,0,0,
 ```
 3A Smart Home HGZB-04D       {"NAME":"HGZB-4D","GPIO":[1,1,1,1,1,1,0,0,1,1,290,1,1,0],"FLAG":0,"BASE":54}
 Acenx SD03                   {"NAME":"SD03","GPIO":[34,33,0,323,576,322,0,0,321,416,320,96,256,0],"FLAG":0,"BASE":73}
+Athom EU                     {"NAME":"Athom Dimmer Switch","GPIO":[576,2272,0,2304,0,0,0,0,0,0,0,0,0,1],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 21,2|Ledtable 0|DimmerRange 10,1000"}
 CE Smart Home                {"NAME":"CE-WF500D","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54}
 CE Smart Home CFW500D-3W 3 Way  {"NAME":"CE-WF500D-3W","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54}
 CNSKOU Touch                 {"NAME":"CNSKOU Dimmer Switch","GPIO":[0,0,0,0,0,0,0,0,0,0,290,0,0,0],"FLAG":0,"BASE":54}
@@ -338,14 +356,16 @@ Martin Jerry SD01            {"NAME":"MJ-SD01 Dimmer","GPIO":[34,33,0,323,576,32
 Martin Jerry Single Pole     {"NAME":"MJ-KN01 Dimmer","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 Maxcio Rotary                {"NAME":"EDM-1WAA-EU","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
 Minoston 3-Way               {"NAME":"MS10W","GPIO":[1,2272,1,2304,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
-Moes DS01-1                  {"NAME":"MOES DS01","GPIO":[1,1,1,1,1,1,0,0,1,2304,1,2272,1,0],"FLAG":0,"BASE":54}
+Moes                         {"NAME":"MOES DS01","GPIO":[1,1,1,1,1,1,0,0,1,2304,1,2272,1,0],"FLAG":0,"BASE":54}
 PS-16-DZ                     {"NAME":"PS-16-DZ","GPIO":[1,3200,1,3232,1,1,0,0,1,288,1,1,1,0],"FLAG":0,"BASE":58}
 Teekar UIW001-1              {"NAME":"Teekar UIW001-","GPIO":[0,3232,416,3200,640,608,0,0,160,0,0,0,0,0],"FLAG":0,"BASE":18}
 Tessan MJ-SD02               {"NAME":"MJ-SD02","GPIO":[34,33,0,323,576,322,0,0,321,416,320,96,256,0],"FLAG":0,"BASE":73}
 TopGreener TGWF500D          {"NAME":"TopGreener-Dimmer","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54}
-TreatLife DS01               {"NAME":"DS02S Dimmer","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
-TreatLife DS02S              {"NAME":"DS02S Dimmer","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
+TreatLife 400W               {"NAME":"DS02S Dimmer","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
+TreatLife 400W Single Pole   {"NAME":"DS02S Dimmer","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
+Treatlife Dual Outdoor Dimmer  {"NAME":"DP12","GPIO":[1,2272,1,2304,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54,"CMND":"SO97 1 | TuyaMCU 11,1 | TuyaMCU 12,7 | TuyaMCU 21,2 | TuyaMCU 22,8 | SO20 1 | SO54 1"}
 TreatLife Light and Fan      {"NAME":"DS03 Fan/Light","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
+Virage Labs VirageDimmer     {"NAME":"VirageDimmer","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
 WF-DS01                      {"NAME":"Dimmer WF-DS01","GPIO":[1,1,1,1,1,1,0,0,1,1,290,1,1,0],"FLAG":0,"BASE":54}
 WiFi Dimmer Switch           {"NAME":"PS-16-DZ","GPIO":[0,3200,0,3232,0,0,0,0,0,288,0,0,0,0],"FLAG":0,"BASE":58}
 Zemismart KS-7011            {"NAME":"KS-7011 Dimmer","GPIO":[1,2272,1,2304,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
@@ -371,10 +391,11 @@ Sonoff D1                    {"NAME":"Sonoff D1","GPIO":[1,3200,0,3232,0,0,0,0,0
 ```
 Heltec WiFi Kit 32           {"NAME":"WiFi Kit 32","GPIO":[1,1,1,1,640,1,1,1,1,1,1,608,3840,1,1,1,0,1,1,1,0,224,1,1,0,0,0,0,1,1,1,1,1,0,0,1],"FLAG":0,"BASE":1}
 Heltec WiFi Kit 8            {"NAME":"HTIT-W8266","GPIO":[1,1,1,1,640,608,0,0,1,1,1,1,1024,1],"FLAG":0,"BASE":18}
+LilyGO T5 4.7 inch E-paper   {"NAME":"LilyGO T5-4.7","GPIO":[0,0,0,0,0,0,0,0,1,1,1,1,0,0,0,0,0,0,0,7616,0,0,0,0,0,0,0,0,0,0,33,34,4704,0,0,32],"FLAG":0,"BASE":1}
 LilyGO TTGO ESP8266 0.91 inch OLED SSD1306  {"NAME":"TTGO-0.91","GPIO":[1,1,640,1,1024,0,0,0,1,1,608,1,0,1],"FLAG":0,"BASE":18}
 LilyGO TTGO T-Camera         {"NAME":"T-Camera","GPIO":[1,1,1,1,4992,5120,1,1,1,5089,5090,64,1,1,5024,65,0,640,608,5056,0,5184,1,5152,0,0,0,0,1,1,5088,5091,5095,5094,5093,5092],"FLAG":0,"BASE":1}
 LilyGO TTGO T-Display 1.14in  {"NAME":"ESP32-ttgo-display","GPIO":[0,1,1,1,992,6592,1,1,1,1,1,1,6624,1,896,864,0,1,1,1024,0,1,1,1,0,0,0,0,1,1,1,33,1,0,0,1],"FLAG":0,"BASE":1}
-LilyGO TTGO T-Watcher        {"NAME":"TTGO T4 v1.3","GPIO":[35,1,672,1,992,1024,1,1,832,768,736,704,1,1,896,0,0,640,608,864,0,0,1,928,0,0,0,0,960,1,1,4704,1,32,33,34],"FLAG":0,"BASE":1}
+LilyGO TTGO T-Watcher        {"NAME":"TTGO T4 v1.3","GPIO":[35,1,672,1,992,1024,1,1,832,768,736,704,1,1,896,0,0,640,608,864,0,0,1,6368,0,0,0,0,6400,1,1,4704,1,32,33,34],"FLAG":0,"BASE":1}
 LilyGO TTGO TO ESP8266 OLED SH1106 Weather Station  {"NAME":"TTGO T12","GPIO":[1,1,1,1,608,640,0,0,32,34,33,1,1,1],"FLAG":0,"BASE":18}
 M5Stack Core2                {"NAME":"M5Stack Core 2","GPIO":[6210,1,1,1,6720,768,0,0,0,1,1,800,0,0,736,1,0,641,609,704,0,0,0,1,0,0,0,0,640,608,1,1,1,0,672,0],"FLAG":0,"BASE":1}
 M5Stack M5StickC             {"NAME":"M5StickC","GPIO":[1,0,0,0,0,768,1056,576,0,736,0,704,0,0,1024,0,0,641,609,800,0,0,1,0,0,0,0,0,640,608,1,0,1,32,6210,33],"FLAG":0,"BASE":1}
@@ -383,6 +404,12 @@ OLED Display Module 0.66" for Wemos D1 Mini  {"NAME":"OLED 64x48","GPIO":[1,1,1,
 TTGO ESP32                   {"NAME":"TTGO T-Journal ESP32 Camera","GPIO":[4928,1,1,1,1,5091,1,1,1,608,640,4960,1,5088,5093,5095,0,5184,5120,5056,0,5024,5152,4992,0,0,0,0,1,1,5090,5089,5094,0,0,5092],"FLAG":0,"BASE":1}
 ```
 
+## Display Switch
+```
+Lanbon L8 5 in 1 LCD Touch   {"NAME":"Lanbon L8","GPIO":[0,0,0,0,0,992,0,0,224,0,225,0,0,0,1024,896,0,6624,6592,864,0,832,416,226,0,0,0,0,417,418,0,352,0,0,0,4736],"FLAG":0,"BASE":1}
+Sonoff NSPanel Touch         {"NAME":"NSPanel","GPIO":[0,0,0,0,3872,0,0,0,0,0,32,0,0,0,0,225,0,480,224,1,0,0,0,33,0,0,0,0,0,0,0,0,0,0,4736,0],"FLAG":0,"BASE":1,"CMND":"ADCParam 2,64000,10000,3950 | Sleep 0 | BuzzerPWM 1"}
+```
+
 ## Downlight
 ```
 3A 12W RGBW                  {"NAME":"RGBWSpot","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":18}
@@ -390,6 +417,7 @@ Arlec Smart 9W CCT           {"NAME":"Arlec ALD092CHA","GPIO":[0,0,0,0,416,417,0
 Arlec Smart 9W RGB+CCT       {"NAME":"Arlec ALD092RHA","GPIO":[0,0,0,0,419,420,0,0,416,418,417,0,0,0],"FLAG":0,"BASE":18}
 Atom 10W RGBCCT              {"NAME":"Atom AT9017/WH/WIZ/TR","GPIO":[0,0,420,0,419,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 Atom 11W RGBCCT              {"NAME":"Atom AT9012/WH/WIZ","GPIO":[0,0,420,0,419,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
+Bazz 6" RGBCCT Recessed Lighting Conversion Kit  {"NAME":"CON6RGBTNWWF","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 BrilliantSmart Prism 10W RGBCCT  {"NAME":"Prism","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 BrilliantSmart Trilogy 9W CCT  {"NAME":"SmartCCTDwnLgt","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,0],"FLAG":0,"BASE":48}
 Connect SmartHome RGB        {"NAME":"CSH-240RGB10W","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
@@ -400,6 +428,7 @@ Globe 5W 4" Recessed RGBCCT  {"NAME":"GlobeRGBWW","GPIO":[0,0,0,0,416,419,0,0,41
 Hyperikon 14W 1000lm 6"      {"NAME":"HyperikonDL6","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
 iHomma 6W RGBCCT             {"NAME":"iHomma RGBWW","GPIO":[0,0,0,0,420,419,0,0,416,417,418,0,0,0],"FLAG":0,"BASE":18}
 iHomma RGB BT+IR 12W         {"NAME":"iHommaLEDDownl","GPIO":[0,0,0,0,0,419,0,0,416,417,418,0,0,0],"FLAG":0,"BASE":18}
+Illume 6-inch RGBCCT         {"NAME":"I-SMRGBCCT6","GPIO":[0,0,0,0,407,406,0,0,409,420,408,0,0,0],"FLAG":0,"BASE":18}
 Kogan 9W RGBCCT              {"NAME":"Kogan_SMARTLED","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
 LEDLite CCT 10W Fire Rated   {"NAME":"LEDLite-LTTD10Wifi","GPIO":[0,0,0,0,0,0,0,0,417,0,416,0,0,0],"FLAG":0,"BASE":18}
 Mirabella Genio 9W CCT       {"NAME":"GenioDLightCCT","GPIO":[0,0,0,0,0,0,0,0,449,0,416,0,0,0],"FLAG":0,"BASE":48}
@@ -427,6 +456,7 @@ Arlec Smart 45cm Smart DC Wall  {"NAME":"Arlec 45cm Fan","GPIO":[0,0,0,0,0,0,0,0
 Geek Aire 3D Oscillating Desktop  {"NAME":"Geek Aire Fan","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 12,4 | TuyaMCU 13,5"}
 Goldair SleepSmart GCPF315   {"NAME":"Goldair Fan","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54}
 Lucci Connect Remote Control  {"NAME":"Lucci Fan","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54}
+QuietCool Gable Mount Attic  {"NAME":"QuietCool-AFG-SMT-PRO-2.0","GPIO":[0,0,0,0,0,224,0,0,0,0,0,0,0,0,640,608,0,0,0,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"Interlock 1|WebButton1 Low|WebButton2 High|SO8 1"}
 Sichler Haushaltsgeraete Column  {"NAME":"Sichler Fan","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 Technical Pro                {"NAME":"FXA16 Fan","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 12,8"}
 Zemismart Bladeless          {"NAME":"Bladeless Fan","GPIO":[1,2272,1,2304,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
@@ -446,7 +476,7 @@ Sonoff iFan04-L 110V Light and Ceiling  {"NAME":"iFan04-L","GPIO":[32,3200,0,323
 Avatto Light and             {"NAME":"AVATTO SYS-FL01","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 Deta Light and               {"NAME":"Deta Fan Speed and Light Controller","GPIO":[33,0,0,576,226,34,0,0,0,225,224,227,32,0],"FLAG":0,"BASE":18}
 iSwitch Light and            {"NAME":"iSwitchOZ Light Fan","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
-Treatlife Ceiling            {"NAME":"DS02F","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1|SO97 1|SO68 0"}
+Treatlife 1.5A 4 Speed Ceiling  {"NAME":"DS02F","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1|SO97 1|SO68 0"}
 ```
 
 ## Garage Door Opener
@@ -567,7 +597,6 @@ ZJ-WF-ESP-A v1.1             {"NAME":"RGB2","GPIO":[0,0,0,0,0,0,0,0,417,416,418,
 Arlec Smart 2m LED Colour Changing Strip Light  {"NAME":"Arlec_Light_Strip","GPIO":[1,1,1088,1,416,419,1,1,417,420,418,0,1,1],"FLAG":0,"BASE":18}
 B.K. Licht 2m RGB            {"NAME":"RGBW-Strip","GPIO":[0,0,0,0,416,32,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
 BAZZ 10 ft RGBW              {"NAME":"BAZZ U183MRGBWWF RGBW LED Strip","GPIO":[32,0,0,0,416,419,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
-BlitzWolf BW-LT11            {"NAME":"BW-LT11 Strip","GPIO":[32,0,0,0,416,419,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
 BrilliantSmart 20743 RGB+W   {"NAME":"BrilliantStrip","GPIO":[32,0,0,0,416,419,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
 Briloner 2256-150 RGB        {"NAME":"Briloner2256-1","GPIO":[1088,0,0,0,416,0,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
 Calex 5m RGB + White         {"NAME":"Calex RGBW IR","GPIO":[1088,0,0,0,416,0,0,0,417,419,418,0,0,0],"FLAG":0,"BASE":18}
@@ -589,7 +618,7 @@ LE LampUX 16.4ft RGB         {"NAME":"LampUX","GPIO":[0,33,32,0,0,417,0,0,418,10
 LE LampUX 2m RGB TV Backlight  {"NAME":"LE 904102","GPIO":[0,32,33,0,0,417,0,0,418,34,0,416,0,0],"FLAG":0,"BASE":18}
 LE LampUX 5m RGB             {"NAME":"LampUX","GPIO":[32,0,0,0,0,417,0,0,418,0,0,416,0,0],"FLAG":0,"BASE":18}
 LE LampUX 5m RGB             {"NAME":"LE LampUx","GPIO":[0,0,0,0,0,417,0,0,418,0,0,416,0,0],"FLAG":0,"BASE":34}
-LE lampUX 5m RGBW            {"NAME":"LampUX","GPIO":[0,0,32,0,0,417,0,0,418,0,419,416,0,0],"FLAG":0,"BASE":18}
+LE lampUX 5m RGBW            {"NAME":"LampUX","GPIO":[0,0,0,0,416,419,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
 Lenovo 5m RGBW               {"NAME":"Lenovo LED Strip 5m","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 LePower 32.8ft RGB           {"NAME":"LePower","GPIO":[0,0,0,0,0,417,0,0,418,0,0,416,0,0],"FLAG":0,"BASE":18}
 Lohas ZN022 5m RGBW          {"NAME":"LOHAS M5-022","GPIO":[0,0,0,0,417,416,0,0,32,418,0,0,0,0],"FLAG":0,"BASE":18}
@@ -617,7 +646,7 @@ Torchstar Safe Lighting Kit  {"NAME":"Torchstar","GPIO":[0,0,0,0,288,0,0,0,0,0,0
 WiZ 2m Starter Kit           {"NAME":"WiZ LED Strip","GPIO":[0,0,420,0,419,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,416,417,418,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 WOOX 5m RGBW                 {"NAME":"GardenLedstrip1","GPIO":[0,0,0,0,0,417,0,0,418,160,416,0,0,0],"FLAG":0,"BASE":18}
 WOOX 5m RGBW                 {"NAME":"Woox R5093","GPIO":[32,0,0,0,416,419,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
-Yeelight Lightstrip 1S       {"NAME":"Yeelight Lightstrip 1S","GPIO":[0,0,0,0,0,418,0,0,0,416,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"`SO37 128 | SO92 1"}
+Yeelight Lightstrip 1S       {"NAME":"Yeelight Lightstrip 1S","GPIO":[0,0,0,0,0,418,0,0,0,416,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"SO37 128 | SO92 1"}
 Zemismart 3m Extendable RGBW  {"NAME":"Zemismart LED","GPIO":[0,0,0,0,417,416,0,0,0,418,419,0,0,0],"FLAG":0,"BASE":18}
 ```
 
@@ -641,6 +670,8 @@ electriQ MOODL Ambiance Lamp  {"NAME":"ElectriQ MOODL","GPIO":[0,4640,0,0,0,0,0,
 Hama Wall Light Square, 10 cm, IP 44  {"NAME":"Hama Wifi Wall Light","GPIO":[0,0,0,0,0,416,0,0,0,417,0,0,0,1],"FLAG":0,"BASE":18}
 Hugoai Table Lamp            {"NAME":"HG02","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,20 | TuyaMCU 26,21 | TuyaMCU 21,22 | TuyaMCU 23,23 | TuyaMCU 24,24 | DimmerRange 34,1000"}
 Iwoole Table Lamp            {"NAME":"GLOBELAMP","GPIO":[0,0,0,0,419,0,0,0,417,418,416,0,0,0],"FLAG":0,"BASE":18}
+LSC Multicolor Christmas String  {"NAME":"LSC MC Lights","GPIO":[0,0,0,0,544,32,0,0,3840,0,3872,0,0,0],"FLAG":0,"BASE":18}
+LSC Smart Mood               {"NAME":"LSC Mood Light","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Lumary 18W RGBCCT Recessed Panel  {"NAME":"LumaryDLghtRGB","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
 Mi LED Desk Lamp             {"NAME":"Mi Desk Lamp","GPIO":[0,0,32,0,416,417,0,0,3264,3296,0,0,0,0],"FLAG":0,"BASE":66}
 Mirabella Genio 10 LED Filament Festoon  {"NAME":"GenioFestoon","GPIO":[0,0,0,0,0,0,0,0,0,0,416,0,0,0],"FLAG":0,"BASE":18}
@@ -648,16 +679,18 @@ Mirabella Genio 4 Black LED Garden Path  {"NAME":"GenioGardenStr","GPIO":[0,0,0,
 Mirabella Genio CCT 6 LED 30mm Stainless Steel Deck  {"NAME":"Mirabella Deck CCT","GPIO":[0,0,0,0,0,416,0,0,0,417,0,0,0,0],"FLAG":0,"BASE":18}
 MiraBella Genio Colour 6 LED 30mm Stainless Steel Deck  {"NAME":"Genio RGB Deck Lights","GPIO":[0,0,0,0,416,0,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
 Mirabella Genio Rechargable LED Portable Lamp  {"NAME":"MirabellaPortableLamp","GPIO":[32,0,0,0,416,419,0,0,417,0,418,0,0,0],"FLAG":0,"BASE":18}
+Nous CCT Desk Lamp           {"NAME":"NOUS Smart Desk Lamp S1","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1 | TuyaMCU 21,3 | TuyaMCU 23,4 | DimmerRange 25,255"}
 Novostella UT88835 20W Flood  {"NAME":"Novo 20W Flood","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Novostella UT88836 20W Flood  {"NAME":"Novo 20W Flood","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Nue Vision Care Desk Lamp    {"NAME":"Nue Vision Desk Lamp VC18","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1 | TuyaMCU 21,3 | TuyaMCU 23,4"}
-Sonoff BN-SZ01               {"NAME":"Sonoff BN-SZ","GPIO":[0,0,0,0,0,0,0,0,416,320,0,0,0,0],"FLAG":0,"BASE":22}
+Philips Wiz 24W LED White Batten  {"NAME":"PHILIPS-wiz-24w","GPIO":[0,0,0,0,417,0,0,0,0,416,0,0,0,0],"FLAG":0,"BASE":18}
+Sonoff                       {"NAME":"Sonoff BN-SZ","GPIO":[0,0,0,0,0,0,0,0,416,320,0,0,0,0],"FLAG":0,"BASE":22}
 Spotlight 9cm RGB+W 7W       {"NAME":"Spotlight RGBW","GPIO":[0,0,0,0,0,0,0,0,0,3008,0,3040,0,0],"FLAG":0,"BASE":27}
-TCP WPAN Square 600X600mm 36W CCT Panel  {"NAME":"TCPsmart LED Panel","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,0],"FLAG":0,"BASE":18}
+TCP WPAN Square 600X600mm 36W CCT Panel  {"NAME":"TCPsmart LED Panel","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,0],"FLAG":0,"BASE":18,"CMND":"SO92 1|DimmerRange 30,100"}
 Teckin FL41                  {"NAME":"Teckin FL41","GPIO":[0,0,0,0,0,32,0,0,0,0,416,0,0,0],"FLAG":0,"BASE":18}
 Wipro Next Smart Batten 20W CCT  {"NAME":"WIPROBatten","GPIO":[0,0,0,0,0,416,0,0,0,449,0,0,0,4704],"FLAG":0,"BASE":18}
 Xiaomi Mi Desk Lamp Pro      {"NAME":"Mi Desk Lamp Pro","GPIO":[6212,0,416,0,417,0,0,0,3840,0,0,0,160,640,608,0,0,0,0,0,0,0,3296,3264,0,0,0,0,0,32,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"DimmerRange 30,100"}
-Yeelight Crystal Pendant     {"NAME":"Yeelight Meteorite","GPIO":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,0,419,0,0,0,0,417,418,0,0,0,0,0,416,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"`SO37 128 | SO92 1"}
+Yeelight Crystal Pendant     {"NAME":"Yeelight Meteorite","GPIO":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,420,0,419,0,0,0,0,417,418,0,0,0,0,0,416,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"SO37 128 | SO92 1"}
 Zemismart Moonlamp           {"NAME":"Zemismart Moonlamp","GPIO":[1,1,1,1,416,419,1,1,417,420,418,1,1,1],"FLAG":0,"BASE":18}
 ```
 
@@ -682,12 +715,16 @@ NEO Coolcam Mouse Trap       {"NAME":"Neo Mouse Trap","GPIO":[1,2272,1,2304,1,1,
 PCI-e Desktop PC Remote Control  {"NAME":"PC-Switch-01","GPIO":[32,0,0,0,0,0,0,0,224,544,0,0,0,0],"FLAG":0,"BASE":18}
 Proscenic T21 Air Fryer      {"NAME":"Proscenic T21","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 RainPoint Indoor Water Pump  {"NAME":"RainPoint","GPIO":[0,0,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 81,107|TuyaMCU 12,109|TuyaMCU 11,1|TuyaMCU 82,104"}
+Sinilink PCIe Computer Remote  {"NAME":"XY-WPCE","GPIO":[1,1,320,1,32,224,0,0,160,0,0,0,0,0],"FLAG":0,"BASE":18,"CMND":"SO114 1 | SwitchMode1 2"}
+Sinilink USB Computer Remote  {"NAME":"XY-WPCL","GPIO":[1,1,320,1,32,224,0,0,160,0,0,0,0,0],"FLAG":0,"BASE":18,"CMND":"SO114 1 | SwitchMode1 2"}
 Xystec USB3.0 4 Port Hub     {"NAME":"Xystec USB Hub","GPIO":[0,0,0,0,224,0,0,0,226,227,225,0,0,0],"FLAG":0,"BASE":18}
 ```
 
 ## Module
 ```
-Ai Thinker ESP-C3-12F ESP-12 Compatible  "Not available"
+Ai-Thinker ESP32-C3          "Not available"
+Ai-Thinker ESP32-C3F ESP-12 Compatible  "Not available"
+Ai-Thinker ESP32-S2F         "Not available"
 DT-Light ESP8285 Lighting    {"NAME":"DMP-L1","GPIO":[1,1,0,1,1,1,0,0,1,1,1,1,1,1],"FLAG":0,"BASE":18}
 ESP-01D                      {"NAME":"ESP-01D","GPIO":[1,1,0,1,1,0,0,0,1,0,1,0,0,0],"FLAG":0,"BASE":18}
 ESP-01M                      "Not available"
@@ -700,7 +737,10 @@ ESP-M2                       {"NAME":"ESP-M2","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,0,
 ESP-M3                       {"NAME":"ESP-M3","GPIO":[1,1,1,1,1,0,0,0,0,1,1,0,1,0],"FLAG":0,"BASE":18}
 ESP-M4                       {"NAME":"ESP-M4","GPIO":[1,1,0,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":18}
 LC Technology PSF-B04 Ewelink 4 Channel Switch  {"NAME":"LC-EWL-B04-MB","GPIO":[1,1,1,1,1,1,0,0,1,288,1,1,0,0],"FLAG":0,"BASE":18}
+M5Stack M5Stamp C3           "Not available"
+M5Stack M5Stamp Pico         {"NAME":"M5Stamp Pico","GPIO":[1,1,0,1,0,0,0,0,0,0,0,0,0,0,1,1,0,1,1,0,0,1,0,1376,0,0,0,0,1,1,0,0,1,0,0,32],"FLAG":0,"BASE":1}
 MTools 16 Channel ESP32 Relay Driver 5V DC  {"NAME":"16ch Board","GPIO":[1,1,237,1,232,1,1,1,228,231,1,1,233,230,234,235,0,238,239,236,0,224,227,226,0,0,0,0,229,225,1,1,1,0,0,1],"FLAG":0,"BASE":1}
+PSF-B Series ESP8285         "Not available"
 Shelly Universal Input/Output  {"NAME":"Shelly Uni","GPIO":[320,0,0,0,225,1216,0,0,192,193,0,224,0,4864],"FLAG":0,"BASE":18}
 Sinilink MODBUS Interface    {"NAME":"XY-WFPOW","GPIO":[0,1,0,1,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
 Wireless Tag ESP32-C3 ESP-12 Compatible  "Not available"
@@ -769,13 +809,14 @@ Konyks Pluviose 16A IP55     {"NAME":"Konyks Pluviose","GPIO":[32,0,0,0,0,0,0,0,
 Koolertron                   {"NAME":"C168 Outdoor","GPIO":[0,32,0,320,2720,2656,0,0,224,2624,225,226,0,0],"FLAG":0,"BASE":18}
 Luminea 2 Outlet             {"NAME":"Luminea","GPIO":[0,0,0,0,225,320,0,0,224,321,32,0,0,1],"FLAG":0,"BASE":18}
 Luminea NX-4458              {"NAME":"Luminea NX4458","GPIO":[32,0,0,0,2688,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":65}
+Master                       {"NAME":"Master_IOT-EXTPLUG","GPIO":[32,1,0,1,1,0,0,0,224,288,0,0,0,0],"FLAG":0,"BASE":1}
 Maxcio EOP03-EU              {"NAME":"Maxcio EOP03-EU","GPIO":[0,0,0,0,225,321,0,0,224,288,32,0,322,0],"FLAG":0,"BASE":18}
 Maxcio SOP02-US              {"NAME":"Maxcio SOP02US","GPIO":[0,0,0,0,0,544,0,0,224,32,225,0,0,1],"FLAG":0,"BASE":18}
 Merkury                      {"NAME":"Merkury Switch","GPIO":[32,0,0,0,0,321,0,0,0,288,224,0,0,0],"FLAG":0,"BASE":18}
 Merkury                      {"NAME":"Merkury Switch","GPIO":[0,0,0,0,32,0,0,0,0,224,0,0,0,0],"FLAG":0,"BASE":18}
 Minoston MP22W               {"NAME":"Minoston MP22W","GPIO":[0,0,0,0,320,0,0,0,224,64,0,0,0,0],"FLAG":0,"BASE":18}
 Nedis PO120 IP44             {"NAME":"WIFIPO120FWT","GPIO":[32,0,0,0,2688,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":49}
-Obi Stecker IP44             {"NAME":"OBI Socket 2","GPIO":[0,0,0,0,224,32,0,0,320,289,0,0,0,0],"FLAG":0,"BASE":61}
+Obi Stecker IP44             {"NAME":"OBI-Outdoor-Socket2","GPIO":[0,0,0,0,224,32,0,0,576,288,1,1,1,1],"FLAG":0,"BASE":18}
 Oittm Outdoor                {"NAME":"Oittm Outdoor","GPIO":[32,0,0,0,0,0,0,0,0,0,320,224,1,0],"FLAG":0,"BASE":18}
 Peteme PS-1602               {"NAME":"Peteme Outdoor","GPIO":[32,0,0,0,0,225,33,0,224,320,0,0,0,0],"FLAG":0,"BASE":18}
 Poweradd                     {"NAME":"POWERADD","GPIO":[0,0,0,0,320,321,0,0,224,32,225,0,0,0],"FLAG":0,"BASE":18}
@@ -802,6 +843,7 @@ Wyze                         {"NAME":"Wyze Plug Outdoor","GPIO":[0,0,0,0,0,576,0
 
 ## Plug
 ```
+1AC 2USB                     {"NAME":"BSD31","GPIO":[0,0,0,0,0,225,0,0,224,32,320,0,0,0],"FLAG":0,"BASE":18}
 2nice SP111                  {"NAME":"2NICE SP111","GPIO":[320,0,321,0,0,0,0,0,0,32,0,224,0,4736],"FLAG":0,"BASE":18}
 2nice UP111                  {"NAME":"2NICE UP111","GPIO":[0,576,0,32,2720,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":18}
 3Stone Mini                  {"NAME":"3Stone Smart Plug","GPIO":[0,32,0,0,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
@@ -840,6 +882,7 @@ Aoycocr X6                   {"NAME":"Aoycocr X6","GPIO":[0,0,320,0,0,0,0,0,0,32
 Aquiv S1                     {"NAME":"Aquiv S1","GPIO":[0,0,544,0,320,0,0,0,224,32,0,0,0,1],"FLAG":0,"BASE":18}
 Arlec 10m Smart Extension Lead  {"NAME":"Arlec Ext Cord","GPIO":[0,32,0,0,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
 Arlec Heavy Duty 20m Extension Lead  {"NAME":"Arlec Ext Cord","GPIO":[0,32,0,0,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
+Arlec Plug In Socket         {"NAME":"PC191HA","GPIO":[0,32,0,0,2720,2656,0,0,2624,224,288,0,0,0],"FLAG":0,"BASE":18}
 Arlec Smart                  {"NAME":"Arlec-PC190HA","GPIO":[0,0,0,0,320,0,0,0,224,576,32,0,0,0],"FLAG":0,"BASE":18}
 Arlec Smart                  {"NAME":"PC399HA","GPIO":[0,0,0,32,2720,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":52}
 Arlec Smart 2.1A USB Charger  {"NAME":"Arlec Single","GPIO":[0,0,0,0,321,0,0,0,224,0,64,0,0,0],"FLAG":0,"BASE":18}
@@ -881,6 +924,7 @@ Bakibo TP22Y                 {"NAME":"Bakibo TP22Y","GPIO":[0,0,0,32,2720,2656,0
 Bardi 16A                    {"NAME":"BARDI","GPIO":[320,0,0,0,0,2720,0,0,224,32,2656,321,2624,0],"FLAG":0,"BASE":18}
 Bauhn ASPU-1019              {"NAME":"Bauhn Smart Pl","GPIO":[0,0,0,0,224,225,0,0,0,320,32,0,0,0],"FLAG":0,"BASE":18}
 BAW                          {"NAME":"BAW TPSWIFI-10","GPIO":[0,0,0,0,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
+Bawoo                        {"NAME":"Bawoo S120","GPIO":[0,0,0,0,288,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 Be HiTech 16A                {"NAME":"Be HiTech","GPIO":[0,0,0,288,0,2720,0,0,2624,32,2656,224,0],"FLAG":0,"BASE":18}
 Bearware 303492 3AC+2USB     {"NAME":"Bearware 30349","GPIO":[0,320,0,32,225,226,0,0,227,224,544,0,0,0],"FLAG":0,"BASE":18}
 Bestek MRJ1011               {"NAME":"BestekMRJ1011","GPIO":[0,0,0,0,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":1}
@@ -952,6 +996,7 @@ Digoo NX-SP202               {"NAME":"Generic_SP202","GPIO":[288,0,0,2624,65,272
 Dilisens NX-SP201 Mini 2 in 1  {"NAME":"NX-SP201","GPIO":[0,0,2624,0,2720,2656,288,224,33,225,32,0,0,0],"FLAG":0,"BASE":18}
 DILISENS SP201               {"NAME":"Dilisens SP201","GPIO":[0,0,2624,0,2688,2656,288,224,33,225,32,0,0,0],"FLAG":0,"BASE":18}
 Dunnes Stores                {"NAME":"SmartLifePlug","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
+Duvik 10A                    {"NAME":"Duvik M008","GPIO":[0,0,0,0,320,320,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 DWFeng AWP02L-N              {"NAME":"AWP02L-N","GPIO":[1,1,320,1,1,1,0,0,1,32,1,224,1,0],"FLAG":0,"BASE":18}
 DWFeng BSD01                 {"NAME":"DWFeng BSD01","GPIO":[1,1,1,1,1,1,1,1,224,32,320,1,1,1],"FLAG":0,"BASE":18}
 ECO Plugs CT-065W            {"NAME":"ECO/CT-065W","GPIO":[0,0,576,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
@@ -971,10 +1016,11 @@ Energeeks 2 USB              {"NAME":"EG-EW005MC","GPIO":[544,1,288,1,1,225,1,1,
 Energizer                    {"NAME":"Energizer EIE3-1001-WHT","GPIO":[32,0,448,0,2688,2656,0,0,2624,450,224,0,449,0],"FLAG":0,"BASE":18}
 Energizer Smart Plug         {"NAME":"Energizer Smart Plug","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
 Epicka                       {"NAME":"Epicka","GPIO":[1,1,1,1,321,320,0,0,224,32,1,1,1,4704],"FLAG":0,"BASE":18}
+Eques Elf Smart Plug         {"NAME":"EQP01WTGY","GPIO":[0,0,0,320,0,0,0,0,96,0,0,224,0,0],"FLAG":0,"BASE":18}
 Esicoo JSM-WF02              {"NAME":"Esicoo Plug","GPIO":[0,32,0,0,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
 Estink C178                  {"NAME":"Estink C178","GPIO":[0,0,0,0,288,321,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
-Etekcity ESW01-USA           {"NAME":"ESW01-USA","GPIO":[0,0,0,0,224,544,0,0,2656,2688,32,2592,288,0],"FLAG":0,"BASE":55}
-Etekcity ESW15-USA           {"NAME":"ESW15-US","GPIO":[0,0,0,0,0,224,0,0,2656,2688,32,2592,288,0],"FLAG":0,"BASE":18}
+Etekcity 15A                 {"NAME":"ESW15-US","GPIO":[0,0,0,0,0,224,0,0,2656,2688,32,2592,288,0],"FLAG":0,"BASE":18}
+Etekcity 8A                  {"NAME":"ESW01-USA","GPIO":[0,0,0,0,224,544,0,0,2656,2688,32,2592,288,0],"FLAG":0,"BASE":55}
 EU3S                         {"NAME":"AWOW BSD33","GPIO":[0,0,320,0,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":18}
 Eva Logik                    {"NAME":"EVA LOGIK Plug","GPIO":[1,32,1,1,1,1,0,0,1,288,224,1,1,0],"FLAG":0,"BASE":18}
 EZPlug V1 OpenSource         {"NAME":"EZPlug V1","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":1}
@@ -985,6 +1031,7 @@ FK-PW901U                    {"NAME":"FK-PW901U","GPIO":[320,1,1,1,1,226,0,0,224
 FLHS-ZN04                    {"NAME":"FLHS-ZN04","GPIO":[321,0,320,0,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":45}
 Fontastic SH01               {"NAME":"Fontastic","GPIO":[1,0,1,0,320,0,0,0,224,32,0,0,0,4704],"FLAG":0,"BASE":18}
 Foreet                       {"NAME":"Foreet_120V","GPIO":[0,0,0,0,224,32,0,0,289,288,0,0,0,0],"FLAG":0,"BASE":18}
+Fox&Summit FS-IP12PK         {"NAME":"Fox & Summit Plug","GPIO":[0,0,32,0,3840,0,0,0,544,256,480,0,0,0],"FLAG":0,"BASE":18,"CMND":"BuzzerPwm 1"}
 FrankEver 15A                {"NAME":"Israel plug","GPIO":[321,0,320,2624,0,2720,0,0,0,32,2656,224,0,0],"FLAG":0,"BASE":45}
 FrankEver 16A                {"NAME":"FrankEver FK-PW801ER","GPIO":[0,0,0,0,288,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 FrankEver Mini               {"NAME":"FK-PW801US","GPIO":[0,0,320,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
@@ -999,12 +1046,14 @@ Geeni Spot Glo               {"NAME":"Geeni Glo","GPIO":[0,0,0,0,320,0,0,0,224,3
 Geeni SWITCH                 {"NAME":"Geeni Switch","GPIO":[0,0,0,0,288,321,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 Geeni Switch Duo             {"NAME":"Geeni Duo","GPIO":[0,0,0,0,33,225,0,0,32,288,224,0,289,0],"FLAG":0,"BASE":18}
 Girier 16A                   {"NAME":"Girier - JR-PM01","GPIO":[0,544,0,2624,2720,2656,0,0,224,32,320,0,0,0],"FLAG":0,"BASE":68}
+Globe 15A                    {"NAME":"Globe 50329","GPIO":[0,0,0,0,320,0,0,0,224,0,32,0,0,0],"FLAG":0,"BASE":18}
 Globe 2 Outlet               {"NAME":"Globe 50020","GPIO":[0,576,0,321,33,32,0,0,224,320,225,0,0,0],"FLAG":0,"BASE":18}
 Globe Smart                  {"NAME":"GlobeSmartPlug","GPIO":[0,0,0,0,320,0,0,0,224,0,32,0,0,0],"FLAG":0,"BASE":18}
 GoldenDot Mini               {"NAME":"GoldenDot Mini","GPIO":[0,32,0,0,0,0,0,0,0,321,224,0,0,0],"FLAG":0,"BASE":52}
 GoldenDot with ADC           {"NAME":"W-US003-Power","GPIO":[320,0,0,0,0,0,0,0,0,32,0,224,0,4896],"FLAG":0,"BASE":18}
 Goliath 16A                  {"NAME":"GOLIATH AV-SSTE01","GPIO":[0,0,320,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
 Gosund                       {"NAME":"Gosund EP2","GPIO":[320,1,576,1,2656,2720,0,0,2624,32,0,224,0,0],"FLAG":0,"BASE":45}
+Gosund                       {"NAME":"SHP5","GPIO":[321,3072,320,3104,1,225,0,0,1,1,224,1,32,0],"FLAG":0,"BASE":18}
 Gosund 13A                   {"NAME":"Gosund UP111","GPIO":[0,320,0,32,2720,2656,0,0,2624,576,224,0,0,0],"FLAG":0,"BASE":18}
 Gosund 2 in 1                {"NAME":"Gosund WP212","GPIO":[321,288,544,0,224,2720,0,0,2624,32,2656,225,33,0],"FLAG":0,"BASE":18}
 Gosund Dual                  {"NAME":"Gosund SP211","GPIO":[33,576,320,2624,2720,2656,0,0,32,321,224,0,225,0],"FLAG":0,"BASE":18}
@@ -1012,10 +1061,9 @@ Gosund SP1                   {"NAME":"Gosund SP1 v23","GPIO":[0,321,0,32,2720,26
 Gosund SP111                 {"NAME":"Gosund SP111","GPIO":[320,0,321,0,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":18}
 Gosund SP111 v1.1            {"NAME":"Gosund SP111 v1.1","GPIO":[320,0,576,0,2656,2720,0,0,2624,32,0,224,0,0],"FLAG":0,"BASE":45}
 Gosund SP111 v1.4            {"NAME":"Gosund SP111 v1.4","GPIO":[321,1,320,1,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":45}
-Gosund SP112                 {"NAME":"SHP5","GPIO":[321,3072,320,3104,1,225,0,0,1,1,224,1,32,0],"FLAG":0,"BASE":18}
 Gosund SP112                 {"NAME":"Gosund 112v3.4","GPIO":[320,0,321,0,2656,2720,0,0,2624,257,224,0,0,4800],"FLAG":0,"BASE":18}
 Gosund WP1                   {"NAME":"Gosund WP1-1","GPIO":[0,0,320,0,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":45}
-Gosund WP2                   {"NAME":"Gosund WP2","GPIO":[32,576,321,0,33,0,0,0,225,320,224,0,0,0],"FLAG":0,"BASE":18}
+Gosund WP2                   {"NAME":"Gosund WP2 Plug","GPIO":[33,0,320,0,321,32,0,0,224,576,225,0,0,0],"FLAG":0,"BASE":18}
 Gosund WP211                 {"NAME":"Gosund wp211","GPIO":[0,0,0,0,224,0,0,0,0,32,0,225,33,0],"FLAG":0,"BASE":18}
 Gosund WP212                 {"NAME":"Gosund_WP212","GPIO":[32,544,321,0,33,0,0,0,225,320,224,0,0,0],"FLAG":0,"BASE":18}
 Gosund WP3                   {"NAME":"Gosund WP3 v2","GPIO":[320,0,321,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
@@ -1051,10 +1099,10 @@ Hyleton 313                  {"NAME":"Hyleton 313","GPIO":[321,0,320,0,0,0,0,0,0
 Hyleton 314                  {"NAME":"hyleton-314","GPIO":[321,0,320,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
 Hyleton 315                  {"NAME":"hyleton-315","GPIO":[0,0,0,0,321,320,0,0,224,64,0,0,0,0],"FLAG":0,"BASE":18}
 Hyleton 317                  {"NAME":"hyleton-317","GPIO":[320,0,321,0,322,0,0,0,0,64,0,224,0,0],"FLAG":0,"BASE":18}
-Hyleton HLT-311              {"NAME":"HLT-311","GPIO":[320,0,0,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
+Hyleton HLT-311              {"NAME":"HLT-311","GPIO":[544,0,320,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
 iClever IC-BS08              {"NAME":"iClever BS08","GPIO":[0,0,0,0,544,320,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 iDIGITAL                     {"NAME":"Brilliant","GPIO":[0,0,0,0,288,0,0,0,224,64,0,0,0,0],"FLAG":0,"BASE":18}
-Ihommate 16A                 {"NAME":"ZCH-02","GPIO":[0,0,0,32,2688,2656,0,0,2592,320,224,0,0,4704],"FLAG":0,"BASE":18}
+Ihommate 16A                 {"NAME":"ZCH-02","GPIO":[0,0,0,32,2688,2656,0,0,2624,320,224,0,0,4704],"FLAG":0,"BASE":18}
 Infray 16A                   {"NAME":"AWP08L","GPIO":[32,0,288,0,0,0,0,0,0,0,0,224,0,4704],"FLAG":0,"BASE":18}
 Insmart WP5                  {"NAME":"INSMART","GPIO":[0,0,448,0,0,0,0,0,0,160,0,224,0,0],"FLAG":0,"BASE":18}
 iSwitch                      {"NAME":"Smart Plug XSA","GPIO":[1,32,1,1,1,1,0,0,1,320,224,1,1,0],"FLAG":0,"BASE":18}
@@ -1102,6 +1150,7 @@ Koogeek W-UKX                {"NAME":"Koogeek W-UKX","GPIO":[0,32,1,1,1,0,0,0,0,
 KULED K63                    {"NAME":"KULED K63","GPIO":[0,0,0,0,224,32,0,0,320,0,0,0,0,0],"FLAG":0,"BASE":18}
 Laduo YX-DE01                {"NAME":"YX-DE01","GPIO":[1,32,1,1,1,1,0,0,1,320,224,1,1,0],"FLAG":0,"BASE":18}
 LE LampUX Smart Socket       {"NAME":"LE LampUX","GPIO":[0,0,0,0,0,320,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
+Ledvance Smart+              {"NAME":"Ledvance Plug","GPIO":[0,0,0,320,2688,2656,0,0,224,32,2624,0,0,0],"FLAG":0,"BASE":18}
 Lenovo SE-341A               {"NAME":"Lenovo SE-341A","GPIO":[0,0,0,0,32,224,0,0,576,0,320,0,0,0],"FLAG":0,"BASE":18}
 LESHP KS-501                 {"NAME":"LESHP KS-501","GPIO":[32,0,0,0,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":1}
 Lighting Arena               {"NAME":"Lighting Arena Smart Plug","GPIO":[0,0,320,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
@@ -1113,6 +1162,7 @@ Lohas Nightlight + USB       {"NAME":"Lohas LED Mini Plug","GPIO":[0,321,0,288,3
 Lonsonho 10A Type E          {"NAME":"Lonsonho10ALed","GPIO":[0,0,0,0,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 LoraTap SP400W-IT            {"NAME":"LoraTap SP400W","GPIO":[0,0,0,0,544,320,0,0,224,32,0,0,0,1],"FLAG":0,"BASE":18}
 LSC Power                    {"NAME":"LSC Smart Plug","GPIO":[0,0,0,0,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
+LSC Smart Connect            {"NAME":"LSC Smart Plug FR","GPIO":[0,0,0,0,320,0,0,0,224,0,32,0,0,0],"FLAG":0,"BASE":18}
 Lumiman LM650                {"NAME":"Lumiman LM650","GPIO":[0,0,0,0,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 Luminea NX-4491              {"NAME":"Luminea NX-449","GPIO":[320,0,576,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
 Luminea NX-4541              {"NAME":"NX-4451","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":55}
@@ -1134,9 +1184,11 @@ Merkury MI-WW101-199         {"NAME":"merkury WW101","GPIO":[0,0,0,0,0,0,0,0,320
 Merkury MI-WW102-199L        {"NAME":"MIC-WW102","GPIO":[32,0,0,0,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":36}
 Merkury MI-WW105-199W        {"NAME":"Merkury Switch","GPIO":[1,1,1,1,576,320,0,0,224,32,1,1,1,4704],"FLAG":0,"BASE":18}
 Mini                         {"NAME":"MiniSmartSocket_S03","GPIO":[0,0,0,0,320,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
+Mini Smart                   {"NAME":"W-US002S","GPIO":[0,32,0,0,2720,0,0,0,0,288,224,0,0,0],"FLAG":0,"BASE":45}
 Minleaf W-DEXI               {"NAME":"W-DEXI","GPIO":[0,32,0,0,2720,2656,0,0,2624,288,224,0,0,0],"FLAG":0,"BASE":18}
 Mirabella Genio              {"NAME":"GenioGpo","GPIO":[0,0,0,32,2720,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":18}
 Mirabella Genio 1002341      {"NAME":"Genio 1","GPIO":[0,0,320,0,0,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":1}
+Mirabella Genio Double Plug with USB Ports  {"NAME":"Genio I002932","GPIO":[0,320,1,32,0,0,0,0,224,0,225,0,0,0],"FLAG":0,"BASE":18}
 Mirabella Genio USB          {"NAME":"Mirabella Genio 1002826","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":1}
 Mirabella Genio USB Port     {"NAME":"Genio I002341","GPIO":[0,0,0,0,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":1}
 Mistral                      {"NAME":"Mistral Smart ","GPIO":[320,0,0,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
@@ -1158,6 +1210,7 @@ NEO Coolcam NAS-WR01W        {"NAME":"NAS-WR01W","GPIO":[0,0,0,0,288,0,0,0,224,3
 NEO Coolcam NAS-WR01W 16A    {"NAME":"Neo Coolcam 16","GPIO":[32,0,0,0,2720,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":49}
 Nestler-matho                {"NAME":"N-m 485-1","GPIO":[0,0,0,32,2688,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":18}
 NETVIP XS-SSA01              {"NAME":"XS-SSA01","GPIO":[0,0,0,0,0,0,0,0,320,32,0,224,0,0],"FLAG":0,"BASE":18}
+Nexxt Surge Protector 220V Chile  {"NAME":"Nexxt Smart Plug","GPIO":[0,0,0,0,320,1,0,0,32,544,224,0,0,0],"FLAG":0,"BASE":18}
 NGS Loop Track 16A           {"NAME":"LOOP","GPIO":[0,0,320,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
 Nightlight and AC Outlet     {"NAME":"SWN03","GPIO":[32,0,0,0,0,0,1,1,416,0,0,224,0,0],"FLAG":0,"BASE":18}
 Nishica SM-PW701I            {"NAME":"SM-PW701I","GPIO":[1,1,1,1,1,1,1,1,224,288,32,1,1,1],"FLAG":0,"BASE":18}
@@ -1215,12 +1268,12 @@ SilentNight                  {"NAME":"SilentNightPlug","GPIO":[0,0,0,0,288,0,0,0
 Silvergear Slimme Stekker    {"NAME":"Silvergear SmartHomePlug","GPIO":[0,0,0,96,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
 SimpleHome                   {"NAME":"SimpleHome","GPIO":[289,0,0,0,0,0,0,0,224,320,32,0,0,0],"FLAG":0,"BASE":1}
 SimpleHome 2 USB             {"NAME":"SimpleHome","GPIO":[289,0,0,0,2656,2624,0,0,224,2688,32,0,0,0],"FLAG":0,"BASE":1}
+Slitinto Mini 2 in 1         {"NAME":"slitinto NX-SP201","GPIO":[0,0,0,2624,32,2720,0,0,224,33,2656,225,0,0],"FLAG":0,"BASE":18}
 Slitinto NX-SM110            {"NAME":"Slitinto SM110","GPIO":[0,0,320,0,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":45}
 Slitinto NX-SM112            {"NAME":"NX-SM112","GPIO":[576,0,0,2624,0,2720,0,0,0,32,2656,224,0,0],"FLAG":0,"BASE":45}
 Slitinto NX-SM112 v2         {"NAME":"Slitinto NX SM","GPIO":[320,1,576,1,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":45}
 Slitinto NX-SM200            {"NAME":"NX-SM200","GPIO":[0,0,0,32,2720,2656,0,0,0,288,224,2592,0,0],"FLAG":0,"BASE":45}
 Slitinto NX-SM2001           {"NAME":"NX-SM2001","GPIO":[0,0,0,32,2720,2656,0,0,2624,288,224,0,0,0],"FLAG":0,"BASE":45}
-Slitinto NX-SP201 Mini 2 in 1  {"NAME":"Slitinto Dual ","GPIO":[576,0,0,2624,64,2720,0,0,224,65,2656,225,0,0],"FLAG":0,"BASE":18}
 Slitinto NX-SP202            {"NAME":"Slitinto SP202","GPIO":[32,0,0,0,2720,2656,0,0,2624,288,225,224,65,0],"FLAG":0,"BASE":64}
 SM-PW701K                    {"NAME":"SM-PW701K","GPIO":[0,0,0,0,288,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 Smaho                        {"NAME":"SMAHO WiFi P.","GPIO":[32,0,0,0,2720,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":18}
@@ -1248,7 +1301,7 @@ STITCH                       {"NAME":"Stitch 27937","GPIO":[32,0,320,0,2688,2656
 STITCH                       {"NAME":"Stitch 35511","GPIO":[320,0,321,0,0,2688,0,0,0,32,2656,224,2624,0],"FLAG":0,"BASE":18}
 STITCH 15A In-Line           {"NAME":"Stitch 39047","GPIO":[0,288,0,32,2688,2656,0,0,2624,0,224,0,0,0],"FLAG":0,"BASE":18}
 STITCH Mini 10A              {"NAME":"STITCH 41730","GPIO":[0,0,320,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
-SuperNight Dual              {"NAME":"SuperNight Dua","GPIO":[1,32,1,224,2656,2688,0,0,225,2592,322,1,1,4704],"FLAG":0,"BASE":18}
+SuperNight Dual              {"NAME":"SUPERNIGHT","GPIO":[0,32,0,224,2656,2688,0,0,225,2624,576,0,0,4833],"FLAG":0,"BASE":18}
 SWA1                         {"NAME":"SWA1","GPIO":[0,0,0,0,288,224,0,0,0,32,0,0,0,0],"FLAG":0,"BASE":18}
 SWA1 FR                      {"NAME":"SWA1","GPIO":[0,0,0,0,288,224,0,0,0,32,0,0,0,0],"FLAG":0,"BASE":18}
 SWA1 UK                      {"NAME":"SWA1","GPIO":[0,0,0,0,288,224,0,0,0,32,0,0,0,0],"FLAG":0,"BASE":18}
@@ -1289,6 +1342,7 @@ TP20                         {"NAME":"TP20","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0
 TP24                         {"NAME":"TP24","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
 Treatlife Dimmable           {"NAME":"DP20","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 21,2 | SO20 1 | SO54 1"}
 U10 Series                   {"NAME":"WIFI-Socket","GPIO":[1,32,1,1,1,1,1,1,1,320,224,1,1,4704],"FLAG":0,"BASE":18}
+UltraBrite                   {"NAME":"UltraBrite Smart Plug","GPIO":[1,1,1,1,288,289,1,1,224,32,1,1,1,1],"FLAG":0,"BASE":18}
 Ultralink UL-P01W            {"NAME":"UL-P01W","GPIO":[0,288,0,32,2720,2656,0,0,2624,544,224,0,0,0],"FLAG":0,"BASE":18}
 Upstone                      {"NAME":"UPSTONE","GPIO":[1,1,544,1,320,1,0,0,224,32,1,1,1,1],"FLAG":0,"BASE":18}
 US212                        {"NAME":"US212","GPIO":[320,0,0,2624,0,2720,0,0,224,32,2656,225,0,0],"FLAG":0,"BASE":18}
@@ -1309,8 +1363,9 @@ WAZA JH-G01E 10A             {"NAME":"Waza JH-G01E","GPIO":[0,0,0,0,288,0,0,0,22
 Waza JH-G01E 16A             {"NAME":"Waza JH-G01E 2","GPIO":[0,0,0,0,0,0,0,0,32,288,224,0,0,4704],"FLAG":0,"BASE":18}
 Wily Electronics             {"NAME":"VC Plug","GPIO":[544,0,0,0,0,2720,0,0,2624,32,2656,224,0,0],"FLAG":0,"BASE":45}
 WiOn                         {"NAME":"WiOn","GPIO":[1,0,288,0,0,0,0,0,1,32,0,224,0,0],"FLAG":0,"BASE":17}
+WiOn Single Outlet           {"NAME":"WiOn 50050","GPIO":[0,0,576,0,0,0,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":18}
 Wipro 16A                    {"NAME":"Wip-DSP1160","GPIO":[0,0,0,32,2720,2656,0,0,2624,576,224,0,0,0],"FLAG":0,"BASE":52}
-Wisdom ZY_ACU02              {"NAME":"ZY-ACU02","GPIO":[0,0,0,544,225,224,0,0,320,32,321,0,0,0],"FLAG":0,"BASE":18}
+Wisdom Dual                  {"NAME":"ZY-ACU02","GPIO":[0,0,0,544,225,224,0,0,320,32,321,0,0,0],"FLAG":0,"BASE":18}
 WL-SC01                      {"NAME":"WL-SC01","GPIO":[0,0,0,0,320,0,0,0,224,0,32,0,0,0],"FLAG":0,"BASE":1}
 WOOX R4026                   {"NAME":"WOOX R4026","GPIO":[0,0,0,32,0,0,0,0,0,320,224,0,0,0],"FLAG":0,"BASE":18}
 WOOX R4785                   {"NAME":"WOOXR4785","GPIO":[0,0,0,0,288,224,0,0,0,32,0,0,0,0],"FLAG":0,"BASE":18}
@@ -1329,14 +1384,14 @@ XS-A14                       {"NAME":"NETVIP XS-A14","GPIO":[416,0,417,0,0,32,0,
 XS-A17                       {"NAME":"XS-A18","GPIO":[416,0,417,0,0,418,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":45}
 XS-A18                       {"NAME":"XS-A18","GPIO":[416,0,417,0,0,418,0,0,0,32,0,224,0,0],"FLAG":0,"BASE":45}
 XS-A23                       {"NAME":"XS-A23","GPIO":[320,1,0,2624,32,2720,0,0,0,33,2656,224,225,0],"FLAG":0,"BASE":45}
-XS-SSA01                     {"NAME":"XS-SSA01","GPIO":[0,32,0,0,0,0,0,0,320,160,0,224,0,0],"FLAG":0,"BASE":18}
+XS-SSA01                     {"NAME":"XS-SSA01","GPIO":[1,0,0,1,0,0,0,0,320,32,1,224,1,0],"FLAG":0,"BASE":18}
 XS-SSA01 v2                  {"NAME":"XS-SSA01","GPIO":[1,32,1,1,1,1,0,0,320,1,1,224,1,0],"FLAG":0,"BASE":18}
 XS-SSA05                     {"NAME":"XS-SSA05","GPIO":[257,1,1,2624,1,2688,0,0,224,32,2656,258,1,4704],"FLAG":0,"BASE":18}
 XS-SSA06                     {"NAME":"XS-SSA06","GPIO":[416,0,417,0,0,418,0,0,0,64,0,224,0,0],"FLAG":0,"BASE":18}
 Yagala SWA9                  {"NAME":"SWA9","GPIO":[0,0,0,0,288,224,0,0,0,32,0,0,0,0],"FLAG":0,"BASE":18}
 Yelomin JH-G01E              {"NAME":"Yelomin","GPIO":[0,3072,0,3104,0,0,0,0,32,320,224,0,0,0],"FLAG":0,"BASE":18}
 YERON US101                  {"NAME":"YERON_US101","GPIO":[1,1,1,32,2688,2656,0,0,2624,320,224,1,1,0],"FLAG":0,"BASE":18}
-YM-WS-1 Mini                 {"NAME":"YM-WS1","GPIO":[0,0,0,0,0,0,0,0,320,32,0,224,0,0],"FLAG":0,"BASE":18}
+YM-WS-1 Mini                 {"NAME":"YM-WS-1-ALT","GPIO":[32,33,34,35,0,0,0,0,0,288,224,0,0,0],"FLAG":0,"BASE":18}
 YM-WS-3 16A                  {"NAME":"YM-WS-3","GPIO":[0,32,0,0,0,0,0,0,0,288,224,0,576,4704],"FLAG":0,"BASE":18}
 YT-E002                      {"NAME":"YT-E002","GPIO":[576,0,0,0,33,0,0,0,225,32,0,224,0,0],"FLAG":0,"BASE":18}
 YT-E003                      {"NAME":"YT-E003-SP202","GPIO":[32,0,0,0,2720,2656,0,0,2624,288,225,224,65,0],"FLAG":0,"BASE":64}
@@ -1360,6 +1415,7 @@ AHRise 4+4AC+4USB            {"NAME":"AHRise-083","GPIO":[0,0,0,0,320,32,0,0,225
 AHRise AHR-085               {"NAME":"AHRise AHR-085","GPIO":[0,0,0,0,32,320,0,0,225,226,224,0,0,0],"FLAG":0,"BASE":18}
 Aicliv 4AC 3USB              {"NAME":"Aicliv WiFi","GPIO":[0,0,0,227,226,576,0,0,224,32,225,0,0,0],"FLAG":0,"BASE":18}
 Ailink 4AC 4USB              {"NAME":"Ailink","GPIO":[288,321,0,289,256,32,0,0,258,257,259,0,228,0],"FLAG":0,"BASE":4}
+Anhaorui 6+6AC 4USB          {"NAME":"Anhaorui ZN-709","GPIO":[320,0,0,160,224,225,0,0,228,229,227,226,0,0],"FLAG":0,"BASE":18,"CMND":"SwitchMode1 5|SO32 10"}
 Anncoe 4AC 4USB              {"NAME":"P-EU4U4S","GPIO":[288,0,0,0,226,227,0,0,0,0,225,224,0,0],"FLAG":0,"BASE":18}
 Annhome 3AC + 2USB           {"NAME":"1200W WiFi SPS","GPIO":[259,0,0,0,321,288,0,0,224,32,225,226,260,0],"FLAG":0,"BASE":18}
 AOFO 3AC+4USB                {"NAME":"AOFO","GPIO":[0,320,0,32,225,224,0,0,0,226,227,0,0,4704],"FLAG":0,"BASE":18}
@@ -1389,8 +1445,9 @@ Geeni Surge + Charge 2 USB   {"NAME":"Geeni GN-SW023","GPIO":[288,0,0,0,225,224,
 Geeni SURGE 6-Outlet Surge Protector  {"NAME":"Geeni 6 Strip","GPIO":[320,0,0,0,225,224,0,0,227,228,226,229,32,0],"FLAG":0,"BASE":18}
 Geeni Surge Mini             {"NAME":"Geeni-GN-SW004","GPIO":[320,0,0,32,0,0,0,0,225,224,226,0,0,1],"FLAG":0,"BASE":18}
 Globe 4 Outlet 2 USB         {"NAME":"PowerBar","GPIO":[320,0,0,0,227,32,0,0,225,226,224,0,0,1],"FLAG":0,"BASE":18}
+Gosund 3+3AC 3USB            {"NAME":"Gosund-PM03-T","GPIO":[0,0,576,0,0,259,0,0,224,225,226,0,32,0],"FLAG":0,"BASE":18}
 Gosund P1                    {"NAME":"Gosund_P1","GPIO":[0,3072,544,3104,0,259,0,0,225,226,224,0,32,4704],"FLAG":0,"BASE":18}
-Gosund P2                    {"NAME":"Gosund P2","GPIO":[0,0,544,0,0,259,0,0,224,225,226,0,32,0],"FLAG":0,"BASE":18}
+Gosund P2                    {"NAME":"Gosund-PM03-v2","GPIO":[0,0,576,0,0,0,0,0,224,225,226,259,32,0],"FLAG":0,"BASE":18}
 Gosund WP9                   {"NAME":"Gosund WP9","GPIO":[320,291,290,289,0,224,0,0,226,227,225,0,32,0],"FLAG":0,"BASE":18}
 Hama 4AC 4USB                {"NAME":"HamaStrip","GPIO":[0,544,0,32,225,224,0,0,226,227,228,0,0,0],"FLAG":0,"BASE":18}
 Heyvalue 3AC+3USB            {"NAME":"HeyvalueHLT-330","GPIO":[288,0,289,0,227,256,0,0,257,35,258,0,0,0],"FLAG":0,"BASE":18}
@@ -1430,6 +1487,7 @@ POWSAV 5+5AC 4USB            {"NAME":"POWSAV 5+5AC+4USB","GPIO":[320,0,0,32,224,
 Prokord 4AC 4USB             {"NAME":"PSH-WT003-EU","GPIO":[0,320,0,32,226,227,0,0,225,224,260,0,0,0],"FLAG":0,"BASE":18}
 S2199EU                      {"NAME":"S2199EU","GPIO":[0,32,0,288,226,228,0,0,224,227,225,0,0,4704],"FLAG":0,"BASE":18}
 SA-P402A                     {"NAME":"SA-P402A","GPIO":[0,32,0,320,226,228,224,227,225,0,0,0,0,4704],"FLAG":0,"BASE":18}
+Smart Tech 4AC 4USB          {"NAME":"ST-T-SPS1","GPIO":[0,576,320,0,228,225,0,0,227,32,226,224,0,0],"FLAG":0,"BASE":18}
 STITCH 4 AC, 2 Always-On USB  {"NAME":"MP Stitch 34082","GPIO":[320,0,0,0,227,32,0,0,225,226,224,0,0,0],"FLAG":0,"BASE":18}
 Surge Protector 3AC 2USB     {"NAME":"C158","GPIO":[260,0,0,0,261,230,0,0,224,0,225,226,259,0],"FLAG":0,"BASE":18}
 SWB1                         {"NAME":"SWB1","GPIO":[288,0,0,0,0,227,0,0,224,32,225,226,0,0],"FLAG":0,"BASE":18}
@@ -1468,7 +1526,7 @@ ZLD64-EU-W                   {"NAME":"ZLD64-EU-W","GPIO":[0,320,0,32,225,224,0,0
 
 ## RF Gateway
 ```
-Sonoff RF Gateway 433        {"NAME":"Sonoff Bridge","GPIO":[32,3200,1,3232,1,1,0,0,1,320,1,0,0,0],"FLAG":0,"BASE":25}
+Sonoff RF Bridge 433         {"NAME":"Sonoff Bridge","GPIO":[32,3200,1,3232,1,1,0,0,1,320,1,0,0,0],"FLAG":0,"BASE":25}
 ```
 
 ## RGB
@@ -1495,9 +1553,10 @@ Aoycocr JL81 5W 400lm        {"NAME":"AoycocrJLB1","GPIO":[0,0,0,0,418,0,0,0,417
 Aoycocr Q10CWM BR30 9W 720lm  {"NAME":"AoycocrBR30","GPIO":[0,0,0,0,0,418,0,0,417,0,416,419,0,0],"FLAG":0,"BASE":18}
 Arlec Smart 9.5W 806lm       {"NAME":"Arlec RGBWW","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Arlec Smart 9.5W 806lm       {"NAME":"Arlec RGBWW","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
-Athom 15W 1400lm             {"NAME":"Athom LB017W","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":1,"CMND":"SO92 1 | DimmerRange 24,100"}
+Athom 12W 1000lm             {"NAME":"LB03-12W-E27-TAS","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":18,"CMND":"SO92 1 | DimmerRange 24,100"}
+Athom 15W 1400lm             {"NAME":"LB01-15W-E27-TAS","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":18,"CMND":"SO92 1 | DimmerRange 24 100"}
 Athom 4.5W 700lm             {"NAME":"Athom LB10-5W-TAS","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":18}
-Athom 7W 600lm               {"NAME":"Athom LB017W","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":1}
+Athom 7W 600lm               {"NAME":"LB01-7W-E27-TAS","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Aunics 7W 600lm              {"NAME":"Aunics RGBW","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Avatar 8W 800lm              {"NAME":"Avatar 8W RGBCW","GPIO":[1,1,1,1,416,419,1,1,417,420,418,1,1,1],"FLAG":0,"BASE":18}
 Avatar ALB201W 720lm         {"NAME":"AVATAR ALB201W","GPIO":[0,0,0,0,0,418,0,0,417,0,416,419,0,0],"FLAG":0,"BASE":18}
@@ -1509,7 +1568,7 @@ Bardi 9W 900lm               {"NAME":"Bardi 9W RGBWW","GPIO":[0,0,0,0,417,416,0,
 BAZZ BR30 650lm              {"NAME":"BAZZrgb","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Beghelli dom-E 14W 1400lm    {"NAME":"Beghelli Smart Bulb","GPIO":[0,0,0,0,416,417,0,0,418,419,420,0,0,0],"FLAG":3,"BASE":18,"CMND":"SO37 13"}
 BlitzWolf w/ remote 850lm    {"NAME":"BW-LT27","GPIO":[0,0,0,0,420,417,0,0,418,1088,419,416,0,0],"FLAG":0,"BASE":18}
-BNETA 8.5W 800lm             {"NAME":"BNETA IO-WIFI60-E27P","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":18}
+BNETA 8.5W 800lm             {"NAME":"BNETA IO-WIFI60-E27P","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":48}
 BNETA 8.5W 800lm             {"NAME":"OM60/RGBW","GPIO":[0,0,0,0,2912,416,0,0,417,2976,2944,0,0,0],"FLAG":0,"BASE":18}
 Bomcosy 600lm                {"NAME":"Generic","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,4704],"FLAG":0,"BASE":18}
 Boxlood 9W 900lm             {"NAME":"Boxlood 9w 900lm RGBCCT","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
@@ -1517,6 +1576,7 @@ Calex 429004 A60 806lm       {"NAME":"Calex E27 RGB ","GPIO":[0,0,0,0,416,419,0,
 Calex 429008 B35 5W 470lm    {"NAME":"Calex E14 RGBW","GPIO":[0,0,0,0,0,0,0,0,4064,0,4032,0,0,0],"FLAG":0,"BASE":18}
 Calex 5W 350lm Reflector     {"NAME":"Calex RGBW","GPIO":[0,0,0,0,0,0,0,0,4064,0,4032,0,0,0],"FLAG":0,"BASE":18}
 Candle 5W 450lm              {"NAME":"Candela","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
+Cleverio 400lm 5.5W          {"NAME":"Cleverio 51573","GPIO":[0,0,0,0,0,0,0,0,4064,0,4032,0,0,0],"FLAG":0,"BASE":18}
 Cleverio 51395 806lm         {"NAME":"CleverioE27RGB","GPIO":[0,0,0,0,2944,2912,0,0,417,2976,416,0,0,0],"FLAG":0,"BASE":18}
 CMARS 4W Reflector           {"NAME":"RGBWW GU10","GPIO":[0,0,0,0,419,420,0,0,417,418,416,0,0,1],"FLAG":0,"BASE":18}
 Connect SmartHome 5W GU5.3   {"NAME":"CSH-GU53RGB5W","GPIO":[0,0,0,0,419,420,0,0,417,418,416,0,0,0],"FLAG":0,"BASE":18}
@@ -1572,6 +1632,7 @@ Legelite 5W Candle           {"NAME":"Legelite E12","GPIO":[0,0,0,0,416,419,0,0,
 Legelite A60 7W              {"NAME":"Legelite A60 7","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Legelite A60 7W 600lm        {"NAME":"Legelite E26","GPIO":[0,0,0,0,416,419,0,0,417,420,418,0,0,0],"FLAG":0,"BASE":18}
 Lenovo 800lm                 {"NAME":"Lenovo SE-241EB","GPIO":[0,0,0,0,416,419,0,0,417,452,418,0,0,0],"FLAG":0,"BASE":18}
+Lloyd's 5W 400Lm             {"NAME":"LLOYDS LC-1271","GPIO":[160,0,0,0,0,0,0,0,4064,0,4032,0,0,0],"FLAG":0,"BASE":18}
 Lohas ZN004 8W 680lm         {"NAME":"Lohas B22 R63","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
 Lohas ZN011 5W 420lm         {"NAME":"LohasZN011","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
 Lohas ZN014-2 5W 380lm       {"NAME":"Lohas ZN014-2","GPIO":[0,0,0,0,417,416,0,0,420,418,419,0,0,0],"FLAG":0,"BASE":18}
@@ -1829,11 +1890,14 @@ Zilotek A19 800lm            {"NAME":"Zilotek RGBW","GPIO":[0,0,0,0,2912,416,0,0
 
 ## Relay Board
 ```
+2 Channel Tuya               {"NAME":"TY-DIY-S02","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1 | TuyaMCU 12,2 | TuyaMCU 13,13 | TuyaMCU 1,101"}
 Anmbest 2 Channel Inching Self-locking Switch Module  {"NAME":"Generic","GPIO":[32,1,1,1,1,225,33,0,224,320,0,0,0,0],"FLAG":0,"BASE":1}
+Aptinex IOT RelayNode 4 Channel  {"NAME":"APTINEX","GPIO":[0,0,1,0,0,0,0,0,224,225,226,227,0,0],"FLAG":0,"BASE":18}
 Armtronix Quad               {"NAME":"Armtronix Wifi Four Relay Board","GPIO":[1,0,0,0,224,1,0,0,225,226,227,0,1,0],"FLAG":0,"BASE":7}
 Athom 1Ch Inching/Self-locking  {"NAME":"Athom R01","GPIO":[1,1,1,1,1,224,1,1,1,1,1,1,576,0],"FLAG":0,"BASE":18}
 Athom 8Ch Inching/Self-locking 10A  {"NAME":"Athom R08","GPIO":[229,1,1,1,230,231,1,1,226,227,225,228,224,0],"FLAG":0,"BASE":18}
 Claudy 5V                    {"NAME":"CLAUDY","GPIO":[0,0,225,0,0,0,0,0,0,0,0,224,0,0],"FLAG":0,"BASE":18}
+Devantech 8x16A              {"NAME":"ESP32LR88","GPIO":[0,0,231,0,32,35,0,0,229,230,228,0,33,34,36,37,0,38,39,544,0,225,226,227,0,0,0,0,0,224,3232,3200,0,0,0,0],"FLAG":0,"BASE":1}
 DoHome HomeKit DIY Switch    {"NAME":"DoHome DIY","GPIO":[1,1,0,1,1,544,0,0,224,0,0,0,0,0],"FLAG":0,"BASE":1}
 Eachen ST-DC2                {"NAME":"Garage Control","GPIO":[162,0,0,0,226,225,33,0,224,288,163,227,0,4704],"FLAG":0,"BASE":18}
 Eachen ST-DC4                {"NAME":"Eachen_ST-DC4","GPIO":[160,1,1,1,226,225,1,1,224,544,1,227,1,0],"FLAG":0,"BASE":54}
@@ -1847,11 +1911,12 @@ ESP-12F 5V/7-28V 4 Channel 30A  {"NAME":"ESP12F_Relay_30A_X4","GPIO":[1,1,1,1,32
 ESP-12F 5V/7-28V 8 Channel   {"NAME":"ESP12F_Relay_X8","GPIO":[229,1,1,1,230,231,0,0,226,227,225,228,224,1],"FLAG":0,"BASE":18}
 ESP-12F 5V/7-30V/220V 4 Channel  {"NAME":"ESP12F_Relay_X4","GPIO":[1,1,320,1,1,321,1,1,226,227,225,1,224,1],"FLAG":0,"BASE":18}
 ESP-12F 5V/8-80V 2 Channel   {"NAME":"LC-Relay-ESP12-2R-D8","GPIO":[1,1,1,1,224,225,1,1,1,1,1,1,1,1],"FLAG":0,"BASE":18}
-ESP32 4 Channel              {"NAME":"RobotDyn ESP32R4","GPIO":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,224,225,1,227,226,32,33,34,35],"FLAG":0,"BASE":1}
+ESP32 4 Channel              {"NAME":"RobotDyn ESP32R4","GPIO":[0,0,1,0,1,1,0,0,1,1,1,1,1,1,1,1,0,0,0,1,0,224,225,0,0,0,0,0,227,226,32,33,34,0,0,35],"FLAG":0,"BASE":2}
 eWeLink PSF-B04 5V 7-32V 4 Channel  {"NAME":"eWeLink 4CH","GPIO":[160,0,0,0,226,225,161,162,224,288,163,227,0,0],"FLAG":0,"BASE":18}
 Geekcreit 5V DIY 4 Channel Jog Inching Self-Locking  {"NAME":"Geekcreit-4ch","GPIO":[160,0,0,0,226,225,161,162,224,288,163,227,0,0],"FLAG":0,"BASE":18}
 Geekcreit Module 220V 10A    {"NAME":"DIY ESP8266 Re","GPIO":[0,0,544,0,224,32,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
 HW-622 ESP8266               {"NAME":"HW-622","GPIO":[0,0,544,0,224,32,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
+Kincony 8 Channel            {"NAME":"KC868-A8","GPIO":[32,0,1120,0,640,608,0,0,0,1,1,1152,0,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,1],"FLAG":0,"BASE":1,"CMND":"EthClockMode 3 | EthAddress 0 | EthType 0 | I2CDriver2 1"}
 Kincony IR+RF 4 Channel      {"NAME":"KC868-A4","GPIO":[32,0,227,0,224,225,0,0,0,1312,1,226,0,0,480,1152,0,1120,1056,1088,0,1,1,1,0,0,0,0,4706,4707,4704,4705,1,0,0,1],"FLAG":0,"BASE":1}
 LC Technology 12V 4 Channel  {"NAME":"LC Technology 4CH Relay","GPIO":[224,0,225,0,226,227,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":18}
 LC Technology 5V 2 Channel   {"NAME":"LC-ESP01-2R-5V","GPIO":[0,3200,0,3232,0,0,0,0,224,225,0,0,0,0],"FLAG":0,"BASE":18}
@@ -1865,18 +1930,13 @@ Mhcozy 5V                    {"NAME":"Portail","GPIO":[160,0,0,0,0,0,0,0,224,320
 Sinilink DC5V Module         {"NAME":"Sinilink XY-WF5V","GPIO":[0,0,0,0,224,1,0,0,32,288,0,0,1,0],"FLAG":0,"BASE":18}
 Sinilink DC6-36V Module      {"NAME":"Sinilink XY-WF5V","GPIO":[0,0,0,0,224,1,0,0,32,288,0,0,1,0],"FLAG":0,"BASE":18}
 Sinilink MOS                 {"NAME":"Sinilink MOS","GPIO":[0,0,576,0,224,1,0,0,32,288,0,0,0,0],"FLAG":0,"BASE":18}
+Sinilink Thermostat          {"NAME":"XY-WFT1","GPIO":[0,0,544,0,480,224,0,0,320,1,32,0,0,4736],"FLAG":0,"BASE":18,"CMND":"BuzzerPwm 1"}
 Sonoff 1 Channel Inching/Self-Locking  {"NAME":"1 Channel","GPIO":[32,0,0,0,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":12}
 Sonoff RE5V1C 5V Inching/Selflock  {"NAME":"Sonoff RE5V1C","GPIO":[32,1,1,1,1,1,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":18}
 Sonoff SV                    {"NAME":"Sonoff SV","GPIO":[32,1,0,1,1,1,0,0,224,320,1,0,0,4704],"FLAG":0,"BASE":3}
 Yunshan 7-30V 10A            {"NAME":"Yunshan 10A","GPIO":[32,1,288,1,224,161,0,0,225,0,0,0,0,0],"FLAG":0,"BASE":18}
 ```
 
-## Relay Module
-```
-PPA Contatto Wi-Fi           {"NAME":"PPA Contatto","GPIO":[0,0,32,0,224,162,0,0,288,225,0,0,0,0],"FLAG":0,"BASE":18}
-Shelly Plus 1                {"NAME":"Shelly Plus 1 ","GPIO":[0,0,0,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
-```
-
 ## Siren
 ```
 Connex Smart Indoor          {"NAME":"Connex Siren","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
@@ -1900,7 +1960,7 @@ SmartBase E0260              {"NAME":"SmartBaseE0260","GPIO":[0,0,0,0,320,0,0,0,
 
 ## Switch
 ```
-3 Way Smart Light            {"NAME":"Nexete KS-602F 3-Way","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
+3 Way Smart Light            {"NAME":"KS-602F","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
 3A Smart Home                {"NAME":"3A Smart Home ","GPIO":[544,0,290,33,225,34,0,0,32,224,289,226,288,0],"FLAG":0,"BASE":18}
 AGL 2 Gang                   {"NAME":"AGL WiFi 02","GPIO":[0,0,544,0,0,33,0,0,225,224,0,0,32,0],"FLAG":0,"BASE":18}
 AGL 3 Gang                   {"NAME":"AGL WiFi 03","GPIO":[0,0,544,0,34,33,0,0,225,224,226,0,32,0],"FLAG":0,"BASE":18}
@@ -1908,12 +1968,16 @@ Aoycocr SW1                  {"NAME":"Aoycocr SW1","GPIO":[576,1,321,1,1,1,1,1,3
 Athom 1 Gang                 {"NAME":"Athom SW011EU","GPIO":[576,0,0,32,0,0,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":1}
 Athom 1 Gang                 {"NAME":"Athom SW031US","GPIO":[576,0,0,32,0,0,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":1}
 Athom 1 Gang No Neutral      {"NAME":"Athom SW111EU","GPIO":[576,0,0,32,0,0,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":1}
+Athom 1 Gang No Neutral Touch  {"NAME":"Athom SW33-1US","GPIO":[576,0,0,32,0,0,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":18}
 Athom 2 Gang                 {"NAME":"Athom SW012EU","GPIO":[576,289,0,32,225,33,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":1}
 Athom 2 Gang                 {"NAME":"Athom SW032US","GPIO":[576,289,0,32,225,33,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":1}
 Athom 2 Gang No Neutral      {"NAME":"Athom SW112EU","GPIO":[576,289,0,32,225,33,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":1}
+Athom 2 Gang No Neutral Touch  {"NAME":"Athom SW33-2US","GPIO":[576,289,0,32,225,33,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":18}
 Athom 3 Gang Key             {"NAME":"Athom SW01-TAS-3EU","GPIO":[576,290,1,33,225,34,0,0,32,224,289,226,288,0],"FLAG":0,"BASE":18}
+Athom 3 Gang No Neutral Touch  {"NAME":"Athom SW33-3US","GPIO":[576,290,0,33,225,34,0,0,32,224,289,226,288,0],"FLAG":0,"BASE":18}
 Athom 3 Gang Touch           {"NAME":"Athom SW03-TAS-3US","GPIO":[576,290,0,33,225,34,0,0,32,224,289,226,288,0],"FLAG":0,"BASE":18}
 Athom 3 Gang Touch           {"NAME":"Athom SW11-TAS-3EU","GPIO":[576,290,1,33,225,34,0,0,32,224,289,226,288,0],"FLAG":0,"BASE":18}
+Athom 4 Gang No Neutral Touch  {"NAME":"Athom SW33-4US","GPIO":[576,0,0,33,225,34,0,0,32,224,227,226,35,0],"FLAG":0,"BASE":18}
 Athom 4 Gang Touch           {"NAME":"Athom SW03-TAS-4US","GPIO":[576,0,0,33,225,34,0,0,32,224,227,226,35,0],"FLAG":0,"BASE":18}
 Athom 4 Gang Touch           {"NAME":"Athom SW11-TAS-4EU","GPIO":[576,0,0,33,225,34,0,0,32,224,227,226,35,0],"FLAG":0,"BASE":18}
 Athom US Key Switch 1 Gang   {"NAME":"Athom SW13","GPIO":[576,0,0,32,0,0,0,0,0,224,288,0,0,0],"FLAG":0,"BASE":1}
@@ -1954,9 +2018,10 @@ Eachen CD303 3 Gang          {"NAME":"ID Components","GPIO":[544,289,0,162,224,1
 Eachen SWT-2Gang             {"NAME":"ID Components","GPIO":[544,1,1,1,1,161,1,1,160,224,289,225,288,1],"FLAG":0,"BASE":18}
 Earda 3-Way                  {"NAME":"ESW-1WAA-US","GPIO":[160,0,0,0,320,0,0,0,0,224,0,0,0,0],"FLAG":0,"BASE":18}
 Enjowi WF-SK301              {"NAME":"Tuya 3 Channel","GPIO":[0,0,0,0,226,33,0,0,32,224,34,225,544,0],"FLAG":0,"BASE":18}
+Esooli 1 Gang                {"NAME":"Esooli 1G","GPIO":[0,288,0,0,0,32,0,0,224,0,0,0,0,0],"FLAG":0,"BASE":1}
 Esooli 2 Gang 1 Way          {"NAME":"Esooli 2 gang","GPIO":[0,288,0,32,33,0,0,0,0,224,225,0,0,0],"FLAG":0,"BASE":1}
-Etekcity ESWL01              {"NAME":"EtekCityESWL01","GPIO":[0,1,0,1,288,289,0,0,0,224,96,0,0,4704],"FLAG":0,"BASE":18}
-Etekcity ESWL03 3-way        {"NAME":"Etekcity 3Way","GPIO":[0,0,0,0,226,256,0,0,192,225,161,0,0,0],"FLAG":0,"BASE":18}
+Etekcity                     {"NAME":"EtekCityESWL01","GPIO":[0,1,0,1,288,289,0,0,0,224,96,0,0,4704],"FLAG":0,"BASE":18}
+Etekcity 3-way               {"NAME":"Etekcity 3Way","GPIO":[0,0,0,0,226,256,0,0,192,225,161,0,0,0],"FLAG":0,"BASE":18}
 Eva Logik 3-Way              {"NAME":"WF30 Switch","GPIO":[0,0,0,0,33,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 FrankEver 4 Gang             {"NAME":"FrankEver Wifi Smart Switch","GPIO":[0,0,0,32,224,33,1,1,34,226,227,225,35,0],"FLAG":0,"BASE":18}
 Freecube                     {"NAME":"Freecube","GPIO":[288,0,289,0,0,0,0,0,290,32,0,224,0,0],"FLAG":0,"BASE":18}
@@ -1998,7 +2063,6 @@ Kuled K36                    {"NAME":"KULED-B","GPIO":[160,1,1,1,1,1,224,288,256
 Kuled KS602S                 {"NAME":"KULED","GPIO":[32,1,1,1,1,1,0,0,224,320,1,1,1,0],"FLAG":0,"BASE":18}
 Kygne CD-301                 {"NAME":"KYGNE Touch","GPIO":[0,0,0,0,288,289,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":10}
 Laghten SS02S                {"NAME":"Laghten SS02S","GPIO":[0,0,0,0,288,321,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
-Lanbon L8 5 in 1 LCD Touch   {"NAME":"Lanbon L8","GPIO":[0,0,0,0,0,992,0,0,224,0,225,0,0,0,1024,896,0,6624,6592,864,0,832,416,226,0,0,0,0,417,418,0,352,0,0,0,4736],"FLAG":0,"BASE":1}
 LCARE Modular 2 Gang         {"NAME":"2SW1-In","GPIO":[32,1,1,1,0,225,33,0,224,320,0,0,0,0],"FLAG":0,"BASE":29}
 LerLink 1 Gang No Neutral    {"NAME":"LerLink X801-L","GPIO":[0,0,0,0,32,0,0,0,224,320,0,0,0,1],"FLAG":0,"BASE":18}
 Lerlink 2 Gang               {"NAME":"Lerlink X802A","GPIO":[0,0,0,33,32,0,0,0,224,288,225,0,0,0],"FLAG":0,"BASE":18}
@@ -2007,7 +2071,7 @@ Lerlink 3 Gang               {"NAME":"X803A","GPIO":[0,0,0,33,32,34,0,0,224,259,
 Lerlink 3 Gang               {"NAME":"X803A","GPIO":[0,0,0,33,32,34,0,0,224,288,225,226,0,0],"FLAG":0,"BASE":18}
 Lerlink 3 Gang No Neutral    {"NAME":"X803K-L 3 Gang","GPIO":[0,0,320,0,32,34,33,0,224,0,225,226,0,0],"FLAG":0,"BASE":18}
 Lightstory WT02S             {"NAME":"WT02S","GPIO":[0,0,0,0,321,320,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":50}
-Linkind 2-Way Single Pole    {"NAME":"Linkind WS240010008","GPIO":[0,0,0,0,0,224,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,576,321,0,0,0,0,0,33,32,0,0,0,0,0,0],"FLAG":0,"BASE":1}
+Linkind 2-Way                {"NAME":"Linkind WS240010008","GPIO":[0,0,0,0,0,224,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,576,321,0,0,0,0,0,33,32,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 Lonsonho SK3-01              {"NAME":"Tuya 1 Channel","GPIO":[0,0,0,0,0,32,0,0,0,0,0,224,288,0],"FLAG":0,"BASE":18}
 Lonsonho SK3-02              {"NAME":"Tuya 2 Channel","GPIO":[0,0,0,0,225,0,0,0,32,224,33,0,288,0],"FLAG":0,"BASE":18}
 Lonsonho SK3-03              {"NAME":"Tuya 3-ch v2","GPIO":[544,322,0,33,225,34,0,0,32,224,321,226,320,0],"FLAG":0,"BASE":18}
@@ -2043,6 +2107,7 @@ Moes BS-US-W Boiler          {"NAME":"BS-US-W","GPIO":[290,0,0,32,224,0,0,0,0,0,
 Moes Light and Fan           {"NAME":"Moes WF-FL01","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 Moes RF433 2 Gang Switch     {"NAME":"WS-EUB2-WR","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
 Moes RF433 3 Gang            {"NAME":"WS-EUB3-WR","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54}
+Moes RF433 3 Gang Touch      {"NAME":"WS-EU-RF","GPIO":[0,2272,0,2304,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":54,"CMND":"TuyaMCU 11,1 | TuyaMCU 12,2 | TuyaMCU 13,3"}
 Moes SS01S-1                 {"NAME":"Moes Switch","GPIO":[1,1,1,1,320,0,0,0,224,32,1,1,1,0],"FLAG":0,"BASE":18}
 Moes WS-EU1-LB 1 Gang No Neutral  {"NAME":"Moes WS-EU1-LB","GPIO":[0,0,0,0,0,32,0,0,0,0,0,224,544,0],"FLAG":0,"BASE":18}
 Moes WS-EU2-LW 2 Gang No Neutral  {"NAME":"Tuya 2 Channel","GPIO":[0,0,0,0,225,0,0,0,32,224,33,0,544,0],"FLAG":0,"BASE":18}
@@ -2080,6 +2145,7 @@ Sesoo WIFI-EU-SK3-02         {"NAME":"Sesoo SK3-02","GPIO":[0,0,321,0,225,0,0,0,
 Sesoo WIFI-US-SK3-04         {"NAME":"Tuya 4 Channel","GPIO":[288,1,1,34,226,32,0,0,35,227,225,224,33,0],"FLAG":0,"BASE":18}
 Shawader 1Ch Touch Light     {"NAME":"ShawaderTuya1C","GPIO":[0,0,0,0,0,32,0,0,0,0,0,224,288,0],"FLAG":0,"BASE":18}
 Shawader 2Ch Touch Light     {"NAME":"ShawaderTuya2C","GPIO":[0,0,0,0,224,0,0,0,33,225,32,0,288,0],"FLAG":0,"BASE":18}
+Shawader 3Ch Touch Light     {"NAME":"ShawaderTuya3C","GPIO":[0,3872,0,66,64,65,0,0,225,226,224,0,0,0],"FLAG":0,"BASE":18}
 SK-A801-01-US 1 Gang         {"NAME":"jsankou US Switch 1 Gang","GPIO":[544,0,0,0,0,0,0,0,32,256,0,0,0,0],"FLAG":0,"BASE":18}
 SK-W803-01-US 3 Gang         {"NAME":"jsankou US Switch 3 Gang","GPIO":[544,0,0,33,257,34,0,0,32,256,0,258,0,0],"FLAG":0,"BASE":18}
 Smartlife Opard CD302        {"NAME":"CD302","GPIO":[0,0,0,0,288,321,0,0,256,32,0,0,0,0],"FLAG":0,"BASE":18}
@@ -2106,6 +2172,7 @@ Sonoff TX T1 EU 1 Gang       {"NAME":"Sonoff T1 TX 1CH","GPIO":[32,1,1,1,0,0,0,0
 Sonoff TX T1 EU 2 Gang       {"NAME":"Sonoff T1 TX 2CH","GPIO":[32,1,1,1,0,225,33,0,224,320,0,0,0,0],"FLAG":0,"BASE":29}
 Sonoff TX T2 EU 1 Gang       {"NAME":"Sonoff T2 TX 1CH","GPIO":[32,1,1,1,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":28}
 Sonoff TX T2 EU 2 Gang       {"NAME":"Sonoff T2 TX 2CH","GPIO":[32,1,1,1,0,225,33,0,224,320,0,0,0,0],"FLAG":0,"BASE":29}
+Sonoff TX T2 UK 2 Gang       {"NAME":"Sonoff T1 TX 2CH","GPIO":[32,1,1,1,0,225,33,0,224,448,0,0,0,0],"FLAG":0,"BASE":29}
 Sonoff TX T3 EU 1 Gang       {"NAME":"Sonoff T3 TX 1CH","GPIO":[32,1,1,1,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":28}
 Sonoff TX T3 EU 2 Gang       {"NAME":"Sonoff T3 TX 2CH","GPIO":[32,1,1,1,0,225,33,0,224,320,0,0,0,0],"FLAG":0,"BASE":29}
 Sonoff TX T3 EU 3 Gang       {"NAME":"TX T3EU3C","GPIO":[32,1,0,1,226,225,33,34,224,576,0,0,0,0],"FLAG":0,"BASE":30}
@@ -2120,7 +2187,7 @@ SSMS118-01A1 Scene Light Smart  {"NAME":"RGB Switch","GPIO":[257,0,259,161,418,4
 Steren Apagador              {"NAME":"SHOME-115","GPIO":[32,0,0,0,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":18}
 Steren Apagador Doble        {"NAME":"STEREN SHOME-116","GPIO":[0,0,288,0,0,32,0,0,224,225,0,0,33,0],"FLAG":0,"BASE":18}
 Steren Apagador Triple       {"NAME":"STEREN SHOME-117","GPIO":[0,0,288,0,34,32,0,0,224,225,226,0,33,0],"FLAG":0,"BASE":18}
-STITCH                       {"NAME":"Tuya WF15S ","GPIO":[1,1,0,0,1,1,0,0,1,2304,1,2272,0,0],"FLAG":0,"BASE":54}
+STITCH                       {"NAME":"Tuya WF15S ","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54}
 TCP Smart 1 Gang             {"NAME":"TCP 1 Gang 1 Way","GPIO":[544,0,0,32,224,0,0,0,0,0,320,0,0,0],"FLAG":0,"BASE":18}
 Teckin 2 Gang                {"NAME":"Teckin SR43","GPIO":[0,0,288,0,0,32,0,0,224,225,0,0,33,0],"FLAG":0,"BASE":18}
 Teckin SR-41 Single Pole     {"NAME":"Teckin SR-41","GPIO":[32,0,0,0,0,0,0,0,224,576,0,0,0,0],"FLAG":0,"BASE":18}
@@ -2134,10 +2201,10 @@ TopGreener Scene Controller  {"NAME":"TGWF15RM","GPIO":[0,2272,0,2304,0,0,0,0,0,
 TopGreener TGWF15S           {"NAME":"TopGreener-Switch","GPIO":[0,0,0,0,0,0,0,0,0,2304,0,2272,0,0],"FLAG":0,"BASE":54}
 Touch 3 Gang                 {"NAME":"Switch 3-Gang","GPIO":[0,0,0,0,226,33,0,0,32,224,34,225,544,0],"FLAG":0,"BASE":18}
 Touch Light Switch 1 Gang    {"NAME":"Smart Touch Light Switch ","GPIO":[0,0,0,0,0,32,1,1,0,0,0,224,320,0],"FLAG":0,"BASE":18}
+TreatLife                    {"NAME":"TL SS01S Swtch","GPIO":[0,0,0,0,288,576,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
+Treatlife 3-Way              {"NAME":"Treatlife SS01 3-Way","GPIO":[0,0,0,0,224,576,0,0,225,33,160,0,0,0],"FLAG":0,"BASE":18}
 TreatLife 3-Way              {"NAME":"Treatlife 3-Way","GPIO":[0,0,0,0,224,576,0,0,225,33,160,0,0,0],"FLAG":0,"BASE":18}
-Treatlife SS01 3-Way         {"NAME":"Treatlife SS01 3-Way","GPIO":[0,0,0,0,224,576,0,0,225,33,160,0,0,0],"FLAG":0,"BASE":18}
-TreatLife SS01S              {"NAME":"TL SS01S Swtch","GPIO":[0,0,0,0,288,576,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
-TreatLife SS02S              {"NAME":"Treatlife SS02","GPIO":[0,0,0,0,288,576,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
+TreatLife Single Pole ON/OFF  {"NAME":"Treatlife SS02","GPIO":[0,0,0,0,288,576,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 Tuya 3 Gang                  {"NAME":"KING-Tuya-key","GPIO":[0,0,0,0,226,225,0,0,224,32,34,0,33,0],"FLAG":0,"BASE":18}
 TY-US-L1-W                   {"NAME":"TY-US-L1-W","GPIO":[0,0,0,0,0,32,0,0,0,224,0,0,576,0],"FLAG":0,"BASE":18}
 TY-US-L3-W                   {"NAME":"TY-US-L3-W","GPIO":[0,0,0,0,224,33,0,0,34,226,32,225,576,1],"FLAG":0,"BASE":18}
@@ -2148,6 +2215,7 @@ Vaticas 1                    {"NAME":"Vaticas","GPIO":[0,0,0,32,224,0,0,0,0,0,28
 VHome RF433 1 Gang           {"NAME":"VH-TW-CL-01","GPIO":[0,0,0,0,0,32,0,0,0,0,0,224,544,1],"FLAG":0,"BASE":18}
 VHome RF433 2 Gang           {"NAME":"VX-TW-CL-002","GPIO":[0,0,0,0,224,0,0,0,33,225,32,0,544,1],"FLAG":0,"BASE":18}
 vhome RF433 3 Gang           {"NAME":"VH-TB-US-003","GPIO":[0,0,0,0,224,33,0,0,34,226,32,225,576,1],"FLAG":0,"BASE":18}
+Virage Labs VirageSwitch Light  {"NAME":"VirageSwitch","GPIO":[32,0,0,0,0,0,0,0,224,288,0,0,0,0],"FLAG":0,"BASE":18}
 Wall Touch Switch 2 Gang     {"NAME":"VOVOWAY 120-WIFI-RF 2GANG","GPIO":[0,0,289,0,225,0,0,0,32,224,33,0,288,0],"FLAG":0,"BASE":18}
 Welaik 2-Gang 1-Way          "Not available"
 WiFi Smart Switch 2 Gang     {"NAME":"Kingart N2","GPIO":[32,1,0,1,0,225,33,0,224,0,0,0,0,1],"FLAG":0,"BASE":18}
@@ -2178,7 +2246,7 @@ ZUCZUG 3 Gang                {"NAME":"2ph105626a x3","GPIO":[0,288,0,32,34,33,0,
 ```
 AGL Modulo Relay 01 Canal    {"NAME":"AGL-Basic","GPIO":[0,1,0,0,224,32,0,0,0,0,320,0,0,0],"FLAG":0,"BASE":18}
 Albohes 2 Channel            {"NAME":"Albohes SH-08","GPIO":[0,3200,33,3232,321,320,0,0,224,544,32,0,225,1],"FLAG":0,"BASE":18}
-Athom 10A                    {"NAME":"Athom CB0110A","GPIO":[0,0,0,0,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":1}
+Athom 10A                    {"NAME":"CB01-TAS-1","GPIO":[0,0,0,32,576,0,0,0,0,224,160,0,0,1],"FLAG":0,"BASE":18}
 Athom 2Ch Inching/Self-locking  {"NAME":"Athom R02","GPIO":[1,1,1,1,225,224,1,1,1,1,1,1,576,0],"FLAG":0,"BASE":18}
 Athom 3-Way Mini Relay       {"NAME":"RS01-TAS-1","GPIO":[0,0,0,32,576,0,0,0,0,224,160,0,0,0],"FLAG":0,"BASE":18}
 Athom 4Ch Inching/Self-locking 10A  {"NAME":"Athom R04","GPIO":[1,1,1,1,32,576,1,1,226,227,225,1,224,0],"FLAG":0,"BASE":18}
@@ -2202,6 +2270,7 @@ Ener-J Outdoor Switch        {"NAME":"Ener-J Smart WiFi Outdoor Relay","GPIO":[3
 eWelink No Neutral           {"NAME":"SA-018","GPIO":[0,0,0,0,160,0,0,0,224,288,0,0,0,0],"FLAG":0,"BASE":18}
 EX Store 2 Kanal V5          {"NAME":"EXS Relay V5","GPIO":[1,1,1,1,1,1,0,0,224,225,258,288,259,0],"FLAG":0,"BASE":16}
 Geekcreit 2 Channel AC 85V-250V  {"NAME":"Geekcreit 2ch","GPIO":[32,0,0,0,0,225,33,0,224,288,0,0,0,4704],"FLAG":0,"BASE":18}
+Gosund SW3                   {"NAME":"Gosund WP3","GPIO":[0,0,0,32,0,0,0,0,320,321,224,0,0,0],"FLAG":0,"BASE":18}
 HomeMate 4 Node In-wall      {"NAME":"HomeMate Wifi 4N ","GPIO":[1,1,1,160,224,163,1,1,161,225,226,227,162,1],"FLAG":0,"BASE":18}
 L-5A01                       {"NAME":"L-5A01","GPIO":[32,1,0,1,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":1}
 LoraTap 10A                  {"NAME":"LoraTap RR400W","GPIO":[0,0,0,0,544,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
@@ -2211,17 +2280,20 @@ Luani HVIO                   {"NAME":"Luani HVIO","GPIO":[0,1,1,1,224,225,0,0,16
 Milfra Smart                 {"NAME":"Milfra Smart Module TB41","GPIO":[576,0,0,225,2688,2656,0,0,2592,193,480,224,192,0],"FLAG":0,"BASE":18}
 Moes                         {"NAME":"Moes MS-104B","GPIO":[0,0,32,0,480,0,0,0,161,160,224,225,0,0],"FLAG":0,"BASE":18}
 Nova Digital Basic 1 MS101   {"NAME":"NovaDigBasic1","GPIO":[0,1,0,1,320,0,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
+PPA Contatto Wi-Fi           {"NAME":"PPA Contatto","GPIO":[0,0,32,0,224,162,0,0,288,225,0,0,0,0],"FLAG":0,"BASE":18}
 PS-1604 16A                  {"NAME":"PS-1604 16A","GPIO":[32,1,1,1,1,0,0,0,224,320,1,0,0,0],"FLAG":0,"BASE":1}
 QS-WIFI-S03                  {"NAME":"QS-WIFI-S03","GPIO":[32,1,1,1,1,0,0,0,192,224,0,0,0,0],"FLAG":0,"BASE":1}
 QS-WIFI-S05                  {"NAME":"QS-WIFI-S05","GPIO":[32,1,1,1,1,0,0,0,192,224,0,0,0,0],"FLAG":0,"BASE":1}
 Qualitel Breaker             {"NAME":"Qualitel Smart Switch","GPIO":[0,0,0,0,224,0,0,0,32,321,288,0,0,0],"FLAG":0,"BASE":18}
-Shelly 1                     {"NAME":"Shelly 1","GPIO":[0,0,0,0,224,192,0,0,0,0,0,0,0,4736],"FLAG":0,"BASE":46}
+Shelly 1                     {"NAME":"Shelly 1","GPIO":[1,1,0,1,224,192,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":46}
 Shelly 1L No Neutral         {"NAME":"Shelly 1L","GPIO":[320,0,0,0,192,224,0,0,0,0,193,0,0,4736],"FLAG":0,"BASE":18}
 Shelly 1PM                   {"NAME":"Shelly 1PM","GPIO":[320,0,0,0,192,2720,0,0,0,0,0,224,0,4736],"FLAG":0,"BASE":18}
 Shelly 2                     {"NAME":"Shelly 2","GPIO":[0,2752,0,2784,224,225,0,0,160,0,161,2816,0,0],"FLAG":0,"BASE":47}
 Shelly 2.5                   {"NAME":"Shelly 2.5","GPIO":[320,0,32,0,224,193,0,0,640,192,608,225,3456,4736],"FLAG":0,"BASE":18}
-Shelly EM                    {"NAME":"Shelly EM","GPIO":[0,0,0,0,0,0,0,0,640,3456,608,224,0,1],"FLAG":0,"BASE":18}
+Shelly EM                    {"NAME":"Shelly EM","GPIO":[0,0,288,0,32,0,0,0,640,3456,608,224,0,1],"FLAG":0,"BASE":18}
 Shelly i3 Action and Scenes Activation Device  {"NAME":"Shelly i3","GPIO":[0,0,0,0,0,320,0,0,193,194,192,0,0,4736],"FLAG":0,"BASE":18}
+Shelly Plus 1                {"NAME":"Shelly Plus 1 ","GPIO":[0,0,0,0,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
+Shelly Plus 1PM              {"NAME":"Shelly Plus 1PM","GPIO":[0,0,0,0,192,2720,0,0,0,0,0,0,0,0,2656,0,0,0,0,2624,0,0,224,0,0,0,0,0,0,0,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 Sinilink USB                 {"NAME":"XY-WFUSB","GPIO":[1,1,0,1,32,224,0,0,0,0,320,0,544,0],"FLAG":0,"BASE":18}
 Smart Home SS-8839-01        {"NAME":"SS-8839-01","GPIO":[0,1,0,1,224,0,0,0,32,321,0,320,0,0],"FLAG":0,"BASE":18}
 Sonoff 4CH (R2)              {"NAME":"Sonoff 4CH","GPIO":[32,1,1,1,226,225,33,34,224,320,35,227,0,0],"FLAG":0,"BASE":7}
@@ -2237,7 +2309,7 @@ Sonoff Dual R3               {"NAME":"Sonoff Dual R3","GPIO":[32,0,0,0,0,0,0,0,0
 Sonoff Dual R3 Lite          {"NAME":"Sonoff Dual R3 Lite","GPIO":[32,0,0,0,0,0,0,0,0,576,225,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,160,161,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 Sonoff Dual R3 v2            {"NAME":"Sonoff Dual R3 v2","GPIO":[32,0,0,0,0,0,0,0,0,576,225,0,0,0,0,0,0,0,0,0,0,3200,8128,224,0,0,0,0,160,161,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 Sonoff Mini                  {"NAME":"Sonoff Mini","GPIO":[32,0,0,0,160,0,0,0,224,320,0,0,1,0],"FLAG":0,"BASE":1}
-Sonoff Mini R2               {"NAME":"Sonoff MINIR2","GPIO":[32,0,0,0,160,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":1}
+Sonoff Mini R2               {"NAME":"Sonoff MINIR2","GPIO":[32,0,0,0,160,0,0,0,224,544,0,0,0,0],"FLAG":0,"BASE":1}
 Sonoff Pow                   {"NAME":"Sonoff Pow","GPIO":[32,0,0,0,0,2592,0,0,224,2656,2688,288,0,0],"FLAG":0,"BASE":6}
 Sonoff Pow R2                {"NAME":"Sonoff Pow R2","GPIO":[32,3072,0,3104,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":43}
 Sonoff POW R3 25A 5500W      {"NAME":"Sonoff POWR3","GPIO":[32,3072,0,3104,0,0,0,0,256,320,0,1,1,1],"FLAG":0,"BASE":43}
@@ -2252,6 +2324,7 @@ Switch Module 2x5A           {"NAME":"QS-WIFI-S04-2C","GPIO":[1,1,32,1,480,0,0,0
 Tinxy Single Node 7A         {"NAME":"Tnxy07A","GPIO":[32,0,0,0,160,224,0,0,288,0,0,0,0,0],"FLAG":0,"BASE":18}
 WL-SW01_10                   {"NAME":"WL-SW01_10","GPIO":[32,3232,0,3200,0,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":1}
 Woox Integrational Switch    {"NAME":"WOOXR4967","GPIO":[0,0,0,1,320,224,0,0,0,32,0,0,0,0],"FLAG":0,"BASE":18}
+Yeelight Dual Control        {"NAME":"YLAI002","GPIO":[0,0,0,0,0,0,0,0,96,0,224,0,0,320,320,160,0,160,0,0,0,0,0,225,0,0,0,0,162,163,0,0,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"SO127 1"}
 Yuntong Smart                {"NAME":"Yuntong Smart","GPIO":[0,0,0,0,224,0,0,0,96,320,0,576,0,0],"FLAG":0,"BASE":1}
 Zemismart ERC309 Kinetic     {"NAME":"Kinetic Switch","GPIO":[1,1,1,1,1,1,0,0,1,2304,1,2272,1,0],"FLAG":0,"BASE":54}
 ```
@@ -2267,6 +2340,7 @@ Shelly Add-on                {"NAME":"Shelly 1 Temp ","GPIO":[1344,0,0,1312,224,
 ## Thermostat
 ```
 Floor Heating or Water/Gas Boiler  {"NAME":"ME81H Thermostat","GPIO":[1,1,1,1,1,1,0,0,1,1,1,1,1,0],"FLAG":0,"BASE":54}
+Mysa V1 Electric Baseboard Heater  {"NAME":"Mysa Thermostat","GPIO":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,224,0,0,0,0,0,0,640,608,0,0,0,0,0,0],"FLAG":0,"BASE":1}
 ```
 
 ## Valve
@@ -2277,6 +2351,7 @@ Jinvoo SM-AW713              {"NAME":"Jinvoo Valve","GPIO":[0,0,0,0,0,288,0,0,22
 Jinvoo SM-PW713              {"NAME":"Jinvoo Valve","GPIO":[0,0,0,0,224,288,0,0,32,289,0,0,0,4704],"FLAG":0,"BASE":18}
 Moes Gas-Water               {"NAME":"MoesHouse WV-B","GPIO":[0,0,0,0,0,0,0,0,32,224,0,0,0,0],"FLAG":0,"BASE":18}
 Owfeel EN71                  {"NAME":"SmartValve","GPIO":[224,0,0,0,0,0,0,0,32,288,0,0,0,0],"FLAG":0,"BASE":18}
+Tuya Gas/Water               {"NAME":"Valve FM101","GPIO":[320,0,0,0,224,0,0,0,0,0,32,0,225,0],"FLAG":0,"BASE":18}
 ```
 
 ## Wall Outlet
@@ -2290,10 +2365,13 @@ BSEED Smart Socket           {"NAME":"BSEED Socket","GPIO":[0,0,0,0,544,288,0,0,
 CE Smart Home                {"NAME":"CE Smart Wall","GPIO":[1,1,1,1,544,32,0,0,224,1,1,1,1,1],"FLAG":0,"BASE":18}
 CE Smart Home LQ-2-W3        {"NAME":"LITESUN","GPIO":[0,0,0,0,544,32,0,0,224,0,0,0,0,0],"FLAG":0,"BASE":18}
 ChilITec Pilota Casa IP44    {"NAME":"Outdoor IP44","GPIO":[0,0,0,0,0,224,0,0,0,288,32,0,0,0],"FLAG":0,"BASE":18}
+DETA Double GPO + USB        {"NAME":"DETA 6920HA","GPIO":[0,0,0,3104,32,288,0,0,33,224,225,0,0,0],"FLAG":0,"BASE":18}
 Deta Double Power Point      {"NAME":"DETA 2G GPO","GPIO":[0,0,0,0,544,0,0,0,65,224,225,0,64,0],"FLAG":0,"BASE":18}
+DETA Outdoor Double Powerpoint  {"NAME":"DETA 6294HA","GPIO":[0,0,0,3104,32,288,0,0,33,224,225,0,0,0],"FLAG":0,"BASE":18}
 Deta Single Power Point      {"NAME":"DETA 2G GPO USB","GPIO":[0,0,0,2720,64,576,0,0,65,224,225,0,0,0],"FLAG":0,"BASE":18}
 Ener-J 13A Twin Wall Sockets with USB  {"NAME":"Ener-J 2-Gang ","GPIO":[32,0,0,0,0,224,33,0,225,320,0,0,0,0],"FLAG":0,"BASE":18}
 Gosund                       {"NAME":"Gosund WO1","GPIO":[320,0,576,0,2656,2720,0,0,2624,321,225,224,0,4704],"FLAG":0,"BASE":18}
+Hevolta Glasense             {"NAME":"Hevolta Socket","GPIO":[0,0,0,0,288,289,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 Kapok T16                    {"NAME":"tiltech-t16","GPIO":[0,320,0,32,192,0,0,0,224,225,0,0,0,0],"FLAG":0,"BASE":18}
 Kesen KS-604                 {"NAME":"KS-604","GPIO":[1,1,288,1,1,33,0,0,225,224,1,1,32,0],"FLAG":0,"BASE":18}
 Kesen KS-604S                {"NAME":"KS-604S","GPIO":[1,1,258,1,1,33,0,0,225,224,1,1,32,4704],"FLAG":0,"BASE":18}
@@ -2302,18 +2380,21 @@ KS-621                       {"NAME":"KS-621","GPIO":[32,0,0,0,2688,2656,0,0,259
 Makegood MG-AUWF01           {"NAME":"MG-AUWF01","GPIO":[320,161,544,323,2720,2656,0,0,2624,225,321,224,160,0],"FLAG":0,"BASE":18}
 Makegood MG-UKWSG01          {"NAME":"Aseer 2-Gang","GPIO":[321,160,544,323,2720,2656,0,0,2624,224,320,225,161,0],"FLAG":0,"BASE":18}
 Makegood MG-UKWSW/B          {"NAME":"Aseer 1-Gang","GPIO":[320,0,544,321,2720,2656,0,0,2624,0,0,224,160,0],"FLAG":0,"BASE":18}
+Master Contacto WiFi de pared  {"NAME":"Master_IOT-WLSOCKET","GPIO":[32,0,0,0,0,225,33,0,224,320,0,0,0,0],"FLAG":0,"BASE":18}
 Moes WWK Glass Panel         {"NAME":"Smart Socket","GPIO":[0,0,0,0,288,289,0,0,224,32,0,0,0,0],"FLAG":0,"BASE":18}
 Oittm 120                    {"NAME":"Oittm WS01","GPIO":[32,0,0,0,0,2592,0,0,224,2656,2688,288,0,0],"FLAG":0,"BASE":18}
 PS-1607                      {"NAME":"PS-1607","GPIO":[32,0,0,0,0,225,33,0,224,0,0,0,0,0],"FLAG":0,"BASE":18}
 Smanergy KA10                {"NAME":"KA10","GPIO":[0,320,0,32,2720,2656,0,0,2624,289,224,0,0,0],"FLAG":0,"BASE":64}
 Sonoff IW100                 {"NAME":"Sonoff IW100","GPIO":[32,3072,0,3104,0,0,0,0,224,544,0,0,0,0],"FLAG":0,"BASE":41}
 Sonoff S55                   {"NAME":"Sonoff S55","GPIO":[32,1,0,1,1,0,0,0,224,320,0,0,0,0],"FLAG":0,"BASE":1}
+Steren Dual Plug and USB Charger  {"NAME":"Steren_SHOME-118","GPIO":[0,576,0,32,33,288,0,0,224,225,289,0,0,0],"FLAG":0,"BASE":18}
 T16E Dual USB 10A            {"NAME":"T16E 10A","GPIO":[0,0,0,32,2720,2656,0,0,2624,320,224,0,0,0],"FLAG":0,"BASE":18}
 TCP Smart Dual               {"NAME":"TCP TAUWIS2GUK","GPIO":[33,0,0,0,0,224,32,0,225,544,0,0,0,0],"FLAG":0,"BASE":18}
 Teckin SR40                  {"NAME":"RF-SR40-US","GPIO":[576,0,0,32,320,33,0,0,225,224,321,226,0,0],"FLAG":0,"BASE":18}
 TopGreener Dual USB          {"NAME":"TGWF215U2A","GPIO":[0,320,0,32,2720,2656,0,0,2624,225,224,321,0,0],"FLAG":0,"BASE":18}
 TopGreener TGWF15RM          {"NAME":"TGWF15RM","GPIO":[0,320,0,32,2720,2656,0,0,2624,321,224,0,0,0],"FLAG":0,"BASE":55}
 Vigica VGSPK00815            {"NAME":"VIGICA outlet","GPIO":[32,1,1,1,1,225,33,1,224,1,1,1,1,4704],"FLAG":0,"BASE":18}
+Virage Labs ViragePlug       {"NAME":"ViragePlug","GPIO":[544,0,0,32,320,33,0,0,225,224,320,226,0,0],"FLAG":0,"BASE":18}
 Woox Dual                    {"NAME":"Woox R4053","GPIO":[33,0,0,0,0,224,32,0,225,320,0,0,0,0],"FLAG":0,"BASE":18}
 Xenon 2AC 1USB               {"NAME":"Xenon SM-PW801-U1","GPIO":[0,0,0,0,288,32,0,0,224,0,225,0,226,0],"FLAG":0,"BASE":18}
 ```
diff --git a/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp32RmtMethod.h b/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp32RmtMethod.h
index 6d98ccd04..2ed7e4a0e 100644
--- a/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp32RmtMethod.h
+++ b/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp32RmtMethod.h
@@ -50,6 +50,12 @@ extern "C"
 #include <driver/rmt.h>
 }
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
+#define NEOPIXELBUS_RMT_INT_FLAGS (ESP_INTR_FLAG_LOWMED)
+#else
+#define NEOPIXELBUS_RMT_INT_FLAGS (ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_LEVEL1)
+#endif
+
 class NeoEsp32RmtSpeed
 {
 public:
@@ -554,7 +560,7 @@ public:
         config.clk_div = T_SPEED::RmtClockDivider;
 
         ESP_ERROR_CHECK(rmt_config(&config));
-        ESP_ERROR_CHECK(rmt_driver_install(_channel.RmtChannelNumber, 0, ESP_INTR_FLAG_IRAM | ESP_INTR_FLAG_LEVEL1));
+        ESP_ERROR_CHECK(rmt_driver_install(_channel.RmtChannelNumber, 0, NEOPIXELBUS_RMT_INT_FLAGS));
         ESP_ERROR_CHECK(rmt_translator_init(_channel.RmtChannelNumber, T_SPEED::Translate));
     }
 
diff --git a/lib/lib_display/UDisplay/uDisplay.cpp b/lib/lib_display/UDisplay/uDisplay.cpp
index 6f48d5796..8414795e0 100755
--- a/lib/lib_display/UDisplay/uDisplay.cpp
+++ b/lib/lib_display/UDisplay/uDisplay.cpp
@@ -76,6 +76,9 @@ uDisplay::uDisplay(char *lp) : Renderer(800, 600) {
   uint8_t section = 0;
   dsp_ncmds = 0;
   lut_num = 0;
+  lvgl_param.data = 0;
+  lvgl_param.fluslines = 40;
+
   for (uint32_t cnt = 0; cnt < 5; cnt++) {
     lut_cnt[cnt] = 0;
     lut_cmd[cnt] = 0xff;
diff --git a/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp b/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp
index 70c705e6e..f41c8df59 100644
--- a/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp
+++ b/lib/lib_ssl/tls_mini/src/StackThunk_light.cpp
@@ -43,10 +43,8 @@ uint32_t stack_thunk_light_refcnt = 0;
 //#define _stackSize (5600/4)
 #if defined(USE_MQTT_AWS_IOT) || defined(USE_MQTT_AWS_IOT_LIGHT) || defined(USE_MQTT_AZURE_IOT)
   #define _stackSize (5300/4)   // using a light version of bearssl we can save 300 bytes
-#elif defined(USE_MQTT_TLS_FORCE_EC_CIPHER) || defined(USE_4K_RSA)
-  #define _stackSize (4800/4)   // no private key, we can reduce a little, max observed 4300
 #else
-  #define _stackSize (3800/4)   // using a light version of bearssl we can save 2k
+  #define _stackSize (4800/4)   // no private key, we can reduce a little, max observed 4300
 #endif
 #define _stackPaint 0xdeadbeef
 
diff --git a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp
index 6f66915f3..7be46adf0 100755
--- a/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp
+++ b/lib/lib_ssl/tls_mini/src/WiFiClientSecureLightBearSSL.cpp
@@ -191,11 +191,7 @@ void WiFiClientSecure_light::_clear() {
   _last_error = 0;
   _recvapp_buf = nullptr;
   _recvapp_len = 0;
-#ifdef USE_MQTT_TLS_CA_CERT
-  _insecure = false;        // insecure (fingerprint) mode is only enabled if setPubKeyFingerprint() is called
-#else
-  _insecure = true;        // force insecure if CA validation is not enabled
-#endif
+  _insecure = false;  // set to true when calling setPubKeyFingerprint()
   _fingerprint_any = true; // by default accept all fingerprints
   _fingerprint1 = nullptr;
   _fingerprint2 = nullptr;
@@ -920,11 +916,7 @@ extern "C" {
   // We limit to a single cipher to reduce footprint
   // we reference it, don't put in PROGMEM
   static const uint16_t suites[] = {
-#ifdef USE_MQTT_TLS_FORCE_EC_CIPHER
     BR_TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-#else
-    BR_TLS_RSA_WITH_AES_128_GCM_SHA256
-#endif
   };
 
   // Default initializion for our SSL clients
@@ -947,10 +939,8 @@ extern "C" {
     br_ssl_engine_set_aes_ctr(&cc->eng, &br_aes_small_ctr_vtable);
     br_ssl_engine_set_ghash(&cc->eng, &br_ghash_ctmul32);
 
-#ifdef USE_MQTT_TLS_FORCE_EC_CIPHER
     // we support only P256 EC curve for AWS IoT, no EC curve for Letsencrypt unless forced
     br_ssl_engine_set_ec(&cc->eng, &br_ec_p256_m15); // TODO
-#endif
   }
 }
 
@@ -958,9 +948,8 @@ extern "C" {
 // Returns if the SSL handshake succeeded.
 bool WiFiClientSecure_light::_connectSSL(const char* hostName) {
   // Validation context, either full CA validation or checking only fingerprints
-#ifdef USE_MQTT_TLS_CA_CERT
+
   br_x509_minimal_context *x509_minimal = nullptr;
-#endif
   br_x509_pubkeyfingerprint_context *x509_insecure = nullptr;
 
   LOG_HEAP_SIZE("_connectSSL.start");
@@ -998,7 +987,6 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) {
     br_x509_pubkeyfingerprint_init(x509_insecure, _fingerprint1, _fingerprint2, _recv_fingerprint, _fingerprint_any);
     br_ssl_engine_set_x509(_eng, &x509_insecure->vtable);
 
-  #ifdef USE_MQTT_TLS_CA_CERT
     if (!_insecure) {
       x509_minimal = (br_x509_minimal_context*) malloc(sizeof(br_x509_minimal_context));
       if (!x509_minimal) break;
@@ -1011,7 +999,6 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) {
       if (cfg_time > now) { now = cfg_time; }
       br_x509_minimal_set_time(x509_minimal, now / 86400 + 719528, now % 86400);
     }
-  #endif
     LOG_HEAP_SIZE("_connectSSL after DecoderContext allocation");
 
     // ============================================================
@@ -1050,9 +1037,7 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) {
     LOG_HEAP_SIZE("_connectSSL.end, freeing StackThunk");
 #endif // ESP8266
 
-  #ifdef USE_MQTT_TLS_CA_CERT
-    free(x509_minimal);
-  #endif
+    free(x509_minimal);   // safe to call if nullptr
     free(x509_insecure);
     LOG_HEAP_SIZE("_connectSSL after release of Priv Key");
     return ret;
@@ -1065,9 +1050,7 @@ bool WiFiClientSecure_light::_connectSSL(const char* hostName) {
 #ifdef ESP8266
   stack_thunk_light_del_ref();
 #endif
-#ifdef USE_MQTT_TLS_CA_CERT
-  free(x509_minimal);
-#endif
+  free(x509_minimal);   // safe to call if nullptr
   free(x509_insecure);
   LOG_HEAP_SIZE("_connectSSL clean_on_error");
   return false;
diff --git a/lib/libesp32/Berry/Makefile b/lib/libesp32/Berry/Makefile
index 531661bc2..f9d61125d 100644
--- a/lib/libesp32/Berry/Makefile
+++ b/lib/libesp32/Berry/Makefile
@@ -10,6 +10,8 @@ SRCPATH   = src default
 GENERATE  = generate
 CONFIG    = default/berry_conf.h
 COC		  = tools/coc/coc
+PY        = python3
+PYCOC     = tools/pycoc/main.py
 CONST_TAB = $(GENERATE)/be_const_strtab.h
 MAKE_COC  = $(MAKE) -C tools/coc
 
@@ -18,6 +20,7 @@ ifeq ($(OS), Windows_NT) # Windows
     LFLAGS    += -Wl,--out-implib,berry.lib # export symbols lib for dll linked
     TARGET    := $(TARGET).exe
     COC       := $(COC).exe
+    PY        := $(PY).exe
 else
     CFLAGS    += -DUSE_READLINE_LIB
     LIBS      += -lreadline -ldl
@@ -92,7 +95,7 @@ uninstall:
 
 prebuild: $(COC) $(GENERATE)
 	$(MSG) [Prebuild] generate resources
-	$(Q) $(COC) -o $(GENERATE) $(SRCPATH) -c $(CONFIG)
+	$(Q) $(PY) $(PYCOC) -o $(GENERATE) $(SRCPATH) -c $(CONFIG)
 	$(MSG) done
 
 clean:
diff --git a/lib/libesp32/Berry/default/be_animate_lib.c b/lib/libesp32/Berry/default/be_animate_lib.c
index db6052653..398f87b66 100644
--- a/lib/libesp32/Berry/default/be_animate_lib.c
+++ b/lib/libesp32/Berry/default/be_animate_lib.c
@@ -20,17 +20,17 @@ be_local_closure(Animate_rotate_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 8]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("closure", 1548407746, 7),
-    /* K2   */  be_nested_string("code", -114201356, 4),
-    /* K3   */  be_nested_string("push", -2022703139, 4),
-    /* K4   */  be_nested_string("animate", -409180496, 7),
-    /* K5   */  be_nested_string("ins_ramp", 1068049360, 8),
-    /* K6   */  be_nested_string("ins_goto", 1342843963, 8),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(closure),
+    /* K2   */  be_nested_str(code),
+    /* K3   */  be_nested_str(push),
+    /* K4   */  be_nested_str(animate),
+    /* K5   */  be_nested_str(ins_ramp),
+    /* K6   */  be_nested_str(ins_goto),
     /* K7   */  be_const_int(0),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[25]) {  /* code */
       0x60140003,  //  0000  GETGBL	R5	G3
       0x5C180000,  //  0001  MOVE	R6	R0
@@ -72,9 +72,9 @@ be_local_class(Animate_rotate,
     &be_class_Animate_engine,
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(Animate_rotate_init_closure) },
+        { be_const_key(init, -1), be_const_closure(Animate_rotate_init_closure) },
     })),
-    (be_nested_const_str("Animate_rotate", -787188142, 14))
+    be_str_literal("Animate_rotate")
 );
 
 /********************************************************************
@@ -91,15 +91,15 @@ be_local_closure(Animate_from_to_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("closure", 1548407746, 7),
-    /* K2   */  be_nested_string("code", -114201356, 4),
-    /* K3   */  be_nested_string("push", -2022703139, 4),
-    /* K4   */  be_nested_string("animate", -409180496, 7),
-    /* K5   */  be_nested_string("ins_ramp", 1068049360, 8),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(closure),
+    /* K2   */  be_nested_str(code),
+    /* K3   */  be_nested_str(push),
+    /* K4   */  be_nested_str(animate),
+    /* K5   */  be_nested_str(ins_ramp),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[16]) {  /* code */
       0x60140003,  //  0000  GETGBL	R5	G3
       0x5C180000,  //  0001  MOVE	R6	R0
@@ -132,9 +132,9 @@ be_local_class(Animate_from_to,
     &be_class_Animate_engine,
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(Animate_from_to_init_closure) },
+        { be_const_key(init, -1), be_const_closure(Animate_from_to_init_closure) },
     })),
-    (be_nested_const_str("Animate_from_to", 1699049867, 15))
+    be_str_literal("Animate_from_to")
 );
 
 /********************************************************************
@@ -151,18 +151,18 @@ be_local_closure(Animate_back_forth_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 9]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("closure", 1548407746, 7),
-    /* K2   */  be_nested_string("code", -114201356, 4),
-    /* K3   */  be_nested_string("push", -2022703139, 4),
-    /* K4   */  be_nested_string("animate", -409180496, 7),
-    /* K5   */  be_nested_string("ins_ramp", 1068049360, 8),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(closure),
+    /* K2   */  be_nested_str(code),
+    /* K3   */  be_nested_str(push),
+    /* K4   */  be_nested_str(animate),
+    /* K5   */  be_nested_str(ins_ramp),
     /* K6   */  be_const_int(2),
-    /* K7   */  be_nested_string("ins_goto", 1342843963, 8),
+    /* K7   */  be_nested_str(ins_goto),
     /* K8   */  be_const_int(0),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[34]) {  /* code */
       0x60140003,  //  0000  GETGBL	R5	G3
       0x5C180000,  //  0001  MOVE	R6	R0
@@ -213,9 +213,9 @@ be_local_class(Animate_back_forth,
     &be_class_Animate_engine,
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(Animate_back_forth_init_closure) },
+        { be_const_key(init, -1), be_const_closure(Animate_back_forth_init_closure) },
     })),
-    (be_nested_const_str("Animate_back_forth", 5319526, 18))
+    be_str_literal("Animate_back_forth")
 );
 
 /********************************************************************
@@ -232,12 +232,12 @@ be_local_closure(Animate_ins_goto_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("pc_rel", 991921176, 6),
-    /* K1   */  be_nested_string("pc_abs", 920256495, 6),
-    /* K2   */  be_nested_string("duration", 799079693, 8),
+    /* K0   */  be_nested_str(pc_rel),
+    /* K1   */  be_nested_str(pc_abs),
+    /* K2   */  be_nested_str(duration),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x90020001,  //  0000  SETMBR	R0	K0	R1
       0x90020202,  //  0001  SETMBR	R0	K1	R2
@@ -257,12 +257,12 @@ be_local_class(Animate_ins_goto,
     NULL,
     be_nested_map(4,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("pc_rel", 991921176, 6, -1), be_const_var(0) },
-        { be_nested_key("duration", 799079693, 8, -1), be_const_var(2) },
-        { be_nested_key("pc_abs", 920256495, 6, -1), be_const_var(1) },
-        { be_nested_key("init", 380752755, 4, 2), be_const_closure(Animate_ins_goto_init_closure) },
+        { be_const_key(pc_rel, -1), be_const_var(0) },
+        { be_const_key(duration, -1), be_const_var(2) },
+        { be_const_key(pc_abs, -1), be_const_var(1) },
+        { be_const_key(init, 2), be_const_closure(Animate_ins_goto_init_closure) },
     })),
-    (be_nested_const_str("Animate_ins_goto", 1667367043, 16))
+    be_str_literal("Animate_ins_goto")
 );
 
 /********************************************************************
@@ -279,12 +279,12 @@ be_local_closure(Animate_ins_ramp_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("a", -468965076, 1),
-    /* K1   */  be_nested_string("b", -418632219, 1),
-    /* K2   */  be_nested_string("duration", 799079693, 8),
+    /* K0   */  be_nested_str(a),
+    /* K1   */  be_nested_str(b),
+    /* K2   */  be_nested_str(duration),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x90020001,  //  0000  SETMBR	R0	K0	R1
       0x90020202,  //  0001  SETMBR	R0	K1	R2
@@ -304,12 +304,12 @@ be_local_class(Animate_ins_ramp,
     NULL,
     be_nested_map(4,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("a", -468965076, 1, -1), be_const_var(0) },
-        { be_nested_key("b", -418632219, 1, 2), be_const_var(1) },
-        { be_nested_key("duration", 799079693, 8, -1), be_const_var(2) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(Animate_ins_ramp_init_closure) },
+        { be_const_key(a, -1), be_const_var(0) },
+        { be_const_key(b, 2), be_const_var(1) },
+        { be_const_key(duration, -1), be_const_var(2) },
+        { be_const_key(init, -1), be_const_closure(Animate_ins_ramp_init_closure) },
     })),
-    (be_nested_const_str("Animate_ins_ramp", 785058280, 16))
+    be_str_literal("Animate_ins_ramp")
 );
 
 /********************************************************************
@@ -326,15 +326,15 @@ be_local_closure(Animate_engine_run,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("millis", 1214679063, 6),
-    /* K2   */  be_nested_string("value", 1113510858, 5),
-    /* K3   */  be_nested_string("ins_time", -1314721743, 8),
-    /* K4   */  be_nested_string("running", 343848780, 7),
-    /* K5   */  be_nested_string("add_driver", 1654458371, 10),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(millis),
+    /* K2   */  be_nested_str(value),
+    /* K3   */  be_nested_str(ins_time),
+    /* K4   */  be_nested_str(running),
+    /* K5   */  be_nested_str(add_driver),
     }),
-    (be_nested_const_str("run", 718098122, 3)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_run,
+    &be_const_str_solidified,
     ( &(const binstruction[19]) {  /* code */
       0x4C0C0000,  //  0000  LDNIL	R3
       0x1C0C0203,  //  0001  EQ	R3	R1	R3
@@ -375,14 +375,14 @@ be_local_closure(Animate_engine_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("code", -114201356, 4),
-    /* K1   */  be_nested_string("pc", 1313756516, 2),
+    /* K0   */  be_nested_str(code),
+    /* K1   */  be_nested_str(pc),
     /* K2   */  be_const_int(0),
-    /* K3   */  be_nested_string("ins_time", -1314721743, 8),
-    /* K4   */  be_nested_string("running", 343848780, 7),
+    /* K3   */  be_nested_str(ins_time),
+    /* K4   */  be_nested_str(running),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 8]) {  /* code */
       0x60040012,  //  0000  GETGBL	R1	G18
       0x7C040000,  //  0001  CALL	R1	0
@@ -412,12 +412,12 @@ be_local_closure(Animate_engine_autorun,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("run", 718098122, 3),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("add_driver", 1654458371, 10),
+    /* K0   */  be_nested_str(run),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(add_driver),
     }),
-    (be_nested_const_str("autorun", 1447527407, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_autorun,
+    &be_const_str_solidified,
     ( &(const binstruction[ 9]) {  /* code */
       0x8C0C0100,  //  0000  GETMET	R3	R0	K0
       0x5C140200,  //  0001  MOVE	R5	R1
@@ -448,12 +448,12 @@ be_local_closure(Animate_engine_stop,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("running", 343848780, 7),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("remove_driver", 1030243768, 13),
+    /* K0   */  be_nested_str(running),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(remove_driver),
     }),
-    (be_nested_const_str("stop", -883741979, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_stop,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0x50040000,  //  0000  LDBOOL	R1	0	0
       0x90020001,  //  0001  SETMBR	R0	K0	R1
@@ -482,10 +482,10 @@ be_local_closure(Animate_engine_is_running,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("running", 343848780, 7),
+    /* K0   */  be_nested_str(running),
     }),
-    (be_nested_const_str("is_running", -2068120035, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_is_running,
+    &be_const_str_solidified,
     ( &(const binstruction[ 2]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x80040200,  //  0001  RET	1	R1
@@ -509,10 +509,10 @@ be_local_closure(Animate_engine_every_50ms,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("animate", -409180496, 7),
+    /* K0   */  be_nested_str(animate),
     }),
-    (be_nested_const_str("every_50ms", -1911083288, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_every_50ms,
+    &be_const_str_solidified,
     ( &(const binstruction[ 3]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x7C040200,  //  0001  CALL	R1	1
@@ -537,31 +537,31 @@ be_local_closure(Animate_engine_animate,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[22]) {     /* constants */
-    /* K0   */  be_nested_string("running", 343848780, 7),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("millis", 1214679063, 6),
-    /* K3   */  be_nested_string("ins_time", -1314721743, 8),
-    /* K4   */  be_nested_string("pc", 1313756516, 2),
-    /* K5   */  be_nested_string("code", -114201356, 4),
+    /* K0   */  be_nested_str(running),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(millis),
+    /* K3   */  be_nested_str(ins_time),
+    /* K4   */  be_nested_str(pc),
+    /* K5   */  be_nested_str(code),
     /* K6   */  be_const_int(0),
-    /* K7   */  be_nested_string("internal_error", -1775809127, 14),
-    /* K8   */  be_nested_string("Animate pc is out of range", 1854929421, 26),
-    /* K9   */  be_nested_string("animate", -409180496, 7),
-    /* K10  */  be_nested_string("ins_ramp", 1068049360, 8),
-    /* K11  */  be_nested_string("closure", 1548407746, 7),
-    /* K12  */  be_nested_string("duration", 799079693, 8),
-    /* K13  */  be_nested_string("value", 1113510858, 5),
-    /* K14  */  be_nested_string("scale_uint", -1204156202, 10),
-    /* K15  */  be_nested_string("a", -468965076, 1),
-    /* K16  */  be_nested_string("b", -418632219, 1),
+    /* K7   */  be_nested_str(internal_error),
+    /* K8   */  be_nested_str(Animate_X20pc_X20is_X20out_X20of_X20range),
+    /* K9   */  be_nested_str(animate),
+    /* K10  */  be_nested_str(ins_ramp),
+    /* K11  */  be_nested_str(closure),
+    /* K12  */  be_nested_str(duration),
+    /* K13  */  be_nested_str(value),
+    /* K14  */  be_nested_str(scale_uint),
+    /* K15  */  be_nested_str(a),
+    /* K16  */  be_nested_str(b),
     /* K17  */  be_const_int(1),
-    /* K18  */  be_nested_string("ins_goto", 1342843963, 8),
-    /* K19  */  be_nested_string("pc_rel", 991921176, 6),
-    /* K20  */  be_nested_string("pc_abs", 920256495, 6),
-    /* K21  */  be_nested_string("unknown instruction", 1093911841, 19),
+    /* K18  */  be_nested_str(ins_goto),
+    /* K19  */  be_nested_str(pc_rel),
+    /* K20  */  be_nested_str(pc_abs),
+    /* K21  */  be_nested_str(unknown_X20instruction),
     }),
-    (be_nested_const_str("animate", -409180496, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_animate,
+    &be_const_str_solidified,
     ( &(const binstruction[99]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x740A0000,  //  0001  JMPT	R2	#0003
@@ -676,21 +676,21 @@ be_local_class(Animate_engine,
     NULL,
     be_nested_map(13,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("code", -114201356, 4, -1), be_const_var(0) },
-        { be_nested_key("run", 718098122, 3, 4), be_const_closure(Animate_engine_run_closure) },
-        { be_nested_key("running", 343848780, 7, 8), be_const_var(4) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(Animate_engine_init_closure) },
-        { be_nested_key("autorun", 1447527407, 7, -1), be_const_closure(Animate_engine_autorun_closure) },
-        { be_nested_key("value", 1113510858, 5, -1), be_const_var(5) },
-        { be_nested_key("stop", -883741979, 4, 3), be_const_closure(Animate_engine_stop_closure) },
-        { be_nested_key("pc", 1313756516, 2, -1), be_const_var(2) },
-        { be_nested_key("is_running", -2068120035, 10, 11), be_const_closure(Animate_engine_is_running_closure) },
-        { be_nested_key("every_50ms", -1911083288, 10, 10), be_const_closure(Animate_engine_every_50ms_closure) },
-        { be_nested_key("animate", -409180496, 7, -1), be_const_closure(Animate_engine_animate_closure) },
-        { be_nested_key("closure", 1548407746, 7, -1), be_const_var(1) },
-        { be_nested_key("ins_time", -1314721743, 8, 9), be_const_var(3) },
+        { be_const_key(code, -1), be_const_var(0) },
+        { be_const_key(run, 4), be_const_closure(Animate_engine_run_closure) },
+        { be_const_key(running, 8), be_const_var(4) },
+        { be_const_key(init, -1), be_const_closure(Animate_engine_init_closure) },
+        { be_const_key(autorun, -1), be_const_closure(Animate_engine_autorun_closure) },
+        { be_const_key(value, -1), be_const_var(5) },
+        { be_const_key(stop, 3), be_const_closure(Animate_engine_stop_closure) },
+        { be_const_key(pc, -1), be_const_var(2) },
+        { be_const_key(is_running, 11), be_const_closure(Animate_engine_is_running_closure) },
+        { be_const_key(every_50ms, 10), be_const_closure(Animate_engine_every_50ms_closure) },
+        { be_const_key(animate, -1), be_const_closure(Animate_engine_animate_closure) },
+        { be_const_key(closure, -1), be_const_var(1) },
+        { be_const_key(ins_time, 9), be_const_var(3) },
     })),
-    (be_nested_const_str("Animate_engine", 1498417667, 14))
+    be_str_literal("Animate_engine")
 );
 
 /********************************************************************
@@ -700,12 +700,12 @@ be_local_module(animate,
     "animate",
     be_nested_map(6,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("rotate", -1510671094, 6, 2), be_const_class(be_class_Animate_rotate) },
-        { be_nested_key("from_to", 21625507, 7, 3), be_const_class(be_class_Animate_from_to) },
-        { be_nested_key("back_forth", -1629925234, 10, -1), be_const_class(be_class_Animate_back_forth) },
-        { be_nested_key("ins_goto", 1342843963, 8, -1), be_const_class(be_class_Animate_ins_goto) },
-        { be_nested_key("ins_ramp", 1068049360, 8, -1), be_const_class(be_class_Animate_ins_ramp) },
-        { be_nested_key("engine", -301606853, 6, -1), be_const_class(be_class_Animate_engine) },
+        { be_const_key(rotate, 2), be_const_class(be_class_Animate_rotate) },
+        { be_const_key(from_to, 3), be_const_class(be_class_Animate_from_to) },
+        { be_const_key(back_forth, -1), be_const_class(be_class_Animate_back_forth) },
+        { be_const_key(ins_goto, -1), be_const_class(be_class_Animate_ins_goto) },
+        { be_const_key(ins_ramp, -1), be_const_class(be_class_Animate_ins_ramp) },
+        { be_const_key(engine, -1), be_const_class(be_class_Animate_engine) },
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(animate);
diff --git a/lib/libesp32/Berry/default/be_autoconf_lib.c b/lib/libesp32/Berry/default/be_autoconf_lib.c
index 3d864a988..da41707c7 100644
--- a/lib/libesp32/Berry/default/be_autoconf_lib.c
+++ b/lib/libesp32/Berry/default/be_autoconf_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: page_autoconf_ctl
 ********************************************************************/
-be_local_closure(page_autoconf_ctl,   /* name */
+be_local_closure(Autoconf_page_autoconf_ctl,   /* name */
   be_nested_proto(
     13,                          /* nstack */
     1,                          /* argc */
@@ -21,50 +21,50 @@ be_local_closure(page_autoconf_ctl,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[41]) {     /* constants */
-    /* K0   */  be_nested_string("webserver", 1572454038, 9),
-    /* K1   */  be_nested_string("string", 398550328, 6),
-    /* K2   */  be_nested_string("path", -2071507658, 4),
-    /* K3   */  be_nested_string("check_privileged_access", -602033328, 23),
-    /* K4   */  be_nested_string("has_arg", 424878688, 7),
-    /* K5   */  be_nested_string("reapply", -516027964, 7),
-    /* K6   */  be_nested_string("tasmota", 424643812, 7),
-    /* K7   */  be_nested_string("log", 1062293841, 3),
-    /* K8   */  be_nested_string("CFG: removing first time marker", 2125556683, 31),
+    /* K0   */  be_nested_str(webserver),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(path),
+    /* K3   */  be_nested_str(check_privileged_access),
+    /* K4   */  be_nested_str(has_arg),
+    /* K5   */  be_nested_str(reapply),
+    /* K6   */  be_nested_str(tasmota),
+    /* K7   */  be_nested_str(log),
+    /* K8   */  be_nested_str(CFG_X3A_X20removing_X20first_X20time_X20marker),
     /* K9   */  be_const_int(2),
-    /* K10  */  be_nested_string("clear_first_time", 632769909, 16),
-    /* K11  */  be_nested_string("redirect", 389758641, 8),
-    /* K12  */  be_nested_string("/?rst=", 580074707, 6),
-    /* K13  */  be_nested_string("zip", -1417514060, 3),
-    /* K14  */  be_nested_string("CFG: removing autoconf files", -280262326, 28),
-    /* K15  */  be_nested_string("delete_all_configs", -1912899718, 18),
-    /* K16  */  be_nested_string("arg", 1047474471, 3),
-    /* K17  */  be_nested_string("reset", 1695364032, 5),
-    /* K18  */  be_nested_string("format", -1180859054, 6),
-    /* K19  */  be_nested_string("https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", -1551440987, 70),
-    /* K20  */  be_nested_string("arch", -1342162999, 4),
-    /* K21  */  be_nested_string("CFG: downloading '%s'", 589480701, 21),
-    /* K22  */  be_nested_string("%s.autoconf", -734583772, 11),
-    /* K23  */  be_nested_string("webclient", -218578150, 9),
-    /* K24  */  be_nested_string("begin", 1748273790, 5),
-    /* K25  */  be_nested_string("GET", -1763262857, 3),
-    /* K26  */  be_nested_string("return code=%i", 2127454401, 14),
-    /* K27  */  be_nested_string("connection_error", 1358926260, 16),
-    /* K28  */  be_nested_string("write_file", -1117308417, 10),
-    /* K29  */  be_nested_string("close", 667630371, 5),
-    /* K30  */  be_nested_string("value_error", 773297791, 11),
-    /* K31  */  be_nested_string("Unknown command", 1830905432, 15),
-    /* K32  */  be_nested_string("CFG: Exception> '%s' - %s", 1228874553, 25),
-    /* K33  */  be_nested_string("content_start", -1357458227, 13),
-    /* K34  */  be_nested_string("Parameter error", -454925258, 15),
-    /* K35  */  be_nested_string("content_send_style", 1087907647, 18),
-    /* K36  */  be_nested_string("content_send", 1673733649, 12),
-    /* K37  */  be_nested_string("<p style='width:340px;'><b>Exception:</b><br>'%s'<br>%s</p>", -42402214, 59),
-    /* K38  */  be_nested_string("content_button", 1956476087, 14),
-    /* K39  */  be_nested_string("BUTTON_CONFIGURATION", 70820856, 20),
-    /* K40  */  be_nested_string("content_stop", 658554751, 12),
+    /* K10  */  be_nested_str(clear_first_time),
+    /* K11  */  be_nested_str(redirect),
+    /* K12  */  be_nested_str(_X2F_X3Frst_X3D),
+    /* K13  */  be_nested_str(zip),
+    /* K14  */  be_nested_str(CFG_X3A_X20removing_X20autoconf_X20files),
+    /* K15  */  be_nested_str(delete_all_configs),
+    /* K16  */  be_nested_str(arg),
+    /* K17  */  be_nested_str(reset),
+    /* K18  */  be_nested_str(format),
+    /* K19  */  be_nested_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf),
+    /* K20  */  be_nested_str(arch),
+    /* K21  */  be_nested_str(CFG_X3A_X20downloading_X20_X27_X25s_X27),
+    /* K22  */  be_nested_str(_X25s_X2Eautoconf),
+    /* K23  */  be_nested_str(webclient),
+    /* K24  */  be_nested_str(begin),
+    /* K25  */  be_nested_str(GET),
+    /* K26  */  be_nested_str(return_X20code_X3D_X25i),
+    /* K27  */  be_nested_str(connection_error),
+    /* K28  */  be_nested_str(write_file),
+    /* K29  */  be_nested_str(close),
+    /* K30  */  be_nested_str(value_error),
+    /* K31  */  be_nested_str(Unknown_X20command),
+    /* K32  */  be_nested_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s),
+    /* K33  */  be_nested_str(content_start),
+    /* K34  */  be_nested_str(Parameter_X20error),
+    /* K35  */  be_nested_str(content_send_style),
+    /* K36  */  be_nested_str(content_send),
+    /* K37  */  be_nested_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E),
+    /* K38  */  be_nested_str(content_button),
+    /* K39  */  be_nested_str(BUTTON_CONFIGURATION),
+    /* K40  */  be_nested_str(content_stop),
     }),
-    (be_nested_const_str("page_autoconf_ctl", -1841585800, 17)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_page_autoconf_ctl,
+    &be_const_str_solidified,
     ( &(const binstruction[117]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
@@ -192,7 +192,7 @@ be_local_closure(page_autoconf_ctl,   /* name */
 /********************************************************************
 ** Solidified function: autoexec
 ********************************************************************/
-be_local_closure(autoexec,   /* name */
+be_local_closure(Autoconf_autoexec,   /* name */
   be_nested_proto(
     9,                          /* nstack */
     1,                          /* argc */
@@ -203,41 +203,41 @@ be_local_closure(autoexec,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[32]) {     /* constants */
-    /* K0   */  be_nested_string("_archive", -290407892, 8),
-    /* K1   */  be_nested_string("path", -2071507658, 4),
-    /* K2   */  be_nested_string("#init.bat", -997372219, 9),
-    /* K3   */  be_nested_string("is_first_time", 275242384, 13),
-    /* K4   */  be_nested_string("exists", 1002329533, 6),
-    /* K5   */  be_nested_string("set_first_time", -1183719746, 14),
-    /* K6   */  be_nested_string("run_bat", -1758063998, 7),
-    /* K7   */  be_nested_string("tasmota", 424643812, 7),
-    /* K8   */  be_nested_string("log", 1062293841, 3),
-    /* K9   */  be_nested_string("CFG: 'init.bat' done, restarting", 1569670677, 32),
+    /* K0   */  be_nested_str(_archive),
+    /* K1   */  be_nested_str(path),
+    /* K2   */  be_nested_str(_X23init_X2Ebat),
+    /* K3   */  be_nested_str(is_first_time),
+    /* K4   */  be_nested_str(exists),
+    /* K5   */  be_nested_str(set_first_time),
+    /* K6   */  be_nested_str(run_bat),
+    /* K7   */  be_nested_str(tasmota),
+    /* K8   */  be_nested_str(log),
+    /* K9   */  be_nested_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting),
     /* K10  */  be_const_int(2),
-    /* K11  */  be_nested_string("cmd", -158181397, 3),
-    /* K12  */  be_nested_string("Restart 1", -790511441, 9),
-    /* K13  */  be_nested_string("#display.ini", 182218220, 12),
-    /* K14  */  be_nested_string("gpio", -1656812038, 4),
-    /* K15  */  be_nested_string("pin_used", -261112684, 8),
-    /* K16  */  be_nested_string("OPTION_A", 1133299440, 8),
-    /* K17  */  be_nested_string("display.ini", -1648793295, 11),
-    /* K18  */  be_nested_string("CFG: skipping 'display.ini' because already present in file-system", -329418032, 66),
-    /* K19  */  be_nested_string("display", 1164572437, 7),
-    /* K20  */  be_nested_string("r", -150190315, 1),
-    /* K21  */  be_nested_string("read", -824204347, 4),
-    /* K22  */  be_nested_string("close", 667630371, 5),
-    /* K23  */  be_nested_string("start", 1697318111, 5),
-    /* K24  */  be_nested_string("#autoexec.bat", -912076799, 13),
-    /* K25  */  be_nested_string("CFG: running ", -1816632762, 13),
+    /* K11  */  be_nested_str(cmd),
+    /* K12  */  be_nested_str(Restart_X201),
+    /* K13  */  be_nested_str(_X23display_X2Eini),
+    /* K14  */  be_nested_str(gpio),
+    /* K15  */  be_nested_str(pin_used),
+    /* K16  */  be_nested_str(OPTION_A),
+    /* K17  */  be_nested_str(display_X2Eini),
+    /* K18  */  be_nested_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem),
+    /* K19  */  be_nested_str(display),
+    /* K20  */  be_nested_str(r),
+    /* K21  */  be_nested_str(read),
+    /* K22  */  be_nested_str(close),
+    /* K23  */  be_nested_str(start),
+    /* K24  */  be_nested_str(_X23autoexec_X2Ebat),
+    /* K25  */  be_nested_str(CFG_X3A_X20running_X20),
     /* K26  */  be_const_int(3),
-    /* K27  */  be_nested_string("CFG: ran  ", -715396824, 10),
-    /* K28  */  be_nested_string("#autoexec.be", 1181757091, 12),
-    /* K29  */  be_nested_string("CFG: loading ", -284605793, 13),
-    /* K30  */  be_nested_string("load", -435725847, 4),
-    /* K31  */  be_nested_string("CFG: loaded  ", -584693758, 13),
+    /* K27  */  be_nested_str(CFG_X3A_X20ran_X20_X20),
+    /* K28  */  be_nested_str(_X23autoexec_X2Ebe),
+    /* K29  */  be_nested_str(CFG_X3A_X20loading_X20),
+    /* K30  */  be_nested_str(load),
+    /* K31  */  be_nested_str(CFG_X3A_X20loaded_X20_X20),
     }),
-    (be_nested_const_str("autoexec", -618105405, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_autoexec,
+    &be_const_str_solidified,
     ( &(const binstruction[107]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x4C080000,  //  0001  LDNIL	R2
@@ -355,7 +355,7 @@ be_local_closure(autoexec,   /* name */
 /********************************************************************
 ** Solidified function: run_bat
 ********************************************************************/
-be_local_closure(run_bat,   /* name */
+be_local_closure(Autoconf_run_bat,   /* name */
   be_nested_proto(
     13,                          /* nstack */
     2,                          /* argc */
@@ -366,19 +366,19 @@ be_local_closure(run_bat,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("r", -150190315, 1),
-    /* K2   */  be_nested_string("readline", 1212709927, 8),
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(r),
+    /* K2   */  be_nested_str(readline),
     /* K3   */  be_const_int(0),
-    /* K4   */  be_nested_string("\n", 252472541, 1),
-    /* K5   */  be_nested_string("tasmota", 424643812, 7),
-    /* K6   */  be_nested_string("cmd", -158181397, 3),
-    /* K7   */  be_nested_string("close", 667630371, 5),
-    /* K8   */  be_nested_string("format", -1180859054, 6),
-    /* K9   */  be_nested_string("CFG: could not run %s (%s - %s)", 1428829580, 31),
+    /* K4   */  be_nested_str(_X0A),
+    /* K5   */  be_nested_str(tasmota),
+    /* K6   */  be_nested_str(cmd),
+    /* K7   */  be_nested_str(close),
+    /* K8   */  be_nested_str(format),
+    /* K9   */  be_nested_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29),
     }),
-    (be_nested_const_str("run_bat", -1758063998, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_run_bat,
+    &be_const_str_solidified,
     ( &(const binstruction[54]) {  /* code */
       0xA40A0000,  //  0000  IMPORT	R2	K0
       0x4C0C0000,  //  0001  LDNIL	R3
@@ -443,7 +443,7 @@ be_local_closure(run_bat,   /* name */
 /********************************************************************
 ** Solidified function: page_autoconf_mgr
 ********************************************************************/
-be_local_closure(page_autoconf_mgr,   /* name */
+be_local_closure(Autoconf_page_autoconf_mgr,   /* name */
   be_nested_proto(
     19,                          /* nstack */
     1,                          /* argc */
@@ -454,48 +454,48 @@ be_local_closure(page_autoconf_mgr,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[39]) {     /* constants */
-    /* K0   */  be_nested_string("webserver", 1572454038, 9),
-    /* K1   */  be_nested_string("string", 398550328, 6),
-    /* K2   */  be_nested_string("check_privileged_access", -602033328, 23),
-    /* K3   */  be_nested_string("content_start", -1357458227, 13),
-    /* K4   */  be_nested_string("Auto-configuration", 1665006109, 18),
-    /* K5   */  be_nested_string("content_send_style", 1087907647, 18),
-    /* K6   */  be_nested_string("content_send", 1673733649, 12),
-    /* K7   */  be_nested_string("<p><small>&nbsp;(This feature requires an internet connection)</small></p>", -1575700810, 74),
-    /* K8   */  be_nested_string("get_current_module_path", -1088293888, 23),
-    /* K9   */  be_nested_string("tr", 1195724803, 2),
-    /* K10  */  be_nested_string("get_current_module_name", -1915696556, 23),
-    /* K11  */  be_nested_string("_", -636741266, 1),
-    /* K12  */  be_nested_string(" ", 621580159, 1),
-    /* K13  */  be_nested_string("_error", 1132109656, 6),
-    /* K14  */  be_nested_string("&lt;Error: apply new or remove&gt;", -1439459347, 34),
-    /* K15  */  be_nested_string("&lt;None&gt;", -1692801798, 12),
-    /* K16  */  be_nested_string("<fieldset><style>.bdis{background:#888;}.bdis:hover{background:#888;}</style>", 842307168, 77),
-    /* K17  */  be_nested_string("format", -1180859054, 6),
-    /* K18  */  be_nested_string("<legend><b title='Autoconfiguration'>&nbsp;Current auto-configuration</b></legend>", -82466516, 82),
-    /* K19  */  be_nested_string("<p>Current configuration: </p><p><b>%s</b></p>", -179311535, 46),
-    /* K20  */  be_nested_string("<p><form id=reapply style='display: block;' action='/ac' method='post' ", 546993478, 71),
-    /* K21  */  be_nested_string("onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018, 57),
-    /* K22  */  be_nested_string("<button name='reapply' class='button bgrn'>Re-apply current configuration</button>", -1147033080, 82),
-    /* K23  */  be_nested_string("</form></p>", -748395557, 11),
-    /* K24  */  be_nested_string("<p></p></fieldset><p></p>", 2052843416, 25),
-    /* K25  */  be_nested_string("<legend><b title='New autoconf'>&nbsp;Select new auto-configuration</b></legend>", 1926223891, 80),
-    /* K26  */  be_nested_string("<p><form id=zip style='display: block;' action='/ac' method='post' ", -261345130, 67),
-    /* K27  */  be_nested_string("onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", -502554737, 94),
-    /* K28  */  be_nested_string("<label>Choose a device configuration:</label><br>", 1336654704, 49),
-    /* K29  */  be_nested_string("<select name='zip'>", -47042760, 19),
-    /* K30  */  be_nested_string("load_templates", -781097163, 14),
-    /* K31  */  be_nested_string("<option value='reset'>&lt;Remove autoconf&gt;</option>", -300347541, 54),
-    /* K32  */  be_nested_string("<option value='%s'>%s</option>", 510303524, 30),
-    /* K33  */  be_nested_string("stop_iteration", -121173395, 14),
-    /* K34  */  be_nested_string("</select><p></p>", 1863865923, 16),
-    /* K35  */  be_nested_string("<button name='zipapply' class='button bgrn'>Apply configuration</button>", 1205771629, 72),
-    /* K36  */  be_nested_string("content_button", 1956476087, 14),
-    /* K37  */  be_nested_string("BUTTON_CONFIGURATION", 70820856, 20),
-    /* K38  */  be_nested_string("content_stop", 658554751, 12),
+    /* K0   */  be_nested_str(webserver),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(check_privileged_access),
+    /* K3   */  be_nested_str(content_start),
+    /* K4   */  be_nested_str(Auto_X2Dconfiguration),
+    /* K5   */  be_nested_str(content_send_style),
+    /* K6   */  be_nested_str(content_send),
+    /* K7   */  be_nested_str(_X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E),
+    /* K8   */  be_nested_str(get_current_module_path),
+    /* K9   */  be_nested_str(tr),
+    /* K10  */  be_nested_str(get_current_module_name),
+    /* K11  */  be_nested_str(_),
+    /* K12  */  be_nested_str(_X20),
+    /* K13  */  be_nested_str(_error),
+    /* K14  */  be_nested_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B),
+    /* K15  */  be_nested_str(_X26lt_X3BNone_X26gt_X3B),
+    /* K16  */  be_nested_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E),
+    /* K17  */  be_nested_str(format),
+    /* K18  */  be_nested_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E),
+    /* K19  */  be_nested_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E),
+    /* K20  */  be_nested_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20),
+    /* K21  */  be_nested_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E),
+    /* K22  */  be_nested_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E),
+    /* K23  */  be_nested_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E),
+    /* K24  */  be_nested_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E),
+    /* K25  */  be_nested_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E),
+    /* K26  */  be_nested_str(_X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20),
+    /* K27  */  be_nested_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E),
+    /* K28  */  be_nested_str(_X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E),
+    /* K29  */  be_nested_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E),
+    /* K30  */  be_nested_str(load_templates),
+    /* K31  */  be_nested_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E),
+    /* K32  */  be_nested_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E),
+    /* K33  */  be_nested_str(stop_iteration),
+    /* K34  */  be_nested_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E),
+    /* K35  */  be_nested_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E),
+    /* K36  */  be_nested_str(content_button),
+    /* K37  */  be_nested_str(BUTTON_CONFIGURATION),
+    /* K38  */  be_nested_str(content_stop),
     }),
-    (be_nested_const_str("page_autoconf_mgr", -651030265, 17)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_page_autoconf_mgr,
+    &be_const_str_solidified,
     ( &(const binstruction[124]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
@@ -630,7 +630,7 @@ be_local_closure(page_autoconf_mgr,   /* name */
 /********************************************************************
 ** Solidified function: get_current_module_name
 ********************************************************************/
-be_local_closure(get_current_module_name,   /* name */
+be_local_closure(Autoconf_get_current_module_name,   /* name */
   be_nested_proto(
     3,                          /* nstack */
     1,                          /* argc */
@@ -641,11 +641,11 @@ be_local_closure(get_current_module_name,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_archive", -290407892, 8),
+    /* K0   */  be_nested_str(_archive),
     /* K1   */  be_const_int(0),
     }),
-    (be_nested_const_str("get_current_module_name", -1915696556, 23)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_current_module_name,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x5405FFF5,  //  0000  LDINT	R1	-10
       0x40060201,  //  0001  CONNECT	R1	K1	R1
@@ -661,7 +661,7 @@ be_local_closure(get_current_module_name,   /* name */
 /********************************************************************
 ** Solidified function: delete_all_configs
 ********************************************************************/
-be_local_closure(delete_all_configs,   /* name */
+be_local_closure(Autoconf_delete_all_configs,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     1,                          /* argc */
@@ -672,18 +672,18 @@ be_local_closure(delete_all_configs,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 9]) {     /* constants */
-    /* K0   */  be_nested_string("path", -2071507658, 4),
-    /* K1   */  be_nested_string("string", 398550328, 6),
-    /* K2   */  be_nested_string("listdir", 2005220720, 7),
-    /* K3   */  be_nested_string("/", 705468254, 1),
-    /* K4   */  be_nested_string("find", -1108310694, 4),
-    /* K5   */  be_nested_string(".autoconf", -1770288208, 9),
+    /* K0   */  be_nested_str(path),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(listdir),
+    /* K3   */  be_nested_str(_X2F),
+    /* K4   */  be_nested_str(find),
+    /* K5   */  be_nested_str(_X2Eautoconf),
     /* K6   */  be_const_int(0),
-    /* K7   */  be_nested_string("remove", -611183107, 6),
-    /* K8   */  be_nested_string("stop_iteration", -121173395, 14),
+    /* K7   */  be_nested_str(remove),
+    /* K8   */  be_nested_str(stop_iteration),
     }),
-    (be_nested_const_str("delete_all_configs", -1912899718, 18)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_delete_all_configs,
+    &be_const_str_solidified,
     ( &(const binstruction[25]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
@@ -719,7 +719,7 @@ be_local_closure(delete_all_configs,   /* name */
 /********************************************************************
 ** Solidified function: set_first_time
 ********************************************************************/
-be_local_closure(set_first_time,   /* name */
+be_local_closure(Autoconf_set_first_time,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -730,12 +730,12 @@ be_local_closure(set_first_time,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("/.autoconf", -2082892903, 10),
-    /* K1   */  be_nested_string("w", -234078410, 1),
-    /* K2   */  be_nested_string("close", 667630371, 5),
+    /* K0   */  be_nested_str(_X2F_X2Eautoconf),
+    /* K1   */  be_nested_str(w),
+    /* K2   */  be_nested_str(close),
     }),
-    (be_nested_const_str("set_first_time", -1183719746, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_first_time,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0x60040011,  //  0000  GETGBL	R1	G17
       0x58080000,  //  0001  LDCONST	R2	K0
@@ -753,7 +753,7 @@ be_local_closure(set_first_time,   /* name */
 /********************************************************************
 ** Solidified function: load_templates
 ********************************************************************/
-be_local_closure(load_templates,   /* name */
+be_local_closure(Autoconf_load_templates,   /* name */
   be_nested_proto(
     15,                          /* nstack */
     1,                          /* argc */
@@ -764,30 +764,30 @@ be_local_closure(load_templates,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[21]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("json", 916562499, 4),
-    /* K2   */  be_nested_string("format", -1180859054, 6),
-    /* K3   */  be_nested_string("https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", -637415251, 72),
-    /* K4   */  be_nested_string("tasmota", 424643812, 7),
-    /* K5   */  be_nested_string("arch", -1342162999, 4),
-    /* K6   */  be_nested_string("log", 1062293841, 3),
-    /* K7   */  be_nested_string("CFG: loading '%s'", -2009661199, 17),
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(json),
+    /* K2   */  be_nested_str(format),
+    /* K3   */  be_nested_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson),
+    /* K4   */  be_nested_str(tasmota),
+    /* K5   */  be_nested_str(arch),
+    /* K6   */  be_nested_str(log),
+    /* K7   */  be_nested_str(CFG_X3A_X20loading_X20_X27_X25s_X27),
     /* K8   */  be_const_int(3),
-    /* K9   */  be_nested_string("webclient", -218578150, 9),
-    /* K10  */  be_nested_string("begin", 1748273790, 5),
-    /* K11  */  be_nested_string("GET", -1763262857, 3),
-    /* K12  */  be_nested_string("CFG: return_code=%i", 2059897320, 19),
+    /* K9   */  be_nested_str(webclient),
+    /* K10  */  be_nested_str(begin),
+    /* K11  */  be_nested_str(GET),
+    /* K12  */  be_nested_str(CFG_X3A_X20return_code_X3D_X25i),
     /* K13  */  be_const_int(2),
-    /* K14  */  be_nested_string("get_string", -99119327, 10),
-    /* K15  */  be_nested_string("close", 667630371, 5),
-    /* K16  */  be_nested_string("load", -435725847, 4),
-    /* K17  */  be_nested_string("CFG: loaded '%s'", 1699028828, 16),
-    /* K18  */  be_nested_string("find", -1108310694, 4),
-    /* K19  */  be_nested_string("files", 1055342736, 5),
-    /* K20  */  be_nested_string("CFG: exception '%s' - '%s'", -199559383, 26),
+    /* K14  */  be_nested_str(get_string),
+    /* K15  */  be_nested_str(close),
+    /* K16  */  be_nested_str(load),
+    /* K17  */  be_nested_str(CFG_X3A_X20loaded_X20_X27_X25s_X27),
+    /* K18  */  be_nested_str(find),
+    /* K19  */  be_nested_str(files),
+    /* K20  */  be_nested_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27),
     }),
-    (be_nested_const_str("load_templates", -781097163, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_load_templates,
+    &be_const_str_solidified,
     ( &(const binstruction[86]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
@@ -884,7 +884,7 @@ be_local_closure(load_templates,   /* name */
 /********************************************************************
 ** Solidified function: web_add_config_button
 ********************************************************************/
-be_local_closure(web_add_config_button,   /* name */
+be_local_closure(Autoconf_web_add_config_button,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     1,                          /* argc */
@@ -895,12 +895,12 @@ be_local_closure(web_add_config_button,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("webserver", 1572454038, 9),
-    /* K1   */  be_nested_string("content_send", 1673733649, 12),
-    /* K2   */  be_nested_string("<p><form id=ac action='ac' style='display: block;' method='get'><button>&#129668; Auto-configuration</button></form></p>", 452285201, 120),
+    /* K0   */  be_nested_str(webserver),
+    /* K1   */  be_nested_str(content_send),
+    /* K2   */  be_nested_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E),
     }),
-    (be_nested_const_str("web_add_config_button", 639674325, 21)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_web_add_config_button,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0x8C080301,  //  0001  GETMET	R2	R1	K1
@@ -916,7 +916,7 @@ be_local_closure(web_add_config_button,   /* name */
 /********************************************************************
 ** Solidified function: is_first_time
 ********************************************************************/
-be_local_closure(is_first_time,   /* name */
+be_local_closure(Autoconf_is_first_time,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     1,                          /* argc */
@@ -927,12 +927,12 @@ be_local_closure(is_first_time,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("path", -2071507658, 4),
-    /* K1   */  be_nested_string("exists", 1002329533, 6),
-    /* K2   */  be_nested_string("/.autoconf", -2082892903, 10),
+    /* K0   */  be_nested_str(path),
+    /* K1   */  be_nested_str(exists),
+    /* K2   */  be_nested_str(_X2F_X2Eautoconf),
     }),
-    (be_nested_const_str("is_first_time", 275242384, 13)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_is_first_time,
+    &be_const_str_solidified,
     ( &(const binstruction[ 8]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0x8C080301,  //  0001  GETMET	R2	R1	K1
@@ -951,7 +951,7 @@ be_local_closure(is_first_time,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(Autoconf_init,   /* name */
   be_nested_proto(
     12,                          /* nstack */
     1,                          /* argc */
@@ -962,26 +962,26 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[17]) {     /* constants */
-    /* K0   */  be_nested_str_literal("path"),
-    /* K1   */  be_nested_str_literal("string"),
-    /* K2   */  be_nested_str_literal("listdir"),
-    /* K3   */  be_nested_str_literal("/"),
-    /* K4   */  be_nested_str_literal("tasmota"),
-    /* K5   */  be_nested_str_literal("add_driver"),
+    /* K0   */  be_nested_str(path),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(listdir),
+    /* K3   */  be_nested_str(_X2F),
+    /* K4   */  be_nested_str(tasmota),
+    /* K5   */  be_nested_str(add_driver),
     /* K6   */  be_const_int(0),
-    /* K7   */  be_nested_str_literal("find"),
-    /* K8   */  be_nested_str_literal(".autoconf"),
-    /* K9   */  be_nested_str_literal("format"),
-    /* K10  */  be_nested_str_literal("CFG: multiple autoconf files found, aborting ('%s' + '%s')"),
-    /* K11  */  be_nested_str_literal("_error"),
+    /* K7   */  be_nested_str(find),
+    /* K8   */  be_nested_str(_X2Eautoconf),
+    /* K9   */  be_nested_str(format),
+    /* K10  */  be_nested_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29),
+    /* K11  */  be_nested_str(_error),
     /* K12  */  be_const_int(1),
-    /* K13  */  be_nested_str_literal("log"),
-    /* K14  */  be_nested_str_literal("CFG: no '*.autoconf' file found"),
+    /* K13  */  be_nested_str(log),
+    /* K14  */  be_nested_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found),
     /* K15  */  be_const_int(2),
-    /* K16  */  be_nested_str_literal("_archive"),
+    /* K16  */  be_nested_str(_archive),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[51]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
@@ -1043,7 +1043,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: preinit
 ********************************************************************/
-be_local_closure(preinit,   /* name */
+be_local_closure(Autoconf_preinit,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     1,                          /* argc */
@@ -1054,19 +1054,19 @@ be_local_closure(preinit,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("_archive", -290407892, 8),
-    /* K1   */  be_nested_string("path", -2071507658, 4),
-    /* K2   */  be_nested_string("#preinit.be", 687035716, 11),
-    /* K3   */  be_nested_string("exists", 1002329533, 6),
-    /* K4   */  be_nested_string("tasmota", 424643812, 7),
-    /* K5   */  be_nested_string("log", 1062293841, 3),
-    /* K6   */  be_nested_string("CFG: loading ", -284605793, 13),
+    /* K0   */  be_nested_str(_archive),
+    /* K1   */  be_nested_str(path),
+    /* K2   */  be_nested_str(_X23preinit_X2Ebe),
+    /* K3   */  be_nested_str(exists),
+    /* K4   */  be_nested_str(tasmota),
+    /* K5   */  be_nested_str(log),
+    /* K6   */  be_nested_str(CFG_X3A_X20loading_X20),
     /* K7   */  be_const_int(3),
-    /* K8   */  be_nested_string("load", -435725847, 4),
-    /* K9   */  be_nested_string("CFG: loaded  ", -584693758, 13),
+    /* K8   */  be_nested_str(load),
+    /* K9   */  be_nested_str(CFG_X3A_X20loaded_X20_X20),
     }),
-    (be_nested_const_str("preinit", -1572960196, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_preinit,
+    &be_const_str_solidified,
     ( &(const binstruction[26]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x4C080000,  //  0001  LDNIL	R2
@@ -1103,7 +1103,7 @@ be_local_closure(preinit,   /* name */
 /********************************************************************
 ** Solidified function: reset
 ********************************************************************/
-be_local_closure(reset,   /* name */
+be_local_closure(Autoconf_reset,   /* name */
   be_nested_proto(
     12,                          /* nstack */
     1,                          /* argc */
@@ -1114,22 +1114,22 @@ be_local_closure(reset,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[13]) {     /* constants */
-    /* K0   */  be_nested_string("path", -2071507658, 4),
-    /* K1   */  be_nested_string("string", 398550328, 6),
-    /* K2   */  be_nested_string("listdir", 2005220720, 7),
-    /* K3   */  be_nested_string("/", 705468254, 1),
+    /* K0   */  be_nested_str(path),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(listdir),
+    /* K3   */  be_nested_str(_X2F),
     /* K4   */  be_const_int(0),
-    /* K5   */  be_nested_string("find", -1108310694, 4),
-    /* K6   */  be_nested_string(".autoconf", -1770288208, 9),
-    /* K7   */  be_nested_string("remove", -611183107, 6),
-    /* K8   */  be_nested_string("format", -1180859054, 6),
-    /* K9   */  be_nested_string("CFG: removed file '%s'", 2048602473, 22),
+    /* K5   */  be_nested_str(find),
+    /* K6   */  be_nested_str(_X2Eautoconf),
+    /* K7   */  be_nested_str(remove),
+    /* K8   */  be_nested_str(format),
+    /* K9   */  be_nested_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27),
     /* K10  */  be_const_int(1),
-    /* K11  */  be_nested_string("_archive", -290407892, 8),
-    /* K12  */  be_nested_string("_error", 1132109656, 6),
+    /* K11  */  be_nested_str(_archive),
+    /* K12  */  be_nested_str(_error),
     }),
-    (be_nested_const_str("reset", 1695364032, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_reset,
+    &be_const_str_solidified,
     ( &(const binstruction[35]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
@@ -1175,7 +1175,7 @@ be_local_closure(reset,   /* name */
 /********************************************************************
 ** Solidified function: web_add_handler
 ********************************************************************/
-be_local_closure(web_add_handler,   /* name */
+be_local_closure(Autoconf_web_add_handler,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     1,                          /* argc */
@@ -1196,10 +1196,10 @@ be_local_closure(web_add_handler,   /* name */
         NULL,                       /* no sub protos */
         1,                          /* has constants */
         ( &(const bvalue[ 1]) {     /* constants */
-        /* K0   */  be_nested_string("page_autoconf_mgr", -651030265, 17),
+        /* K0   */  be_nested_str(page_autoconf_mgr),
         }),
-        (be_nested_const_str("<lambda>", 607256038, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str__X3Clambda_X3E,
+        &be_const_str_solidified,
         ( &(const binstruction[ 4]) {  /* code */
           0x68000000,  //  0000  GETUPV	R0	U0
           0x8C000100,  //  0001  GETMET	R0	R0	K0
@@ -1219,10 +1219,10 @@ be_local_closure(web_add_handler,   /* name */
         NULL,                       /* no sub protos */
         1,                          /* has constants */
         ( &(const bvalue[ 1]) {     /* constants */
-        /* K0   */  be_nested_string("page_autoconf_ctl", -1841585800, 17),
+        /* K0   */  be_nested_str(page_autoconf_ctl),
         }),
-        (be_nested_const_str("<lambda>", 607256038, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str__X3Clambda_X3E,
+        &be_const_str_solidified,
         ( &(const binstruction[ 4]) {  /* code */
           0x68000000,  //  0000  GETUPV	R0	U0
           0x8C000100,  //  0001  GETMET	R0	R0	K0
@@ -1233,14 +1233,14 @@ be_local_closure(web_add_handler,   /* name */
     }),
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("webserver", 1572454038, 9),
-    /* K1   */  be_nested_string("on", 1630810064, 2),
-    /* K2   */  be_nested_string("/ac", -390315318, 3),
-    /* K3   */  be_nested_string("HTTP_GET", 1722467738, 8),
-    /* K4   */  be_nested_string("HTTP_POST", 1999554144, 9),
+    /* K0   */  be_nested_str(webserver),
+    /* K1   */  be_nested_str(on),
+    /* K2   */  be_nested_str(_X2Fac),
+    /* K3   */  be_nested_str(HTTP_GET),
+    /* K4   */  be_nested_str(HTTP_POST),
     }),
-    (be_nested_const_str("web_add_handler", -304792334, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_web_add_handler,
+    &be_const_str_solidified,
     ( &(const binstruction[13]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0x8C080301,  //  0001  GETMET	R2	R1	K1
@@ -1264,7 +1264,7 @@ be_local_closure(web_add_handler,   /* name */
 /********************************************************************
 ** Solidified function: clear_first_time
 ********************************************************************/
-be_local_closure(clear_first_time,   /* name */
+be_local_closure(Autoconf_clear_first_time,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     1,                          /* argc */
@@ -1275,12 +1275,12 @@ be_local_closure(clear_first_time,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("path", -2071507658, 4),
-    /* K1   */  be_nested_string("remove", -611183107, 6),
-    /* K2   */  be_nested_string("/.autoconf", -2082892903, 10),
+    /* K0   */  be_nested_str(path),
+    /* K1   */  be_nested_str(remove),
+    /* K2   */  be_nested_str(_X2F_X2Eautoconf),
     }),
-    (be_nested_const_str("clear_first_time", 632769909, 16)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_clear_first_time,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0x8C080301,  //  0001  GETMET	R2	R1	K1
@@ -1296,7 +1296,7 @@ be_local_closure(clear_first_time,   /* name */
 /********************************************************************
 ** Solidified function: get_current_module_path
 ********************************************************************/
-be_local_closure(get_current_module_path,   /* name */
+be_local_closure(Autoconf_get_current_module_path,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
@@ -1307,10 +1307,10 @@ be_local_closure(get_current_module_path,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("_archive", -290407892, 8),
+    /* K0   */  be_nested_str(_archive),
     }),
-    (be_nested_const_str("get_current_module_path", -1088293888, 23)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_current_module_path,
+    &be_const_str_solidified,
     ( &(const binstruction[ 2]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x80040200,  //  0001  RET	1	R1
@@ -1328,26 +1328,26 @@ be_local_class(Autoconf,
     NULL,
     be_nested_map(18,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("page_autoconf_ctl", -1841585800, 17, -1), be_const_closure(page_autoconf_ctl_closure) },
-        { be_nested_key("autoexec", -618105405, 8, -1), be_const_closure(autoexec_closure) },
-        { be_nested_key("run_bat", -1758063998, 7, 6), be_const_closure(run_bat_closure) },
-        { be_nested_key("page_autoconf_mgr", -651030265, 17, -1), be_const_closure(page_autoconf_mgr_closure) },
-        { be_nested_key("get_current_module_name", -1915696556, 23, -1), be_const_closure(get_current_module_name_closure) },
-        { be_nested_key("delete_all_configs", -1912899718, 18, 13), be_const_closure(delete_all_configs_closure) },
-        { be_nested_key("set_first_time", -1183719746, 14, -1), be_const_closure(set_first_time_closure) },
-        { be_nested_key("load_templates", -781097163, 14, -1), be_const_closure(load_templates_closure) },
-        { be_nested_key("_archive", -290407892, 8, -1), be_const_var(0) },
-        { be_nested_key("web_add_config_button", 639674325, 21, -1), be_const_closure(web_add_config_button_closure) },
-        { be_nested_key("is_first_time", 275242384, 13, -1), be_const_closure(is_first_time_closure) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
-        { be_nested_key("preinit", -1572960196, 7, 5), be_const_closure(preinit_closure) },
-        { be_nested_key("reset", 1695364032, 5, 17), be_const_closure(reset_closure) },
-        { be_nested_key("web_add_handler", -304792334, 15, 4), be_const_closure(web_add_handler_closure) },
-        { be_nested_key("clear_first_time", 632769909, 16, 11), be_const_closure(clear_first_time_closure) },
-        { be_nested_key("_error", 1132109656, 6, -1), be_const_var(1) },
-        { be_nested_key("get_current_module_path", -1088293888, 23, -1), be_const_closure(get_current_module_path_closure) },
+        { be_const_key(page_autoconf_ctl, -1), be_const_closure(Autoconf_page_autoconf_ctl_closure) },
+        { be_const_key(autoexec, -1), be_const_closure(Autoconf_autoexec_closure) },
+        { be_const_key(run_bat, 17), be_const_closure(Autoconf_run_bat_closure) },
+        { be_const_key(page_autoconf_mgr, -1), be_const_closure(Autoconf_page_autoconf_mgr_closure) },
+        { be_const_key(get_current_module_path, 13), be_const_closure(Autoconf_get_current_module_path_closure) },
+        { be_const_key(preinit, -1), be_const_closure(Autoconf_preinit_closure) },
+        { be_const_key(clear_first_time, -1), be_const_closure(Autoconf_clear_first_time_closure) },
+        { be_const_key(load_templates, -1), be_const_closure(Autoconf_load_templates_closure) },
+        { be_const_key(_archive, -1), be_const_var(0) },
+        { be_const_key(web_add_config_button, -1), be_const_closure(Autoconf_web_add_config_button_closure) },
+        { be_const_key(is_first_time, -1), be_const_closure(Autoconf_is_first_time_closure) },
+        { be_const_key(web_add_handler, -1), be_const_closure(Autoconf_web_add_handler_closure) },
+        { be_const_key(delete_all_configs, 4), be_const_closure(Autoconf_delete_all_configs_closure) },
+        { be_const_key(reset, 5), be_const_closure(Autoconf_reset_closure) },
+        { be_const_key(get_current_module_name, 11), be_const_closure(Autoconf_get_current_module_name_closure) },
+        { be_const_key(init, 6), be_const_closure(Autoconf_init_closure) },
+        { be_const_key(_error, -1), be_const_var(1) },
+        { be_const_key(set_first_time, -1), be_const_closure(Autoconf_set_first_time_closure) },
     })),
-    (be_nested_const_str("Autoconf", 984011268, 8))
+    be_str_literal("Autoconf")
 );
 
 /********************************************************************
@@ -1366,8 +1366,8 @@ be_local_closure(_anonymous_,   /* name */
     ( &(const bvalue[ 1]) {     /* constants */
     /* K0   */  be_const_class(be_class_Autoconf),
     }),
-    (be_nested_const_str("_anonymous_", 1957281476, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str__anonymous_,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x58040000,  //  0000  LDCONST	R1	K0
       0xB4000000,  //  0001  CLASS	K0
@@ -1387,7 +1387,7 @@ be_local_module(autoconf,
     "autoconf",
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(_anonymous__closure) },
+        { be_const_key(init, -1), be_const_closure(_anonymous__closure) },
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(autoconf);
diff --git a/lib/libesp32/Berry/default/be_display_lib.c b/lib/libesp32/Berry/default/be_display_lib.c
index 2d8bf9ff7..3943396fc 100644
--- a/lib/libesp32/Berry/default/be_display_lib.c
+++ b/lib/libesp32/Berry/default/be_display_lib.c
@@ -11,7 +11,7 @@
 
 // Tasmota specific
 
-extern int be_disp_start(bvm *vm);
+extern int be_ntv_display_start(bvm *vm);
 
 /********************************************************************
 ** Solidified module: display
@@ -20,7 +20,7 @@ be_local_module(display,
     "display",
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("start", 1697318111, 5, -1), be_const_func(be_disp_start) },
+        { be_const_key(start, -1), be_const_func(be_ntv_display_start) },
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(display);
diff --git a/lib/libesp32/Berry/default/be_driverlib.c b/lib/libesp32/Berry/default/be_driverlib.c
index 13f1d211e..45a611382 100644
--- a/lib/libesp32/Berry/default/be_driverlib.c
+++ b/lib/libesp32/Berry/default/be_driverlib.c
@@ -9,7 +9,7 @@
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(Driver_init,   /* name */
   be_nested_proto(
     1,                          /* nstack */
     1,                          /* argc */
@@ -20,8 +20,8 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     0,                          /* has constants */
     NULL,                       /* no const */
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 1]) {  /* code */
       0x80000000,  //  0000  RET	0
     })
@@ -33,7 +33,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: get_tasmota
 ********************************************************************/
-be_local_closure(get_tasmota,   /* name */
+be_local_closure(Driver_get_tasmota,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
@@ -44,10 +44,10 @@ be_local_closure(get_tasmota,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
+    /* K0   */  be_nested_str(tasmota),
     }),
-    (be_nested_const_str("get_tasmota", 334356779, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_tasmota,
+    &be_const_str_solidified,
     ( &(const binstruction[ 2]) {  /* code */
       0xB8060000,  //  0000  GETNGBL	R1	K0
       0x80040200,  //  0001  RET	1	R1
@@ -60,7 +60,7 @@ be_local_closure(get_tasmota,   /* name */
 /********************************************************************
 ** Solidified function: add_cmd
 ********************************************************************/
-be_local_closure(add_cmd,   /* name */
+be_local_closure(Driver_add_cmd,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     3,                          /* argc */
@@ -82,8 +82,8 @@ be_local_closure(add_cmd,   /* name */
         NULL,                       /* no sub protos */
         0,                          /* has constants */
         NULL,                       /* no const */
-        (be_nested_const_str("<lambda>", 607256038, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str__X3Clambda_X3E,
+        &be_const_str_solidified,
         ( &(const binstruction[ 8]) {  /* code */
           0x68100000,  //  0000  GETUPV	R4	U0
           0x68140001,  //  0001  GETUPV	R5	U1
@@ -98,11 +98,11 @@ be_local_closure(add_cmd,   /* name */
     }),
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("add_cmd", -933336417, 7),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(add_cmd),
     }),
-    (be_nested_const_str("add_cmd", -933336417, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_add_cmd,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0xB80E0000,  //  0000  GETNGBL	R3	K0
       0x8C0C0701,  //  0001  GETMET	R3	R3	K1
@@ -125,24 +125,24 @@ be_local_class(Driver,
     NULL,
     be_nested_map(16,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("web_add_main_button", -334599632, 19, 14), be_const_var(4) },
-        { be_nested_key("web_add_console_button", -813531104, 22, -1), be_const_var(7) },
-        { be_nested_key("web_add_management_button", -1556090110, 25, 8), be_const_var(5) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
-        { be_nested_key("json_append", -1292948012, 11, -1), be_const_var(10) },
-        { be_nested_key("web_add_config_button", 639674325, 21, 7), be_const_var(6) },
-        { be_nested_key("every_100ms", 1546407804, 11, -1), be_const_var(1) },
-        { be_nested_key("display", 1164572437, 7, -1), be_const_var(12) },
-        { be_nested_key("web_add_button", -757092238, 14, 13), be_const_var(3) },
-        { be_nested_key("every_second", 2075451465, 12, -1), be_const_var(0) },
-        { be_nested_key("save_before_restart", 1253239338, 19, -1), be_const_var(8) },
-        { be_nested_key("get_tasmota", 334356779, 11, -1), be_const_closure(get_tasmota_closure) },
-        { be_nested_key("web_sensor", -1394870324, 10, 6), be_const_var(9) },
-        { be_nested_key("web_add_handler", -304792334, 15, -1), be_const_var(2) },
-        { be_nested_key("button_pressed", 1694209616, 14, 1), be_const_var(11) },
-        { be_nested_key("add_cmd", -933336417, 7, -1), be_const_closure(add_cmd_closure) },
+        { be_const_key(web_add_main_button, 14), be_const_var(4) },
+        { be_const_key(web_add_console_button, -1), be_const_var(7) },
+        { be_const_key(web_add_management_button, 8), be_const_var(5) },
+        { be_const_key(init, -1), be_const_closure(Driver_init_closure) },
+        { be_const_key(json_append, -1), be_const_var(10) },
+        { be_const_key(web_add_config_button, 7), be_const_var(6) },
+        { be_const_key(every_100ms, -1), be_const_var(1) },
+        { be_const_key(display, -1), be_const_var(12) },
+        { be_const_key(web_add_button, 13), be_const_var(3) },
+        { be_const_key(every_second, -1), be_const_var(0) },
+        { be_const_key(save_before_restart, -1), be_const_var(8) },
+        { be_const_key(get_tasmota, -1), be_const_closure(Driver_get_tasmota_closure) },
+        { be_const_key(web_sensor, 6), be_const_var(9) },
+        { be_const_key(web_add_handler, -1), be_const_var(2) },
+        { be_const_key(button_pressed, 1), be_const_var(11) },
+        { be_const_key(add_cmd, -1), be_const_closure(Driver_add_cmd_closure) },
     })),
-    (be_nested_const_str("Driver", -718580993, 6))
+    be_str_literal("Driver")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_energylib.c b/lib/libesp32/Berry/default/be_energylib.c
index e115a8507..cbdddbfca 100644
--- a/lib/libesp32/Berry/default/be_energylib.c
+++ b/lib/libesp32/Berry/default/be_energylib.c
@@ -12,32 +12,127 @@
 extern struct ENERGY Energy;
 /*
 
+_energy = nil   # avoid compilation error
+energy = module("energy")
+energy._ptr = nil
+
 def init(m)
     import global
     global._energy = energy_struct(m._ptr)
     return m
 end
+energy.init = init
 
 def read()
     return _energy.tomap()
 end
+energy.read = read
 
 def member(k)
     return _energy.(k)
 end
+energy.member = member
 
 def setmember(k, v)
     _energy.(k) = v
 end
+energy.setmember = setmember
 
 import solidify
-solidify.dump(m.init)
+solidify.dump(energy)
 */
 
+
+/********************************************************************
+** Solidified function: member
+********************************************************************/
+be_local_closure(energy_member,   /* name */
+  be_nested_proto(
+    2,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 1]) {     /* constants */
+    /* K0   */  be_nested_str(_energy),
+    }),
+    &be_const_str_member,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 3]) {  /* code */
+      0xB8060000,  //  0000  GETNGBL	R1	K0
+      0x88040200,  //  0001  GETMBR	R1	R1	R0
+      0x80040200,  //  0002  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: setmember
+********************************************************************/
+be_local_closure(energy_setmember,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 1]) {     /* constants */
+    /* K0   */  be_nested_str(_energy),
+    }),
+    &be_const_str_setmember,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 3]) {  /* code */
+      0xB80A0000,  //  0000  GETNGBL	R2	K0
+      0x90080001,  //  0001  SETMBR	R2	R0	R1
+      0x80000000,  //  0002  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: read
+********************************************************************/
+be_local_closure(energy_read,   /* name */
+  be_nested_proto(
+    2,                          /* nstack */
+    0,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(_energy),
+    /* K1   */  be_nested_str(tomap),
+    }),
+    &be_const_str_read,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0xB8020000,  //  0000  GETNGBL	R0	K0
+      0x8C000101,  //  0001  GETMET	R0	R0	K1
+      0x7C000200,  //  0002  CALL	R0	1
+      0x80040000,  //  0003  RET	1	R0
+    })
+  )
+);
+/*******************************************************************/
+
+
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(energy_init,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -48,13 +143,13 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_string("global", 503252654, 6),
-    /* K1   */  be_nested_string("_energy", 535372070, 7),
-    /* K2   */  be_nested_string("energy_struct", 1655792843, 13),
-    /* K3   */  be_nested_string("_ptr", 306235816, 4),
+    /* K0   */  be_nested_str(global),
+    /* K1   */  be_nested_str(_energy),
+    /* K2   */  be_nested_str(energy_struct),
+    /* K3   */  be_nested_str(_ptr),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 6]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xB80A0400,  //  0001  GETNGBL	R2	K2
@@ -69,100 +164,23 @@ be_local_closure(init,   /* name */
 
 
 /********************************************************************
-** Solidified function: read
+** Solidified module: energy
 ********************************************************************/
-be_local_closure(read,   /* name */
-  be_nested_proto(
-    2,                          /* nstack */
-    0,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_energy", 535372070, 7),
-    /* K1   */  be_nested_string("tomap", 612167626, 5),
-    }),
-    (be_nested_const_str("<anonymous>", 1160973142, 11)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 4]) {  /* code */
-      0xB8020000,  //  0000  GETNGBL	R0	K0
-      0x8C000101,  //  0001  GETMET	R0	R0	K1
-      0x7C000200,  //  0002  CALL	R0	1
-      0x80040000,  //  0003  RET	1	R0
-    })
-  )
+be_local_module(energy,
+    "energy",
+    be_nested_map(5,
+    ( (struct bmapnode*) &(const bmapnode[]) {
+        { be_const_key(init, -1), be_const_closure(energy_init_closure) },
+        { be_const_key(member, 2), be_const_closure(energy_member_closure) },
+        { be_const_key(_ptr, 3), be_const_comptr(&Energy) },
+        { be_const_key(setmember, -1), be_const_closure(energy_setmember_closure) },
+        { be_const_key(read, -1), be_const_closure(energy_read_closure) },
+    }))
 );
-/*******************************************************************/
-
-/********************************************************************
-** Solidified function: member
-********************************************************************/
-be_local_closure(member,   /* name */
-  be_nested_proto(
-    2,                          /* nstack */
-    1,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("_energy", 535372070, 7),
-    }),
-    (be_nested_const_str("member", 719708611, 6)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 3]) {  /* code */
-      0xB8060000,  //  0000  GETNGBL	R1	K0
-      0x88040200,  //  0001  GETMBR	R1	R1	R0
-      0x80040200,  //  0002  RET	1	R1
-    })
-  )
-);
-/*******************************************************************/
+BE_EXPORT_VARIABLE be_define_const_native_module(energy);
+/********************************************************************/
 
 
-/********************************************************************
-** Solidified function: setmember
-********************************************************************/
-be_local_closure(setmember,   /* name */
-  be_nested_proto(
-    3,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("_energy", 535372070, 7),
-    }),
-    (be_nested_const_str("setmember", 1432909441, 9)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 3]) {  /* code */
-      0xB80A0000,  //  0000  GETNGBL	R2	K0
-      0x90080001,  //  0001  SETMBR	R2	R0	R1
-      0x80000000,  //  0002  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/* @const_object_info_begin
-module energy (scope: global) {
-    _ptr, comptr(&Energy)
-    init, closure(init_closure)
-
-    read, closure(read_closure)
-    member, closure(member_closure)
-    setmember, closure(setmember_closure)
-}
-@const_object_info_end */
-#include "../generate/be_fixed_energy.h"
+//  { be_const_key(_ptr, 3), be_const_comptr(&Energy) }, /* patch */
 
 #endif // USE_ENERGY_SENSOR
\ No newline at end of file
diff --git a/lib/libesp32/Berry/default/be_i2c_axp192_lib.c b/lib/libesp32/Berry/default/be_i2c_axp192_lib.c
index 7449780d6..4f9f02307 100644
--- a/lib/libesp32/Berry/default/be_i2c_axp192_lib.c
+++ b/lib/libesp32/Berry/default/be_i2c_axp192_lib.c
@@ -6,7 +6,7 @@
 /********************************************************************
 ** Solidified function: get_warning_level
 ********************************************************************/
-be_local_closure(get_warning_level,   /* name */
+be_local_closure(AXP192_get_warning_level,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -17,11 +17,11 @@ be_local_closure(get_warning_level,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read12", -3890326, 6),
+    /* K0   */  be_nested_str(read12),
     /* K1   */  be_const_int(1),
     }),
-    (be_nested_const_str("get_warning_level", 1737834441, 17)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_warning_level,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0046,  //  0001  LDINT	R3	71
@@ -37,7 +37,7 @@ be_local_closure(get_warning_level,   /* name */
 /********************************************************************
 ** Solidified function: get_vbus_current
 ********************************************************************/
-be_local_closure(get_vbus_current,   /* name */
+be_local_closure(AXP192_get_vbus_current,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -48,11 +48,11 @@ be_local_closure(get_vbus_current,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read12", -3890326, 6),
+    /* K0   */  be_nested_str(read12),
     /* K1   */  be_const_real_hex(0x3EC00000),
     }),
-    (be_nested_const_str("get_vbus_current", 1205347942, 16)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_vbus_current,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E005B,  //  0001  LDINT	R3	92
@@ -68,7 +68,7 @@ be_local_closure(get_vbus_current,   /* name */
 /********************************************************************
 ** Solidified function: set_chg_current
 ********************************************************************/
-be_local_closure(set_chg_current,   /* name */
+be_local_closure(AXP192_set_chg_current,   /* name */
   be_nested_proto(
     8,                          /* nstack */
     2,                          /* argc */
@@ -79,11 +79,11 @@ be_local_closure(set_chg_current,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("write8", -1160975764, 6),
-    /* K1   */  be_nested_string("read8", -1492179129, 5),
+    /* K0   */  be_nested_str(write8),
+    /* K1   */  be_nested_str(read8),
     }),
-    (be_nested_const_str("set_chg_current", 336304386, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_chg_current,
+    &be_const_str_solidified,
     ( &(const binstruction[12]) {  /* code */
       0x8C080100,  //  0000  GETMET	R2	R0	K0
       0x54120032,  //  0001  LDINT	R4	51
@@ -106,7 +106,7 @@ be_local_closure(set_chg_current,   /* name */
 /********************************************************************
 ** Solidified function: get_bat_current
 ********************************************************************/
-be_local_closure(get_bat_current,   /* name */
+be_local_closure(AXP192_get_bat_current,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     1,                          /* argc */
@@ -117,11 +117,11 @@ be_local_closure(get_bat_current,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read13", 12887293, 6),
+    /* K0   */  be_nested_str(read13),
     /* K1   */  be_const_real_hex(0x3F000000),
     }),
-    (be_nested_const_str("get_bat_current", 1912106073, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_bat_current,
+    &be_const_str_solidified,
     ( &(const binstruction[ 9]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0079,  //  0001  LDINT	R3	122
@@ -141,7 +141,7 @@ be_local_closure(get_bat_current,   /* name */
 /********************************************************************
 ** Solidified function: get_bat_power
 ********************************************************************/
-be_local_closure(get_bat_power,   /* name */
+be_local_closure(AXP192_get_bat_power,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -152,11 +152,11 @@ be_local_closure(get_bat_power,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read24", 1808533811, 6),
+    /* K0   */  be_nested_str(read24),
     /* K1   */  be_const_real_hex(0x3A102DE1),
     }),
-    (be_nested_const_str("get_bat_power", -1227592443, 13)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_bat_power,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E006F,  //  0001  LDINT	R3	112
@@ -172,7 +172,7 @@ be_local_closure(get_bat_power,   /* name */
 /********************************************************************
 ** Solidified function: json_append
 ********************************************************************/
-be_local_closure(json_append,   /* name */
+be_local_closure(AXP192_json_append,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
@@ -183,10 +183,10 @@ be_local_closure(json_append,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
+    /* K0   */  be_nested_str(wire),
     }),
-    (be_nested_const_str("json_append", -1292948012, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_json_append,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x74060001,  //  0001  JMPT	R1	#0004
@@ -202,7 +202,7 @@ be_local_closure(json_append,   /* name */
 /********************************************************************
 ** Solidified function: get_vbus_voltage
 ********************************************************************/
-be_local_closure(get_vbus_voltage,   /* name */
+be_local_closure(AXP192_get_vbus_voltage,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -213,11 +213,11 @@ be_local_closure(get_vbus_voltage,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read12", -3890326, 6),
+    /* K0   */  be_nested_str(read12),
     /* K1   */  be_const_real_hex(0x3ADED28A),
     }),
-    (be_nested_const_str("get_vbus_voltage", -1896756895, 16)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_vbus_voltage,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0059,  //  0001  LDINT	R3	90
@@ -233,7 +233,7 @@ be_local_closure(get_vbus_voltage,   /* name */
 /********************************************************************
 ** Solidified function: get_temp
 ********************************************************************/
-be_local_closure(get_temp,   /* name */
+be_local_closure(AXP192_get_temp,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -244,12 +244,12 @@ be_local_closure(get_temp,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("read12", -3890326, 6),
+    /* K0   */  be_nested_str(read12),
     /* K1   */  be_const_real_hex(0x3DCCCCCD),
     /* K2   */  be_const_real_hex(0x4310B333),
     }),
-    (be_nested_const_str("get_temp", -924047810, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_temp,
+    &be_const_str_solidified,
     ( &(const binstruction[ 6]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E005D,  //  0001  LDINT	R3	94
@@ -266,7 +266,7 @@ be_local_closure(get_temp,   /* name */
 /********************************************************************
 ** Solidified function: battery_present
 ********************************************************************/
-be_local_closure(battery_present,   /* name */
+be_local_closure(AXP192_battery_present,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     1,                          /* argc */
@@ -277,13 +277,13 @@ be_local_closure(battery_present,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read", -824204347, 4),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(1),
     }),
-    (be_nested_const_str("battery_present", -706570238, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_battery_present,
+    &be_const_str_solidified,
     ( &(const binstruction[15]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -309,7 +309,7 @@ be_local_closure(battery_present,   /* name */
 /********************************************************************
 ** Solidified function: get_aps_voltage
 ********************************************************************/
-be_local_closure(get_aps_voltage,   /* name */
+be_local_closure(AXP192_get_aps_voltage,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -320,11 +320,11 @@ be_local_closure(get_aps_voltage,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read12", -3890326, 6),
+    /* K0   */  be_nested_str(read12),
     /* K1   */  be_const_real_hex(0x3AB78035),
     }),
-    (be_nested_const_str("get_aps_voltage", -2001930861, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_aps_voltage,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E007D,  //  0001  LDINT	R3	126
@@ -340,7 +340,7 @@ be_local_closure(get_aps_voltage,   /* name */
 /********************************************************************
 ** Solidified function: set_dcdc_enable
 ********************************************************************/
-be_local_closure(set_dcdc_enable,   /* name */
+be_local_closure(AXP192_set_dcdc_enable,   /* name */
   be_nested_proto(
     8,                          /* nstack */
     3,                          /* argc */
@@ -352,13 +352,13 @@ be_local_closure(set_dcdc_enable,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
     /* K0   */  be_const_int(1),
-    /* K1   */  be_nested_string("write_bit", -1633976860, 9),
+    /* K1   */  be_nested_str(write_bit),
     /* K2   */  be_const_int(0),
     /* K3   */  be_const_int(2),
     /* K4   */  be_const_int(3),
     }),
-    (be_nested_const_str("set_dcdc_enable", 1594690786, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_dcdc_enable,
+    &be_const_str_solidified,
     ( &(const binstruction[22]) {  /* code */
       0x1C0C0300,  //  0000  EQ	R3	R1	K0
       0x780E0004,  //  0001  JMPF	R3	#0007
@@ -391,7 +391,7 @@ be_local_closure(set_dcdc_enable,   /* name */
 /********************************************************************
 ** Solidified function: set_ldo_voltage
 ********************************************************************/
-be_local_closure(set_ldo_voltage,   /* name */
+be_local_closure(AXP192_set_ldo_voltage,   /* name */
   be_nested_proto(
     9,                          /* nstack */
     3,                          /* argc */
@@ -403,12 +403,12 @@ be_local_closure(set_ldo_voltage,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 4]) {     /* constants */
     /* K0   */  be_const_int(2),
-    /* K1   */  be_nested_string("write8", -1160975764, 6),
-    /* K2   */  be_nested_string("read8", -1492179129, 5),
+    /* K1   */  be_nested_str(write8),
+    /* K2   */  be_nested_str(read8),
     /* K3   */  be_const_int(3),
     }),
-    (be_nested_const_str("set_ldo_voltage", -204466136, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_ldo_voltage,
+    &be_const_str_solidified,
     ( &(const binstruction[39]) {  /* code */
       0x540E0CE3,  //  0000  LDINT	R3	3300
       0x240C0403,  //  0001  GT	R3	R2	R3
@@ -458,7 +458,7 @@ be_local_closure(set_ldo_voltage,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(AXP192_init,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     1,                          /* argc */
@@ -469,12 +469,12 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("I2C_Driver", 1714501658, 10),
-    /* K1   */  be_nested_string("init", 380752755, 4),
-    /* K2   */  be_nested_string("AXP192", 757230128, 6),
+    /* K0   */  be_nested_str(I2C_Driver),
+    /* K1   */  be_nested_str(init),
+    /* K2   */  be_nested_str(AXP192),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 9]) {  /* code */
       0x60040003,  //  0000  GETGBL	R1	G3
       0x5C080000,  //  0001  MOVE	R2	R0
@@ -494,7 +494,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: get_bat_voltage
 ********************************************************************/
-be_local_closure(get_bat_voltage,   /* name */
+be_local_closure(AXP192_get_bat_voltage,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -505,11 +505,11 @@ be_local_closure(get_bat_voltage,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read12", -3890326, 6),
+    /* K0   */  be_nested_str(read12),
     /* K1   */  be_const_real_hex(0x3A902DE0),
     }),
-    (be_nested_const_str("get_bat_voltage", 706676538, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_bat_voltage,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0077,  //  0001  LDINT	R3	120
@@ -525,7 +525,7 @@ be_local_closure(get_bat_voltage,   /* name */
 /********************************************************************
 ** Solidified function: set_ldo_enable
 ********************************************************************/
-be_local_closure(set_ldo_enable,   /* name */
+be_local_closure(AXP192_set_ldo_enable,   /* name */
   be_nested_proto(
     8,                          /* nstack */
     3,                          /* argc */
@@ -537,11 +537,11 @@ be_local_closure(set_ldo_enable,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
     /* K0   */  be_const_int(2),
-    /* K1   */  be_nested_string("write_bit", -1633976860, 9),
+    /* K1   */  be_nested_str(write_bit),
     /* K2   */  be_const_int(3),
     }),
-    (be_nested_const_str("set_ldo_enable", -1378465255, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_ldo_enable,
+    &be_const_str_solidified,
     ( &(const binstruction[15]) {  /* code */
       0x1C0C0300,  //  0000  EQ	R3	R1	K0
       0x780E0004,  //  0001  JMPF	R3	#0007
@@ -567,7 +567,7 @@ be_local_closure(set_ldo_enable,   /* name */
 /********************************************************************
 ** Solidified function: set_dc_voltage
 ********************************************************************/
-be_local_closure(set_dc_voltage,   /* name */
+be_local_closure(AXP192_set_dc_voltage,   /* name */
   be_nested_proto(
     11,                          /* nstack */
     3,                          /* argc */
@@ -582,11 +582,11 @@ be_local_closure(set_dc_voltage,   /* name */
     /* K1   */  be_const_int(3),
     /* K2   */  be_const_int(0),
     /* K3   */  be_const_int(2),
-    /* K4   */  be_nested_string("write8", -1160975764, 6),
-    /* K5   */  be_nested_string("read8", -1492179129, 5),
+    /* K4   */  be_nested_str(write8),
+    /* K5   */  be_nested_str(read8),
     }),
-    (be_nested_const_str("set_dc_voltage", -2112985360, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_dc_voltage,
+    &be_const_str_solidified,
     ( &(const binstruction[48]) {  /* code */
       0x140C0300,  //  0000  LT	R3	R1	K0
       0x740E0001,  //  0001  JMPT	R3	#0004
@@ -645,7 +645,7 @@ be_local_closure(set_dc_voltage,   /* name */
 /********************************************************************
 ** Solidified function: write_gpio
 ********************************************************************/
-be_local_closure(write_gpio,   /* name */
+be_local_closure(AXP192_write_gpio,   /* name */
   be_nested_proto(
     8,                          /* nstack */
     3,                          /* argc */
@@ -658,11 +658,11 @@ be_local_closure(write_gpio,   /* name */
     ( &(const bvalue[ 4]) {     /* constants */
     /* K0   */  be_const_int(0),
     /* K1   */  be_const_int(2),
-    /* K2   */  be_nested_string("write_bit", -1633976860, 9),
+    /* K2   */  be_nested_str(write_bit),
     /* K3   */  be_const_int(3),
     }),
-    (be_nested_const_str("write_gpio", -2027026962, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_write_gpio,
+    &be_const_str_solidified,
     ( &(const binstruction[21]) {  /* code */
       0x280C0300,  //  0000  GE	R3	R1	K0
       0x780E0007,  //  0001  JMPF	R3	#000A
@@ -694,7 +694,7 @@ be_local_closure(write_gpio,   /* name */
 /********************************************************************
 ** Solidified function: web_sensor
 ********************************************************************/
-be_local_closure(web_sensor,   /* name */
+be_local_closure(AXP192_web_sensor,   /* name */
   be_nested_proto(
     11,                          /* nstack */
     1,                          /* argc */
@@ -705,23 +705,23 @@ be_local_closure(web_sensor,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[14]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("string", 398550328, 6),
-    /* K2   */  be_nested_string("format", -1180859054, 6),
-    /* K3   */  be_nested_string("{s}VBus Voltage{m}%.3f V{e}", 165651270, 27),
-    /* K4   */  be_nested_string("{s}VBus Current{m}%.1f mA{e}", 1032721155, 28),
-    /* K5   */  be_nested_string("{s}Batt Voltage{m}%.3f V{e}", -1110659097, 27),
-    /* K6   */  be_nested_string("{s}Batt Current{m}%.1f mA{e}", 866537156, 28),
-    /* K7   */  be_nested_string("{s}Temp AXP{m}%.1f °C{e}", -1990510004, 25),
-    /* K8   */  be_nested_string("get_vbus_voltage", -1896756895, 16),
-    /* K9   */  be_nested_string("get_bat_voltage", 706676538, 15),
-    /* K10  */  be_nested_string("get_bat_current", 1912106073, 15),
-    /* K11  */  be_nested_string("get_temp", -924047810, 8),
-    /* K12  */  be_nested_string("tasmota", 424643812, 7),
-    /* K13  */  be_nested_string("web_send_decimal", 1407210204, 16),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(format),
+    /* K3   */  be_nested_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D),
+    /* K4   */  be_nested_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D),
+    /* K5   */  be_nested_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D),
+    /* K6   */  be_nested_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D),
+    /* K7   */  be_nested_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D),
+    /* K8   */  be_nested_str(get_vbus_voltage),
+    /* K9   */  be_nested_str(get_bat_voltage),
+    /* K10  */  be_nested_str(get_bat_current),
+    /* K11  */  be_nested_str(get_temp),
+    /* K12  */  be_nested_str(tasmota),
+    /* K13  */  be_nested_str(web_send_decimal),
     }),
-    (be_nested_const_str("web_sensor", -1394870324, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_web_sensor,
+    &be_const_str_solidified,
     ( &(const binstruction[26]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x74060001,  //  0001  JMPT	R1	#0004
@@ -758,7 +758,7 @@ be_local_closure(web_sensor,   /* name */
 /********************************************************************
 ** Solidified function: get_bat_charge_current
 ********************************************************************/
-be_local_closure(get_bat_charge_current,   /* name */
+be_local_closure(AXP192_get_bat_charge_current,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -769,11 +769,11 @@ be_local_closure(get_bat_charge_current,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("read13", 12887293, 6),
+    /* K0   */  be_nested_str(read13),
     /* K1   */  be_const_real_hex(0x3F000000),
     }),
-    (be_nested_const_str("get_bat_charge_current", 1385293050, 22)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_bat_charge_current,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0079,  //  0001  LDINT	R3	122
@@ -789,7 +789,7 @@ be_local_closure(get_bat_charge_current,   /* name */
 /********************************************************************
 ** Solidified function: get_battery_chargin_status
 ********************************************************************/
-be_local_closure(get_battery_chargin_status,   /* name */
+be_local_closure(AXP192_get_battery_chargin_status,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     1,                          /* argc */
@@ -800,13 +800,13 @@ be_local_closure(get_battery_chargin_status,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read", -824204347, 4),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(1),
     }),
-    (be_nested_const_str("get_battery_chargin_status", -2061725725, 26)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_battery_chargin_status,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -824,7 +824,7 @@ be_local_closure(get_battery_chargin_status,   /* name */
 /********************************************************************
 ** Solidified function: get_input_power_status
 ********************************************************************/
-be_local_closure(get_input_power_status,   /* name */
+be_local_closure(AXP192_get_input_power_status,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     1,                          /* argc */
@@ -835,14 +835,14 @@ be_local_closure(get_input_power_status,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read", -824204347, 4),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(0),
     /* K4   */  be_const_int(1),
     }),
-    (be_nested_const_str("get_input_power_status", -192138119, 22)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_input_power_status,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -866,29 +866,29 @@ be_local_class(AXP192,
     &be_class_I2C_Driver,
     be_nested_map(21,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("get_warning_level", 1737834441, 17, -1), be_const_closure(get_warning_level_closure) },
-        { be_nested_key("get_vbus_current", 1205347942, 16, -1), be_const_closure(get_vbus_current_closure) },
-        { be_nested_key("set_chg_current", 336304386, 15, 14), be_const_closure(set_chg_current_closure) },
-        { be_nested_key("get_bat_current", 1912106073, 15, -1), be_const_closure(get_bat_current_closure) },
-        { be_nested_key("get_bat_power", -1227592443, 13, 9), be_const_closure(get_bat_power_closure) },
-        { be_nested_key("json_append", -1292948012, 11, -1), be_const_closure(json_append_closure) },
-        { be_nested_key("get_vbus_voltage", -1896756895, 16, -1), be_const_closure(get_vbus_voltage_closure) },
-        { be_nested_key("get_temp", -924047810, 8, -1), be_const_closure(get_temp_closure) },
-        { be_nested_key("battery_present", -706570238, 15, -1), be_const_closure(battery_present_closure) },
-        { be_nested_key("get_aps_voltage", -2001930861, 15, -1), be_const_closure(get_aps_voltage_closure) },
-        { be_nested_key("set_dcdc_enable", 1594690786, 15, -1), be_const_closure(set_dcdc_enable_closure) },
-        { be_nested_key("set_ldo_voltage", -204466136, 15, 7), be_const_closure(set_ldo_voltage_closure) },
-        { be_nested_key("init", 380752755, 4, 2), be_const_closure(init_closure) },
-        { be_nested_key("get_bat_voltage", 706676538, 15, 18), be_const_closure(get_bat_voltage_closure) },
-        { be_nested_key("set_ldo_enable", -1378465255, 14, -1), be_const_closure(set_ldo_enable_closure) },
-        { be_nested_key("set_dc_voltage", -2112985360, 14, 13), be_const_closure(set_dc_voltage_closure) },
-        { be_nested_key("write_gpio", -2027026962, 10, -1), be_const_closure(write_gpio_closure) },
-        { be_nested_key("web_sensor", -1394870324, 10, -1), be_const_closure(web_sensor_closure) },
-        { be_nested_key("get_bat_charge_current", 1385293050, 22, 19), be_const_closure(get_bat_charge_current_closure) },
-        { be_nested_key("get_battery_chargin_status", -2061725725, 26, -1), be_const_closure(get_battery_chargin_status_closure) },
-        { be_nested_key("get_input_power_status", -192138119, 22, -1), be_const_closure(get_input_power_status_closure) },
+        { be_const_key(get_warning_level, -1), be_const_closure(AXP192_get_warning_level_closure) },
+        { be_const_key(get_vbus_current, -1), be_const_closure(AXP192_get_vbus_current_closure) },
+        { be_const_key(get_aps_voltage, -1), be_const_closure(AXP192_get_aps_voltage_closure) },
+        { be_const_key(get_bat_current, -1), be_const_closure(AXP192_get_bat_current_closure) },
+        { be_const_key(get_bat_power, 2), be_const_closure(AXP192_get_bat_power_closure) },
+        { be_const_key(json_append, -1), be_const_closure(AXP192_json_append_closure) },
+        { be_const_key(get_vbus_voltage, -1), be_const_closure(AXP192_get_vbus_voltage_closure) },
+        { be_const_key(get_battery_chargin_status, 9), be_const_closure(AXP192_get_battery_chargin_status_closure) },
+        { be_const_key(battery_present, -1), be_const_closure(AXP192_battery_present_closure) },
+        { be_const_key(get_bat_charge_current, 14), be_const_closure(AXP192_get_bat_charge_current_closure) },
+        { be_const_key(set_dcdc_enable, -1), be_const_closure(AXP192_set_dcdc_enable_closure) },
+        { be_const_key(get_temp, 19), be_const_closure(AXP192_get_temp_closure) },
+        { be_const_key(set_chg_current, 13), be_const_closure(AXP192_set_chg_current_closure) },
+        { be_const_key(set_ldo_enable, 18), be_const_closure(AXP192_set_ldo_enable_closure) },
+        { be_const_key(set_dc_voltage, -1), be_const_closure(AXP192_set_dc_voltage_closure) },
+        { be_const_key(get_bat_voltage, 7), be_const_closure(AXP192_get_bat_voltage_closure) },
+        { be_const_key(write_gpio, -1), be_const_closure(AXP192_write_gpio_closure) },
+        { be_const_key(web_sensor, -1), be_const_closure(AXP192_web_sensor_closure) },
+        { be_const_key(init, -1), be_const_closure(AXP192_init_closure) },
+        { be_const_key(set_ldo_voltage, -1), be_const_closure(AXP192_set_ldo_voltage_closure) },
+        { be_const_key(get_input_power_status, -1), be_const_closure(AXP192_get_input_power_status_closure) },
     })),
-    (be_nested_const_str("AXP192", 757230128, 6))
+    be_str_literal("AXP192")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_i2c_driverlib.c b/lib/libesp32/Berry/default/be_i2c_driverlib.c
index f1cedfe8b..45f829e19 100644
--- a/lib/libesp32/Berry/default/be_i2c_driverlib.c
+++ b/lib/libesp32/Berry/default/be_i2c_driverlib.c
@@ -9,12 +9,10 @@
  *******************************************************************/
 #include "be_constobj.h"
 
-extern bclass* be_class_Driver;     // Parent class
-
 /********************************************************************
 ** Solidified function: read32
 ********************************************************************/
-be_local_closure(read32,   /* name */
+be_local_closure(I2C_Driver_read32,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     2,                          /* argc */
@@ -25,16 +23,16 @@ be_local_closure(read32,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read_bytes", -718234123, 10),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read_bytes),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(0),
     /* K4   */  be_const_int(1),
     /* K5   */  be_const_int(2),
     /* K6   */  be_const_int(3),
     }),
-    (be_nested_const_str("read32", 1741276240, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_read32,
+    &be_const_str_solidified,
     ( &(const binstruction[20]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -65,7 +63,7 @@ be_local_closure(read32,   /* name */
 /********************************************************************
 ** Solidified function: write8
 ********************************************************************/
-be_local_closure(write8,   /* name */
+be_local_closure(I2C_Driver_write8,   /* name */
   be_nested_proto(
     9,                          /* nstack */
     3,                          /* argc */
@@ -76,13 +74,13 @@ be_local_closure(write8,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("write", -1104765092, 5),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(write),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(1),
     }),
-    (be_nested_const_str("write8", -1160975764, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_write8,
+    &be_const_str_solidified,
     ( &(const binstruction[ 8]) {  /* code */
       0x880C0100,  //  0000  GETMBR	R3	R0	K0
       0x8C0C0701,  //  0001  GETMET	R3	R3	K1
@@ -101,7 +99,7 @@ be_local_closure(write8,   /* name */
 /********************************************************************
 ** Solidified function: read12
 ********************************************************************/
-be_local_closure(read12,   /* name */
+be_local_closure(I2C_Driver_read12,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     2,                          /* argc */
@@ -112,15 +110,15 @@ be_local_closure(read12,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read_bytes", -718234123, 10),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read_bytes),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(2),
     /* K4   */  be_const_int(0),
     /* K5   */  be_const_int(1),
     }),
-    (be_nested_const_str("read12", -3890326, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_read12,
+    &be_const_str_solidified,
     ( &(const binstruction[12]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -143,7 +141,7 @@ be_local_closure(read12,   /* name */
 /********************************************************************
 ** Solidified function: write_bit
 ********************************************************************/
-be_local_closure(write_bit,   /* name */
+be_local_closure(I2C_Driver_write_bit,   /* name */
   be_nested_proto(
     11,                          /* nstack */
     4,                          /* argc */
@@ -156,11 +154,11 @@ be_local_closure(write_bit,   /* name */
     ( &(const bvalue[ 4]) {     /* constants */
     /* K0   */  be_const_int(0),
     /* K1   */  be_const_int(1),
-    /* K2   */  be_nested_string("write8", -1160975764, 6),
-    /* K3   */  be_nested_string("read8", -1492179129, 5),
+    /* K2   */  be_nested_str(write8),
+    /* K3   */  be_nested_str(read8),
     }),
-    (be_nested_const_str("write_bit", -1633976860, 9)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_write_bit,
+    &be_const_str_solidified,
     ( &(const binstruction[26]) {  /* code */
       0x14100500,  //  0000  LT	R4	R2	K0
       0x74120002,  //  0001  JMPT	R4	#0005
@@ -197,7 +195,7 @@ be_local_closure(write_bit,   /* name */
 /********************************************************************
 ** Solidified function: read24
 ********************************************************************/
-be_local_closure(read24,   /* name */
+be_local_closure(I2C_Driver_read24,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     2,                          /* argc */
@@ -208,16 +206,16 @@ be_local_closure(read24,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read_bytes", -718234123, 10),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read_bytes),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(3),
     /* K4   */  be_const_int(0),
     /* K5   */  be_const_int(1),
     /* K6   */  be_const_int(2),
     }),
-    (be_nested_const_str("read24", 1808533811, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_read24,
+    &be_const_str_solidified,
     ( &(const binstruction[16]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -244,7 +242,7 @@ be_local_closure(read24,   /* name */
 /********************************************************************
 ** Solidified function: read8
 ********************************************************************/
-be_local_closure(read8,   /* name */
+be_local_closure(I2C_Driver_read8,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     2,                          /* argc */
@@ -255,13 +253,13 @@ be_local_closure(read8,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read", -824204347, 4),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(1),
     }),
-    (be_nested_const_str("read8", -1492179129, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_read8,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -279,7 +277,7 @@ be_local_closure(read8,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(I2C_Driver_init,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     4,                          /* argc */
@@ -290,19 +288,19 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("get_tasmota", 334356779, 11),
-    /* K1   */  be_nested_string("i2c_enabled", 218388101, 11),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
-    /* K3   */  be_nested_string("wire", -212213352, 4),
-    /* K4   */  be_nested_string("wire_scan", -1623691416, 9),
-    /* K5   */  be_nested_string("function", -1630125495, 8),
-    /* K6   */  be_nested_string("name", -1925595674, 4),
-    /* K7   */  be_nested_string("I2C:", 813483371, 4),
-    /* K8   */  be_nested_string("detected on bus", 1432002650, 15),
-    /* K9   */  be_nested_string("bus", 1607822841, 3),
+    /* K0   */  be_nested_str(get_tasmota),
+    /* K1   */  be_nested_str(i2c_enabled),
+    /* K2   */  be_nested_str(addr),
+    /* K3   */  be_nested_str(wire),
+    /* K4   */  be_nested_str(wire_scan),
+    /* K5   */  be_nested_str(function),
+    /* K6   */  be_nested_str(name),
+    /* K7   */  be_nested_str(I2C_X3A),
+    /* K8   */  be_nested_str(detected_X20on_X20bus),
+    /* K9   */  be_nested_str(bus),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[44]) {  /* code */
       0x8C100100,  //  0000  GETMET	R4	R0	K0
       0x7C100200,  //  0001  CALL	R4	1
@@ -357,7 +355,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: read13
 ********************************************************************/
-be_local_closure(read13,   /* name */
+be_local_closure(I2C_Driver_read13,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     2,                          /* argc */
@@ -368,15 +366,15 @@ be_local_closure(read13,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("wire", -212213352, 4),
-    /* K1   */  be_nested_string("read_bytes", -718234123, 10),
-    /* K2   */  be_nested_string("addr", 1087856498, 4),
+    /* K0   */  be_nested_str(wire),
+    /* K1   */  be_nested_str(read_bytes),
+    /* K2   */  be_nested_str(addr),
     /* K3   */  be_const_int(2),
     /* K4   */  be_const_int(0),
     /* K5   */  be_const_int(1),
     }),
-    (be_nested_const_str("read13", 12887293, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_read13,
+    &be_const_str_solidified,
     ( &(const binstruction[12]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -395,27 +393,33 @@ be_local_closure(read13,   /* name */
 );
 /*******************************************************************/
 
-#include "../generate/be_fixed_be_class_I2C_Driver.h"
 
-void be_load_driver_i2c_lib(bvm *vm) {
+/********************************************************************
+** Solidified class: I2C_Driver
+********************************************************************/
+be_local_class(I2C_Driver,
+    3,
+    NULL,
+    be_nested_map(11,
+    ( (struct bmapnode*) &(const bmapnode[]) {
+        { be_const_key(read32, -1), be_const_closure(I2C_Driver_read32_closure) },
+        { be_const_key(write8, 6), be_const_closure(I2C_Driver_write8_closure) },
+        { be_const_key(name, -1), be_const_var(2) },
+        { be_const_key(addr, 8), be_const_var(1) },
+        { be_const_key(read12, -1), be_const_closure(I2C_Driver_read12_closure) },
+        { be_const_key(wire, 10), be_const_var(0) },
+        { be_const_key(read13, -1), be_const_closure(I2C_Driver_read13_closure) },
+        { be_const_key(read24, -1), be_const_closure(I2C_Driver_read24_closure) },
+        { be_const_key(read8, -1), be_const_closure(I2C_Driver_read8_closure) },
+        { be_const_key(init, -1), be_const_closure(I2C_Driver_init_closure) },
+        { be_const_key(write_bit, -1), be_const_closure(I2C_Driver_write_bit_closure) },
+    })),
+    be_str_literal("I2C_Driver")
+);
+/*******************************************************************/
+
+void be_load_I2C_Driver_class(bvm *vm) {
     be_pushntvclass(vm, &be_class_I2C_Driver);
     be_setglobal(vm, "I2C_Driver");
     be_pop(vm, 1);
 }
-/* @const_object_info_begin
-
-class be_class_I2C_Driver (scope: global, name: I2C_Driver, super: be_class_Driver) {
-    wire, var
-    addr, var
-    name, var
-
-    init, closure(init_closure)
-    write8, closure(write8_closure)
-    write_bit, closure(write_bit_closure)
-    read8, closure(read8_closure)
-    read12, closure(read12_closure)
-    read13, closure(read13_closure)
-    read24, closure(read24_closure)
-    read32, closure(read32_closure)
-}
-@const_object_info_end */
diff --git a/lib/libesp32/Berry/default/be_leds_animator_lib.c b/lib/libesp32/Berry/default/be_leds_animator_lib.c
index c5783edb9..bd82193b9 100644
--- a/lib/libesp32/Berry/default/be_leds_animator_lib.c
+++ b/lib/libesp32/Berry/default/be_leds_animator_lib.c
@@ -20,17 +20,17 @@ be_local_closure(Leds_animator_init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 8]) {     /* constants */
-    /* K0   */  be_nested_string("strip", -48555823, 5),
-    /* K1   */  be_nested_string("bri", 2112284244, 3),
-    /* K2   */  be_nested_string("running", 343848780, 7),
-    /* K3   */  be_nested_string("pixel_count", -1855836553, 11),
-    /* K4   */  be_nested_string("animators", 279858213, 9),
-    /* K5   */  be_nested_string("clear", 1550717474, 5),
-    /* K6   */  be_nested_string("tasmota", 424643812, 7),
-    /* K7   */  be_nested_string("add_driver", 1654458371, 10),
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(bri),
+    /* K2   */  be_nested_str(running),
+    /* K3   */  be_nested_str(pixel_count),
+    /* K4   */  be_nested_str(animators),
+    /* K5   */  be_nested_str(clear),
+    /* K6   */  be_nested_str(tasmota),
+    /* K7   */  be_nested_str(add_driver),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[18]) {  /* code */
       0x90020001,  //  0000  SETMBR	R0	K0	R1
       0x540A0031,  //  0001  LDINT	R2	50
@@ -70,10 +70,10 @@ be_local_closure(Leds_animator_set_bri,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("bri", 2112284244, 3),
+    /* K0   */  be_nested_str(bri),
     }),
-    (be_nested_const_str("set_bri", -1505848517, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_bri,
+    &be_const_str_solidified,
     ( &(const binstruction[ 2]) {  /* code */
       0x90020001,  //  0000  SETMBR	R0	K0	R1
       0x80000000,  //  0001  RET	0
@@ -97,10 +97,10 @@ be_local_closure(Leds_animator_stop,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("running", 343848780, 7),
+    /* K0   */  be_nested_str(running),
     }),
-    (be_nested_const_str("stop", -883741979, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_stop,
+    &be_const_str_solidified,
     ( &(const binstruction[ 3]) {  /* code */
       0x50040000,  //  0000  LDBOOL	R1	0	0
       0x90020001,  //  0001  SETMBR	R0	K0	R1
@@ -125,8 +125,8 @@ be_local_closure(Leds_animator_animate,   /* name */
     NULL,                       /* no sub protos */
     0,                          /* has constants */
     NULL,                       /* no const */
-    (be_nested_const_str("animate", -409180496, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_animate,
+    &be_const_str_solidified,
     ( &(const binstruction[ 1]) {  /* code */
       0x80000000,  //  0000  RET	0
     })
@@ -149,11 +149,11 @@ be_local_closure(Leds_animator_remove,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("remove_driver", 1030243768, 13),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(remove_driver),
     }),
-    (be_nested_const_str("remove", -611183107, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_remove,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0xB8060000,  //  0000  GETNGBL	R1	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -180,16 +180,16 @@ be_local_closure(Leds_animator_every_50ms,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("running", 343848780, 7),
+    /* K0   */  be_nested_str(running),
     /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_string("animators", 279858213, 9),
-    /* K3   */  be_nested_string("is_running", -2068120035, 10),
-    /* K4   */  be_nested_string("animate", -409180496, 7),
+    /* K2   */  be_nested_str(animators),
+    /* K3   */  be_nested_str(is_running),
+    /* K4   */  be_nested_str(animate),
     /* K5   */  be_const_int(1),
-    /* K6   */  be_nested_string("remove", -611183107, 6),
+    /* K6   */  be_nested_str(remove),
     }),
-    (be_nested_const_str("every_50ms", -1911083288, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_every_50ms,
+    &be_const_str_solidified,
     ( &(const binstruction[25]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x78060015,  //  0001  JMPF	R1	#0018
@@ -236,10 +236,10 @@ be_local_closure(Leds_animator_get_bri,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("bri", 2112284244, 3),
+    /* K0   */  be_nested_str(bri),
     }),
-    (be_nested_const_str("get_bri", 2041809895, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_bri,
+    &be_const_str_solidified,
     ( &(const binstruction[ 2]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x80040400,  //  0001  RET	1	R2
@@ -263,10 +263,10 @@ be_local_closure(Leds_animator_start,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("running", 343848780, 7),
+    /* K0   */  be_nested_str(running),
     }),
-    (be_nested_const_str("start", 1697318111, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_start,
+    &be_const_str_solidified,
     ( &(const binstruction[ 3]) {  /* code */
       0x50040200,  //  0000  LDBOOL	R1	1	0
       0x90020001,  //  0001  SETMBR	R0	K0	R1
@@ -291,12 +291,12 @@ be_local_closure(Leds_animator_add_anim,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("animators", 279858213, 9),
-    /* K1   */  be_nested_string("push", -2022703139, 4),
-    /* K2   */  be_nested_string("run", 718098122, 3),
+    /* K0   */  be_nested_str(animators),
+    /* K1   */  be_nested_str(push),
+    /* K2   */  be_nested_str(run),
     }),
-    (be_nested_const_str("add_anim", -314304628, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_add_anim,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -325,12 +325,12 @@ be_local_closure(Leds_animator_clear,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("stop", -883741979, 4),
-    /* K1   */  be_nested_string("strip", -48555823, 5),
-    /* K2   */  be_nested_string("clear", 1550717474, 5),
+    /* K0   */  be_nested_str(stop),
+    /* K1   */  be_nested_str(strip),
+    /* K2   */  be_nested_str(clear),
     }),
-    (be_nested_const_str("clear", 1550717474, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_clear,
+    &be_const_str_solidified,
     ( &(const binstruction[ 6]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x7C040200,  //  0001  CALL	R1	1
@@ -352,23 +352,23 @@ be_local_class(Leds_animator,
     NULL,
     be_nested_map(15,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, 7), be_const_closure(Leds_animator_init_closure) },
-        { be_nested_key("set_bri", -1505848517, 7, -1), be_const_closure(Leds_animator_set_bri_closure) },
-        { be_nested_key("stop", -883741979, 4, -1), be_const_closure(Leds_animator_stop_closure) },
-        { be_nested_key("strip", -48555823, 5, 4), be_const_var(0) },
-        { be_nested_key("animators", 279858213, 9, 12), be_const_var(4) },
-        { be_nested_key("animate", -409180496, 7, -1), be_const_closure(Leds_animator_animate_closure) },
-        { be_nested_key("remove", -611183107, 6, -1), be_const_closure(Leds_animator_remove_closure) },
-        { be_nested_key("running", 343848780, 7, -1), be_const_var(3) },
-        { be_nested_key("every_50ms", -1911083288, 10, -1), be_const_closure(Leds_animator_every_50ms_closure) },
-        { be_nested_key("bri", 2112284244, 3, 6), be_const_var(2) },
-        { be_nested_key("get_bri", 2041809895, 7, -1), be_const_closure(Leds_animator_get_bri_closure) },
-        { be_nested_key("start", 1697318111, 5, -1), be_const_closure(Leds_animator_start_closure) },
-        { be_nested_key("add_anim", -314304628, 8, 13), be_const_closure(Leds_animator_add_anim_closure) },
-        { be_nested_key("pixel_count", -1855836553, 11, -1), be_const_var(1) },
-        { be_nested_key("clear", 1550717474, 5, 1), be_const_closure(Leds_animator_clear_closure) },
+        { be_const_key(init, 12), be_const_closure(Leds_animator_init_closure) },
+        { be_const_key(clear, -1), be_const_closure(Leds_animator_clear_closure) },
+        { be_const_key(stop, -1), be_const_closure(Leds_animator_stop_closure) },
+        { be_const_key(strip, 4), be_const_var(0) },
+        { be_const_key(pixel_count, 6), be_const_var(1) },
+        { be_const_key(animate, -1), be_const_closure(Leds_animator_animate_closure) },
+        { be_const_key(add_anim, 13), be_const_closure(Leds_animator_add_anim_closure) },
+        { be_const_key(bri, -1), be_const_var(2) },
+        { be_const_key(every_50ms, -1), be_const_closure(Leds_animator_every_50ms_closure) },
+        { be_const_key(remove, 7), be_const_closure(Leds_animator_remove_closure) },
+        { be_const_key(get_bri, -1), be_const_closure(Leds_animator_get_bri_closure) },
+        { be_const_key(start, -1), be_const_closure(Leds_animator_start_closure) },
+        { be_const_key(running, -1), be_const_var(3) },
+        { be_const_key(animators, -1), be_const_var(4) },
+        { be_const_key(set_bri, 1), be_const_closure(Leds_animator_set_bri_closure) },
     })),
-    (be_nested_const_str("Leds_animator", 142168673, 13))
+    be_str_literal("Leds_animator")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_leds_lib.c b/lib/libesp32/Berry/default/be_leds_lib.c
index a4442df37..58b0a991e 100644
--- a/lib/libesp32/Berry/default/be_leds_lib.c
+++ b/lib/libesp32/Berry/default/be_leds_lib.c
@@ -7,11 +7,41 @@
 #ifdef USE_WS2812
 
 /********************************************************************
-** Solidified function: get_pixel_color
+** Solidified function: pixel_count
 ********************************************************************/
-be_local_closure(Leds_get_pixel_color,   /* name */
+be_local_closure(Leds_matrix_pixel_count,   /* name */
   be_nested_proto(
-    6,                          /* nstack */
+    3,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(w),
+    /* K1   */  be_nested_str(h),
+    }),
+    &be_const_str_pixel_count,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x88080101,  //  0001  GETMBR	R2	R0	K1
+      0x08040202,  //  0002  MUL	R1	R1	R2
+      0x80040200,  //  0003  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: set_alternate
+********************************************************************/
+be_local_closure(Leds_matrix_set_alternate,   /* name */
+  be_nested_proto(
+    2,                          /* nstack */
     2,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
@@ -20,16 +50,13 @@ be_local_closure(Leds_get_pixel_color,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    /* K0   */  be_nested_str(alternate),
     }),
-    (be_nested_const_str("get_pixel_color", 337490048, 15)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 5]) {  /* code */
-      0x8C080100,  //  0000  GETMET	R2	R0	K0
-      0x5412000A,  //  0001  LDINT	R4	11
-      0x5C140200,  //  0002  MOVE	R5	R1
-      0x7C080600,  //  0003  CALL	R2	3
-      0x80040400,  //  0004  RET	1	R2
+    &be_const_str_set_alternate,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 2]) {  /* code */
+      0x90020001,  //  0000  SETMBR	R0	K0	R1
+      0x80000000,  //  0001  RET	0
     })
   )
 );
@@ -37,11 +64,11 @@ be_local_closure(Leds_get_pixel_color,   /* name */
 
 
 /********************************************************************
-** Solidified function: pixels_buffer
+** Solidified function: pixel_size
 ********************************************************************/
-be_local_closure(Leds_pixels_buffer,   /* name */
+be_local_closure(Leds_matrix_pixel_size,   /* name */
   be_nested_proto(
-    4,                          /* nstack */
+    3,                          /* nstack */
     1,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
@@ -49,15 +76,16 @@ be_local_closure(Leds_pixels_buffer,   /* name */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(pixel_size),
     }),
-    (be_nested_const_str("pixels_buffer", 1229555807, 13)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_pixel_size,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
-      0x8C040100,  //  0000  GETMET	R1	R0	K0
-      0x540E0005,  //  0001  LDINT	R3	6
-      0x7C040400,  //  0002  CALL	R1	2
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
       0x80040200,  //  0003  RET	1	R1
     })
   )
@@ -65,10 +93,232 @@ be_local_closure(Leds_pixels_buffer,   /* name */
 /*******************************************************************/
 
 
+/********************************************************************
+** Solidified function: set_pixel_color
+********************************************************************/
+be_local_closure(Leds_matrix_set_pixel_color,   /* name */
+  be_nested_proto(
+    9,                          /* nstack */
+    4,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(set_pixel_color),
+    /* K2   */  be_nested_str(offset),
+    }),
+    &be_const_str_set_pixel_color,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 8]) {  /* code */
+      0x88100100,  //  0000  GETMBR	R4	R0	K0
+      0x8C100901,  //  0001  GETMET	R4	R4	K1
+      0x88180102,  //  0002  GETMBR	R6	R0	K2
+      0x00180206,  //  0003  ADD	R6	R1	R6
+      0x5C1C0400,  //  0004  MOVE	R7	R2
+      0x5C200600,  //  0005  MOVE	R8	R3
+      0x7C100800,  //  0006  CALL	R4	4
+      0x80000000,  //  0007  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: set_matrix_pixel_color
+********************************************************************/
+be_local_closure(Leds_matrix_set_matrix_pixel_color,   /* name */
+  be_nested_proto(
+    10,                          /* nstack */
+    5,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 8]) {     /* constants */
+    /* K0   */  be_nested_str(alternate),
+    /* K1   */  be_const_int(2),
+    /* K2   */  be_nested_str(strip),
+    /* K3   */  be_nested_str(set_pixel_color),
+    /* K4   */  be_nested_str(w),
+    /* K5   */  be_nested_str(h),
+    /* K6   */  be_const_int(1),
+    /* K7   */  be_nested_str(offset),
+    }),
+    &be_const_str_set_matrix_pixel_color,
+    &be_const_str_solidified,
+    ( &(const binstruction[29]) {  /* code */
+      0x88140100,  //  0000  GETMBR	R5	R0	K0
+      0x7816000F,  //  0001  JMPF	R5	#0012
+      0x10140301,  //  0002  MOD	R5	R1	K1
+      0x7816000D,  //  0003  JMPF	R5	#0012
+      0x88140102,  //  0004  GETMBR	R5	R0	K2
+      0x8C140B03,  //  0005  GETMET	R5	R5	K3
+      0x881C0104,  //  0006  GETMBR	R7	R0	K4
+      0x081C0207,  //  0007  MUL	R7	R1	R7
+      0x88200105,  //  0008  GETMBR	R8	R0	K5
+      0x001C0E08,  //  0009  ADD	R7	R7	R8
+      0x041C0E02,  //  000A  SUB	R7	R7	R2
+      0x041C0F06,  //  000B  SUB	R7	R7	K6
+      0x88200107,  //  000C  GETMBR	R8	R0	K7
+      0x001C0E08,  //  000D  ADD	R7	R7	R8
+      0x5C200600,  //  000E  MOVE	R8	R3
+      0x5C240800,  //  000F  MOVE	R9	R4
+      0x7C140800,  //  0010  CALL	R5	4
+      0x70020009,  //  0011  JMP		#001C
+      0x88140102,  //  0012  GETMBR	R5	R0	K2
+      0x8C140B03,  //  0013  GETMET	R5	R5	K3
+      0x881C0104,  //  0014  GETMBR	R7	R0	K4
+      0x081C0207,  //  0015  MUL	R7	R1	R7
+      0x001C0E02,  //  0016  ADD	R7	R7	R2
+      0x88200107,  //  0017  GETMBR	R8	R0	K7
+      0x001C0E08,  //  0018  ADD	R7	R7	R8
+      0x5C200600,  //  0019  MOVE	R8	R3
+      0x5C240800,  //  001A  MOVE	R9	R4
+      0x7C140800,  //  001B  CALL	R5	4
+      0x80000000,  //  001C  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: show
+********************************************************************/
+be_local_closure(Leds_matrix_show,   /* name */
+  be_nested_proto(
+    4,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 7]) {     /* constants */
+    /* K0   */  be_nested_str(offset),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(w),
+    /* K3   */  be_nested_str(h),
+    /* K4   */  be_nested_str(strip),
+    /* K5   */  be_nested_str(leds),
+    /* K6   */  be_nested_str(show),
+    }),
+    &be_const_str_show,
+    &be_const_str_solidified,
+    ( &(const binstruction[18]) {  /* code */
+      0x60080017,  //  0000  GETGBL	R2	G23
+      0x5C0C0200,  //  0001  MOVE	R3	R1
+      0x7C080200,  //  0002  CALL	R2	1
+      0x740A0009,  //  0003  JMPT	R2	#000E
+      0x88080100,  //  0004  GETMBR	R2	R0	K0
+      0x1C080501,  //  0005  EQ	R2	R2	K1
+      0x780A0009,  //  0006  JMPF	R2	#0011
+      0x88080102,  //  0007  GETMBR	R2	R0	K2
+      0x880C0103,  //  0008  GETMBR	R3	R0	K3
+      0x08080403,  //  0009  MUL	R2	R2	R3
+      0x880C0104,  //  000A  GETMBR	R3	R0	K4
+      0x880C0705,  //  000B  GETMBR	R3	R3	K5
+      0x1C080403,  //  000C  EQ	R2	R2	R3
+      0x780A0002,  //  000D  JMPF	R2	#0011
+      0x88080104,  //  000E  GETMBR	R2	R0	K4
+      0x8C080506,  //  000F  GETMET	R2	R2	K6
+      0x7C080200,  //  0010  CALL	R2	1
+      0x80000000,  //  0011  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: is_dirty
+********************************************************************/
+be_local_closure(Leds_matrix_is_dirty,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(is_dirty),
+    }),
+    &be_const_str_is_dirty,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
+      0x80040200,  //  0003  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: clear_to
+********************************************************************/
+be_local_closure(Leds_matrix_clear_to,   /* name */
+  be_nested_proto(
+    9,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 7]) {     /* constants */
+    /* K0   */  be_const_int(0),
+    /* K1   */  be_nested_str(w),
+    /* K2   */  be_nested_str(h),
+    /* K3   */  be_nested_str(strip),
+    /* K4   */  be_nested_str(set_pixel_color),
+    /* K5   */  be_nested_str(offset),
+    /* K6   */  be_const_int(1),
+    }),
+    &be_const_str_clear_to,
+    &be_const_str_solidified,
+    ( &(const binstruction[16]) {  /* code */
+      0x580C0000,  //  0000  LDCONST	R3	K0
+      0x88100101,  //  0001  GETMBR	R4	R0	K1
+      0x88140102,  //  0002  GETMBR	R5	R0	K2
+      0x08100805,  //  0003  MUL	R4	R4	R5
+      0x14100604,  //  0004  LT	R4	R3	R4
+      0x78120008,  //  0005  JMPF	R4	#000F
+      0x88100103,  //  0006  GETMBR	R4	R0	K3
+      0x8C100904,  //  0007  GETMET	R4	R4	K4
+      0x88180105,  //  0008  GETMBR	R6	R0	K5
+      0x00180606,  //  0009  ADD	R6	R3	R6
+      0x5C1C0200,  //  000A  MOVE	R7	R1
+      0x5C200400,  //  000B  MOVE	R8	R2
+      0x7C100800,  //  000C  CALL	R4	4
+      0x000C0706,  //  000D  ADD	R3	R3	K6
+      0x7001FFF1,  //  000E  JMP		#0001
+      0x80000000,  //  000F  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
 /********************************************************************
 ** Solidified function: clear
 ********************************************************************/
-be_local_closure(Leds_clear,   /* name */
+be_local_closure(Leds_matrix_clear,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -79,12 +329,12 @@ be_local_closure(Leds_clear,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_str_literal("clear_to"),
+    /* K0   */  be_nested_str(clear_to),
     /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_str_literal("show"),
+    /* K2   */  be_nested_str(show),
     }),
-    (be_nested_const_str("clear", 1550717474, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_clear,
+    &be_const_str_solidified,
     ( &(const binstruction[ 6]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x580C0001,  //  0001  LDCONST	R3	K1
@@ -99,66 +349,24 @@ be_local_closure(Leds_clear,   /* name */
 
 
 /********************************************************************
-** Solidified function: init
+** Solidified function: pixels_buffer
 ********************************************************************/
-be_local_closure(Leds_init,   /* name */
+be_local_closure(Leds_matrix_pixels_buffer,   /* name */
   be_nested_proto(
-    11,                          /* nstack */
-    5,                          /* argc */
+    2,                          /* nstack */
+    1,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[11]) {     /* constants */
-    /* K0   */  be_nested_str_literal("gamma"),
-    /* K1   */  be_nested_str_literal("pin"),
-    /* K2   */  be_nested_str_literal("WS2812"),
-    /* K3   */  be_const_int(0),
-    /* K4   */  be_nested_str_literal("valuer_error"),
-    /* K5   */  be_nested_str_literal("no GPIO specified for neopixelbus"),
-    /* K6   */  be_nested_str_literal("ctor"),
-    /* K7   */  be_nested_str_literal("_p"),
-    /* K8   */  be_nested_str_literal("internal_error"),
-    /* K9   */  be_nested_str_literal("couldn't not initialize noepixelbus"),
-    /* K10  */  be_nested_str_literal("begin"),
-    }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[32]) {  /* code */
-      0x50140200,  //  0000  LDBOOL	R5	1	0
-      0x90020005,  //  0001  SETMBR	R0	K0	R5
-      0x4C140000,  //  0002  LDNIL	R5
-      0x1C140405,  //  0003  EQ	R5	R2	R5
-      0x78160008,  //  0004  JMPF	R5	#000E
-      0x8C140501,  //  0005  GETMET	R5	R2	K1
-      0x881C0502,  //  0006  GETMBR	R7	R2	K2
-      0x7C140400,  //  0007  CALL	R5	2
-      0x28140B03,  //  0008  GE	R5	R5	K3
-      0x78160003,  //  0009  JMPF	R5	#000E
-      0x8C140501,  //  000A  GETMET	R5	R2	K1
-      0x881C0502,  //  000B  GETMBR	R7	R2	K2
-      0x7C140400,  //  000C  CALL	R5	2
-      0x5C080A00,  //  000D  MOVE	R2	R5
-      0x4C140000,  //  000E  LDNIL	R5
-      0x1C140405,  //  000F  EQ	R5	R2	R5
-      0x78160000,  //  0010  JMPF	R5	#0012
-      0xB0060905,  //  0011  RAISE	1	K4	K5
-      0x8C140106,  //  0012  GETMET	R5	R0	K6
-      0x5C1C0200,  //  0013  MOVE	R7	R1
-      0x5C200400,  //  0014  MOVE	R8	R2
-      0x5C240600,  //  0015  MOVE	R9	R3
-      0x5C280800,  //  0016  MOVE	R10	R4
-      0x7C140A00,  //  0017  CALL	R5	5
-      0x88140107,  //  0018  GETMBR	R5	R0	K7
-      0x4C180000,  //  0019  LDNIL	R6
-      0x1C140A06,  //  001A  EQ	R5	R5	R6
-      0x78160000,  //  001B  JMPF	R5	#001D
-      0xB0061109,  //  001C  RAISE	1	K8	K9
-      0x8C14010A,  //  001D  GETMET	R5	R0	K10
-      0x7C140200,  //  001E  CALL	R5	1
-      0x80000000,  //  001F  RET	0
+    0,                          /* has constants */
+    NULL,                       /* no const */
+    &be_const_str_pixels_buffer,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 2]) {  /* code */
+      0x4C040000,  //  0000  LDNIL	R1
+      0x80040200,  //  0001  RET	1	R1
     })
   )
 );
@@ -166,12 +374,48 @@ be_local_closure(Leds_init,   /* name */
 
 
 /********************************************************************
-** Solidified function: set_pixel_color
+** Solidified function: init
 ********************************************************************/
-be_local_closure(Leds_set_pixel_color,   /* name */
+be_local_closure(Leds_matrix_init,   /* name */
   be_nested_proto(
-    12,                          /* nstack */
-    4,                          /* argc */
+    6,                          /* nstack */
+    5,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(offset),
+    /* K2   */  be_nested_str(h),
+    /* K3   */  be_nested_str(w),
+    /* K4   */  be_nested_str(alternate),
+    }),
+    &be_const_str_init,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 7]) {  /* code */
+      0x90020001,  //  0000  SETMBR	R0	K0	R1
+      0x90020204,  //  0001  SETMBR	R0	K1	R4
+      0x90020403,  //  0002  SETMBR	R0	K2	R3
+      0x90020602,  //  0003  SETMBR	R0	K3	R2
+      0x50140000,  //  0004  LDBOOL	R5	0	0
+      0x90020805,  //  0005  SETMBR	R0	K4	R5
+      0x80000000,  //  0006  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: dirty
+********************************************************************/
+be_local_closure(Leds_matrix_dirty,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    1,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
@@ -179,21 +423,229 @@ be_local_closure(Leds_set_pixel_color,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
-    /* K1   */  be_nested_str_literal("to_gamma"),
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(dirty),
     }),
-    (be_nested_const_str("set_pixel_color", 1275248356, 15)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 9]) {  /* code */
-      0x8C100100,  //  0000  GETMET	R4	R0	K0
-      0x541A0009,  //  0001  LDINT	R6	10
-      0x5C1C0200,  //  0002  MOVE	R7	R1
-      0x8C200101,  //  0003  GETMET	R8	R0	K1
-      0x5C280400,  //  0004  MOVE	R10	R2
-      0x5C2C0600,  //  0005  MOVE	R11	R3
-      0x7C200600,  //  0006  CALL	R8	3
-      0x7C100800,  //  0007  CALL	R4	4
-      0x80000000,  //  0008  RET	0
+    &be_const_str_dirty,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
+      0x80000000,  //  0003  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: get_pixel_color
+********************************************************************/
+be_local_closure(Leds_matrix_get_pixel_color,   /* name */
+  be_nested_proto(
+    5,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(get_pixel_color),
+    /* K2   */  be_nested_str(offseta),
+    }),
+    &be_const_str_get_pixel_color,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 6]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x8C080501,  //  0001  GETMET	R2	R2	K1
+      0x88100102,  //  0002  GETMBR	R4	R0	K2
+      0x00100204,  //  0003  ADD	R4	R1	R4
+      0x7C080400,  //  0004  CALL	R2	2
+      0x80040400,  //  0005  RET	1	R2
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: get_alternate
+********************************************************************/
+be_local_closure(Leds_matrix_get_alternate,   /* name */
+  be_nested_proto(
+    2,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 1]) {     /* constants */
+    /* K0   */  be_nested_str(alternate),
+    }),
+    &be_const_str_get_alternate,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 2]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x80040200,  //  0001  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: begin
+********************************************************************/
+be_local_closure(Leds_matrix_begin,   /* name */
+  be_nested_proto(
+    1,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    0,                          /* has constants */
+    NULL,                       /* no const */
+    &be_const_str_begin,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 1]) {  /* code */
+      0x80000000,  //  0000  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: can_show
+********************************************************************/
+be_local_closure(Leds_matrix_can_show,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(can_show),
+    }),
+    &be_const_str_can_show,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
+      0x80040200,  //  0003  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified class: Leds_matrix
+********************************************************************/
+be_local_class(Leds_matrix,
+    5,
+    NULL,
+    be_nested_map(21,
+    ( (struct bmapnode*) &(const bmapnode[]) {
+        { be_const_key(pixel_count, -1), be_const_closure(Leds_matrix_pixel_count_closure) },
+        { be_const_key(h, 6), be_const_var(2) },
+        { be_const_key(set_alternate, 7), be_const_closure(Leds_matrix_set_alternate_closure) },
+        { be_const_key(pixel_size, 16), be_const_closure(Leds_matrix_pixel_size_closure) },
+        { be_const_key(set_pixel_color, 19), be_const_closure(Leds_matrix_set_pixel_color_closure) },
+        { be_const_key(set_matrix_pixel_color, 10), be_const_closure(Leds_matrix_set_matrix_pixel_color_closure) },
+        { be_const_key(show, -1), be_const_closure(Leds_matrix_show_closure) },
+        { be_const_key(alternate, -1), be_const_var(4) },
+        { be_const_key(strip, -1), be_const_var(0) },
+        { be_const_key(clear_to, -1), be_const_closure(Leds_matrix_clear_to_closure) },
+        { be_const_key(w, 15), be_const_var(3) },
+        { be_const_key(pixels_buffer, -1), be_const_closure(Leds_matrix_pixels_buffer_closure) },
+        { be_const_key(init, -1), be_const_closure(Leds_matrix_init_closure) },
+        { be_const_key(dirty, -1), be_const_closure(Leds_matrix_dirty_closure) },
+        { be_const_key(get_pixel_color, -1), be_const_closure(Leds_matrix_get_pixel_color_closure) },
+        { be_const_key(get_alternate, 17), be_const_closure(Leds_matrix_get_alternate_closure) },
+        { be_const_key(offset, 8), be_const_var(1) },
+        { be_const_key(clear, -1), be_const_closure(Leds_matrix_clear_closure) },
+        { be_const_key(begin, -1), be_const_closure(Leds_matrix_begin_closure) },
+        { be_const_key(is_dirty, -1), be_const_closure(Leds_matrix_is_dirty_closure) },
+        { be_const_key(can_show, -1), be_const_closure(Leds_matrix_can_show_closure) },
+    })),
+    be_str_literal("Leds_matrix")
+);
+
+/********************************************************************
+** Solidified function: create_matrix
+********************************************************************/
+be_local_closure(Leds_create_matrix,   /* name */
+  be_nested_proto(
+    10,                          /* nstack */
+    4,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_const_int(0),
+    /* K1   */  be_nested_str(leds),
+    /* K2   */  be_nested_str(value_error),
+    /* K3   */  be_nested_str(out_X20of_X20range),
+    /* K4   */  be_const_class(be_class_Leds_matrix),
+    }),
+    &be_const_str_create_matrix,
+    &be_const_str_solidified,
+    ( &(const binstruction[37]) {  /* code */
+      0x60100009,  //  0000  GETGBL	R4	G9
+      0x5C140600,  //  0001  MOVE	R5	R3
+      0x7C100200,  //  0002  CALL	R4	1
+      0x5C0C0800,  //  0003  MOVE	R3	R4
+      0x60100009,  //  0004  GETGBL	R4	G9
+      0x5C140200,  //  0005  MOVE	R5	R1
+      0x7C100200,  //  0006  CALL	R4	1
+      0x5C040800,  //  0007  MOVE	R1	R4
+      0x60100009,  //  0008  GETGBL	R4	G9
+      0x5C140400,  //  0009  MOVE	R5	R2
+      0x7C100200,  //  000A  CALL	R4	1
+      0x5C080800,  //  000B  MOVE	R2	R4
+      0x4C100000,  //  000C  LDNIL	R4
+      0x1C100604,  //  000D  EQ	R4	R3	R4
+      0x78120000,  //  000E  JMPF	R4	#0010
+      0x580C0000,  //  000F  LDCONST	R3	K0
+      0x08100202,  //  0010  MUL	R4	R1	R2
+      0x00100803,  //  0011  ADD	R4	R4	R3
+      0x88140101,  //  0012  GETMBR	R5	R0	K1
+      0x24100805,  //  0013  GT	R4	R4	R5
+      0x74120005,  //  0014  JMPT	R4	#001B
+      0x14100500,  //  0015  LT	R4	R2	K0
+      0x74120003,  //  0016  JMPT	R4	#001B
+      0x14100300,  //  0017  LT	R4	R1	K0
+      0x74120001,  //  0018  JMPT	R4	#001B
+      0x14100700,  //  0019  LT	R4	R3	K0
+      0x78120000,  //  001A  JMPF	R4	#001C
+      0xB0060503,  //  001B  RAISE	1	K2	K3
+      0x58100004,  //  001C  LDCONST	R4	K4
+      0xB4000004,  //  001D  CLASS	K4
+      0x5C140800,  //  001E  MOVE	R5	R4
+      0x5C180000,  //  001F  MOVE	R6	R0
+      0x5C1C0200,  //  0020  MOVE	R7	R1
+      0x5C200400,  //  0021  MOVE	R8	R2
+      0x5C240600,  //  0022  MOVE	R9	R3
+      0x7C140800,  //  0023  CALL	R5	4
+      0x80040A00,  //  0024  RET	1	R5
     })
   )
 );
@@ -214,11 +666,11 @@ be_local_closure(Leds_begin,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    /* K0   */  be_nested_str(call_native),
     /* K1   */  be_const_int(1),
     }),
-    (be_nested_const_str("begin", 1748273790, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_begin,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x580C0001,  //  0001  LDCONST	R3	K1
@@ -244,16 +696,16 @@ be_local_closure(Leds_to_gamma,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_str_literal("tasmota"),
-    /* K1   */  be_nested_str_literal("scale_uint"),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(scale_uint),
     /* K2   */  be_const_int(0),
     /* K3   */  be_const_int(16711680),
-    /* K4   */  be_nested_str_literal("gamma"),
-    /* K5   */  be_nested_str_literal("light"),
-    /* K6   */  be_nested_str_literal("gamma8"),
+    /* K4   */  be_nested_str(gamma),
+    /* K5   */  be_nested_str(light),
+    /* K6   */  be_nested_str(gamma8),
     }),
-    (be_nested_const_str("to_gamma", 1597139862, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_to_gamma,
+    &be_const_str_solidified,
     ( &(const binstruction[67]) {  /* code */
       0x4C0C0000,  //  0000  LDNIL	R3
       0x200C0403,  //  0001  NE	R3	R2	R3
@@ -342,10 +794,10 @@ be_local_closure(Leds_pixel_count,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    /* K0   */  be_nested_str(call_native),
     }),
-    (be_nested_const_str("pixel_count", -1855836553, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_pixel_count,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0007,  //  0001  LDINT	R3	8
@@ -358,29 +810,37 @@ be_local_closure(Leds_pixel_count,   /* name */
 
 
 /********************************************************************
-** Solidified function: can_show
+** Solidified function: matrix
 ********************************************************************/
-be_local_closure(Leds_can_show,   /* name */
+be_local_closure(Leds_matrix,   /* name */
   be_nested_proto(
-    4,                          /* nstack */
-    1,                          /* argc */
+    10,                          /* nstack */
+    4,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
-    /* K1   */  be_const_int(3),
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(Leds),
+    /* K1   */  be_nested_str(create_matrix),
+    /* K2   */  be_const_int(0),
     }),
-    (be_nested_const_str("can_show", 960091187, 8)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 4]) {  /* code */
-      0x8C040100,  //  0000  GETMET	R1	R0	K0
-      0x580C0001,  //  0001  LDCONST	R3	K1
-      0x7C040400,  //  0002  CALL	R1	2
-      0x80040200,  //  0003  RET	1	R1
+    &be_const_str_matrix,
+    &be_const_str_solidified,
+    ( &(const binstruction[11]) {  /* code */
+      0xB8120000,  //  0000  GETNGBL	R4	K0
+      0x08140001,  //  0001  MUL	R5	R0	R1
+      0x5C180400,  //  0002  MOVE	R6	R2
+      0x5C1C0600,  //  0003  MOVE	R7	R3
+      0x7C100600,  //  0004  CALL	R4	3
+      0x8C140901,  //  0005  GETMET	R5	R4	K1
+      0x5C1C0000,  //  0006  MOVE	R7	R0
+      0x5C200200,  //  0007  MOVE	R8	R1
+      0x58240002,  //  0008  LDCONST	R9	K2
+      0x7C140800,  //  0009  CALL	R5	4
+      0x80040A00,  //  000A  RET	1	R5
     })
   )
 );
@@ -401,10 +861,10 @@ be_local_closure(Leds_pixel_size,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    /* K0   */  be_nested_str(call_native),
     }),
-    (be_nested_const_str("pixel_size", -2085831511, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_pixel_size,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0006,  //  0001  LDINT	R3	7
@@ -417,9 +877,9 @@ be_local_closure(Leds_pixel_size,   /* name */
 
 
 /********************************************************************
-** Solidified function: dirty
+** Solidified function: pixels_buffer
 ********************************************************************/
-be_local_closure(Leds_dirty,   /* name */
+be_local_closure(Leds_pixels_buffer,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -430,15 +890,15 @@ be_local_closure(Leds_dirty,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    /* K0   */  be_nested_str(call_native),
     }),
-    (be_nested_const_str("dirty", -1627386213, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_pixels_buffer,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
-      0x540E0004,  //  0001  LDINT	R3	5
+      0x540E0005,  //  0001  LDINT	R3	6
       0x7C040400,  //  0002  CALL	R1	2
-      0x80000000,  //  0003  RET	0
+      0x80040200,  //  0003  RET	1	R1
     })
   )
 );
@@ -446,29 +906,29 @@ be_local_closure(Leds_dirty,   /* name */
 
 
 /********************************************************************
-** Solidified function: show
+** Solidified function: get_pixel_color
 ********************************************************************/
-be_local_closure(Leds_show,   /* name */
+be_local_closure(Leds_get_pixel_color,   /* name */
   be_nested_proto(
-    4,                          /* nstack */
-    1,                          /* argc */
+    6,                          /* nstack */
+    2,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
-    /* K1   */  be_const_int(2),
+    ( &(const bvalue[ 1]) {     /* constants */
+    /* K0   */  be_nested_str(call_native),
     }),
-    (be_nested_const_str("show", -1454906820, 4)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 4]) {  /* code */
-      0x8C040100,  //  0000  GETMET	R1	R0	K0
-      0x580C0001,  //  0001  LDCONST	R3	K1
-      0x7C040400,  //  0002  CALL	R1	2
-      0x80000000,  //  0003  RET	0
+    &be_const_str_get_pixel_color,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 5]) {  /* code */
+      0x8C080100,  //  0000  GETMET	R2	R0	K0
+      0x5412000A,  //  0001  LDINT	R4	11
+      0x5C140200,  //  0002  MOVE	R5	R1
+      0x7C080600,  //  0003  CALL	R2	3
+      0x80040400,  //  0004  RET	1	R2
     })
   )
 );
@@ -476,12 +936,12 @@ be_local_closure(Leds_show,   /* name */
 
 
 /********************************************************************
-** Solidified function: clear_to
+** Solidified function: set_pixel_color
 ********************************************************************/
-be_local_closure(Leds_clear_to,   /* name */
+be_local_closure(Leds_set_pixel_color,   /* name */
   be_nested_proto(
-    10,                          /* nstack */
-    3,                          /* argc */
+    12,                          /* nstack */
+    4,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
@@ -489,20 +949,21 @@ be_local_closure(Leds_clear_to,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
-    /* K1   */  be_nested_str_literal("to_gamma"),
+    /* K0   */  be_nested_str(call_native),
+    /* K1   */  be_nested_str(to_gamma),
     }),
-    (be_nested_const_str("clear_to", -766965166, 8)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 8]) {  /* code */
-      0x8C0C0100,  //  0000  GETMET	R3	R0	K0
-      0x54160008,  //  0001  LDINT	R5	9
-      0x8C180101,  //  0002  GETMET	R6	R0	K1
-      0x5C200200,  //  0003  MOVE	R8	R1
-      0x5C240400,  //  0004  MOVE	R9	R2
-      0x7C180600,  //  0005  CALL	R6	3
-      0x7C0C0600,  //  0006  CALL	R3	3
-      0x80000000,  //  0007  RET	0
+    &be_const_str_set_pixel_color,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 9]) {  /* code */
+      0x8C100100,  //  0000  GETMET	R4	R0	K0
+      0x541A0009,  //  0001  LDINT	R6	10
+      0x5C1C0200,  //  0002  MOVE	R7	R1
+      0x8C200101,  //  0003  GETMET	R8	R0	K1
+      0x5C280400,  //  0004  MOVE	R10	R2
+      0x5C2C0600,  //  0005  MOVE	R11	R3
+      0x7C200600,  //  0006  CALL	R8	3
+      0x7C100800,  //  0007  CALL	R4	4
+      0x80000000,  //  0008  RET	0
     })
   )
 );
@@ -523,10 +984,10 @@ be_local_closure(Leds_is_dirty,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    /* K0   */  be_nested_str(call_native),
     }),
-    (be_nested_const_str("is_dirty", 418034110, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_is_dirty,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x8C040100,  //  0000  GETMET	R1	R0	K0
       0x540E0003,  //  0001  LDINT	R3	4
@@ -538,6 +999,205 @@ be_local_closure(Leds_is_dirty,   /* name */
 /*******************************************************************/
 
 
+/********************************************************************
+** Solidified function: init
+********************************************************************/
+be_local_closure(Leds_init,   /* name */
+  be_nested_proto(
+    11,                          /* nstack */
+    5,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[12]) {     /* constants */
+    /* K0   */  be_nested_str(gamma),
+    /* K1   */  be_nested_str(leds),
+    /* K2   */  be_nested_str(pin),
+    /* K3   */  be_nested_str(WS2812),
+    /* K4   */  be_const_int(0),
+    /* K5   */  be_nested_str(valuer_error),
+    /* K6   */  be_nested_str(no_X20GPIO_X20specified_X20for_X20neopixelbus),
+    /* K7   */  be_nested_str(ctor),
+    /* K8   */  be_nested_str(_p),
+    /* K9   */  be_nested_str(internal_error),
+    /* K10  */  be_nested_str(couldn_X27t_X20not_X20initialize_X20noepixelbus),
+    /* K11  */  be_nested_str(begin),
+    }),
+    &be_const_str_init,
+    &be_const_str_solidified,
+    ( &(const binstruction[36]) {  /* code */
+      0x50140200,  //  0000  LDBOOL	R5	1	0
+      0x90020005,  //  0001  SETMBR	R0	K0	R5
+      0x60140009,  //  0002  GETGBL	R5	G9
+      0x5C180200,  //  0003  MOVE	R6	R1
+      0x7C140200,  //  0004  CALL	R5	1
+      0x90020205,  //  0005  SETMBR	R0	K1	R5
+      0x4C140000,  //  0006  LDNIL	R5
+      0x1C140405,  //  0007  EQ	R5	R2	R5
+      0x78160008,  //  0008  JMPF	R5	#0012
+      0x8C140502,  //  0009  GETMET	R5	R2	K2
+      0x881C0503,  //  000A  GETMBR	R7	R2	K3
+      0x7C140400,  //  000B  CALL	R5	2
+      0x28140B04,  //  000C  GE	R5	R5	K4
+      0x78160003,  //  000D  JMPF	R5	#0012
+      0x8C140502,  //  000E  GETMET	R5	R2	K2
+      0x881C0503,  //  000F  GETMBR	R7	R2	K3
+      0x7C140400,  //  0010  CALL	R5	2
+      0x5C080A00,  //  0011  MOVE	R2	R5
+      0x4C140000,  //  0012  LDNIL	R5
+      0x1C140405,  //  0013  EQ	R5	R2	R5
+      0x78160000,  //  0014  JMPF	R5	#0016
+      0xB0060B06,  //  0015  RAISE	1	K5	K6
+      0x8C140107,  //  0016  GETMET	R5	R0	K7
+      0x881C0101,  //  0017  GETMBR	R7	R0	K1
+      0x5C200400,  //  0018  MOVE	R8	R2
+      0x5C240600,  //  0019  MOVE	R9	R3
+      0x5C280800,  //  001A  MOVE	R10	R4
+      0x7C140A00,  //  001B  CALL	R5	5
+      0x88140108,  //  001C  GETMBR	R5	R0	K8
+      0x4C180000,  //  001D  LDNIL	R6
+      0x1C140A06,  //  001E  EQ	R5	R5	R6
+      0x78160000,  //  001F  JMPF	R5	#0021
+      0xB006130A,  //  0020  RAISE	1	K9	K10
+      0x8C14010B,  //  0021  GETMET	R5	R0	K11
+      0x7C140200,  //  0022  CALL	R5	1
+      0x80000000,  //  0023  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: clear_to
+********************************************************************/
+be_local_closure(Leds_clear_to,   /* name */
+  be_nested_proto(
+    10,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(call_native),
+    /* K1   */  be_nested_str(to_gamma),
+    }),
+    &be_const_str_clear_to,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 8]) {  /* code */
+      0x8C0C0100,  //  0000  GETMET	R3	R0	K0
+      0x54160008,  //  0001  LDINT	R5	9
+      0x8C180101,  //  0002  GETMET	R6	R0	K1
+      0x5C200200,  //  0003  MOVE	R8	R1
+      0x5C240400,  //  0004  MOVE	R9	R2
+      0x7C180600,  //  0005  CALL	R6	3
+      0x7C0C0600,  //  0006  CALL	R3	3
+      0x80000000,  //  0007  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: can_show
+********************************************************************/
+be_local_closure(Leds_can_show,   /* name */
+  be_nested_proto(
+    4,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(call_native),
+    /* K1   */  be_const_int(3),
+    }),
+    &be_const_str_can_show,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x8C040100,  //  0000  GETMET	R1	R0	K0
+      0x580C0001,  //  0001  LDCONST	R3	K1
+      0x7C040400,  //  0002  CALL	R1	2
+      0x80040200,  //  0003  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: clear
+********************************************************************/
+be_local_closure(Leds_clear,   /* name */
+  be_nested_proto(
+    4,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(clear_to),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(show),
+    }),
+    &be_const_str_clear,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 6]) {  /* code */
+      0x8C040100,  //  0000  GETMET	R1	R0	K0
+      0x580C0001,  //  0001  LDCONST	R3	K1
+      0x7C040400,  //  0002  CALL	R1	2
+      0x8C040102,  //  0003  GETMET	R1	R0	K2
+      0x7C040200,  //  0004  CALL	R1	1
+      0x80000000,  //  0005  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: show
+********************************************************************/
+be_local_closure(Leds_show,   /* name */
+  be_nested_proto(
+    4,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(call_native),
+    /* K1   */  be_const_int(2),
+    }),
+    &be_const_str_show,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x8C040100,  //  0000  GETMET	R1	R0	K0
+      0x580C0001,  //  0001  LDCONST	R3	K1
+      0x7C040400,  //  0002  CALL	R1	2
+      0x80000000,  //  0003  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
 /********************************************************************
 ** Solidified function: ctor
 ********************************************************************/
@@ -552,11 +1212,11 @@ be_local_closure(Leds_ctor,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_str_literal("call_native"),
+    /* K0   */  be_nested_str(call_native),
     /* K1   */  be_const_int(0),
     }),
-    (be_nested_const_str("ctor", 375399343, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_ctor,
+    &be_const_str_solidified,
     ( &(const binstruction[16]) {  /* code */
       0x4C100000,  //  0000  LDNIL	R4
       0x1C100604,  //  0001  EQ	R4	R3	R4
@@ -580,31 +1240,567 @@ be_local_closure(Leds_ctor,   /* name */
 /*******************************************************************/
 
 
+/********************************************************************
+** Solidified function: dirty
+********************************************************************/
+be_local_closure(Leds_dirty,   /* name */
+  be_nested_proto(
+    4,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 1]) {     /* constants */
+    /* K0   */  be_nested_str(call_native),
+    }),
+    &be_const_str_dirty,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x8C040100,  //  0000  GETMET	R1	R0	K0
+      0x540E0004,  //  0001  LDINT	R3	5
+      0x7C040400,  //  0002  CALL	R1	2
+      0x80000000,  //  0003  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: get_pixel_color
+********************************************************************/
+be_local_closure(Leds_segment_get_pixel_color,   /* name */
+  be_nested_proto(
+    5,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(get_pixel_color),
+    /* K2   */  be_nested_str(offseta),
+    }),
+    &be_const_str_get_pixel_color,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 6]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x8C080501,  //  0001  GETMET	R2	R2	K1
+      0x88100102,  //  0002  GETMBR	R4	R0	K2
+      0x00100204,  //  0003  ADD	R4	R1	R4
+      0x7C080400,  //  0004  CALL	R2	2
+      0x80040400,  //  0005  RET	1	R2
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: clear_to
+********************************************************************/
+be_local_closure(Leds_segment_clear_to,   /* name */
+  be_nested_proto(
+    9,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 6]) {     /* constants */
+    /* K0   */  be_const_int(0),
+    /* K1   */  be_nested_str(leds),
+    /* K2   */  be_nested_str(strip),
+    /* K3   */  be_nested_str(set_pixel_color),
+    /* K4   */  be_nested_str(offset),
+    /* K5   */  be_const_int(1),
+    }),
+    &be_const_str_clear_to,
+    &be_const_str_solidified,
+    ( &(const binstruction[14]) {  /* code */
+      0x580C0000,  //  0000  LDCONST	R3	K0
+      0x88100101,  //  0001  GETMBR	R4	R0	K1
+      0x14100604,  //  0002  LT	R4	R3	R4
+      0x78120008,  //  0003  JMPF	R4	#000D
+      0x88100102,  //  0004  GETMBR	R4	R0	K2
+      0x8C100903,  //  0005  GETMET	R4	R4	K3
+      0x88180104,  //  0006  GETMBR	R6	R0	K4
+      0x00180606,  //  0007  ADD	R6	R3	R6
+      0x5C1C0200,  //  0008  MOVE	R7	R1
+      0x5C200400,  //  0009  MOVE	R8	R2
+      0x7C100800,  //  000A  CALL	R4	4
+      0x000C0705,  //  000B  ADD	R3	R3	K5
+      0x7001FFF3,  //  000C  JMP		#0001
+      0x80000000,  //  000D  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: can_show
+********************************************************************/
+be_local_closure(Leds_segment_can_show,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(can_show),
+    }),
+    &be_const_str_can_show,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
+      0x80040200,  //  0003  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: set_pixel_color
+********************************************************************/
+be_local_closure(Leds_segment_set_pixel_color,   /* name */
+  be_nested_proto(
+    9,                          /* nstack */
+    4,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(set_pixel_color),
+    /* K2   */  be_nested_str(offset),
+    }),
+    &be_const_str_set_pixel_color,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 8]) {  /* code */
+      0x88100100,  //  0000  GETMBR	R4	R0	K0
+      0x8C100901,  //  0001  GETMET	R4	R4	K1
+      0x88180102,  //  0002  GETMBR	R6	R0	K2
+      0x00180206,  //  0003  ADD	R6	R1	R6
+      0x5C1C0400,  //  0004  MOVE	R7	R2
+      0x5C200600,  //  0005  MOVE	R8	R3
+      0x7C100800,  //  0006  CALL	R4	4
+      0x80000000,  //  0007  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: clear
+********************************************************************/
+be_local_closure(Leds_segment_clear,   /* name */
+  be_nested_proto(
+    4,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(clear_to),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(show),
+    }),
+    &be_const_str_clear,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 6]) {  /* code */
+      0x8C040100,  //  0000  GETMET	R1	R0	K0
+      0x580C0001,  //  0001  LDCONST	R3	K1
+      0x7C040400,  //  0002  CALL	R1	2
+      0x8C040102,  //  0003  GETMET	R1	R0	K2
+      0x7C040200,  //  0004  CALL	R1	1
+      0x80000000,  //  0005  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: begin
+********************************************************************/
+be_local_closure(Leds_segment_begin,   /* name */
+  be_nested_proto(
+    1,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    0,                          /* has constants */
+    NULL,                       /* no const */
+    &be_const_str_begin,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 1]) {  /* code */
+      0x80000000,  //  0000  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: pixel_count
+********************************************************************/
+be_local_closure(Leds_segment_pixel_count,   /* name */
+  be_nested_proto(
+    2,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 1]) {     /* constants */
+    /* K0   */  be_nested_str(leds),
+    }),
+    &be_const_str_pixel_count,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 2]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x80040200,  //  0001  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: init
+********************************************************************/
+be_local_closure(Leds_segment_init,   /* name */
+  be_nested_proto(
+    6,                          /* nstack */
+    4,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(offset),
+    /* K2   */  be_nested_str(leds),
+    }),
+    &be_const_str_init,
+    &be_const_str_solidified,
+    ( &(const binstruction[10]) {  /* code */
+      0x90020001,  //  0000  SETMBR	R0	K0	R1
+      0x60100009,  //  0001  GETGBL	R4	G9
+      0x5C140400,  //  0002  MOVE	R5	R2
+      0x7C100200,  //  0003  CALL	R4	1
+      0x90020204,  //  0004  SETMBR	R0	K1	R4
+      0x60100009,  //  0005  GETGBL	R4	G9
+      0x5C140600,  //  0006  MOVE	R5	R3
+      0x7C100200,  //  0007  CALL	R4	1
+      0x90020404,  //  0008  SETMBR	R0	K2	R4
+      0x80000000,  //  0009  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: pixel_size
+********************************************************************/
+be_local_closure(Leds_segment_pixel_size,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(pixel_size),
+    }),
+    &be_const_str_pixel_size,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
+      0x80040200,  //  0003  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: dirty
+********************************************************************/
+be_local_closure(Leds_segment_dirty,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(dirty),
+    }),
+    &be_const_str_dirty,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
+      0x80000000,  //  0003  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: show
+********************************************************************/
+be_local_closure(Leds_segment_show,   /* name */
+  be_nested_proto(
+    4,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_nested_str(offset),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(leds),
+    /* K3   */  be_nested_str(strip),
+    /* K4   */  be_nested_str(show),
+    }),
+    &be_const_str_show,
+    &be_const_str_solidified,
+    ( &(const binstruction[16]) {  /* code */
+      0x60080017,  //  0000  GETGBL	R2	G23
+      0x5C0C0200,  //  0001  MOVE	R3	R1
+      0x7C080200,  //  0002  CALL	R2	1
+      0x740A0007,  //  0003  JMPT	R2	#000C
+      0x88080100,  //  0004  GETMBR	R2	R0	K0
+      0x1C080501,  //  0005  EQ	R2	R2	K1
+      0x780A0007,  //  0006  JMPF	R2	#000F
+      0x88080102,  //  0007  GETMBR	R2	R0	K2
+      0x880C0103,  //  0008  GETMBR	R3	R0	K3
+      0x880C0702,  //  0009  GETMBR	R3	R3	K2
+      0x1C080403,  //  000A  EQ	R2	R2	R3
+      0x780A0002,  //  000B  JMPF	R2	#000F
+      0x88080103,  //  000C  GETMBR	R2	R0	K3
+      0x8C080504,  //  000D  GETMET	R2	R2	K4
+      0x7C080200,  //  000E  CALL	R2	1
+      0x80000000,  //  000F  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: is_dirty
+********************************************************************/
+be_local_closure(Leds_segment_is_dirty,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(strip),
+    /* K1   */  be_nested_str(is_dirty),
+    }),
+    &be_const_str_is_dirty,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 4]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x8C040301,  //  0001  GETMET	R1	R1	K1
+      0x7C040200,  //  0002  CALL	R1	1
+      0x80040200,  //  0003  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: pixels_buffer
+********************************************************************/
+be_local_closure(Leds_segment_pixels_buffer,   /* name */
+  be_nested_proto(
+    2,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    0,                          /* has constants */
+    NULL,                       /* no const */
+    &be_const_str_pixels_buffer,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 2]) {  /* code */
+      0x4C040000,  //  0000  LDNIL	R1
+      0x80040200,  //  0001  RET	1	R1
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified class: Leds_segment
+********************************************************************/
+be_local_class(Leds_segment,
+    3,
+    NULL,
+    be_nested_map(16,
+    ( (struct bmapnode*) &(const bmapnode[]) {
+        { be_const_key(get_pixel_color, -1), be_const_closure(Leds_segment_get_pixel_color_closure) },
+        { be_const_key(strip, -1), be_const_var(0) },
+        { be_const_key(clear_to, 5), be_const_closure(Leds_segment_clear_to_closure) },
+        { be_const_key(can_show, 13), be_const_closure(Leds_segment_can_show_closure) },
+        { be_const_key(set_pixel_color, -1), be_const_closure(Leds_segment_set_pixel_color_closure) },
+        { be_const_key(clear, -1), be_const_closure(Leds_segment_clear_closure) },
+        { be_const_key(is_dirty, -1), be_const_closure(Leds_segment_is_dirty_closure) },
+        { be_const_key(pixel_count, -1), be_const_closure(Leds_segment_pixel_count_closure) },
+        { be_const_key(leds, -1), be_const_var(2) },
+        { be_const_key(pixel_size, -1), be_const_closure(Leds_segment_pixel_size_closure) },
+        { be_const_key(offset, -1), be_const_var(1) },
+        { be_const_key(dirty, 8), be_const_closure(Leds_segment_dirty_closure) },
+        { be_const_key(show, -1), be_const_closure(Leds_segment_show_closure) },
+        { be_const_key(init, -1), be_const_closure(Leds_segment_init_closure) },
+        { be_const_key(begin, 6), be_const_closure(Leds_segment_begin_closure) },
+        { be_const_key(pixels_buffer, -1), be_const_closure(Leds_segment_pixels_buffer_closure) },
+    })),
+    be_str_literal("Leds_segment")
+);
+
+/********************************************************************
+** Solidified function: create_segment
+********************************************************************/
+be_local_closure(Leds_create_segment,   /* name */
+  be_nested_proto(
+    8,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_nested_str(leds),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(value_error),
+    /* K3   */  be_nested_str(out_X20of_X20range),
+    /* K4   */  be_const_class(be_class_Leds_segment),
+    }),
+    &be_const_str_create_segment,
+    &be_const_str_solidified,
+    ( &(const binstruction[23]) {  /* code */
+      0x600C0009,  //  0000  GETGBL	R3	G9
+      0x5C100200,  //  0001  MOVE	R4	R1
+      0x7C0C0200,  //  0002  CALL	R3	1
+      0x60100009,  //  0003  GETGBL	R4	G9
+      0x5C140400,  //  0004  MOVE	R5	R2
+      0x7C100200,  //  0005  CALL	R4	1
+      0x000C0604,  //  0006  ADD	R3	R3	R4
+      0x88100100,  //  0007  GETMBR	R4	R0	K0
+      0x240C0604,  //  0008  GT	R3	R3	R4
+      0x740E0003,  //  0009  JMPT	R3	#000E
+      0x140C0301,  //  000A  LT	R3	R1	K1
+      0x740E0001,  //  000B  JMPT	R3	#000E
+      0x140C0501,  //  000C  LT	R3	R2	K1
+      0x780E0000,  //  000D  JMPF	R3	#000F
+      0xB0060503,  //  000E  RAISE	1	K2	K3
+      0x580C0004,  //  000F  LDCONST	R3	K4
+      0xB4000004,  //  0010  CLASS	K4
+      0x5C100600,  //  0011  MOVE	R4	R3
+      0x5C140000,  //  0012  MOVE	R5	R0
+      0x5C180200,  //  0013  MOVE	R6	R1
+      0x5C1C0400,  //  0014  MOVE	R7	R2
+      0x7C100600,  //  0015  CALL	R4	3
+      0x80040800,  //  0016  RET	1	R4
+    })
+  )
+);
+/*******************************************************************/
+
+
 /********************************************************************
 ** Solidified class: Leds
 ********************************************************************/
 extern const bclass be_class_Leds_ntv;
 be_local_class(Leds,
-    1,
+    2,
     &be_class_Leds_ntv,
-    be_nested_map(16,
+    be_nested_map(20,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("get_pixel_color", 337490048, 15, -1), be_const_closure(Leds_get_pixel_color_closure) },
-        { be_nested_key("ctor", 375399343, 4, -1), be_const_closure(Leds_ctor_closure) },
-        { be_nested_key("clear", 1550717474, 5, 8), be_const_closure(Leds_clear_closure) },
-        { be_nested_key("init", 380752755, 4, 13), be_const_closure(Leds_init_closure) },
-        { be_nested_key("set_pixel_color", 1275248356, 15, -1), be_const_closure(Leds_set_pixel_color_closure) },
-        { be_nested_key("is_dirty", 418034110, 8, -1), be_const_closure(Leds_is_dirty_closure) },
-        { be_nested_key("to_gamma", 1597139862, 8, -1), be_const_closure(Leds_to_gamma_closure) },
-        { be_nested_key("pixel_count", -1855836553, 11, -1), be_const_closure(Leds_pixel_count_closure) },
-        { be_nested_key("clear_to", -766965166, 8, -1), be_const_closure(Leds_clear_to_closure) },
-        { be_nested_key("pixel_size", -2085831511, 10, -1), be_const_closure(Leds_pixel_size_closure) },
-        { be_nested_key("gamma", -802614262, 5, -1), be_const_var(0) },
-        { be_nested_key("dirty", -1627386213, 5, -1), be_const_closure(Leds_dirty_closure) },
-        { be_nested_key("show", -1454906820, 4, -1), be_const_closure(Leds_show_closure) },
-        { be_nested_key("can_show", 960091187, 8, -1), be_const_closure(Leds_can_show_closure) },
-        { be_nested_key("begin", 1748273790, 5, 5), be_const_closure(Leds_begin_closure) },
-        { be_nested_key("pixels_buffer", 1229555807, 13, 1), be_const_closure(Leds_pixels_buffer_closure) },
+        { be_const_key(pixel_count, -1), be_const_closure(Leds_pixel_count_closure) },
+        { be_const_key(dirty, 6), be_const_closure(Leds_dirty_closure) },
+        { be_const_key(to_gamma, -1), be_const_closure(Leds_to_gamma_closure) },
+        { be_const_key(create_matrix, 1), be_const_closure(Leds_create_matrix_closure) },
+        { be_const_key(matrix, -1), be_const_static_closure(Leds_matrix_closure) },
+        { be_const_key(pixel_size, -1), be_const_closure(Leds_pixel_size_closure) },
+        { be_const_key(ctor, 0), be_const_closure(Leds_ctor_closure) },
+        { be_const_key(pixels_buffer, 13), be_const_closure(Leds_pixels_buffer_closure) },
+        { be_const_key(get_pixel_color, -1), be_const_closure(Leds_get_pixel_color_closure) },
+        { be_const_key(show, -1), be_const_closure(Leds_show_closure) },
+        { be_const_key(begin, 17), be_const_closure(Leds_begin_closure) },
+        { be_const_key(leds, -1), be_const_var(1) },
+        { be_const_key(clear, -1), be_const_closure(Leds_clear_closure) },
+        { be_const_key(can_show, -1), be_const_closure(Leds_can_show_closure) },
+        { be_const_key(gamma, 12), be_const_var(0) },
+        { be_const_key(init, 11), be_const_closure(Leds_init_closure) },
+        { be_const_key(set_pixel_color, 9), be_const_closure(Leds_set_pixel_color_closure) },
+        { be_const_key(clear_to, 18), be_const_closure(Leds_clear_to_closure) },
+        { be_const_key(is_dirty, -1), be_const_closure(Leds_is_dirty_closure) },
+        { be_const_key(create_segment, -1), be_const_closure(Leds_create_segment_closure) },
     })),
     be_str_literal("Leds")
 );
diff --git a/lib/libesp32/Berry/default/be_leds_matrix_lib.c b/lib/libesp32/Berry/default/be_leds_matrix_lib.c
deleted file mode 100644
index 1aafb3db4..000000000
--- a/lib/libesp32/Berry/default/be_leds_matrix_lib.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/********************************************************************
- * Berry class `Leds_matrix`
- * 
- *******************************************************************/
-#include "be_constobj.h"
-
-#ifdef USE_WS2812
-
-/********************************************************************
-** Solidified function: get_alternate
-********************************************************************/
-be_local_closure(Leds_matrix_get_alternate,   /* name */
-  be_nested_proto(
-    2,                          /* nstack */
-    1,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("alternate"),
-    }),
-    (be_nested_const_str("get_alternate", 1450148894, 13)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 2]) {  /* code */
-      0x88040100,  //  0000  GETMBR	R1	R0	K0
-      0x80040200,  //  0001  RET	1	R1
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: set_alternate
-********************************************************************/
-be_local_closure(Leds_matrix_set_alternate,   /* name */
-  be_nested_proto(
-    2,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_str_literal("alternate"),
-    }),
-    (be_nested_const_str("set_alternate", 1709680562, 13)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 2]) {  /* code */
-      0x90020001,  //  0000  SETMBR	R0	K0	R1
-      0x80000000,  //  0001  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: set_matrix_pixel_color
-********************************************************************/
-be_local_closure(Leds_matrix_set_matrix_pixel_color,   /* name */
-  be_nested_proto(
-    10,                          /* nstack */
-    5,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_str_literal("alternate"),
-    /* K1   */  be_const_int(2),
-    /* K2   */  be_nested_str_literal("set_pixel_color"),
-    /* K3   */  be_nested_str_literal("w"),
-    /* K4   */  be_nested_str_literal("h"),
-    /* K5   */  be_const_int(1),
-    }),
-    (be_nested_const_str("set_matrix_pixel_color", 1197149462, 22)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[23]) {  /* code */
-      0x88140100,  //  0000  GETMBR	R5	R0	K0
-      0x7816000C,  //  0001  JMPF	R5	#000F
-      0x10140301,  //  0002  MOD	R5	R1	K1
-      0x7816000A,  //  0003  JMPF	R5	#000F
-      0x8C140102,  //  0004  GETMET	R5	R0	K2
-      0x881C0103,  //  0005  GETMBR	R7	R0	K3
-      0x081C0207,  //  0006  MUL	R7	R1	R7
-      0x88200104,  //  0007  GETMBR	R8	R0	K4
-      0x001C0E08,  //  0008  ADD	R7	R7	R8
-      0x041C0E02,  //  0009  SUB	R7	R7	R2
-      0x041C0F05,  //  000A  SUB	R7	R7	K5
-      0x5C200600,  //  000B  MOVE	R8	R3
-      0x5C240800,  //  000C  MOVE	R9	R4
-      0x7C140800,  //  000D  CALL	R5	4
-      0x70020006,  //  000E  JMP		#0016
-      0x8C140102,  //  000F  GETMET	R5	R0	K2
-      0x881C0103,  //  0010  GETMBR	R7	R0	K3
-      0x081C0207,  //  0011  MUL	R7	R1	R7
-      0x001C0E02,  //  0012  ADD	R7	R7	R2
-      0x5C200600,  //  0013  MOVE	R8	R3
-      0x5C240800,  //  0014  MOVE	R9	R4
-      0x7C140800,  //  0015  CALL	R5	4
-      0x80000000,  //  0016  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: init
-********************************************************************/
-be_local_closure(Leds_matrix_init,   /* name */
-  be_nested_proto(
-    10,                          /* nstack */
-    5,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_str_literal("w"),
-    /* K1   */  be_nested_str_literal("h"),
-    /* K2   */  be_nested_str_literal("alternate"),
-    /* K3   */  be_nested_str_literal("init"),
-    }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[13]) {  /* code */
-      0x90020001,  //  0000  SETMBR	R0	K0	R1
-      0x90020202,  //  0001  SETMBR	R0	K1	R2
-      0x50140000,  //  0002  LDBOOL	R5	0	0
-      0x90020405,  //  0003  SETMBR	R0	K2	R5
-      0x60140003,  //  0004  GETGBL	R5	G3
-      0x5C180000,  //  0005  MOVE	R6	R0
-      0x7C140200,  //  0006  CALL	R5	1
-      0x8C140B03,  //  0007  GETMET	R5	R5	K3
-      0x081C0202,  //  0008  MUL	R7	R1	R2
-      0x5C200600,  //  0009  MOVE	R8	R3
-      0x5C240800,  //  000A  MOVE	R9	R4
-      0x7C140800,  //  000B  CALL	R5	4
-      0x80000000,  //  000C  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified class: Leds_matrix
-********************************************************************/
-extern const bclass be_class_Leds;
-be_local_class(Leds_matrix,
-    3,
-    &be_class_Leds,
-    be_nested_map(7,
-    ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, 3), be_const_closure(Leds_matrix_init_closure) },
-        { be_nested_key("h", -317966505, 1, -1), be_const_var(0) },
-        { be_nested_key("set_alternate", 1709680562, 13, 6), be_const_closure(Leds_matrix_set_alternate_closure) },
-        { be_nested_key("set_matrix_pixel_color", 1197149462, 22, 4), be_const_closure(Leds_matrix_set_matrix_pixel_color_closure) },
-        { be_nested_key("w", -234078410, 1, -1), be_const_var(1) },
-        { be_nested_key("get_alternate", 1450148894, 13, 0), be_const_closure(Leds_matrix_get_alternate_closure) },
-        { be_nested_key("alternate", 1140253277, 9, -1), be_const_var(2) },
-    })),
-    be_str_literal("Leds_matrix")
-);
-/*******************************************************************/
-
-void be_load_Leds_matrix_class(bvm *vm) {
-    be_pushntvclass(vm, &be_class_Leds_matrix);
-    be_setglobal(vm, "Leds_matrix");
-    be_pop(vm, 1);
-}
-
-
-#endif // USE_WS2812
diff --git a/lib/libesp32/Berry/default/be_leds_ntv_lib.c b/lib/libesp32/Berry/default/be_leds_ntv_lib.c
index 5affc1c71..4d5b07bb6 100644
--- a/lib/libesp32/Berry/default/be_leds_ntv_lib.c
+++ b/lib/libesp32/Berry/default/be_leds_ntv_lib.c
@@ -8,9 +8,7 @@ class Leds_ntv
   var _p      # pointer to internal object of type `NeoPixelBus<FEATURE, METHOD>(uint16_t countPixels, uint8_t pin)`
   var _t      # type of led strip
   static WS2812_GRB   = 1
-  static WS2812_GRBW  = 2
-  static SK6812_GRB   = 3
-  static SK6812_GRBW  = 4
+  static SK6812_GRBW  = 2
 
   # skeleton for native call
   def call_native() end
@@ -30,15 +28,13 @@ extern int be_neopixelbus_call_native(bvm *vm);
 be_local_class(Leds_ntv,
     2,
     NULL,
-    be_nested_map(7,
+    be_nested_map(5,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("WS2812_GRB", 1736405692, 10, 5), be_const_int(1) },
-        { be_nested_key("_p", 1594591802, 2, -1), be_const_var(0) },
-        { be_nested_key("WS2812_GRBW", -660477967, 11, 3), be_const_int(2) },
-        { be_nested_key("call_native", 1389147405, 11, -1), be_const_func(be_neopixelbus_call_native) },
-        { be_nested_key("SK6812_GRBW", 81157857, 11, -1), be_const_int(4) },
-        { be_nested_key("_t", 1527481326, 2, -1), be_const_var(1) },
-        { be_nested_key("SK6812_GRB", 1159411308, 10, 1), be_const_int(3) },
+        { be_const_key(call_native, -1), be_const_func(be_neopixelbus_call_native) },
+        { be_const_key(_t, -1), be_const_var(1) },
+        { be_const_key(_p, 3), be_const_var(0) },
+        { be_const_key(SK6812_GRBW, 4), be_const_int(2) },
+        { be_const_key(WS2812_GRB, -1), be_const_int(1) },
     })),
     be_str_literal("Leds_ntv")
 );
diff --git a/lib/libesp32/Berry/default/be_lvgl_clock_icon_lib.c b/lib/libesp32/Berry/default/be_lvgl_clock_icon_lib.c
index 4cef73ac9..c9cf7f207 100644
--- a/lib/libesp32/Berry/default/be_lvgl_clock_icon_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_clock_icon_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: set_time
 ********************************************************************/
-be_local_closure(set_time,   /* name */
+be_local_closure(lv_clock_icon_set_time,   /* name */
   be_nested_proto(
     11,                          /* nstack */
     4,                          /* argc */
@@ -21,19 +21,19 @@ be_local_closure(set_time,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("hour", -1241306097, 4),
-    /* K2   */  be_nested_string("minute", 954666857, 6),
-    /* K3   */  be_nested_string("sec", -1155074638, 3),
-    /* K4   */  be_nested_string("format", -1180859054, 6),
-    /* K5   */  be_nested_string("%02d%s%02d", 1587999717, 10),
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(hour),
+    /* K2   */  be_nested_str(minute),
+    /* K3   */  be_nested_str(sec),
+    /* K4   */  be_nested_str(format),
+    /* K5   */  be_nested_str(_X2502d_X25s_X2502d),
     /* K6   */  be_const_int(2),
-    /* K7   */  be_nested_string(":", 1057798253, 1),
-    /* K8   */  be_nested_string(" ", 621580159, 1),
-    /* K9   */  be_nested_string("set_text", 1849641155, 8),
+    /* K7   */  be_nested_str(_X3A),
+    /* K8   */  be_nested_str(_X20),
+    /* K9   */  be_nested_str(set_text),
     }),
-    (be_nested_const_str("set_time", 900236405, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_time,
+    &be_const_str_solidified,
     ( &(const binstruction[27]) {  /* code */
       0xA4120000,  //  0000  IMPORT	R4	K0
       0x88140101,  //  0001  GETMBR	R5	R0	K1
@@ -71,7 +71,7 @@ be_local_closure(set_time,   /* name */
 /********************************************************************
 ** Solidified function: every_second
 ********************************************************************/
-be_local_closure(every_second,   /* name */
+be_local_closure(lv_clock_icon_every_second,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     1,                          /* argc */
@@ -82,18 +82,18 @@ be_local_closure(every_second,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 9]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("time_dump", -964556549, 9),
-    /* K2   */  be_nested_string("rtc", 1070575216, 3),
-    /* K3   */  be_nested_string("local", -1673304312, 5),
-    /* K4   */  be_nested_string("year", -1367388900, 4),
-    /* K5   */  be_nested_string("set_time", 900236405, 8),
-    /* K6   */  be_nested_string("hour", -1241306097, 4),
-    /* K7   */  be_nested_string("min", -913357481, 3),
-    /* K8   */  be_nested_string("sec", -1155074638, 3),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(time_dump),
+    /* K2   */  be_nested_str(rtc),
+    /* K3   */  be_nested_str(local),
+    /* K4   */  be_nested_str(year),
+    /* K5   */  be_nested_str(set_time),
+    /* K6   */  be_nested_str(hour),
+    /* K7   */  be_nested_str(min),
+    /* K8   */  be_nested_str(sec),
     }),
-    (be_nested_const_str("every_second", 2075451465, 12)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_every_second,
+    &be_const_str_solidified,
     ( &(const binstruction[17]) {  /* code */
       0xB8060000,  //  0000  GETNGBL	R1	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -121,7 +121,7 @@ be_local_closure(every_second,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(lv_clock_icon_init,   /* name */
   be_nested_proto(
     11,                          /* nstack */
     2,                          /* argc */
@@ -132,31 +132,31 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[22]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("lv", 1529997255, 2),
-    /* K2   */  be_nested_string("seg7_font", -195276607, 9),
-    /* K3   */  be_nested_string("set_style_text_font", 1028590019, 19),
-    /* K4   */  be_nested_string("PART_MAIN", -1821475788, 9),
-    /* K5   */  be_nested_string("STATE_DEFAULT", 712406428, 13),
-    /* K6   */  be_nested_string("get_height", -723211773, 10),
-    /* K7   */  be_nested_string("set_text", 1849641155, 8),
-    /* K8   */  be_nested_string("--:--", 1370615441, 5),
-    /* K9   */  be_nested_string("refr_size", 1958144468, 9),
-    /* K10  */  be_nested_string("get_width", -1001549996, 9),
-    /* K11  */  be_nested_string("set_y", 1866178391, 5),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(lv),
+    /* K2   */  be_nested_str(seg7_font),
+    /* K3   */  be_nested_str(set_style_text_font),
+    /* K4   */  be_nested_str(PART_MAIN),
+    /* K5   */  be_nested_str(STATE_DEFAULT),
+    /* K6   */  be_nested_str(get_height),
+    /* K7   */  be_nested_str(set_text),
+    /* K8   */  be_nested_str(_X2D_X2D_X3A_X2D_X2D),
+    /* K9   */  be_nested_str(refr_size),
+    /* K10  */  be_nested_str(get_width),
+    /* K11  */  be_nested_str(set_y),
     /* K12  */  be_const_int(2),
-    /* K13  */  be_nested_string("get_style_pad_right", -1144679830, 19),
-    /* K14  */  be_nested_string("set_x", 1849400772, 5),
+    /* K13  */  be_nested_str(get_style_pad_right),
+    /* K14  */  be_nested_str(set_x),
     /* K15  */  be_const_int(3),
-    /* K16  */  be_nested_string("set_style_pad_right", -980898242, 19),
-    /* K17  */  be_nested_string("set_style_bg_color", 1689513089, 18),
-    /* K18  */  be_nested_string("color", 1031692888, 5),
-    /* K19  */  be_nested_string("COLOR_BLACK", 264427940, 11),
-    /* K20  */  be_nested_string("tasmota", 424643812, 7),
-    /* K21  */  be_nested_string("add_driver", 1654458371, 10),
+    /* K16  */  be_nested_str(set_style_pad_right),
+    /* K17  */  be_nested_str(set_style_bg_color),
+    /* K18  */  be_nested_str(color),
+    /* K19  */  be_nested_str(COLOR_BLACK),
+    /* K20  */  be_nested_str(tasmota),
+    /* K21  */  be_nested_str(add_driver),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[82]) {  /* code */
       0x60080003,  //  0000  GETGBL	R2	G3
       0x5C0C0000,  //  0001  MOVE	R3	R0
@@ -249,7 +249,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: del
 ********************************************************************/
-be_local_closure(del,   /* name */
+be_local_closure(lv_clock_icon_del,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -260,12 +260,12 @@ be_local_closure(del,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("del", -816214454, 3),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("remove_driver", 1030243768, 13),
+    /* K0   */  be_nested_str(del),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(remove_driver),
     }),
-    (be_nested_const_str("del", -816214454, 3)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_del,
+    &be_const_str_solidified,
     ( &(const binstruction[10]) {  /* code */
       0x60040003,  //  0000  GETGBL	R1	G3
       0x5C080000,  //  0001  MOVE	R2	R0
@@ -292,15 +292,15 @@ be_local_class(lv_clock_icon,
     &be_class_lv_label,
     be_nested_map(7,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("sec", -1155074638, 3, -1), be_const_var(2) },
-        { be_nested_key("hour", -1241306097, 4, -1), be_const_var(0) },
-        { be_nested_key("set_time", 900236405, 8, 6), be_const_closure(set_time_closure) },
-        { be_nested_key("every_second", 2075451465, 12, -1), be_const_closure(every_second_closure) },
-        { be_nested_key("minute", 954666857, 6, -1), be_const_var(1) },
-        { be_nested_key("init", 380752755, 4, 2), be_const_closure(init_closure) },
-        { be_nested_key("del", -816214454, 3, -1), be_const_closure(del_closure) },
+        { be_const_key(sec, -1), be_const_var(2) },
+        { be_const_key(hour, -1), be_const_var(0) },
+        { be_const_key(set_time, 6), be_const_closure(lv_clock_icon_set_time_closure) },
+        { be_const_key(every_second, -1), be_const_closure(lv_clock_icon_every_second_closure) },
+        { be_const_key(minute, -1), be_const_var(1) },
+        { be_const_key(init, 2), be_const_closure(lv_clock_icon_init_closure) },
+        { be_const_key(del, -1), be_const_closure(lv_clock_icon_del_closure) },
     })),
-    (be_nested_const_str("lv_clock_icon", -1037751086, 13))
+    be_str_literal("lv_clock_icon")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_lvgl_glob_lib.c b/lib/libesp32/Berry/default/be_lvgl_glob_lib.c
index 31619f1c4..01bd4ed1d 100644
--- a/lib/libesp32/Berry/default/be_lvgl_glob_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_glob_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: get_object_from_ptr
 ********************************************************************/
-be_local_closure(get_object_from_ptr,   /* name */
+be_local_closure(LVGL_glob_get_object_from_ptr,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -21,11 +21,11 @@ be_local_closure(get_object_from_ptr,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("cb_obj", 1195696482, 6),
-    /* K1   */  be_nested_string("find", -1108310694, 4),
+    /* K0   */  be_nested_str(cb_obj),
+    /* K1   */  be_nested_str(find),
     }),
-    (be_nested_const_str("get_object_from_ptr", -1949948095, 19)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_object_from_ptr,
+    &be_const_str_solidified,
     ( &(const binstruction[10]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x4C0C0000,  //  0001  LDNIL	R3
@@ -46,7 +46,7 @@ be_local_closure(get_object_from_ptr,   /* name */
 /********************************************************************
 ** Solidified function: widget_event_impl
 ********************************************************************/
-be_local_closure(widget_event_impl,   /* name */
+be_local_closure(LVGL_glob_widget_event_impl,   /* name */
   be_nested_proto(
     12,                          /* nstack */
     3,                          /* argc */
@@ -57,18 +57,18 @@ be_local_closure(widget_event_impl,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 9]) {     /* constants */
-    /* K0   */  be_nested_string("introspect", 164638290, 10),
-    /* K1   */  be_nested_string("lv", 1529997255, 2),
-    /* K2   */  be_nested_string("lv_obj_class", -255311002, 12),
-    /* K3   */  be_nested_string("lv_event", -1860877328, 8),
-    /* K4   */  be_nested_string("target", 845187144, 6),
-    /* K5   */  be_nested_string("get_object_from_ptr", -1949948095, 19),
-    /* K6   */  be_nested_string("instance", 193386898, 8),
-    /* K7   */  be_nested_string("get", 1410115415, 3),
-    /* K8   */  be_nested_string("widget_event", 1951408186, 12),
+    /* K0   */  be_nested_str(introspect),
+    /* K1   */  be_nested_str(lv),
+    /* K2   */  be_nested_str(lv_obj_class),
+    /* K3   */  be_nested_str(lv_event),
+    /* K4   */  be_nested_str(target),
+    /* K5   */  be_nested_str(get_object_from_ptr),
+    /* K6   */  be_nested_str(instance),
+    /* K7   */  be_nested_str(get),
+    /* K8   */  be_nested_str(widget_event),
     }),
-    (be_nested_const_str("widget_event_impl", -2116536735, 17)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_widget_event_impl,
+    &be_const_str_solidified,
     ( &(const binstruction[30]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0xB8120200,  //  0001  GETNGBL	R4	K1
@@ -109,7 +109,7 @@ be_local_closure(widget_event_impl,   /* name */
 /********************************************************************
 ** Solidified function: lvgl_event_dispatch
 ********************************************************************/
-be_local_closure(lvgl_event_dispatch,   /* name */
+be_local_closure(LVGL_glob_lvgl_event_dispatch,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     2,                          /* argc */
@@ -120,16 +120,16 @@ be_local_closure(lvgl_event_dispatch,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("introspect", 164638290, 10),
-    /* K1   */  be_nested_string("lv", 1529997255, 2),
-    /* K2   */  be_nested_string("lv_event", -1860877328, 8),
-    /* K3   */  be_nested_string("toptr", -915119842, 5),
-    /* K4   */  be_nested_string("target", 845187144, 6),
-    /* K5   */  be_nested_string("cb_event_closure", -466699971, 16),
-    /* K6   */  be_nested_string("get_object_from_ptr", -1949948095, 19),
+    /* K0   */  be_nested_str(introspect),
+    /* K1   */  be_nested_str(lv),
+    /* K2   */  be_nested_str(lv_event),
+    /* K3   */  be_nested_str(toptr),
+    /* K4   */  be_nested_str(target),
+    /* K5   */  be_nested_str(cb_event_closure),
+    /* K6   */  be_nested_str(get_object_from_ptr),
     }),
-    (be_nested_const_str("lvgl_event_dispatch", 2104396622, 19)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_lvgl_event_dispatch,
+    &be_const_str_solidified,
     ( &(const binstruction[20]) {  /* code */
       0xA40A0000,  //  0000  IMPORT	R2	K0
       0xB80E0200,  //  0001  GETNGBL	R3	K1
@@ -160,7 +160,7 @@ be_local_closure(lvgl_event_dispatch,   /* name */
 /********************************************************************
 ** Solidified function: widget_dtor_impl
 ********************************************************************/
-be_local_closure(widget_dtor_impl,   /* name */
+be_local_closure(LVGL_glob_widget_dtor_impl,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     3,                          /* argc */
@@ -171,16 +171,16 @@ be_local_closure(widget_dtor_impl,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("introspect", 164638290, 10),
-    /* K1   */  be_nested_string("lv", 1529997255, 2),
-    /* K2   */  be_nested_string("lv_obj_class", -255311002, 12),
-    /* K3   */  be_nested_string("get_object_from_ptr", -1949948095, 19),
-    /* K4   */  be_nested_string("instance", 193386898, 8),
-    /* K5   */  be_nested_string("get", 1410115415, 3),
-    /* K6   */  be_nested_string("widget_destructor", -87578951, 17),
+    /* K0   */  be_nested_str(introspect),
+    /* K1   */  be_nested_str(lv),
+    /* K2   */  be_nested_str(lv_obj_class),
+    /* K3   */  be_nested_str(get_object_from_ptr),
+    /* K4   */  be_nested_str(instance),
+    /* K5   */  be_nested_str(get),
+    /* K6   */  be_nested_str(widget_destructor),
     }),
-    (be_nested_const_str("widget_dtor_impl", 520430610, 16)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_widget_dtor_impl,
+    &be_const_str_solidified,
     ( &(const binstruction[22]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0xB8120200,  //  0001  GETNGBL	R4	K1
@@ -213,7 +213,7 @@ be_local_closure(widget_dtor_impl,   /* name */
 /********************************************************************
 ** Solidified function: register_obj
 ********************************************************************/
-be_local_closure(register_obj,   /* name */
+be_local_closure(LVGL_glob_register_obj,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     2,                          /* argc */
@@ -224,11 +224,11 @@ be_local_closure(register_obj,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("cb_obj", 1195696482, 6),
-    /* K1   */  be_nested_string("_p", 1594591802, 2),
+    /* K0   */  be_nested_str(cb_obj),
+    /* K1   */  be_nested_str(_p),
     }),
-    (be_nested_const_str("register_obj", -312352526, 12)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_register_obj,
+    &be_const_str_solidified,
     ( &(const binstruction[13]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x4C0C0000,  //  0001  LDNIL	R3
@@ -252,7 +252,7 @@ be_local_closure(register_obj,   /* name */
 /********************************************************************
 ** Solidified function: gen_cb
 ********************************************************************/
-be_local_closure(gen_cb,   /* name */
+be_local_closure(LVGL_glob_gen_cb,   /* name */
   be_nested_proto(
     8,                          /* nstack */
     5,                          /* argc */
@@ -273,10 +273,10 @@ be_local_closure(gen_cb,   /* name */
         NULL,                       /* no sub protos */
         1,                          /* has constants */
         ( &(const bvalue[ 1]) {     /* constants */
-        /* K0   */  be_nested_string("lvgl_event_dispatch", 2104396622, 19),
+        /* K0   */  be_nested_str(lvgl_event_dispatch),
         }),
-        (be_nested_const_str("<lambda>", 607256038, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str__X3Clambda_X3E,
+        &be_const_str_solidified,
         ( &(const binstruction[ 5]) {  /* code */
           0x68040000,  //  0000  GETUPV	R1	U0
           0x8C040300,  //  0001  GETMET	R1	R1	K0
@@ -288,17 +288,17 @@ be_local_closure(gen_cb,   /* name */
     }),
     1,                          /* has constants */
     ( &(const bvalue[ 8]) {     /* constants */
-    /* K0   */  be_nested_string("lv_event_cb", -1814236280, 11),
-    /* K1   */  be_nested_string("cb_event_closure", -466699971, 16),
-    /* K2   */  be_nested_string("event_cb", -1166269279, 8),
-    /* K3   */  be_nested_string("tasmota", 424643812, 7),
-    /* K4   */  be_nested_string("gen_cb", -1049739745, 6),
-    /* K5   */  be_nested_string("register_obj", -312352526, 12),
-    /* K6   */  be_nested_string("null_cb", -1961430836, 7),
-    /* K7   */  be_nested_string("cb_do_nothing", 1488730702, 13),
+    /* K0   */  be_nested_str(lv_event_cb),
+    /* K1   */  be_nested_str(cb_event_closure),
+    /* K2   */  be_nested_str(event_cb),
+    /* K3   */  be_nested_str(tasmota),
+    /* K4   */  be_nested_str(gen_cb),
+    /* K5   */  be_nested_str(register_obj),
+    /* K6   */  be_nested_str(null_cb),
+    /* K7   */  be_nested_str(cb_do_nothing),
     }),
-    (be_nested_const_str("gen_cb", -1049739745, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_gen_cb,
+    &be_const_str_solidified,
     ( &(const binstruction[41]) {  /* code */
       0x1C140300,  //  0000  EQ	R5	R1	K0
       0x78160018,  //  0001  JMPF	R5	#001B
@@ -350,7 +350,7 @@ be_local_closure(gen_cb,   /* name */
 /********************************************************************
 ** Solidified function: deregister_obj
 ********************************************************************/
-be_local_closure(deregister_obj,   /* name */
+be_local_closure(LVGL_glob_deregister_obj,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -361,12 +361,12 @@ be_local_closure(deregister_obj,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("cb_obj", 1195696482, 6),
-    /* K1   */  be_nested_string("remove", -611183107, 6),
-    /* K2   */  be_nested_string("cb_event_closure", -466699971, 16),
+    /* K0   */  be_nested_str(cb_obj),
+    /* K1   */  be_nested_str(remove),
+    /* K2   */  be_nested_str(cb_event_closure),
     }),
-    (be_nested_const_str("deregister_obj", -385000303, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_deregister_obj,
+    &be_const_str_solidified,
     ( &(const binstruction[17]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x4C0C0000,  //  0001  LDNIL	R3
@@ -394,7 +394,7 @@ be_local_closure(deregister_obj,   /* name */
 /********************************************************************
 ** Solidified function: widget_cb
 ********************************************************************/
-be_local_closure(widget_cb,   /* name */
+be_local_closure(LVGL_glob_widget_cb,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -415,10 +415,10 @@ be_local_closure(widget_cb,   /* name */
         NULL,                       /* no sub protos */
         1,                          /* has constants */
         ( &(const bvalue[ 1]) {     /* constants */
-        /* K0   */  be_nested_string("widget_ctor_impl", 194252479, 16),
+        /* K0   */  be_nested_str(widget_ctor_impl),
         }),
-        (be_nested_const_str("<lambda>", 607256038, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str__X3Clambda_X3E,
+        &be_const_str_solidified,
         ( &(const binstruction[ 6]) {  /* code */
           0x68080000,  //  0000  GETUPV	R2	U0
           0x8C080500,  //  0001  GETMET	R2	R2	K0
@@ -440,10 +440,10 @@ be_local_closure(widget_cb,   /* name */
         NULL,                       /* no sub protos */
         1,                          /* has constants */
         ( &(const bvalue[ 1]) {     /* constants */
-        /* K0   */  be_nested_string("widget_dtor_impl", 520430610, 16),
+        /* K0   */  be_nested_str(widget_dtor_impl),
         }),
-        (be_nested_const_str("<lambda>", 607256038, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str__X3Clambda_X3E,
+        &be_const_str_solidified,
         ( &(const binstruction[ 6]) {  /* code */
           0x68080000,  //  0000  GETUPV	R2	U0
           0x8C080500,  //  0001  GETMET	R2	R2	K0
@@ -465,10 +465,10 @@ be_local_closure(widget_cb,   /* name */
         NULL,                       /* no sub protos */
         1,                          /* has constants */
         ( &(const bvalue[ 1]) {     /* constants */
-        /* K0   */  be_nested_string("widget_event_impl", -2116536735, 17),
+        /* K0   */  be_nested_str(widget_event_impl),
         }),
-        (be_nested_const_str("<lambda>", 607256038, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str__X3Clambda_X3E,
+        &be_const_str_solidified,
         ( &(const binstruction[ 6]) {  /* code */
           0x68080000,  //  0000  GETUPV	R2	U0
           0x8C080500,  //  0001  GETMET	R2	R2	K0
@@ -481,24 +481,24 @@ be_local_closure(widget_cb,   /* name */
     }),
     1,                          /* has constants */
     ( &(const bvalue[15]) {     /* constants */
-    /* K0   */  be_nested_string("widget_ctor_cb", 876007560, 14),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("gen_cb", -1049739745, 6),
-    /* K3   */  be_nested_string("widget_dtor_cb", -1143421451, 14),
-    /* K4   */  be_nested_string("widget_event_cb", 1508466754, 15),
-    /* K5   */  be_nested_string("widget_struct_default", 781673633, 21),
-    /* K6   */  be_nested_string("lv", 1529997255, 2),
-    /* K7   */  be_nested_string("lv_obj_class", -255311002, 12),
-    /* K8   */  be_nested_string("lv_obj", -37134147, 6),
-    /* K9   */  be_nested_string("_class", -1562820946, 6),
-    /* K10  */  be_nested_string("copy", -446502332, 4),
-    /* K11  */  be_nested_string("base_class", 1107737279, 10),
-    /* K12  */  be_nested_string("constructor_cb", -1805861999, 14),
-    /* K13  */  be_nested_string("destructor_cb", 1930283190, 13),
-    /* K14  */  be_nested_string("event_cb", -1166269279, 8),
+    /* K0   */  be_nested_str(widget_ctor_cb),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(gen_cb),
+    /* K3   */  be_nested_str(widget_dtor_cb),
+    /* K4   */  be_nested_str(widget_event_cb),
+    /* K5   */  be_nested_str(widget_struct_default),
+    /* K6   */  be_nested_str(lv),
+    /* K7   */  be_nested_str(lv_obj_class),
+    /* K8   */  be_nested_str(lv_obj),
+    /* K9   */  be_nested_str(_class),
+    /* K10  */  be_nested_str(copy),
+    /* K11  */  be_nested_str(base_class),
+    /* K12  */  be_nested_str(constructor_cb),
+    /* K13  */  be_nested_str(destructor_cb),
+    /* K14  */  be_nested_str(event_cb),
     }),
-    (be_nested_const_str("widget_cb", -1531384241, 9)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_widget_cb,
+    &be_const_str_solidified,
     ( &(const binstruction[56]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x4C080000,  //  0001  LDNIL	R2
@@ -565,7 +565,7 @@ be_local_closure(widget_cb,   /* name */
 /********************************************************************
 ** Solidified function: _anonymous_
 ********************************************************************/
-be_local_closure(_anonymous_,   /* name */
+be_local_closure(LVGL_glob__anonymous_,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     0,                          /* argc */
@@ -576,10 +576,10 @@ be_local_closure(_anonymous_,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("LVG: call to unsupported callback", 504176819, 33),
+    /* K0   */  be_nested_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback),
     }),
-    (be_nested_const_str("_anonymous_", 1957281476, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str__anonymous_,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
       0x60000001,  //  0000  GETGBL	R0	G1
       0x58040000,  //  0001  LDCONST	R1	K0
@@ -594,7 +594,7 @@ be_local_closure(_anonymous_,   /* name */
 /********************************************************************
 ** Solidified function: create_custom_widget
 ********************************************************************/
-be_local_closure(create_custom_widget,   /* name */
+be_local_closure(LVGL_glob_create_custom_widget,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     3,                          /* argc */
@@ -605,36 +605,36 @@ be_local_closure(create_custom_widget,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[27]) {     /* constants */
-    /* K0   */  be_nested_string("introspect", 164638290, 10),
-    /* K1   */  be_nested_string("lv", 1529997255, 2),
-    /* K2   */  be_nested_string("lv_obj", -37134147, 6),
-    /* K3   */  be_nested_string("value_error", 773297791, 11),
-    /* K4   */  be_nested_string("arg must be a subclass of lv_obj", 1641882079, 32),
-    /* K5   */  be_nested_string("widget_struct_by_class", -488593454, 22),
-    /* K6   */  be_nested_string("find", -1108310694, 4),
-    /* K7   */  be_nested_string("widget_cb", -1531384241, 9),
-    /* K8   */  be_nested_string("widget_struct_default", 781673633, 21),
-    /* K9   */  be_nested_string("copy", -446502332, 4),
-    /* K10  */  be_nested_string("base_class", 1107737279, 10),
-    /* K11  */  be_nested_string("_class", -1562820946, 6),
-    /* K12  */  be_nested_string("get", 1410115415, 3),
-    /* K13  */  be_nested_string("widget_width_def", -308888434, 16),
-    /* K14  */  be_nested_string("width_def", 1143717879, 9),
-    /* K15  */  be_nested_string("widget_height_def", -1163299483, 17),
-    /* K16  */  be_nested_string("height_def", -1946728458, 10),
-    /* K17  */  be_nested_string("widget_editable", -473174010, 15),
-    /* K18  */  be_nested_string("editable", 60532369, 8),
-    /* K19  */  be_nested_string("widget_group_def", 1246968785, 16),
-    /* K20  */  be_nested_string("group_def", 1524213328, 9),
-    /* K21  */  be_nested_string("widget_instance_size", 2055354779, 20),
-    /* K22  */  be_nested_string("instance_size", -14697778, 13),
-    /* K23  */  be_nested_string("obj_class_create_obj", -990576664, 20),
-    /* K24  */  be_nested_string("_p", 1594591802, 2),
-    /* K25  */  be_nested_string("register_obj", -312352526, 12),
-    /* K26  */  be_nested_string("class_init_obj", 178410604, 14),
+    /* K0   */  be_nested_str(introspect),
+    /* K1   */  be_nested_str(lv),
+    /* K2   */  be_nested_str(lv_obj),
+    /* K3   */  be_nested_str(value_error),
+    /* K4   */  be_nested_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj),
+    /* K5   */  be_nested_str(widget_struct_by_class),
+    /* K6   */  be_nested_str(find),
+    /* K7   */  be_nested_str(widget_cb),
+    /* K8   */  be_nested_str(widget_struct_default),
+    /* K9   */  be_nested_str(copy),
+    /* K10  */  be_nested_str(base_class),
+    /* K11  */  be_nested_str(_class),
+    /* K12  */  be_nested_str(get),
+    /* K13  */  be_nested_str(widget_width_def),
+    /* K14  */  be_nested_str(width_def),
+    /* K15  */  be_nested_str(widget_height_def),
+    /* K16  */  be_nested_str(height_def),
+    /* K17  */  be_nested_str(widget_editable),
+    /* K18  */  be_nested_str(editable),
+    /* K19  */  be_nested_str(widget_group_def),
+    /* K20  */  be_nested_str(group_def),
+    /* K21  */  be_nested_str(widget_instance_size),
+    /* K22  */  be_nested_str(instance_size),
+    /* K23  */  be_nested_str(obj_class_create_obj),
+    /* K24  */  be_nested_str(_p),
+    /* K25  */  be_nested_str(register_obj),
+    /* K26  */  be_nested_str(class_init_obj),
     }),
-    (be_nested_const_str("create_custom_widget", 1140594778, 20)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_create_custom_widget,
+    &be_const_str_solidified,
     ( &(const binstruction[86]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0x6010000F,  //  0001  GETGBL	R4	G15
@@ -731,7 +731,7 @@ be_local_closure(create_custom_widget,   /* name */
 /********************************************************************
 ** Solidified function: widget_ctor_impl
 ********************************************************************/
-be_local_closure(widget_ctor_impl,   /* name */
+be_local_closure(LVGL_glob_widget_ctor_impl,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     3,                          /* argc */
@@ -742,18 +742,18 @@ be_local_closure(widget_ctor_impl,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 9]) {     /* constants */
-    /* K0   */  be_nested_string("introspect", 164638290, 10),
-    /* K1   */  be_nested_string("lv", 1529997255, 2),
-    /* K2   */  be_nested_string("lv_obj_class", -255311002, 12),
-    /* K3   */  be_nested_string("get_object_from_ptr", -1949948095, 19),
-    /* K4   */  be_nested_string("cb_obj", 1195696482, 6),
-    /* K5   */  be_nested_string("find", -1108310694, 4),
-    /* K6   */  be_nested_string("instance", 193386898, 8),
-    /* K7   */  be_nested_string("get", 1410115415, 3),
-    /* K8   */  be_nested_string("widget_constructor", -1751181362, 18),
+    /* K0   */  be_nested_str(introspect),
+    /* K1   */  be_nested_str(lv),
+    /* K2   */  be_nested_str(lv_obj_class),
+    /* K3   */  be_nested_str(get_object_from_ptr),
+    /* K4   */  be_nested_str(cb_obj),
+    /* K5   */  be_nested_str(find),
+    /* K6   */  be_nested_str(instance),
+    /* K7   */  be_nested_str(get),
+    /* K8   */  be_nested_str(widget_constructor),
     }),
-    (be_nested_const_str("widget_ctor_impl", 194252479, 16)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_widget_ctor_impl,
+    &be_const_str_solidified,
     ( &(const binstruction[29]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0xB8120200,  //  0001  GETNGBL	R4	K1
@@ -798,28 +798,28 @@ be_local_class(LVGL_glob,
     NULL,
     be_nested_map(20,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("widget_ctor_cb", 876007560, 14, 9), be_const_var(4) },
-        { be_nested_key("get_object_from_ptr", -1949948095, 19, 4), be_const_closure(get_object_from_ptr_closure) },
-        { be_nested_key("cb_obj", 1195696482, 6, 7), be_const_var(0) },
-        { be_nested_key("widget_struct_by_class", -488593454, 22, -1), be_const_var(8) },
-        { be_nested_key("widget_event_impl", -2116536735, 17, -1), be_const_closure(widget_event_impl_closure) },
-        { be_nested_key("widget_dtor_cb", -1143421451, 14, 6), be_const_var(5) },
-        { be_nested_key("cb_event_closure", -466699971, 16, -1), be_const_var(1) },
-        { be_nested_key("lvgl_event_dispatch", 2104396622, 19, 16), be_const_closure(lvgl_event_dispatch_closure) },
-        { be_nested_key("widget_dtor_impl", 520430610, 16, -1), be_const_closure(widget_dtor_impl_closure) },
-        { be_nested_key("null_cb", -1961430836, 7, -1), be_const_var(3) },
-        { be_nested_key("register_obj", -312352526, 12, 8), be_const_closure(register_obj_closure) },
-        { be_nested_key("gen_cb", -1049739745, 6, -1), be_const_closure(gen_cb_closure) },
-        { be_nested_key("widget_struct_default", 781673633, 21, -1), be_const_var(7) },
-        { be_nested_key("deregister_obj", -385000303, 14, 12), be_const_closure(deregister_obj_closure) },
-        { be_nested_key("widget_event_cb", 1508466754, 15, -1), be_const_var(6) },
-        { be_nested_key("widget_cb", -1531384241, 9, -1), be_const_closure(widget_cb_closure) },
-        { be_nested_key("cb_do_nothing", 1488730702, 13, 3), be_const_closure(_anonymous__closure) },
-        { be_nested_key("event_cb", -1166269279, 8, -1), be_const_var(2) },
-        { be_nested_key("create_custom_widget", 1140594778, 20, -1), be_const_closure(create_custom_widget_closure) },
-        { be_nested_key("widget_ctor_impl", 194252479, 16, -1), be_const_closure(widget_ctor_impl_closure) },
+        { be_const_key(widget_ctor_cb, 9), be_const_var(4) },
+        { be_const_key(get_object_from_ptr, 4), be_const_closure(LVGL_glob_get_object_from_ptr_closure) },
+        { be_const_key(cb_obj, 7), be_const_var(0) },
+        { be_const_key(widget_struct_by_class, -1), be_const_var(8) },
+        { be_const_key(widget_event_impl, -1), be_const_closure(LVGL_glob_widget_event_impl_closure) },
+        { be_const_key(widget_dtor_cb, 6), be_const_var(5) },
+        { be_const_key(cb_event_closure, -1), be_const_var(1) },
+        { be_const_key(lvgl_event_dispatch, 16), be_const_closure(LVGL_glob_lvgl_event_dispatch_closure) },
+        { be_const_key(widget_dtor_impl, -1), be_const_closure(LVGL_glob_widget_dtor_impl_closure) },
+        { be_const_key(null_cb, -1), be_const_var(3) },
+        { be_const_key(register_obj, 8), be_const_closure(LVGL_glob_register_obj_closure) },
+        { be_const_key(gen_cb, -1), be_const_closure(LVGL_glob_gen_cb_closure) },
+        { be_const_key(widget_struct_default, -1), be_const_var(7) },
+        { be_const_key(deregister_obj, 12), be_const_closure(LVGL_glob_deregister_obj_closure) },
+        { be_const_key(widget_event_cb, -1), be_const_var(6) },
+        { be_const_key(widget_cb, -1), be_const_closure(LVGL_glob_widget_cb_closure) },
+        { be_const_key(cb_do_nothing, 3), be_const_closure(LVGL_glob__anonymous__closure) },
+        { be_const_key(event_cb, -1), be_const_var(2) },
+        { be_const_key(create_custom_widget, -1), be_const_closure(LVGL_glob_create_custom_widget_closure) },
+        { be_const_key(widget_ctor_impl, -1), be_const_closure(LVGL_glob_widget_ctor_impl_closure) },
     })),
-    (be_nested_const_str("LVGL_glob", 315437079, 9))
+    be_str_literal("LVGL_glob")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_lvgl_signal_arcs_lib.c b/lib/libesp32/Berry/default/be_lvgl_signal_arcs_lib.c
index f3452ba57..a127cddd9 100644
--- a/lib/libesp32/Berry/default/be_lvgl_signal_arcs_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_signal_arcs_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: set_percentage
 ********************************************************************/
-be_local_closure(set_percentage,   /* name */
+be_local_closure(lv_signal_arcs_set_percentage,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -21,12 +21,12 @@ be_local_closure(set_percentage,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("percentage", -1756136011, 10),
+    /* K0   */  be_nested_str(percentage),
     /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_string("invalidate", -1645232368, 10),
+    /* K2   */  be_nested_str(invalidate),
     }),
-    (be_nested_const_str("set_percentage", -1342944572, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_percentage,
+    &be_const_str_solidified,
     ( &(const binstruction[18]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x540E0018,  //  0001  LDINT	R3	25
@@ -55,7 +55,7 @@ be_local_closure(set_percentage,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(lv_signal_arcs_init,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     2,                          /* argc */
@@ -66,19 +66,19 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("_lvgl", -1605747813, 5),
-    /* K1   */  be_nested_string("create_custom_widget", 1140594778, 20),
-    /* K2   */  be_nested_string("percentage", -1756136011, 10),
-    /* K3   */  be_nested_string("p1", -1605446022, 2),
-    /* K4   */  be_nested_string("lv", 1529997255, 2),
-    /* K5   */  be_nested_string("point", 414084241, 5),
-    /* K6   */  be_nested_string("p2", -1622223641, 2),
-    /* K7   */  be_nested_string("area", -1693507260, 4),
-    /* K8   */  be_nested_string("line_dsc", -200476318, 8),
-    /* K9   */  be_nested_string("draw_line_dsc", -74291093, 13),
+    /* K0   */  be_nested_str(_lvgl),
+    /* K1   */  be_nested_str(create_custom_widget),
+    /* K2   */  be_nested_str(percentage),
+    /* K3   */  be_nested_str(p1),
+    /* K4   */  be_nested_str(lv),
+    /* K5   */  be_nested_str(point),
+    /* K6   */  be_nested_str(p2),
+    /* K7   */  be_nested_str(area),
+    /* K8   */  be_nested_str(line_dsc),
+    /* K9   */  be_nested_str(draw_line_dsc),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[24]) {  /* code */
       0xB80A0000,  //  0000  GETNGBL	R2	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -113,7 +113,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: widget_event
 ********************************************************************/
-be_local_closure(widget_event,   /* name */
+be_local_closure(lv_signal_arcs_widget_event,   /* name */
   be_nested_proto(
     28,                          /* nstack */
     3,                          /* argc */
@@ -134,8 +134,8 @@ be_local_closure(widget_event,   /* name */
         ( &(const bvalue[ 1]) {     /* constants */
         /* K0   */  be_const_int(1),
         }),
-        (be_nested_const_str("atleast1", 1956331672, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str_atleast1,
+        &be_const_str_solidified,
         ( &(const binstruction[ 6]) {  /* code */
           0x28040100,  //  0000  GE	R1	R0	K0
           0x78060001,  //  0001  JMPF	R1	#0004
@@ -148,44 +148,44 @@ be_local_closure(widget_event,   /* name */
     }),
     1,                          /* has constants */
     ( &(const bvalue[35]) {     /* constants */
-    /* K0   */  be_nested_string("lv", 1529997255, 2),
-    /* K1   */  be_nested_string("obj_event_base", 1624064363, 14),
-    /* K2   */  be_nested_string("RES_OK", 1233817284, 6),
-    /* K3   */  be_nested_string("code", -114201356, 4),
-    /* K4   */  be_nested_string("math", -293037681, 4),
-    /* K5   */  be_nested_string("get_height", -723211773, 10),
-    /* K6   */  be_nested_string("get_width", -1001549996, 9),
+    /* K0   */  be_nested_str(lv),
+    /* K1   */  be_nested_str(obj_event_base),
+    /* K2   */  be_nested_str(RES_OK),
+    /* K3   */  be_nested_str(code),
+    /* K4   */  be_nested_str(math),
+    /* K5   */  be_nested_str(get_height),
+    /* K6   */  be_nested_str(get_width),
     /* K7   */  be_const_int(2),
     /* K8   */  be_const_int(3),
-    /* K9   */  be_nested_string("EVENT_DRAW_MAIN", 1955620614, 15),
-    /* K10  */  be_nested_string("area", -1693507260, 4),
-    /* K11  */  be_nested_string("param", 1309554226, 5),
-    /* K12  */  be_nested_string("get_coords", 1044089006, 10),
-    /* K13  */  be_nested_string("x1", 274927234, 2),
-    /* K14  */  be_nested_string("y1", -1939865569, 2),
-    /* K15  */  be_nested_string("draw_line_dsc_init", -428273650, 18),
-    /* K16  */  be_nested_string("line_dsc", -200476318, 8),
-    /* K17  */  be_nested_string("init_draw_line_dsc", -1787031256, 18),
-    /* K18  */  be_nested_string("PART_MAIN", -1821475788, 9),
-    /* K19  */  be_nested_string("round_start", -1345482912, 11),
+    /* K9   */  be_nested_str(EVENT_DRAW_MAIN),
+    /* K10  */  be_nested_str(area),
+    /* K11  */  be_nested_str(param),
+    /* K12  */  be_nested_str(get_coords),
+    /* K13  */  be_nested_str(x1),
+    /* K14  */  be_nested_str(y1),
+    /* K15  */  be_nested_str(draw_line_dsc_init),
+    /* K16  */  be_nested_str(line_dsc),
+    /* K17  */  be_nested_str(init_draw_line_dsc),
+    /* K18  */  be_nested_str(PART_MAIN),
+    /* K19  */  be_nested_str(round_start),
     /* K20  */  be_const_int(1),
-    /* K21  */  be_nested_string("round_end", 985288225, 9),
-    /* K22  */  be_nested_string("width", -1786286561, 5),
-    /* K23  */  be_nested_string("get_style_line_color", 805371932, 20),
-    /* K24  */  be_nested_string("STATE_DEFAULT", 712406428, 13),
-    /* K25  */  be_nested_string("get_style_bg_color", 964794381, 18),
-    /* K26  */  be_nested_string("deg", -967213025, 3),
-    /* K27  */  be_nested_string("acos", 1006755615, 4),
-    /* K28  */  be_nested_string("p1", -1605446022, 2),
-    /* K29  */  be_nested_string("x", -49524601, 1),
-    /* K30  */  be_nested_string("y", -66302220, 1),
-    /* K31  */  be_nested_string("color", 1031692888, 5),
-    /* K32  */  be_nested_string("percentage", -1756136011, 10),
-    /* K33  */  be_nested_string("draw_arc", 1828251676, 8),
+    /* K21  */  be_nested_str(round_end),
+    /* K22  */  be_nested_str(width),
+    /* K23  */  be_nested_str(get_style_line_color),
+    /* K24  */  be_nested_str(STATE_DEFAULT),
+    /* K25  */  be_nested_str(get_style_bg_color),
+    /* K26  */  be_nested_str(deg),
+    /* K27  */  be_nested_str(acos),
+    /* K28  */  be_nested_str(p1),
+    /* K29  */  be_nested_str(x),
+    /* K30  */  be_nested_str(y),
+    /* K31  */  be_nested_str(color),
+    /* K32  */  be_nested_str(percentage),
+    /* K33  */  be_nested_str(draw_arc),
     /* K34  */  be_const_int(0),
     }),
-    (be_nested_const_str("widget_event", 1951408186, 12)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_widget_event,
+    &be_const_str_solidified,
     ( &(const binstruction[182]) {  /* code */
       0xB80E0000,  //  0000  GETNGBL	R3	K0
       0x8C0C0701,  //  0001  GETMET	R3	R3	K1
@@ -378,7 +378,7 @@ be_local_closure(widget_event,   /* name */
 /********************************************************************
 ** Solidified function: get_percentage
 ********************************************************************/
-be_local_closure(get_percentage,   /* name */
+be_local_closure(lv_signal_arcs_get_percentage,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
@@ -389,10 +389,10 @@ be_local_closure(get_percentage,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("percentage", -1756136011, 10),
+    /* K0   */  be_nested_str(percentage),
     }),
-    (be_nested_const_str("get_percentage", -1414483304, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_percentage,
+    &be_const_str_solidified,
     ( &(const binstruction[ 2]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x80040200,  //  0001  RET	1	R1
@@ -411,17 +411,17 @@ be_local_class(lv_signal_arcs,
     &be_class_lv_obj,
     be_nested_map(9,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("percentage", -1756136011, 10, 4), be_const_var(0) },
-        { be_nested_key("p1", -1605446022, 2, 3), be_const_var(1) },
-        { be_nested_key("p2", -1622223641, 2, -1), be_const_var(2) },
-        { be_nested_key("area", -1693507260, 4, -1), be_const_var(3) },
-        { be_nested_key("line_dsc", -200476318, 8, -1), be_const_var(4) },
-        { be_nested_key("set_percentage", -1342944572, 14, -1), be_const_closure(set_percentage_closure) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
-        { be_nested_key("widget_event", 1951408186, 12, -1), be_const_closure(widget_event_closure) },
-        { be_nested_key("get_percentage", -1414483304, 14, 5), be_const_closure(get_percentage_closure) },
+        { be_const_key(percentage, 4), be_const_var(0) },
+        { be_const_key(p1, 3), be_const_var(1) },
+        { be_const_key(p2, -1), be_const_var(2) },
+        { be_const_key(area, -1), be_const_var(3) },
+        { be_const_key(line_dsc, -1), be_const_var(4) },
+        { be_const_key(set_percentage, -1), be_const_closure(lv_signal_arcs_set_percentage_closure) },
+        { be_const_key(init, -1), be_const_closure(lv_signal_arcs_init_closure) },
+        { be_const_key(widget_event, -1), be_const_closure(lv_signal_arcs_widget_event_closure) },
+        { be_const_key(get_percentage, 5), be_const_closure(lv_signal_arcs_get_percentage_closure) },
     })),
-    (be_nested_const_str("lv_signal_arcs", -1455810308, 14))
+    be_str_literal("lv_signal_arcs")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_lvgl_signal_bars_lib.c b/lib/libesp32/Berry/default/be_lvgl_signal_bars_lib.c
index 161afc65d..18452ae34 100644
--- a/lib/libesp32/Berry/default/be_lvgl_signal_bars_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_signal_bars_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: set_percentage
 ********************************************************************/
-be_local_closure(set_percentage,   /* name */
+be_local_closure(lv_signal_bars_set_percentage,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -21,12 +21,12 @@ be_local_closure(set_percentage,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("percentage", -1756136011, 10),
+    /* K0   */  be_nested_str(percentage),
     /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_string("invalidate", -1645232368, 10),
+    /* K2   */  be_nested_str(invalidate),
     }),
-    (be_nested_const_str("set_percentage", -1342944572, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_set_percentage,
+    &be_const_str_solidified,
     ( &(const binstruction[18]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x540E0013,  //  0001  LDINT	R3	20
@@ -55,7 +55,7 @@ be_local_closure(set_percentage,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(lv_signal_bars_init,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     2,                          /* argc */
@@ -66,19 +66,19 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("_lvgl", -1605747813, 5),
-    /* K1   */  be_nested_string("create_custom_widget", 1140594778, 20),
-    /* K2   */  be_nested_string("percentage", -1756136011, 10),
-    /* K3   */  be_nested_string("p1", -1605446022, 2),
-    /* K4   */  be_nested_string("lv", 1529997255, 2),
-    /* K5   */  be_nested_string("point", 414084241, 5),
-    /* K6   */  be_nested_string("p2", -1622223641, 2),
-    /* K7   */  be_nested_string("area", -1693507260, 4),
-    /* K8   */  be_nested_string("line_dsc", -200476318, 8),
-    /* K9   */  be_nested_string("draw_line_dsc", -74291093, 13),
+    /* K0   */  be_nested_str(_lvgl),
+    /* K1   */  be_nested_str(create_custom_widget),
+    /* K2   */  be_nested_str(percentage),
+    /* K3   */  be_nested_str(p1),
+    /* K4   */  be_nested_str(lv),
+    /* K5   */  be_nested_str(point),
+    /* K6   */  be_nested_str(p2),
+    /* K7   */  be_nested_str(area),
+    /* K8   */  be_nested_str(line_dsc),
+    /* K9   */  be_nested_str(draw_line_dsc),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[24]) {  /* code */
       0xB80A0000,  //  0000  GETNGBL	R2	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -113,7 +113,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: widget_event
 ********************************************************************/
-be_local_closure(widget_event,   /* name */
+be_local_closure(lv_signal_bars_widget_event,   /* name */
   be_nested_proto(
     23,                          /* nstack */
     3,                          /* argc */
@@ -134,8 +134,8 @@ be_local_closure(widget_event,   /* name */
         ( &(const bvalue[ 1]) {     /* constants */
         /* K0   */  be_const_int(1),
         }),
-        (be_nested_const_str("atleast1", 1956331672, 8)),
-        ((bstring*) &be_const_str_input),
+        &be_const_str_atleast1,
+        &be_const_str_solidified,
         ( &(const binstruction[ 6]) {  /* code */
           0x28040100,  //  0000  GE	R1	R0	K0
           0x78060001,  //  0001  JMPF	R1	#0004
@@ -148,46 +148,46 @@ be_local_closure(widget_event,   /* name */
     }),
     1,                          /* has constants */
     ( &(const bvalue[37]) {     /* constants */
-    /* K0   */  be_nested_string("lv", 1529997255, 2),
-    /* K1   */  be_nested_string("obj_event_base", 1624064363, 14),
-    /* K2   */  be_nested_string("RES_OK", 1233817284, 6),
-    /* K3   */  be_nested_string("code", -114201356, 4),
-    /* K4   */  be_nested_string("get_height", -723211773, 10),
-    /* K5   */  be_nested_string("get_width", -1001549996, 9),
+    /* K0   */  be_nested_str(lv),
+    /* K1   */  be_nested_str(obj_event_base),
+    /* K2   */  be_nested_str(RES_OK),
+    /* K3   */  be_nested_str(code),
+    /* K4   */  be_nested_str(get_height),
+    /* K5   */  be_nested_str(get_width),
     /* K6   */  be_const_int(3),
     /* K7   */  be_const_int(2),
-    /* K8   */  be_nested_string("EVENT_DRAW_MAIN", 1955620614, 15),
-    /* K9   */  be_nested_string("area", -1693507260, 4),
-    /* K10  */  be_nested_string("param", 1309554226, 5),
-    /* K11  */  be_nested_string("get_coords", 1044089006, 10),
-    /* K12  */  be_nested_string("x1", 274927234, 2),
-    /* K13  */  be_nested_string("y1", -1939865569, 2),
-    /* K14  */  be_nested_string("draw_line_dsc_init", -428273650, 18),
-    /* K15  */  be_nested_string("line_dsc", -200476318, 8),
-    /* K16  */  be_nested_string("init_draw_line_dsc", -1787031256, 18),
-    /* K17  */  be_nested_string("PART_MAIN", -1821475788, 9),
-    /* K18  */  be_nested_string("round_start", -1345482912, 11),
+    /* K8   */  be_nested_str(EVENT_DRAW_MAIN),
+    /* K9   */  be_nested_str(area),
+    /* K10  */  be_nested_str(param),
+    /* K11  */  be_nested_str(get_coords),
+    /* K12  */  be_nested_str(x1),
+    /* K13  */  be_nested_str(y1),
+    /* K14  */  be_nested_str(draw_line_dsc_init),
+    /* K15  */  be_nested_str(line_dsc),
+    /* K16  */  be_nested_str(init_draw_line_dsc),
+    /* K17  */  be_nested_str(PART_MAIN),
+    /* K18  */  be_nested_str(round_start),
     /* K19  */  be_const_int(1),
-    /* K20  */  be_nested_string("round_end", 985288225, 9),
-    /* K21  */  be_nested_string("width", -1786286561, 5),
-    /* K22  */  be_nested_string("get_style_line_color", 805371932, 20),
-    /* K23  */  be_nested_string("STATE_DEFAULT", 712406428, 13),
-    /* K24  */  be_nested_string("get_style_bg_color", 964794381, 18),
-    /* K25  */  be_nested_string("event_send", 598925582, 10),
-    /* K26  */  be_nested_string("EVENT_DRAW_PART_BEGIN", -903102272, 21),
+    /* K20  */  be_nested_str(round_end),
+    /* K21  */  be_nested_str(width),
+    /* K22  */  be_nested_str(get_style_line_color),
+    /* K23  */  be_nested_str(STATE_DEFAULT),
+    /* K24  */  be_nested_str(get_style_bg_color),
+    /* K25  */  be_nested_str(event_send),
+    /* K26  */  be_nested_str(EVENT_DRAW_PART_BEGIN),
     /* K27  */  be_const_int(0),
-    /* K28  */  be_nested_string("color", 1031692888, 5),
-    /* K29  */  be_nested_string("percentage", -1756136011, 10),
-    /* K30  */  be_nested_string("p1", -1605446022, 2),
-    /* K31  */  be_nested_string("y", -66302220, 1),
-    /* K32  */  be_nested_string("x", -49524601, 1),
-    /* K33  */  be_nested_string("p2", -1622223641, 2),
-    /* K34  */  be_nested_string("draw_line", 1634465686, 9),
-    /* K35  */  be_nested_string("stop_iteration", -121173395, 14),
-    /* K36  */  be_nested_string("EVENT_DRAW_PART_END", -993342004, 19),
+    /* K28  */  be_nested_str(color),
+    /* K29  */  be_nested_str(percentage),
+    /* K30  */  be_nested_str(p1),
+    /* K31  */  be_nested_str(y),
+    /* K32  */  be_nested_str(x),
+    /* K33  */  be_nested_str(p2),
+    /* K34  */  be_nested_str(draw_line),
+    /* K35  */  be_nested_str(stop_iteration),
+    /* K36  */  be_nested_str(EVENT_DRAW_PART_END),
     }),
-    (be_nested_const_str("widget_event", 1951408186, 12)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_widget_event,
+    &be_const_str_solidified,
     ( &(const binstruction[138]) {  /* code */
       0xB80E0000,  //  0000  GETNGBL	R3	K0
       0x8C0C0701,  //  0001  GETMET	R3	R3	K1
@@ -336,7 +336,7 @@ be_local_closure(widget_event,   /* name */
 /********************************************************************
 ** Solidified function: get_percentage
 ********************************************************************/
-be_local_closure(get_percentage,   /* name */
+be_local_closure(lv_signal_bars_get_percentage,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
@@ -347,10 +347,10 @@ be_local_closure(get_percentage,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_nested_string("percentage", -1756136011, 10),
+    /* K0   */  be_nested_str(percentage),
     }),
-    (be_nested_const_str("get_percentage", -1414483304, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_get_percentage,
+    &be_const_str_solidified,
     ( &(const binstruction[ 2]) {  /* code */
       0x88040100,  //  0000  GETMBR	R1	R0	K0
       0x80040200,  //  0001  RET	1	R1
@@ -369,17 +369,17 @@ be_local_class(lv_signal_bars,
     &be_class_lv_obj,
     be_nested_map(9,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("percentage", -1756136011, 10, 4), be_const_var(0) },
-        { be_nested_key("p1", -1605446022, 2, 3), be_const_var(1) },
-        { be_nested_key("p2", -1622223641, 2, -1), be_const_var(2) },
-        { be_nested_key("area", -1693507260, 4, -1), be_const_var(3) },
-        { be_nested_key("line_dsc", -200476318, 8, -1), be_const_var(4) },
-        { be_nested_key("set_percentage", -1342944572, 14, -1), be_const_closure(set_percentage_closure) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
-        { be_nested_key("widget_event", 1951408186, 12, -1), be_const_closure(widget_event_closure) },
-        { be_nested_key("get_percentage", -1414483304, 14, 5), be_const_closure(get_percentage_closure) },
+        { be_const_key(percentage, 4), be_const_var(0) },
+        { be_const_key(p1, 3), be_const_var(1) },
+        { be_const_key(p2, -1), be_const_var(2) },
+        { be_const_key(area, -1), be_const_var(3) },
+        { be_const_key(line_dsc, -1), be_const_var(4) },
+        { be_const_key(set_percentage, -1), be_const_closure(lv_signal_bars_set_percentage_closure) },
+        { be_const_key(init, -1), be_const_closure(lv_signal_bars_init_closure) },
+        { be_const_key(widget_event, -1), be_const_closure(lv_signal_bars_widget_event_closure) },
+        { be_const_key(get_percentage, 5), be_const_closure(lv_signal_bars_get_percentage_closure) },
     })),
-    (be_nested_const_str("lv_signal_bars", -780994737, 14))
+    be_str_literal("lv_signal_bars")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_icon_lib.c b/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_icon_lib.c
index 9a2c742ff..d8fe9ce08 100644
--- a/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_icon_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_icon_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(lv_wifi_arcs_icon_init,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     2,                          /* argc */
@@ -21,27 +21,27 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[18]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("set_style_line_color", -629728320, 20),
-    /* K2   */  be_nested_string("lv", 1529997255, 2),
-    /* K3   */  be_nested_string("color", 1031692888, 5),
-    /* K4   */  be_nested_string("COLOR_WHITE", -1758096026, 11),
-    /* K5   */  be_nested_string("PART_MAIN", -1821475788, 9),
-    /* K6   */  be_nested_string("STATE_DEFAULT", 712406428, 13),
-    /* K7   */  be_nested_string("set_style_bg_color", 1689513089, 18),
-    /* K8   */  be_nested_string("COLOR_BLACK", 264427940, 11),
-    /* K9   */  be_nested_string("get_height", -723211773, 10),
-    /* K10  */  be_nested_string("get_style_pad_right", -1144679830, 19),
-    /* K11  */  be_nested_string("set_height", 1080207399, 10),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(set_style_line_color),
+    /* K2   */  be_nested_str(lv),
+    /* K3   */  be_nested_str(color),
+    /* K4   */  be_nested_str(COLOR_WHITE),
+    /* K5   */  be_nested_str(PART_MAIN),
+    /* K6   */  be_nested_str(STATE_DEFAULT),
+    /* K7   */  be_nested_str(set_style_bg_color),
+    /* K8   */  be_nested_str(COLOR_BLACK),
+    /* K9   */  be_nested_str(get_height),
+    /* K10  */  be_nested_str(get_style_pad_right),
+    /* K11  */  be_nested_str(set_height),
     /* K12  */  be_const_int(3),
-    /* K13  */  be_nested_string("set_width", 484671920, 9),
-    /* K14  */  be_nested_string("set_x", 1849400772, 5),
-    /* K15  */  be_nested_string("get_width", -1001549996, 9),
-    /* K16  */  be_nested_string("set_style_pad_right", -980898242, 19),
+    /* K13  */  be_nested_str(set_width),
+    /* K14  */  be_nested_str(set_x),
+    /* K15  */  be_nested_str(get_width),
+    /* K16  */  be_nested_str(set_style_pad_right),
     /* K17  */  be_const_int(1),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[67]) {  /* code */
       0x60080003,  //  0000  GETGBL	R2	G3
       0x5C0C0000,  //  0001  MOVE	R3	R0
@@ -125,9 +125,9 @@ be_local_class(lv_wifi_arcs_icon,
     &be_class_lv_wifi_arcs,
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
+        { be_const_key(init, -1), be_const_closure(lv_wifi_arcs_icon_init_closure) },
     })),
-    (be_nested_const_str("lv_wifi_arcs_icon", 1507982909, 17))
+    be_str_literal("lv_wifi_arcs_icon")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_lib.c b/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_lib.c
index 59132af9e..57cbf18a9 100644
--- a/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_wifi_arcs_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: every_second
 ********************************************************************/
-be_local_closure(every_second,   /* name */
+be_local_closure(lv_wifi_arcs_every_second,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     1,                          /* argc */
@@ -21,16 +21,16 @@ be_local_closure(every_second,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("wifi", 120087624, 4),
-    /* K2   */  be_nested_string("find", -1108310694, 4),
-    /* K3   */  be_nested_string("quality", -1697296346, 7),
-    /* K4   */  be_nested_string("ip", 1261996636, 2),
-    /* K5   */  be_nested_string("set_percentage", -1342944572, 14),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(wifi),
+    /* K2   */  be_nested_str(find),
+    /* K3   */  be_nested_str(quality),
+    /* K4   */  be_nested_str(ip),
+    /* K5   */  be_nested_str(set_percentage),
     /* K6   */  be_const_int(0),
     }),
-    (be_nested_const_str("every_second", 2075451465, 12)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_every_second,
+    &be_const_str_solidified,
     ( &(const binstruction[23]) {  /* code */
       0xB8060000,  //  0000  GETNGBL	R1	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -64,7 +64,7 @@ be_local_closure(every_second,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(lv_wifi_arcs_init,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -75,14 +75,14 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("add_driver", 1654458371, 10),
-    /* K3   */  be_nested_string("set_percentage", -1342944572, 14),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(add_driver),
+    /* K3   */  be_nested_str(set_percentage),
     /* K4   */  be_const_int(0),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[14]) {  /* code */
       0x60080003,  //  0000  GETGBL	R2	G3
       0x5C0C0000,  //  0001  MOVE	R3	R0
@@ -107,7 +107,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: del
 ********************************************************************/
-be_local_closure(del,   /* name */
+be_local_closure(lv_wifi_arcs_del,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -118,12 +118,12 @@ be_local_closure(del,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("del", -816214454, 3),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("remove_driver", 1030243768, 13),
+    /* K0   */  be_nested_str(del),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(remove_driver),
     }),
-    (be_nested_const_str("del", -816214454, 3)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_del,
+    &be_const_str_solidified,
     ( &(const binstruction[10]) {  /* code */
       0x60040003,  //  0000  GETGBL	R1	G3
       0x5C080000,  //  0001  MOVE	R2	R0
@@ -150,11 +150,11 @@ be_local_class(lv_wifi_arcs,
     &be_class_lv_signal_arcs,
     be_nested_map(3,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("every_second", 2075451465, 12, 1), be_const_closure(every_second_closure) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
-        { be_nested_key("del", -816214454, 3, -1), be_const_closure(del_closure) },
+        { be_const_key(every_second, 1), be_const_closure(lv_wifi_arcs_every_second_closure) },
+        { be_const_key(init, -1), be_const_closure(lv_wifi_arcs_init_closure) },
+        { be_const_key(del, -1), be_const_closure(lv_wifi_arcs_del_closure) },
     })),
-    (be_nested_const_str("lv_wifi_arcs", 2082091963, 12))
+    be_str_literal("lv_wifi_arcs")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_bars_icon_lib.c b/lib/libesp32/Berry/default/be_lvgl_wifi_bars_icon_lib.c
index 9adcdeba5..a1cf693e5 100644
--- a/lib/libesp32/Berry/default/be_lvgl_wifi_bars_icon_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_wifi_bars_icon_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(lv_wifi_bars_icon_init,   /* name */
   be_nested_proto(
     9,                          /* nstack */
     2,                          /* argc */
@@ -21,26 +21,26 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[17]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("set_style_line_color", -629728320, 20),
-    /* K2   */  be_nested_string("lv", 1529997255, 2),
-    /* K3   */  be_nested_string("color", 1031692888, 5),
-    /* K4   */  be_nested_string("COLOR_WHITE", -1758096026, 11),
-    /* K5   */  be_nested_string("PART_MAIN", -1821475788, 9),
-    /* K6   */  be_nested_string("STATE_DEFAULT", 712406428, 13),
-    /* K7   */  be_nested_string("set_style_bg_color", 1689513089, 18),
-    /* K8   */  be_nested_string("COLOR_BLACK", 264427940, 11),
-    /* K9   */  be_nested_string("get_height", -723211773, 10),
-    /* K10  */  be_nested_string("get_style_pad_right", -1144679830, 19),
-    /* K11  */  be_nested_string("set_height", 1080207399, 10),
-    /* K12  */  be_nested_string("set_width", 484671920, 9),
-    /* K13  */  be_nested_string("set_x", 1849400772, 5),
-    /* K14  */  be_nested_string("get_width", -1001549996, 9),
-    /* K15  */  be_nested_string("set_style_pad_right", -980898242, 19),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(set_style_line_color),
+    /* K2   */  be_nested_str(lv),
+    /* K3   */  be_nested_str(color),
+    /* K4   */  be_nested_str(COLOR_WHITE),
+    /* K5   */  be_nested_str(PART_MAIN),
+    /* K6   */  be_nested_str(STATE_DEFAULT),
+    /* K7   */  be_nested_str(set_style_bg_color),
+    /* K8   */  be_nested_str(COLOR_BLACK),
+    /* K9   */  be_nested_str(get_height),
+    /* K10  */  be_nested_str(get_style_pad_right),
+    /* K11  */  be_nested_str(set_height),
+    /* K12  */  be_nested_str(set_width),
+    /* K13  */  be_nested_str(set_x),
+    /* K14  */  be_nested_str(get_width),
+    /* K15  */  be_nested_str(set_style_pad_right),
     /* K16  */  be_const_int(1),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[64]) {  /* code */
       0x60080003,  //  0000  GETGBL	R2	G3
       0x5C0C0000,  //  0001  MOVE	R3	R0
@@ -121,9 +121,9 @@ be_local_class(lv_wifi_bars_icon,
     &be_class_lv_wifi_bars,
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
+        { be_const_key(init, -1), be_const_closure(lv_wifi_bars_icon_init_closure) },
     })),
-    (be_nested_const_str("lv_wifi_bars_icon", -1489151756, 17))
+    be_str_literal("lv_wifi_bars_icon")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_lvgl_wifi_bars_lib.c b/lib/libesp32/Berry/default/be_lvgl_wifi_bars_lib.c
index 9bbb51bf0..c61cb2bb3 100644
--- a/lib/libesp32/Berry/default/be_lvgl_wifi_bars_lib.c
+++ b/lib/libesp32/Berry/default/be_lvgl_wifi_bars_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: every_second
 ********************************************************************/
-be_local_closure(every_second,   /* name */
+be_local_closure(lv_wifi_bars_every_second,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     1,                          /* argc */
@@ -21,16 +21,16 @@ be_local_closure(every_second,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("wifi", 120087624, 4),
-    /* K2   */  be_nested_string("find", -1108310694, 4),
-    /* K3   */  be_nested_string("quality", -1697296346, 7),
-    /* K4   */  be_nested_string("ip", 1261996636, 2),
-    /* K5   */  be_nested_string("set_percentage", -1342944572, 14),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(wifi),
+    /* K2   */  be_nested_str(find),
+    /* K3   */  be_nested_str(quality),
+    /* K4   */  be_nested_str(ip),
+    /* K5   */  be_nested_str(set_percentage),
     /* K6   */  be_const_int(0),
     }),
-    (be_nested_const_str("every_second", 2075451465, 12)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_every_second,
+    &be_const_str_solidified,
     ( &(const binstruction[23]) {  /* code */
       0xB8060000,  //  0000  GETNGBL	R1	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -64,7 +64,7 @@ be_local_closure(every_second,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(lv_wifi_bars_init,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -75,14 +75,14 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("init", 380752755, 4),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("add_driver", 1654458371, 10),
-    /* K3   */  be_nested_string("set_percentage", -1342944572, 14),
+    /* K0   */  be_nested_str(init),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(add_driver),
+    /* K3   */  be_nested_str(set_percentage),
     /* K4   */  be_const_int(0),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[14]) {  /* code */
       0x60080003,  //  0000  GETGBL	R2	G3
       0x5C0C0000,  //  0001  MOVE	R3	R0
@@ -107,7 +107,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: del
 ********************************************************************/
-be_local_closure(del,   /* name */
+be_local_closure(lv_wifi_bars_del,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -118,12 +118,12 @@ be_local_closure(del,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("del", -816214454, 3),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("remove_driver", 1030243768, 13),
+    /* K0   */  be_nested_str(del),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(remove_driver),
     }),
-    (be_nested_const_str("del", -816214454, 3)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_del,
+    &be_const_str_solidified,
     ( &(const binstruction[10]) {  /* code */
       0x60040003,  //  0000  GETGBL	R1	G3
       0x5C080000,  //  0001  MOVE	R2	R0
@@ -150,11 +150,11 @@ be_local_class(lv_wifi_bars,
     &be_class_lv_signal_bars,
     be_nested_map(3,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("every_second", 2075451465, 12, 1), be_const_closure(every_second_closure) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
-        { be_nested_key("del", -816214454, 3, -1), be_const_closure(del_closure) },
+        { be_const_key(every_second, 1), be_const_closure(lv_wifi_bars_every_second_closure) },
+        { be_const_key(init, -1), be_const_closure(lv_wifi_bars_init_closure) },
+        { be_const_key(del, -1), be_const_closure(lv_wifi_bars_del_closure) },
     })),
-    (be_nested_const_str("lv_wifi_bars", 2109539196, 12))
+    be_str_literal("lv_wifi_bars")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_modtab.c b/lib/libesp32/Berry/default/be_modtab.c
index 5f04457ac..47db8b24e 100644
--- a/lib/libesp32/Berry/default/be_modtab.c
+++ b/lib/libesp32/Berry/default/be_modtab.c
@@ -131,14 +131,14 @@ extern void be_load_onewirelib(bvm *vm);
 extern void be_load_serial_lib(bvm *vm);
 extern void be_load_Driver_class(bvm *vm);
 extern void be_load_Timer_class(bvm *vm);
-extern void be_load_driver_i2c_lib(bvm *vm);
+extern void be_load_I2C_Driver_class(bvm *vm);
 extern void be_load_AXP192_class(bvm *vm);
 extern void be_load_md5_lib(bvm *vm);
 extern void be_load_webclient_lib(bvm *vm);
+extern void be_load_tcpclient_lib(bvm *vm);
 extern void be_load_crypto_lib(bvm *vm);
 extern void be_load_Leds_ntv_class(bvm *vm);
 extern void be_load_Leds_class(bvm *vm);
-extern void be_load_Leds_matrix_class(bvm *vm);
 extern void be_load_Leds_animator_class(bvm *vm);
 
 extern void be_load_ctypes_lib(bvm *vm);
@@ -182,7 +182,7 @@ BERRY_API void be_load_custom_libs(bvm *vm)
 #endif
 #ifdef USE_I2C
     be_load_wirelib(vm);
-    be_load_driver_i2c_lib(vm);
+    be_load_I2C_Driver_class(vm);
     be_load_AXP192_class(vm);
 #endif // USE_I2C
 #ifdef USE_ENERGY_SENSOR
@@ -190,6 +190,7 @@ BERRY_API void be_load_custom_libs(bvm *vm)
 #endif // USE_ENERGY_SENSOR
 #ifdef USE_WEBCLIENT
     be_load_webclient_lib(vm);
+    be_load_tcpclient_lib(vm);
 #endif // USE_WEBCLIENT
 #if defined(USE_ONEWIRE) || defined(USE_DS18x20)
     be_load_onewirelib(vm);
@@ -197,7 +198,6 @@ BERRY_API void be_load_custom_libs(bvm *vm)
 #ifdef USE_WS2812
     be_load_Leds_ntv_class(vm);
     be_load_Leds_class(vm);
-    be_load_Leds_matrix_class(vm);
     be_load_Leds_animator_class(vm);
 #endif // USE_WS2812
 #ifdef USE_I2S_AUDIO_BERRY
diff --git a/lib/libesp32/Berry/default/be_persist_lib.c b/lib/libesp32/Berry/default/be_persist_lib.c
index e0a92dcd9..0581081c7 100644
--- a/lib/libesp32/Berry/default/be_persist_lib.c
+++ b/lib/libesp32/Berry/default/be_persist_lib.c
@@ -10,7 +10,7 @@
 /********************************************************************
 ** Solidified function: json_fdump_map
 ********************************************************************/
-be_local_closure(json_fdump_map,   /* name */
+be_local_closure(Persist_json_fdump_map,   /* name */
   be_nested_proto(
     13,                          /* nstack */
     3,                          /* argc */
@@ -21,19 +21,19 @@ be_local_closure(json_fdump_map,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("json", 916562499, 4),
-    /* K1   */  be_nested_string("write", -1104765092, 5),
-    /* K2   */  be_nested_string("{", -32746982, 1),
-    /* K3   */  be_nested_string("keys", -112588595, 4),
-    /* K4   */  be_nested_string("dump", -631966073, 4),
-    /* K5   */  be_nested_string(":", 1057798253, 1),
-    /* K6   */  be_nested_string("json_fdump_any", -946337911, 14),
-    /* K7   */  be_nested_string(",", 688690635, 1),
-    /* K8   */  be_nested_string("stop_iteration", -121173395, 14),
-    /* K9   */  be_nested_string("}", -133412696, 1),
+    /* K0   */  be_nested_str(json),
+    /* K1   */  be_nested_str(write),
+    /* K2   */  be_nested_str(_X7B),
+    /* K3   */  be_nested_str(keys),
+    /* K4   */  be_nested_str(dump),
+    /* K5   */  be_nested_str(_X3A),
+    /* K6   */  be_nested_str(json_fdump_any),
+    /* K7   */  be_nested_str(_X2C),
+    /* K8   */  be_nested_str(stop_iteration),
+    /* K9   */  be_nested_str(_X7D),
     }),
-    (be_nested_const_str("json_fdump_map", -203012643, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_json_fdump_map,
+    &be_const_str_solidified,
     ( &(const binstruction[41]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0x8C100301,  //  0001  GETMET	R4	R1	K1
@@ -85,7 +85,7 @@ be_local_closure(json_fdump_map,   /* name */
 /********************************************************************
 ** Solidified function: setmember
 ********************************************************************/
-be_local_closure(setmember,   /* name */
+be_local_closure(Persist_setmember,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     3,                          /* argc */
@@ -96,11 +96,11 @@ be_local_closure(setmember,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_p", 1594591802, 2),
-    /* K1   */  be_nested_string("_dirty", 283846766, 6),
+    /* K0   */  be_nested_str(_p),
+    /* K1   */  be_nested_str(_dirty),
     }),
-    (be_nested_const_str("setmember", 1432909441, 9)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_setmember,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x880C0100,  //  0000  GETMBR	R3	R0	K0
       0x980C0202,  //  0001  SETIDX	R3	R1	R2
@@ -116,7 +116,7 @@ be_local_closure(setmember,   /* name */
 /********************************************************************
 ** Solidified function: zero
 ********************************************************************/
-be_local_closure(zero,   /* name */
+be_local_closure(Persist_zero,   /* name */
   be_nested_proto(
     2,                          /* nstack */
     1,                          /* argc */
@@ -127,11 +127,11 @@ be_local_closure(zero,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_p", 1594591802, 2),
-    /* K1   */  be_nested_string("_dirty", 283846766, 6),
+    /* K0   */  be_nested_str(_p),
+    /* K1   */  be_nested_str(_dirty),
     }),
-    (be_nested_const_str("zero", -1955600541, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_zero,
+    &be_const_str_solidified,
     ( &(const binstruction[ 6]) {  /* code */
       0x60040013,  //  0000  GETGBL	R1	G19
       0x7C040000,  //  0001  CALL	R1	0
@@ -148,7 +148,7 @@ be_local_closure(zero,   /* name */
 /********************************************************************
 ** Solidified function: member
 ********************************************************************/
-be_local_closure(member,   /* name */
+be_local_closure(Persist_member,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -159,11 +159,11 @@ be_local_closure(member,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_p", 1594591802, 2),
-    /* K1   */  be_nested_string("find", -1108310694, 4),
+    /* K0   */  be_nested_str(_p),
+    /* K1   */  be_nested_str(find),
     }),
-    (be_nested_const_str("member", 719708611, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_member,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -179,7 +179,7 @@ be_local_closure(member,   /* name */
 /********************************************************************
 ** Solidified function: json_fdump
 ********************************************************************/
-be_local_closure(json_fdump,   /* name */
+be_local_closure(Persist_json_fdump,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     2,                          /* argc */
@@ -190,14 +190,14 @@ be_local_closure(json_fdump,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("json", 916562499, 4),
-    /* K1   */  be_nested_string("_p", 1594591802, 2),
-    /* K2   */  be_nested_string("json_fdump_map", -203012643, 14),
-    /* K3   */  be_nested_string("internal_error", -1775809127, 14),
-    /* K4   */  be_nested_string("persist._p is not a map", 1176528732, 23),
+    /* K0   */  be_nested_str(json),
+    /* K1   */  be_nested_str(_p),
+    /* K2   */  be_nested_str(json_fdump_map),
+    /* K3   */  be_nested_str(internal_error),
+    /* K4   */  be_nested_str(persist_X2E_p_X20is_X20not_X20a_X20map),
     }),
-    (be_nested_const_str("json_fdump", 1694216580, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_json_fdump,
+    &be_const_str_solidified,
     ( &(const binstruction[13]) {  /* code */
       0xA40A0000,  //  0000  IMPORT	R2	K0
       0x600C000F,  //  0001  GETGBL	R3	G15
@@ -221,7 +221,7 @@ be_local_closure(json_fdump,   /* name */
 /********************************************************************
 ** Solidified function: remove
 ********************************************************************/
-be_local_closure(remove,   /* name */
+be_local_closure(Persist_remove,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -232,12 +232,12 @@ be_local_closure(remove,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("_p", 1594591802, 2),
-    /* K1   */  be_nested_string("remove", -611183107, 6),
-    /* K2   */  be_nested_string("_dirty", 283846766, 6),
+    /* K0   */  be_nested_str(_p),
+    /* K1   */  be_nested_str(remove),
+    /* K2   */  be_nested_str(_dirty),
     }),
-    (be_nested_const_str("remove", -611183107, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_remove,
+    &be_const_str_solidified,
     ( &(const binstruction[ 7]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -255,7 +255,7 @@ be_local_closure(remove,   /* name */
 /********************************************************************
 ** Solidified function: json_fdump_any
 ********************************************************************/
-be_local_closure(json_fdump_any,   /* name */
+be_local_closure(Persist_json_fdump_any,   /* name */
   be_nested_proto(
     9,                          /* nstack */
     3,                          /* argc */
@@ -266,14 +266,14 @@ be_local_closure(json_fdump_any,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("json", 916562499, 4),
-    /* K1   */  be_nested_string("json_fdump_map", -203012643, 14),
-    /* K2   */  be_nested_string("json_fdump_list", -391087443, 15),
-    /* K3   */  be_nested_string("write", -1104765092, 5),
-    /* K4   */  be_nested_string("dump", -631966073, 4),
+    /* K0   */  be_nested_str(json),
+    /* K1   */  be_nested_str(json_fdump_map),
+    /* K2   */  be_nested_str(json_fdump_list),
+    /* K3   */  be_nested_str(write),
+    /* K4   */  be_nested_str(dump),
     }),
-    (be_nested_const_str("json_fdump_any", -946337911, 14)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_json_fdump_any,
+    &be_const_str_solidified,
     ( &(const binstruction[27]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0x6010000F,  //  0001  GETGBL	R4	G15
@@ -311,7 +311,7 @@ be_local_closure(json_fdump_any,   /* name */
 /********************************************************************
 ** Solidified function: save
 ********************************************************************/
-be_local_closure(save,   /* name */
+be_local_closure(Persist_save,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     1,                          /* argc */
@@ -322,16 +322,16 @@ be_local_closure(save,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("_filename", 1430813195, 9),
-    /* K1   */  be_nested_string("w", -234078410, 1),
-    /* K2   */  be_nested_string("json_fdump", 1694216580, 10),
-    /* K3   */  be_nested_string("close", 667630371, 5),
-    /* K4   */  be_nested_string("write", -1104765092, 5),
-    /* K5   */  be_nested_string("{}", 1415952421, 2),
-    /* K6   */  be_nested_string("_dirty", 283846766, 6),
+    /* K0   */  be_nested_str(_filename),
+    /* K1   */  be_nested_str(w),
+    /* K2   */  be_nested_str(json_fdump),
+    /* K3   */  be_nested_str(close),
+    /* K4   */  be_nested_str(write),
+    /* K5   */  be_nested_str(_X7B_X7D),
+    /* K6   */  be_nested_str(_dirty),
     }),
-    (be_nested_const_str("save", -855671224, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_save,
+    &be_const_str_solidified,
     ( &(const binstruction[37]) {  /* code */
       0x4C040000,  //  0000  LDNIL	R1
       0xA802000B,  //  0001  EXBLK	0	#000E
@@ -379,7 +379,7 @@ be_local_closure(save,   /* name */
 /********************************************************************
 ** Solidified function: load
 ********************************************************************/
-be_local_closure(load,   /* name */
+be_local_closure(Persist_load,   /* name */
   be_nested_proto(
     9,                          /* nstack */
     1,                          /* argc */
@@ -389,22 +389,23 @@ be_local_closure(load,   /* name */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[11]) {     /* constants */
-    /* K0   */  be_nested_string("json", 916562499, 4),
-    /* K1   */  be_nested_string("path", -2071507658, 4),
-    /* K2   */  be_nested_string("exists", 1002329533, 6),
-    /* K3   */  be_nested_string("_filename", 1430813195, 9),
-    /* K4   */  be_nested_string("r", -150190315, 1),
-    /* K5   */  be_nested_string("load", -435725847, 4),
-    /* K6   */  be_nested_string("read", -824204347, 4),
-    /* K7   */  be_nested_string("close", 667630371, 5),
-    /* K8   */  be_nested_string("_p", 1594591802, 2),
-    /* K9   */  be_nested_string("BRY: failed to load _persist.json", -1303053851, 33),
-    /* K10  */  be_nested_string("_dirty", 283846766, 6),
+    ( &(const bvalue[12]) {     /* constants */
+    /* K0   */  be_nested_str(json),
+    /* K1   */  be_nested_str(path),
+    /* K2   */  be_nested_str(exists),
+    /* K3   */  be_nested_str(_filename),
+    /* K4   */  be_nested_str(r),
+    /* K5   */  be_nested_str(load),
+    /* K6   */  be_nested_str(read),
+    /* K7   */  be_nested_str(close),
+    /* K8   */  be_nested_str(_p),
+    /* K9   */  be_nested_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson),
+    /* K10  */  be_nested_str(_dirty),
+    /* K11  */  be_nested_str(save),
     }),
-    (be_nested_const_str("load", -435725847, 4)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[46]) {  /* code */
+    &be_const_str_load,
+    &be_const_str_solidified,
+    ( &(const binstruction[49]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
       0x4C0C0000,  //  0002  LDNIL	R3
@@ -412,7 +413,7 @@ be_local_closure(load,   /* name */
       0x8C140502,  //  0004  GETMET	R5	R2	K2
       0x881C0103,  //  0005  GETMBR	R7	R0	K3
       0x7C140400,  //  0006  CALL	R5	2
-      0x78160024,  //  0007  JMPF	R5	#002D
+      0x78160025,  //  0007  JMPF	R5	#002E
       0xA802000D,  //  0008  EXBLK	0	#0017
       0x60140011,  //  0009  GETGBL	R5	G17
       0x88180103,  //  000A  GETMBR	R6	R0	K3
@@ -450,7 +451,10 @@ be_local_closure(load,   /* name */
       0x7C140200,  //  002A  CALL	R5	1
       0x50140000,  //  002B  LDBOOL	R5	0	0
       0x90021405,  //  002C  SETMBR	R0	K10	R5
-      0x80000000,  //  002D  RET	0
+      0x70020001,  //  002D  JMP		#0030
+      0x8C14010B,  //  002E  GETMET	R5	R0	K11
+      0x7C140200,  //  002F  CALL	R5	1
+      0x80000000,  //  0030  RET	0
     })
   )
 );
@@ -460,7 +464,7 @@ be_local_closure(load,   /* name */
 /********************************************************************
 ** Solidified function: find
 ********************************************************************/
-be_local_closure(find,   /* name */
+be_local_closure(Persist_find,   /* name */
   be_nested_proto(
     7,                          /* nstack */
     3,                          /* argc */
@@ -471,11 +475,11 @@ be_local_closure(find,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_p", 1594591802, 2),
-    /* K1   */  be_nested_string("find", -1108310694, 4),
+    /* K0   */  be_nested_str(_p),
+    /* K1   */  be_nested_str(find),
     }),
-    (be_nested_const_str("find", -1108310694, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_find,
+    &be_const_str_solidified,
     ( &(const binstruction[ 6]) {  /* code */
       0x880C0100,  //  0000  GETMBR	R3	R0	K0
       0x8C0C0701,  //  0001  GETMET	R3	R3	K1
@@ -492,7 +496,7 @@ be_local_closure(find,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(Persist_init,   /* name */
   be_nested_proto(
     6,                          /* nstack */
     2,                          /* argc */
@@ -503,15 +507,15 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("_filename", 1430813195, 9),
-    /* K1   */  be_nested_string("_persist.json", 2008425138, 13),
-    /* K2   */  be_nested_string("_p", 1594591802, 2),
-    /* K3   */  be_nested_string("copy", -446502332, 4),
-    /* K4   */  be_nested_string("load", -435725847, 4),
-    /* K5   */  be_nested_string("_dirty", 283846766, 6),
+    /* K0   */  be_nested_str(_filename),
+    /* K1   */  be_nested_str(_persist_X2Ejson),
+    /* K2   */  be_nested_str(_p),
+    /* K3   */  be_nested_str(copy),
+    /* K4   */  be_nested_str(load),
+    /* K5   */  be_nested_str(_dirty),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[20]) {  /* code */
       0x90020101,  //  0000  SETMBR	R0	K0	K1
       0x6008000F,  //  0001  GETGBL	R2	G15
@@ -542,7 +546,7 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: json_fdump_list
 ********************************************************************/
-be_local_closure(json_fdump_list,   /* name */
+be_local_closure(Persist_json_fdump_list,   /* name */
   be_nested_proto(
     9,                          /* nstack */
     3,                          /* argc */
@@ -553,17 +557,17 @@ be_local_closure(json_fdump_list,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 8]) {     /* constants */
-    /* K0   */  be_nested_string("json", 916562499, 4),
-    /* K1   */  be_nested_string("write", -1104765092, 5),
-    /* K2   */  be_nested_string("[", -569630790, 1),
+    /* K0   */  be_nested_str(json),
+    /* K1   */  be_nested_str(write),
+    /* K2   */  be_nested_str(_X5B),
     /* K3   */  be_const_int(0),
-    /* K4   */  be_nested_string(",", 688690635, 1),
-    /* K5   */  be_nested_string("json_fdump_any", -946337911, 14),
+    /* K4   */  be_nested_str(_X2C),
+    /* K5   */  be_nested_str(json_fdump_any),
     /* K6   */  be_const_int(1),
-    /* K7   */  be_nested_string("]", -670296504, 1),
+    /* K7   */  be_nested_str(_X5D),
     }),
-    (be_nested_const_str("json_fdump_list", -391087443, 15)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_json_fdump_list,
+    &be_const_str_solidified,
     ( &(const binstruction[25]) {  /* code */
       0xA40E0000,  //  0000  IMPORT	R3	K0
       0x8C100301,  //  0001  GETMET	R4	R1	K1
@@ -599,7 +603,7 @@ be_local_closure(json_fdump_list,   /* name */
 /********************************************************************
 ** Solidified function: has
 ********************************************************************/
-be_local_closure(has,   /* name */
+be_local_closure(Persist_has,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -610,11 +614,11 @@ be_local_closure(has,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_p", 1594591802, 2),
-    /* K1   */  be_nested_string("has", -306245661, 3),
+    /* K0   */  be_nested_str(_p),
+    /* K1   */  be_nested_str(has),
     }),
-    (be_nested_const_str("has", -306245661, 3)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_has,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x88080100,  //  0000  GETMBR	R2	R0	K0
       0x8C080501,  //  0001  GETMET	R2	R2	K1
@@ -635,30 +639,30 @@ be_local_class(Persist,
     NULL,
     be_nested_map(16,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("json_fdump_map", -203012643, 14, 5), be_const_closure(json_fdump_map_closure) },
-        { be_nested_key("setmember", 1432909441, 9, -1), be_const_closure(setmember_closure) },
-        { be_nested_key("zero", -1955600541, 4, 15), be_const_closure(zero_closure) },
-        { be_nested_key("member", 719708611, 6, 12), be_const_closure(member_closure) },
-        { be_nested_key("json_fdump", 1694216580, 10, -1), be_const_closure(json_fdump_closure) },
-        { be_nested_key("remove", -611183107, 6, -1), be_const_closure(remove_closure) },
-        { be_nested_key("json_fdump_any", -946337911, 14, -1), be_const_closure(json_fdump_any_closure) },
-        { be_nested_key("_p", 1594591802, 2, -1), be_const_var(1) },
-        { be_nested_key("save", -855671224, 4, -1), be_const_closure(save_closure) },
-        { be_nested_key("load", -435725847, 4, 6), be_const_closure(load_closure) },
-        { be_nested_key("find", -1108310694, 4, 7), be_const_closure(find_closure) },
-        { be_nested_key("_filename", 1430813195, 9, -1), be_const_var(0) },
-        { be_nested_key("init", 380752755, 4, 2), be_const_closure(init_closure) },
-        { be_nested_key("json_fdump_list", -391087443, 15, 0), be_const_closure(json_fdump_list_closure) },
-        { be_nested_key("_dirty", 283846766, 6, -1), be_const_var(2) },
-        { be_nested_key("has", -306245661, 3, -1), be_const_closure(has_closure) },
+        { be_const_key(has, 6), be_const_closure(Persist_has_closure) },
+        { be_const_key(setmember, -1), be_const_closure(Persist_setmember_closure) },
+        { be_const_key(remove, -1), be_const_closure(Persist_remove_closure) },
+        { be_const_key(zero, 0), be_const_closure(Persist_zero_closure) },
+        { be_const_key(json_fdump, -1), be_const_closure(Persist_json_fdump_closure) },
+        { be_const_key(json_fdump_list, 2), be_const_closure(Persist_json_fdump_list_closure) },
+        { be_const_key(init, 15), be_const_closure(Persist_init_closure) },
+        { be_const_key(find, -1), be_const_closure(Persist_find_closure) },
+        { be_const_key(save, -1), be_const_closure(Persist_save_closure) },
+        { be_const_key(json_fdump_any, 12), be_const_closure(Persist_json_fdump_any_closure) },
+        { be_const_key(_p, 7), be_const_var(1) },
+        { be_const_key(_filename, -1), be_const_var(0) },
+        { be_const_key(load, -1), be_const_closure(Persist_load_closure) },
+        { be_const_key(json_fdump_map, 5), be_const_closure(Persist_json_fdump_map_closure) },
+        { be_const_key(_dirty, -1), be_const_var(2) },
+        { be_const_key(member, -1), be_const_closure(Persist_member_closure) },
     })),
-    (be_nested_const_str("Persist", 1456346147, 7))
+    be_str_literal("Persist")
 );
 
 /********************************************************************
 ** Solidified function: _anonymous_
 ********************************************************************/
-be_local_closure(_anonymous_,   /* name */
+be_local_closure(persist__anonymous_,   /* name */
   be_nested_proto(
     3,                          /* nstack */
     1,                          /* argc */
@@ -671,8 +675,8 @@ be_local_closure(_anonymous_,   /* name */
     ( &(const bvalue[ 1]) {     /* constants */
     /* K0   */  be_const_class(be_class_Persist),
     }),
-    (be_nested_const_str("_anonymous_", 1957281476, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str__anonymous_,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x58040000,  //  0000  LDCONST	R1	K0
       0xB4000000,  //  0001  CLASS	K0
@@ -692,7 +696,7 @@ be_local_module(persist,
     "persist",
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(_anonymous__closure) },
+        { be_const_key(init, -1), be_const_closure(persist__anonymous__closure) },
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(persist);
diff --git a/lib/libesp32/Berry/default/be_python_compat.c b/lib/libesp32/Berry/default/be_python_compat.c
index 7213c10ad..5b3ec64d0 100644
--- a/lib/libesp32/Berry/default/be_python_compat.c
+++ b/lib/libesp32/Berry/default/be_python_compat.c
@@ -8,7 +8,7 @@
 /********************************************************************
 ** Solidified function: _anonymous_
 ********************************************************************/
-be_local_closure(_anonymous_,   /* name */
+be_local_closure(python_compat__anonymous_,   /* name */
   be_nested_proto(
     3,                          /* nstack */
     1,                          /* argc */
@@ -19,25 +19,25 @@ be_local_closure(_anonymous_,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("global", 503252654, 6),
-    /* K1   */  be_nested_string("True", -841064955, 4),
-    /* K2   */  be_nested_string("False", -1753917960, 5),
-    /* K3   */  be_nested_string("None", 810547195, 4),
-    /* K4   */  be_nested_string("b", -418632219, 1),
+    /* K0   */  be_nested_str(global),
+    /* K1   */  be_nested_str(True),
+    /* K2   */  be_nested_str(False),
+    /* K3   */  be_nested_str(None),
+    /* K4   */  be_nested_str(b),
     }),
-    (be_nested_const_str("_anonymous_", 1957281476, 11)),
-    (be_nested_const_str("python_compat.be", -225667571, 16)),
+    &be_const_str__anonymous_,
+    &be_const_str_solidified,
     ( &(const binstruction[10]) {  /* code */
-      0xA4060000,  //  0000  IMPORT  R1  K0
-      0x50080200,  //  0001  LDBOOL  R2  1  0
-      0x90060202,  //  0002  SETMBR  R1  K1  R2
-      0x50080000,  //  0003  LDBOOL  R2  0  0
-      0x90060402,  //  0004  SETMBR  R1  K2  R2
-      0x4C080000,  //  0005  LDNIL  R2
-      0x90060602,  //  0006  SETMBR  R1  K3  R2
-      0x60080015,  //  0007  GETGBL  R2  G21
-      0x90060802,  //  0008  SETMBR  R1  K4  R2
-      0x80040000,  //  0009  RET  1  R0
+      0xA4060000,  //  0000  IMPORT	R1	K0
+      0x50080200,  //  0001  LDBOOL	R2	1	0
+      0x90060202,  //  0002  SETMBR	R1	K1	R2
+      0x50080000,  //  0003  LDBOOL	R2	0	0
+      0x90060402,  //  0004  SETMBR	R1	K2	R2
+      0x4C080000,  //  0005  LDNIL	R2
+      0x90060602,  //  0006  SETMBR	R1	K3	R2
+      0x60080015,  //  0007  GETGBL	R2	G21
+      0x90060802,  //  0008  SETMBR	R1	K4	R2
+      0x80040000,  //  0009  RET	1	R0
     })
   )
 );
@@ -51,7 +51,7 @@ be_local_module(python_compat,
     "python_compat",
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(_anonymous__closure) },
+        { be_const_key(init, -1), be_const_closure(python_compat__anonymous__closure) },
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(python_compat);
diff --git a/lib/libesp32/Berry/default/be_tapp_lib.c b/lib/libesp32/Berry/default/be_tapp_lib.c
index 7a8cbe693..1a312d110 100644
--- a/lib/libesp32/Berry/default/be_tapp_lib.c
+++ b/lib/libesp32/Berry/default/be_tapp_lib.c
@@ -9,7 +9,7 @@
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(Tapp_init,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     1,                          /* argc */
@@ -20,11 +20,11 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("add_driver", 1654458371, 10),
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(add_driver),
     }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0xB8060000,  //  0000  GETNGBL	R1	K0
       0x8C040301,  //  0001  GETMET	R1	R1	K1
@@ -40,9 +40,9 @@ be_local_closure(init,   /* name */
 /********************************************************************
 ** Solidified function: autoexec
 ********************************************************************/
-be_local_closure(autoexec,   /* name */
+be_local_closure(Tapp_autoexec,   /* name */
   be_nested_proto(
-    11,                          /* nstack */
+    12,                          /* nstack */
     1,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
@@ -50,24 +50,26 @@ be_local_closure(autoexec,   /* name */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[13]) {     /* constants */
-    /* K0   */  be_nested_string("path", -2071507658, 4),
-    /* K1   */  be_nested_string("string", 398550328, 6),
-    /* K2   */  be_nested_string("listdir", 2005220720, 7),
-    /* K3   */  be_nested_string("/", 705468254, 1),
-    /* K4   */  be_nested_string("find", -1108310694, 4),
-    /* K5   */  be_nested_string(".tapp", 1363391594, 5),
+    ( &(const bvalue[15]) {     /* constants */
+    /* K0   */  be_nested_str(path),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(listdir),
+    /* K3   */  be_nested_str(_X2F),
+    /* K4   */  be_nested_str(find),
+    /* K5   */  be_nested_str(_X2Etapp),
     /* K6   */  be_const_int(0),
-    /* K7   */  be_nested_string("format", -1180859054, 6),
-    /* K8   */  be_nested_string("TAP: found Tasmota App '%s'", -1651814898, 27),
-    /* K9   */  be_nested_string("tasmota", 424643812, 7),
-    /* K10  */  be_nested_string("load", -435725847, 4),
-    /* K11  */  be_nested_string("#autoexec.be", 1181757091, 12),
-    /* K12  */  be_nested_string("stop_iteration", -121173395, 14),
+    /* K7   */  be_nested_str(tasmota),
+    /* K8   */  be_nested_str(log),
+    /* K9   */  be_nested_str(format),
+    /* K10  */  be_nested_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27),
+    /* K11  */  be_const_int(2),
+    /* K12  */  be_nested_str(load),
+    /* K13  */  be_nested_str(_X23autoexec_X2Ebe),
+    /* K14  */  be_nested_str(stop_iteration),
     }),
-    (be_nested_const_str("autoexec", -618105405, 8)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[32]) {  /* code */
+    &be_const_str_autoexec,
+    &be_const_str_solidified,
+    ( &(const binstruction[34]) {  /* code */
       0xA4060000,  //  0000  IMPORT	R1	K0
       0xA40A0200,  //  0001  IMPORT	R2	K1
       0x8C0C0302,  //  0002  GETMET	R3	R1	K2
@@ -76,7 +78,7 @@ be_local_closure(autoexec,   /* name */
       0x60100010,  //  0005  GETGBL	R4	G16
       0x5C140600,  //  0006  MOVE	R5	R3
       0x7C100200,  //  0007  CALL	R4	1
-      0xA8020012,  //  0008  EXBLK	0	#001C
+      0xA8020014,  //  0008  EXBLK	0	#001E
       0x5C140800,  //  0009  MOVE	R5	R4
       0x7C140000,  //  000A  CALL	R5	0
       0x8C180504,  //  000B  GETMET	R6	R2	K4
@@ -84,22 +86,24 @@ be_local_closure(autoexec,   /* name */
       0x58240005,  //  000D  LDCONST	R9	K5
       0x7C180600,  //  000E  CALL	R6	3
       0x24180D06,  //  000F  GT	R6	R6	K6
-      0x781A0009,  //  0010  JMPF	R6	#001B
-      0x60180001,  //  0011  GETGBL	R6	G1
-      0x8C1C0507,  //  0012  GETMET	R7	R2	K7
-      0x58240008,  //  0013  LDCONST	R9	K8
-      0x5C280A00,  //  0014  MOVE	R10	R5
-      0x7C1C0600,  //  0015  CALL	R7	3
-      0x7C180200,  //  0016  CALL	R6	1
-      0xB81A1200,  //  0017  GETNGBL	R6	K9
-      0x8C180D0A,  //  0018  GETMET	R6	R6	K10
-      0x00200B0B,  //  0019  ADD	R8	R5	K11
-      0x7C180400,  //  001A  CALL	R6	2
-      0x7001FFEC,  //  001B  JMP		#0009
-      0x5810000C,  //  001C  LDCONST	R4	K12
-      0xAC100200,  //  001D  CATCH	R4	1	0
-      0xB0080000,  //  001E  RAISE	2	R0	R0
-      0x80000000,  //  001F  RET	0
+      0x781A000B,  //  0010  JMPF	R6	#001D
+      0xB81A0E00,  //  0011  GETNGBL	R6	K7
+      0x8C180D08,  //  0012  GETMET	R6	R6	K8
+      0x8C200509,  //  0013  GETMET	R8	R2	K9
+      0x5828000A,  //  0014  LDCONST	R10	K10
+      0x5C2C0A00,  //  0015  MOVE	R11	R5
+      0x7C200600,  //  0016  CALL	R8	3
+      0x5824000B,  //  0017  LDCONST	R9	K11
+      0x7C180600,  //  0018  CALL	R6	3
+      0xB81A0E00,  //  0019  GETNGBL	R6	K7
+      0x8C180D0C,  //  001A  GETMET	R6	R6	K12
+      0x00200B0D,  //  001B  ADD	R8	R5	K13
+      0x7C180400,  //  001C  CALL	R6	2
+      0x7001FFEA,  //  001D  JMP		#0009
+      0x5810000E,  //  001E  LDCONST	R4	K14
+      0xAC100200,  //  001F  CATCH	R4	1	0
+      0xB0080000,  //  0020  RAISE	2	R0	R0
+      0x80000000,  //  0021  RET	0
     })
   )
 );
@@ -114,16 +118,16 @@ be_local_class(Tapp,
     NULL,
     be_nested_map(2,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
-        { be_nested_key("autoexec", -618105405, 8, 0), be_const_closure(autoexec_closure) },
+        { be_const_key(autoexec, -1), be_const_closure(Tapp_autoexec_closure) },
+        { be_const_key(init, 0), be_const_closure(Tapp_init_closure) },
     })),
-    (be_nested_const_str("Tapp", 2012315062, 4))
+    be_str_literal("Tapp")
 );
 
 /********************************************************************
 ** Solidified function: _anonymous_
 ********************************************************************/
-be_local_closure(_anonymous_,   /* name */
+be_local_closure(tapp__anonymous_,   /* name */
   be_nested_proto(
     3,                          /* nstack */
     1,                          /* argc */
@@ -136,8 +140,8 @@ be_local_closure(_anonymous_,   /* name */
     ( &(const bvalue[ 1]) {     /* constants */
     /* K0   */  be_const_class(be_class_Tapp),
     }),
-    (be_nested_const_str("_anonymous_", 1957281476, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str__anonymous_,
+    &be_const_str_solidified,
     ( &(const binstruction[ 5]) {  /* code */
       0x58040000,  //  0000  LDCONST	R1	K0
       0xB4000000,  //  0001  CLASS	K0
@@ -157,7 +161,7 @@ be_local_module(tapp,
     "tapp",
     be_nested_map(1,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(_anonymous__closure) },
+        { be_const_key(init, -1), be_const_closure(tapp__anonymous__closure) },
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(tapp);
diff --git a/lib/libesp32/Berry/default/be_tasmotalib.c b/lib/libesp32/Berry/default/be_tasmotalib.c
index 76720b7b4..e117bae70 100644
--- a/lib/libesp32/Berry/default/be_tasmotalib.c
+++ b/lib/libesp32/Berry/default/be_tasmotalib.c
@@ -23,6 +23,7 @@ extern int l_timereached(bvm *vm);
 extern int l_rtc(bvm *vm);
 extern int l_time_dump(bvm *vm);
 extern int l_strftime(bvm *vm);
+extern int l_strptime(bvm *vm);
 extern int l_memory(bvm *vm);
 extern int l_wifi(bvm *vm);
 extern int l_eth(bvm *vm);
@@ -53,161 +54,11 @@ extern int l_getswitch(bvm *vm);
 
 extern int l_i2cenabled(bvm *vm);
 
-// KV class
-/********************************************************************
-** Solidified function: init
-********************************************************************/
-be_local_closure(kv_init,   /* name */
-  be_nested_proto(
-    3,                          /* nstack */
-    3,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("k", -301188886, 1),
-    /* K1   */  be_nested_string("v", -217300791, 1),
-    }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 3]) {  /* code */
-      0x90020001,  //  0000  SETMBR	R0	K0	R1
-      0x90020202,  //  0001  SETMBR	R0	K1	R2
-      0x80000000,  //  0002  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified class: KV
-********************************************************************/
-be_local_class(KV,
-    2,
-    NULL,
-    be_nested_map(3,
-    ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("k", -301188886, 1, 2), be_const_var(0) },
-        { be_nested_key("v", -217300791, 1, -1), be_const_var(1) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(kv_init_closure) },
-    })),
-    (be_nested_const_str("KV", 955173972, 2))
-);
-
-/********************************************************************
-** Solidified function: kv
-********************************************************************/
-be_local_closure(kv,   /* name */
-  be_nested_proto(
-    7,                          /* nstack */
-    3,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 1]) {     /* constants */
-    /* K0   */  be_const_class(be_class_KV),
-    }),
-    (be_nested_const_str("kv", 1497177492, 2)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 7]) {  /* code */
-      0x580C0000,  //  0000  LDCONST	R3	K0
-      0xB4000000,  //  0001  CLASS	K0
-      0x5C100600,  //  0002  MOVE	R4	R3
-      0x5C140200,  //  0003  MOVE	R5	R1
-      0x5C180400,  //  0004  MOVE	R6	R2
-      0x7C100400,  //  0005  CALL	R4	2
-      0x80040800,  //  0006  RET	1	R4
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: init
-********************************************************************/
-be_local_closure(init,   /* name */
-  be_nested_proto(
-    7,                          /* nstack */
-    1,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[15]) {     /* constants */
-    /* K0   */  be_nested_str_literal("global"),
-    /* K1   */  be_nested_str_literal("ctypes_bytes_dyn"),
-    /* K2   */  be_nested_str_literal("_global_addr"),
-    /* K3   */  be_nested_str_literal("_global_def"),
-    /* K4   */  be_nested_str_literal("introspect"),
-    /* K5   */  be_nested_str_literal("_settings_ptr"),
-    /* K6   */  be_nested_str_literal("get"),
-    /* K7   */  be_const_int(0),
-    /* K8   */  be_nested_str_literal("settings"),
-    /* K9   */  be_nested_str_literal("toptr"),
-    /* K10  */  be_nested_str_literal("_settings_def"),
-    /* K11  */  be_nested_str_literal("wd"),
-    /* K12  */  be_nested_str_literal(""),
-    /* K13  */  be_nested_str_literal("_debug_present"),
-    /* K14  */  be_nested_str_literal("debug"),
-    }),
-    (be_nested_const_str("init", 380752755, 4)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[36]) {  /* code */
-      0xB8060200,  //  0000  GETNGBL	R1	K1
-      0x88080102,  //  0001  GETMBR	R2	R0	K2
-      0x880C0103,  //  0002  GETMBR	R3	R0	K3
-      0x7C040400,  //  0003  CALL	R1	2
-      0x90020001,  //  0004  SETMBR	R0	K0	R1
-      0xA4060800,  //  0005  IMPORT	R1	K4
-      0x60080015,  //  0006  GETGBL	R2	G21
-      0x880C0105,  //  0007  GETMBR	R3	R0	K5
-      0x54120003,  //  0008  LDINT	R4	4
-      0x7C080400,  //  0009  CALL	R2	2
-      0x8C080506,  //  000A  GETMET	R2	R2	K6
-      0x58100007,  //  000B  LDCONST	R4	K7
-      0x54160003,  //  000C  LDINT	R5	4
-      0x7C080600,  //  000D  CALL	R2	3
-      0x780A0006,  //  000E  JMPF	R2	#0016
-      0xB80E0200,  //  000F  GETNGBL	R3	K1
-      0x8C100309,  //  0010  GETMET	R4	R1	K9
-      0x5C180400,  //  0011  MOVE	R6	R2
-      0x7C100400,  //  0012  CALL	R4	2
-      0x8814010A,  //  0013  GETMBR	R5	R0	K10
-      0x7C0C0400,  //  0014  CALL	R3	2
-      0x90021003,  //  0015  SETMBR	R0	K8	R3
-      0x9002170C,  //  0016  SETMBR	R0	K11	K12
-      0x500C0000,  //  0017  LDBOOL	R3	0	0
-      0x90021A03,  //  0018  SETMBR	R0	K13	R3
-      0xA8020004,  //  0019  EXBLK	0	#001F
-      0xA40E1C00,  //  001A  IMPORT	R3	K14
-      0x50100200,  //  001B  LDBOOL	R4	1	0
-      0x90021A04,  //  001C  SETMBR	R0	K13	R4
-      0xA8040001,  //  001D  EXBLK	1	1
-      0x70020003,  //  001E  JMP		#0023
-      0xAC0C0000,  //  001F  CATCH	R3	0	0
-      0x70020000,  //  0020  JMP		#0022
-      0x70020000,  //  0021  JMP		#0023
-      0xB0080000,  //  0022  RAISE	2	R0	R0
-      0x80000000,  //  0023  RET	0
-    })
-  )
-);
-/*******************************************************************/
 
 /********************************************************************
 ** Solidified function: add_driver
 ********************************************************************/
-be_local_closure(add_driver,   /* name */
+be_local_closure(Tasmota_add_driver,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -218,24 +69,24 @@ be_local_closure(add_driver,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_drivers", -1034638311, 8),
-    /* K1   */  be_nested_string("push", -2022703139, 4),
+    /* K0   */  be_nested_str(_drivers),
+    /* K1   */  be_nested_str(push),
     }),
-    (be_nested_const_str("add_driver", 1654458371, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_add_driver,
+    &be_const_str_solidified,
     ( &(const binstruction[12]) {  /* code */
-      0x88080100,  //  0000  GETMBR R2  R0  K0
-      0x780A0004,  //  0001  JMPF R2  #0007
-      0x88080100,  //  0002  GETMBR R2  R0  K0
-      0x8C080501,  //  0003  GETMET R2  R2  K1
-      0x5C100200,  //  0004  MOVE R4  R1
-      0x7C080400,  //  0005  CALL R2  2
-      0x70020003,  //  0006  JMP    #000B
-      0x60080012,  //  0007  GETGBL R2  G18
-      0x7C080000,  //  0008  CALL R2  0
-      0x400C0401,  //  0009  CONNECT  R3  R2  R1
-      0x90020002,  //  000A  SETMBR R0  K0  R2
-      0x80000000,  //  000B  RET  0
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x780A0004,  //  0001  JMPF	R2	#0007
+      0x88080100,  //  0002  GETMBR	R2	R0	K0
+      0x8C080501,  //  0003  GETMET	R2	R2	K1
+      0x5C100200,  //  0004  MOVE	R4	R1
+      0x7C080400,  //  0005  CALL	R2	2
+      0x70020003,  //  0006  JMP		#000B
+      0x60080012,  //  0007  GETGBL	R2	G18
+      0x7C080000,  //  0008  CALL	R2	0
+      0x400C0401,  //  0009  CONNECT	R3	R2	R1
+      0x90020002,  //  000A  SETMBR	R0	K0	R2
+      0x80000000,  //  000B  RET	0
     })
   )
 );
@@ -243,77 +94,12 @@ be_local_closure(add_driver,   /* name */
 
 
 /********************************************************************
-** Solidified function: gen_cb
+** Solidified function: gc
 ********************************************************************/
-be_local_closure(gen_cb,   /* name */
+be_local_closure(Tasmota_gc,   /* name */
   be_nested_proto(
-    7,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("_cb", -251666929, 3),
-    /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_string("find", -1108310694, 4),
-    /* K3   */  be_nested_string("_get_cb", 1448849122, 7),
-    /* K4   */  be_nested_string("stop_iteration", -121173395, 14),
-    /* K5   */  be_nested_string("internal_error", -1775809127, 14),
-    /* K6   */  be_nested_string("No callback available", 633786138, 21),
-    }),
-    (be_nested_const_str("gen_cb", -1049739745, 6)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[34]) {  /* code */
-      0x88080100,  //  0000  GETMBR R2  R0  K0
-      0x4C0C0000,  //  0001  LDNIL  R3
-      0x1C080403,  //  0002  EQ R2  R2  R3
-      0x780A0002,  //  0003  JMPF R2  #0007
-      0x60080013,  //  0004  GETGBL R2  G19
-      0x7C080000,  //  0005  CALL R2  0
-      0x90020002,  //  0006  SETMBR R0  K0  R2
-      0x60080010,  //  0007  GETGBL R2  G16
-      0x540E0012,  //  0008  LDINT  R3  19
-      0x400E0203,  //  0009  CONNECT  R3  K1  R3
-      0x7C080200,  //  000A  CALL R2  1
-      0xA8020010,  //  000B  EXBLK  0 #001D
-      0x5C0C0400,  //  000C  MOVE R3  R2
-      0x7C0C0000,  //  000D  CALL R3  0
-      0x88100100,  //  000E  GETMBR R4  R0  K0
-      0x8C100902,  //  000F  GETMET R4  R4  K2
-      0x5C180600,  //  0010  MOVE R6  R3
-      0x7C100400,  //  0011  CALL R4  2
-      0x4C140000,  //  0012  LDNIL  R5
-      0x1C100805,  //  0013  EQ R4  R4  R5
-      0x78120006,  //  0014  JMPF R4  #001C
-      0x88100100,  //  0015  GETMBR R4  R0  K0
-      0x98100601,  //  0016  SETIDX R4  R3  R1
-      0x8C100103,  //  0017  GETMET R4  R0  K3
-      0x5C180600,  //  0018  MOVE R6  R3
-      0x7C100400,  //  0019  CALL R4  2
-      0xA8040001,  //  001A  EXBLK  1 1
-      0x80040800,  //  001B  RET  1 R4
-      0x7001FFEE,  //  001C  JMP    #000C
-      0x58080004,  //  001D  LDCONST  R2  K4
-      0xAC080200,  //  001E  CATCH  R2  1 0
-      0xB0080000,  //  001F  RAISE  2 R0  R0
-      0xB0060B06,  //  0020  RAISE  1 K5  K6
-      0x80000000,  //  0021  RET  0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: set_light
-********************************************************************/
-be_local_closure(set_light,   /* name */
-  be_nested_proto(
-    8,                          /* nstack */
-    3,                          /* argc */
+    4,                          /* nstack */
+    1,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
@@ -321,700 +107,19 @@ be_local_closure(set_light,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota.set_light() is deprecated, use light.set()", 2124937871, 50),
-    /* K1   */  be_nested_string("light", -493019601, 5),
-    /* K2   */  be_nested_string("set", -970520829, 3),
+    /* K0   */  be_nested_str(gc),
+    /* K1   */  be_nested_str(collect),
+    /* K2   */  be_nested_str(allocated),
     }),
-    (be_nested_const_str("set_light", -1118891144, 9)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[18]) {  /* code */
-      0x600C0001,  //  0000  GETGBL R3  G1
-      0x58100000,  //  0001  LDCONST  R4  K0
-      0x7C0C0200,  //  0002  CALL R3  1
-      0xA40E0200,  //  0003  IMPORT R3  K1
-      0x4C100000,  //  0004  LDNIL  R4
-      0x20100404,  //  0005  NE R4  R2  R4
-      0x78120005,  //  0006  JMPF R4  #000D
-      0x8C100702,  //  0007  GETMET R4  R3  K2
-      0x5C180200,  //  0008  MOVE R6  R1
-      0x5C1C0400,  //  0009  MOVE R7  R2
-      0x7C100600,  //  000A  CALL R4  3
-      0x80040800,  //  000B  RET  1 R4
-      0x70020003,  //  000C  JMP    #0011
-      0x8C100702,  //  000D  GETMET R4  R3  K2
-      0x5C180200,  //  000E  MOVE R6  R1
-      0x7C100400,  //  000F  CALL R4  2
-      0x80040800,  //  0010  RET  1 R4
-      0x80000000,  //  0011  RET  0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: remove_rule
-********************************************************************/
-be_local_closure(remove_rule,   /* name */
-  be_nested_proto(
-    6,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("_rules", -28750191, 6),
-    /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_string("k", -301188886, 1),
-    /* K3   */  be_nested_string("remove", -611183107, 6),
-    /* K4   */  be_const_int(1),
-    }),
-    (be_nested_const_str("remove_rule", -838755968, 11)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[21]) {  /* code */
-      0x88080100,  //  0000  GETMBR	R2	R0	K0
-      0x780A0011,  //  0001  JMPF	R2	#0014
-      0x58080001,  //  0002  LDCONST	R2	K1
-      0x600C000C,  //  0003  GETGBL	R3	G12
-      0x88100100,  //  0004  GETMBR	R4	R0	K0
-      0x7C0C0200,  //  0005  CALL	R3	1
-      0x140C0403,  //  0006  LT	R3	R2	R3
-      0x780E000B,  //  0007  JMPF	R3	#0014
-      0x880C0100,  //  0008  GETMBR	R3	R0	K0
-      0x940C0602,  //  0009  GETIDX	R3	R3	R2
-      0x880C0702,  //  000A  GETMBR	R3	R3	K2
-      0x1C0C0601,  //  000B  EQ	R3	R3	R1
-      0x780E0004,  //  000C  JMPF	R3	#0012
-      0x880C0100,  //  000D  GETMBR	R3	R0	K0
-      0x8C0C0703,  //  000E  GETMET	R3	R3	K3
-      0x5C140400,  //  000F  MOVE	R5	R2
-      0x7C0C0400,  //  0010  CALL	R3	2
-      0x70020000,  //  0011  JMP		#0013
-      0x00080504,  //  0012  ADD	R2	R2	K4
-      0x7001FFEE,  //  0013  JMP		#0003
-      0x80000000,  //  0014  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: add_cmd
-********************************************************************/
-be_local_closure(add_cmd,   /* name */
-  be_nested_proto(
-    5,                          /* nstack */
-    3,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_string("_ccmd", -2131545883, 5),
-    /* K1   */  be_nested_string("function", -1630125495, 8),
-    /* K2   */  be_nested_string("value_error", 773297791, 11),
-    /* K3   */  be_nested_string("the second argument is not a function", -340392827, 37),
-    }),
-    (be_nested_const_str("add_cmd", -933336417, 7)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[15]) {  /* code */
-      0x880C0100,  //  0000  GETMBR R3  R0  K0
-      0x740E0002,  //  0001  JMPT R3  #0005
-      0x600C0013,  //  0002  GETGBL R3  G19
-      0x7C0C0000,  //  0003  CALL R3  0
-      0x90020003,  //  0004  SETMBR R0  K0  R3
-      0x600C0004,  //  0005  GETGBL R3  G4
-      0x5C100400,  //  0006  MOVE R4  R2
-      0x7C0C0200,  //  0007  CALL R3  1
-      0x1C0C0701,  //  0008  EQ R3  R3  K1
-      0x780E0002,  //  0009  JMPF R3  #000D
-      0x880C0100,  //  000A  GETMBR R3  R0  K0
-      0x980C0202,  //  000B  SETIDX R3  R1  R2
-      0x70020000,  //  000C  JMP    #000E
-      0xB0060503,  //  000D  RAISE  1 K2  K3
-      0x80000000,  //  000E  RET  0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: wire_scan
-********************************************************************/
-be_local_closure(wire_scan,   /* name */
-  be_nested_proto(
-    6,                          /* nstack */
-    3,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("i2c_enabled", 218388101, 11),
-    /* K1   */  be_nested_string("wire1", -1082245877, 5),
-    /* K2   */  be_nested_string("enabled", 49525662, 7),
-    /* K3   */  be_nested_string("detect", 8884370, 6),
-    /* K4   */  be_nested_string("wire2", -1065468258, 5),
-    }),
-    (be_nested_const_str("wire_scan", -1623691416, 9)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[33]) {  /* code */
-      0x4C0C0000,  //  0000  LDNIL	R3
-      0x200C0403,  //  0001  NE	R3	R2	R3
-      0x780E0005,  //  0002  JMPF	R3	#0009
-      0x8C0C0100,  //  0003  GETMET	R3	R0	K0
-      0x5C140400,  //  0004  MOVE	R5	R2
-      0x7C0C0400,  //  0005  CALL	R3	2
-      0x740E0001,  //  0006  JMPT	R3	#0009
-      0x4C0C0000,  //  0007  LDNIL	R3
-      0x80040600,  //  0008  RET	1	R3
-      0x880C0101,  //  0009  GETMBR	R3	R0	K1
-      0x8C0C0702,  //  000A  GETMET	R3	R3	K2
-      0x7C0C0200,  //  000B  CALL	R3	1
-      0x780E0006,  //  000C  JMPF	R3	#0014
-      0x880C0101,  //  000D  GETMBR	R3	R0	K1
-      0x8C0C0703,  //  000E  GETMET	R3	R3	K3
-      0x5C140200,  //  000F  MOVE	R5	R1
-      0x7C0C0400,  //  0010  CALL	R3	2
-      0x780E0001,  //  0011  JMPF	R3	#0014
-      0x880C0101,  //  0012  GETMBR	R3	R0	K1
-      0x80040600,  //  0013  RET	1	R3
-      0x880C0104,  //  0014  GETMBR	R3	R0	K4
-      0x8C0C0702,  //  0015  GETMET	R3	R3	K2
-      0x7C0C0200,  //  0016  CALL	R3	1
-      0x780E0006,  //  0017  JMPF	R3	#001F
-      0x880C0104,  //  0018  GETMBR	R3	R0	K4
-      0x8C0C0703,  //  0019  GETMET	R3	R3	K3
-      0x5C140200,  //  001A  MOVE	R5	R1
-      0x7C0C0400,  //  001B  CALL	R3	2
-      0x780E0001,  //  001C  JMPF	R3	#001F
-      0x880C0104,  //  001D  GETMBR	R3	R0	K4
-      0x80040600,  //  001E  RET	1	R3
-      0x4C0C0000,  //  001F  LDNIL	R3
-      0x80040600,  //  0020  RET	1	R3
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: find_key_i
-********************************************************************/
-be_local_closure(find_key_i,   /* name */
-  be_nested_proto(
-    10,                          /* nstack */
-    3,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("toupper", -602983720, 7),
-    /* K2   */  be_nested_string("keys", -112588595, 4),
-    /* K3   */  be_nested_string("?", 973910158, 1),
-    /* K4   */  be_nested_string("stop_iteration", -121173395, 14),
-    }),
-    (be_nested_const_str("find_key_i", 850136726, 10)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[30]) {  /* code */
-      0xA40E0000,  //  0000  IMPORT	R3	K0
-      0x8C100701,  //  0001  GETMET	R4	R3	K1
-      0x5C180400,  //  0002  MOVE	R6	R2
-      0x7C100400,  //  0003  CALL	R4	2
-      0x6014000F,  //  0004  GETGBL	R5	G15
-      0x5C180200,  //  0005  MOVE	R6	R1
-      0x601C0013,  //  0006  GETGBL	R7	G19
-      0x7C140400,  //  0007  CALL	R5	2
-      0x78160013,  //  0008  JMPF	R5	#001D
-      0x60140010,  //  0009  GETGBL	R5	G16
-      0x8C180302,  //  000A  GETMET	R6	R1	K2
-      0x7C180200,  //  000B  CALL	R6	1
-      0x7C140200,  //  000C  CALL	R5	1
-      0xA802000B,  //  000D  EXBLK	0	#001A
-      0x5C180A00,  //  000E  MOVE	R6	R5
-      0x7C180000,  //  000F  CALL	R6	0
-      0x8C1C0701,  //  0010  GETMET	R7	R3	K1
-      0x5C240C00,  //  0011  MOVE	R9	R6
-      0x7C1C0400,  //  0012  CALL	R7	2
-      0x1C1C0E04,  //  0013  EQ	R7	R7	R4
-      0x741E0001,  //  0014  JMPT	R7	#0017
-      0x1C1C0503,  //  0015  EQ	R7	R2	K3
-      0x781E0001,  //  0016  JMPF	R7	#0019
-      0xA8040001,  //  0017  EXBLK	1	1
-      0x80040C00,  //  0018  RET	1	R6
-      0x7001FFF3,  //  0019  JMP		#000E
-      0x58140004,  //  001A  LDCONST	R5	K4
-      0xAC140200,  //  001B  CATCH	R5	1	0
-      0xB0080000,  //  001C  RAISE	2	R0	R0
-      0x80000000,  //  001D  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: chars_in_string
-********************************************************************/
-be_local_closure(chars_in_string,   /* name */
-  be_nested_proto(
-    10,                          /* nstack */
-    4,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_const_int(0),
-    /* K1   */  be_const_int(1),
-    }),
-    (be_nested_const_str("chars_in_string", -1146182164, 15)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[31]) {  /* code */
-      0x780E0001,  //  0000  JMPF	R3	#0003
-      0x50100200,  //  0001  LDBOOL	R4	1	0
-      0x70020000,  //  0002  JMP		#0004
-      0x50100000,  //  0003  LDBOOL	R4	0	0
-      0x58140000,  //  0004  LDCONST	R5	K0
-      0x6018000C,  //  0005  GETGBL	R6	G12
-      0x5C1C0200,  //  0006  MOVE	R7	R1
-      0x7C180200,  //  0007  CALL	R6	1
-      0x14180A06,  //  0008  LT	R6	R5	R6
-      0x781A0012,  //  0009  JMPF	R6	#001D
-      0x50180000,  //  000A  LDBOOL	R6	0	0
-      0x581C0000,  //  000B  LDCONST	R7	K0
-      0x6020000C,  //  000C  GETGBL	R8	G12
-      0x5C240400,  //  000D  MOVE	R9	R2
-      0x7C200200,  //  000E  CALL	R8	1
-      0x14200E08,  //  000F  LT	R8	R7	R8
-      0x78220006,  //  0010  JMPF	R8	#0018
-      0x94200205,  //  0011  GETIDX	R8	R1	R5
-      0x94240407,  //  0012  GETIDX	R9	R2	R7
-      0x1C201009,  //  0013  EQ	R8	R8	R9
-      0x78220000,  //  0014  JMPF	R8	#0016
-      0x50180200,  //  0015  LDBOOL	R6	1	0
-      0x001C0F01,  //  0016  ADD	R7	R7	K1
-      0x7001FFF3,  //  0017  JMP		#000C
-      0x20200806,  //  0018  NE	R8	R4	R6
-      0x78220000,  //  0019  JMPF	R8	#001B
-      0x80040A00,  //  001A  RET	1	R5
-      0x00140B01,  //  001B  ADD	R5	R5	K1
-      0x7001FFE7,  //  001C  JMP		#0005
-      0x5419FFFE,  //  001D  LDINT	R6	-1
-      0x80040C00,  //  001E  RET	1	R6
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: set_timer
-********************************************************************/
-be_local_closure(set_timer,   /* name */
-  be_nested_proto(
-    10,                          /* nstack */
-    4,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 4]) {     /* constants */
-    /* K0   */  be_nested_string("_timers", -1694866380, 7),
-    /* K1   */  be_nested_string("push", -2022703139, 4),
-    /* K2   */  be_nested_string("Timer", -346839614, 5),
-    /* K3   */  be_nested_string("millis", 1214679063, 6),
-    }),
-    (be_nested_const_str("set_timer", 2135414533, 9)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[16]) {  /* code */
-      0x88100100,  //  0000  GETMBR R4  R0  K0
-      0x74120002,  //  0001  JMPT R4  #0005
-      0x60100012,  //  0002  GETGBL R4  G18
-      0x7C100000,  //  0003  CALL R4  0
-      0x90020004,  //  0004  SETMBR R0  K0  R4
-      0x88100100,  //  0005  GETMBR R4  R0  K0
-      0x8C100901,  //  0006  GETMET R4  R4  K1
-      0xB81A0400,  //  0007  GETNGBL  R6  K2
-      0x8C1C0103,  //  0008  GETMET R7  R0  K3
-      0x5C240200,  //  0009  MOVE R9  R1
-      0x7C1C0400,  //  000A  CALL R7  2
-      0x5C200400,  //  000B  MOVE R8  R2
-      0x5C240600,  //  000C  MOVE R9  R3
-      0x7C180600,  //  000D  CALL R6  3
-      0x7C100400,  //  000E  CALL R4  2
-      0x80000000,  //  000F  RET  0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: add_rule
-********************************************************************/
-be_local_closure(add_rule,   /* name */
-  be_nested_proto(
-    9,                          /* nstack */
-    3,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("_rules", -28750191, 6),
-    /* K1   */  be_nested_string("function", -1630125495, 8),
-    /* K2   */  be_nested_string("push", -2022703139, 4),
-    /* K3   */  be_nested_string("kv", 1497177492, 2),
-    /* K4   */  be_nested_string("value_error", 773297791, 11),
-    /* K5   */  be_nested_string("the second argument is not a function", -340392827, 37),
-    }),
-    (be_nested_const_str("add_rule", 596540743, 8)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[20]) {  /* code */
-      0x880C0100,  //  0000  GETMBR	R3	R0	K0
-      0x740E0002,  //  0001  JMPT	R3	#0005
-      0x600C0012,  //  0002  GETGBL	R3	G18
-      0x7C0C0000,  //  0003  CALL	R3	0
-      0x90020003,  //  0004  SETMBR	R0	K0	R3
-      0x600C0004,  //  0005  GETGBL	R3	G4
-      0x5C100400,  //  0006  MOVE	R4	R2
-      0x7C0C0200,  //  0007  CALL	R3	1
-      0x1C0C0701,  //  0008  EQ	R3	R3	K1
-      0x780E0007,  //  0009  JMPF	R3	#0012
-      0x880C0100,  //  000A  GETMBR	R3	R0	K0
-      0x8C0C0702,  //  000B  GETMET	R3	R3	K2
-      0x8C140103,  //  000C  GETMET	R5	R0	K3
-      0x5C1C0200,  //  000D  MOVE	R7	R1
-      0x5C200400,  //  000E  MOVE	R8	R2
-      0x7C140600,  //  000F  CALL	R5	3
-      0x7C0C0400,  //  0010  CALL	R3	2
-      0x70020000,  //  0011  JMP		#0013
-      0xB0060905,  //  0012  RAISE	1	K4	K5
-      0x80000000,  //  0013  RET	0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: run_deferred
-********************************************************************/
-be_local_closure(run_deferred,   /* name */
-  be_nested_proto(
-    6,                          /* nstack */
-    1,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 8]) {     /* constants */
-    /* K0   */  be_nested_string("_timers", -1694866380, 7),
-    /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_string("size", 597743964, 4),
-    /* K3   */  be_nested_string("time_reached", 2075136773, 12),
-    /* K4   */  be_nested_string("due", -399437003, 3),
-    /* K5   */  be_nested_string("f", -485742695, 1),
-    /* K6   */  be_nested_string("remove", -611183107, 6),
-    /* K7   */  be_const_int(1),
-    }),
-    (be_nested_const_str("run_deferred", 371594696, 12)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[27]) {  /* code */
-      0x88040100,  //  0000  GETMBR R1  R0  K0
-      0x78060017,  //  0001  JMPF R1  #001A
-      0x58040001,  //  0002  LDCONST  R1  K1
-      0x88080100,  //  0003  GETMBR R2  R0  K0
-      0x8C080502,  //  0004  GETMET R2  R2  K2
-      0x7C080200,  //  0005  CALL R2  1
-      0x14080202,  //  0006  LT R2  R1  R2
-      0x780A0011,  //  0007  JMPF R2  #001A
-      0x8C080103,  //  0008  GETMET R2  R0  K3
-      0x88100100,  //  0009  GETMBR R4  R0  K0
-      0x94100801,  //  000A  GETIDX R4  R4  R1
-      0x88100904,  //  000B  GETMBR R4  R4  K4
-      0x7C080400,  //  000C  CALL R2  2
-      0x780A0009,  //  000D  JMPF R2  #0018
-      0x88080100,  //  000E  GETMBR R2  R0  K0
-      0x94080401,  //  000F  GETIDX R2  R2  R1
-      0x88080505,  //  0010  GETMBR R2  R2  K5
-      0x880C0100,  //  0011  GETMBR R3  R0  K0
-      0x8C0C0706,  //  0012  GETMET R3  R3  K6
-      0x5C140200,  //  0013  MOVE R5  R1
-      0x7C0C0400,  //  0014  CALL R3  2
-      0x5C0C0400,  //  0015  MOVE R3  R2
-      0x7C0C0000,  //  0016  CALL R3  0
-      0x70020000,  //  0017  JMP    #0019
-      0x00040307,  //  0018  ADD  R1  R1  K7
-      0x7001FFE8,  //  0019  JMP    #0003
-      0x80000000,  //  001A  RET  0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: cmd
-********************************************************************/
-be_local_closure(cmd,   /* name */
-  be_nested_proto(
-    5,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("cmd_res", 921166762, 7),
-    /* K1   */  be_nested_string("_cmd", -875145154, 4),
-    }),
-    (be_nested_const_str("cmd", -158181397, 3)),
-    (be_nested_const_str("tasmota.be", 1128870755, 10)),
-    ( &(const binstruction[14]) {  /* code */
-      0x50080200,  //  0000  LDBOOL	R2	1	0
-      0x90020002,  //  0001  SETMBR	R0	K0	R2
-      0x8C080101,  //  0002  GETMET	R2	R0	K1
-      0x5C100200,  //  0003  MOVE	R4	R1
-      0x7C080400,  //  0004  CALL	R2	2
-      0x4C080000,  //  0005  LDNIL	R2
-      0x880C0100,  //  0006  GETMBR	R3	R0	K0
-      0x50100200,  //  0007  LDBOOL	R4	1	0
-      0x200C0604,  //  0008  NE	R3	R3	R4
-      0x780E0000,  //  0009  JMPF	R3	#000B
-      0x88080100,  //  000A  GETMBR	R2	R0	K0
-      0x4C0C0000,  //  000B  LDNIL	R3
-      0x90020003,  //  000C  SETMBR	R0	K0	R3
-      0x80040400,  //  000D  RET	1	R2
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: time_str
-********************************************************************/
-be_local_closure(time_str,   /* name */
-  be_nested_proto(
-    13,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[10]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("time_dump", -964556549, 9),
-    /* K2   */  be_nested_string("format", -1180859054, 6),
-    /* K3   */  be_nested_string("%04d-%02d-%02dT%02d:%02d:%02d", -869438695, 29),
-    /* K4   */  be_nested_string("year", -1367388900, 4),
-    /* K5   */  be_nested_string("month", -696646139, 5),
-    /* K6   */  be_nested_string("day", -464576003, 3),
-    /* K7   */  be_nested_string("hour", -1241306097, 4),
-    /* K8   */  be_nested_string("min", -913357481, 3),
-    /* K9   */  be_nested_string("sec", -1155074638, 3),
-    }),
-    (be_nested_const_str("time_str", -1681139684, 8)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[14]) {  /* code */
-      0xA40A0000,  //  0000  IMPORT R2  K0
-      0x8C0C0101,  //  0001  GETMET R3  R0  K1
-      0x5C140200,  //  0002  MOVE R5  R1
-      0x7C0C0400,  //  0003  CALL R3  2
-      0x8C100502,  //  0004  GETMET R4  R2  K2
-      0x58180003,  //  0005  LDCONST  R6  K3
-      0x941C0704,  //  0006  GETIDX R7  R3  K4
-      0x94200705,  //  0007  GETIDX R8  R3  K5
-      0x94240706,  //  0008  GETIDX R9  R3  K6
-      0x94280707,  //  0009  GETIDX R10 R3  K7
-      0x942C0708,  //  000A  GETIDX R11 R3  K8
-      0x94300709,  //  000B  GETIDX R12 R3  K9
-      0x7C101000,  //  000C  CALL R4  8
-      0x80040800,  //  000D  RET  1 R4
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: load
-********************************************************************/
-be_local_closure(load,   /* name */
-  be_nested_proto(
-    19,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[21]) {     /* constants */
-    /* K0   */  be_nested_str_literal("string"),
-    /* K1   */  be_nested_str_literal("path"),
-    /* K2   */  be_const_int(0),
-    /* K3   */  be_nested_str_literal("/"),
-    /* K4   */  be_nested_str_literal("split"),
-    /* K5   */  be_nested_str_literal("#"),
-    /* K6   */  be_const_int(1),
-    /* K7   */  be_nested_str_literal("find"),
-    /* K8   */  be_nested_str_literal("."),
-    /* K9   */  be_nested_str_literal(".be"),
-    /* K10  */  be_nested_str_literal(".bec"),
-    /* K11  */  be_nested_str_literal("io_error"),
-    /* K12  */  be_nested_str_literal("file extension is not '.be' or '.bec'"),
-    /* K13  */  be_nested_str_literal("last_modified"),
-    /* K14  */  be_nested_str_literal("c"),
-    /* K15  */  be_nested_str_literal("wd"),
-    /* K16  */  be_nested_str_literal(""),
-    /* K17  */  be_nested_str_literal("file"),
-    /* K18  */  be_nested_str_literal("save"),
-    /* K19  */  be_nested_str_literal("format"),
-    /* K20  */  be_nested_str_literal("BRY: could not save compiled file %s (%s)"),
-    }),
-    (be_nested_const_str("load", -435725847, 4)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[112]) {  /* code */
-      0xA40A0000,  //  0000  IMPORT	R2	K0
-      0xA40E0200,  //  0001  IMPORT	R3	K1
-      0x6010000C,  //  0002  GETGBL	R4	G12
-      0x5C140200,  //  0003  MOVE	R5	R1
-      0x7C100200,  //  0004  CALL	R4	1
-      0x1C100902,  //  0005  EQ	R4	R4	K2
-      0x78120001,  //  0006  JMPF	R4	#0009
-      0x50100000,  //  0007  LDBOOL	R4	0	0
-      0x80040800,  //  0008  RET	1	R4
-      0x94100302,  //  0009  GETIDX	R4	R1	K2
-      0x20100903,  //  000A  NE	R4	R4	K3
-      0x78120000,  //  000B  JMPF	R4	#000D
-      0x00060601,  //  000C  ADD	R1	K3	R1
-      0x8C100504,  //  000D  GETMET	R4	R2	K4
-      0x5C180200,  //  000E  MOVE	R6	R1
-      0x581C0005,  //  000F  LDCONST	R7	K5
-      0x7C100600,  //  0010  CALL	R4	3
-      0x94140902,  //  0011  GETIDX	R5	R4	K2
-      0x5419FFFE,  //  0012  LDINT	R6	-1
-      0x94180806,  //  0013  GETIDX	R6	R4	R6
-      0x601C000C,  //  0014  GETGBL	R7	G12
-      0x5C200800,  //  0015  MOVE	R8	R4
-      0x7C1C0200,  //  0016  CALL	R7	1
-      0x241C0F06,  //  0017  GT	R7	R7	K6
-      0x8C200507,  //  0018  GETMET	R8	R2	K7
-      0x5C280C00,  //  0019  MOVE	R10	R6
-      0x582C0008,  //  001A  LDCONST	R11	K8
-      0x7C200600,  //  001B  CALL	R8	3
-      0x14201102,  //  001C  LT	R8	R8	K2
-      0x78220001,  //  001D  JMPF	R8	#0020
-      0x00040309,  //  001E  ADD	R1	R1	K9
-      0x00180D09,  //  001F  ADD	R6	R6	K9
-      0x5421FFFC,  //  0020  LDINT	R8	-3
-      0x5425FFFE,  //  0021  LDINT	R9	-1
-      0x40201009,  //  0022  CONNECT	R8	R8	R9
-      0x94200C08,  //  0023  GETIDX	R8	R6	R8
-      0x1C201109,  //  0024  EQ	R8	R8	K9
-      0x5425FFFB,  //  0025  LDINT	R9	-4
-      0x5429FFFE,  //  0026  LDINT	R10	-1
-      0x4024120A,  //  0027  CONNECT	R9	R9	R10
-      0x94240C09,  //  0028  GETIDX	R9	R6	R9
-      0x1C24130A,  //  0029  EQ	R9	R9	K10
-      0x5C281000,  //  002A  MOVE	R10	R8
-      0x742A0002,  //  002B  JMPT	R10	#002F
-      0x5C281200,  //  002C  MOVE	R10	R9
-      0x742A0000,  //  002D  JMPT	R10	#002F
-      0xB006170C,  //  002E  RAISE	1	K11	K12
-      0x8C28070D,  //  002F  GETMET	R10	R3	K13
-      0x5C300A00,  //  0030  MOVE	R12	R5
-      0x7C280400,  //  0031  CALL	R10	2
-      0x78260005,  //  0032  JMPF	R9	#0039
-      0x4C2C0000,  //  0033  LDNIL	R11
-      0x1C2C140B,  //  0034  EQ	R11	R10	R11
-      0x782E0001,  //  0035  JMPF	R11	#0038
-      0x502C0000,  //  0036  LDBOOL	R11	0	0
-      0x80041600,  //  0037  RET	1	R11
-      0x70020013,  //  0038  JMP		#004D
-      0x8C2C070D,  //  0039  GETMET	R11	R3	K13
-      0x0034030E,  //  003A  ADD	R13	R1	K14
-      0x7C2C0400,  //  003B  CALL	R11	2
-      0x4C300000,  //  003C  LDNIL	R12
-      0x1C30140C,  //  003D  EQ	R12	R10	R12
-      0x78320004,  //  003E  JMPF	R12	#0044
-      0x4C300000,  //  003F  LDNIL	R12
-      0x1C30160C,  //  0040  EQ	R12	R11	R12
-      0x78320001,  //  0041  JMPF	R12	#0044
-      0x50300000,  //  0042  LDBOOL	R12	0	0
-      0x80041800,  //  0043  RET	1	R12
-      0x4C300000,  //  0044  LDNIL	R12
-      0x2030160C,  //  0045  NE	R12	R11	R12
-      0x78320005,  //  0046  JMPF	R12	#004D
-      0x4C300000,  //  0047  LDNIL	R12
-      0x1C30140C,  //  0048  EQ	R12	R10	R12
-      0x74320001,  //  0049  JMPT	R12	#004C
-      0x2830160A,  //  004A  GE	R12	R11	R10
-      0x78320000,  //  004B  JMPF	R12	#004D
-      0x50240200,  //  004C  LDBOOL	R9	1	0
-      0x781E0002,  //  004D  JMPF	R7	#0051
-      0x002C0B05,  //  004E  ADD	R11	R5	K5
-      0x90021E0B,  //  004F  SETMBR	R0	K15	R11
-      0x70020000,  //  0050  JMP		#0052
-      0x90021F10,  //  0051  SETMBR	R0	K15	K16
-      0x602C000D,  //  0052  GETGBL	R11	G13
-      0x5C300200,  //  0053  MOVE	R12	R1
-      0x58340011,  //  0054  LDCONST	R13	K17
-      0x7C2C0400,  //  0055  CALL	R11	2
-      0x5C301200,  //  0056  MOVE	R12	R9
-      0x74320013,  //  0057  JMPT	R12	#006C
-      0x5C300E00,  //  0058  MOVE	R12	R7
-      0x74320011,  //  0059  JMPT	R12	#006C
-      0xA8020005,  //  005A  EXBLK	0	#0061
-      0x8C300112,  //  005B  GETMET	R12	R0	K18
-      0x0038030E,  //  005C  ADD	R14	R1	K14
-      0x5C3C1600,  //  005D  MOVE	R15	R11
-      0x7C300600,  //  005E  CALL	R12	3
-      0xA8040001,  //  005F  EXBLK	1	1
-      0x7002000A,  //  0060  JMP		#006C
-      0xAC300001,  //  0061  CATCH	R12	0	1
-      0x70020007,  //  0062  JMP		#006B
-      0x60340001,  //  0063  GETGBL	R13	G1
-      0x8C380513,  //  0064  GETMET	R14	R2	K19
-      0x58400014,  //  0065  LDCONST	R16	K20
-      0x0044030E,  //  0066  ADD	R17	R1	K14
-      0x5C481800,  //  0067  MOVE	R18	R12
-      0x7C380800,  //  0068  CALL	R14	4
-      0x7C340200,  //  0069  CALL	R13	1
-      0x70020000,  //  006A  JMP		#006C
-      0xB0080000,  //  006B  RAISE	2	R0	R0
-      0x5C301600,  //  006C  MOVE	R12	R11
-      0x7C300000,  //  006D  CALL	R12	0
-      0x50300200,  //  006E  LDBOOL	R12	1	0
-      0x80041800,  //  006F  RET	1	R12
+    &be_const_str_gc,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 6]) {  /* code */
+      0xA4060000,  //  0000  IMPORT	R1	K0
+      0x8C080301,  //  0001  GETMET	R2	R1	K1
+      0x7C080200,  //  0002  CALL	R2	1
+      0x8C080302,  //  0003  GETMET	R2	R1	K2
+      0x7C080200,  //  0004  CALL	R2	1
+      0x80040400,  //  0005  RET	1	R2
     })
   )
 );
@@ -1024,7 +129,7 @@ be_local_closure(load,   /* name */
 /********************************************************************
 ** Solidified function: find_op
 ********************************************************************/
-be_local_closure(find_op,   /* name */
+be_local_closure(Tasmota_find_op,   /* name */
   be_nested_proto(
     13,                          /* nstack */
     2,                          /* argc */
@@ -1035,357 +140,58 @@ be_local_closure(find_op,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("=<>!", -1630497019, 4),
-    /* K2   */  be_nested_string("chars_in_string", -1146182164, 15),
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(_X3D_X3C_X3E_X21),
+    /* K2   */  be_nested_str(chars_in_string),
     /* K3   */  be_const_int(0),
-    /* K4   */  be_nested_string("split", -2017972765, 5),
+    /* K4   */  be_nested_str(split),
     /* K5   */  be_const_int(1),
     }),
-    (be_nested_const_str("find_op", -528253920, 7)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_find_op,
+    &be_const_str_solidified,
     ( &(const binstruction[42]) {  /* code */
-      0xA40A0000,  //  0000  IMPORT R2  K0
-      0x580C0001,  //  0001  LDCONST  R3  K1
-      0x8C100102,  //  0002  GETMET R4  R0  K2
-      0x5C180200,  //  0003  MOVE R6  R1
-      0x5C1C0600,  //  0004  MOVE R7  R3
-      0x7C100600,  //  0005  CALL R4  3
-      0x28140903,  //  0006  GE R5  R4  K3
-      0x78160019,  //  0007  JMPF R5  #0022
-      0x8C140504,  //  0008  GETMET R5  R2  K4
-      0x5C1C0200,  //  0009  MOVE R7  R1
-      0x5C200800,  //  000A  MOVE R8  R4
-      0x7C140600,  //  000B  CALL R5  3
-      0x94180B03,  //  000C  GETIDX R6  R5  K3
-      0x941C0B05,  //  000D  GETIDX R7  R5  K5
-      0x8C200102,  //  000E  GETMET R8  R0  K2
-      0x5C280E00,  //  000F  MOVE R10 R7
-      0x5C2C0600,  //  0010  MOVE R11 R3
-      0x50300200,  //  0011  LDBOOL R12 1 0
-      0x7C200800,  //  0012  CALL R8  4
-      0x5C101000,  //  0013  MOVE R4  R8
-      0x28200903,  //  0014  GE R8  R4  K3
-      0x7822000B,  //  0015  JMPF R8  #0022
-      0x8C200504,  //  0016  GETMET R8  R2  K4
-      0x5C280E00,  //  0017  MOVE R10 R7
-      0x5C2C0800,  //  0018  MOVE R11 R4
-      0x7C200600,  //  0019  CALL R8  3
-      0x94241103,  //  001A  GETIDX R9  R8  K3
-      0x94281105,  //  001B  GETIDX R10 R8  K5
-      0x602C0012,  //  001C  GETGBL R11 G18
-      0x7C2C0000,  //  001D  CALL R11 0
-      0x40301606,  //  001E  CONNECT  R12 R11 R6
-      0x40301609,  //  001F  CONNECT  R12 R11 R9
-      0x4030160A,  //  0020  CONNECT  R12 R11 R10
-      0x80041600,  //  0021  RET  1 R11
-      0x60140012,  //  0022  GETGBL R5  G18
-      0x7C140000,  //  0023  CALL R5  0
-      0x40180A01,  //  0024  CONNECT  R6  R5  R1
-      0x4C180000,  //  0025  LDNIL  R6
-      0x40180A06,  //  0026  CONNECT  R6  R5  R6
-      0x4C180000,  //  0027  LDNIL  R6
-      0x40180A06,  //  0028  CONNECT  R6  R5  R6
-      0x80040A00,  //  0029  RET  1 R5
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: remove_timer
-********************************************************************/
-be_local_closure(remove_timer,   /* name */
-  be_nested_proto(
-    6,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 7]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota", 424643812, 7),
-    /* K1   */  be_nested_string("_timers", -1694866380, 7),
-    /* K2   */  be_const_int(0),
-    /* K3   */  be_nested_string("size", 597743964, 4),
-    /* K4   */  be_nested_string("id", 926444256, 2),
-    /* K5   */  be_nested_string("remove", -611183107, 6),
-    /* K6   */  be_const_int(1),
-    }),
-    (be_nested_const_str("remove_timer", -153495081, 12)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[23]) {  /* code */
-      0xB80A0000,  //  0000  GETNGBL  R2  K0
-      0x88080501,  //  0001  GETMBR R2  R2  K1
-      0x780A0012,  //  0002  JMPF R2  #0016
-      0x58080002,  //  0003  LDCONST  R2  K2
-      0xB80E0000,  //  0004  GETNGBL  R3  K0
-      0x880C0701,  //  0005  GETMBR R3  R3  K1
-      0x8C0C0703,  //  0006  GETMET R3  R3  K3
-      0x7C0C0200,  //  0007  CALL R3  1
-      0x140C0403,  //  0008  LT R3  R2  R3
-      0x780E000B,  //  0009  JMPF R3  #0016
-      0x880C0101,  //  000A  GETMBR R3  R0  K1
-      0x940C0602,  //  000B  GETIDX R3  R3  R2
-      0x880C0704,  //  000C  GETMBR R3  R3  K4
-      0x1C0C0601,  //  000D  EQ R3  R3  R1
-      0x780E0004,  //  000E  JMPF R3  #0014
-      0x880C0101,  //  000F  GETMBR R3  R0  K1
-      0x8C0C0705,  //  0010  GETMET R3  R3  K5
-      0x5C140400,  //  0011  MOVE R5  R2
-      0x7C0C0400,  //  0012  CALL R3  2
-      0x70020000,  //  0013  JMP    #0015
-      0x00080506,  //  0014  ADD  R2  R2  K6
-      0x7001FFED,  //  0015  JMP    #0004
-      0x80000000,  //  0016  RET  0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: get_light
-********************************************************************/
-be_local_closure(get_light,   /* name */
-  be_nested_proto(
-    6,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("tasmota.get_light() is deprecated, use light.get()", -769213649, 50),
-    /* K1   */  be_nested_string("light", -493019601, 5),
-    /* K2   */  be_nested_string("get", 1410115415, 3),
-    }),
-    (be_nested_const_str("get_light", 381930476, 9)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[16]) {  /* code */
-      0x60080001,  //  0000  GETGBL R2  G1
-      0x580C0000,  //  0001  LDCONST  R3  K0
-      0x7C080200,  //  0002  CALL R2  1
-      0xA40A0200,  //  0003  IMPORT R2  K1
-      0x4C0C0000,  //  0004  LDNIL  R3
-      0x200C0203,  //  0005  NE R3  R1  R3
-      0x780E0004,  //  0006  JMPF R3  #000C
-      0x8C0C0502,  //  0007  GETMET R3  R2  K2
-      0x5C140200,  //  0008  MOVE R5  R1
-      0x7C0C0400,  //  0009  CALL R3  2
-      0x80040600,  //  000A  RET  1 R3
-      0x70020002,  //  000B  JMP    #000F
-      0x8C0C0502,  //  000C  GETMET R3  R2  K2
-      0x7C0C0200,  //  000D  CALL R3  1
-      0x80040600,  //  000E  RET  1 R3
-      0x80000000,  //  000F  RET  0
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: exec_rules
-********************************************************************/
-be_local_closure(exec_rules,   /* name */
-  be_nested_proto(
-    12,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[12]) {     /* constants */
-    /* K0   */  be_nested_string("_rules", -28750191, 6),
-    /* K1   */  be_nested_string("cmd_res", 921166762, 7),
-    /* K2   */  be_nested_string("json", 916562499, 4),
-    /* K3   */  be_nested_string("load", -435725847, 4),
-    /* K4   */  be_nested_string("log", 1062293841, 3),
-    /* K5   */  be_nested_string("BRY: ERROR, bad json: ", -1579831487, 22),
-    /* K6   */  be_const_int(3),
-    /* K7   */  be_const_int(0),
-    /* K8   */  be_nested_string("try_rule", 1986449405, 8),
-    /* K9   */  be_nested_string("k", -301188886, 1),
-    /* K10  */  be_nested_string("v", -217300791, 1),
-    /* K11  */  be_const_int(1),
-    }),
-    (be_nested_const_str("exec_rules", 1445221092, 10)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[48]) {  /* code */
-      0x88080100,  //  0000  GETMBR	R2	R0	K0
-      0x740A0003,  //  0001  JMPT	R2	#0006
-      0x88080101,  //  0002  GETMBR	R2	R0	K1
-      0x4C0C0000,  //  0003  LDNIL	R3
-      0x20080403,  //  0004  NE	R2	R2	R3
-      0x780A0027,  //  0005  JMPF	R2	#002E
-      0xA40A0400,  //  0006  IMPORT	R2	K2
-      0x8C0C0503,  //  0007  GETMET	R3	R2	K3
-      0x5C140200,  //  0008  MOVE	R5	R1
-      0x7C0C0400,  //  0009  CALL	R3	2
-      0x50100000,  //  000A  LDBOOL	R4	0	0
-      0x4C140000,  //  000B  LDNIL	R5
-      0x1C140605,  //  000C  EQ	R5	R3	R5
-      0x78160004,  //  000D  JMPF	R5	#0013
-      0x8C140104,  //  000E  GETMET	R5	R0	K4
-      0x001E0A01,  //  000F  ADD	R7	K5	R1
-      0x58200006,  //  0010  LDCONST	R8	K6
-      0x7C140600,  //  0011  CALL	R5	3
-      0x5C0C0200,  //  0012  MOVE	R3	R1
-      0x88140101,  //  0013  GETMBR	R5	R0	K1
-      0x4C180000,  //  0014  LDNIL	R6
-      0x20140A06,  //  0015  NE	R5	R5	R6
-      0x78160000,  //  0016  JMPF	R5	#0018
-      0x90020203,  //  0017  SETMBR	R0	K1	R3
-      0x88140100,  //  0018  GETMBR	R5	R0	K0
-      0x78160012,  //  0019  JMPF	R5	#002D
-      0x58140007,  //  001A  LDCONST	R5	K7
-      0x6018000C,  //  001B  GETGBL	R6	G12
-      0x881C0100,  //  001C  GETMBR	R7	R0	K0
-      0x7C180200,  //  001D  CALL	R6	1
-      0x14180A06,  //  001E  LT	R6	R5	R6
-      0x781A000C,  //  001F  JMPF	R6	#002D
-      0x88180100,  //  0020  GETMBR	R6	R0	K0
-      0x94180C05,  //  0021  GETIDX	R6	R6	R5
-      0x8C1C0108,  //  0022  GETMET	R7	R0	K8
-      0x5C240600,  //  0023  MOVE	R9	R3
-      0x88280D09,  //  0024  GETMBR	R10	R6	K9
-      0x882C0D0A,  //  0025  GETMBR	R11	R6	K10
-      0x7C1C0800,  //  0026  CALL	R7	4
-      0x741E0001,  //  0027  JMPT	R7	#002A
-      0x74120000,  //  0028  JMPT	R4	#002A
-      0x50100001,  //  0029  LDBOOL	R4	0	1
-      0x50100200,  //  002A  LDBOOL	R4	1	0
-      0x00140B0B,  //  002B  ADD	R5	R5	K11
-      0x7001FFED,  //  002C  JMP		#001B
-      0x80040800,  //  002D  RET	1	R4
-      0x50080000,  //  002E  LDBOOL	R2	0	0
-      0x80040400,  //  002F  RET	1	R2
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: exec_tele
-********************************************************************/
-be_local_closure(exec_tele,   /* name */
-  be_nested_proto(
-    12,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[12]) {     /* constants */
-    /* K0   */  be_nested_string("_rules", -28750191, 6),
-    /* K1   */  be_nested_string("json", 916562499, 4),
-    /* K2   */  be_nested_string("load", -435725847, 4),
-    /* K3   */  be_nested_string("log", 1062293841, 3),
-    /* K4   */  be_nested_string("BRY: ERROR, bad json: ", -1579831487, 22),
-    /* K5   */  be_const_int(3),
-    /* K6   */  be_nested_string("Tele", 1329980653, 4),
-    /* K7   */  be_const_int(0),
-    /* K8   */  be_nested_string("try_rule", 1986449405, 8),
-    /* K9   */  be_nested_string("k", -301188886, 1),
-    /* K10  */  be_nested_string("v", -217300791, 1),
-    /* K11  */  be_const_int(1),
-    }),
-    (be_nested_const_str("exec_tele", 1020751601, 9)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[41]) {  /* code */
-      0x88080100,  //  0000  GETMBR	R2	R0	K0
-      0x780A0024,  //  0001  JMPF	R2	#0027
-      0xA40A0200,  //  0002  IMPORT	R2	K1
-      0x8C0C0502,  //  0003  GETMET	R3	R2	K2
-      0x5C140200,  //  0004  MOVE	R5	R1
-      0x7C0C0400,  //  0005  CALL	R3	2
-      0x50100000,  //  0006  LDBOOL	R4	0	0
-      0x4C140000,  //  0007  LDNIL	R5
-      0x1C140605,  //  0008  EQ	R5	R3	R5
-      0x78160004,  //  0009  JMPF	R5	#000F
-      0x8C140103,  //  000A  GETMET	R5	R0	K3
-      0x001E0801,  //  000B  ADD	R7	K4	R1
-      0x58200005,  //  000C  LDCONST	R8	K5
-      0x7C140600,  //  000D  CALL	R5	3
-      0x5C0C0200,  //  000E  MOVE	R3	R1
-      0x60140013,  //  000F  GETGBL	R5	G19
-      0x7C140000,  //  0010  CALL	R5	0
-      0x98160C03,  //  0011  SETIDX	R5	K6	R3
-      0x5C0C0A00,  //  0012  MOVE	R3	R5
-      0x58140007,  //  0013  LDCONST	R5	K7
-      0x6018000C,  //  0014  GETGBL	R6	G12
-      0x881C0100,  //  0015  GETMBR	R7	R0	K0
-      0x7C180200,  //  0016  CALL	R6	1
-      0x14180A06,  //  0017  LT	R6	R5	R6
-      0x781A000C,  //  0018  JMPF	R6	#0026
-      0x88180100,  //  0019  GETMBR	R6	R0	K0
-      0x94180C05,  //  001A  GETIDX	R6	R6	R5
-      0x8C1C0108,  //  001B  GETMET	R7	R0	K8
-      0x5C240600,  //  001C  MOVE	R9	R3
-      0x88280D09,  //  001D  GETMBR	R10	R6	K9
-      0x882C0D0A,  //  001E  GETMBR	R11	R6	K10
-      0x7C1C0800,  //  001F  CALL	R7	4
-      0x741E0001,  //  0020  JMPT	R7	#0023
-      0x74120000,  //  0021  JMPT	R4	#0023
-      0x50100001,  //  0022  LDBOOL	R4	0	1
-      0x50100200,  //  0023  LDBOOL	R4	1	0
-      0x00140B0B,  //  0024  ADD	R5	R5	K11
-      0x7001FFED,  //  0025  JMP		#0014
-      0x80040800,  //  0026  RET	1	R4
-      0x50080000,  //  0027  LDBOOL	R2	0	0
-      0x80040400,  //  0028  RET	1	R2
-    })
-  )
-);
-/*******************************************************************/
-
-
-/********************************************************************
-** Solidified function: remove_driver
-********************************************************************/
-be_local_closure(remove_driver,   /* name */
-  be_nested_proto(
-    6,                          /* nstack */
-    2,                          /* argc */
-    0,                          /* varg */
-    0,                          /* has upvals */
-    NULL,                       /* no upvals */
-    0,                          /* has sup protos */
-    NULL,                       /* no sub protos */
-    1,                          /* has constants */
-    ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("_drivers", -1034638311, 8),
-    /* K1   */  be_nested_string("find", -1108310694, 4),
-    /* K2   */  be_nested_string("pop", 1362321360, 3),
-    }),
-    (be_nested_const_str("remove_driver", 1030243768, 13)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[14]) {  /* code */
-      0x88080100,  //  0000  GETMBR R2  R0  K0
-      0x780A000A,  //  0001  JMPF R2  #000D
-      0x88080100,  //  0002  GETMBR R2  R0  K0
-      0x8C080501,  //  0003  GETMET R2  R2  K1
-      0x5C100200,  //  0004  MOVE R4  R1
-      0x7C080400,  //  0005  CALL R2  2
-      0x4C0C0000,  //  0006  LDNIL  R3
-      0x200C0403,  //  0007  NE R3  R2  R3
-      0x780E0003,  //  0008  JMPF R3  #000D
-      0x880C0100,  //  0009  GETMBR R3  R0  K0
-      0x8C0C0702,  //  000A  GETMET R3  R3  K2
-      0x5C140400,  //  000B  MOVE R5  R2
-      0x7C0C0400,  //  000C  CALL R3  2
-      0x80000000,  //  000D  RET  0
+      0xA40A0000,  //  0000  IMPORT	R2	K0
+      0x580C0001,  //  0001  LDCONST	R3	K1
+      0x8C100102,  //  0002  GETMET	R4	R0	K2
+      0x5C180200,  //  0003  MOVE	R6	R1
+      0x5C1C0600,  //  0004  MOVE	R7	R3
+      0x7C100600,  //  0005  CALL	R4	3
+      0x28140903,  //  0006  GE	R5	R4	K3
+      0x78160019,  //  0007  JMPF	R5	#0022
+      0x8C140504,  //  0008  GETMET	R5	R2	K4
+      0x5C1C0200,  //  0009  MOVE	R7	R1
+      0x5C200800,  //  000A  MOVE	R8	R4
+      0x7C140600,  //  000B  CALL	R5	3
+      0x94180B03,  //  000C  GETIDX	R6	R5	K3
+      0x941C0B05,  //  000D  GETIDX	R7	R5	K5
+      0x8C200102,  //  000E  GETMET	R8	R0	K2
+      0x5C280E00,  //  000F  MOVE	R10	R7
+      0x5C2C0600,  //  0010  MOVE	R11	R3
+      0x50300200,  //  0011  LDBOOL	R12	1	0
+      0x7C200800,  //  0012  CALL	R8	4
+      0x5C101000,  //  0013  MOVE	R4	R8
+      0x28200903,  //  0014  GE	R8	R4	K3
+      0x7822000B,  //  0015  JMPF	R8	#0022
+      0x8C200504,  //  0016  GETMET	R8	R2	K4
+      0x5C280E00,  //  0017  MOVE	R10	R7
+      0x5C2C0800,  //  0018  MOVE	R11	R4
+      0x7C200600,  //  0019  CALL	R8	3
+      0x94241103,  //  001A  GETIDX	R9	R8	K3
+      0x94281105,  //  001B  GETIDX	R10	R8	K5
+      0x602C0012,  //  001C  GETGBL	R11	G18
+      0x7C2C0000,  //  001D  CALL	R11	0
+      0x40301606,  //  001E  CONNECT	R12	R11	R6
+      0x40301609,  //  001F  CONNECT	R12	R11	R9
+      0x4030160A,  //  0020  CONNECT	R12	R11	R10
+      0x80041600,  //  0021  RET	1	R11
+      0x60140012,  //  0022  GETGBL	R5	G18
+      0x7C140000,  //  0023  CALL	R5	0
+      0x40180A01,  //  0024  CONNECT	R6	R5	R1
+      0x4C180000,  //  0025  LDNIL	R6
+      0x40180A06,  //  0026  CONNECT	R6	R5	R6
+      0x4C180000,  //  0027  LDNIL	R6
+      0x40180A06,  //  0028  CONNECT	R6	R5	R6
+      0x80040A00,  //  0029  RET	1	R5
     })
   )
 );
@@ -1395,7 +201,7 @@ be_local_closure(remove_driver,   /* name */
 /********************************************************************
 ** Solidified function: try_rule
 ********************************************************************/
-be_local_closure(try_rule,   /* name */
+be_local_closure(Tasmota_try_rule,   /* name */
   be_nested_proto(
     15,                          /* nstack */
     4,                          /* argc */
@@ -1406,25 +212,25 @@ be_local_closure(try_rule,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[16]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("find_op", -528253920, 7),
-    /* K2   */  be_nested_string("split", -2017972765, 5),
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(find_op),
+    /* K2   */  be_nested_str(split),
     /* K3   */  be_const_int(0),
-    /* K4   */  be_nested_string("#", 638357778, 1),
-    /* K5   */  be_nested_string("find_key_i", 850136726, 10),
+    /* K4   */  be_nested_str(_X23),
+    /* K5   */  be_nested_str(find_key_i),
     /* K6   */  be_const_int(1),
     /* K7   */  be_const_int(2),
-    /* K8   */  be_nested_string("==", -1863000881, 2),
-    /* K9   */  be_nested_string("!==", 559817114, 3),
-    /* K10  */  be_nested_string("=", 940354920, 1),
-    /* K11  */  be_nested_string("!=", -1866252285, 2),
-    /* K12  */  be_nested_string(">", 990687777, 1),
-    /* K13  */  be_nested_string(">=", 284975636, 2),
-    /* K14  */  be_nested_string("<", 957132539, 1),
-    /* K15  */  be_nested_string("<=", -1795743310, 2),
+    /* K8   */  be_nested_str(_X3D_X3D),
+    /* K9   */  be_nested_str(_X21_X3D_X3D),
+    /* K10  */  be_nested_str(_X3D),
+    /* K11  */  be_nested_str(_X21_X3D),
+    /* K12  */  be_nested_str(_X3E),
+    /* K13  */  be_nested_str(_X3E_X3D),
+    /* K14  */  be_nested_str(_X3C),
+    /* K15  */  be_nested_str(_X3C_X3D),
     }),
-    (be_nested_const_str("try_rule", 1986449405, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_try_rule,
+    &be_const_str_solidified,
     ( &(const binstruction[141]) {  /* code */
       0xA4120000,  //  0000  IMPORT	R4	K0
       0x8C140101,  //  0001  GETMET	R5	R0	K1
@@ -1574,46 +380,64 @@ be_local_closure(try_rule,   /* name */
 
 
 /********************************************************************
-** Solidified function: cb_dispatch
+** Solidified function: gen_cb
 ********************************************************************/
-be_local_closure(cb_dispatch,   /* name */
+be_local_closure(Tasmota_gen_cb,   /* name */
   be_nested_proto(
-    12,                          /* nstack */
-    6,                          /* argc */
+    7,                          /* nstack */
+    2,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("_cb", -251666929, 3),
+    ( &(const bvalue[ 7]) {     /* constants */
+    /* K0   */  be_nested_str(_cb),
     /* K1   */  be_const_int(0),
-    /* K2   */  be_nested_string("find", -1108310694, 4),
+    /* K2   */  be_nested_str(find),
+    /* K3   */  be_nested_str(_get_cb),
+    /* K4   */  be_nested_str(stop_iteration),
+    /* K5   */  be_nested_str(internal_error),
+    /* K6   */  be_nested_str(No_X20callback_X20available),
     }),
-    (be_nested_const_str("cb_dispatch", 1741510499, 11)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[20]) {  /* code */
-      0x88180100,  //  0000  GETMBR R6  R0  K0
-      0x4C1C0000,  //  0001  LDNIL  R7
-      0x1C180C07,  //  0002  EQ R6  R6  R7
-      0x781A0000,  //  0003  JMPF R6  #0005
-      0x80060200,  //  0004  RET  1 K1
-      0x88180100,  //  0005  GETMBR R6  R0  K0
-      0x8C180D02,  //  0006  GETMET R6  R6  K2
-      0x5C200200,  //  0007  MOVE R8  R1
-      0x7C180400,  //  0008  CALL R6  2
-      0x4C1C0000,  //  0009  LDNIL  R7
-      0x201C0C07,  //  000A  NE R7  R6  R7
-      0x781E0006,  //  000B  JMPF R7  #0013
-      0x5C1C0C00,  //  000C  MOVE R7  R6
-      0x5C200400,  //  000D  MOVE R8  R2
-      0x5C240600,  //  000E  MOVE R9  R3
-      0x5C280800,  //  000F  MOVE R10 R4
-      0x5C2C0A00,  //  0010  MOVE R11 R5
-      0x7C1C0800,  //  0011  CALL R7  4
-      0x80040E00,  //  0012  RET  1 R7
-      0x80060200,  //  0013  RET  1 K1
+    &be_const_str_gen_cb,
+    &be_const_str_solidified,
+    ( &(const binstruction[34]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x4C0C0000,  //  0001  LDNIL	R3
+      0x1C080403,  //  0002  EQ	R2	R2	R3
+      0x780A0002,  //  0003  JMPF	R2	#0007
+      0x60080013,  //  0004  GETGBL	R2	G19
+      0x7C080000,  //  0005  CALL	R2	0
+      0x90020002,  //  0006  SETMBR	R0	K0	R2
+      0x60080010,  //  0007  GETGBL	R2	G16
+      0x540E0012,  //  0008  LDINT	R3	19
+      0x400E0203,  //  0009  CONNECT	R3	K1	R3
+      0x7C080200,  //  000A  CALL	R2	1
+      0xA8020010,  //  000B  EXBLK	0	#001D
+      0x5C0C0400,  //  000C  MOVE	R3	R2
+      0x7C0C0000,  //  000D  CALL	R3	0
+      0x88100100,  //  000E  GETMBR	R4	R0	K0
+      0x8C100902,  //  000F  GETMET	R4	R4	K2
+      0x5C180600,  //  0010  MOVE	R6	R3
+      0x7C100400,  //  0011  CALL	R4	2
+      0x4C140000,  //  0012  LDNIL	R5
+      0x1C100805,  //  0013  EQ	R4	R4	R5
+      0x78120006,  //  0014  JMPF	R4	#001C
+      0x88100100,  //  0015  GETMBR	R4	R0	K0
+      0x98100601,  //  0016  SETIDX	R4	R3	R1
+      0x8C100103,  //  0017  GETMET	R4	R0	K3
+      0x5C180600,  //  0018  MOVE	R6	R3
+      0x7C100400,  //  0019  CALL	R4	2
+      0xA8040001,  //  001A  EXBLK	1	1
+      0x80040800,  //  001B  RET	1	R4
+      0x7001FFEE,  //  001C  JMP		#000C
+      0x58080004,  //  001D  LDCONST	R2	K4
+      0xAC080200,  //  001E  CATCH	R2	1	0
+      0xB0080000,  //  001F  RAISE	2	R0	R0
+      0xB0060B06,  //  0020  RAISE	1	K5	K6
+      0x80000000,  //  0021  RET	0
     })
   )
 );
@@ -1621,12 +445,12 @@ be_local_closure(cb_dispatch,   /* name */
 
 
 /********************************************************************
-** Solidified function: gc
+** Solidified function: set_light
 ********************************************************************/
-be_local_closure(gc,   /* name */
+be_local_closure(Tasmota_set_light,   /* name */
   be_nested_proto(
-    4,                          /* nstack */
-    1,                          /* argc */
+    8,                          /* nstack */
+    3,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
@@ -1634,19 +458,208 @@ be_local_closure(gc,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("gc", 1042313471, 2),
-    /* K1   */  be_nested_string("collect", -1895928271, 7),
-    /* K2   */  be_nested_string("allocated", 429986098, 9),
+    /* K0   */  be_nested_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29),
+    /* K1   */  be_nested_str(light),
+    /* K2   */  be_nested_str(set),
     }),
-    (be_nested_const_str("gc", 1042313471, 2)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 6]) {  /* code */
-      0xA4060000,  //  0000  IMPORT R1  K0
-      0x8C080301,  //  0001  GETMET R2  R1  K1
-      0x7C080200,  //  0002  CALL R2  1
-      0x8C080302,  //  0003  GETMET R2  R1  K2
-      0x7C080200,  //  0004  CALL R2  1
-      0x80040400,  //  0005  RET  1 R2
+    &be_const_str_set_light,
+    &be_const_str_solidified,
+    ( &(const binstruction[18]) {  /* code */
+      0x600C0001,  //  0000  GETGBL	R3	G1
+      0x58100000,  //  0001  LDCONST	R4	K0
+      0x7C0C0200,  //  0002  CALL	R3	1
+      0xA40E0200,  //  0003  IMPORT	R3	K1
+      0x4C100000,  //  0004  LDNIL	R4
+      0x20100404,  //  0005  NE	R4	R2	R4
+      0x78120005,  //  0006  JMPF	R4	#000D
+      0x8C100702,  //  0007  GETMET	R4	R3	K2
+      0x5C180200,  //  0008  MOVE	R6	R1
+      0x5C1C0400,  //  0009  MOVE	R7	R2
+      0x7C100600,  //  000A  CALL	R4	3
+      0x80040800,  //  000B  RET	1	R4
+      0x70020003,  //  000C  JMP		#0011
+      0x8C100702,  //  000D  GETMET	R4	R3	K2
+      0x5C180200,  //  000E  MOVE	R6	R1
+      0x7C100400,  //  000F  CALL	R4	2
+      0x80040800,  //  0010  RET	1	R4
+      0x80000000,  //  0011  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: exec_tele
+********************************************************************/
+be_local_closure(Tasmota_exec_tele,   /* name */
+  be_nested_proto(
+    12,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[12]) {     /* constants */
+    /* K0   */  be_nested_str(_rules),
+    /* K1   */  be_nested_str(json),
+    /* K2   */  be_nested_str(load),
+    /* K3   */  be_nested_str(log),
+    /* K4   */  be_nested_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20),
+    /* K5   */  be_const_int(3),
+    /* K6   */  be_nested_str(Tele),
+    /* K7   */  be_const_int(0),
+    /* K8   */  be_nested_str(try_rule),
+    /* K9   */  be_nested_str(k),
+    /* K10  */  be_nested_str(v),
+    /* K11  */  be_const_int(1),
+    }),
+    &be_const_str_exec_tele,
+    &be_const_str_solidified,
+    ( &(const binstruction[41]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x780A0024,  //  0001  JMPF	R2	#0027
+      0xA40A0200,  //  0002  IMPORT	R2	K1
+      0x8C0C0502,  //  0003  GETMET	R3	R2	K2
+      0x5C140200,  //  0004  MOVE	R5	R1
+      0x7C0C0400,  //  0005  CALL	R3	2
+      0x50100000,  //  0006  LDBOOL	R4	0	0
+      0x4C140000,  //  0007  LDNIL	R5
+      0x1C140605,  //  0008  EQ	R5	R3	R5
+      0x78160004,  //  0009  JMPF	R5	#000F
+      0x8C140103,  //  000A  GETMET	R5	R0	K3
+      0x001E0801,  //  000B  ADD	R7	K4	R1
+      0x58200005,  //  000C  LDCONST	R8	K5
+      0x7C140600,  //  000D  CALL	R5	3
+      0x5C0C0200,  //  000E  MOVE	R3	R1
+      0x60140013,  //  000F  GETGBL	R5	G19
+      0x7C140000,  //  0010  CALL	R5	0
+      0x98160C03,  //  0011  SETIDX	R5	K6	R3
+      0x5C0C0A00,  //  0012  MOVE	R3	R5
+      0x58140007,  //  0013  LDCONST	R5	K7
+      0x6018000C,  //  0014  GETGBL	R6	G12
+      0x881C0100,  //  0015  GETMBR	R7	R0	K0
+      0x7C180200,  //  0016  CALL	R6	1
+      0x14180A06,  //  0017  LT	R6	R5	R6
+      0x781A000C,  //  0018  JMPF	R6	#0026
+      0x88180100,  //  0019  GETMBR	R6	R0	K0
+      0x94180C05,  //  001A  GETIDX	R6	R6	R5
+      0x8C1C0108,  //  001B  GETMET	R7	R0	K8
+      0x5C240600,  //  001C  MOVE	R9	R3
+      0x88280D09,  //  001D  GETMBR	R10	R6	K9
+      0x882C0D0A,  //  001E  GETMBR	R11	R6	K10
+      0x7C1C0800,  //  001F  CALL	R7	4
+      0x741E0001,  //  0020  JMPT	R7	#0023
+      0x74120000,  //  0021  JMPT	R4	#0023
+      0x50100001,  //  0022  LDBOOL	R4	0	1
+      0x50100200,  //  0023  LDBOOL	R4	1	0
+      0x00140B0B,  //  0024  ADD	R5	R5	K11
+      0x7001FFED,  //  0025  JMP		#0014
+      0x80040800,  //  0026  RET	1	R4
+      0x50080000,  //  0027  LDBOOL	R2	0	0
+      0x80040400,  //  0028  RET	1	R2
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: run_deferred
+********************************************************************/
+be_local_closure(Tasmota_run_deferred,   /* name */
+  be_nested_proto(
+    6,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 8]) {     /* constants */
+    /* K0   */  be_nested_str(_timers),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(size),
+    /* K3   */  be_nested_str(time_reached),
+    /* K4   */  be_nested_str(due),
+    /* K5   */  be_nested_str(f),
+    /* K6   */  be_nested_str(remove),
+    /* K7   */  be_const_int(1),
+    }),
+    &be_const_str_run_deferred,
+    &be_const_str_solidified,
+    ( &(const binstruction[27]) {  /* code */
+      0x88040100,  //  0000  GETMBR	R1	R0	K0
+      0x78060017,  //  0001  JMPF	R1	#001A
+      0x58040001,  //  0002  LDCONST	R1	K1
+      0x88080100,  //  0003  GETMBR	R2	R0	K0
+      0x8C080502,  //  0004  GETMET	R2	R2	K2
+      0x7C080200,  //  0005  CALL	R2	1
+      0x14080202,  //  0006  LT	R2	R1	R2
+      0x780A0011,  //  0007  JMPF	R2	#001A
+      0x8C080103,  //  0008  GETMET	R2	R0	K3
+      0x88100100,  //  0009  GETMBR	R4	R0	K0
+      0x94100801,  //  000A  GETIDX	R4	R4	R1
+      0x88100904,  //  000B  GETMBR	R4	R4	K4
+      0x7C080400,  //  000C  CALL	R2	2
+      0x780A0009,  //  000D  JMPF	R2	#0018
+      0x88080100,  //  000E  GETMBR	R2	R0	K0
+      0x94080401,  //  000F  GETIDX	R2	R2	R1
+      0x88080505,  //  0010  GETMBR	R2	R2	K5
+      0x880C0100,  //  0011  GETMBR	R3	R0	K0
+      0x8C0C0706,  //  0012  GETMET	R3	R3	K6
+      0x5C140200,  //  0013  MOVE	R5	R1
+      0x7C0C0400,  //  0014  CALL	R3	2
+      0x5C0C0400,  //  0015  MOVE	R3	R2
+      0x7C0C0000,  //  0016  CALL	R3	0
+      0x70020000,  //  0017  JMP		#0019
+      0x00040307,  //  0018  ADD	R1	R1	K7
+      0x7001FFE8,  //  0019  JMP		#0003
+      0x80000000,  //  001A  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: remove_driver
+********************************************************************/
+be_local_closure(Tasmota_remove_driver,   /* name */
+  be_nested_proto(
+    6,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(_drivers),
+    /* K1   */  be_nested_str(find),
+    /* K2   */  be_nested_str(pop),
+    }),
+    &be_const_str_remove_driver,
+    &be_const_str_solidified,
+    ( &(const binstruction[14]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x780A000A,  //  0001  JMPF	R2	#000D
+      0x88080100,  //  0002  GETMBR	R2	R0	K0
+      0x8C080501,  //  0003  GETMET	R2	R2	K1
+      0x5C100200,  //  0004  MOVE	R4	R1
+      0x7C080400,  //  0005  CALL	R2	2
+      0x4C0C0000,  //  0006  LDNIL	R3
+      0x200C0403,  //  0007  NE	R3	R2	R3
+      0x780E0003,  //  0008  JMPF	R3	#000D
+      0x880C0100,  //  0009  GETMBR	R3	R0	K0
+      0x8C0C0702,  //  000A  GETMET	R3	R3	K2
+      0x5C140400,  //  000B  MOVE	R5	R2
+      0x7C0C0400,  //  000C  CALL	R3	2
+      0x80000000,  //  000D  RET	0
     })
   )
 );
@@ -1656,7 +669,7 @@ be_local_closure(gc,   /* name */
 /********************************************************************
 ** Solidified function: event
 ********************************************************************/
-be_local_closure(event,   /* name */
+be_local_closure(Tasmota_event,   /* name */
   be_nested_proto(
     20,                          /* nstack */
     6,                          /* argc */
@@ -1667,32 +680,32 @@ be_local_closure(event,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[23]) {     /* constants */
-    /* K0   */  be_nested_string("introspect", 164638290, 10),
-    /* K1   */  be_nested_string("string", 398550328, 6),
-    /* K2   */  be_nested_string("every_50ms", -1911083288, 10),
-    /* K3   */  be_nested_string("run_deferred", 371594696, 12),
-    /* K4   */  be_nested_string("cmd", -158181397, 3),
-    /* K5   */  be_nested_string("exec_cmd", 493567399, 8),
-    /* K6   */  be_nested_string("tele", -820509235, 4),
-    /* K7   */  be_nested_string("exec_tele", 1020751601, 9),
-    /* K8   */  be_nested_string("rule", -64077613, 4),
-    /* K9   */  be_nested_string("exec_rules", 1445221092, 10),
-    /* K10  */  be_nested_string("gc", 1042313471, 2),
-    /* K11  */  be_nested_string("_drivers", -1034638311, 8),
+    /* K0   */  be_nested_str(introspect),
+    /* K1   */  be_nested_str(string),
+    /* K2   */  be_nested_str(every_50ms),
+    /* K3   */  be_nested_str(run_deferred),
+    /* K4   */  be_nested_str(cmd),
+    /* K5   */  be_nested_str(exec_cmd),
+    /* K6   */  be_nested_str(tele),
+    /* K7   */  be_nested_str(exec_tele),
+    /* K8   */  be_nested_str(rule),
+    /* K9   */  be_nested_str(exec_rules),
+    /* K10  */  be_nested_str(gc),
+    /* K11  */  be_nested_str(_drivers),
     /* K12  */  be_const_int(0),
-    /* K13  */  be_nested_string("get", 1410115415, 3),
-    /* K14  */  be_nested_string("function", -1630125495, 8),
-    /* K15  */  be_nested_string("format", -1180859054, 6),
-    /* K16  */  be_nested_string("BRY: Exception> '%s' - %s", -2047976332, 25),
-    /* K17  */  be_nested_string("debug", 1483009432, 5),
-    /* K18  */  be_nested_string("traceback", -909779187, 9),
+    /* K13  */  be_nested_str(get),
+    /* K14  */  be_nested_str(function),
+    /* K15  */  be_nested_str(format),
+    /* K16  */  be_nested_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s),
+    /* K17  */  be_nested_str(debug),
+    /* K18  */  be_nested_str(traceback),
     /* K19  */  be_const_int(1),
-    /* K20  */  be_nested_string("save_before_restart", 1253239338, 19),
-    /* K21  */  be_nested_string("persist", -377883517, 7),
-    /* K22  */  be_nested_string("save", -855671224, 4),
+    /* K20  */  be_nested_str(save_before_restart),
+    /* K21  */  be_nested_str(persist),
+    /* K22  */  be_nested_str(save),
     }),
-    (be_nested_const_str("event", -30355297, 5)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_event,
+    &be_const_str_solidified,
     ( &(const binstruction[91]) {  /* code */
       0xA41A0000,  //  0000  IMPORT	R6	K0
       0xA41E0200,  //  0001  IMPORT	R7	K1
@@ -1792,9 +805,593 @@ be_local_closure(event,   /* name */
 
 
 /********************************************************************
-** Solidified function: remove_cmd
+** Solidified function: find_key_i
 ********************************************************************/
-be_local_closure(remove_cmd,   /* name */
+be_local_closure(Tasmota_find_key_i,   /* name */
+  be_nested_proto(
+    10,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(toupper),
+    /* K2   */  be_nested_str(keys),
+    /* K3   */  be_nested_str(_X3F),
+    /* K4   */  be_nested_str(stop_iteration),
+    }),
+    &be_const_str_find_key_i,
+    &be_const_str_solidified,
+    ( &(const binstruction[30]) {  /* code */
+      0xA40E0000,  //  0000  IMPORT	R3	K0
+      0x8C100701,  //  0001  GETMET	R4	R3	K1
+      0x5C180400,  //  0002  MOVE	R6	R2
+      0x7C100400,  //  0003  CALL	R4	2
+      0x6014000F,  //  0004  GETGBL	R5	G15
+      0x5C180200,  //  0005  MOVE	R6	R1
+      0x601C0013,  //  0006  GETGBL	R7	G19
+      0x7C140400,  //  0007  CALL	R5	2
+      0x78160013,  //  0008  JMPF	R5	#001D
+      0x60140010,  //  0009  GETGBL	R5	G16
+      0x8C180302,  //  000A  GETMET	R6	R1	K2
+      0x7C180200,  //  000B  CALL	R6	1
+      0x7C140200,  //  000C  CALL	R5	1
+      0xA802000B,  //  000D  EXBLK	0	#001A
+      0x5C180A00,  //  000E  MOVE	R6	R5
+      0x7C180000,  //  000F  CALL	R6	0
+      0x8C1C0701,  //  0010  GETMET	R7	R3	K1
+      0x5C240C00,  //  0011  MOVE	R9	R6
+      0x7C1C0400,  //  0012  CALL	R7	2
+      0x1C1C0E04,  //  0013  EQ	R7	R7	R4
+      0x741E0001,  //  0014  JMPT	R7	#0017
+      0x1C1C0503,  //  0015  EQ	R7	R2	K3
+      0x781E0001,  //  0016  JMPF	R7	#0019
+      0xA8040001,  //  0017  EXBLK	1	1
+      0x80040C00,  //  0018  RET	1	R6
+      0x7001FFF3,  //  0019  JMP		#000E
+      0x58140004,  //  001A  LDCONST	R5	K4
+      0xAC140200,  //  001B  CATCH	R5	1	0
+      0xB0080000,  //  001C  RAISE	2	R0	R0
+      0x80000000,  //  001D  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: wire_scan
+********************************************************************/
+be_local_closure(Tasmota_wire_scan,   /* name */
+  be_nested_proto(
+    6,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_nested_str(i2c_enabled),
+    /* K1   */  be_nested_str(wire1),
+    /* K2   */  be_nested_str(enabled),
+    /* K3   */  be_nested_str(detect),
+    /* K4   */  be_nested_str(wire2),
+    }),
+    &be_const_str_wire_scan,
+    &be_const_str_solidified,
+    ( &(const binstruction[33]) {  /* code */
+      0x4C0C0000,  //  0000  LDNIL	R3
+      0x200C0403,  //  0001  NE	R3	R2	R3
+      0x780E0005,  //  0002  JMPF	R3	#0009
+      0x8C0C0100,  //  0003  GETMET	R3	R0	K0
+      0x5C140400,  //  0004  MOVE	R5	R2
+      0x7C0C0400,  //  0005  CALL	R3	2
+      0x740E0001,  //  0006  JMPT	R3	#0009
+      0x4C0C0000,  //  0007  LDNIL	R3
+      0x80040600,  //  0008  RET	1	R3
+      0x880C0101,  //  0009  GETMBR	R3	R0	K1
+      0x8C0C0702,  //  000A  GETMET	R3	R3	K2
+      0x7C0C0200,  //  000B  CALL	R3	1
+      0x780E0006,  //  000C  JMPF	R3	#0014
+      0x880C0101,  //  000D  GETMBR	R3	R0	K1
+      0x8C0C0703,  //  000E  GETMET	R3	R3	K3
+      0x5C140200,  //  000F  MOVE	R5	R1
+      0x7C0C0400,  //  0010  CALL	R3	2
+      0x780E0001,  //  0011  JMPF	R3	#0014
+      0x880C0101,  //  0012  GETMBR	R3	R0	K1
+      0x80040600,  //  0013  RET	1	R3
+      0x880C0104,  //  0014  GETMBR	R3	R0	K4
+      0x8C0C0702,  //  0015  GETMET	R3	R3	K2
+      0x7C0C0200,  //  0016  CALL	R3	1
+      0x780E0006,  //  0017  JMPF	R3	#001F
+      0x880C0104,  //  0018  GETMBR	R3	R0	K4
+      0x8C0C0703,  //  0019  GETMET	R3	R3	K3
+      0x5C140200,  //  001A  MOVE	R5	R1
+      0x7C0C0400,  //  001B  CALL	R3	2
+      0x780E0001,  //  001C  JMPF	R3	#001F
+      0x880C0104,  //  001D  GETMBR	R3	R0	K4
+      0x80040600,  //  001E  RET	1	R3
+      0x4C0C0000,  //  001F  LDNIL	R3
+      0x80040600,  //  0020  RET	1	R3
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: init
+********************************************************************/
+be_local_closure(Tasmota_init,   /* name */
+  be_nested_proto(
+    7,                          /* nstack */
+    1,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[15]) {     /* constants */
+    /* K0   */  be_nested_str(global),
+    /* K1   */  be_nested_str(ctypes_bytes_dyn),
+    /* K2   */  be_nested_str(_global_addr),
+    /* K3   */  be_nested_str(_global_def),
+    /* K4   */  be_nested_str(introspect),
+    /* K5   */  be_nested_str(_settings_ptr),
+    /* K6   */  be_nested_str(get),
+    /* K7   */  be_const_int(0),
+    /* K8   */  be_nested_str(settings),
+    /* K9   */  be_nested_str(toptr),
+    /* K10  */  be_nested_str(_settings_def),
+    /* K11  */  be_nested_str(wd),
+    /* K12  */  be_nested_str(),
+    /* K13  */  be_nested_str(_debug_present),
+    /* K14  */  be_nested_str(debug),
+    }),
+    &be_const_str_init,
+    &be_const_str_solidified,
+    ( &(const binstruction[36]) {  /* code */
+      0xB8060200,  //  0000  GETNGBL	R1	K1
+      0x88080102,  //  0001  GETMBR	R2	R0	K2
+      0x880C0103,  //  0002  GETMBR	R3	R0	K3
+      0x7C040400,  //  0003  CALL	R1	2
+      0x90020001,  //  0004  SETMBR	R0	K0	R1
+      0xA4060800,  //  0005  IMPORT	R1	K4
+      0x60080015,  //  0006  GETGBL	R2	G21
+      0x880C0105,  //  0007  GETMBR	R3	R0	K5
+      0x54120003,  //  0008  LDINT	R4	4
+      0x7C080400,  //  0009  CALL	R2	2
+      0x8C080506,  //  000A  GETMET	R2	R2	K6
+      0x58100007,  //  000B  LDCONST	R4	K7
+      0x54160003,  //  000C  LDINT	R5	4
+      0x7C080600,  //  000D  CALL	R2	3
+      0x780A0006,  //  000E  JMPF	R2	#0016
+      0xB80E0200,  //  000F  GETNGBL	R3	K1
+      0x8C100309,  //  0010  GETMET	R4	R1	K9
+      0x5C180400,  //  0011  MOVE	R6	R2
+      0x7C100400,  //  0012  CALL	R4	2
+      0x8814010A,  //  0013  GETMBR	R5	R0	K10
+      0x7C0C0400,  //  0014  CALL	R3	2
+      0x90021003,  //  0015  SETMBR	R0	K8	R3
+      0x9002170C,  //  0016  SETMBR	R0	K11	K12
+      0x500C0000,  //  0017  LDBOOL	R3	0	0
+      0x90021A03,  //  0018  SETMBR	R0	K13	R3
+      0xA8020004,  //  0019  EXBLK	0	#001F
+      0xA40E1C00,  //  001A  IMPORT	R3	K14
+      0x50100200,  //  001B  LDBOOL	R4	1	0
+      0x90021A04,  //  001C  SETMBR	R0	K13	R4
+      0xA8040001,  //  001D  EXBLK	1	1
+      0x70020003,  //  001E  JMP		#0023
+      0xAC0C0000,  //  001F  CATCH	R3	0	0
+      0x70020000,  //  0020  JMP		#0022
+      0x70020000,  //  0021  JMP		#0023
+      0xB0080000,  //  0022  RAISE	2	R0	R0
+      0x80000000,  //  0023  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: time_str
+********************************************************************/
+be_local_closure(Tasmota_time_str,   /* name */
+  be_nested_proto(
+    13,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[10]) {     /* constants */
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(time_dump),
+    /* K2   */  be_nested_str(format),
+    /* K3   */  be_nested_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d),
+    /* K4   */  be_nested_str(year),
+    /* K5   */  be_nested_str(month),
+    /* K6   */  be_nested_str(day),
+    /* K7   */  be_nested_str(hour),
+    /* K8   */  be_nested_str(min),
+    /* K9   */  be_nested_str(sec),
+    }),
+    &be_const_str_time_str,
+    &be_const_str_solidified,
+    ( &(const binstruction[14]) {  /* code */
+      0xA40A0000,  //  0000  IMPORT	R2	K0
+      0x8C0C0101,  //  0001  GETMET	R3	R0	K1
+      0x5C140200,  //  0002  MOVE	R5	R1
+      0x7C0C0400,  //  0003  CALL	R3	2
+      0x8C100502,  //  0004  GETMET	R4	R2	K2
+      0x58180003,  //  0005  LDCONST	R6	K3
+      0x941C0704,  //  0006  GETIDX	R7	R3	K4
+      0x94200705,  //  0007  GETIDX	R8	R3	K5
+      0x94240706,  //  0008  GETIDX	R9	R3	K6
+      0x94280707,  //  0009  GETIDX	R10	R3	K7
+      0x942C0708,  //  000A  GETIDX	R11	R3	K8
+      0x94300709,  //  000B  GETIDX	R12	R3	K9
+      0x7C101000,  //  000C  CALL	R4	8
+      0x80040800,  //  000D  RET	1	R4
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: remove_rule
+********************************************************************/
+be_local_closure(Tasmota_remove_rule,   /* name */
+  be_nested_proto(
+    6,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_nested_str(_rules),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(k),
+    /* K3   */  be_nested_str(remove),
+    /* K4   */  be_const_int(1),
+    }),
+    &be_const_str_remove_rule,
+    &be_const_str_solidified,
+    ( &(const binstruction[21]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x780A0011,  //  0001  JMPF	R2	#0014
+      0x58080001,  //  0002  LDCONST	R2	K1
+      0x600C000C,  //  0003  GETGBL	R3	G12
+      0x88100100,  //  0004  GETMBR	R4	R0	K0
+      0x7C0C0200,  //  0005  CALL	R3	1
+      0x140C0403,  //  0006  LT	R3	R2	R3
+      0x780E000B,  //  0007  JMPF	R3	#0014
+      0x880C0100,  //  0008  GETMBR	R3	R0	K0
+      0x940C0602,  //  0009  GETIDX	R3	R3	R2
+      0x880C0702,  //  000A  GETMBR	R3	R3	K2
+      0x1C0C0601,  //  000B  EQ	R3	R3	R1
+      0x780E0004,  //  000C  JMPF	R3	#0012
+      0x880C0100,  //  000D  GETMBR	R3	R0	K0
+      0x8C0C0703,  //  000E  GETMET	R3	R3	K3
+      0x5C140400,  //  000F  MOVE	R5	R2
+      0x7C0C0400,  //  0010  CALL	R3	2
+      0x70020000,  //  0011  JMP		#0013
+      0x00080504,  //  0012  ADD	R2	R2	K4
+      0x7001FFEE,  //  0013  JMP		#0003
+      0x80000000,  //  0014  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: load
+********************************************************************/
+be_local_closure(Tasmota_load,   /* name */
+  be_nested_proto(
+    21,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    1,                          /* has sup protos */
+    ( &(const struct bproto*[ 2]) {
+      be_nested_proto(
+        6,                          /* nstack */
+        1,                          /* argc */
+        0,                          /* varg */
+        0,                          /* has upvals */
+        NULL,                       /* no upvals */
+        0,                          /* has sup protos */
+        NULL,                       /* no sub protos */
+        1,                          /* has constants */
+        ( &(const bvalue[ 4]) {     /* constants */
+        /* K0   */  be_nested_str(sys),
+        /* K1   */  be_nested_str(path),
+        /* K2   */  be_nested_str(find),
+        /* K3   */  be_nested_str(push),
+        }),
+        &be_const_str_push_path,
+        &be_const_str_solidified,
+        ( &(const binstruction[13]) {  /* code */
+          0xA4060000,  //  0000  IMPORT	R1	K0
+          0x8C080301,  //  0001  GETMET	R2	R1	K1
+          0x7C080200,  //  0002  CALL	R2	1
+          0x8C0C0502,  //  0003  GETMET	R3	R2	K2
+          0x5C140000,  //  0004  MOVE	R5	R0
+          0x7C0C0400,  //  0005  CALL	R3	2
+          0x4C100000,  //  0006  LDNIL	R4
+          0x1C0C0604,  //  0007  EQ	R3	R3	R4
+          0x780E0002,  //  0008  JMPF	R3	#000C
+          0x8C0C0503,  //  0009  GETMET	R3	R2	K3
+          0x5C140000,  //  000A  MOVE	R5	R0
+          0x7C0C0400,  //  000B  CALL	R3	2
+          0x80000000,  //  000C  RET	0
+        })
+      ),
+      be_nested_proto(
+        7,                          /* nstack */
+        1,                          /* argc */
+        0,                          /* varg */
+        0,                          /* has upvals */
+        NULL,                       /* no upvals */
+        0,                          /* has sup protos */
+        NULL,                       /* no sub protos */
+        1,                          /* has constants */
+        ( &(const bvalue[ 4]) {     /* constants */
+        /* K0   */  be_nested_str(sys),
+        /* K1   */  be_nested_str(path),
+        /* K2   */  be_nested_str(find),
+        /* K3   */  be_nested_str(remove),
+        }),
+        &be_const_str_pop_path,
+        &be_const_str_solidified,
+        ( &(const binstruction[13]) {  /* code */
+          0xA4060000,  //  0000  IMPORT	R1	K0
+          0x8C080301,  //  0001  GETMET	R2	R1	K1
+          0x7C080200,  //  0002  CALL	R2	1
+          0x8C0C0502,  //  0003  GETMET	R3	R2	K2
+          0x5C140000,  //  0004  MOVE	R5	R0
+          0x7C0C0400,  //  0005  CALL	R3	2
+          0x4C100000,  //  0006  LDNIL	R4
+          0x20100604,  //  0007  NE	R4	R3	R4
+          0x78120002,  //  0008  JMPF	R4	#000C
+          0x8C100503,  //  0009  GETMET	R4	R2	K3
+          0x5C180600,  //  000A  MOVE	R6	R3
+          0x7C100400,  //  000B  CALL	R4	2
+          0x80000000,  //  000C  RET	0
+        })
+      ),
+    }),
+    1,                          /* has constants */
+    ( &(const bvalue[21]) {     /* constants */
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(path),
+    /* K2   */  be_const_int(0),
+    /* K3   */  be_nested_str(_X2F),
+    /* K4   */  be_nested_str(split),
+    /* K5   */  be_nested_str(_X23),
+    /* K6   */  be_const_int(1),
+    /* K7   */  be_nested_str(find),
+    /* K8   */  be_nested_str(_X2E),
+    /* K9   */  be_nested_str(_X2Ebe),
+    /* K10  */  be_nested_str(_X2Ebec),
+    /* K11  */  be_nested_str(io_error),
+    /* K12  */  be_nested_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27),
+    /* K13  */  be_nested_str(last_modified),
+    /* K14  */  be_nested_str(c),
+    /* K15  */  be_nested_str(wd),
+    /* K16  */  be_nested_str(),
+    /* K17  */  be_nested_str(file),
+    /* K18  */  be_nested_str(save),
+    /* K19  */  be_nested_str(format),
+    /* K20  */  be_nested_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29),
+    }),
+    &be_const_str_load,
+    &be_const_str_solidified,
+    ( &(const binstruction[121]) {  /* code */
+      0x84080000,  //  0000  CLOSURE	R2	P0
+      0x840C0001,  //  0001  CLOSURE	R3	P1
+      0xA4120000,  //  0002  IMPORT	R4	K0
+      0xA4160200,  //  0003  IMPORT	R5	K1
+      0x6018000C,  //  0004  GETGBL	R6	G12
+      0x5C1C0200,  //  0005  MOVE	R7	R1
+      0x7C180200,  //  0006  CALL	R6	1
+      0x1C180D02,  //  0007  EQ	R6	R6	K2
+      0x781A0001,  //  0008  JMPF	R6	#000B
+      0x50180000,  //  0009  LDBOOL	R6	0	0
+      0x80040C00,  //  000A  RET	1	R6
+      0x94180302,  //  000B  GETIDX	R6	R1	K2
+      0x20180D03,  //  000C  NE	R6	R6	K3
+      0x781A0000,  //  000D  JMPF	R6	#000F
+      0x00060601,  //  000E  ADD	R1	K3	R1
+      0x8C180904,  //  000F  GETMET	R6	R4	K4
+      0x5C200200,  //  0010  MOVE	R8	R1
+      0x58240005,  //  0011  LDCONST	R9	K5
+      0x7C180600,  //  0012  CALL	R6	3
+      0x941C0D02,  //  0013  GETIDX	R7	R6	K2
+      0x5421FFFE,  //  0014  LDINT	R8	-1
+      0x94200C08,  //  0015  GETIDX	R8	R6	R8
+      0x6024000C,  //  0016  GETGBL	R9	G12
+      0x5C280C00,  //  0017  MOVE	R10	R6
+      0x7C240200,  //  0018  CALL	R9	1
+      0x24241306,  //  0019  GT	R9	R9	K6
+      0x8C280907,  //  001A  GETMET	R10	R4	K7
+      0x5C301000,  //  001B  MOVE	R12	R8
+      0x58340008,  //  001C  LDCONST	R13	K8
+      0x7C280600,  //  001D  CALL	R10	3
+      0x14281502,  //  001E  LT	R10	R10	K2
+      0x782A0001,  //  001F  JMPF	R10	#0022
+      0x00040309,  //  0020  ADD	R1	R1	K9
+      0x00201109,  //  0021  ADD	R8	R8	K9
+      0x5429FFFC,  //  0022  LDINT	R10	-3
+      0x542DFFFE,  //  0023  LDINT	R11	-1
+      0x4028140B,  //  0024  CONNECT	R10	R10	R11
+      0x9428100A,  //  0025  GETIDX	R10	R8	R10
+      0x1C281509,  //  0026  EQ	R10	R10	K9
+      0x542DFFFB,  //  0027  LDINT	R11	-4
+      0x5431FFFE,  //  0028  LDINT	R12	-1
+      0x402C160C,  //  0029  CONNECT	R11	R11	R12
+      0x942C100B,  //  002A  GETIDX	R11	R8	R11
+      0x1C2C170A,  //  002B  EQ	R11	R11	K10
+      0x5C301400,  //  002C  MOVE	R12	R10
+      0x74320002,  //  002D  JMPT	R12	#0031
+      0x5C301600,  //  002E  MOVE	R12	R11
+      0x74320000,  //  002F  JMPT	R12	#0031
+      0xB006170C,  //  0030  RAISE	1	K11	K12
+      0x8C300B0D,  //  0031  GETMET	R12	R5	K13
+      0x5C380E00,  //  0032  MOVE	R14	R7
+      0x7C300400,  //  0033  CALL	R12	2
+      0x782E0005,  //  0034  JMPF	R11	#003B
+      0x4C340000,  //  0035  LDNIL	R13
+      0x1C34180D,  //  0036  EQ	R13	R12	R13
+      0x78360001,  //  0037  JMPF	R13	#003A
+      0x50340000,  //  0038  LDBOOL	R13	0	0
+      0x80041A00,  //  0039  RET	1	R13
+      0x70020013,  //  003A  JMP		#004F
+      0x8C340B0D,  //  003B  GETMET	R13	R5	K13
+      0x003C030E,  //  003C  ADD	R15	R1	K14
+      0x7C340400,  //  003D  CALL	R13	2
+      0x4C380000,  //  003E  LDNIL	R14
+      0x1C38180E,  //  003F  EQ	R14	R12	R14
+      0x783A0004,  //  0040  JMPF	R14	#0046
+      0x4C380000,  //  0041  LDNIL	R14
+      0x1C381A0E,  //  0042  EQ	R14	R13	R14
+      0x783A0001,  //  0043  JMPF	R14	#0046
+      0x50380000,  //  0044  LDBOOL	R14	0	0
+      0x80041C00,  //  0045  RET	1	R14
+      0x4C380000,  //  0046  LDNIL	R14
+      0x20381A0E,  //  0047  NE	R14	R13	R14
+      0x783A0005,  //  0048  JMPF	R14	#004F
+      0x4C380000,  //  0049  LDNIL	R14
+      0x1C38180E,  //  004A  EQ	R14	R12	R14
+      0x743A0001,  //  004B  JMPT	R14	#004E
+      0x28381A0C,  //  004C  GE	R14	R13	R12
+      0x783A0000,  //  004D  JMPF	R14	#004F
+      0x502C0200,  //  004E  LDBOOL	R11	1	0
+      0x78260005,  //  004F  JMPF	R9	#0056
+      0x00340F05,  //  0050  ADD	R13	R7	K5
+      0x90021E0D,  //  0051  SETMBR	R0	K15	R13
+      0x5C340400,  //  0052  MOVE	R13	R2
+      0x8838010F,  //  0053  GETMBR	R14	R0	K15
+      0x7C340200,  //  0054  CALL	R13	1
+      0x70020000,  //  0055  JMP		#0057
+      0x90021F10,  //  0056  SETMBR	R0	K15	K16
+      0x6034000D,  //  0057  GETGBL	R13	G13
+      0x5C380200,  //  0058  MOVE	R14	R1
+      0x583C0011,  //  0059  LDCONST	R15	K17
+      0x7C340400,  //  005A  CALL	R13	2
+      0x5C381600,  //  005B  MOVE	R14	R11
+      0x743A0013,  //  005C  JMPT	R14	#0071
+      0x5C381200,  //  005D  MOVE	R14	R9
+      0x743A0011,  //  005E  JMPT	R14	#0071
+      0xA8020005,  //  005F  EXBLK	0	#0066
+      0x8C380112,  //  0060  GETMET	R14	R0	K18
+      0x0040030E,  //  0061  ADD	R16	R1	K14
+      0x5C441A00,  //  0062  MOVE	R17	R13
+      0x7C380600,  //  0063  CALL	R14	3
+      0xA8040001,  //  0064  EXBLK	1	1
+      0x7002000A,  //  0065  JMP		#0071
+      0xAC380001,  //  0066  CATCH	R14	0	1
+      0x70020007,  //  0067  JMP		#0070
+      0x603C0001,  //  0068  GETGBL	R15	G1
+      0x8C400913,  //  0069  GETMET	R16	R4	K19
+      0x58480014,  //  006A  LDCONST	R18	K20
+      0x004C030E,  //  006B  ADD	R19	R1	K14
+      0x5C501C00,  //  006C  MOVE	R20	R14
+      0x7C400800,  //  006D  CALL	R16	4
+      0x7C3C0200,  //  006E  CALL	R15	1
+      0x70020000,  //  006F  JMP		#0071
+      0xB0080000,  //  0070  RAISE	2	R0	R0
+      0x5C381A00,  //  0071  MOVE	R14	R13
+      0x7C380000,  //  0072  CALL	R14	0
+      0x78260002,  //  0073  JMPF	R9	#0077
+      0x5C380600,  //  0074  MOVE	R14	R3
+      0x003C0F05,  //  0075  ADD	R15	R7	K5
+      0x7C380200,  //  0076  CALL	R14	1
+      0x50380200,  //  0077  LDBOOL	R14	1	0
+      0x80041C00,  //  0078  RET	1	R14
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: chars_in_string
+********************************************************************/
+be_local_closure(Tasmota_chars_in_string,   /* name */
+  be_nested_proto(
+    10,                          /* nstack */
+    4,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_const_int(0),
+    /* K1   */  be_const_int(1),
+    }),
+    &be_const_str_chars_in_string,
+    &be_const_str_solidified,
+    ( &(const binstruction[31]) {  /* code */
+      0x780E0001,  //  0000  JMPF	R3	#0003
+      0x50100200,  //  0001  LDBOOL	R4	1	0
+      0x70020000,  //  0002  JMP		#0004
+      0x50100000,  //  0003  LDBOOL	R4	0	0
+      0x58140000,  //  0004  LDCONST	R5	K0
+      0x6018000C,  //  0005  GETGBL	R6	G12
+      0x5C1C0200,  //  0006  MOVE	R7	R1
+      0x7C180200,  //  0007  CALL	R6	1
+      0x14180A06,  //  0008  LT	R6	R5	R6
+      0x781A0012,  //  0009  JMPF	R6	#001D
+      0x50180000,  //  000A  LDBOOL	R6	0	0
+      0x581C0000,  //  000B  LDCONST	R7	K0
+      0x6020000C,  //  000C  GETGBL	R8	G12
+      0x5C240400,  //  000D  MOVE	R9	R2
+      0x7C200200,  //  000E  CALL	R8	1
+      0x14200E08,  //  000F  LT	R8	R7	R8
+      0x78220006,  //  0010  JMPF	R8	#0018
+      0x94200205,  //  0011  GETIDX	R8	R1	R5
+      0x94240407,  //  0012  GETIDX	R9	R2	R7
+      0x1C201009,  //  0013  EQ	R8	R8	R9
+      0x78220000,  //  0014  JMPF	R8	#0016
+      0x50180200,  //  0015  LDBOOL	R6	1	0
+      0x001C0F01,  //  0016  ADD	R7	R7	K1
+      0x7001FFF3,  //  0017  JMP		#000C
+      0x20200806,  //  0018  NE	R8	R4	R6
+      0x78220000,  //  0019  JMPF	R8	#001B
+      0x80040A00,  //  001A  RET	1	R5
+      0x00140B01,  //  001B  ADD	R5	R5	K1
+      0x7001FFE7,  //  001C  JMP		#0005
+      0x5419FFFE,  //  001D  LDINT	R6	-1
+      0x80040C00,  //  001E  RET	1	R6
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: cmd
+********************************************************************/
+be_local_closure(Tasmota_cmd,   /* name */
   be_nested_proto(
     5,                          /* nstack */
     2,                          /* argc */
@@ -1805,19 +1402,26 @@ be_local_closure(remove_cmd,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 2]) {     /* constants */
-    /* K0   */  be_nested_string("_ccmd", -2131545883, 5),
-    /* K1   */  be_nested_string("remove", -611183107, 6),
+    /* K0   */  be_nested_str(cmd_res),
+    /* K1   */  be_nested_str(_cmd),
     }),
-    (be_nested_const_str("remove_cmd", -462651594, 10)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[ 7]) {  /* code */
-      0x88080100,  //  0000  GETMBR R2  R0  K0
-      0x780A0003,  //  0001  JMPF R2  #0006
-      0x88080100,  //  0002  GETMBR R2  R0  K0
-      0x8C080501,  //  0003  GETMET R2  R2  K1
-      0x5C100200,  //  0004  MOVE R4  R1
-      0x7C080400,  //  0005  CALL R2  2
-      0x80000000,  //  0006  RET  0
+    &be_const_str_cmd,
+    &be_const_str_solidified,
+    ( &(const binstruction[14]) {  /* code */
+      0x50080200,  //  0000  LDBOOL	R2	1	0
+      0x90020002,  //  0001  SETMBR	R0	K0	R2
+      0x8C080101,  //  0002  GETMET	R2	R0	K1
+      0x5C100200,  //  0003  MOVE	R4	R1
+      0x7C080400,  //  0004  CALL	R2	2
+      0x4C080000,  //  0005  LDNIL	R2
+      0x880C0100,  //  0006  GETMBR	R3	R0	K0
+      0x50100200,  //  0007  LDBOOL	R4	1	0
+      0x200C0604,  //  0008  NE	R3	R3	R4
+      0x780E0000,  //  0009  JMPF	R3	#000B
+      0x88080100,  //  000A  GETMBR	R2	R0	K0
+      0x4C0C0000,  //  000B  LDNIL	R3
+      0x90020003,  //  000C  SETMBR	R0	K0	R3
+      0x80040400,  //  000D  RET	1	R2
     })
   )
 );
@@ -1825,64 +1429,233 @@ be_local_closure(remove_cmd,   /* name */
 
 
 /********************************************************************
-** Solidified function: exec_cmd
+** Solidified function: add_cmd
 ********************************************************************/
-be_local_closure(exec_cmd,   /* name */
+be_local_closure(Tasmota_add_cmd,   /* name */
   be_nested_proto(
-    12,                          /* nstack */
-    4,                          /* argc */
+    5,                          /* nstack */
+    3,                          /* argc */
     0,                          /* varg */
     0,                          /* has upvals */
     NULL,                       /* no upvals */
     0,                          /* has sup protos */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
-    ( &(const bvalue[ 5]) {     /* constants */
-    /* K0   */  be_nested_string("_ccmd", -2131545883, 5),
-    /* K1   */  be_nested_string("json", 916562499, 4),
-    /* K2   */  be_nested_string("load", -435725847, 4),
-    /* K3   */  be_nested_string("find_key_i", 850136726, 10),
-    /* K4   */  be_nested_string("resolvecmnd", 993361485, 11),
+    ( &(const bvalue[ 4]) {     /* constants */
+    /* K0   */  be_nested_str(_ccmd),
+    /* K1   */  be_nested_str(function),
+    /* K2   */  be_nested_str(value_error),
+    /* K3   */  be_nested_str(the_X20second_X20argument_X20is_X20not_X20a_X20function),
     }),
-    (be_nested_const_str("exec_cmd", 493567399, 8)),
-    ((bstring*) &be_const_str_input),
-    ( &(const binstruction[27]) {  /* code */
-      0x88100100,  //  0000  GETMBR R4  R0  K0
-      0x78120016,  //  0001  JMPF R4  #0019
-      0xA4120200,  //  0002  IMPORT R4  K1
-      0x8C140902,  //  0003  GETMET R5  R4  K2
-      0x5C1C0600,  //  0004  MOVE R7  R3
-      0x7C140400,  //  0005  CALL R5  2
-      0x8C180103,  //  0006  GETMET R6  R0  K3
-      0x88200100,  //  0007  GETMBR R8  R0  K0
-      0x5C240200,  //  0008  MOVE R9  R1
-      0x7C180600,  //  0009  CALL R6  3
-      0x4C1C0000,  //  000A  LDNIL  R7
-      0x201C0C07,  //  000B  NE R7  R6  R7
-      0x781E000B,  //  000C  JMPF R7  #0019
-      0x8C1C0104,  //  000D  GETMET R7  R0  K4
-      0x5C240C00,  //  000E  MOVE R9  R6
-      0x7C1C0400,  //  000F  CALL R7  2
-      0x881C0100,  //  0010  GETMBR R7  R0  K0
-      0x941C0E06,  //  0011  GETIDX R7  R7  R6
-      0x5C200C00,  //  0012  MOVE R8  R6
-      0x5C240400,  //  0013  MOVE R9  R2
-      0x5C280600,  //  0014  MOVE R10 R3
-      0x5C2C0A00,  //  0015  MOVE R11 R5
-      0x7C1C0800,  //  0016  CALL R7  4
-      0x501C0200,  //  0017  LDBOOL R7  1 0
-      0x80040E00,  //  0018  RET  1 R7
-      0x50100000,  //  0019  LDBOOL R4  0 0
-      0x80040800,  //  001A  RET  1 R4
+    &be_const_str_add_cmd,
+    &be_const_str_solidified,
+    ( &(const binstruction[15]) {  /* code */
+      0x880C0100,  //  0000  GETMBR	R3	R0	K0
+      0x740E0002,  //  0001  JMPT	R3	#0005
+      0x600C0013,  //  0002  GETGBL	R3	G19
+      0x7C0C0000,  //  0003  CALL	R3	0
+      0x90020003,  //  0004  SETMBR	R0	K0	R3
+      0x600C0004,  //  0005  GETGBL	R3	G4
+      0x5C100400,  //  0006  MOVE	R4	R2
+      0x7C0C0200,  //  0007  CALL	R3	1
+      0x1C0C0701,  //  0008  EQ	R3	R3	K1
+      0x780E0002,  //  0009  JMPF	R3	#000D
+      0x880C0100,  //  000A  GETMBR	R3	R0	K0
+      0x980C0202,  //  000B  SETIDX	R3	R1	R2
+      0x70020000,  //  000C  JMP		#000E
+      0xB0060503,  //  000D  RAISE	1	K2	K3
+      0x80000000,  //  000E  RET	0
     })
   )
 );
 /*******************************************************************/
 
+
+/********************************************************************
+** Solidified function: add_rule
+********************************************************************/
+be_local_closure(Tasmota_add_rule,   /* name */
+  be_nested_proto(
+    9,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 6]) {     /* constants */
+    /* K0   */  be_nested_str(_rules),
+    /* K1   */  be_nested_str(function),
+    /* K2   */  be_nested_str(push),
+    /* K3   */  be_nested_str(kv),
+    /* K4   */  be_nested_str(value_error),
+    /* K5   */  be_nested_str(the_X20second_X20argument_X20is_X20not_X20a_X20function),
+    }),
+    &be_const_str_add_rule,
+    &be_const_str_solidified,
+    ( &(const binstruction[20]) {  /* code */
+      0x880C0100,  //  0000  GETMBR	R3	R0	K0
+      0x740E0002,  //  0001  JMPT	R3	#0005
+      0x600C0012,  //  0002  GETGBL	R3	G18
+      0x7C0C0000,  //  0003  CALL	R3	0
+      0x90020003,  //  0004  SETMBR	R0	K0	R3
+      0x600C0004,  //  0005  GETGBL	R3	G4
+      0x5C100400,  //  0006  MOVE	R4	R2
+      0x7C0C0200,  //  0007  CALL	R3	1
+      0x1C0C0701,  //  0008  EQ	R3	R3	K1
+      0x780E0007,  //  0009  JMPF	R3	#0012
+      0x880C0100,  //  000A  GETMBR	R3	R0	K0
+      0x8C0C0702,  //  000B  GETMET	R3	R3	K2
+      0x8C140103,  //  000C  GETMET	R5	R0	K3
+      0x5C1C0200,  //  000D  MOVE	R7	R1
+      0x5C200400,  //  000E  MOVE	R8	R2
+      0x7C140600,  //  000F  CALL	R5	3
+      0x7C0C0400,  //  0010  CALL	R3	2
+      0x70020000,  //  0011  JMP		#0013
+      0xB0060905,  //  0012  RAISE	1	K4	K5
+      0x80000000,  //  0013  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: exec_rules
+********************************************************************/
+be_local_closure(Tasmota_exec_rules,   /* name */
+  be_nested_proto(
+    12,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[12]) {     /* constants */
+    /* K0   */  be_nested_str(_rules),
+    /* K1   */  be_nested_str(cmd_res),
+    /* K2   */  be_nested_str(json),
+    /* K3   */  be_nested_str(load),
+    /* K4   */  be_nested_str(log),
+    /* K5   */  be_nested_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20),
+    /* K6   */  be_const_int(3),
+    /* K7   */  be_const_int(0),
+    /* K8   */  be_nested_str(try_rule),
+    /* K9   */  be_nested_str(k),
+    /* K10  */  be_nested_str(v),
+    /* K11  */  be_const_int(1),
+    }),
+    &be_const_str_exec_rules,
+    &be_const_str_solidified,
+    ( &(const binstruction[48]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x740A0003,  //  0001  JMPT	R2	#0006
+      0x88080101,  //  0002  GETMBR	R2	R0	K1
+      0x4C0C0000,  //  0003  LDNIL	R3
+      0x20080403,  //  0004  NE	R2	R2	R3
+      0x780A0027,  //  0005  JMPF	R2	#002E
+      0xA40A0400,  //  0006  IMPORT	R2	K2
+      0x8C0C0503,  //  0007  GETMET	R3	R2	K3
+      0x5C140200,  //  0008  MOVE	R5	R1
+      0x7C0C0400,  //  0009  CALL	R3	2
+      0x50100000,  //  000A  LDBOOL	R4	0	0
+      0x4C140000,  //  000B  LDNIL	R5
+      0x1C140605,  //  000C  EQ	R5	R3	R5
+      0x78160004,  //  000D  JMPF	R5	#0013
+      0x8C140104,  //  000E  GETMET	R5	R0	K4
+      0x001E0A01,  //  000F  ADD	R7	K5	R1
+      0x58200006,  //  0010  LDCONST	R8	K6
+      0x7C140600,  //  0011  CALL	R5	3
+      0x5C0C0200,  //  0012  MOVE	R3	R1
+      0x88140101,  //  0013  GETMBR	R5	R0	K1
+      0x4C180000,  //  0014  LDNIL	R6
+      0x20140A06,  //  0015  NE	R5	R5	R6
+      0x78160000,  //  0016  JMPF	R5	#0018
+      0x90020203,  //  0017  SETMBR	R0	K1	R3
+      0x88140100,  //  0018  GETMBR	R5	R0	K0
+      0x78160012,  //  0019  JMPF	R5	#002D
+      0x58140007,  //  001A  LDCONST	R5	K7
+      0x6018000C,  //  001B  GETGBL	R6	G12
+      0x881C0100,  //  001C  GETMBR	R7	R0	K0
+      0x7C180200,  //  001D  CALL	R6	1
+      0x14180A06,  //  001E  LT	R6	R5	R6
+      0x781A000C,  //  001F  JMPF	R6	#002D
+      0x88180100,  //  0020  GETMBR	R6	R0	K0
+      0x94180C05,  //  0021  GETIDX	R6	R6	R5
+      0x8C1C0108,  //  0022  GETMET	R7	R0	K8
+      0x5C240600,  //  0023  MOVE	R9	R3
+      0x88280D09,  //  0024  GETMBR	R10	R6	K9
+      0x882C0D0A,  //  0025  GETMBR	R11	R6	K10
+      0x7C1C0800,  //  0026  CALL	R7	4
+      0x741E0001,  //  0027  JMPT	R7	#002A
+      0x74120000,  //  0028  JMPT	R4	#002A
+      0x50100001,  //  0029  LDBOOL	R4	0	1
+      0x50100200,  //  002A  LDBOOL	R4	1	0
+      0x00140B0B,  //  002B  ADD	R5	R5	K11
+      0x7001FFED,  //  002C  JMP		#001B
+      0x80040800,  //  002D  RET	1	R4
+      0x50080000,  //  002E  LDBOOL	R2	0	0
+      0x80040400,  //  002F  RET	1	R2
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: cb_dispatch
+********************************************************************/
+be_local_closure(Tasmota_cb_dispatch,   /* name */
+  be_nested_proto(
+    12,                          /* nstack */
+    6,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(_cb),
+    /* K1   */  be_const_int(0),
+    /* K2   */  be_nested_str(find),
+    }),
+    &be_const_str_cb_dispatch,
+    &be_const_str_solidified,
+    ( &(const binstruction[20]) {  /* code */
+      0x88180100,  //  0000  GETMBR	R6	R0	K0
+      0x4C1C0000,  //  0001  LDNIL	R7
+      0x1C180C07,  //  0002  EQ	R6	R6	R7
+      0x781A0000,  //  0003  JMPF	R6	#0005
+      0x80060200,  //  0004  RET	1	K1
+      0x88180100,  //  0005  GETMBR	R6	R0	K0
+      0x8C180D02,  //  0006  GETMET	R6	R6	K2
+      0x5C200200,  //  0007  MOVE	R8	R1
+      0x7C180400,  //  0008  CALL	R6	2
+      0x4C1C0000,  //  0009  LDNIL	R7
+      0x201C0C07,  //  000A  NE	R7	R6	R7
+      0x781E0006,  //  000B  JMPF	R7	#0013
+      0x5C1C0C00,  //  000C  MOVE	R7	R6
+      0x5C200400,  //  000D  MOVE	R8	R2
+      0x5C240600,  //  000E  MOVE	R9	R3
+      0x5C280800,  //  000F  MOVE	R10	R4
+      0x5C2C0A00,  //  0010  MOVE	R11	R5
+      0x7C1C0800,  //  0011  CALL	R7	4
+      0x80040E00,  //  0012  RET	1	R7
+      0x80060200,  //  0013  RET	1	K1
+    })
+  )
+);
+/*******************************************************************/
+
+
 /********************************************************************
 ** Solidified function: hs2rgb
 ********************************************************************/
-be_local_closure(hs2rgb,   /* name */
+be_local_closure(Tasmota_hs2rgb,   /* name */
   be_nested_proto(
     17,                          /* nstack */
     3,                          /* argc */
@@ -1894,14 +1667,14 @@ be_local_closure(hs2rgb,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
     /* K0   */  be_const_int(0),
-    /* K1   */  be_nested_string("tasmota", 424643812, 7),
-    /* K2   */  be_nested_string("scale_uint", -1204156202, 10),
+    /* K1   */  be_nested_str(tasmota),
+    /* K2   */  be_nested_str(scale_uint),
     /* K3   */  be_const_int(1),
     /* K4   */  be_const_int(2),
     /* K5   */  be_const_int(3),
     }),
-    (be_nested_const_str("hs2rgb", 1040816349, 6)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_hs2rgb,
+    &be_const_str_solidified,
     ( &(const binstruction[68]) {  /* code */
       0x4C0C0000,  //  0000  LDNIL	R3
       0x1C0C0403,  //  0001  EQ	R3	R2	R3
@@ -1976,6 +1749,312 @@ be_local_closure(hs2rgb,   /* name */
 );
 /*******************************************************************/
 
+
+/********************************************************************
+** Solidified function: init
+********************************************************************/
+be_local_closure(KV_init,   /* name */
+  be_nested_proto(
+    3,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(k),
+    /* K1   */  be_nested_str(v),
+    }),
+    &be_const_str_init,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 3]) {  /* code */
+      0x90020001,  //  0000  SETMBR	R0	K0	R1
+      0x90020202,  //  0001  SETMBR	R0	K1	R2
+      0x80000000,  //  0002  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified class: KV
+********************************************************************/
+be_local_class(KV,
+    2,
+    NULL,
+    be_nested_map(3,
+    ( (struct bmapnode*) &(const bmapnode[]) {
+        { be_const_key(k, 2), be_const_var(0) },
+        { be_const_key(v, -1), be_const_var(1) },
+        { be_const_key(init, -1), be_const_closure(KV_init_closure) },
+    })),
+    be_str_literal("KV")
+);
+
+/********************************************************************
+** Solidified function: kv
+********************************************************************/
+be_local_closure(Tasmota_kv,   /* name */
+  be_nested_proto(
+    7,                          /* nstack */
+    3,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 1]) {     /* constants */
+    /* K0   */  be_const_class(be_class_KV),
+    }),
+    &be_const_str_kv,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 7]) {  /* code */
+      0x580C0000,  //  0000  LDCONST	R3	K0
+      0xB4000000,  //  0001  CLASS	K0
+      0x5C100600,  //  0002  MOVE	R4	R3
+      0x5C140200,  //  0003  MOVE	R5	R1
+      0x5C180400,  //  0004  MOVE	R6	R2
+      0x7C100400,  //  0005  CALL	R4	2
+      0x80040800,  //  0006  RET	1	R4
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: remove_cmd
+********************************************************************/
+be_local_closure(Tasmota_remove_cmd,   /* name */
+  be_nested_proto(
+    5,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 2]) {     /* constants */
+    /* K0   */  be_nested_str(_ccmd),
+    /* K1   */  be_nested_str(remove),
+    }),
+    &be_const_str_remove_cmd,
+    &be_const_str_solidified,
+    ( &(const binstruction[ 7]) {  /* code */
+      0x88080100,  //  0000  GETMBR	R2	R0	K0
+      0x780A0003,  //  0001  JMPF	R2	#0006
+      0x88080100,  //  0002  GETMBR	R2	R0	K0
+      0x8C080501,  //  0003  GETMET	R2	R2	K1
+      0x5C100200,  //  0004  MOVE	R4	R1
+      0x7C080400,  //  0005  CALL	R2	2
+      0x80000000,  //  0006  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: set_timer
+********************************************************************/
+be_local_closure(Tasmota_set_timer,   /* name */
+  be_nested_proto(
+    10,                          /* nstack */
+    4,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 4]) {     /* constants */
+    /* K0   */  be_nested_str(_timers),
+    /* K1   */  be_nested_str(push),
+    /* K2   */  be_nested_str(Timer),
+    /* K3   */  be_nested_str(millis),
+    }),
+    &be_const_str_set_timer,
+    &be_const_str_solidified,
+    ( &(const binstruction[16]) {  /* code */
+      0x88100100,  //  0000  GETMBR	R4	R0	K0
+      0x74120002,  //  0001  JMPT	R4	#0005
+      0x60100012,  //  0002  GETGBL	R4	G18
+      0x7C100000,  //  0003  CALL	R4	0
+      0x90020004,  //  0004  SETMBR	R0	K0	R4
+      0x88100100,  //  0005  GETMBR	R4	R0	K0
+      0x8C100901,  //  0006  GETMET	R4	R4	K1
+      0xB81A0400,  //  0007  GETNGBL	R6	K2
+      0x8C1C0103,  //  0008  GETMET	R7	R0	K3
+      0x5C240200,  //  0009  MOVE	R9	R1
+      0x7C1C0400,  //  000A  CALL	R7	2
+      0x5C200400,  //  000B  MOVE	R8	R2
+      0x5C240600,  //  000C  MOVE	R9	R3
+      0x7C180600,  //  000D  CALL	R6	3
+      0x7C100400,  //  000E  CALL	R4	2
+      0x80000000,  //  000F  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: remove_timer
+********************************************************************/
+be_local_closure(Tasmota_remove_timer,   /* name */
+  be_nested_proto(
+    6,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 7]) {     /* constants */
+    /* K0   */  be_nested_str(tasmota),
+    /* K1   */  be_nested_str(_timers),
+    /* K2   */  be_const_int(0),
+    /* K3   */  be_nested_str(size),
+    /* K4   */  be_nested_str(id),
+    /* K5   */  be_nested_str(remove),
+    /* K6   */  be_const_int(1),
+    }),
+    &be_const_str_remove_timer,
+    &be_const_str_solidified,
+    ( &(const binstruction[23]) {  /* code */
+      0xB80A0000,  //  0000  GETNGBL	R2	K0
+      0x88080501,  //  0001  GETMBR	R2	R2	K1
+      0x780A0012,  //  0002  JMPF	R2	#0016
+      0x58080002,  //  0003  LDCONST	R2	K2
+      0xB80E0000,  //  0004  GETNGBL	R3	K0
+      0x880C0701,  //  0005  GETMBR	R3	R3	K1
+      0x8C0C0703,  //  0006  GETMET	R3	R3	K3
+      0x7C0C0200,  //  0007  CALL	R3	1
+      0x140C0403,  //  0008  LT	R3	R2	R3
+      0x780E000B,  //  0009  JMPF	R3	#0016
+      0x880C0101,  //  000A  GETMBR	R3	R0	K1
+      0x940C0602,  //  000B  GETIDX	R3	R3	R2
+      0x880C0704,  //  000C  GETMBR	R3	R3	K4
+      0x1C0C0601,  //  000D  EQ	R3	R3	R1
+      0x780E0004,  //  000E  JMPF	R3	#0014
+      0x880C0101,  //  000F  GETMBR	R3	R0	K1
+      0x8C0C0705,  //  0010  GETMET	R3	R3	K5
+      0x5C140400,  //  0011  MOVE	R5	R2
+      0x7C0C0400,  //  0012  CALL	R3	2
+      0x70020000,  //  0013  JMP		#0015
+      0x00080506,  //  0014  ADD	R2	R2	K6
+      0x7001FFED,  //  0015  JMP		#0004
+      0x80000000,  //  0016  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: exec_cmd
+********************************************************************/
+be_local_closure(Tasmota_exec_cmd,   /* name */
+  be_nested_proto(
+    12,                          /* nstack */
+    4,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 5]) {     /* constants */
+    /* K0   */  be_nested_str(_ccmd),
+    /* K1   */  be_nested_str(json),
+    /* K2   */  be_nested_str(load),
+    /* K3   */  be_nested_str(find_key_i),
+    /* K4   */  be_nested_str(resolvecmnd),
+    }),
+    &be_const_str_exec_cmd,
+    &be_const_str_solidified,
+    ( &(const binstruction[27]) {  /* code */
+      0x88100100,  //  0000  GETMBR	R4	R0	K0
+      0x78120016,  //  0001  JMPF	R4	#0019
+      0xA4120200,  //  0002  IMPORT	R4	K1
+      0x8C140902,  //  0003  GETMET	R5	R4	K2
+      0x5C1C0600,  //  0004  MOVE	R7	R3
+      0x7C140400,  //  0005  CALL	R5	2
+      0x8C180103,  //  0006  GETMET	R6	R0	K3
+      0x88200100,  //  0007  GETMBR	R8	R0	K0
+      0x5C240200,  //  0008  MOVE	R9	R1
+      0x7C180600,  //  0009  CALL	R6	3
+      0x4C1C0000,  //  000A  LDNIL	R7
+      0x201C0C07,  //  000B  NE	R7	R6	R7
+      0x781E000B,  //  000C  JMPF	R7	#0019
+      0x8C1C0104,  //  000D  GETMET	R7	R0	K4
+      0x5C240C00,  //  000E  MOVE	R9	R6
+      0x7C1C0400,  //  000F  CALL	R7	2
+      0x881C0100,  //  0010  GETMBR	R7	R0	K0
+      0x941C0E06,  //  0011  GETIDX	R7	R7	R6
+      0x5C200C00,  //  0012  MOVE	R8	R6
+      0x5C240400,  //  0013  MOVE	R9	R2
+      0x5C280600,  //  0014  MOVE	R10	R3
+      0x5C2C0A00,  //  0015  MOVE	R11	R5
+      0x7C1C0800,  //  0016  CALL	R7	4
+      0x501C0200,  //  0017  LDBOOL	R7	1	0
+      0x80040E00,  //  0018  RET	1	R7
+      0x50100000,  //  0019  LDBOOL	R4	0	0
+      0x80040800,  //  001A  RET	1	R4
+    })
+  )
+);
+/*******************************************************************/
+
+
+/********************************************************************
+** Solidified function: get_light
+********************************************************************/
+be_local_closure(Tasmota_get_light,   /* name */
+  be_nested_proto(
+    6,                          /* nstack */
+    2,                          /* argc */
+    0,                          /* varg */
+    0,                          /* has upvals */
+    NULL,                       /* no upvals */
+    0,                          /* has sup protos */
+    NULL,                       /* no sub protos */
+    1,                          /* has constants */
+    ( &(const bvalue[ 3]) {     /* constants */
+    /* K0   */  be_nested_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29),
+    /* K1   */  be_nested_str(light),
+    /* K2   */  be_nested_str(get),
+    }),
+    &be_const_str_get_light,
+    &be_const_str_solidified,
+    ( &(const binstruction[16]) {  /* code */
+      0x60080001,  //  0000  GETGBL	R2	G1
+      0x580C0000,  //  0001  LDCONST	R3	K0
+      0x7C080200,  //  0002  CALL	R2	1
+      0xA40A0200,  //  0003  IMPORT	R2	K1
+      0x4C0C0000,  //  0004  LDNIL	R3
+      0x200C0203,  //  0005  NE	R3	R1	R3
+      0x780E0004,  //  0006  JMPF	R3	#000C
+      0x8C0C0502,  //  0007  GETMET	R3	R2	K2
+      0x5C140200,  //  0008  MOVE	R5	R1
+      0x7C0C0400,  //  0009  CALL	R3	2
+      0x80040600,  //  000A  RET	1	R3
+      0x70020002,  //  000B  JMP		#000F
+      0x8C0C0502,  //  000C  GETMET	R3	R2	K2
+      0x7C0C0200,  //  000D  CALL	R3	1
+      0x80040600,  //  000E  RET	1	R3
+      0x80000000,  //  000F  RET	0
+    })
+  )
+);
+/*******************************************************************/
+
 #include "../generate/be_fixed_be_class_tasmota.h"
 
 
@@ -2007,8 +2086,8 @@ class be_class_tasmota (scope: global, name: Tasmota) {
     _global_addr, comptr(&TasmotaGlobal)
     _settings_ptr, comptr(&Settings)
 
-    init, closure(init_closure)
-    kv, closure(kv_closure)
+    init, closure(Tasmota_init_closure)
+    kv, closure(Tasmota_kv_closure)
 
     get_free_heap, func(l_getFreeHeap)
     arch, func(l_arch)
@@ -2022,6 +2101,7 @@ class be_class_tasmota (scope: global, name: Tasmota) {
     rtc, func(l_rtc)
     time_dump, func(l_time_dump)
     strftime, func(l_strftime)
+    strptime, func(l_strptime)
     memory, func(l_memory)
     wifi, func(l_wifi)
     eth, func(l_eth)
@@ -2050,35 +2130,35 @@ class be_class_tasmota (scope: global, name: Tasmota) {
 
     i2c_enabled, func(l_i2cenabled)
 
-    cmd, closure(cmd_closure)
-    chars_in_string, closure(chars_in_string_closure)
-    find_key_i, closure(find_key_i_closure)
-    find_op, closure(find_op_closure)
-    add_rule, closure(add_rule_closure)
-    remove_rule, closure(remove_rule_closure)
-    try_rule, closure(try_rule_closure)
-    exec_rules, closure(exec_rules_closure)
-    exec_tele, closure(exec_tele_closure)
-    set_timer, closure(set_timer_closure)
-    run_deferred, closure(run_deferred_closure)
-    remove_timer, closure(remove_timer_closure)
-    add_cmd, closure(add_cmd_closure)
-    remove_cmd, closure(remove_cmd_closure)
-    exec_cmd, closure(exec_cmd_closure)
-    gc, closure(gc_closure)
-    event, closure(event_closure)
-    add_driver, closure(add_driver_closure)
-    remove_driver, closure(remove_driver_closure)
-    load, closure(load_closure)
-    wire_scan, closure(wire_scan_closure)
-    time_str, closure(time_str_closure)
+    cmd, closure(Tasmota_cmd_closure)
+    chars_in_string, closure(Tasmota_chars_in_string_closure)
+    find_key_i, closure(Tasmota_find_key_i_closure)
+    find_op, closure(Tasmota_find_op_closure)
+    add_rule, closure(Tasmota_add_rule_closure)
+    remove_rule, closure(Tasmota_remove_rule_closure)
+    try_rule, closure(Tasmota_try_rule_closure)
+    exec_rules, closure(Tasmota_exec_rules_closure)
+    exec_tele, closure(Tasmota_exec_tele_closure)
+    set_timer, closure(Tasmota_set_timer_closure)
+    run_deferred, closure(Tasmota_run_deferred_closure)
+    remove_timer, closure(Tasmota_remove_timer_closure)
+    add_cmd, closure(Tasmota_add_cmd_closure)
+    remove_cmd, closure(Tasmota_remove_cmd_closure)
+    exec_cmd, closure(Tasmota_exec_cmd_closure)
+    gc, closure(Tasmota_gc_closure)
+    event, closure(Tasmota_event_closure)
+    add_driver, closure(Tasmota_add_driver_closure)
+    remove_driver, closure(Tasmota_remove_driver_closure)
+    load, closure(Tasmota_load_closure)
+    wire_scan, closure(Tasmota_wire_scan_closure)
+    time_str, closure(Tasmota_time_str_closure)
 
-    hs2rgb, closure(hs2rgb_closure)
+    hs2rgb, closure(Tasmota_hs2rgb_closure)
 
-    cb_dispatch, closure(cb_dispatch_closure)
-    gen_cb, closure(gen_cb_closure)
+    cb_dispatch, closure(Tasmota_cb_dispatch_closure)
+    gen_cb, closure(Tasmota_gen_cb_closure)
 
-    get_light, closure(get_light_closure)
-    set_light, closure(set_light_closure)
+    get_light, closure(Tasmota_get_light_closure)
+    set_light, closure(Tasmota_set_light_closure)
 }
 @const_object_info_end */
diff --git a/lib/libesp32/Berry/default/be_tcpclient_lib.c b/lib/libesp32/Berry/default/be_tcpclient_lib.c
new file mode 100644
index 000000000..b39db458e
--- /dev/null
+++ b/lib/libesp32/Berry/default/be_tcpclient_lib.c
@@ -0,0 +1,48 @@
+/********************************************************************
+ * Webclient mapped to Arduino framework
+ * 
+ * To use: `d = webclient()`
+ * 
+ *******************************************************************/
+#include "be_constobj.h"
+
+#ifdef USE_WEBCLIENT
+
+extern int wc_tcp_init(bvm *vm);
+extern int wc_tcp_deinit(bvm *vm);
+
+extern int wc_tcp_connect(bvm *vm);
+extern int wc_tcp_connected(bvm *vm);
+extern int wc_tcp_close(bvm *vm);
+extern int wc_tcp_available(bvm *vm);
+
+extern int wc_tcp_write(bvm *vm);
+extern int wc_tcp_read(bvm *vm);
+extern int wc_tcp_readbytes(bvm *vm);
+
+#include "../generate/be_fixed_be_class_tcpclient.h"
+
+void be_load_tcpclient_lib(bvm *vm) {
+    be_pushntvclass(vm, &be_class_tcpclient);
+    be_setglobal(vm, "tcpclient");
+    be_pop(vm, 1);
+}
+/* @const_object_info_begin
+
+class be_class_tcpclient (scope: global, name: tcpclient) {
+    .w, var
+    init, func(wc_tcp_init)
+    deinit, func(wc_tcp_deinit)
+
+    connect, func(wc_tcp_connect)
+    connected, func(wc_tcp_connected)
+    close, func(wc_tcp_close)
+    available, func(wc_tcp_available)
+
+    write, func(wc_tcp_write)
+    read, func(wc_tcp_read)
+    readbytes, func(wc_tcp_readbytes)
+}
+@const_object_info_end */
+
+#endif // USE_WEBCLIENT
diff --git a/lib/libesp32/Berry/default/be_timer_class.c b/lib/libesp32/Berry/default/be_timer_class.c
index 2646fd6b2..6664e408e 100644
--- a/lib/libesp32/Berry/default/be_timer_class.c
+++ b/lib/libesp32/Berry/default/be_timer_class.c
@@ -8,7 +8,7 @@
 /********************************************************************
 ** Solidified function: tostring
 ********************************************************************/
-be_local_closure(tostring,   /* name */
+be_local_closure(Timer_tostring,   /* name */
   be_nested_proto(
     10,                          /* nstack */
     1,                          /* argc */
@@ -19,35 +19,35 @@ be_local_closure(tostring,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("string", 398550328, 6),
-    /* K1   */  be_nested_string("format", -1180859054, 6),
-    /* K2   */  be_nested_string("<instance: %s(%s, %s, %s)", 257363333, 25),
-    /* K3   */  be_nested_string("due", -399437003, 3),
-    /* K4   */  be_nested_string("f", -485742695, 1),
-    /* K5   */  be_nested_string("id", 926444256, 2),
+    /* K0   */  be_nested_str(string),
+    /* K1   */  be_nested_str(format),
+    /* K2   */  be_nested_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29),
+    /* K3   */  be_nested_str(due),
+    /* K4   */  be_nested_str(f),
+    /* K5   */  be_nested_str(id),
     }),
-    (be_nested_const_str("tostring", -1995258651, 8)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_tostring,
+    &be_const_str_solidified,
     ( &(const binstruction[19]) {  /* code */
-      0xA4060000,  //  0000  IMPORT R1  K0
-      0x8C080301,  //  0001  GETMET R2  R1  K1
-      0x58100002,  //  0002  LDCONST  R4  K2
-      0x60140008,  //  0003  GETGBL R5  G8
-      0x60180006,  //  0004  GETGBL R6  G6
-      0x5C1C0000,  //  0005  MOVE R7  R0
-      0x7C180200,  //  0006  CALL R6  1
-      0x7C140200,  //  0007  CALL R5  1
-      0x60180008,  //  0008  GETGBL R6  G8
-      0x881C0103,  //  0009  GETMBR R7  R0  K3
-      0x7C180200,  //  000A  CALL R6  1
-      0x601C0008,  //  000B  GETGBL R7  G8
-      0x88200104,  //  000C  GETMBR R8  R0  K4
-      0x7C1C0200,  //  000D  CALL R7  1
-      0x60200008,  //  000E  GETGBL R8  G8
-      0x88240105,  //  000F  GETMBR R9  R0  K5
-      0x7C200200,  //  0010  CALL R8  1
-      0x7C080C00,  //  0011  CALL R2  6
-      0x80040400,  //  0012  RET  1 R2
+      0xA4060000,  //  0000  IMPORT	R1	K0
+      0x8C080301,  //  0001  GETMET	R2	R1	K1
+      0x58100002,  //  0002  LDCONST	R4	K2
+      0x60140008,  //  0003  GETGBL	R5	G8
+      0x60180006,  //  0004  GETGBL	R6	G6
+      0x5C1C0000,  //  0005  MOVE	R7	R0
+      0x7C180200,  //  0006  CALL	R6	1
+      0x7C140200,  //  0007  CALL	R5	1
+      0x60180008,  //  0008  GETGBL	R6	G8
+      0x881C0103,  //  0009  GETMBR	R7	R0	K3
+      0x7C180200,  //  000A  CALL	R6	1
+      0x601C0008,  //  000B  GETGBL	R7	G8
+      0x88200104,  //  000C  GETMBR	R8	R0	K4
+      0x7C1C0200,  //  000D  CALL	R7	1
+      0x60200008,  //  000E  GETGBL	R8	G8
+      0x88240105,  //  000F  GETMBR	R9	R0	K5
+      0x7C200200,  //  0010  CALL	R8	1
+      0x7C080C00,  //  0011  CALL	R2	6
+      0x80040400,  //  0012  RET	1	R2
     })
   )
 );
@@ -57,7 +57,7 @@ be_local_closure(tostring,   /* name */
 /********************************************************************
 ** Solidified function: init
 ********************************************************************/
-be_local_closure(init,   /* name */
+be_local_closure(Timer_init,   /* name */
   be_nested_proto(
     4,                          /* nstack */
     4,                          /* argc */
@@ -68,17 +68,17 @@ be_local_closure(init,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("due", -399437003, 3),
-    /* K1   */  be_nested_string("f", -485742695, 1),
-    /* K2   */  be_nested_string("id", 926444256, 2),
+    /* K0   */  be_nested_str(due),
+    /* K1   */  be_nested_str(f),
+    /* K2   */  be_nested_str(id),
     }),
-    ((bstring*) &be_const_str_init),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_init,
+    &be_const_str_solidified,
     ( &(const binstruction[ 4]) {  /* code */
-      0x90020001,  //  0000  SETMBR R0  K0  R1
-      0x90020202,  //  0001  SETMBR R0  K1  R2
-      0x90020403,  //  0002  SETMBR R0  K2  R3
-      0x80000000,  //  0003  RET  0
+      0x90020001,  //  0000  SETMBR	R0	K0	R1
+      0x90020202,  //  0001  SETMBR	R0	K1	R2
+      0x90020403,  //  0002  SETMBR	R0	K2	R3
+      0x80000000,  //  0003  RET	0
     })
   )
 );
@@ -93,13 +93,13 @@ be_local_class(Timer,
     NULL,
     be_nested_map(5,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("tostring", -1995258651, 8, 4), be_const_closure(tostring_closure) },
-        { be_nested_key("id", 926444256, 2, 2), be_const_var(2) },
-        { be_nested_key("f", -485742695, 1, -1), be_const_var(1) },
-        { be_nested_key("due", -399437003, 3, -1), be_const_var(0) },
-        { be_nested_key("init", 380752755, 4, -1), be_const_closure(init_closure) },
+        { be_const_key(tostring, 4), be_const_closure(Timer_tostring_closure) },
+        { be_const_key(id, 2), be_const_var(2) },
+        { be_const_key(f, -1), be_const_var(1) },
+        { be_const_key(due, -1), be_const_var(0) },
+        { be_const_key(init, -1), be_const_closure(Timer_init_closure) },
     })),
-    (be_nested_const_str("Timer", -346839614, 5))
+    be_str_literal("Timer")
 );
 /*******************************************************************/
 
diff --git a/lib/libesp32/Berry/default/be_unishox_lib.c b/lib/libesp32/Berry/default/be_unishox_lib.c
index 867e0870a..971f4c9e0 100644
--- a/lib/libesp32/Berry/default/be_unishox_lib.c
+++ b/lib/libesp32/Berry/default/be_unishox_lib.c
@@ -9,8 +9,8 @@
 
 #ifdef USE_UNISHOX_COMPRESSION
 
-extern int be_unishox_compress(bvm *vm);
-extern int be_unishox_decompress(bvm *vm);
+extern int be_ntv_unishox_decompress(bvm *vm);
+extern int be_ntv_unishox_compress(bvm *vm);
 
 /********************************************************************
 ** Solidified module: unishox
@@ -19,8 +19,8 @@ be_local_module(unishox,
     "unishox",
     be_nested_map(2,
     ( (struct bmapnode*) &(const bmapnode[]) {
-        { be_nested_key("decompress", -1407935646, 10, -1), be_const_func(be_unishox_decompress) },
-        { be_nested_key("compress", -1476883059, 8, -1), be_const_func(be_unishox_compress) },
+        { be_const_key(decompress, -1), be_const_func(be_ntv_unishox_decompress) },
+        { be_const_key(compress, -1), be_const_func(be_ntv_unishox_compress) },
     }))
 );
 BE_EXPORT_VARIABLE be_define_const_native_module(unishox);
diff --git a/lib/libesp32/Berry/default/be_wirelib.c b/lib/libesp32/Berry/default/be_wirelib.c
index 63c4da93a..38f345553 100644
--- a/lib/libesp32/Berry/default/be_wirelib.c
+++ b/lib/libesp32/Berry/default/be_wirelib.c
@@ -39,12 +39,12 @@ be_local_closure(write_bytes,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 3]) {     /* constants */
-    /* K0   */  be_nested_string("_begin_transmission", -1515506120, 19),
-    /* K1   */  be_nested_string("_write", -2079504471, 6),
-    /* K2   */  be_nested_string("_end_transmission", -1057486896, 17),
+    /* K0   */  be_nested_str(_begin_transmission),
+    /* K1   */  be_nested_str(_write),
+    /* K2   */  be_nested_str(_end_transmission),
     }),
-    (be_nested_const_str("write_bytes", 1227543792, 11)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_write_bytes,
+    &be_const_str_solidified,
     ( &(const binstruction[12]) {  /* code */
       0x8C100100,  //  0000  GETMET	R4	R0	K0
       0x5C180200,  //  0001  MOVE	R6	R1
@@ -78,15 +78,15 @@ be_local_closure(read_bytes,   /* name */
     NULL,                       /* no sub protos */
     1,                          /* has constants */
     ( &(const bvalue[ 6]) {     /* constants */
-    /* K0   */  be_nested_string("_begin_transmission", -1515506120, 19),
-    /* K1   */  be_nested_string("_write", -2079504471, 6),
-    /* K2   */  be_nested_string("_end_transmission", -1057486896, 17),
-    /* K3   */  be_nested_string("_request_from", -329818692, 13),
-    /* K4   */  be_nested_string("_available", 1306196581, 10),
-    /* K5   */  be_nested_string("_read", 346717030, 5),
+    /* K0   */  be_nested_str(_begin_transmission),
+    /* K1   */  be_nested_str(_write),
+    /* K2   */  be_nested_str(_end_transmission),
+    /* K3   */  be_nested_str(_request_from),
+    /* K4   */  be_nested_str(_available),
+    /* K5   */  be_nested_str(_read),
     }),
-    (be_nested_const_str("read_bytes", -718234123, 10)),
-    ((bstring*) &be_const_str_input),
+    &be_const_str_read_bytes,
+    &be_const_str_solidified,
     ( &(const binstruction[24]) {  /* code */
       0x8C100100,  //  0000  GETMET	R4	R0	K0
       0x5C180200,  //  0001  MOVE	R6	R1
diff --git a/lib/libesp32/Berry/default/embedded/Tasmota.be b/lib/libesp32/Berry/default/embedded/Tasmota.be
index 814af338f..3305d57ff 100644
--- a/lib/libesp32/Berry/default/embedded/Tasmota.be
+++ b/lib/libesp32/Berry/default/embedded/Tasmota.be
@@ -330,6 +330,25 @@ class Tasmota
   end
 
   def load(f)
+    # embedded functions
+    # puth_path: adds the current archive to sys.path
+    def push_path(p)
+      import sys
+      var path = sys.path()
+      if path.find(p) == nil  # append only if it's not already there
+        path.push(p)
+      end
+    end
+    # pop_path: removes the path
+    def pop_path(p)
+      import sys
+      var path = sys.path()
+      var idx = path.find(p)
+      if idx != nil
+        path.remove(idx)
+      end
+    end
+
     import string
     import path
 
@@ -382,6 +401,7 @@ class Tasmota
     # recall the working directory
     if f_archive
       self.wd = f_prefix + "#"
+      push_path(self.wd)
     else
       self.wd = ""
     end
@@ -398,6 +418,12 @@ class Tasmota
     # call the compiled code
     c()
     # call successfuls
+
+    # remove path prefix
+    if f_archive
+      pop_path(f_prefix + "#")
+    end
+
     return true
   end
 
diff --git a/lib/libesp32/Berry/default/embedded/i2c_driver.be b/lib/libesp32/Berry/default/embedded/i2c_driver.be
index a3210b766..a66afa5ad 100644
--- a/lib/libesp32/Berry/default/embedded/i2c_driver.be
+++ b/lib/libesp32/Berry/default/embedded/i2c_driver.be
@@ -14,7 +14,7 @@
  -   i2c_index: (optional) check is the device is not disabled
  -------------------------------------------------------------#
 
-class I2C_Driver : Driver
+class I2C_Driver
   var wire          #- wire object to reach the device, if nil then the module is not initialized -#
   var addr          #- I2C address of the device -#
   var name          #- model namme of the device, cannot be nil -#
diff --git a/lib/libesp32/Berry/default/embedded/leds.be b/lib/libesp32/Berry/default/embedded/leds.be
index 289ad1118..11a0489af 100644
--- a/lib/libesp32/Berry/default/embedded/leds.be
+++ b/lib/libesp32/Berry/default/embedded/leds.be
@@ -24,12 +24,14 @@
 
 class Leds : Leds_ntv
   var gamma       # if true, apply gamma (true is default)
+  var leds        # number of leds
   # leds:int = number of leds of the strip
   # gpio:int (optional) = GPIO for NeoPixel. If not specified, takes the WS2812 gpio
   # type:int (optional) = Type of LED, defaults to WS2812 RGB
   # rmt:int (optional) = RMT hardware channel to use, leave default unless you have a good reason 
   def init(leds, gpio, type, rmt)   # rmt is optional
     self.gamma = true     # gamma is enabled by default, it should be disabled explicitly if needed
+    self.leds = int(leds)
 
     if gpio == nil && gpio.pin(gpio.WS2812) >= 0
       gpio = gpio.pin(gpio.WS2812)
@@ -41,7 +43,7 @@ class Leds : Leds_ntv
     end
 
     # initialize the structure
-    self.ctor(leds, gpio, type, rmt)
+    self.ctor(self.leds, gpio, type, rmt)
 
     if self._p == nil raise "internal_error", "couldn't not initialize noepixelbus" end
 
@@ -124,8 +126,176 @@ class Leds : Leds_ntv
              b
     end
   end
+
+  # `segment`
+  # create a new `strip` object that maps a part of the current strip
+  def create_segment(offset, leds)
+    if int(offset) + int(leds) > self.leds || offset < 0 || leds < 0
+      raise "value_error", "out of range"
+    end
+
+    # inner class
+    class Leds_segment
+      var strip
+      var offset, leds
+    
+      def init(strip, offset, leds)
+        self.strip = strip
+        self.offset = int(offset)
+        self.leds = int(leds)
+      end
+    
+      def clear()
+        self.clear_to(0x000000)
+        self.show()
+      end
+    
+      def begin()
+        # do nothing, already being handled by physical strip
+      end
+      def show(force)
+        # don't trigger on segment, you will need to trigger on full strip instead
+        if bool(force) || (self.offset == 0 && self.leds == self.strip.leds)
+          self.strip.show()
+        end
+      end
+      def can_show()
+        return self.strip.can_show()
+      end
+      def is_dirty()
+        return self.strip.is_dirty()
+      end
+      def dirty()
+        self.strip.dirty()
+      end
+      def pixels_buffer()
+        return nil
+      end
+      def pixel_size()
+        return self.strip.pixel_size()
+      end
+      def pixel_count()
+        return self.leds
+      end
+      def clear_to(col, bri)
+        var i = 0
+        while i < self.leds
+          self.strip.set_pixel_color(i + self.offset, col, bri)
+          i += 1
+        end
+      end
+      def set_pixel_color(idx, col, bri)
+        self.strip.set_pixel_color(idx + self.offset, col, bri)
+      end
+      def get_pixel_color(idx)
+        return self.strip.get_pixel_color(idx + self.offseta)
+      end
+    end
+
+    return Leds_segment(self, offset, leds)
+
+  end
+
+  def create_matrix(w, h, offset)
+    offset = int(offset)
+    w = int(w)
+    h = int(h)
+    if offset == nil   offset = 0 end
+    if w * h + offset > self.leds || h < 0 || w < 0 || offset < 0
+      raise "value_error", "out of range"
+    end
+
+    # inner class
+    class Leds_matrix
+      var strip
+      var offset
+      var h, w
+      var alternate     # are rows in alternate mode (even/odd are reversed)
+    
+      def init(strip, w, h, offset)
+        self.strip = strip
+        self.offset = offset
+        self.h = h
+        self.w = w
+        self.alternate = false
+      end
+    
+      def clear()
+        self.clear_to(0x000000)
+        self.show()
+      end
+    
+      def begin()
+        # do nothing, already being handled by physical strip
+      end
+      def show(force)
+        # don't trigger on segment, you will need to trigger on full strip instead
+        if bool(force) || (self.offset == 0 && self.w * self.h == self.strip.leds)
+          self.strip.show()
+        end
+      end
+      def can_show()
+        return self.strip.can_show()
+      end
+      def is_dirty()
+        return self.strip.is_dirty()
+      end
+      def dirty()
+        self.strip.dirty()
+      end
+      def pixels_buffer()
+        return nil
+      end
+      def pixel_size()
+        return self.strip.pixel_size()
+      end
+      def pixel_count()
+        return self.w * self.h
+      end
+      def clear_to(col, bri)
+        var i = 0
+        while i < self.w * self.h
+          self.strip.set_pixel_color(i + self.offset, col, bri)
+          i += 1
+        end
+      end
+      def set_pixel_color(idx, col, bri)
+        self.strip.set_pixel_color(idx + self.offset, col, bri)
+      end
+      def get_pixel_color(idx)
+        return self.strip.get_pixel_color(idx + self.offseta)
+      end
+
+      # Leds_matrix specific
+      def set_alternate(alt)
+        self.alternate = alt
+      end
+      def get_alternate()
+        return self.alternate
+      end
+
+      def set_matrix_pixel_color(x, y, col, bri)
+        if self.alternate && x % 2
+          # reversed line
+          self.strip.set_pixel_color(x * self.w + self.h - y - 1 + self.offset, col, bri)
+        else
+          self.strip.set_pixel_color(x * self.w + y + self.offset, col, bri)
+        end
+      end
+    end
+
+    return Leds_matrix(self, w, h, offset)
+
+  end
+
+  static def matrix(w, h, gpio, rmt)
+    var strip = Leds(w * h, gpio, rmt)
+    var matrix = strip.create_matrix(w, h, 0)
+    return matrix
+  end
 end
 
+
 #-
 
 var s = Leds(25, gpio.pin(gpio.WS2812, 1))
@@ -144,34 +314,6 @@ anim()
 
 -#
 
-class Leds_matrix : Leds
-  var h, w
-  var alternate     # are rows in alternate mode (even/odd are reversed)
-
-  def init(w, h, gpio, rmt)
-    self.w = w
-    self.h = h
-    self.alternate = false
-    super(self).init(w * h, gpio, rmt)
-  end
-
-  def set_alternate(alt)
-    self.alternate = alt
-  end
-  def get_alternate()
-    return self.alternate
-  end
-
-  def set_matrix_pixel_color(x, y, col, bri)
-    if self.alternate && x % 2
-      # reversed line
-      self.set_pixel_color(x * self.w + self.h - y - 1, col, bri)
-    else
-      self.set_pixel_color(x * self.w + y, col, bri)
-    end
-  end
-end
-
 #-
 
 var s = Leds_matrix(5, 5, gpio.pin(gpio.WS2812, 1))
diff --git a/lib/libesp32/Berry/default/embedded/persist.be b/lib/libesp32/Berry/default/embedded/persist.be
index e0bb8025f..164a1dd7b 100644
--- a/lib/libesp32/Berry/default/embedded/persist.be
+++ b/lib/libesp32/Berry/default/embedded/persist.be
@@ -81,6 +81,8 @@ persist_module.init = def (m)
           print("BRY: failed to load _persist.json")
         end
         self._dirty = false
+      else
+        self.save()
       end
 
       # print("Loading")
diff --git a/lib/libesp32/Berry/default/embedded/tapp.be b/lib/libesp32/Berry/default/embedded/tapp.be
index 3c3528e3a..30aa1f740 100644
--- a/lib/libesp32/Berry/default/embedded/tapp.be
+++ b/lib/libesp32/Berry/default/embedded/tapp.be
@@ -19,7 +19,7 @@ tapp_module.init = def (m)
 
       for d: dir
         if string.find(d, ".tapp") > 0
-          print(string.format("TAP: found Tasmota App '%s'", d))
+          tasmota.log(string.format("TAP: found Tasmota App '%s'", d), 2)
           tasmota.load(d + "#autoexec.be")
         end
       end
diff --git a/lib/libesp32/Berry/generate/be_const_strtab.h b/lib/libesp32/Berry/generate/be_const_strtab.h
index cee6bc29d..9692c8508 100644
--- a/lib/libesp32/Berry/generate/be_const_strtab.h
+++ b/lib/libesp32/Berry/generate/be_const_strtab.h
@@ -1,350 +1,743 @@
-extern const bcstring be_const_str_SERIAL_6N2;
-extern const bcstring be_const_str__begin_transmission;
-extern const bcstring be_const_str_set_light;
-extern const bcstring be_const_str_time_reached;
-extern const bcstring be_const_str_SERIAL_5E2;
-extern const bcstring be_const_str___lower__;
-extern const bcstring be_const_str_SERIAL_7O1;
-extern const bcstring be_const_str_getbits;
-extern const bcstring be_const_str_input;
-extern const bcstring be_const_str_dot_size;
-extern const bcstring be_const_str_publish_result;
-extern const bcstring be_const_str_web_send_decimal;
-extern const bcstring be_const_str_def;
-extern const bcstring be_const_str__cmd;
-extern const bcstring be_const_str_begin;
-extern const bcstring be_const_str_resp_cmnd;
-extern const bcstring be_const_str_assert;
-extern const bcstring be_const_str_set;
-extern const bcstring be_const_str_tag;
-extern const bcstring be_const_str_check_privileged_access;
-extern const bcstring be_const_str_kv;
-extern const bcstring be_const_str_publish;
-extern const bcstring be_const_str_read32;
-extern const bcstring be_const_str_load;
-extern const bcstring be_const_str_read13;
-extern const bcstring be_const_str_search;
-extern const bcstring be_const_str_dac_voltage;
-extern const bcstring be_const_str_finish;
-extern const bcstring be_const_str_hex;
-extern const bcstring be_const_str_isinstance;
-extern const bcstring be_const_str_rand;
-extern const bcstring be_const_str_POST;
-extern const bcstring be_const_str_SERIAL_6E2;
-extern const bcstring be_const_str_classname;
-extern const bcstring be_const_str__global_def;
-extern const bcstring be_const_str_open;
-extern const bcstring be_const_str_redirect;
-extern const bcstring be_const_str_AES_GCM;
-extern const bcstring be_const_str_resp_cmnd_failed;
-extern const bcstring be_const_str_reverse_gamma10;
-extern const bcstring be_const_str_strftime;
-extern const bcstring be_const_str_insert;
-extern const bcstring be_const_str_false;
-extern const bcstring be_const_str_arg_size;
-extern const bcstring be_const_str_serial;
-extern const bcstring be_const_str_OneWire;
-extern const bcstring be_const_str_scale_uint;
-extern const bcstring be_const_str_return;
-extern const bcstring be_const_str_wire;
-extern const bcstring be_const_str_write_bytes;
-extern const bcstring be_const_str__global_addr;
-extern const bcstring be_const_str_exec_tele;
-extern const bcstring be_const_str_target_search;
-extern const bcstring be_const_str_gamma8;
-extern const bcstring be_const_str_pi;
-extern const bcstring be_const_str_state;
-extern const bcstring be_const_str_depower;
-extern const bcstring be_const_str_init;
-extern const bcstring be_const_str_member;
-extern const bcstring be_const_str__end_transmission;
-extern const bcstring be_const_str_digital_read;
-extern const bcstring be_const_str_imin;
-extern const bcstring be_const_str_hs2rgb;
-extern const bcstring be_const_str_keys;
-extern const bcstring be_const_str_real;
-extern const bcstring be_const_str_sin;
-extern const bcstring be_const_str_SERIAL_7N1;
-extern const bcstring be_const_str_ctypes_bytes;
-extern const bcstring be_const_str_ctypes_bytes_dyn;
-extern const bcstring be_const_str_raise;
-extern const bcstring be_const_str_GET;
-extern const bcstring be_const_str__settings_def;
-extern const bcstring be_const_str_read24;
-extern const bcstring be_const_str_cos;
-extern const bcstring be_const_str_remove_driver;
-extern const bcstring be_const_str__settings_ptr;
-extern const bcstring be_const_str_memory;
-extern const bcstring be_const_str_set_auth;
-extern const bcstring be_const_str_content_send_style;
-extern const bcstring be_const_str_class;
-extern const bcstring be_const_str_SERIAL_7E2;
-extern const bcstring be_const_str_shared_key;
-extern const bcstring be_const_str_tanh;
-extern const bcstring be_const_str_nil;
-extern const bcstring be_const_str_get_power;
-extern const bcstring be_const_str_last_modified;
-extern const bcstring be_const_str_resolvecmnd;
-extern const bcstring be_const_str__read;
-extern const bcstring be_const_str_atan;
-extern const bcstring be_const_str_content_button;
-extern const bcstring be_const_str_setbits;
-extern const bcstring be_const_str_upper;
-extern const bcstring be_const_str_contains;
-extern const bcstring be_const_str_time_str;
-extern const bcstring be_const_str_arch;
-extern const bcstring be_const_str_fromptr;
-extern const bcstring be_const_str_push;
-extern const bcstring be_const_str_srand;
-extern const bcstring be_const_str_geti;
-extern const bcstring be_const_str_seti;
-extern const bcstring be_const_str_add_cmd;
-extern const bcstring be_const_str_cmd;
-extern const bcstring be_const_str_get_switch;
-extern const bcstring be_const_str_size;
-extern const bcstring be_const_str_try;
-extern const bcstring be_const_str_web_send;
-extern const bcstring be_const_str_except;
-extern const bcstring be_const_str_SERIAL_5O1;
-extern const bcstring be_const_str_SERIAL_8E2;
-extern const bcstring be_const_str__available;
-extern const bcstring be_const_str_codedump;
-extern const bcstring be_const_str_wire2;
-extern const bcstring be_const_str_dump;
-extern const bcstring be_const_str_exec_cmd;
-extern const bcstring be_const_str_add;
-extern const bcstring be_const_str_exp;
-extern const bcstring be_const_str_isrunning;
-extern const bcstring be_const_str_remove_rule;
-extern const bcstring be_const_str_run_deferred;
-extern const bcstring be_const_str_scan;
-extern const bcstring be_const_str_for;
-extern const bcstring be_const_str_set_timer;
-extern const bcstring be_const_str_url_encode;
-extern const bcstring be_const_str_addr;
-extern const bcstring be_const_str___upper__;
-extern const bcstring be_const_str_loop;
-extern const bcstring be_const_str_AudioGeneratorWAV;
-extern const bcstring be_const_str_chars_in_string;
-extern const bcstring be_const_str_cosh;
-extern const bcstring be_const_str_import;
-extern const bcstring be_const_str_SERIAL_5N2;
-extern const bcstring be_const_str_type;
-extern const bcstring be_const_str_clear;
-extern const bcstring be_const_str_SERIAL_8N1;
-extern const bcstring be_const_str_issubclass;
-extern const bcstring be_const_str_remove_timer;
-extern const bcstring be_const_str_sinh;
-extern const bcstring be_const_str_AudioGeneratorMP3;
-extern const bcstring be_const_str_Wire;
-extern const bcstring be_const_str_get_light;
-extern const bcstring be_const_str_get_option;
-extern const bcstring be_const_str_list;
-extern const bcstring be_const_str_stop;
-extern const bcstring be_const_str_try_rule;
-extern const bcstring be_const_str_webclient;
-extern const bcstring be_const_str_dot_p2;
-extern const bcstring be_const_str_has;
-extern const bcstring be_const_str__request_from;
-extern const bcstring be_const_str_setrange;
-extern const bcstring be_const_str_I2C_Driver;
-extern const bcstring be_const_str_ceil;
-extern const bcstring be_const_str_else;
-extern const bcstring be_const_str_concat;
-extern const bcstring be_const_str_set_power;
-extern const bcstring be_const_str_tomap;
-extern const bcstring be_const_str_resp_cmnd_error;
-extern const bcstring be_const_str_add_header;
-extern const bcstring be_const_str_eth;
-extern const bcstring be_const_str_write_bit;
-extern const bcstring be_const_str_exists;
-extern const bcstring be_const_str_pow;
-extern const bcstring be_const_str_select;
-extern const bcstring be_const_str_allocated;
-extern const bcstring be_const_str_classof;
-extern const bcstring be_const_str_if;
-extern const bcstring be_const_str_SERIAL_5E1;
-extern const bcstring be_const_str_arg;
-extern const bcstring be_const_str_cb_dispatch;
-extern const bcstring be_const_str_response_append;
-extern const bcstring be_const_str_pin_used;
-extern const bcstring be_const_str_write;
-extern const bcstring be_const_str_write8;
-extern const bcstring be_const_str_SERIAL_6O2;
-extern const bcstring be_const_str_log;
-extern const bcstring be_const_str_pin_mode;
-extern const bcstring be_const_str_read12;
-extern const bcstring be_const_str_resp_cmnd_str;
-extern const bcstring be_const_str_abs;
-extern const bcstring be_const_str_digital_write;
-extern const bcstring be_const_str_static;
-extern const bcstring be_const_str_bytes;
-extern const bcstring be_const_str_find_op;
-extern const bcstring be_const_str_call;
-extern const bcstring be_const_str_cmd_res;
-extern const bcstring be_const_str_opt_eq;
-extern const bcstring be_const_str_save;
-extern const bcstring be_const_str_find_key_i;
-extern const bcstring be_const_str__cb;
-extern const bcstring be_const_str_Tasmota;
-extern const bcstring be_const_str_public_key;
-extern const bcstring be_const_str_as;
-extern const bcstring be_const_str_dot_w;
-extern const bcstring be_const_str_SERIAL_8O1;
-extern const bcstring be_const_str_compile;
-extern const bcstring be_const_str_range;
-extern const bcstring be_const_str_add_rule;
-extern const bcstring be_const_str__ptr;
-extern const bcstring be_const_str_delay;
-extern const bcstring be_const_str_pop;
-extern const bcstring be_const_str_reset;
-extern const bcstring be_const_str_wire_scan;
-extern const bcstring be_const_str_reset_search;
-extern const bcstring be_const_str_tolower;
-extern const bcstring be_const_str_SERIAL_7O2;
-extern const bcstring be_const_str_asin;
-extern const bcstring be_const_str_nan;
-extern const bcstring be_const_str_deg;
-extern const bcstring be_const_str_log10;
-extern const bcstring be_const_str_char;
-extern const bcstring be_const_str_get_size;
-extern const bcstring be_const_str_opt_call;
-extern const bcstring be_const_str_end;
-extern const bcstring be_const_str_SERIAL_7N2;
-extern const bcstring be_const_str_time_dump;
-extern const bcstring be_const_str_listdir;
-extern const bcstring be_const_str_wifi;
-extern const bcstring be_const_str_read_bytes;
-extern const bcstring be_const_str_reverse;
-extern const bcstring be_const_str_SERIAL_6E1;
-extern const bcstring be_const_str_SERIAL_5O2;
-extern const bcstring be_const_str_SERIAL_8E1;
-extern const bcstring be_const_str_asstring;
-extern const bcstring be_const_str_deinit;
-extern const bcstring be_const_str_encrypt;
-extern const bcstring be_const_str_iter;
-extern const bcstring be_const_str_millis;
-extern const bcstring be_const_str_AudioOutput;
-extern const bcstring be_const_str_members;
-extern const bcstring be_const_str_rtc;
-extern const bcstring be_const_str_SERIAL_6N1;
-extern const bcstring be_const_str__write;
-extern const bcstring be_const_str_content_start;
-extern const bcstring be_const_str_module;
-extern const bcstring be_const_str_item;
-extern const bcstring be_const_str_remove_cmd;
-extern const bcstring be_const_str_MD5;
-extern const bcstring be_const_str_sqrt;
-extern const bcstring be_const_str_SERIAL_5N1;
-extern const bcstring be_const_str_break;
-extern const bcstring be_const_str_map;
-extern const bcstring be_const_str_setmember;
-extern const bcstring be_const_str_tostring;
-extern const bcstring be_const_str_AudioGenerator;
-extern const bcstring be_const_str_while;
-extern const bcstring be_const_str_event;
-extern const bcstring be_const_str_resp_cmnd_done;
-extern const bcstring be_const_str_AudioOutputI2S;
-extern const bcstring be_const_str_has_arg;
-extern const bcstring be_const_str_floor;
-extern const bcstring be_const_str_read;
-extern const bcstring be_const_str_remove;
-extern const bcstring be_const_str_calldepth;
-extern const bcstring be_const_str_lower;
-extern const bcstring be_const_str_path;
-extern const bcstring be_const_str_gamma10;
-extern const bcstring be_const_str_get;
-extern const bcstring be_const_str_elif;
-extern const bcstring be_const_str__buffer;
-extern const bcstring be_const_str_exec_rules;
-extern const bcstring be_const_str_pin;
-extern const bcstring be_const_str_collect;
-extern const bcstring be_const_str_enabled;
-extern const bcstring be_const_str_global;
-extern const bcstring be_const_str_acos;
-extern const bcstring be_const_str_content_stop;
-extern const bcstring be_const_str_read8;
-extern const bcstring be_const_str_wire1;
-extern const bcstring be_const_str_fromstring;
-extern const bcstring be_const_str_setitem;
-extern const bcstring be_const_str__debug_present;
-extern const bcstring be_const_str_erase;
-extern const bcstring be_const_str_i2c_enabled;
-extern const bcstring be_const_str_resize;
-extern const bcstring be_const_str_decrypt;
-extern const bcstring be_const_str_escape;
-extern const bcstring be_const_str_isnan;
-extern const bcstring be_const_str_skip;
-extern const bcstring be_const_str_var;
-extern const bcstring be_const_str_dot_p;
-extern const bcstring be_const_str_write_file;
-extern const bcstring be_const_str_copy;
-extern const bcstring be_const_str_str;
-extern const bcstring be_const_str_super;
-extern const bcstring be_const_str_update;
-extern const bcstring be_const_str__def;
-extern const bcstring be_const_str__drivers;
-extern const bcstring be_const_str_imax;
-extern const bcstring be_const_str_add_driver;
-extern const bcstring be_const_str_dot_len;
-extern const bcstring be_const_str_SERIAL_6O1;
-extern const bcstring be_const_str_attrdump;
-extern const bcstring be_const_str_on;
-extern const bcstring be_const_str_rad;
-extern const bcstring be_const_str_bus;
-extern const bcstring be_const_str_yield;
-extern const bcstring be_const_str_top;
-extern const bcstring be_const_str_get_string;
-extern const bcstring be_const_str_read_sensors;
-extern const bcstring be_const_str_settings;
-extern const bcstring be_const_str__get_cb;
-extern const bcstring be_const_str_int;
-extern const bcstring be_const_str_opt_neq;
-extern const bcstring be_const_str_gen_cb;
-extern const bcstring be_const_str__timers;
-extern const bcstring be_const_str_continue;
-extern const bcstring be_const_str_SERIAL_7E1;
-extern const bcstring be_const_str_AudioFileSource;
-extern const bcstring be_const_str_format;
-extern const bcstring be_const_str_EC_C25519;
-extern const bcstring be_const_str_close;
-extern const bcstring be_const_str_content_flush;
-extern const bcstring be_const_str_reduce;
-extern const bcstring be_const_str_tr;
-extern const bcstring be_const_str_available;
-extern const bcstring be_const_str_traceback;
-extern const bcstring be_const_str_opt_add;
-extern const bcstring be_const_str_SERIAL_8N2;
-extern const bcstring be_const_str_wd;
-extern const bcstring be_const_str___iterator__;
-extern const bcstring be_const_str_fromb64;
-extern const bcstring be_const_str_number;
-extern const bcstring be_const_str_print;
-extern const bcstring be_const_str_set_useragent;
-extern const bcstring be_const_str_tan;
-extern const bcstring be_const_str_do;
 extern const bcstring be_const_str_;
-extern const bcstring be_const_str_opt_connect;
+extern const bcstring be_const_str_AES_GCM;
+extern const bcstring be_const_str_AXP192;
+extern const bcstring be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range;
+extern const bcstring be_const_str_AudioFileSource;
+extern const bcstring be_const_str_AudioFileSourceFS;
+extern const bcstring be_const_str_AudioGenerator;
+extern const bcstring be_const_str_AudioGeneratorMP3;
+extern const bcstring be_const_str_AudioGeneratorWAV;
+extern const bcstring be_const_str_AudioOutput;
+extern const bcstring be_const_str_AudioOutputI2S;
+extern const bcstring be_const_str_Auto_X2Dconfiguration;
+extern const bcstring be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20;
+extern const bcstring be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s;
+extern const bcstring be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29;
+extern const bcstring be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson;
+extern const bcstring be_const_str_BUTTON_CONFIGURATION;
+extern const bcstring be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s;
+extern const bcstring be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting;
+extern const bcstring be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29;
+extern const bcstring be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27;
+extern const bcstring be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27;
+extern const bcstring be_const_str_CFG_X3A_X20loaded_X20_X20;
+extern const bcstring be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27;
+extern const bcstring be_const_str_CFG_X3A_X20loading_X20;
+extern const bcstring be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27;
+extern const bcstring be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29;
+extern const bcstring be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found;
+extern const bcstring be_const_str_CFG_X3A_X20ran_X20_X20;
+extern const bcstring be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27;
+extern const bcstring be_const_str_CFG_X3A_X20removing_X20autoconf_X20files;
+extern const bcstring be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker;
+extern const bcstring be_const_str_CFG_X3A_X20return_code_X3D_X25i;
+extern const bcstring be_const_str_CFG_X3A_X20running_X20;
+extern const bcstring be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem;
+extern const bcstring be_const_str_COLOR_BLACK;
+extern const bcstring be_const_str_COLOR_WHITE;
+extern const bcstring be_const_str_EC_C25519;
+extern const bcstring be_const_str_EVENT_DRAW_MAIN;
+extern const bcstring be_const_str_EVENT_DRAW_PART_BEGIN;
+extern const bcstring be_const_str_EVENT_DRAW_PART_END;
+extern const bcstring be_const_str_False;
+extern const bcstring be_const_str_GET;
+extern const bcstring be_const_str_HTTP_GET;
+extern const bcstring be_const_str_HTTP_POST;
+extern const bcstring be_const_str_I2C_Driver;
+extern const bcstring be_const_str_I2C_X3A;
+extern const bcstring be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback;
+extern const bcstring be_const_str_Leds;
+extern const bcstring be_const_str_MD5;
+extern const bcstring be_const_str_No_X20callback_X20available;
+extern const bcstring be_const_str_None;
+extern const bcstring be_const_str_OPTION_A;
+extern const bcstring be_const_str_OneWire;
+extern const bcstring be_const_str_PART_MAIN;
+extern const bcstring be_const_str_POST;
+extern const bcstring be_const_str_Parameter_X20error;
+extern const bcstring be_const_str_RES_OK;
+extern const bcstring be_const_str_Restart_X201;
+extern const bcstring be_const_str_SERIAL_5E1;
+extern const bcstring be_const_str_SERIAL_5E2;
+extern const bcstring be_const_str_SERIAL_5N1;
+extern const bcstring be_const_str_SERIAL_5N2;
+extern const bcstring be_const_str_SERIAL_5O1;
+extern const bcstring be_const_str_SERIAL_5O2;
+extern const bcstring be_const_str_SERIAL_6E1;
+extern const bcstring be_const_str_SERIAL_6E2;
+extern const bcstring be_const_str_SERIAL_6N1;
+extern const bcstring be_const_str_SERIAL_6N2;
+extern const bcstring be_const_str_SERIAL_6O1;
+extern const bcstring be_const_str_SERIAL_6O2;
+extern const bcstring be_const_str_SERIAL_7E1;
+extern const bcstring be_const_str_SERIAL_7E2;
+extern const bcstring be_const_str_SERIAL_7N1;
+extern const bcstring be_const_str_SERIAL_7N2;
+extern const bcstring be_const_str_SERIAL_7O1;
+extern const bcstring be_const_str_SERIAL_7O2;
+extern const bcstring be_const_str_SERIAL_8E1;
+extern const bcstring be_const_str_SERIAL_8E2;
+extern const bcstring be_const_str_SERIAL_8N1;
+extern const bcstring be_const_str_SERIAL_8N2;
+extern const bcstring be_const_str_SERIAL_8O1;
+extern const bcstring be_const_str_SERIAL_8O2;
+extern const bcstring be_const_str_SK6812_GRBW;
+extern const bcstring be_const_str_STATE_DEFAULT;
+extern const bcstring be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27;
+extern const bcstring be_const_str_Tasmota;
+extern const bcstring be_const_str_Tele;
+extern const bcstring be_const_str_Timer;
+extern const bcstring be_const_str_True;
+extern const bcstring be_const_str_Unknown_X20command;
+extern const bcstring be_const_str_WS2812;
+extern const bcstring be_const_str_WS2812_GRB;
+extern const bcstring be_const_str_Wire;
+extern const bcstring be_const_str__;
+extern const bcstring be_const_str__X0A;
+extern const bcstring be_const_str__X20;
+extern const bcstring be_const_str__X21_X3D;
+extern const bcstring be_const_str__X21_X3D_X3D;
+extern const bcstring be_const_str__X23;
+extern const bcstring be_const_str__X23autoexec_X2Ebat;
+extern const bcstring be_const_str__X23autoexec_X2Ebe;
+extern const bcstring be_const_str__X23display_X2Eini;
+extern const bcstring be_const_str__X23init_X2Ebat;
+extern const bcstring be_const_str__X23preinit_X2Ebe;
+extern const bcstring be_const_str__X2502d_X25s_X2502d;
+extern const bcstring be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d;
+extern const bcstring be_const_str__X25s_X2Eautoconf;
+extern const bcstring be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B;
+extern const bcstring be_const_str__X26lt_X3BNone_X26gt_X3B;
+extern const bcstring be_const_str__X28_X29;
+extern const bcstring be_const_str__X2B;
+extern const bcstring be_const_str__X2C;
+extern const bcstring be_const_str__X2D_X2D_X3A_X2D_X2D;
+extern const bcstring be_const_str__X2E;
+extern const bcstring be_const_str__X2E_X2E;
+extern const bcstring be_const_str__X2Eautoconf;
+extern const bcstring be_const_str__X2Ebe;
+extern const bcstring be_const_str__X2Ebec;
+extern const bcstring be_const_str__X2Elen;
+extern const bcstring be_const_str__X2Ep;
+extern const bcstring be_const_str__X2Ep1;
+extern const bcstring be_const_str__X2Ep2;
+extern const bcstring be_const_str__X2Esize;
+extern const bcstring be_const_str__X2Etapp;
+extern const bcstring be_const_str__X2Ew;
+extern const bcstring be_const_str__X2F;
+extern const bcstring be_const_str__X2F_X2Eautoconf;
+extern const bcstring be_const_str__X2F_X3Frst_X3D;
+extern const bcstring be_const_str__X2Fac;
+extern const bcstring be_const_str__X3A;
+extern const bcstring be_const_str__X3C;
+extern const bcstring be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E;
+extern const bcstring be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E;
+extern const bcstring be_const_str__X3C_X3D;
+extern const bcstring be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E;
+extern const bcstring be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E;
+extern const bcstring be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E;
+extern const bcstring be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29;
+extern const bcstring be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E;
+extern const bcstring be_const_str__X3Clambda_X3E;
+extern const bcstring be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E;
+extern const bcstring be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E;
+extern const bcstring be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E;
+extern const bcstring be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E;
+extern const bcstring be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E;
+extern const bcstring be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E;
+extern const bcstring be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E;
+extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E;
+extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20;
+extern const bcstring be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20;
+extern const bcstring be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E;
+extern const bcstring be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E;
+extern const bcstring be_const_str__X3D;
+extern const bcstring be_const_str__X3D_X3C_X3E_X21;
+extern const bcstring be_const_str__X3D_X3D;
+extern const bcstring be_const_str__X3E;
+extern const bcstring be_const_str__X3E_X3D;
+extern const bcstring be_const_str__X3F;
+extern const bcstring be_const_str__X5B;
+extern const bcstring be_const_str__X5D;
+extern const bcstring be_const_str__X7B;
+extern const bcstring be_const_str__X7B_X7D;
+extern const bcstring be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D;
+extern const bcstring be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D;
+extern const bcstring be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D;
+extern const bcstring be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D;
+extern const bcstring be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D;
+extern const bcstring be_const_str__X7D;
+extern const bcstring be_const_str___iterator__;
+extern const bcstring be_const_str___lower__;
+extern const bcstring be_const_str___upper__;
+extern const bcstring be_const_str__anonymous_;
+extern const bcstring be_const_str__archive;
+extern const bcstring be_const_str__available;
+extern const bcstring be_const_str__begin_transmission;
+extern const bcstring be_const_str__buffer;
+extern const bcstring be_const_str__cb;
+extern const bcstring be_const_str__ccmd;
+extern const bcstring be_const_str__class;
+extern const bcstring be_const_str__cmd;
+extern const bcstring be_const_str__debug_present;
+extern const bcstring be_const_str__def;
+extern const bcstring be_const_str__dirty;
+extern const bcstring be_const_str__drivers;
+extern const bcstring be_const_str__end_transmission;
+extern const bcstring be_const_str__energy;
+extern const bcstring be_const_str__error;
+extern const bcstring be_const_str__filename;
+extern const bcstring be_const_str__get_cb;
+extern const bcstring be_const_str__global_addr;
+extern const bcstring be_const_str__global_def;
+extern const bcstring be_const_str__lvgl;
+extern const bcstring be_const_str__p;
+extern const bcstring be_const_str__persist_X2Ejson;
+extern const bcstring be_const_str__ptr;
+extern const bcstring be_const_str__read;
+extern const bcstring be_const_str__request_from;
 extern const bcstring be_const_str__rules;
-extern const bcstring be_const_str_dot_p1;
-extern const bcstring be_const_str_find;
-extern const bcstring be_const_str_name;
-extern const bcstring be_const_str_toptr;
+extern const bcstring be_const_str__settings_def;
+extern const bcstring be_const_str__settings_ptr;
+extern const bcstring be_const_str__t;
+extern const bcstring be_const_str__timers;
+extern const bcstring be_const_str__write;
+extern const bcstring be_const_str_a;
+extern const bcstring be_const_str_abs;
+extern const bcstring be_const_str_acos;
+extern const bcstring be_const_str_add;
+extern const bcstring be_const_str_add_anim;
+extern const bcstring be_const_str_add_cmd;
+extern const bcstring be_const_str_add_driver;
+extern const bcstring be_const_str_add_header;
+extern const bcstring be_const_str_add_rule;
+extern const bcstring be_const_str_addr;
+extern const bcstring be_const_str_allocated;
+extern const bcstring be_const_str_alternate;
+extern const bcstring be_const_str_animate;
+extern const bcstring be_const_str_animators;
+extern const bcstring be_const_str_arch;
+extern const bcstring be_const_str_area;
+extern const bcstring be_const_str_arg;
+extern const bcstring be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj;
 extern const bcstring be_const_str_arg_name;
+extern const bcstring be_const_str_arg_size;
+extern const bcstring be_const_str_as;
+extern const bcstring be_const_str_asin;
+extern const bcstring be_const_str_assert;
+extern const bcstring be_const_str_asstring;
+extern const bcstring be_const_str_atan;
+extern const bcstring be_const_str_atan2;
+extern const bcstring be_const_str_atleast1;
+extern const bcstring be_const_str_attrdump;
+extern const bcstring be_const_str_autoexec;
+extern const bcstring be_const_str_autorun;
+extern const bcstring be_const_str_available;
+extern const bcstring be_const_str_b;
+extern const bcstring be_const_str_back_forth;
+extern const bcstring be_const_str_base_class;
+extern const bcstring be_const_str_battery_present;
+extern const bcstring be_const_str_begin;
+extern const bcstring be_const_str_bool;
+extern const bcstring be_const_str_break;
+extern const bcstring be_const_str_bri;
+extern const bcstring be_const_str_bus;
+extern const bcstring be_const_str_button_pressed;
 extern const bcstring be_const_str_byte;
-extern const bcstring be_const_str_gc;
+extern const bcstring be_const_str_bytes;
+extern const bcstring be_const_str_c;
+extern const bcstring be_const_str_call;
+extern const bcstring be_const_str_call_native;
+extern const bcstring be_const_str_calldepth;
+extern const bcstring be_const_str_can_show;
+extern const bcstring be_const_str_cb_dispatch;
+extern const bcstring be_const_str_cb_do_nothing;
+extern const bcstring be_const_str_cb_event_closure;
+extern const bcstring be_const_str_cb_obj;
+extern const bcstring be_const_str_ceil;
+extern const bcstring be_const_str_char;
+extern const bcstring be_const_str_chars_in_string;
+extern const bcstring be_const_str_check_privileged_access;
+extern const bcstring be_const_str_class;
+extern const bcstring be_const_str_class_init_obj;
+extern const bcstring be_const_str_classname;
+extern const bcstring be_const_str_classof;
+extern const bcstring be_const_str_clear;
+extern const bcstring be_const_str_clear_first_time;
+extern const bcstring be_const_str_clear_to;
+extern const bcstring be_const_str_close;
+extern const bcstring be_const_str_closure;
+extern const bcstring be_const_str_cmd;
+extern const bcstring be_const_str_cmd_res;
+extern const bcstring be_const_str_code;
+extern const bcstring be_const_str_codedump;
+extern const bcstring be_const_str_collect;
+extern const bcstring be_const_str_color;
+extern const bcstring be_const_str_compile;
+extern const bcstring be_const_str_compress;
+extern const bcstring be_const_str_concat;
+extern const bcstring be_const_str_connect;
+extern const bcstring be_const_str_connected;
+extern const bcstring be_const_str_connection_error;
+extern const bcstring be_const_str_constructor_cb;
+extern const bcstring be_const_str_contains;
+extern const bcstring be_const_str_content_button;
+extern const bcstring be_const_str_content_flush;
+extern const bcstring be_const_str_content_send;
+extern const bcstring be_const_str_content_send_style;
+extern const bcstring be_const_str_content_start;
+extern const bcstring be_const_str_content_stop;
+extern const bcstring be_const_str_continue;
+extern const bcstring be_const_str_copy;
+extern const bcstring be_const_str_cos;
+extern const bcstring be_const_str_cosh;
+extern const bcstring be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus;
 extern const bcstring be_const_str_count;
 extern const bcstring be_const_str_counters;
-extern const bcstring be_const_str_tob64;
-extern const bcstring be_const_str_AudioFileSourceFS;
-extern const bcstring be_const_str_get_free_heap;
-extern const bcstring be_const_str_atan2;
-extern const bcstring be_const_str_set_timeouts;
-extern const bcstring be_const_str_toupper;
-extern const bcstring be_const_str__ccmd;
-extern const bcstring be_const_str_content_send;
-extern const bcstring be_const_str_flush;
-extern const bcstring be_const_str_true;
+extern const bcstring be_const_str_create_custom_widget;
+extern const bcstring be_const_str_create_matrix;
+extern const bcstring be_const_str_create_segment;
+extern const bcstring be_const_str_ctor;
+extern const bcstring be_const_str_ctypes_bytes;
+extern const bcstring be_const_str_ctypes_bytes_dyn;
+extern const bcstring be_const_str_dac_voltage;
+extern const bcstring be_const_str_day;
+extern const bcstring be_const_str_debug;
+extern const bcstring be_const_str_decompress;
+extern const bcstring be_const_str_decrypt;
+extern const bcstring be_const_str_def;
+extern const bcstring be_const_str_deg;
+extern const bcstring be_const_str_deinit;
+extern const bcstring be_const_str_del;
+extern const bcstring be_const_str_delay;
+extern const bcstring be_const_str_delete_all_configs;
+extern const bcstring be_const_str_depower;
+extern const bcstring be_const_str_deregister_obj;
+extern const bcstring be_const_str_destructor_cb;
 extern const bcstring be_const_str_detect;
-extern const bcstring be_const_str_SERIAL_8O2;
+extern const bcstring be_const_str_detected_X20on_X20bus;
+extern const bcstring be_const_str_digital_read;
+extern const bcstring be_const_str_digital_write;
+extern const bcstring be_const_str_dirty;
+extern const bcstring be_const_str_display;
+extern const bcstring be_const_str_display_X2Eini;
+extern const bcstring be_const_str_do;
+extern const bcstring be_const_str_draw_arc;
+extern const bcstring be_const_str_draw_line;
+extern const bcstring be_const_str_draw_line_dsc;
+extern const bcstring be_const_str_draw_line_dsc_init;
+extern const bcstring be_const_str_due;
+extern const bcstring be_const_str_dump;
+extern const bcstring be_const_str_duration;
+extern const bcstring be_const_str_editable;
+extern const bcstring be_const_str_elif;
+extern const bcstring be_const_str_else;
+extern const bcstring be_const_str_enabled;
+extern const bcstring be_const_str_encrypt;
+extern const bcstring be_const_str_end;
+extern const bcstring be_const_str_energy_struct;
+extern const bcstring be_const_str_engine;
+extern const bcstring be_const_str_erase;
+extern const bcstring be_const_str_escape;
+extern const bcstring be_const_str_eth;
+extern const bcstring be_const_str_event;
+extern const bcstring be_const_str_event_cb;
+extern const bcstring be_const_str_event_send;
+extern const bcstring be_const_str_every_100ms;
+extern const bcstring be_const_str_every_50ms;
+extern const bcstring be_const_str_every_second;
+extern const bcstring be_const_str_except;
+extern const bcstring be_const_str_exec_cmd;
+extern const bcstring be_const_str_exec_rules;
+extern const bcstring be_const_str_exec_tele;
+extern const bcstring be_const_str_exists;
+extern const bcstring be_const_str_exp;
+extern const bcstring be_const_str_f;
+extern const bcstring be_const_str_false;
+extern const bcstring be_const_str_file;
+extern const bcstring be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27;
+extern const bcstring be_const_str_files;
+extern const bcstring be_const_str_find;
+extern const bcstring be_const_str_find_key_i;
+extern const bcstring be_const_str_find_op;
+extern const bcstring be_const_str_finish;
+extern const bcstring be_const_str_floor;
+extern const bcstring be_const_str_flush;
+extern const bcstring be_const_str_for;
+extern const bcstring be_const_str_format;
+extern const bcstring be_const_str_from_to;
+extern const bcstring be_const_str_fromb64;
+extern const bcstring be_const_str_fromptr;
+extern const bcstring be_const_str_fromstring;
+extern const bcstring be_const_str_function;
+extern const bcstring be_const_str_gamma;
+extern const bcstring be_const_str_gamma10;
+extern const bcstring be_const_str_gamma8;
+extern const bcstring be_const_str_gc;
+extern const bcstring be_const_str_gen_cb;
+extern const bcstring be_const_str_get;
+extern const bcstring be_const_str_get_alternate;
+extern const bcstring be_const_str_get_aps_voltage;
+extern const bcstring be_const_str_get_bat_charge_current;
+extern const bcstring be_const_str_get_bat_current;
+extern const bcstring be_const_str_get_bat_power;
+extern const bcstring be_const_str_get_bat_voltage;
+extern const bcstring be_const_str_get_battery_chargin_status;
+extern const bcstring be_const_str_get_bri;
+extern const bcstring be_const_str_get_coords;
+extern const bcstring be_const_str_get_current_module_name;
+extern const bcstring be_const_str_get_current_module_path;
+extern const bcstring be_const_str_get_free_heap;
+extern const bcstring be_const_str_get_height;
+extern const bcstring be_const_str_get_input_power_status;
+extern const bcstring be_const_str_get_light;
+extern const bcstring be_const_str_get_object_from_ptr;
+extern const bcstring be_const_str_get_option;
+extern const bcstring be_const_str_get_percentage;
+extern const bcstring be_const_str_get_pixel_color;
+extern const bcstring be_const_str_get_power;
+extern const bcstring be_const_str_get_size;
+extern const bcstring be_const_str_get_string;
+extern const bcstring be_const_str_get_style_bg_color;
+extern const bcstring be_const_str_get_style_line_color;
+extern const bcstring be_const_str_get_style_pad_right;
+extern const bcstring be_const_str_get_switch;
+extern const bcstring be_const_str_get_tasmota;
+extern const bcstring be_const_str_get_temp;
+extern const bcstring be_const_str_get_vbus_current;
+extern const bcstring be_const_str_get_vbus_voltage;
+extern const bcstring be_const_str_get_warning_level;
+extern const bcstring be_const_str_get_width;
+extern const bcstring be_const_str_getbits;
+extern const bcstring be_const_str_geti;
+extern const bcstring be_const_str_global;
+extern const bcstring be_const_str_gpio;
+extern const bcstring be_const_str_group_def;
+extern const bcstring be_const_str_h;
+extern const bcstring be_const_str_has;
+extern const bcstring be_const_str_has_arg;
+extern const bcstring be_const_str_height_def;
+extern const bcstring be_const_str_hex;
+extern const bcstring be_const_str_hour;
+extern const bcstring be_const_str_hs2rgb;
+extern const bcstring be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf;
+extern const bcstring be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson;
+extern const bcstring be_const_str_i2c_enabled;
+extern const bcstring be_const_str_id;
+extern const bcstring be_const_str_if;
+extern const bcstring be_const_str_imax;
+extern const bcstring be_const_str_imin;
+extern const bcstring be_const_str_import;
+extern const bcstring be_const_str_init;
+extern const bcstring be_const_str_init_draw_line_dsc;
+extern const bcstring be_const_str_input;
+extern const bcstring be_const_str_ins_goto;
+extern const bcstring be_const_str_ins_ramp;
+extern const bcstring be_const_str_ins_time;
+extern const bcstring be_const_str_insert;
+extern const bcstring be_const_str_instance;
+extern const bcstring be_const_str_instance_size;
+extern const bcstring be_const_str_int;
+extern const bcstring be_const_str_internal_error;
+extern const bcstring be_const_str_introspect;
+extern const bcstring be_const_str_invalidate;
+extern const bcstring be_const_str_io_error;
+extern const bcstring be_const_str_ip;
+extern const bcstring be_const_str_is_dirty;
+extern const bcstring be_const_str_is_first_time;
+extern const bcstring be_const_str_is_running;
+extern const bcstring be_const_str_isinstance;
+extern const bcstring be_const_str_isnan;
+extern const bcstring be_const_str_isrunning;
+extern const bcstring be_const_str_issubclass;
+extern const bcstring be_const_str_item;
+extern const bcstring be_const_str_iter;
+extern const bcstring be_const_str_json;
+extern const bcstring be_const_str_json_append;
+extern const bcstring be_const_str_json_fdump;
+extern const bcstring be_const_str_json_fdump_any;
+extern const bcstring be_const_str_json_fdump_list;
+extern const bcstring be_const_str_json_fdump_map;
+extern const bcstring be_const_str_k;
+extern const bcstring be_const_str_keys;
+extern const bcstring be_const_str_kv;
+extern const bcstring be_const_str_last_modified;
+extern const bcstring be_const_str_leds;
+extern const bcstring be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032;
+extern const bcstring be_const_str_light;
+extern const bcstring be_const_str_line_dsc;
+extern const bcstring be_const_str_list;
+extern const bcstring be_const_str_listdir;
+extern const bcstring be_const_str_load;
+extern const bcstring be_const_str_load_templates;
+extern const bcstring be_const_str_local;
+extern const bcstring be_const_str_log;
+extern const bcstring be_const_str_log10;
+extern const bcstring be_const_str_loop;
+extern const bcstring be_const_str_lower;
+extern const bcstring be_const_str_lv;
+extern const bcstring be_const_str_lv_event;
+extern const bcstring be_const_str_lv_event_cb;
+extern const bcstring be_const_str_lv_obj;
+extern const bcstring be_const_str_lv_obj_class;
+extern const bcstring be_const_str_lvgl_event_dispatch;
+extern const bcstring be_const_str_map;
+extern const bcstring be_const_str_math;
+extern const bcstring be_const_str_matrix;
+extern const bcstring be_const_str_member;
+extern const bcstring be_const_str_members;
+extern const bcstring be_const_str_memory;
+extern const bcstring be_const_str_millis;
+extern const bcstring be_const_str_min;
+extern const bcstring be_const_str_minute;
+extern const bcstring be_const_str_module;
+extern const bcstring be_const_str_month;
+extern const bcstring be_const_str_name;
+extern const bcstring be_const_str_nan;
+extern const bcstring be_const_str_nil;
+extern const bcstring be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus;
+extern const bcstring be_const_str_null_cb;
+extern const bcstring be_const_str_number;
+extern const bcstring be_const_str_obj_class_create_obj;
+extern const bcstring be_const_str_obj_event_base;
+extern const bcstring be_const_str_offset;
+extern const bcstring be_const_str_offseta;
+extern const bcstring be_const_str_on;
+extern const bcstring be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E;
+extern const bcstring be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E;
+extern const bcstring be_const_str_open;
+extern const bcstring be_const_str_out_X20of_X20range;
+extern const bcstring be_const_str_p1;
+extern const bcstring be_const_str_p2;
+extern const bcstring be_const_str_page_autoconf_ctl;
+extern const bcstring be_const_str_page_autoconf_mgr;
+extern const bcstring be_const_str_param;
+extern const bcstring be_const_str_path;
+extern const bcstring be_const_str_pc;
+extern const bcstring be_const_str_pc_abs;
+extern const bcstring be_const_str_pc_rel;
+extern const bcstring be_const_str_percentage;
+extern const bcstring be_const_str_persist;
+extern const bcstring be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map;
+extern const bcstring be_const_str_pi;
+extern const bcstring be_const_str_pin;
+extern const bcstring be_const_str_pin_mode;
+extern const bcstring be_const_str_pin_used;
+extern const bcstring be_const_str_pixel_count;
+extern const bcstring be_const_str_pixel_size;
+extern const bcstring be_const_str_pixels_buffer;
+extern const bcstring be_const_str_point;
+extern const bcstring be_const_str_pop;
+extern const bcstring be_const_str_pop_path;
+extern const bcstring be_const_str_pow;
+extern const bcstring be_const_str_preinit;
+extern const bcstring be_const_str_print;
+extern const bcstring be_const_str_public_key;
+extern const bcstring be_const_str_publish;
+extern const bcstring be_const_str_publish_result;
+extern const bcstring be_const_str_push;
+extern const bcstring be_const_str_push_path;
+extern const bcstring be_const_str_quality;
+extern const bcstring be_const_str_r;
+extern const bcstring be_const_str_rad;
+extern const bcstring be_const_str_raise;
+extern const bcstring be_const_str_rand;
+extern const bcstring be_const_str_range;
+extern const bcstring be_const_str_read;
+extern const bcstring be_const_str_read12;
+extern const bcstring be_const_str_read13;
+extern const bcstring be_const_str_read24;
+extern const bcstring be_const_str_read32;
+extern const bcstring be_const_str_read8;
+extern const bcstring be_const_str_read_bytes;
+extern const bcstring be_const_str_read_sensors;
+extern const bcstring be_const_str_readbytes;
+extern const bcstring be_const_str_readline;
+extern const bcstring be_const_str_real;
+extern const bcstring be_const_str_reapply;
+extern const bcstring be_const_str_redirect;
+extern const bcstring be_const_str_reduce;
+extern const bcstring be_const_str_refr_size;
+extern const bcstring be_const_str_register_obj;
+extern const bcstring be_const_str_remove;
+extern const bcstring be_const_str_remove_cmd;
+extern const bcstring be_const_str_remove_driver;
+extern const bcstring be_const_str_remove_rule;
+extern const bcstring be_const_str_remove_timer;
+extern const bcstring be_const_str_reset;
+extern const bcstring be_const_str_reset_search;
+extern const bcstring be_const_str_resize;
+extern const bcstring be_const_str_resolvecmnd;
+extern const bcstring be_const_str_resp_cmnd;
+extern const bcstring be_const_str_resp_cmnd_done;
+extern const bcstring be_const_str_resp_cmnd_error;
+extern const bcstring be_const_str_resp_cmnd_failed;
+extern const bcstring be_const_str_resp_cmnd_str;
+extern const bcstring be_const_str_response_append;
+extern const bcstring be_const_str_return;
+extern const bcstring be_const_str_return_X20code_X3D_X25i;
+extern const bcstring be_const_str_reverse;
+extern const bcstring be_const_str_reverse_gamma10;
+extern const bcstring be_const_str_rotate;
+extern const bcstring be_const_str_round_end;
+extern const bcstring be_const_str_round_start;
+extern const bcstring be_const_str_rtc;
+extern const bcstring be_const_str_rule;
+extern const bcstring be_const_str_run;
+extern const bcstring be_const_str_run_bat;
+extern const bcstring be_const_str_run_deferred;
+extern const bcstring be_const_str_running;
+extern const bcstring be_const_str_save;
+extern const bcstring be_const_str_save_before_restart;
+extern const bcstring be_const_str_scale_uint;
+extern const bcstring be_const_str_scan;
+extern const bcstring be_const_str_search;
+extern const bcstring be_const_str_sec;
+extern const bcstring be_const_str_seg7_font;
+extern const bcstring be_const_str_select;
+extern const bcstring be_const_str_serial;
+extern const bcstring be_const_str_set;
+extern const bcstring be_const_str_set_alternate;
+extern const bcstring be_const_str_set_auth;
+extern const bcstring be_const_str_set_bri;
+extern const bcstring be_const_str_set_chg_current;
+extern const bcstring be_const_str_set_dc_voltage;
+extern const bcstring be_const_str_set_dcdc_enable;
+extern const bcstring be_const_str_set_first_time;
+extern const bcstring be_const_str_set_height;
+extern const bcstring be_const_str_set_ldo_enable;
+extern const bcstring be_const_str_set_ldo_voltage;
+extern const bcstring be_const_str_set_light;
+extern const bcstring be_const_str_set_matrix_pixel_color;
+extern const bcstring be_const_str_set_percentage;
+extern const bcstring be_const_str_set_pixel_color;
+extern const bcstring be_const_str_set_power;
+extern const bcstring be_const_str_set_style_bg_color;
+extern const bcstring be_const_str_set_style_line_color;
+extern const bcstring be_const_str_set_style_pad_right;
+extern const bcstring be_const_str_set_style_text_font;
+extern const bcstring be_const_str_set_text;
+extern const bcstring be_const_str_set_time;
+extern const bcstring be_const_str_set_timeouts;
+extern const bcstring be_const_str_set_timer;
+extern const bcstring be_const_str_set_useragent;
+extern const bcstring be_const_str_set_width;
+extern const bcstring be_const_str_set_x;
+extern const bcstring be_const_str_set_y;
+extern const bcstring be_const_str_setbits;
+extern const bcstring be_const_str_seti;
+extern const bcstring be_const_str_setitem;
+extern const bcstring be_const_str_setmember;
+extern const bcstring be_const_str_setrange;
+extern const bcstring be_const_str_settings;
+extern const bcstring be_const_str_shared_key;
+extern const bcstring be_const_str_show;
+extern const bcstring be_const_str_sin;
+extern const bcstring be_const_str_sinh;
+extern const bcstring be_const_str_size;
+extern const bcstring be_const_str_skip;
+extern const bcstring be_const_str_solidified;
 extern const bcstring be_const_str_split;
+extern const bcstring be_const_str_sqrt;
+extern const bcstring be_const_str_srand;
+extern const bcstring be_const_str_start;
+extern const bcstring be_const_str_state;
+extern const bcstring be_const_str_static;
+extern const bcstring be_const_str_stop;
+extern const bcstring be_const_str_stop_iteration;
+extern const bcstring be_const_str_str;
+extern const bcstring be_const_str_strftime;
+extern const bcstring be_const_str_string;
+extern const bcstring be_const_str_strip;
+extern const bcstring be_const_str_strptime;
+extern const bcstring be_const_str_super;
+extern const bcstring be_const_str_sys;
+extern const bcstring be_const_str_tag;
+extern const bcstring be_const_str_tan;
+extern const bcstring be_const_str_tanh;
+extern const bcstring be_const_str_target;
+extern const bcstring be_const_str_target_search;
+extern const bcstring be_const_str_tasmota;
+extern const bcstring be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29;
+extern const bcstring be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29;
+extern const bcstring be_const_str_tcpclient;
+extern const bcstring be_const_str_tele;
+extern const bcstring be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function;
+extern const bcstring be_const_str_time_dump;
+extern const bcstring be_const_str_time_reached;
+extern const bcstring be_const_str_time_str;
+extern const bcstring be_const_str_to_gamma;
+extern const bcstring be_const_str_tob64;
+extern const bcstring be_const_str_tolower;
+extern const bcstring be_const_str_tomap;
+extern const bcstring be_const_str_top;
+extern const bcstring be_const_str_toptr;
+extern const bcstring be_const_str_tostring;
+extern const bcstring be_const_str_toupper;
+extern const bcstring be_const_str_tr;
+extern const bcstring be_const_str_traceback;
+extern const bcstring be_const_str_true;
+extern const bcstring be_const_str_try;
+extern const bcstring be_const_str_try_rule;
+extern const bcstring be_const_str_type;
+extern const bcstring be_const_str_unknown_X20instruction;
+extern const bcstring be_const_str_update;
+extern const bcstring be_const_str_upper;
+extern const bcstring be_const_str_url_encode;
+extern const bcstring be_const_str_v;
+extern const bcstring be_const_str_value;
+extern const bcstring be_const_str_value_error;
+extern const bcstring be_const_str_valuer_error;
+extern const bcstring be_const_str_var;
+extern const bcstring be_const_str_w;
+extern const bcstring be_const_str_wd;
+extern const bcstring be_const_str_web_add_button;
+extern const bcstring be_const_str_web_add_config_button;
+extern const bcstring be_const_str_web_add_console_button;
+extern const bcstring be_const_str_web_add_handler;
+extern const bcstring be_const_str_web_add_main_button;
+extern const bcstring be_const_str_web_add_management_button;
+extern const bcstring be_const_str_web_send;
+extern const bcstring be_const_str_web_send_decimal;
+extern const bcstring be_const_str_web_sensor;
+extern const bcstring be_const_str_webclient;
+extern const bcstring be_const_str_webserver;
+extern const bcstring be_const_str_while;
+extern const bcstring be_const_str_widget_cb;
+extern const bcstring be_const_str_widget_constructor;
+extern const bcstring be_const_str_widget_ctor_cb;
+extern const bcstring be_const_str_widget_ctor_impl;
+extern const bcstring be_const_str_widget_destructor;
+extern const bcstring be_const_str_widget_dtor_cb;
+extern const bcstring be_const_str_widget_dtor_impl;
+extern const bcstring be_const_str_widget_editable;
+extern const bcstring be_const_str_widget_event;
+extern const bcstring be_const_str_widget_event_cb;
+extern const bcstring be_const_str_widget_event_impl;
+extern const bcstring be_const_str_widget_group_def;
+extern const bcstring be_const_str_widget_height_def;
+extern const bcstring be_const_str_widget_instance_size;
+extern const bcstring be_const_str_widget_struct_by_class;
+extern const bcstring be_const_str_widget_struct_default;
+extern const bcstring be_const_str_widget_width_def;
+extern const bcstring be_const_str_width;
+extern const bcstring be_const_str_width_def;
+extern const bcstring be_const_str_wifi;
+extern const bcstring be_const_str_wire;
+extern const bcstring be_const_str_wire1;
+extern const bcstring be_const_str_wire2;
+extern const bcstring be_const_str_wire_scan;
+extern const bcstring be_const_str_write;
+extern const bcstring be_const_str_write8;
+extern const bcstring be_const_str_write_bit;
+extern const bcstring be_const_str_write_bytes;
+extern const bcstring be_const_str_write_file;
+extern const bcstring be_const_str_write_gpio;
+extern const bcstring be_const_str_x;
+extern const bcstring be_const_str_x1;
+extern const bcstring be_const_str_y;
+extern const bcstring be_const_str_y1;
+extern const bcstring be_const_str_year;
+extern const bcstring be_const_str_yield;
+extern const bcstring be_const_str_zero;
+extern const bcstring be_const_str_zip;
diff --git a/lib/libesp32/Berry/generate/be_const_strtab_def.h b/lib/libesp32/Berry/generate/be_const_strtab_def.h
index 16488ae94..44676a35e 100644
--- a/lib/libesp32/Berry/generate/be_const_strtab_def.h
+++ b/lib/libesp32/Berry/generate/be_const_strtab_def.h
@@ -1,523 +1,1112 @@
-be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str__begin_transmission);
-be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, &be_const_str_set_light);
-be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, NULL);
-be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, NULL);
-be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str___lower__);
-be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, NULL);
-be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_getbits);
-be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_input);
-be_define_const_str(input, "input", 4191711099u, 0, 5, NULL);
-be_define_const_str(dot_size, ".size", 1965188224u, 0, 5, &be_const_str_publish_result);
-be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_web_send_decimal);
-be_define_const_str(web_send_decimal, "web_send_decimal", 1407210204u, 0, 16, &be_const_str_def);
-be_define_const_str(def, "def", 3310976652u, 55, 3, NULL);
-be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, &be_const_str_begin);
-be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_resp_cmnd);
-be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, NULL);
-be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_set);
-be_define_const_str(set, "set", 3324446467u, 0, 3, &be_const_str_tag);
-be_define_const_str(tag, "tag", 2516003219u, 0, 3, NULL);
-be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_kv);
-be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_publish);
-be_define_const_str(publish, "publish", 264247304u, 0, 7, &be_const_str_read32);
-be_define_const_str(read32, "read32", 1741276240u, 0, 6, NULL);
-be_define_const_str(load, "load", 3859241449u, 0, 4, &be_const_str_read13);
-be_define_const_str(read13, "read13", 12887293u, 0, 6, &be_const_str_search);
-be_define_const_str(search, "search", 2150836393u, 0, 6, NULL);
-be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_finish);
-be_define_const_str(finish, "finish", 1494643858u, 0, 6, &be_const_str_hex);
-be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_isinstance);
-be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, &be_const_str_rand);
-be_define_const_str(rand, "rand", 2711325910u, 0, 4, NULL);
-be_define_const_str(POST, "POST", 1929554311u, 0, 4, &be_const_str_SERIAL_6E2);
-be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, NULL);
-be_define_const_str(classname, "classname", 1998589948u, 0, 9, NULL);
-be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_open);
-be_define_const_str(open, "open", 3546203337u, 0, 4, &be_const_str_redirect);
-be_define_const_str(redirect, "redirect", 389758641u, 0, 8, NULL);
-be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, &be_const_str_resp_cmnd_failed);
-be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, &be_const_str_reverse_gamma10);
-be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, NULL);
-be_define_const_str(strftime, "strftime", 187738851u, 0, 8, NULL);
-be_define_const_str(insert, "insert", 3332609576u, 0, 6, &be_const_str_false);
-be_define_const_str(false, "false", 184981848u, 62, 5, NULL);
-be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, &be_const_str_serial);
-be_define_const_str(serial, "serial", 3687697785u, 0, 6, NULL);
-be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_scale_uint);
-be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, NULL);
-be_define_const_str(return, "return", 2246981567u, 60, 6, NULL);
-be_define_const_str(wire, "wire", 4082753944u, 0, 4, &be_const_str_write_bytes);
-be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, NULL);
-be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_exec_tele);
-be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, &be_const_str_target_search);
-be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL);
-be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_pi);
-be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_state);
-be_define_const_str(state, "state", 2016490230u, 0, 5, NULL);
-be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_init);
-be_define_const_str(init, "init", 380752755u, 0, 4, &be_const_str_member);
-be_define_const_str(member, "member", 719708611u, 0, 6, NULL);
-be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, &be_const_str_digital_read);
-be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, &be_const_str_imin);
-be_define_const_str(imin, "imin", 2714127864u, 0, 4, NULL);
-be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, &be_const_str_keys);
-be_define_const_str(keys, "keys", 4182378701u, 0, 4, &be_const_str_real);
-be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str_sin);
-be_define_const_str(sin, "sin", 3761252941u, 0, 3, NULL);
-be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, NULL);
-be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, &be_const_str_ctypes_bytes_dyn);
-be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_raise);
-be_define_const_str(raise, "raise", 1593437475u, 70, 5, NULL);
-be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str__settings_def);
-be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_read24);
-be_define_const_str(read24, "read24", 1808533811u, 0, 6, NULL);
-be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_remove_driver);
-be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, NULL);
-be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_memory);
-be_define_const_str(memory, "memory", 2229924270u, 0, 6, &be_const_str_set_auth);
-be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, NULL);
-be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_class);
-be_define_const_str(class, "class", 2872970239u, 57, 5, NULL);
-be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_shared_key);
-be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_tanh);
-be_define_const_str(tanh, "tanh", 153638352u, 0, 4, &be_const_str_nil);
-be_define_const_str(nil, "nil", 228849900u, 63, 3, NULL);
-be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_last_modified);
-be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, &be_const_str_resolvecmnd);
-be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, NULL);
-be_define_const_str(_read, "_read", 346717030u, 0, 5, NULL);
-be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_content_button);
-be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_setbits);
-be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, &be_const_str_upper);
-be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL);
-be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_time_str);
-be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, NULL);
-be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_fromptr);
-be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, &be_const_str_push);
-be_define_const_str(push, "push", 2272264157u, 0, 4, &be_const_str_srand);
-be_define_const_str(srand, "srand", 465518633u, 0, 5, NULL);
-be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_seti);
-be_define_const_str(seti, "seti", 1500556254u, 0, 4, NULL);
-be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, &be_const_str_cmd);
-be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, NULL);
-be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_size);
-be_define_const_str(size, "size", 597743964u, 0, 4, NULL);
-be_define_const_str(try, "try", 2887626766u, 68, 3, NULL);
-be_define_const_str(web_send, "web_send", 2989941448u, 0, 8, &be_const_str_except);
-be_define_const_str(except, "except", 950914032u, 69, 6, NULL);
-be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_SERIAL_8E2);
-be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str__available);
-be_define_const_str(_available, "_available", 1306196581u, 0, 10, NULL);
-be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, &be_const_str_wire2);
-be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, NULL);
-be_define_const_str(dump, "dump", 3663001223u, 0, 4, &be_const_str_exec_cmd);
-be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, NULL);
-be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_exp);
-be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_isrunning);
-be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_remove_rule);
-be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, &be_const_str_run_deferred);
-be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, &be_const_str_scan);
-be_define_const_str(scan, "scan", 3974641896u, 0, 4, &be_const_str_for);
-be_define_const_str(for, "for", 2901640080u, 54, 3, NULL);
-be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, &be_const_str_url_encode);
-be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL);
-be_define_const_str(addr, "addr", 1087856498u, 0, 4, NULL);
-be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_loop);
-be_define_const_str(loop, "loop", 3723446379u, 0, 4, NULL);
-be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_chars_in_string);
-be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_cosh);
-be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_import);
-be_define_const_str(import, "import", 288002260u, 66, 6, NULL);
-be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, &be_const_str_type);
-be_define_const_str(type, "type", 1361572173u, 0, 4, NULL);
-be_define_const_str(clear, "clear", 1550717474u, 0, 5, NULL);
-be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_issubclass);
-be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, &be_const_str_remove_timer);
-be_define_const_str(remove_timer, "remove_timer", 4141472215u, 0, 12, &be_const_str_sinh);
-be_define_const_str(sinh, "sinh", 282220607u, 0, 4, NULL);
-be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, &be_const_str_Wire);
-be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str_get_light);
-be_define_const_str(get_light, "get_light", 381930476u, 0, 9, NULL);
-be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, &be_const_str_list);
-be_define_const_str(list, "list", 217798785u, 0, 4, &be_const_str_stop);
-be_define_const_str(stop, "stop", 3411225317u, 0, 4, &be_const_str_try_rule);
-be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, NULL);
-be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, NULL);
-be_define_const_str(dot_p2, ".p2", 232398067u, 0, 3, &be_const_str_has);
-be_define_const_str(has, "has", 3988721635u, 0, 3, NULL);
-be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, &be_const_str_setrange);
-be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, NULL);
-be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, NULL);
-be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_else);
-be_define_const_str(else, "else", 3183434736u, 52, 4, NULL);
-be_define_const_str(concat, "concat", 4124019837u, 0, 6, &be_const_str_set_power);
-be_define_const_str(set_power, "set_power", 549820893u, 0, 9, NULL);
-be_define_const_str(tomap, "tomap", 612167626u, 0, 5, NULL);
-be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, NULL);
-be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_eth);
-be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_write_bit);
-be_define_const_str(write_bit, "write_bit", 2660990436u, 0, 9, NULL);
-be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_pow);
-be_define_const_str(pow, "pow", 1479764693u, 0, 3, &be_const_str_select);
-be_define_const_str(select, "select", 297952813u, 0, 6, NULL);
-be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_classof);
-be_define_const_str(classof, "classof", 1796577762u, 0, 7, &be_const_str_if);
-be_define_const_str(if, "if", 959999494u, 50, 2, NULL);
-be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_arg);
-be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_cb_dispatch);
-be_define_const_str(cb_dispatch, "cb_dispatch", 1741510499u, 0, 11, &be_const_str_response_append);
-be_define_const_str(response_append, "response_append", 450346371u, 0, 15, NULL);
-be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_write);
-be_define_const_str(write, "write", 3190202204u, 0, 5, &be_const_str_write8);
-be_define_const_str(write8, "write8", 3133991532u, 0, 6, NULL);
-be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_log);
-be_define_const_str(log, "log", 1062293841u, 0, 3, NULL);
-be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_read12);
-be_define_const_str(read12, "read12", 4291076970u, 0, 6, &be_const_str_resp_cmnd_str);
-be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, NULL);
-be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_digital_write);
-be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_static);
-be_define_const_str(static, "static", 3532702267u, 71, 6, NULL);
-be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, &be_const_str_find_op);
-be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, NULL);
-be_define_const_str(call, "call", 3018949801u, 0, 4, NULL);
-be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, NULL);
-be_define_const_str(opt_eq, "==", 2431966415u, 0, 2, NULL);
-be_define_const_str(save, "save", 3439296072u, 0, 4, NULL);
-be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, NULL);
-be_define_const_str(_cb, "_cb", 4043300367u, 0, 3, NULL);
-be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_public_key);
-be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, NULL);
-be_define_const_str(as, "as", 1579491469u, 67, 2, NULL);
-be_define_const_str(dot_w, ".w", 1255414514u, 0, 2, &be_const_str_SERIAL_8O1);
-be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_compile);
-be_define_const_str(compile, "compile", 1000265118u, 0, 7, &be_const_str_range);
-be_define_const_str(range, "range", 4208725202u, 0, 5, NULL);
-be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, NULL);
-be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_delay);
-be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_pop);
-be_define_const_str(pop, "pop", 1362321360u, 0, 3, &be_const_str_reset);
-be_define_const_str(reset, "reset", 1695364032u, 0, 5, &be_const_str_wire_scan);
-be_define_const_str(wire_scan, "wire_scan", 2671275880u, 0, 9, NULL);
-be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, &be_const_str_tolower);
-be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, NULL);
-be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_asin);
-be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_nan);
-be_define_const_str(nan, "nan", 797905850u, 0, 3, NULL);
-be_define_const_str(deg, "deg", 3327754271u, 0, 3, NULL);
-be_define_const_str(log10, "log10", 2346846000u, 0, 5, NULL);
-be_define_const_str(char, "char", 2823553821u, 0, 4, &be_const_str_get_size);
-be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, NULL);
-be_define_const_str(opt_call, "()", 685372826u, 0, 2, &be_const_str_end);
-be_define_const_str(end, "end", 1787721130u, 56, 3, NULL);
-be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_time_dump);
-be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, NULL);
-be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, &be_const_str_wifi);
-be_define_const_str(wifi, "wifi", 120087624u, 0, 4, NULL);
-be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, &be_const_str_reverse);
-be_define_const_str(reverse, "reverse", 558918661u, 0, 7, NULL);
+be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_True);
+be_define_const_str(_X0A, "\n", 252472541u, 0, 1, &be_const_str_i2c_enabled);
+be_define_const_str(_X20, " ", 621580159u, 0, 1, &be_const_str_add_cmd);
+be_define_const_str(_X21_X3D, "!=", 2428715011u, 0, 2, &be_const_str__X23autoexec_X2Ebe);
+be_define_const_str(_X21_X3D_X3D, "!==", 559817114u, 0, 3, &be_const_str__X2Ew);
+be_define_const_str(_X23, "#", 638357778u, 0, 1, &be_const_str_No_X20callback_X20available);
+be_define_const_str(_X23autoexec_X2Ebat, "#autoexec.bat", 3382890497u, 0, 13, NULL);
+be_define_const_str(_X23autoexec_X2Ebe, "#autoexec.be", 1181757091u, 0, 12, &be_const_str_assert);
+be_define_const_str(_X23display_X2Eini, "#display.ini", 182218220u, 0, 12, &be_const_str_code);
+be_define_const_str(_X23init_X2Ebat, "#init.bat", 3297595077u, 0, 9, &be_const_str__X2502d_X25s_X2502d);
+be_define_const_str(_X23preinit_X2Ebe, "#preinit.be", 687035716u, 0, 11, &be_const_str__timers);
+be_define_const_str(_X2502d_X25s_X2502d, "%02d%s%02d", 1587999717u, 0, 10, &be_const_str__X3D_X3C_X3E_X21);
+be_define_const_str(_X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d, "%04d-%02d-%02dT%02d:%02d:%02d", 3425528601u, 0, 29, &be_const_str_get_object_from_ptr);
+be_define_const_str(_X25s_X2Eautoconf, "%s.autoconf", 3560383524u, 0, 11, &be_const_str_RES_OK);
+be_define_const_str(_X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B, "&lt;Error: apply new or remove&gt;", 2855507949u, 0, 34, &be_const_str_hs2rgb);
+be_define_const_str(_X26lt_X3BNone_X26gt_X3B, "&lt;None&gt;", 2602165498u, 0, 12, &be_const_str__X2Fac);
+be_define_const_str(_X28_X29, "()", 685372826u, 0, 2, NULL);
+be_define_const_str(_X2B, "+", 772578730u, 0, 1, &be_const_str_lower);
+be_define_const_str(_X2C, ",", 688690635u, 0, 1, &be_const_str_SERIAL_7O1);
+be_define_const_str(_X2D_X2D_X3A_X2D_X2D, "--:--", 1370615441u, 0, 5, &be_const_str__X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E);
+be_define_const_str(_X2E, ".", 722245873u, 0, 1, &be_const_str_search);
+be_define_const_str(_X2E_X2E, "..", 2748622605u, 0, 2, &be_const_str__debug_present);
+be_define_const_str(_X2Eautoconf, ".autoconf", 2524679088u, 0, 9, &be_const_str_false);
+be_define_const_str(_X2Ebe, ".be", 1325797348u, 0, 3, &be_const_str_Tasmota);
+be_define_const_str(_X2Ebec, ".bec", 3985273221u, 0, 4, &be_const_str_CFG_X3A_X20downloading_X20_X27_X25s_X27);
+be_define_const_str(_X2Elen, ".len", 850842136u, 0, 4, &be_const_str__X3Cselect_X20name_X3D_X27zip_X27_X3E);
+be_define_const_str(_X2Ep, ".p", 1171526419u, 0, 2, NULL);
+be_define_const_str(_X2Ep1, ".p1", 249175686u, 0, 3, &be_const_str__t);
+be_define_const_str(_X2Ep2, ".p2", 232398067u, 0, 3, &be_const_str_BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29);
+be_define_const_str(_X2Esize, ".size", 1965188224u, 0, 5, &be_const_str_is_first_time);
+be_define_const_str(_X2Etapp, ".tapp", 1363391594u, 0, 5, &be_const_str__X7B);
+be_define_const_str(_X2Ew, ".w", 1255414514u, 0, 2, &be_const_str_clear);
+be_define_const_str(_X2F, "/", 705468254u, 0, 1, &be_const_str_SERIAL_7O2);
+be_define_const_str(_X2F_X2Eautoconf, "/.autoconf", 2212074393u, 0, 10, &be_const_str_CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27);
+be_define_const_str(_X2F_X3Frst_X3D, "/?rst=", 580074707u, 0, 6, &be_const_str_SERIAL_7N2);
+be_define_const_str(_X2Fac, "/ac", 3904651978u, 0, 3, &be_const_str_WS2812);
+be_define_const_str(_X3A, ":", 1057798253u, 0, 1, &be_const_str_AudioFileSourceFS);
+be_define_const_str(_X3C, "<", 957132539u, 0, 1, &be_const_str_digital_write);
+be_define_const_str(_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "</form></p>", 3546571739u, 0, 11, &be_const_str_LVG_X3A_X20call_X20to_X20unsupported_X20callback);
+be_define_const_str(_X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "</select><p></p>", 1863865923u, 0, 16, &be_const_str_rule);
+be_define_const_str(_X3C_X3D, "<=", 2499223986u, 0, 2, &be_const_str_set_chg_current);
+be_define_const_str(_X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E, "<button name='reapply' class='button bgrn'>Re-apply current configuration</button>", 3147934216u, 0, 82, &be_const_str_find_op);
+be_define_const_str(_X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E, "<button name='zipapply' class='button bgrn'>Apply configuration</button>", 1205771629u, 0, 72, NULL);
+be_define_const_str(_X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E, "<fieldset><style>.bdis{background:#888;}.bdis:hover{background:#888;}</style>", 842307168u, 0, 77, &be_const_str_get_current_module_path);
+be_define_const_str(_X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29, "<instance: %s(%s, %s, %s)", 257363333u, 0, 25, NULL);
+be_define_const_str(_X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E, "<label>Choose a device configuration:</label><br>", 1336654704u, 0, 49, &be_const_str_delay);
+be_define_const_str(_X3Clambda_X3E, "<lambda>", 607256038u, 0, 8, &be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20);
+be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='Autoconfiguration'>&nbsp;Current auto-configuration</b></legend>", 4212500780u, 0, 82, &be_const_str_CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29);
+be_define_const_str(_X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E, "<legend><b title='New autoconf'>&nbsp;Select new auto-configuration</b></legend>", 1926223891u, 0, 80, &be_const_str_CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29);
+be_define_const_str(_X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E, "<option value='%s'>%s</option>", 510303524u, 0, 30, &be_const_str_write);
+be_define_const_str(_X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E, "<option value='reset'>&lt;Remove autoconf&gt;</option>", 3994619755u, 0, 54, &be_const_str_None);
+be_define_const_str(_X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E, "<p style='width:340px;'><b>Exception:</b><br>'%s'<br>%s</p>", 4252565082u, 0, 59, &be_const_str_classof);
+be_define_const_str(_X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E, "<p></p></fieldset><p></p>", 2052843416u, 0, 25, &be_const_str_button_pressed);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E, "<p><form id=ac action='ac' style='display: block;' method='get'><button>&#129668; Auto-configuration</button></form></p>", 452285201u, 0, 120, NULL);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dreapply_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=reapply style='display: block;' action='/ac' method='post' ", 546993478u, 0, 71, &be_const_str_wd);
+be_define_const_str(_X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20, "<p><form id=zip style='display: block;' action='/ac' method='post' ", 4033622166u, 0, 67, &be_const_str__X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E);
+be_define_const_str(_X3Cp_X3E_X3Csmall_X3E_X26nbsp_X3B_X28This_X20feature_X20requires_X20an_X20internet_X20connection_X29_X3C_X2Fsmall_X3E_X3C_X2Fp_X3E, "<p><small>&nbsp;(This feature requires an internet connection)</small></p>", 2719266486u, 0, 74, NULL);
+be_define_const_str(_X3Cp_X3ECurrent_X20configuration_X3A_X20_X3C_X2Fp_X3E_X3Cp_X3E_X3Cb_X3E_X25s_X3C_X2Fb_X3E_X3C_X2Fp_X3E, "<p>Current configuration: </p><p><b>%s</b></p>", 4115655761u, 0, 46, &be_const_str_exec_tele);
+be_define_const_str(_X3Cselect_X20name_X3D_X27zip_X27_X3E, "<select name='zip'>", 4247924536u, 0, 19, &be_const_str_False);
+be_define_const_str(_X3D, "=", 940354920u, 0, 1, &be_const_str_CFG_X3A_X20return_code_X3D_X25i);
+be_define_const_str(_X3D_X3C_X3E_X21, "=<>!", 2664470277u, 0, 4, &be_const_str_CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting);
+be_define_const_str(_X3D_X3D, "==", 2431966415u, 0, 2, &be_const_str_get);
+be_define_const_str(_X3E, ">", 990687777u, 0, 1, &be_const_str_CFG_X3A_X20loading_X20_X27_X25s_X27);
+be_define_const_str(_X3E_X3D, ">=", 284975636u, 0, 2, &be_const_str__anonymous_);
+be_define_const_str(_X3F, "?", 973910158u, 0, 1, &be_const_str_TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27);
+be_define_const_str(AES_GCM, "AES_GCM", 3832208678u, 0, 7, NULL);
+be_define_const_str(AXP192, "AXP192", 757230128u, 0, 6, &be_const_str__buffer);
+be_define_const_str(Animate_X20pc_X20is_X20out_X20of_X20range, "Animate pc is out of range", 1854929421u, 0, 26, &be_const_str_true);
+be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str_allocated);
+be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_due);
+be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_enabled);
+be_define_const_str(AudioGeneratorMP3, "AudioGeneratorMP3", 2199818488u, 0, 17, &be_const_str_check_privileged_access);
+be_define_const_str(AudioGeneratorWAV, "AudioGeneratorWAV", 2746509368u, 0, 17, &be_const_str_digital_read);
+be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str_get_pixel_color);
+be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, NULL);
+be_define_const_str(Auto_X2Dconfiguration, "Auto-configuration", 1665006109u, 0, 18, NULL);
+be_define_const_str(BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20, "BRY: ERROR, bad json: ", 2715135809u, 0, 22, &be_const_str_fromptr);
+be_define_const_str(BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "BRY: Exception> '%s' - %s", 2246990964u, 0, 25, &be_const_str_SERIAL_6N2);
+be_define_const_str(BRY_X3A_X20could_X20not_X20save_X20compiled_X20file_X20_X25s_X20_X28_X25s_X29, "BRY: could not save compiled file %s (%s)", 736659787u, 0, 41, NULL);
+be_define_const_str(BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson, "BRY: failed to load _persist.json", 2991913445u, 0, 33, &be_const_str_set_time);
+be_define_const_str(BUTTON_CONFIGURATION, "BUTTON_CONFIGURATION", 70820856u, 0, 20, &be_const_str_files);
+be_define_const_str(CFG_X3A_X20_X27init_X2Ebat_X27_X20done_X2C_X20restarting, "CFG: 'init.bat' done, restarting", 1569670677u, 0, 32, &be_const_str_push_path);
+be_define_const_str(CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s, "CFG: Exception> '%s' - %s", 1228874553u, 0, 25, &be_const_str_CFG_X3A_X20removed_X20file_X20_X27_X25s_X27);
+be_define_const_str(CFG_X3A_X20could_X20not_X20run_X20_X25s_X20_X28_X25s_X20_X2D_X20_X25s_X29, "CFG: could not run %s (%s - %s)", 1428829580u, 0, 31, &be_const_str_COLOR_BLACK);
+be_define_const_str(CFG_X3A_X20downloading_X20_X27_X25s_X27, "CFG: downloading '%s'", 589480701u, 0, 21, &be_const_str_floor);
+be_define_const_str(CFG_X3A_X20exception_X20_X27_X25s_X27_X20_X2D_X20_X27_X25s_X27, "CFG: exception '%s' - '%s'", 4095407913u, 0, 26, &be_const_str_get_option);
+be_define_const_str(CFG_X3A_X20loaded_X20_X20, "CFG: loaded  ", 3710273538u, 0, 13, &be_const_str_delete_all_configs);
+be_define_const_str(CFG_X3A_X20loaded_X20_X27_X25s_X27, "CFG: loaded '%s'", 1699028828u, 0, 16, NULL);
+be_define_const_str(CFG_X3A_X20loading_X20, "CFG: loading ", 4010361503u, 0, 13, NULL);
+be_define_const_str(CFG_X3A_X20loading_X20_X27_X25s_X27, "CFG: loading '%s'", 2285306097u, 0, 17, &be_const_str_SK6812_GRBW);
+be_define_const_str(CFG_X3A_X20multiple_X20autoconf_X20files_X20found_X2C_X20aborting_X20_X28_X27_X25s_X27_X20_X2B_X20_X27_X25s_X27_X29, "CFG: multiple autoconf files found, aborting ('%s' + '%s')", 197663371u, 0, 58, NULL);
+be_define_const_str(CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found, "CFG: no '*.autoconf' file found", 127493957u, 0, 31, &be_const_str_get_free_heap);
+be_define_const_str(CFG_X3A_X20ran_X20_X20, "CFG: ran  ", 3579570472u, 0, 10, &be_const_str_contains);
+be_define_const_str(CFG_X3A_X20removed_X20file_X20_X27_X25s_X27, "CFG: removed file '%s'", 2048602473u, 0, 22, &be_const_str_SERIAL_8E2);
+be_define_const_str(CFG_X3A_X20removing_X20autoconf_X20files, "CFG: removing autoconf files", 4014704970u, 0, 28, &be_const_str_get_bat_charge_current);
+be_define_const_str(CFG_X3A_X20removing_X20first_X20time_X20marker, "CFG: removing first time marker", 2125556683u, 0, 31, &be_const_str__lvgl);
+be_define_const_str(CFG_X3A_X20return_code_X3D_X25i, "CFG: return_code=%i", 2059897320u, 0, 19, &be_const_str_OPTION_A);
+be_define_const_str(CFG_X3A_X20running_X20, "CFG: running ", 2478334534u, 0, 13, NULL);
+be_define_const_str(CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem, "CFG: skipping 'display.ini' because already present in file-system", 3965549264u, 0, 66, NULL);
+be_define_const_str(COLOR_BLACK, "COLOR_BLACK", 264427940u, 0, 11, NULL);
+be_define_const_str(COLOR_WHITE, "COLOR_WHITE", 2536871270u, 0, 11, &be_const_str__energy);
+be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_gc);
+be_define_const_str(EVENT_DRAW_MAIN, "EVENT_DRAW_MAIN", 1955620614u, 0, 15, &be_const_str_SERIAL_5E2);
+be_define_const_str(EVENT_DRAW_PART_BEGIN, "EVENT_DRAW_PART_BEGIN", 3391865024u, 0, 21, &be_const_str_available);
+be_define_const_str(EVENT_DRAW_PART_END, "EVENT_DRAW_PART_END", 3301625292u, 0, 19, &be_const_str_chars_in_string);
+be_define_const_str(False, "False", 2541049336u, 0, 5, &be_const_str_set_style_line_color);
+be_define_const_str(GET, "GET", 2531704439u, 0, 3, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
+be_define_const_str(HTTP_GET, "HTTP_GET", 1722467738u, 0, 8, &be_const_str_I2C_Driver);
+be_define_const_str(HTTP_POST, "HTTP_POST", 1999554144u, 0, 9, &be_const_str_imin);
+be_define_const_str(I2C_X3A, "I2C:", 813483371u, 0, 4, &be_const_str_read24);
+be_define_const_str(I2C_Driver, "I2C_Driver", 1714501658u, 0, 10, &be_const_str_addr);
+be_define_const_str(LVG_X3A_X20call_X20to_X20unsupported_X20callback, "LVG: call to unsupported callback", 504176819u, 0, 33, &be_const_str_cb_dispatch);
+be_define_const_str(Leds, "Leds", 2709245275u, 0, 4, &be_const_str_arg_name);
+be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, NULL);
+be_define_const_str(No_X20callback_X20available, "No callback available", 633786138u, 0, 21, &be_const_str_gpio);
+be_define_const_str(None, "None", 810547195u, 0, 4, &be_const_str_SERIAL_5E1);
+be_define_const_str(OPTION_A, "OPTION_A", 1133299440u, 0, 8, &be_const_str_init_draw_line_dsc);
+be_define_const_str(OneWire, "OneWire", 2298990722u, 0, 7, &be_const_str_Timer);
+be_define_const_str(PART_MAIN, "PART_MAIN", 2473491508u, 0, 9, &be_const_str_STATE_DEFAULT);
+be_define_const_str(POST, "POST", 1929554311u, 0, 4, NULL);
+be_define_const_str(Parameter_X20error, "Parameter error", 3840042038u, 0, 15, NULL);
+be_define_const_str(RES_OK, "RES_OK", 1233817284u, 0, 6, &be_const_str_bri);
+be_define_const_str(Restart_X201, "Restart 1", 3504455855u, 0, 9, &be_const_str_min);
+be_define_const_str(SERIAL_5E1, "SERIAL_5E1", 1163775235u, 0, 10, &be_const_str_zero);
+be_define_const_str(SERIAL_5E2, "SERIAL_5E2", 1180552854u, 0, 10, &be_const_str_lv_obj_class);
+be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_ins_ramp);
+be_define_const_str(SERIAL_5N2, "SERIAL_5N2", 3363364537u, 0, 10, NULL);
+be_define_const_str(SERIAL_5O1, "SERIAL_5O1", 3782657917u, 0, 10, &be_const_str_flush);
+be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, NULL);
 be_define_const_str(SERIAL_6E1, "SERIAL_6E1", 334249486u, 0, 10, NULL);
-be_define_const_str(SERIAL_5O2, "SERIAL_5O2", 3732325060u, 0, 10, &be_const_str_SERIAL_8E1);
-be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_asstring);
-be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_deinit);
-be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, NULL);
-be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, NULL);
-be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_millis);
-be_define_const_str(millis, "millis", 1214679063u, 0, 6, NULL);
-be_define_const_str(AudioOutput, "AudioOutput", 3257792048u, 0, 11, &be_const_str_members);
-be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_rtc);
-be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, NULL);
-be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str__write);
-be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_content_start);
-be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_module);
-be_define_const_str(module, "module", 3617558685u, 0, 6, NULL);
-be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_remove_cmd);
-be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL);
-be_define_const_str(MD5, "MD5", 1935726387u, 0, 3, &be_const_str_sqrt);
-be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, NULL);
-be_define_const_str(SERIAL_5N1, "SERIAL_5N1", 3313031680u, 0, 10, &be_const_str_break);
-be_define_const_str(break, "break", 3378807160u, 58, 5, NULL);
-be_define_const_str(map, "map", 3751997361u, 0, 3, &be_const_str_setmember);
-be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, &be_const_str_tostring);
-be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, NULL);
-be_define_const_str(AudioGenerator, "AudioGenerator", 1839297342u, 0, 14, &be_const_str_while);
-be_define_const_str(while, "while", 231090382u, 53, 5, NULL);
-be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_resp_cmnd_done);
-be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, NULL);
-be_define_const_str(AudioOutputI2S, "AudioOutputI2S", 638031784u, 0, 14, &be_const_str_has_arg);
-be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, NULL);
-be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_read);
-be_define_const_str(read, "read", 3470762949u, 0, 4, &be_const_str_remove);
-be_define_const_str(remove, "remove", 3683784189u, 0, 6, NULL);
-be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str_lower);
-be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_path);
-be_define_const_str(path, "path", 2223459638u, 0, 4, NULL);
-be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, &be_const_str_get);
-be_define_const_str(get, "get", 1410115415u, 0, 3, &be_const_str_elif);
-be_define_const_str(elif, "elif", 3232090307u, 51, 4, NULL);
-be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_exec_rules);
-be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_pin);
-be_define_const_str(pin, "pin", 1866532500u, 0, 3, NULL);
-be_define_const_str(collect, "collect", 2399039025u, 0, 7, NULL);
-be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_global);
-be_define_const_str(global, "global", 503252654u, 0, 6, NULL);
-be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_content_stop);
-be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, &be_const_str_read8);
-be_define_const_str(read8, "read8", 2802788167u, 0, 5, &be_const_str_wire1);
-be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, NULL);
-be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_setitem);
-be_define_const_str(setitem, "setitem", 1554834596u, 0, 7, NULL);
-be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, &be_const_str_erase);
-be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_i2c_enabled);
-be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, &be_const_str_resize);
-be_define_const_str(resize, "resize", 3514612129u, 0, 6, NULL);
-be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_escape);
-be_define_const_str(escape, "escape", 2652972038u, 0, 6, &be_const_str_isnan);
-be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, &be_const_str_skip);
-be_define_const_str(skip, "skip", 1097563074u, 0, 4, &be_const_str_var);
-be_define_const_str(var, "var", 2317739966u, 64, 3, NULL);
-be_define_const_str(dot_p, ".p", 1171526419u, 0, 2, &be_const_str_write_file);
-be_define_const_str(write_file, "write_file", 3177658879u, 0, 10, NULL);
-be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_str);
-be_define_const_str(str, "str", 3259748752u, 0, 3, &be_const_str_super);
-be_define_const_str(super, "super", 4152230356u, 0, 5, &be_const_str_update);
-be_define_const_str(update, "update", 672109684u, 0, 6, NULL);
-be_define_const_str(_def, "_def", 1985022181u, 0, 4, &be_const_str__drivers);
-be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, NULL);
-be_define_const_str(imax, "imax", 3084515410u, 0, 4, NULL);
-be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, NULL);
-be_define_const_str(dot_len, ".len", 850842136u, 0, 4, &be_const_str_SERIAL_6O1);
-be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_attrdump);
-be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_on);
-be_define_const_str(on, "on", 1630810064u, 0, 2, &be_const_str_rad);
-be_define_const_str(rad, "rad", 1358899048u, 0, 3, NULL);
-be_define_const_str(bus, "bus", 1607822841u, 0, 3, NULL);
-be_define_const_str(yield, "yield", 1821831854u, 0, 5, NULL);
-be_define_const_str(top, "top", 2802900028u, 0, 3, NULL);
-be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, &be_const_str_read_sensors);
-be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, NULL);
-be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL);
-be_define_const_str(_get_cb, "_get_cb", 1448849122u, 0, 7, &be_const_str_int);
-be_define_const_str(int, "int", 2515107422u, 0, 3, NULL);
-be_define_const_str(opt_neq, "!=", 2428715011u, 0, 2, &be_const_str_gen_cb);
-be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, NULL);
-be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_continue);
-be_define_const_str(continue, "continue", 2977070660u, 59, 8, NULL);
-be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, NULL);
-be_define_const_str(AudioFileSource, "AudioFileSource", 2959980058u, 0, 15, &be_const_str_format);
-be_define_const_str(format, "format", 3114108242u, 0, 6, NULL);
-be_define_const_str(EC_C25519, "EC_C25519", 95492591u, 0, 9, &be_const_str_close);
-be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_content_flush);
-be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_reduce);
-be_define_const_str(reduce, "reduce", 2002030311u, 0, 6, &be_const_str_tr);
-be_define_const_str(tr, "tr", 1195724803u, 0, 2, NULL);
-be_define_const_str(available, "available", 1727918744u, 0, 9, NULL);
-be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, NULL);
-be_define_const_str(opt_add, "+", 772578730u, 0, 1, &be_const_str_SERIAL_8N2);
-be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_wd);
-be_define_const_str(wd, "wd", 1531424278u, 0, 2, NULL);
-be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_fromb64);
-be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, NULL);
-be_define_const_str(number, "number", 467038368u, 0, 6, &be_const_str_print);
-be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_set_useragent);
-be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, &be_const_str_tan);
-be_define_const_str(tan, "tan", 2633446552u, 0, 3, &be_const_str_do);
-be_define_const_str(do, "do", 1646057492u, 65, 2, NULL);
-be_define_const_str(, "", 2166136261u, 0, 0, &be_const_str_opt_connect);
-be_define_const_str(opt_connect, "..", 2748622605u, 0, 2, &be_const_str__rules);
+be_define_const_str(SERIAL_6E2, "SERIAL_6E2", 317471867u, 0, 10, NULL);
+be_define_const_str(SERIAL_6N1, "SERIAL_6N1", 198895701u, 0, 10, &be_const_str_char);
+be_define_const_str(SERIAL_6N2, "SERIAL_6N2", 148562844u, 0, 10, &be_const_str_matrix);
+be_define_const_str(SERIAL_6O1, "SERIAL_6O1", 266153272u, 0, 10, &be_const_str_atleast1);
+be_define_const_str(SERIAL_6O2, "SERIAL_6O2", 316486129u, 0, 10, &be_const_str_content_send);
+be_define_const_str(SERIAL_7E1, "SERIAL_7E1", 147718061u, 0, 10, &be_const_str_stop_iteration);
+be_define_const_str(SERIAL_7E2, "SERIAL_7E2", 97385204u, 0, 10, &be_const_str_copy);
+be_define_const_str(SERIAL_7N1, "SERIAL_7N1", 1891060246u, 0, 10, NULL);
+be_define_const_str(SERIAL_7N2, "SERIAL_7N2", 1874282627u, 0, 10, &be_const_str_elif);
+be_define_const_str(SERIAL_7O1, "SERIAL_7O1", 1823802675u, 0, 10, &be_const_str_init);
+be_define_const_str(SERIAL_7O2, "SERIAL_7O2", 1840580294u, 0, 10, &be_const_str_global);
+be_define_const_str(SERIAL_8E1, "SERIAL_8E1", 2371121616u, 0, 10, &be_const_str_scan);
+be_define_const_str(SERIAL_8E2, "SERIAL_8E2", 2421454473u, 0, 10, &be_const_str_deregister_obj);
+be_define_const_str(SERIAL_8N1, "SERIAL_8N1", 2369297235u, 0, 10, &be_const_str_resp_cmnd_done);
+be_define_const_str(SERIAL_8N2, "SERIAL_8N2", 2386074854u, 0, 10, &be_const_str_sys);
+be_define_const_str(SERIAL_8O1, "SERIAL_8O1", 289122742u, 0, 10, &be_const_str_get_vbus_current);
+be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_gamma10);
+be_define_const_str(SK6812_GRBW, "SK6812_GRBW", 81157857u, 0, 11, NULL);
+be_define_const_str(STATE_DEFAULT, "STATE_DEFAULT", 712406428u, 0, 13, &be_const_str_classname);
+be_define_const_str(TAP_X3A_X20found_X20Tasmota_X20App_X20_X27_X25s_X27, "TAP: found Tasmota App '%s'", 2643152398u, 0, 27, NULL);
+be_define_const_str(Tasmota, "Tasmota", 4047617668u, 0, 7, &be_const_str_top);
+be_define_const_str(Tele, "Tele", 1329980653u, 0, 4, &be_const_str_exists);
+be_define_const_str(Timer, "Timer", 3948127682u, 0, 5, &be_const_str_del);
+be_define_const_str(True, "True", 3453902341u, 0, 4, &be_const_str_real);
+be_define_const_str(Unknown_X20command, "Unknown command", 1830905432u, 0, 15, &be_const_str_get_percentage);
+be_define_const_str(WS2812, "WS2812", 3539741218u, 0, 6, &be_const_str_finish);
+be_define_const_str(WS2812_GRB, "WS2812_GRB", 1736405692u, 0, 10, &be_const_str_tasmota);
+be_define_const_str(Wire, "Wire", 1938276536u, 0, 4, &be_const_str__begin_transmission);
+be_define_const_str(_X5B, "[", 3725336506u, 0, 1, NULL);
+be_define_const_str(_X5D, "]", 3624670792u, 0, 1, NULL);
+be_define_const_str(_, "_", 3658226030u, 0, 1, NULL);
+be_define_const_str(__iterator__, "__iterator__", 3884039703u, 0, 12, &be_const_str_pixel_count);
+be_define_const_str(__lower__, "__lower__", 123855590u, 0, 9, &be_const_str_pin_mode);
+be_define_const_str(__upper__, "__upper__", 3612202883u, 0, 9, &be_const_str_engine);
+be_define_const_str(_anonymous_, "_anonymous_", 1957281476u, 0, 11, &be_const_str_get_light);
+be_define_const_str(_archive, "_archive", 4004559404u, 0, 8, &be_const_str_cosh);
+be_define_const_str(_available, "_available", 1306196581u, 0, 10, &be_const_str_is_running);
+be_define_const_str(_begin_transmission, "_begin_transmission", 2779461176u, 0, 19, &be_const_str_lv_event_cb);
+be_define_const_str(_buffer, "_buffer", 2044888568u, 0, 7, &be_const_str_every_50ms);
+be_define_const_str(_cb, "_cb", 4043300367u, 0, 3, NULL);
+be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_animators);
+be_define_const_str(_class, "_class", 2732146350u, 0, 6, &be_const_str__X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
+be_define_const_str(_cmd, "_cmd", 3419822142u, 0, 4, NULL);
+be_define_const_str(_debug_present, "_debug_present", 4063411725u, 0, 14, &be_const_str_call_native);
+be_define_const_str(_def, "_def", 1985022181u, 0, 4, NULL);
+be_define_const_str(_dirty, "_dirty", 283846766u, 0, 6, &be_const_str_get_coords);
+be_define_const_str(_drivers, "_drivers", 3260328985u, 0, 8, &be_const_str__write);
+be_define_const_str(_end_transmission, "_end_transmission", 3237480400u, 0, 17, NULL);
+be_define_const_str(_energy, "_energy", 535372070u, 0, 7, &be_const_str_quality);
+be_define_const_str(_error, "_error", 1132109656u, 0, 6, &be_const_str__ptr);
+be_define_const_str(_filename, "_filename", 1430813195u, 0, 9, &be_const_str_set_text);
+be_define_const_str(_get_cb, "_get_cb", 1448849122u, 0, 7, &be_const_str_find);
+be_define_const_str(_global_addr, "_global_addr", 533766721u, 0, 12, &be_const_str_display_X2Eini);
+be_define_const_str(_global_def, "_global_def", 646007001u, 0, 11, &be_const_str_get_warning_level);
+be_define_const_str(_lvgl, "_lvgl", 2689219483u, 0, 5, &be_const_str_get_height);
+be_define_const_str(_p, "_p", 1594591802u, 0, 2, &be_const_str_format);
+be_define_const_str(_persist_X2Ejson, "_persist.json", 2008425138u, 0, 13, &be_const_str_value);
+be_define_const_str(_ptr, "_ptr", 306235816u, 0, 4, &be_const_str_rtc);
+be_define_const_str(_read, "_read", 346717030u, 0, 5, &be_const_str_is_dirty);
+be_define_const_str(_request_from, "_request_from", 3965148604u, 0, 13, NULL);
 be_define_const_str(_rules, "_rules", 4266217105u, 0, 6, NULL);
-be_define_const_str(dot_p1, ".p1", 249175686u, 0, 3, &be_const_str_find);
-be_define_const_str(find, "find", 3186656602u, 0, 4, &be_const_str_name);
-be_define_const_str(name, "name", 2369371622u, 0, 4, &be_const_str_toptr);
-be_define_const_str(toptr, "toptr", 3379847454u, 0, 5, NULL);
-be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_byte);
-be_define_const_str(byte, "byte", 1683620383u, 0, 4, &be_const_str_gc);
-be_define_const_str(gc, "gc", 1042313471u, 0, 2, NULL);
-be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_counters);
-be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_tob64);
+be_define_const_str(_settings_def, "_settings_def", 3775560307u, 0, 13, &be_const_str_set);
+be_define_const_str(_settings_ptr, "_settings_ptr", 1825772182u, 0, 13, &be_const_str_remove_cmd);
+be_define_const_str(_t, "_t", 1527481326u, 0, 2, &be_const_str_draw_line_dsc_init);
+be_define_const_str(_timers, "_timers", 2600100916u, 0, 7, &be_const_str_eth);
+be_define_const_str(_write, "_write", 2215462825u, 0, 6, &be_const_str_v);
+be_define_const_str(a, "a", 3826002220u, 0, 1, &be_const_str_add);
+be_define_const_str(abs, "abs", 709362235u, 0, 3, &be_const_str_get_aps_voltage);
+be_define_const_str(acos, "acos", 1006755615u, 0, 4, &be_const_str_lv);
+be_define_const_str(add, "add", 993596020u, 0, 3, &be_const_str_bytes);
+be_define_const_str(add_anim, "add_anim", 3980662668u, 0, 8, NULL);
+be_define_const_str(add_cmd, "add_cmd", 3361630879u, 0, 7, &be_const_str_arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj);
+be_define_const_str(add_driver, "add_driver", 1654458371u, 0, 10, NULL);
+be_define_const_str(add_header, "add_header", 927130612u, 0, 10, &be_const_str_couldn_X27t_X20not_X20initialize_X20noepixelbus);
+be_define_const_str(add_rule, "add_rule", 596540743u, 0, 8, &be_const_str_resp_cmnd_error);
+be_define_const_str(addr, "addr", 1087856498u, 0, 4, &be_const_str_battery_present);
+be_define_const_str(allocated, "allocated", 429986098u, 0, 9, &be_const_str_create_custom_widget);
+be_define_const_str(alternate, "alternate", 1140253277u, 0, 9, &be_const_str_out_X20of_X20range);
+be_define_const_str(animate, "animate", 3885786800u, 0, 7, &be_const_str_set_ldo_voltage);
+be_define_const_str(animators, "animators", 279858213u, 0, 9, &be_const_str_read_bytes);
+be_define_const_str(arch, "arch", 2952804297u, 0, 4, &be_const_str_arg_size);
+be_define_const_str(area, "area", 2601460036u, 0, 4, &be_const_str_draw_arc);
+be_define_const_str(arg, "arg", 1047474471u, 0, 3, &be_const_str_page_autoconf_mgr);
+be_define_const_str(arg_X20must_X20be_X20a_X20subclass_X20of_X20lv_obj, "arg must be a subclass of lv_obj", 1641882079u, 0, 32, &be_const_str_create_segment);
+be_define_const_str(arg_name, "arg_name", 1345046155u, 0, 8, &be_const_str_has);
+be_define_const_str(arg_size, "arg_size", 3310243257u, 0, 8, NULL);
+be_define_const_str(as, "as", 1579491469u, 67, 2, NULL);
+be_define_const_str(asin, "asin", 4272848550u, 0, 4, &be_const_str_destructor_cb);
+be_define_const_str(assert, "assert", 2774883451u, 0, 6, &be_const_str_member);
+be_define_const_str(asstring, "asstring", 1298225088u, 0, 8, &be_const_str_invalidate);
+be_define_const_str(atan, "atan", 108579519u, 0, 4, &be_const_str_fromb64);
+be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, &be_const_str_millis);
+be_define_const_str(atleast1, "atleast1", 1956331672u, 0, 8, &be_const_str_connected);
+be_define_const_str(attrdump, "attrdump", 1521571304u, 0, 8, &be_const_str_counters);
+be_define_const_str(autoexec, "autoexec", 3676861891u, 0, 8, NULL);
+be_define_const_str(autorun, "autorun", 1447527407u, 0, 7, &be_const_str_return);
+be_define_const_str(available, "available", 1727918744u, 0, 9, &be_const_str_fromstring);
+be_define_const_str(b, "b", 3876335077u, 0, 1, &be_const_str_display);
+be_define_const_str(back_forth, "back_forth", 2665042062u, 0, 10, &be_const_str_dac_voltage);
+be_define_const_str(base_class, "base_class", 1107737279u, 0, 10, NULL);
+be_define_const_str(battery_present, "battery_present", 3588397058u, 0, 15, &be_const_str_run_bat);
+be_define_const_str(begin, "begin", 1748273790u, 0, 5, &be_const_str_gamma8);
+be_define_const_str(bool, "bool", 3365180733u, 0, 4, &be_const_str_set_power);
+be_define_const_str(break, "break", 3378807160u, 58, 5, NULL);
+be_define_const_str(bri, "bri", 2112284244u, 0, 3, &be_const_str_cos);
+be_define_const_str(bus, "bus", 1607822841u, 0, 3, &be_const_str_get_vbus_voltage);
+be_define_const_str(button_pressed, "button_pressed", 1694209616u, 0, 14, &be_const_str_insert);
+be_define_const_str(byte, "byte", 1683620383u, 0, 4, NULL);
+be_define_const_str(bytes, "bytes", 1706151940u, 0, 5, NULL);
+be_define_const_str(c, "c", 3859557458u, 0, 1, &be_const_str_decrypt);
+be_define_const_str(call, "call", 3018949801u, 0, 4, NULL);
+be_define_const_str(call_native, "call_native", 1389147405u, 0, 11, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson);
+be_define_const_str(calldepth, "calldepth", 3122364302u, 0, 9, &be_const_str_event_send);
+be_define_const_str(can_show, "can_show", 960091187u, 0, 8, &be_const_str_ctypes_bytes_dyn);
+be_define_const_str(cb_dispatch, "cb_dispatch", 1741510499u, 0, 11, &be_const_str_set_bri);
+be_define_const_str(cb_do_nothing, "cb_do_nothing", 1488730702u, 0, 13, NULL);
+be_define_const_str(cb_event_closure, "cb_event_closure", 3828267325u, 0, 16, NULL);
+be_define_const_str(cb_obj, "cb_obj", 1195696482u, 0, 6, &be_const_str_rotate);
+be_define_const_str(ceil, "ceil", 1659167240u, 0, 4, &be_const_str_set_width);
+be_define_const_str(char, "char", 2823553821u, 0, 4, NULL);
+be_define_const_str(chars_in_string, "chars_in_string", 3148785132u, 0, 15, &be_const_str_kv);
+be_define_const_str(check_privileged_access, "check_privileged_access", 3692933968u, 0, 23, &be_const_str_group_def);
+be_define_const_str(class, "class", 2872970239u, 57, 5, NULL);
+be_define_const_str(class_init_obj, "class_init_obj", 178410604u, 0, 14, &be_const_str_set_useragent);
+be_define_const_str(classname, "classname", 1998589948u, 0, 9, NULL);
+be_define_const_str(classof, "classof", 1796577762u, 0, 7, NULL);
+be_define_const_str(clear, "clear", 1550717474u, 0, 5, NULL);
+be_define_const_str(clear_first_time, "clear_first_time", 632769909u, 0, 16, &be_const_str_read);
+be_define_const_str(clear_to, "clear_to", 3528002130u, 0, 8, &be_const_str_geti);
+be_define_const_str(close, "close", 667630371u, 0, 5, &be_const_str_depower);
+be_define_const_str(closure, "closure", 1548407746u, 0, 7, &be_const_str_param);
+be_define_const_str(cmd, "cmd", 4136785899u, 0, 3, &be_const_str_input);
+be_define_const_str(cmd_res, "cmd_res", 921166762u, 0, 7, NULL);
+be_define_const_str(code, "code", 4180765940u, 0, 4, &be_const_str_null_cb);
+be_define_const_str(codedump, "codedump", 1786337906u, 0, 8, NULL);
+be_define_const_str(collect, "collect", 2399039025u, 0, 7, &be_const_str_json_fdump_any);
+be_define_const_str(color, "color", 1031692888u, 0, 5, &be_const_str_has_arg);
+be_define_const_str(compile, "compile", 1000265118u, 0, 7, NULL);
+be_define_const_str(compress, "compress", 2818084237u, 0, 8, NULL);
+be_define_const_str(concat, "concat", 4124019837u, 0, 6, NULL);
+be_define_const_str(connect, "connect", 2866859257u, 0, 7, NULL);
+be_define_const_str(connected, "connected", 1424938192u, 0, 9, &be_const_str_debug);
+be_define_const_str(connection_error, "connection_error", 1358926260u, 0, 16, &be_const_str_json_fdump);
+be_define_const_str(constructor_cb, "constructor_cb", 2489105297u, 0, 14, &be_const_str_minute);
+be_define_const_str(contains, "contains", 1825239352u, 0, 8, &be_const_str_deinit);
+be_define_const_str(content_button, "content_button", 1956476087u, 0, 14, &be_const_str_pixels_buffer);
+be_define_const_str(content_flush, "content_flush", 214922475u, 0, 13, &be_const_str_leds);
+be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_load);
+be_define_const_str(content_send_style, "content_send_style", 1087907647u, 0, 18, &be_const_str_read8);
+be_define_const_str(content_start, "content_start", 2937509069u, 0, 13, &be_const_str_https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf);
+be_define_const_str(content_stop, "content_stop", 658554751u, 0, 12, NULL);
+be_define_const_str(continue, "continue", 2977070660u, 59, 8, NULL);
+be_define_const_str(copy, "copy", 3848464964u, 0, 4, &be_const_str_json_append);
+be_define_const_str(cos, "cos", 4220379804u, 0, 3, &be_const_str_count);
+be_define_const_str(cosh, "cosh", 4099687964u, 0, 4, &be_const_str_set_percentage);
+be_define_const_str(couldn_X27t_X20not_X20initialize_X20noepixelbus, "couldn't not initialize noepixelbus", 2536490812u, 0, 35, NULL);
+be_define_const_str(count, "count", 967958004u, 0, 5, &be_const_str_every_100ms);
+be_define_const_str(counters, "counters", 4095866864u, 0, 8, &be_const_str_on);
+be_define_const_str(create_custom_widget, "create_custom_widget", 1140594778u, 0, 20, &be_const_str_instance);
+be_define_const_str(create_matrix, "create_matrix", 3528185923u, 0, 13, &be_const_str_dirty);
+be_define_const_str(create_segment, "create_segment", 3863522719u, 0, 14, &be_const_str_exec_cmd);
+be_define_const_str(ctor, "ctor", 375399343u, 0, 4, &be_const_str_tcpclient);
+be_define_const_str(ctypes_bytes, "ctypes_bytes", 3879019703u, 0, 12, NULL);
+be_define_const_str(ctypes_bytes_dyn, "ctypes_bytes_dyn", 915205307u, 0, 16, &be_const_str_time_dump);
+be_define_const_str(dac_voltage, "dac_voltage", 1552257222u, 0, 11, &be_const_str_reverse_gamma10);
+be_define_const_str(day, "day", 3830391293u, 0, 3, &be_const_str_duration);
+be_define_const_str(debug, "debug", 1483009432u, 0, 5, &be_const_str_str);
+be_define_const_str(decompress, "decompress", 2887031650u, 0, 10, &be_const_str_imax);
+be_define_const_str(decrypt, "decrypt", 2886974618u, 0, 7, &be_const_str_onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E);
+be_define_const_str(def, "def", 3310976652u, 55, 3, NULL);
+be_define_const_str(deg, "deg", 3327754271u, 0, 3, &be_const_str_set_y);
+be_define_const_str(deinit, "deinit", 2345559592u, 0, 6, &be_const_str_tan);
+be_define_const_str(del, "del", 3478752842u, 0, 3, &be_const_str_range);
+be_define_const_str(delay, "delay", 1322381784u, 0, 5, &be_const_str_shared_key);
+be_define_const_str(delete_all_configs, "delete_all_configs", 2382067578u, 0, 18, &be_const_str_get_bat_voltage);
+be_define_const_str(depower, "depower", 3563819571u, 0, 7, &be_const_str_get_battery_chargin_status);
+be_define_const_str(deregister_obj, "deregister_obj", 3909966993u, 0, 14, &be_const_str_strip);
+be_define_const_str(destructor_cb, "destructor_cb", 1930283190u, 0, 13, &be_const_str_state);
+be_define_const_str(detect, "detect", 8884370u, 0, 6, &be_const_str_hex);
+be_define_const_str(detected_X20on_X20bus, "detected on bus", 1432002650u, 0, 15, &be_const_str_nan);
+be_define_const_str(digital_read, "digital_read", 3585496928u, 0, 12, NULL);
+be_define_const_str(digital_write, "digital_write", 3435877979u, 0, 13, &be_const_str_set_style_text_font);
+be_define_const_str(dirty, "dirty", 2667581083u, 0, 5, NULL);
+be_define_const_str(display, "display", 1164572437u, 0, 7, NULL);
+be_define_const_str(display_X2Eini, "display.ini", 2646174001u, 0, 11, &be_const_str_function);
+be_define_const_str(do, "do", 1646057492u, 65, 2, NULL);
+be_define_const_str(draw_arc, "draw_arc", 1828251676u, 0, 8, &be_const_str_io_error);
+be_define_const_str(draw_line, "draw_line", 1634465686u, 0, 9, &be_const_str_item);
+be_define_const_str(draw_line_dsc, "draw_line_dsc", 4220676203u, 0, 13, &be_const_str_energy_struct);
+be_define_const_str(draw_line_dsc_init, "draw_line_dsc_init", 3866693646u, 0, 18, NULL);
+be_define_const_str(due, "due", 3895530293u, 0, 3, &be_const_str_pow);
+be_define_const_str(dump, "dump", 3663001223u, 0, 4, NULL);
+be_define_const_str(duration, "duration", 799079693u, 0, 8, &be_const_str_time_reached);
+be_define_const_str(editable, "editable", 60532369u, 0, 8, &be_const_str_resize);
+be_define_const_str(elif, "elif", 3232090307u, 51, 4, NULL);
+be_define_const_str(else, "else", 3183434736u, 52, 4, NULL);
+be_define_const_str(enabled, "enabled", 49525662u, 0, 7, &be_const_str_widget_width_def);
+be_define_const_str(encrypt, "encrypt", 2194327650u, 0, 7, &be_const_str_introspect);
+be_define_const_str(end, "end", 1787721130u, 56, 3, NULL);
+be_define_const_str(energy_struct, "energy_struct", 1655792843u, 0, 13, NULL);
+be_define_const_str(engine, "engine", 3993360443u, 0, 6, &be_const_str_obj_event_base);
+be_define_const_str(erase, "erase", 1010949589u, 0, 5, &be_const_str_lv_obj);
+be_define_const_str(escape, "escape", 2652972038u, 0, 6, &be_const_str_path);
+be_define_const_str(eth, "eth", 2191266556u, 0, 3, &be_const_str_set_pixel_color);
+be_define_const_str(event, "event", 4264611999u, 0, 5, &be_const_str_issubclass);
+be_define_const_str(event_cb, "event_cb", 3128698017u, 0, 8, &be_const_str_get_power);
+be_define_const_str(event_send, "event_send", 598925582u, 0, 10, &be_const_str_lvgl_event_dispatch);
+be_define_const_str(every_100ms, "every_100ms", 1546407804u, 0, 11, &be_const_str_web_send_decimal);
+be_define_const_str(every_50ms, "every_50ms", 2383884008u, 0, 10, &be_const_str_length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032);
+be_define_const_str(every_second, "every_second", 2075451465u, 0, 12, &be_const_str_serial);
+be_define_const_str(except, "except", 950914032u, 69, 6, NULL);
+be_define_const_str(exec_cmd, "exec_cmd", 493567399u, 0, 8, &be_const_str__X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D);
+be_define_const_str(exec_rules, "exec_rules", 1445221092u, 0, 10, &be_const_str_write8);
+be_define_const_str(exec_tele, "exec_tele", 1020751601u, 0, 9, NULL);
+be_define_const_str(exists, "exists", 1002329533u, 0, 6, &be_const_str_get_bat_power);
+be_define_const_str(exp, "exp", 1923516200u, 0, 3, &be_const_str_listdir);
+be_define_const_str(f, "f", 3809224601u, 0, 1, NULL);
+be_define_const_str(false, "false", 184981848u, 62, 5, NULL);
+be_define_const_str(file, "file", 2867484483u, 0, 4, NULL);
+be_define_const_str(file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27, "file extension is not '.be' or '.bec'", 3095719639u, 0, 37, &be_const_str_hour);
+be_define_const_str(files, "files", 1055342736u, 0, 5, &be_const_str_page_autoconf_ctl);
+be_define_const_str(find, "find", 3186656602u, 0, 4, NULL);
+be_define_const_str(find_key_i, "find_key_i", 850136726u, 0, 10, &be_const_str_w);
+be_define_const_str(find_op, "find_op", 3766713376u, 0, 7, NULL);
+be_define_const_str(finish, "finish", 1494643858u, 0, 6, &be_const_str_isinstance);
+be_define_const_str(floor, "floor", 3102149661u, 0, 5, &be_const_str_get_style_bg_color);
+be_define_const_str(flush, "flush", 3002334877u, 0, 5, NULL);
+be_define_const_str(for, "for", 2901640080u, 54, 3, NULL);
+be_define_const_str(format, "format", 3114108242u, 0, 6, &be_const_str_pi);
+be_define_const_str(from_to, "from_to", 21625507u, 0, 7, &be_const_str_static);
+be_define_const_str(fromb64, "fromb64", 2717019639u, 0, 7, NULL);
+be_define_const_str(fromptr, "fromptr", 666189689u, 0, 7, &be_const_str_set_style_bg_color);
+be_define_const_str(fromstring, "fromstring", 610302344u, 0, 10, &be_const_str_publish);
+be_define_const_str(function, "function", 2664841801u, 0, 8, NULL);
+be_define_const_str(gamma, "gamma", 3492353034u, 0, 5, &be_const_str_isnan);
+be_define_const_str(gamma10, "gamma10", 3472052483u, 0, 7, NULL);
+be_define_const_str(gamma8, "gamma8", 3802843830u, 0, 6, &be_const_str_memory);
+be_define_const_str(gc, "gc", 1042313471u, 0, 2, &be_const_str_tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29);
+be_define_const_str(gen_cb, "gen_cb", 3245227551u, 0, 6, NULL);
+be_define_const_str(get, "get", 1410115415u, 0, 3, NULL);
+be_define_const_str(get_alternate, "get_alternate", 1450148894u, 0, 13, &be_const_str_scale_uint);
+be_define_const_str(get_aps_voltage, "get_aps_voltage", 2293036435u, 0, 15, NULL);
+be_define_const_str(get_bat_charge_current, "get_bat_charge_current", 1385293050u, 0, 22, &be_const_str_read12);
+be_define_const_str(get_bat_current, "get_bat_current", 1912106073u, 0, 15, NULL);
+be_define_const_str(get_bat_power, "get_bat_power", 3067374853u, 0, 13, &be_const_str_json_fdump_list);
+be_define_const_str(get_bat_voltage, "get_bat_voltage", 706676538u, 0, 15, &be_const_str_save_before_restart);
+be_define_const_str(get_battery_chargin_status, "get_battery_chargin_status", 2233241571u, 0, 26, &be_const_str_split);
+be_define_const_str(get_bri, "get_bri", 2041809895u, 0, 7, &be_const_str_math);
+be_define_const_str(get_coords, "get_coords", 1044089006u, 0, 10, &be_const_str_get_temp);
+be_define_const_str(get_current_module_name, "get_current_module_name", 2379270740u, 0, 23, &be_const_str_get_width);
+be_define_const_str(get_current_module_path, "get_current_module_path", 3206673408u, 0, 23, NULL);
+be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, &be_const_str_push);
+be_define_const_str(get_height, "get_height", 3571755523u, 0, 10, &be_const_str_ins_goto);
+be_define_const_str(get_input_power_status, "get_input_power_status", 4102829177u, 0, 22, NULL);
+be_define_const_str(get_light, "get_light", 381930476u, 0, 9, &be_const_str_setitem);
+be_define_const_str(get_object_from_ptr, "get_object_from_ptr", 2345019201u, 0, 19, &be_const_str_log);
+be_define_const_str(get_option, "get_option", 2123730033u, 0, 10, NULL);
+be_define_const_str(get_percentage, "get_percentage", 2880483992u, 0, 14, NULL);
+be_define_const_str(get_pixel_color, "get_pixel_color", 337490048u, 0, 15, NULL);
+be_define_const_str(get_power, "get_power", 3009799377u, 0, 9, &be_const_str_open);
+be_define_const_str(get_size, "get_size", 2803644713u, 0, 8, NULL);
+be_define_const_str(get_string, "get_string", 4195847969u, 0, 10, NULL);
+be_define_const_str(get_style_bg_color, "get_style_bg_color", 964794381u, 0, 18, &be_const_str_r);
+be_define_const_str(get_style_line_color, "get_style_line_color", 805371932u, 0, 20, &be_const_str_time_str);
+be_define_const_str(get_style_pad_right, "get_style_pad_right", 3150287466u, 0, 19, NULL);
+be_define_const_str(get_switch, "get_switch", 164821028u, 0, 10, &be_const_str_isrunning);
+be_define_const_str(get_tasmota, "get_tasmota", 334356779u, 0, 11, &be_const_str_getbits);
+be_define_const_str(get_temp, "get_temp", 3370919486u, 0, 8, NULL);
+be_define_const_str(get_vbus_current, "get_vbus_current", 1205347942u, 0, 16, &be_const_str_while);
+be_define_const_str(get_vbus_voltage, "get_vbus_voltage", 2398210401u, 0, 16, &be_const_str_return_X20code_X3D_X25i);
+be_define_const_str(get_warning_level, "get_warning_level", 1737834441u, 0, 17, &be_const_str_map);
+be_define_const_str(get_width, "get_width", 3293417300u, 0, 9, NULL);
+be_define_const_str(getbits, "getbits", 3094168979u, 0, 7, &be_const_str_tag);
+be_define_const_str(geti, "geti", 2381006490u, 0, 4, &be_const_str_k);
+be_define_const_str(global, "global", 503252654u, 0, 6, &be_const_str_widget_constructor);
+be_define_const_str(gpio, "gpio", 2638155258u, 0, 4, &be_const_str_line_dsc);
+be_define_const_str(group_def, "group_def", 1524213328u, 0, 9, &be_const_str_web_send);
+be_define_const_str(h, "h", 3977000791u, 0, 1, &be_const_str_value_error);
+be_define_const_str(has, "has", 3988721635u, 0, 3, NULL);
+be_define_const_str(has_arg, "has_arg", 424878688u, 0, 7, &be_const_str_rad);
+be_define_const_str(height_def, "height_def", 2348238838u, 0, 10, &be_const_str_wire2);
+be_define_const_str(hex, "hex", 4273249610u, 0, 3, &be_const_str_register_obj);
+be_define_const_str(hour, "hour", 3053661199u, 0, 4, &be_const_str_widget_ctor_impl);
+be_define_const_str(hs2rgb, "hs2rgb", 1040816349u, 0, 6, NULL);
+be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_X2F_X25s_X2Eautoconf, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s/%s.autoconf", 2743526309u, 0, 70, NULL);
+be_define_const_str(https_X3A_X2F_X2Fraw_X2Egithubusercontent_X2Ecom_X2Ftasmota_X2Fautoconf_X2Fmain_X2F_X25s_manifest_X2Ejson, "https://raw.githubusercontent.com/tasmota/autoconf/main/%s_manifest.json", 3657552045u, 0, 72, NULL);
+be_define_const_str(i2c_enabled, "i2c_enabled", 218388101u, 0, 11, &be_const_str_keys);
+be_define_const_str(id, "id", 926444256u, 0, 2, &be_const_str_print);
+be_define_const_str(if, "if", 959999494u, 50, 2, NULL);
+be_define_const_str(imax, "imax", 3084515410u, 0, 4, NULL);
+be_define_const_str(imin, "imin", 2714127864u, 0, 4, &be_const_str_members);
+be_define_const_str(import, "import", 288002260u, 66, 6, NULL);
+be_define_const_str(init, "init", 380752755u, 0, 4, NULL);
+be_define_const_str(init_draw_line_dsc, "init_draw_line_dsc", 2507936040u, 0, 18, &be_const_str_pop);
+be_define_const_str(input, "input", 4191711099u, 0, 5, &be_const_str_json);
+be_define_const_str(ins_goto, "ins_goto", 1342843963u, 0, 8, NULL);
+be_define_const_str(ins_ramp, "ins_ramp", 1068049360u, 0, 8, &be_const_str_wire_scan);
+be_define_const_str(ins_time, "ins_time", 2980245553u, 0, 8, &be_const_str_target_search);
+be_define_const_str(insert, "insert", 3332609576u, 0, 6, NULL);
+be_define_const_str(instance, "instance", 193386898u, 0, 8, NULL);
+be_define_const_str(instance_size, "instance_size", 4280269518u, 0, 13, NULL);
+be_define_const_str(int, "int", 2515107422u, 0, 3, NULL);
+be_define_const_str(internal_error, "internal_error", 2519158169u, 0, 14, &be_const_str_offseta);
+be_define_const_str(introspect, "introspect", 164638290u, 0, 10, &be_const_str_widget_dtor_impl);
+be_define_const_str(invalidate, "invalidate", 2649734928u, 0, 10, &be_const_str_no_X20GPIO_X20specified_X20for_X20neopixelbus);
+be_define_const_str(io_error, "io_error", 1970281036u, 0, 8, &be_const_str_readbytes);
+be_define_const_str(ip, "ip", 1261996636u, 0, 2, &be_const_str_super);
+be_define_const_str(is_dirty, "is_dirty", 418034110u, 0, 8, &be_const_str_rand);
+be_define_const_str(is_first_time, "is_first_time", 275242384u, 0, 13, &be_const_str_local);
+be_define_const_str(is_running, "is_running", 2226847261u, 0, 10, &be_const_str_reverse);
+be_define_const_str(isinstance, "isinstance", 3669352738u, 0, 10, NULL);
+be_define_const_str(isnan, "isnan", 2981347434u, 0, 5, NULL);
+be_define_const_str(isrunning, "isrunning", 1688182268u, 0, 9, &be_const_str_refr_size);
+be_define_const_str(issubclass, "issubclass", 4078395519u, 0, 10, NULL);
+be_define_const_str(item, "item", 2671260646u, 0, 4, &be_const_str_widget_editable);
+be_define_const_str(iter, "iter", 3124256359u, 0, 4, &be_const_str_class);
+be_define_const_str(json, "json", 916562499u, 0, 4, NULL);
+be_define_const_str(json_append, "json_append", 3002019284u, 0, 11, NULL);
+be_define_const_str(json_fdump, "json_fdump", 1694216580u, 0, 10, &be_const_str_nil);
+be_define_const_str(json_fdump_any, "json_fdump_any", 3348629385u, 0, 14, &be_const_str_pixel_size);
+be_define_const_str(json_fdump_list, "json_fdump_list", 3903879853u, 0, 15, &be_const_str_json_fdump_map);
+be_define_const_str(json_fdump_map, "json_fdump_map", 4091954653u, 0, 14, &be_const_str_select);
+be_define_const_str(k, "k", 3993778410u, 0, 1, &be_const_str_set_auth);
+be_define_const_str(keys, "keys", 4182378701u, 0, 4, NULL);
+be_define_const_str(kv, "kv", 1497177492u, 0, 2, &be_const_str_persist_X2E_p_X20is_X20not_X20a_X20map);
+be_define_const_str(last_modified, "last_modified", 772177145u, 0, 13, NULL);
+be_define_const_str(leds, "leds", 558858555u, 0, 4, &be_const_str__X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
+be_define_const_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032, "length in bits must be between 0 and 32", 2584509128u, 0, 39, &be_const_str_lv_event);
+be_define_const_str(light, "light", 3801947695u, 0, 5, NULL);
+be_define_const_str(line_dsc, "line_dsc", 4094490978u, 0, 8, &be_const_str_offset);
+be_define_const_str(list, "list", 217798785u, 0, 4, NULL);
+be_define_const_str(listdir, "listdir", 2005220720u, 0, 7, NULL);
+be_define_const_str(load, "load", 3859241449u, 0, 4, NULL);
+be_define_const_str(load_templates, "load_templates", 3513870133u, 0, 14, NULL);
+be_define_const_str(local, "local", 2621662984u, 0, 5, &be_const_str_round_start);
+be_define_const_str(log, "log", 1062293841u, 0, 3, &be_const_str_read_sensors);
+be_define_const_str(log10, "log10", 2346846000u, 0, 5, NULL);
+be_define_const_str(loop, "loop", 3723446379u, 0, 4, NULL);
+be_define_const_str(lower, "lower", 3038577850u, 0, 5, &be_const_str_end);
+be_define_const_str(lv, "lv", 1529997255u, 0, 2, &be_const_str_x);
+be_define_const_str(lv_event, "lv_event", 2434089968u, 0, 8, &be_const_str_remove_rule);
+be_define_const_str(lv_event_cb, "lv_event_cb", 2480731016u, 0, 11, &be_const_str_run_deferred);
+be_define_const_str(lv_obj, "lv_obj", 4257833149u, 0, 6, &be_const_str_traceback);
+be_define_const_str(lv_obj_class, "lv_obj_class", 4039656294u, 0, 12, NULL);
+be_define_const_str(lvgl_event_dispatch, "lvgl_event_dispatch", 2104396622u, 0, 19, &be_const_str_set_matrix_pixel_color);
+be_define_const_str(map, "map", 3751997361u, 0, 3, &be_const_str_redirect);
+be_define_const_str(math, "math", 4001929615u, 0, 4, NULL);
+be_define_const_str(matrix, "matrix", 365099244u, 0, 6, NULL);
+be_define_const_str(member, "member", 719708611u, 0, 6, NULL);
+be_define_const_str(members, "members", 937576464u, 0, 7, &be_const_str_target);
+be_define_const_str(memory, "memory", 2229924270u, 0, 6, &be_const_str_resp_cmnd_str);
+be_define_const_str(millis, "millis", 1214679063u, 0, 6, NULL);
+be_define_const_str(min, "min", 3381609815u, 0, 3, &be_const_str_widget_cb);
+be_define_const_str(minute, "minute", 954666857u, 0, 6, NULL);
+be_define_const_str(module, "module", 3617558685u, 0, 6, &be_const_str_percentage);
+be_define_const_str(month, "month", 3598321157u, 0, 5, NULL);
+be_define_const_str(name, "name", 2369371622u, 0, 4, NULL);
+be_define_const_str(nan, "nan", 797905850u, 0, 3, NULL);
+be_define_const_str(nil, "nil", 228849900u, 63, 3, NULL);
+be_define_const_str(no_X20GPIO_X20specified_X20for_X20neopixelbus, "no GPIO specified for neopixelbus", 42078528u, 0, 33, &be_const_str_number);
+be_define_const_str(null_cb, "null_cb", 2333536460u, 0, 7, &be_const_str_public_key);
+be_define_const_str(number, "number", 467038368u, 0, 6, NULL);
+be_define_const_str(obj_class_create_obj, "obj_class_create_obj", 3304390632u, 0, 20, &be_const_str_write_bytes);
+be_define_const_str(obj_event_base, "obj_event_base", 1624064363u, 0, 14, NULL);
+be_define_const_str(offset, "offset", 348705738u, 0, 6, &be_const_str_sec);
+be_define_const_str(offseta, "offseta", 1663383089u, 0, 7, NULL);
+be_define_const_str(on, "on", 1630810064u, 0, 2, NULL);
+be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will cause a restart.\");'>", 232646018u, 0, 57, NULL);
+be_define_const_str(onsubmit_X3D_X27return_X20confirm_X28_X22This_X20will_X20change_X20the_X20current_X20configuration_X20and_X20cause_X20a_X20restart_X2E_X22_X29_X3B_X27_X3E, "onsubmit='return confirm(\"This will change the current configuration and cause a restart.\");'>", 3792412559u, 0, 94, &be_const_str_sqrt);
+be_define_const_str(open, "open", 3546203337u, 0, 4, NULL);
+be_define_const_str(out_X20of_X20range, "out of range", 2236631477u, 0, 12, NULL);
+be_define_const_str(p1, "p1", 2689521274u, 0, 2, &be_const_str_widget_event_cb);
+be_define_const_str(p2, "p2", 2672743655u, 0, 2, NULL);
+be_define_const_str(page_autoconf_ctl, "page_autoconf_ctl", 2453381496u, 0, 17, &be_const_str_pc_rel);
+be_define_const_str(page_autoconf_mgr, "page_autoconf_mgr", 3643937031u, 0, 17, &be_const_str_reduce);
+be_define_const_str(param, "param", 1309554226u, 0, 5, &be_const_str_set_dcdc_enable);
+be_define_const_str(path, "path", 2223459638u, 0, 4, &be_const_str_pop_path);
+be_define_const_str(pc, "pc", 1313756516u, 0, 2, &be_const_str_zip);
+be_define_const_str(pc_abs, "pc_abs", 920256495u, 0, 6, NULL);
+be_define_const_str(pc_rel, "pc_rel", 991921176u, 0, 6, NULL);
+be_define_const_str(percentage, "percentage", 2538831285u, 0, 10, &be_const_str_web_add_config_button);
+be_define_const_str(persist, "persist", 3917083779u, 0, 7, NULL);
+be_define_const_str(persist_X2E_p_X20is_X20not_X20a_X20map, "persist._p is not a map", 1176528732u, 0, 23, &be_const_str_publish_result);
+be_define_const_str(pi, "pi", 1213090802u, 0, 2, &be_const_str_set_alternate);
+be_define_const_str(pin, "pin", 1866532500u, 0, 3, &be_const_str_running);
+be_define_const_str(pin_mode, "pin_mode", 3258314030u, 0, 8, &be_const_str_set_first_time);
+be_define_const_str(pin_used, "pin_used", 4033854612u, 0, 8, &be_const_str_reapply);
+be_define_const_str(pixel_count, "pixel_count", 2439130743u, 0, 11, NULL);
+be_define_const_str(pixel_size, "pixel_size", 2209135785u, 0, 10, NULL);
+be_define_const_str(pixels_buffer, "pixels_buffer", 1229555807u, 0, 13, NULL);
+be_define_const_str(point, "point", 414084241u, 0, 5, &be_const_str_setmember);
+be_define_const_str(pop, "pop", 1362321360u, 0, 3, NULL);
+be_define_const_str(pop_path, "pop_path", 2403243998u, 0, 8, NULL);
+be_define_const_str(pow, "pow", 1479764693u, 0, 3, NULL);
+be_define_const_str(preinit, "preinit", 2722007100u, 0, 7, NULL);
+be_define_const_str(print, "print", 372738696u, 0, 5, &be_const_str_else);
+be_define_const_str(public_key, "public_key", 4169142980u, 0, 10, &be_const_str_continue);
+be_define_const_str(publish, "publish", 264247304u, 0, 7, &be_const_str_web_add_main_button);
+be_define_const_str(publish_result, "publish_result", 2013351252u, 0, 14, &be_const_str_set_x);
+be_define_const_str(push, "push", 2272264157u, 0, 4, &be_const_str_stop);
+be_define_const_str(push_path, "push_path", 1155254157u, 0, 9, NULL);
+be_define_const_str(quality, "quality", 2597670950u, 0, 7, NULL);
+be_define_const_str(r, "r", 4144776981u, 0, 1, &be_const_str_tele);
+be_define_const_str(rad, "rad", 1358899048u, 0, 3, NULL);
+be_define_const_str(raise, "raise", 1593437475u, 70, 5, NULL);
+be_define_const_str(rand, "rand", 2711325910u, 0, 4, NULL);
+be_define_const_str(range, "range", 4208725202u, 0, 5, &be_const_str_web_add_handler);
+be_define_const_str(read, "read", 3470762949u, 0, 4, NULL);
+be_define_const_str(read12, "read12", 4291076970u, 0, 6, NULL);
+be_define_const_str(read13, "read13", 12887293u, 0, 6, &be_const_str_set_timer);
+be_define_const_str(read24, "read24", 1808533811u, 0, 6, NULL);
+be_define_const_str(read32, "read32", 1741276240u, 0, 6, &be_const_str_break);
+be_define_const_str(read8, "read8", 2802788167u, 0, 5, &be_const_str_readline);
+be_define_const_str(read_bytes, "read_bytes", 3576733173u, 0, 10, &be_const_str_type);
+be_define_const_str(read_sensors, "read_sensors", 892689201u, 0, 12, NULL);
+be_define_const_str(readbytes, "readbytes", 2716426756u, 0, 9, &be_const_str_show);
+be_define_const_str(readline, "readline", 1212709927u, 0, 8, &be_const_str_solidified);
+be_define_const_str(real, "real", 3604983901u, 0, 4, &be_const_str__X7B_X7D);
+be_define_const_str(reapply, "reapply", 3778939332u, 0, 7, NULL);
+be_define_const_str(redirect, "redirect", 389758641u, 0, 8, NULL);
+be_define_const_str(reduce, "reduce", 2002030311u, 0, 6, NULL);
+be_define_const_str(refr_size, "refr_size", 1958144468u, 0, 9, NULL);
+be_define_const_str(register_obj, "register_obj", 3982614770u, 0, 12, NULL);
+be_define_const_str(remove, "remove", 3683784189u, 0, 6, NULL);
+be_define_const_str(remove_cmd, "remove_cmd", 3832315702u, 0, 10, NULL);
+be_define_const_str(remove_driver, "remove_driver", 1030243768u, 0, 13, &be_const_str_string);
+be_define_const_str(remove_rule, "remove_rule", 3456211328u, 0, 11, NULL);
+be_define_const_str(remove_timer, "remove_timer", 4141472215u, 0, 12, NULL);
+be_define_const_str(reset, "reset", 1695364032u, 0, 5, NULL);
+be_define_const_str(reset_search, "reset_search", 1350414305u, 0, 12, &be_const_str_widget_destructor);
+be_define_const_str(resize, "resize", 3514612129u, 0, 6, NULL);
+be_define_const_str(resolvecmnd, "resolvecmnd", 993361485u, 0, 11, NULL);
+be_define_const_str(resp_cmnd, "resp_cmnd", 2869459626u, 0, 9, &be_const_str_web_add_management_button);
+be_define_const_str(resp_cmnd_done, "resp_cmnd_done", 2601874875u, 0, 14, &be_const_str_raise);
+be_define_const_str(resp_cmnd_error, "resp_cmnd_error", 2404088863u, 0, 15, NULL);
+be_define_const_str(resp_cmnd_failed, "resp_cmnd_failed", 2136281562u, 0, 16, NULL);
+be_define_const_str(resp_cmnd_str, "resp_cmnd_str", 737845590u, 0, 13, NULL);
+be_define_const_str(response_append, "response_append", 450346371u, 0, 15, NULL);
+be_define_const_str(return, "return", 2246981567u, 60, 6, NULL);
+be_define_const_str(return_X20code_X3D_X25i, "return code=%i", 2127454401u, 0, 14, &be_const_str_set_ldo_enable);
+be_define_const_str(reverse, "reverse", 558918661u, 0, 7, &be_const_str_sin);
+be_define_const_str(reverse_gamma10, "reverse_gamma10", 739112262u, 0, 15, &be_const_str_to_gamma);
+be_define_const_str(rotate, "rotate", 2784296202u, 0, 6, NULL);
+be_define_const_str(round_end, "round_end", 985288225u, 0, 9, NULL);
+be_define_const_str(round_start, "round_start", 2949484384u, 0, 11, &be_const_str_wire);
+be_define_const_str(rtc, "rtc", 1070575216u, 0, 3, &be_const_str_settings);
+be_define_const_str(rule, "rule", 4230889683u, 0, 4, NULL);
+be_define_const_str(run, "run", 718098122u, 0, 3, NULL);
+be_define_const_str(run_bat, "run_bat", 2536903298u, 0, 7, NULL);
+be_define_const_str(run_deferred, "run_deferred", 371594696u, 0, 12, NULL);
+be_define_const_str(running, "running", 343848780u, 0, 7, NULL);
+be_define_const_str(save, "save", 3439296072u, 0, 4, &be_const_str_tanh);
+be_define_const_str(save_before_restart, "save_before_restart", 1253239338u, 0, 19, NULL);
+be_define_const_str(scale_uint, "scale_uint", 3090811094u, 0, 10, &be_const_str_set_style_pad_right);
+be_define_const_str(scan, "scan", 3974641896u, 0, 4, &be_const_str_set_dc_voltage);
+be_define_const_str(search, "search", 2150836393u, 0, 6, NULL);
+be_define_const_str(sec, "sec", 3139892658u, 0, 3, NULL);
+be_define_const_str(seg7_font, "seg7_font", 4099690689u, 0, 9, NULL);
+be_define_const_str(select, "select", 297952813u, 0, 6, NULL);
+be_define_const_str(serial, "serial", 3687697785u, 0, 6, &be_const_str_url_encode);
+be_define_const_str(set, "set", 3324446467u, 0, 3, NULL);
+be_define_const_str(set_alternate, "set_alternate", 1709680562u, 0, 13, &be_const_str_widget_struct_by_class);
+be_define_const_str(set_auth, "set_auth", 1057170930u, 0, 8, NULL);
+be_define_const_str(set_bri, "set_bri", 2789118779u, 0, 7, &be_const_str_wire1);
+be_define_const_str(set_chg_current, "set_chg_current", 336304386u, 0, 15, NULL);
+be_define_const_str(set_dc_voltage, "set_dc_voltage", 2181981936u, 0, 14, &be_const_str_toupper);
+be_define_const_str(set_dcdc_enable, "set_dcdc_enable", 1594690786u, 0, 15, &be_const_str_tomap);
+be_define_const_str(set_first_time, "set_first_time", 3111247550u, 0, 14, NULL);
+be_define_const_str(set_height, "set_height", 1080207399u, 0, 10, &be_const_str_width_def);
+be_define_const_str(set_ldo_enable, "set_ldo_enable", 2916502041u, 0, 14, NULL);
+be_define_const_str(set_ldo_voltage, "set_ldo_voltage", 4090501160u, 0, 15, &be_const_str_tob64);
+be_define_const_str(set_light, "set_light", 3176076152u, 0, 9, &be_const_str_setrange);
+be_define_const_str(set_matrix_pixel_color, "set_matrix_pixel_color", 1197149462u, 0, 22, NULL);
+be_define_const_str(set_percentage, "set_percentage", 2952022724u, 0, 14, NULL);
+be_define_const_str(set_pixel_color, "set_pixel_color", 1275248356u, 0, 15, NULL);
+be_define_const_str(set_power, "set_power", 549820893u, 0, 9, &be_const_str_widget_height_def);
+be_define_const_str(set_style_bg_color, "set_style_bg_color", 1689513089u, 0, 18, NULL);
+be_define_const_str(set_style_line_color, "set_style_line_color", 3665238976u, 0, 20, NULL);
+be_define_const_str(set_style_pad_right, "set_style_pad_right", 3314069054u, 0, 19, NULL);
+be_define_const_str(set_style_text_font, "set_style_text_font", 1028590019u, 0, 19, NULL);
+be_define_const_str(set_text, "set_text", 1849641155u, 0, 8, NULL);
+be_define_const_str(set_time, "set_time", 900236405u, 0, 8, NULL);
+be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_import);
+be_define_const_str(set_timer, "set_timer", 2135414533u, 0, 9, NULL);
+be_define_const_str(set_useragent, "set_useragent", 612237244u, 0, 13, NULL);
+be_define_const_str(set_width, "set_width", 484671920u, 0, 9, &be_const_str__X7D);
+be_define_const_str(set_x, "set_x", 1849400772u, 0, 5, &be_const_str_def);
+be_define_const_str(set_y, "set_y", 1866178391u, 0, 5, NULL);
+be_define_const_str(setbits, "setbits", 2762408167u, 0, 7, NULL);
+be_define_const_str(seti, "seti", 1500556254u, 0, 4, NULL);
+be_define_const_str(setitem, "setitem", 1554834596u, 0, 7, NULL);
+be_define_const_str(setmember, "setmember", 1432909441u, 0, 9, &be_const_str_strptime);
+be_define_const_str(setrange, "setrange", 3794019032u, 0, 8, NULL);
+be_define_const_str(settings, "settings", 1745255176u, 0, 8, NULL);
+be_define_const_str(shared_key, "shared_key", 2200833624u, 0, 10, &be_const_str_wifi);
+be_define_const_str(show, "show", 2840060476u, 0, 4, &be_const_str_y);
+be_define_const_str(sin, "sin", 3761252941u, 0, 3, NULL);
+be_define_const_str(sinh, "sinh", 282220607u, 0, 4, &be_const_str_tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29);
+be_define_const_str(size, "size", 597743964u, 0, 4, NULL);
+be_define_const_str(skip, "skip", 1097563074u, 0, 4, NULL);
+be_define_const_str(solidified, "solidified", 3257553487u, 0, 10, NULL);
+be_define_const_str(split, "split", 2276994531u, 0, 5, &be_const_str_strftime);
+be_define_const_str(sqrt, "sqrt", 2112764879u, 0, 4, NULL);
+be_define_const_str(srand, "srand", 465518633u, 0, 5, NULL);
+be_define_const_str(start, "start", 1697318111u, 0, 5, NULL);
+be_define_const_str(state, "state", 2016490230u, 0, 5, NULL);
+be_define_const_str(static, "static", 3532702267u, 71, 6, NULL);
+be_define_const_str(stop, "stop", 3411225317u, 0, 4, NULL);
+be_define_const_str(stop_iteration, "stop_iteration", 4173793901u, 0, 14, NULL);
+be_define_const_str(str, "str", 3259748752u, 0, 3, NULL);
+be_define_const_str(strftime, "strftime", 187738851u, 0, 8, NULL);
+be_define_const_str(string, "string", 398550328u, 0, 6, NULL);
+be_define_const_str(strip, "strip", 4246411473u, 0, 5, NULL);
+be_define_const_str(strptime, "strptime", 1277910361u, 0, 8, &be_const_str_unknown_X20instruction);
+be_define_const_str(super, "super", 4152230356u, 0, 5, &be_const_str_year);
+be_define_const_str(sys, "sys", 3277365014u, 0, 3, NULL);
+be_define_const_str(tag, "tag", 2516003219u, 0, 3, &be_const_str_widget_instance_size);
+be_define_const_str(tan, "tan", 2633446552u, 0, 3, NULL);
+be_define_const_str(tanh, "tanh", 153638352u, 0, 4, NULL);
+be_define_const_str(target, "target", 845187144u, 0, 6, NULL);
+be_define_const_str(target_search, "target_search", 1947846553u, 0, 13, NULL);
+be_define_const_str(tasmota, "tasmota", 424643812u, 0, 7, NULL);
+be_define_const_str(tasmota_X2Eget_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eget_X28_X29, "tasmota.get_light() is deprecated, use light.get()", 3525753647u, 0, 50, NULL);
+be_define_const_str(tasmota_X2Eset_light_X28_X29_X20is_X20deprecated_X2C_X20use_X20light_X2Eset_X28_X29, "tasmota.set_light() is deprecated, use light.set()", 2124937871u, 0, 50, NULL);
+be_define_const_str(tcpclient, "tcpclient", 3828797983u, 0, 9, NULL);
+be_define_const_str(tele, "tele", 3474458061u, 0, 4, NULL);
+be_define_const_str(the_X20second_X20argument_X20is_X20not_X20a_X20function, "the second argument is not a function", 3954574469u, 0, 37, NULL);
+be_define_const_str(time_dump, "time_dump", 3330410747u, 0, 9, NULL);
+be_define_const_str(time_reached, "time_reached", 2075136773u, 0, 12, NULL);
+be_define_const_str(time_str, "time_str", 2613827612u, 0, 8, &be_const_str__X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D);
+be_define_const_str(to_gamma, "to_gamma", 1597139862u, 0, 8, NULL);
 be_define_const_str(tob64, "tob64", 373777640u, 0, 5, NULL);
-be_define_const_str(AudioFileSourceFS, "AudioFileSourceFS", 1839147653u, 0, 17, &be_const_str_get_free_heap);
-be_define_const_str(get_free_heap, "get_free_heap", 625069757u, 0, 13, NULL);
-be_define_const_str(atan2, "atan2", 3173440503u, 0, 5, NULL);
-be_define_const_str(set_timeouts, "set_timeouts", 3732850900u, 0, 12, &be_const_str_toupper);
+be_define_const_str(tolower, "tolower", 1042520049u, 0, 7, NULL);
+be_define_const_str(tomap, "tomap", 612167626u, 0, 5, NULL);
+be_define_const_str(top, "top", 2802900028u, 0, 3, NULL);
+be_define_const_str(toptr, "toptr", 3379847454u, 0, 5, NULL);
+be_define_const_str(tostring, "tostring", 2299708645u, 0, 8, NULL);
 be_define_const_str(toupper, "toupper", 3691983576u, 0, 7, NULL);
-be_define_const_str(_ccmd, "_ccmd", 2163421413u, 0, 5, &be_const_str_content_send);
-be_define_const_str(content_send, "content_send", 1673733649u, 0, 12, &be_const_str_flush);
-be_define_const_str(flush, "flush", 3002334877u, 0, 5, &be_const_str_true);
+be_define_const_str(tr, "tr", 1195724803u, 0, 2, NULL);
+be_define_const_str(traceback, "traceback", 3385188109u, 0, 9, &be_const_str_as);
 be_define_const_str(true, "true", 1303515621u, 61, 4, NULL);
-be_define_const_str(detect, "detect", 8884370u, 0, 6, NULL);
-be_define_const_str(SERIAL_8O2, "SERIAL_8O2", 272345123u, 0, 10, &be_const_str_split);
-be_define_const_str(split, "split", 2276994531u, 0, 5, NULL);
+be_define_const_str(try, "try", 2887626766u, 68, 3, NULL);
+be_define_const_str(try_rule, "try_rule", 1986449405u, 0, 8, &be_const_str_widget_dtor_cb);
+be_define_const_str(type, "type", 1361572173u, 0, 4, NULL);
+be_define_const_str(unknown_X20instruction, "unknown instruction", 1093911841u, 0, 19, &be_const_str_widget_event_impl);
+be_define_const_str(update, "update", 672109684u, 0, 6, NULL);
+be_define_const_str(upper, "upper", 176974407u, 0, 5, NULL);
+be_define_const_str(url_encode, "url_encode", 528392145u, 0, 10, NULL);
+be_define_const_str(v, "v", 4077666505u, 0, 1, &be_const_str_valuer_error);
+be_define_const_str(value, "value", 1113510858u, 0, 5, &be_const_str_web_add_button);
+be_define_const_str(value_error, "value_error", 773297791u, 0, 11, NULL);
+be_define_const_str(valuer_error, "valuer_error", 2567947105u, 0, 12, NULL);
+be_define_const_str(var, "var", 2317739966u, 64, 3, NULL);
+be_define_const_str(w, "w", 4060888886u, 0, 1, NULL);
+be_define_const_str(wd, "wd", 1531424278u, 0, 2, NULL);
+be_define_const_str(web_add_button, "web_add_button", 3537875058u, 0, 14, NULL);
+be_define_const_str(web_add_config_button, "web_add_config_button", 639674325u, 0, 21, NULL);
+be_define_const_str(web_add_console_button, "web_add_console_button", 3481436192u, 0, 22, NULL);
+be_define_const_str(web_add_handler, "web_add_handler", 3990174962u, 0, 15, NULL);
+be_define_const_str(web_add_main_button, "web_add_main_button", 3960367664u, 0, 19, NULL);
+be_define_const_str(web_add_management_button, "web_add_management_button", 2738877186u, 0, 25, &be_const_str_webclient);
+be_define_const_str(web_send, "web_send", 2989941448u, 0, 8, NULL);
+be_define_const_str(web_send_decimal, "web_send_decimal", 1407210204u, 0, 16, NULL);
+be_define_const_str(web_sensor, "web_sensor", 2900096972u, 0, 10, &be_const_str_do);
+be_define_const_str(webclient, "webclient", 4076389146u, 0, 9, NULL);
+be_define_const_str(webserver, "webserver", 1572454038u, 0, 9, NULL);
+be_define_const_str(while, "while", 231090382u, 53, 5, NULL);
+be_define_const_str(widget_cb, "widget_cb", 2763583055u, 0, 9, &be_const_str_width);
+be_define_const_str(widget_constructor, "widget_constructor", 2543785934u, 0, 18, &be_const_str_yield);
+be_define_const_str(widget_ctor_cb, "widget_ctor_cb", 876007560u, 0, 14, &be_const_str_for);
+be_define_const_str(widget_ctor_impl, "widget_ctor_impl", 194252479u, 0, 16, &be_const_str_write_file);
+be_define_const_str(widget_destructor, "widget_destructor", 4207388345u, 0, 17, NULL);
+be_define_const_str(widget_dtor_cb, "widget_dtor_cb", 3151545845u, 0, 14, NULL);
+be_define_const_str(widget_dtor_impl, "widget_dtor_impl", 520430610u, 0, 16, NULL);
+be_define_const_str(widget_editable, "widget_editable", 3821793286u, 0, 15, &be_const_str_try);
+be_define_const_str(widget_event, "widget_event", 1951408186u, 0, 12, NULL);
+be_define_const_str(widget_event_cb, "widget_event_cb", 1508466754u, 0, 15, NULL);
+be_define_const_str(widget_event_impl, "widget_event_impl", 2178430561u, 0, 17, NULL);
+be_define_const_str(widget_group_def, "widget_group_def", 1246968785u, 0, 16, NULL);
+be_define_const_str(widget_height_def, "widget_height_def", 3131667813u, 0, 17, NULL);
+be_define_const_str(widget_instance_size, "widget_instance_size", 2055354779u, 0, 20, NULL);
+be_define_const_str(widget_struct_by_class, "widget_struct_by_class", 3806373842u, 0, 22, NULL);
+be_define_const_str(widget_struct_default, "widget_struct_default", 781673633u, 0, 21, NULL);
+be_define_const_str(widget_width_def, "widget_width_def", 3986078862u, 0, 16, NULL);
+be_define_const_str(width, "width", 2508680735u, 0, 5, NULL);
+be_define_const_str(width_def, "width_def", 1143717879u, 0, 9, NULL);
+be_define_const_str(wifi, "wifi", 120087624u, 0, 4, NULL);
+be_define_const_str(wire, "wire", 4082753944u, 0, 4, NULL);
+be_define_const_str(wire1, "wire1", 3212721419u, 0, 5, NULL);
+be_define_const_str(wire2, "wire2", 3229499038u, 0, 5, NULL);
+be_define_const_str(wire_scan, "wire_scan", 2671275880u, 0, 9, NULL);
+be_define_const_str(write, "write", 3190202204u, 0, 5, NULL);
+be_define_const_str(write8, "write8", 3133991532u, 0, 6, NULL);
+be_define_const_str(write_bit, "write_bit", 2660990436u, 0, 9, NULL);
+be_define_const_str(write_bytes, "write_bytes", 1227543792u, 0, 11, &be_const_str_except);
+be_define_const_str(write_file, "write_file", 3177658879u, 0, 10, NULL);
+be_define_const_str(write_gpio, "write_gpio", 2267940334u, 0, 10, &be_const_str_if);
+be_define_const_str(x, "x", 4245442695u, 0, 1, NULL);
+be_define_const_str(x1, "x1", 274927234u, 0, 2, NULL);
+be_define_const_str(y, "y", 4228665076u, 0, 1, NULL);
+be_define_const_str(y1, "y1", 2355101727u, 0, 2, NULL);
+be_define_const_str(year, "year", 2927578396u, 0, 4, NULL);
+be_define_const_str(yield, "yield", 1821831854u, 0, 5, NULL);
+be_define_const_str(zero, "zero", 2339366755u, 0, 4, NULL);
+be_define_const_str(zip, "zip", 2877453236u, 0, 3, &be_const_str__X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D);
+be_define_const_str(_X7B, "{", 4262220314u, 0, 1, NULL);
+be_define_const_str(_X7Bs_X7DBatt_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}Batt Current{m}%.1f mA{e}", 866537156u, 0, 28, NULL);
+be_define_const_str(_X7Bs_X7DBatt_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}Batt Voltage{m}%.3f V{e}", 3184308199u, 0, 27, NULL);
+be_define_const_str(_X7Bs_X7DTemp_X20AXP_X7Bm_X7D_X25_X2E1f_X20_XB0C_X7Be_X7D, "{s}Temp AXP{m}%.1f \u00b0C{e}", 2304457292u, 0, 24, NULL);
+be_define_const_str(_X7Bs_X7DVBus_X20Current_X7Bm_X7D_X25_X2E1f_X20mA_X7Be_X7D, "{s}VBus Current{m}%.1f mA{e}", 1032721155u, 0, 28, NULL);
+be_define_const_str(_X7Bs_X7DVBus_X20Voltage_X7Bm_X7D_X25_X2E3f_X20V_X7Be_X7D, "{s}VBus Voltage{m}%.3f V{e}", 165651270u, 0, 27, NULL);
+be_define_const_str(_X7B_X7D, "{}", 1415952421u, 0, 2, NULL);
+be_define_const_str(_X7D, "}", 4161554600u, 0, 1, NULL);
 
 static const bstring* const m_string_table[] = {
-    (const bstring *)&be_const_str_SERIAL_6N2,
-    (const bstring *)&be_const_str_time_reached,
-    (const bstring *)&be_const_str_SERIAL_5E2,
-    (const bstring *)&be_const_str_SERIAL_7O1,
-    (const bstring *)&be_const_str_dot_size,
+    (const bstring *)&be_const_str__X3D,
+    (const bstring *)&be_const_str_point,
+    (const bstring *)&be_const_str_run,
     NULL,
-    (const bstring *)&be_const_str__cmd,
-    (const bstring *)&be_const_str_assert,
-    (const bstring *)&be_const_str_check_privileged_access,
-    (const bstring *)&be_const_str_load,
-    (const bstring *)&be_const_str_dac_voltage,
+    (const bstring *)&be_const_str_class_init_obj,
+    (const bstring *)&be_const_str_try_rule,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dzip_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20action_X3D_X27_X2Fac_X27_X20method_X3D_X27post_X27_X20,
+    (const bstring *)&be_const_str_setbits,
+    (const bstring *)&be_const_str_AXP192,
+    (const bstring *)&be_const_str_tolower,
+    (const bstring *)&be_const_str__X2B,
+    (const bstring *)&be_const_str_I2C_X3A,
+    (const bstring *)&be_const_str_exec_rules,
+    (const bstring *)&be_const_str_read13,
+    (const bstring *)&be_const_str__X2F,
+    (const bstring *)&be_const_str_pc_abs,
+    (const bstring *)&be_const_str__error,
+    (const bstring *)&be_const_str__X23autoexec_X2Ebat,
+    (const bstring *)&be_const_str__X23,
+    (const bstring *)&be_const_str__X2Ep,
+    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27Autoconfiguration_X27_X3E_X26nbsp_X3BCurrent_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
+    (const bstring *)&be_const_str_SERIAL_6N1,
+    (const bstring *)&be_const_str_cb_do_nothing,
+    (const bstring *)&be_const_str_CFG_X3A_X20loading_X20,
+    (const bstring *)&be_const_str_HTTP_POST,
+    (const bstring *)&be_const_str__rules,
+    NULL,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_the_X20second_X20argument_X20is_X20not_X20a_X20function,
+    (const bstring *)&be_const_str_begin,
     (const bstring *)&be_const_str_POST,
-    (const bstring *)&be_const_str_classname,
-    (const bstring *)&be_const_str__global_def,
-    (const bstring *)&be_const_str_AES_GCM,
-    (const bstring *)&be_const_str_strftime,
-    (const bstring *)&be_const_str_insert,
-    (const bstring *)&be_const_str_arg_size,
-    (const bstring *)&be_const_str_OneWire,
-    (const bstring *)&be_const_str_return,
-    (const bstring *)&be_const_str_wire,
-    (const bstring *)&be_const_str__global_addr,
-    (const bstring *)&be_const_str_gamma8,
-    (const bstring *)&be_const_str_depower,
-    (const bstring *)&be_const_str__end_transmission,
-    (const bstring *)&be_const_str_hs2rgb,
-    (const bstring *)&be_const_str_SERIAL_7N1,
-    (const bstring *)&be_const_str_ctypes_bytes,
+    (const bstring *)&be_const_str_web_add_console_button,
+    (const bstring *)&be_const_str__X2F_X2Eautoconf,
     NULL,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_GET,
-    (const bstring *)&be_const_str_cos,
-    NULL,
-    (const bstring *)&be_const_str__settings_ptr,
-    (const bstring *)&be_const_str_content_send_style,
-    (const bstring *)&be_const_str_SERIAL_7E2,
-    (const bstring *)&be_const_str_get_power,
-    (const bstring *)&be_const_str__read,
-    (const bstring *)&be_const_str_atan,
-    (const bstring *)&be_const_str_contains,
-    (const bstring *)&be_const_str_arch,
-    (const bstring *)&be_const_str_geti,
-    (const bstring *)&be_const_str_add_cmd,
-    (const bstring *)&be_const_str_get_switch,
-    NULL,
-    (const bstring *)&be_const_str_try,
-    NULL,
-    (const bstring *)&be_const_str_web_send,
+    (const bstring *)&be_const_str__filename,
+    (const bstring *)&be_const_str_write_bit,
     (const bstring *)&be_const_str_SERIAL_5O1,
-    (const bstring *)&be_const_str_codedump,
-    (const bstring *)&be_const_str_dump,
-    (const bstring *)&be_const_str_add,
-    (const bstring *)&be_const_str_set_timer,
-    (const bstring *)&be_const_str_addr,
-    (const bstring *)&be_const_str___upper__,
-    (const bstring *)&be_const_str_AudioGeneratorWAV,
-    (const bstring *)&be_const_str_SERIAL_5N2,
-    (const bstring *)&be_const_str_clear,
-    (const bstring *)&be_const_str_SERIAL_8N1,
-    (const bstring *)&be_const_str_AudioGeneratorMP3,
-    (const bstring *)&be_const_str_get_option,
-    (const bstring *)&be_const_str_webclient,
-    (const bstring *)&be_const_str_dot_p2,
-    (const bstring *)&be_const_str__request_from,
-    NULL,
-    (const bstring *)&be_const_str_I2C_Driver,
-    NULL,
-    (const bstring *)&be_const_str_ceil,
-    (const bstring *)&be_const_str_concat,
-    (const bstring *)&be_const_str_tomap,
-    (const bstring *)&be_const_str_resp_cmnd_error,
-    (const bstring *)&be_const_str_add_header,
-    (const bstring *)&be_const_str_exists,
-    (const bstring *)&be_const_str_allocated,
-    (const bstring *)&be_const_str_SERIAL_5E1,
-    (const bstring *)&be_const_str_pin_used,
+    (const bstring *)&be_const_str_AES_GCM,
+    (const bstring *)&be_const_str_set_height,
+    (const bstring *)&be_const_str__end_transmission,
+    (const bstring *)&be_const_str__X2D_X2D_X3A_X2D_X2D,
+    (const bstring *)&be_const_str_cb_obj,
+    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20first_X20time_X20marker,
+    (const bstring *)&be_const_str__archive,
+    (const bstring *)&be_const_str_module,
+    (const bstring *)&be_const_str_SERIAL_7N1,
+    (const bstring *)&be_const_str_sinh,
+    (const bstring *)&be_const_str__X3Cfieldset_X3E_X3Cstyle_X3E_X2Ebdis_X7Bbackground_X3A_X23888_X3B_X7D_X2Ebdis_X3Ahover_X7Bbackground_X3A_X23888_X3B_X7D_X3C_X2Fstyle_X3E,
     (const bstring *)&be_const_str_SERIAL_6O2,
-    (const bstring *)&be_const_str_pin_mode,
-    (const bstring *)&be_const_str_abs,
-    (const bstring *)&be_const_str_bytes,
-    (const bstring *)&be_const_str_call,
-    (const bstring *)&be_const_str_cmd_res,
-    (const bstring *)&be_const_str_opt_eq,
+    (const bstring *)&be_const_str_detected_X20on_X20bus,
+    (const bstring *)&be_const_str_response_append,
+    (const bstring *)&be_const_str_WS2812_GRB,
+    (const bstring *)&be_const_str__X3Cinstance_X3A_X20_X25s_X28_X25s_X2C_X20_X25s_X2C_X20_X25s_X29,
+    (const bstring *)&be_const_str_toptr,
+    (const bstring *)&be_const_str_get_bri,
+    NULL,
+    (const bstring *)&be_const_str_arch,
+    NULL,
+    (const bstring *)&be_const_str__X3C_X2Fform_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_connection_error,
+    (const bstring *)&be_const_str_,
+    (const bstring *)&be_const_str_calldepth,
+    (const bstring *)&be_const_str___iterator__,
+    (const bstring *)&be_const_str__X2Esize,
+    (const bstring *)&be_const_str_widget_group_def,
+    (const bstring *)&be_const_str_resp_cmnd,
+    (const bstring *)&be_const_str__X2Ep2,
+    (const bstring *)&be_const_str_get_switch,
+    (const bstring *)&be_const_str_clear_first_time,
+    NULL,
+    (const bstring *)&be_const_str_EC_C25519,
     (const bstring *)&be_const_str_save,
     NULL,
+    NULL,
+    (const bstring *)&be_const_str_SERIAL_8N1,
+    (const bstring *)&be_const_str_ip,
+    (const bstring *)&be_const_str_alternate,
+    (const bstring *)&be_const_str_compile,
+    (const bstring *)&be_const_str_file_X20extension_X20is_X20not_X20_X27_X2Ebe_X27_X20or_X20_X27_X2Ebec_X27,
+    (const bstring *)&be_const_str_animate,
+    (const bstring *)&be_const_str__X2504d_X2D_X2502d_X2D_X2502dT_X2502d_X3A_X2502d_X3A_X2502d,
+    NULL,
+    (const bstring *)&be_const_str_SERIAL_8O2,
+    (const bstring *)&be_const_str__X25s_X2Eautoconf,
+    NULL,
+    (const bstring *)&be_const_str__dirty,
+    (const bstring *)&be_const_str_y1,
+    (const bstring *)&be_const_str_remove_driver,
+    (const bstring *)&be_const_str_get_string,
+    (const bstring *)&be_const_str_CFG_X3A_X20removing_X20autoconf_X20files,
+    (const bstring *)&be_const_str_autoexec,
+    (const bstring *)&be_const_str_get_style_line_color,
+    (const bstring *)&be_const_str_bool,
+    (const bstring *)&be_const_str_write_gpio,
+    (const bstring *)&be_const_str__X3D_X3D,
+    (const bstring *)&be_const_str_id,
+    (const bstring *)&be_const_str_SERIAL_5N2,
+    NULL,
+    (const bstring *)&be_const_str_persist,
+    (const bstring *)&be_const_str_set_timeouts,
+    NULL,
+    (const bstring *)&be_const_str_AudioGenerator,
+    (const bstring *)&be_const_str_byte,
+    (const bstring *)&be_const_str_EVENT_DRAW_PART_BEGIN,
+    (const bstring *)&be_const_str_collect,
+    (const bstring *)&be_const_str_widget_event,
+    (const bstring *)&be_const_str_SERIAL_6E2,
+    (const bstring *)&be_const_str_add_anim,
+    (const bstring *)&be_const_str_erase,
+    (const bstring *)&be_const_str___lower__,
+    (const bstring *)&be_const_str_arg,
+    (const bstring *)&be_const_str_CFG_X3A_X20ran_X20_X20,
+    (const bstring *)&be_const_str_srand,
+    (const bstring *)&be_const_str_skip,
+    (const bstring *)&be_const_str_Leds,
+    NULL,
+    (const bstring *)&be_const_str__X23init_X2Ebat,
+    (const bstring *)&be_const_str__X3Clambda_X3E,
+    (const bstring *)&be_const_str_GET,
+    (const bstring *)&be_const_str_widget_ctor_cb,
+    (const bstring *)&be_const_str__global_addr,
+    (const bstring *)&be_const_str_OneWire,
+    (const bstring *)&be_const_str__X3C_X2Fselect_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_update,
+    NULL,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_AudioOutput,
+    NULL,
+    (const bstring *)&be_const_str_decompress,
+    NULL,
+    (const bstring *)&be_const_str_EVENT_DRAW_PART_END,
+    (const bstring *)&be_const_str_load_templates,
+    (const bstring *)&be_const_str_get_alternate,
+    (const bstring *)&be_const_str_acos,
+    (const bstring *)&be_const_str__X2Elen,
+    (const bstring *)&be_const_str_constructor_cb,
+    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X20,
+    NULL,
+    (const bstring *)&be_const_str_get_current_module_name,
+    (const bstring *)&be_const_str__X2Ebec,
+    (const bstring *)&be_const_str__settings_ptr,
+    (const bstring *)&be_const_str_dump,
+    NULL,
+    (const bstring *)&be_const_str__drivers,
+    (const bstring *)&be_const_str__X28_X29,
+    NULL,
+    (const bstring *)&be_const_str__X2Ebe,
+    (const bstring *)&be_const_str_content_start,
+    (const bstring *)&be_const_str__class,
+    (const bstring *)&be_const_str_h,
+    (const bstring *)&be_const_str_Unknown_X20command,
+    (const bstring *)&be_const_str_CFG_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s,
+    (const bstring *)&be_const_str_p1,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_b,
+    (const bstring *)&be_const_str_Parameter_X20error,
+    (const bstring *)&be_const_str_event,
+    (const bstring *)&be_const_str_read32,
+    (const bstring *)&be_const_str_f,
+    (const bstring *)&be_const_str_resp_cmnd_failed,
+    (const bstring *)&be_const_str_create_matrix,
+    (const bstring *)&be_const_str_SERIAL_7E2,
+    (const bstring *)&be_const_str_resolvecmnd,
+    (const bstring *)&be_const_str_draw_line,
+    (const bstring *)&be_const_str_autorun,
+    (const bstring *)&be_const_str__X2Eautoconf,
+    (const bstring *)&be_const_str_editable,
+    NULL,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str__X3A,
+    (const bstring *)&be_const_str_EVENT_DRAW_MAIN,
+    (const bstring *)&be_const_str_remove_timer,
+    (const bstring *)&be_const_str_Wire,
+    (const bstring *)&be_const_str__X3E,
+    (const bstring *)&be_const_str__X26lt_X3BNone_X26gt_X3B,
+    (const bstring *)&be_const_str__X3C,
+    (const bstring *)&be_const_str_pin,
+    (const bstring *)&be_const_str__def,
+    (const bstring *)&be_const_str_int,
+    (const bstring *)&be_const_str_atan2,
+    (const bstring *)&be_const_str_AudioOutputI2S,
+    (const bstring *)&be_const_str_last_modified,
+    (const bstring *)&be_const_str_get_style_pad_right,
+    (const bstring *)&be_const_str__settings_def,
+    (const bstring *)&be_const_str_CFG_X3A_X20loaded_X20_X27_X25s_X27,
+    (const bstring *)&be_const_str__X26lt_X3BError_X3A_X20apply_X20new_X20or_X20remove_X26gt_X3B,
+    NULL,
+    (const bstring *)&be_const_str_start,
+    (const bstring *)&be_const_str_reset,
+    (const bstring *)&be_const_str__X2E,
+    (const bstring *)&be_const_str__X21_X3D_X3D,
+    (const bstring *)&be_const_str__X2C,
+    (const bstring *)&be_const_str__X23preinit_X2Ebe,
+    (const bstring *)&be_const_str_month,
+    (const bstring *)&be_const_str_instance_size,
+    (const bstring *)&be_const_str__X20,
+    (const bstring *)&be_const_str_exp,
+    (const bstring *)&be_const_str_bus,
+    (const bstring *)&be_const_str_cmd_res,
+    (const bstring *)&be_const_str_draw_line_dsc,
+    (const bstring *)&be_const_str_BRY_X3A_X20Exception_X3E_X20_X27_X25s_X27_X20_X2D_X20_X25s,
+    (const bstring *)&be_const_str_tostring,
+    (const bstring *)&be_const_str_var,
+    (const bstring *)&be_const_str_upper,
+    (const bstring *)&be_const_str_color,
+    (const bstring *)&be_const_str_internal_error,
+    (const bstring *)&be_const_str_encrypt,
+    (const bstring *)&be_const_str__X21_X3D,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_CFG_X3A_X20running_X20,
+    (const bstring *)&be_const_str_Restart_X201,
+    (const bstring *)&be_const_str_BUTTON_CONFIGURATION,
+    NULL,
+    (const bstring *)&be_const_str_HTTP_GET,
+    (const bstring *)&be_const_str_loop,
+    (const bstring *)&be_const_str_SERIAL_5O2,
+    (const bstring *)&be_const_str__X0A,
+    (const bstring *)&be_const_str_back_forth,
+    (const bstring *)&be_const_str_add_rule,
+    (const bstring *)&be_const_str_CFG_X3A_X20skipping_X20_X27display_X2Eini_X27_X20because_X20already_X20present_X20in_X20file_X2Dsystem,
+    (const bstring *)&be_const_str_list,
+    (const bstring *)&be_const_str_closure,
+    (const bstring *)&be_const_str__X2F_X3Frst_X3D,
+    NULL,
+    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27zipapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3EApply_X20configuration_X3C_X2Fbutton_X3E,
+    (const bstring *)&be_const_str_COLOR_WHITE,
+    NULL,
+    (const bstring *)&be_const_str_SERIAL_6O1,
+    (const bstring *)&be_const_str_widget_struct_default,
+    (const bstring *)&be_const_str_gamma,
+    (const bstring *)&be_const_str_abs,
+    (const bstring *)&be_const_str_pc,
+    (const bstring *)&be_const_str_concat,
+    (const bstring *)&be_const_str_height_def,
+    NULL,
+    (const bstring *)&be_const_str_log10,
+    (const bstring *)&be_const_str_call,
+    (const bstring *)&be_const_str__p,
+    (const bstring *)&be_const_str_file,
+    (const bstring *)&be_const_str__request_from,
+    (const bstring *)&be_const_str_BRY_X3A_X20failed_X20to_X20load_X20_persist_X2Ejson,
+    (const bstring *)&be_const_str__X2Ep1,
+    (const bstring *)&be_const_str_content_send_style,
+    (const bstring *)&be_const_str_AudioGeneratorWAV,
+    (const bstring *)&be_const_str_seg7_font,
+    NULL,
+    (const bstring *)&be_const_str_add_driver,
+    (const bstring *)&be_const_str_pin_used,
+    (const bstring *)&be_const_str_Tele,
+    (const bstring *)&be_const_str_SERIAL_8N2,
+    NULL,
+    (const bstring *)&be_const_str__X3Cbutton_X20name_X3D_X27reapply_X27_X20class_X3D_X27button_X20bgrn_X27_X3ERe_X2Dapply_X20current_X20configuration_X3C_X2Fbutton_X3E,
+    (const bstring *)&be_const_str_get_input_power_status,
+    (const bstring *)&be_const_str__persist_X2Ejson,
+    NULL,
+    (const bstring *)&be_const_str__X23display_X2Eini,
+    (const bstring *)&be_const_str_Animate_X20pc_X20is_X20out_X20of_X20range,
+    (const bstring *)&be_const_str_SERIAL_8O1,
+    (const bstring *)&be_const_str_ctypes_bytes,
+    (const bstring *)&be_const_str__X3Clabel_X3EChoose_X20a_X20device_X20configuration_X3A_X3C_X2Flabel_X3E_X3Cbr_X3E,
+    (const bstring *)&be_const_str_round_end,
+    (const bstring *)&be_const_str_codedump,
+    (const bstring *)&be_const_str_MD5,
+    (const bstring *)&be_const_str_PART_MAIN,
+    NULL,
+    (const bstring *)&be_const_str_asin,
+    (const bstring *)&be_const_str_content_stop,
+    (const bstring *)&be_const_str_set_light,
+    (const bstring *)&be_const_str_get_bat_current,
+    (const bstring *)&be_const_str_x1,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_compress,
+    (const bstring *)&be_const_str_escape,
+    (const bstring *)&be_const_str_atan,
+    (const bstring *)&be_const_str_SERIAL_5N1,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3Cform_X20id_X3Dac_X20action_X3D_X27ac_X27_X20style_X3D_X27display_X3A_X20block_X3B_X27_X20method_X3D_X27get_X27_X3E_X3Cbutton_X3E_X26_X23129668_X3B_X20Auto_X2Dconfiguration_X3C_X2Fbutton_X3E_X3C_X2Fform_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str__X3Cp_X20style_X3D_X27width_X3A340px_X3B_X27_X3E_X3Cb_X3EException_X3A_X3C_X2Fb_X3E_X3Cbr_X3E_X27_X25s_X27_X3Cbr_X3E_X25s_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_tr,
+    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27_X25s_X27_X3E_X25s_X3C_X2Foption_X3E,
+    (const bstring *)&be_const_str__X2E_X2E,
+    (const bstring *)&be_const_str_SERIAL_6E1,
+    (const bstring *)&be_const_str_content_button,
+    (const bstring *)&be_const_str_asstring,
+    NULL,
+    (const bstring *)&be_const_str_detect,
+    (const bstring *)&be_const_str_close,
+    (const bstring *)&be_const_str_add_header,
+    (const bstring *)&be_const_str_day,
+    (const bstring *)&be_const_str_seti,
+    (const bstring *)&be_const_str_light,
+    (const bstring *)&be_const_str__X3Cp_X3E_X3C_X2Fp_X3E_X3C_X2Ffieldset_X3E_X3Cp_X3E_X3C_X2Fp_X3E,
+    (const bstring *)&be_const_str_event_cb,
+    (const bstring *)&be_const_str_AudioFileSource,
+    (const bstring *)&be_const_str_get_tasmota,
+    (const bstring *)&be_const_str_preinit,
+    (const bstring *)&be_const_str__available,
+    (const bstring *)&be_const_str_name,
+    NULL,
+    NULL,
+    (const bstring *)&be_const_str_reset_search,
+    (const bstring *)&be_const_str__X3C_X3D,
+    (const bstring *)&be_const_str_from_to,
+    NULL,
+    (const bstring *)&be_const_str_remove,
+    (const bstring *)&be_const_str__read,
+    (const bstring *)&be_const_str_deg,
+    (const bstring *)&be_const_str_obj_class_create_obj,
+    (const bstring *)&be_const_str_ins_time,
+    (const bstring *)&be_const_str__X2Etapp,
+    (const bstring *)&be_const_str_content_flush,
+    (const bstring *)&be_const_str_area,
+    (const bstring *)&be_const_str_CFG_X3A_X20no_X20_X27_X2A_X2Eautoconf_X27_X20file_X20found,
+    (const bstring *)&be_const_str_webserver,
+    (const bstring *)&be_const_str_iter,
+    (const bstring *)&be_const_str_ceil,
+    (const bstring *)&be_const_str__global_def,
+    (const bstring *)&be_const_str__get_cb,
+    (const bstring *)&be_const_str___upper__,
+    (const bstring *)&be_const_str_size,
+    (const bstring *)&be_const_str_cb_event_closure,
     (const bstring *)&be_const_str_find_key_i,
     (const bstring *)&be_const_str__cb,
-    (const bstring *)&be_const_str_Tasmota,
-    (const bstring *)&be_const_str_as,
-    (const bstring *)&be_const_str_dot_w,
-    (const bstring *)&be_const_str_add_rule,
-    (const bstring *)&be_const_str__ptr,
-    (const bstring *)&be_const_str_reset_search,
-    (const bstring *)&be_const_str_SERIAL_7O2,
-    (const bstring *)&be_const_str_deg,
-    (const bstring *)&be_const_str_log10,
-    (const bstring *)&be_const_str_char,
-    (const bstring *)&be_const_str_opt_call,
-    (const bstring *)&be_const_str_SERIAL_7N2,
-    (const bstring *)&be_const_str_listdir,
-    (const bstring *)&be_const_str_read_bytes,
-    (const bstring *)&be_const_str_SERIAL_6E1,
-    NULL,
-    (const bstring *)&be_const_str_SERIAL_5O2,
-    NULL,
-    (const bstring *)&be_const_str_encrypt,
-    (const bstring *)&be_const_str_iter,
-    (const bstring *)&be_const_str_AudioOutput,
-    (const bstring *)&be_const_str_SERIAL_6N1,
-    (const bstring *)&be_const_str_item,
-    (const bstring *)&be_const_str_MD5,
-    (const bstring *)&be_const_str_SERIAL_5N1,
-    (const bstring *)&be_const_str_map,
-    (const bstring *)&be_const_str_AudioGenerator,
-    (const bstring *)&be_const_str_event,
-    (const bstring *)&be_const_str_AudioOutputI2S,
-    (const bstring *)&be_const_str_floor,
-    (const bstring *)&be_const_str_calldepth,
-    (const bstring *)&be_const_str_gamma10,
-    (const bstring *)&be_const_str__buffer,
-    (const bstring *)&be_const_str_collect,
-    (const bstring *)&be_const_str_enabled,
-    (const bstring *)&be_const_str_acos,
-    (const bstring *)&be_const_str_fromstring,
-    (const bstring *)&be_const_str__debug_present,
-    (const bstring *)&be_const_str_decrypt,
-    (const bstring *)&be_const_str_dot_p,
-    (const bstring *)&be_const_str_copy,
-    (const bstring *)&be_const_str__def,
-    (const bstring *)&be_const_str_imax,
-    (const bstring *)&be_const_str_add_driver,
-    (const bstring *)&be_const_str_dot_len,
-    (const bstring *)&be_const_str_bus,
-    (const bstring *)&be_const_str_yield,
-    NULL,
-    (const bstring *)&be_const_str_top,
-    (const bstring *)&be_const_str_get_string,
-    NULL,
-    NULL,
-    (const bstring *)&be_const_str_settings,
-    NULL,
-    (const bstring *)&be_const_str__get_cb,
-    (const bstring *)&be_const_str_opt_neq,
-    (const bstring *)&be_const_str__timers,
-    (const bstring *)&be_const_str_SERIAL_7E1,
-    (const bstring *)&be_const_str_AudioFileSource,
-    (const bstring *)&be_const_str_EC_C25519,
-    (const bstring *)&be_const_str_available,
-    (const bstring *)&be_const_str_traceback,
-    (const bstring *)&be_const_str_opt_add,
-    (const bstring *)&be_const_str___iterator__,
-    (const bstring *)&be_const_str_number,
-    (const bstring *)&be_const_str_,
-    (const bstring *)&be_const_str_dot_p1,
-    (const bstring *)&be_const_str_arg_name,
-    (const bstring *)&be_const_str_count,
-    (const bstring *)&be_const_str_AudioFileSourceFS,
-    NULL,
-    (const bstring *)&be_const_str_atan2,
-    (const bstring *)&be_const_str_set_timeouts,
+    (const bstring *)&be_const_str_AudioGeneratorMP3,
+    (const bstring *)&be_const_str_BRY_X3A_X20ERROR_X2C_X20bad_X20json_X3A_X20,
+    (const bstring *)&be_const_str_clear_to,
+    (const bstring *)&be_const_str__X3Clegend_X3E_X3Cb_X20title_X3D_X27New_X20autoconf_X27_X3E_X26nbsp_X3BSelect_X20new_X20auto_X2Dconfiguration_X3C_X2Fb_X3E_X3C_X2Flegend_X3E,
+    (const bstring *)&be_const_str_web_sensor,
     (const bstring *)&be_const_str__ccmd,
-    (const bstring *)&be_const_str_detect,
-    (const bstring *)&be_const_str_SERIAL_8O2
+    NULL,
+    (const bstring *)&be_const_str_p2,
+    (const bstring *)&be_const_str_SERIAL_8E1,
+    (const bstring *)&be_const_str_connect,
+    (const bstring *)&be_const_str_c,
+    (const bstring *)&be_const_str_cmd,
+    (const bstring *)&be_const_str_a,
+    (const bstring *)&be_const_str_SERIAL_7E1,
+    (const bstring *)&be_const_str__cmd,
+    (const bstring *)&be_const_str_ctor,
+    (const bstring *)&be_const_str_attrdump,
+    (const bstring *)&be_const_str_every_second,
+    (const bstring *)&be_const_str__X5B,
+    (const bstring *)&be_const_str_can_show,
+    NULL,
+    (const bstring *)&be_const_str_Auto_X2Dconfiguration,
+    (const bstring *)&be_const_str__,
+    (const bstring *)&be_const_str_gen_cb,
+    (const bstring *)&be_const_str__X5D,
+    (const bstring *)&be_const_str_get_size,
+    NULL,
+    (const bstring *)&be_const_str__X3Coption_X20value_X3D_X27reset_X27_X3E_X26lt_X3BRemove_X20autoconf_X26gt_X3B_X3C_X2Foption_X3E,
+    (const bstring *)&be_const_str__X3E_X3D,
+    NULL,
+    (const bstring *)&be_const_str__X3F,
+    (const bstring *)&be_const_str_base_class
 };
 
 static const struct bconststrtab m_const_string_table = {
-    .size = 164,
-    .count = 328,
+    .size = 360,
+    .count = 743,
     .table = m_string_table
 };
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_I2C_Driver.h b/lib/libesp32/Berry/generate/be_fixed_be_class_I2C_Driver.h
deleted file mode 100644
index 4257b0850..000000000
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_I2C_Driver.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "be_constobj.h"
-
-static be_define_const_map_slots(be_class_I2C_Driver_map) {
-    { be_const_key(read32, -1), be_const_closure(read32_closure) },
-    { be_const_key(write8, 6), be_const_closure(write8_closure) },
-    { be_const_key(name, -1), be_const_var(0) },
-    { be_const_key(addr, 10), be_const_var(1) },
-    { be_const_key(read12, -1), be_const_closure(read12_closure) },
-    { be_const_key(write_bit, 8), be_const_closure(write_bit_closure) },
-    { be_const_key(read13, -1), be_const_closure(read13_closure) },
-    { be_const_key(read24, -1), be_const_closure(read24_closure) },
-    { be_const_key(wire, -1), be_const_var(2) },
-    { be_const_key(init, -1), be_const_closure(init_closure) },
-    { be_const_key(read8, -1), be_const_closure(read8_closure) },
-};
-
-static be_define_const_map(
-    be_class_I2C_Driver_map,
-    11
-);
-
-BE_EXPORT_VARIABLE be_define_const_class(
-    be_class_I2C_Driver,
-    3,
-    (bclass *)&be_class_Driver,
-    I2C_Driver
-);
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_aes_gcm.h b/lib/libesp32/Berry/generate/be_fixed_be_class_aes_gcm.h
index 829383a3f..7c4096f34 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_aes_gcm.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_aes_gcm.h
@@ -2,10 +2,10 @@
 
 static be_define_const_map_slots(be_class_aes_gcm_map) {
     { be_const_key(encrypt, 4), be_const_func(m_aes_gcm_encryt) },
-    { be_const_key(dot_p2, -1), be_const_var(0) },
+    { be_const_key(_X2Ep2, -1), be_const_var(0) },
     { be_const_key(decrypt, -1), be_const_func(m_aes_gcm_decryt) },
     { be_const_key(init, -1), be_const_func(m_aes_gcm_init) },
-    { be_const_key(dot_p1, -1), be_const_var(1) },
+    { be_const_key(_X2Ep1, -1), be_const_var(1) },
     { be_const_key(tag, -1), be_const_func(m_aes_gcm_tag) },
 };
 
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source.h b/lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source.h
index e7e5e0998..f3d59effc 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_audio_file_source.h
@@ -1,7 +1,7 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(be_class_audio_file_source_map) {
-    { be_const_key(dot_p, -1), be_const_var(0) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
 };
 
 static be_define_const_map(
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator.h b/lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator.h
index 840da47d1..41b50f180 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_audio_generator.h
@@ -1,7 +1,7 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(be_class_audio_generator_map) {
-    { be_const_key(dot_p, -1), be_const_var(0) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
 };
 
 static be_define_const_map(
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_output.h b/lib/libesp32/Berry/generate/be_fixed_be_class_audio_output.h
index afb2705cb..192ee0677 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_audio_output.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_audio_output.h
@@ -1,7 +1,7 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(be_class_audio_output_map) {
-    { be_const_key(dot_p, -1), be_const_var(0) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
 };
 
 static be_define_const_map(
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_bytes.h b/lib/libesp32/Berry/generate/be_fixed_be_class_bytes.h
index cb188a521..cd9ea1f54 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_bytes.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_bytes.h
@@ -2,29 +2,29 @@
 
 static be_define_const_map_slots(be_class_bytes_map) {
     { be_const_key(setitem, -1), be_const_func(m_setitem) },
-    { be_const_key(opt_connect, -1), be_const_func(m_connect) },
+    { be_const_key(_X2E_X2E, -1), be_const_func(m_connect) },
     { be_const_key(geti, -1), be_const_func(m_geti) },
     { be_const_key(deinit, -1), be_const_func(m_deinit) },
     { be_const_key(add, 18), be_const_func(m_add) },
     { be_const_key(get, -1), be_const_func(m_getu) },
     { be_const_key(asstring, 9), be_const_func(m_asstring) },
-    { be_const_key(dot_p, -1), be_const_var(0) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
     { be_const_key(copy, 25), be_const_func(m_copy) },
     { be_const_key(size, -1), be_const_func(m_size) },
     { be_const_key(getbits, -1), be_const_closure(getbits_closure) },
-    { be_const_key(opt_eq, -1), be_const_func(m_equal) },
+    { be_const_key(_X3D_X3D, -1), be_const_func(m_equal) },
     { be_const_key(tob64, 3), be_const_func(m_tob64) },
     { be_const_key(init, -1), be_const_func(m_init) },
-    { be_const_key(opt_add, -1), be_const_func(m_merge) },
+    { be_const_key(_X2B, -1), be_const_func(m_merge) },
     { be_const_key(setbits, -1), be_const_closure(setbits_closure) },
     { be_const_key(_buffer, -1), be_const_func(m_buffer) },
     { be_const_key(tostring, -1), be_const_func(m_tostring) },
-    { be_const_key(dot_len, -1), be_const_var(1) },
+    { be_const_key(_X2Elen, -1), be_const_var(1) },
     { be_const_key(fromb64, 13), be_const_func(m_fromb64) },
-    { be_const_key(dot_size, 6), be_const_var(2) },
+    { be_const_key(_X2Esize, 6), be_const_var(2) },
     { be_const_key(resize, -1), be_const_func(m_resize) },
     { be_const_key(seti, -1), be_const_func(m_set) },
-    { be_const_key(opt_neq, 5), be_const_func(m_nequal) },
+    { be_const_key(_X21_X3D, 5), be_const_func(m_nequal) },
     { be_const_key(item, -1), be_const_func(m_item) },
     { be_const_key(fromstring, -1), be_const_func(m_fromstring) },
     { be_const_key(clear, 24), be_const_func(m_clear) },
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_list.h b/lib/libesp32/Berry/generate/be_fixed_be_class_list.h
index 2450de9a2..f05a19dc5 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_list.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_list.h
@@ -1,9 +1,9 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(be_class_list_map) {
-    { be_const_key(opt_add, -1), be_const_func(m_merge) },
+    { be_const_key(_X2B, -1), be_const_func(m_merge) },
     { be_const_key(init, -1), be_const_func(m_init) },
-    { be_const_key(opt_connect, 11), be_const_func(m_connect) },
+    { be_const_key(_X2E_X2E, 11), be_const_func(m_connect) },
     { be_const_key(tostring, 2), be_const_func(m_tostring) },
     { be_const_key(pop, 6), be_const_func(m_pop) },
     { be_const_key(insert, -1), be_const_func(m_insert) },
@@ -13,16 +13,16 @@ static be_define_const_map_slots(be_class_list_map) {
     { be_const_key(push, 1), be_const_func(m_push) },
     { be_const_key(item, 5), be_const_func(m_item) },
     { be_const_key(concat, -1), be_const_func(m_concat) },
-    { be_const_key(dot_p, -1), be_const_var(0) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
     { be_const_key(iter, -1), be_const_func(m_iter) },
     { be_const_key(copy, -1), be_const_func(m_copy) },
     { be_const_key(reverse, 13), be_const_func(m_reverse) },
     { be_const_key(keys, -1), be_const_func(m_keys) },
     { be_const_key(resize, 16), be_const_func(m_resize) },
     { be_const_key(setitem, -1), be_const_func(m_setitem) },
-    { be_const_key(opt_neq, 7), be_const_func(m_nequal) },
+    { be_const_key(_X21_X3D, 7), be_const_func(m_nequal) },
     { be_const_key(clear, -1), be_const_func(m_clear) },
-    { be_const_key(opt_eq, -1), be_const_func(m_equal) },
+    { be_const_key(_X3D_X3D, -1), be_const_func(m_equal) },
 };
 
 static be_define_const_map(
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_map.h b/lib/libesp32/Berry/generate/be_fixed_be_class_map.h
index 826e28329..f884630e3 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_map.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_map.h
@@ -8,7 +8,7 @@ static be_define_const_map_slots(be_class_map_map) {
     { be_const_key(has, -1), be_const_func(m_contains) },
     { be_const_key(init, -1), be_const_func(m_init) },
     { be_const_key(contains, 9), be_const_func(m_contains) },
-    { be_const_key(dot_p, 13), be_const_var(0) },
+    { be_const_key(_X2Ep, 13), be_const_var(0) },
     { be_const_key(reduce, -1), be_const_func(m_reduce) },
     { be_const_key(size, -1), be_const_func(m_size) },
     { be_const_key(find, -1), be_const_func(m_find) },
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_md5.h b/lib/libesp32/Berry/generate/be_fixed_be_class_md5.h
index 121a8e6ea..b3fff0a5c 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_md5.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_md5.h
@@ -2,7 +2,7 @@
 
 static be_define_const_map_slots(be_class_md5_map) {
     { be_const_key(update, -1), be_const_func(m_md5_update) },
-    { be_const_key(dot_p, -1), be_const_var(0) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
     { be_const_key(finish, -1), be_const_func(m_md5_finish) },
     { be_const_key(init, 1), be_const_func(m_md5_init) },
 };
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h
index c931a3bc0..dc2abcca8 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota.h
@@ -1,90 +1,91 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(be_class_tasmota_map) {
-    { be_const_key(resp_cmnd_done, -1), be_const_func(l_respCmndDone) },
-    { be_const_key(resolvecmnd, 42), be_const_func(l_resolveCmnd) },
-    { be_const_key(add_driver, -1), be_const_closure(add_driver_closure) },
-    { be_const_key(gc, -1), be_const_closure(gc_closure) },
-    { be_const_key(find_op, -1), be_const_closure(find_op_closure) },
-    { be_const_key(scale_uint, 15), be_const_func(l_scaleuint) },
-    { be_const_key(try_rule, -1), be_const_closure(try_rule_closure) },
-    { be_const_key(time_reached, -1), be_const_func(l_timereached) },
-    { be_const_key(web_send, -1), be_const_func(l_webSend) },
-    { be_const_key(eth, 21), be_const_func(l_eth) },
-    { be_const_key(get_switch, 34), be_const_func(l_getswitch) },
-    { be_const_key(set_power, -1), be_const_func(l_setpower) },
-    { be_const_key(_drivers, 50), be_const_var(0) },
-    { be_const_key(_rules, -1), be_const_var(1) },
-    { be_const_key(_ccmd, 6), be_const_var(2) },
-    { be_const_key(time_dump, -1), be_const_func(l_time_dump) },
-    { be_const_key(gen_cb, 17), be_const_closure(gen_cb_closure) },
-    { be_const_key(cmd_res, 20), be_const_var(3) },
-    { be_const_key(set_light, 63), be_const_closure(set_light_closure) },
-    { be_const_key(millis, -1), be_const_func(l_millis) },
-    { be_const_key(global, -1), be_const_var(4) },
-    { be_const_key(exec_tele, 67), be_const_closure(exec_tele_closure) },
+    { be_const_key(gc, -1), be_const_closure(Tasmota_gc_closure) },
+    { be_const_key(read_sensors, 7), be_const_func(l_read_sensors) },
+    { be_const_key(_get_cb, -1), be_const_func(l_get_cb) },
+    { be_const_key(response_append, 50), be_const_func(l_respAppend) },
+    { be_const_key(try_rule, 74), be_const_closure(Tasmota_try_rule_closure) },
+    { be_const_key(eth, -1), be_const_func(l_eth) },
+    { be_const_key(find_key_i, -1), be_const_closure(Tasmota_find_key_i_closure) },
+    { be_const_key(exec_tele, 73), be_const_closure(Tasmota_exec_tele_closure) },
+    { be_const_key(remove_driver, 28), be_const_closure(Tasmota_remove_driver_closure) },
+    { be_const_key(load, -1), be_const_closure(Tasmota_load_closure) },
     { be_const_key(_settings_ptr, -1), be_const_comptr(&Settings) },
+    { be_const_key(cmd_res, -1), be_const_var(0) },
+    { be_const_key(time_str, 43), be_const_closure(Tasmota_time_str_closure) },
+    { be_const_key(set_power, -1), be_const_func(l_setpower) },
+    { be_const_key(yield, 20), be_const_func(l_yield) },
+    { be_const_key(set_light, -1), be_const_closure(Tasmota_set_light_closure) },
+    { be_const_key(find_op, 32), be_const_closure(Tasmota_find_op_closure) },
     { be_const_key(get_power, -1), be_const_func(l_getpower) },
-    { be_const_key(_cb, 57), be_const_var(5) },
-    { be_const_key(save, -1), be_const_func(l_save) },
-    { be_const_key(run_deferred, -1), be_const_closure(run_deferred_closure) },
-    { be_const_key(i2c_enabled, 9), be_const_func(l_i2cenabled) },
-    { be_const_key(remove_driver, -1), be_const_closure(remove_driver_closure) },
-    { be_const_key(event, -1), be_const_closure(event_closure) },
-    { be_const_key(find_key_i, -1), be_const_closure(find_key_i_closure) },
-    { be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) },
-    { be_const_key(get_free_heap, 3), be_const_func(l_getFreeHeap) },
-    { be_const_key(wire_scan, -1), be_const_closure(wire_scan_closure) },
-    { be_const_key(init, -1), be_const_closure(init_closure) },
-    { be_const_key(wd, -1), be_const_var(6) },
-    { be_const_key(_debug_present, -1), be_const_var(7) },
-    { be_const_key(time_str, 45), be_const_closure(time_str_closure) },
-    { be_const_key(remove_rule, 71), be_const_closure(remove_rule_closure) },
-    { be_const_key(memory, 62), be_const_func(l_memory) },
-    { be_const_key(wifi, -1), be_const_func(l_wifi) },
-    { be_const_key(get_option, 44), be_const_func(l_getoption) },
-    { be_const_key(rtc, -1), be_const_func(l_rtc) },
-    { be_const_key(load, 72), be_const_closure(load_closure) },
-    { be_const_key(chars_in_string, -1), be_const_closure(chars_in_string_closure) },
-    { be_const_key(cmd, -1), be_const_closure(cmd_closure) },
-    { be_const_key(publish, 43), be_const_func(l_publish) },
-    { be_const_key(resp_cmnd_error, 18), be_const_func(l_respCmndError) },
-    { be_const_key(add_cmd, -1), be_const_closure(add_cmd_closure) },
-    { be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) },
-    { be_const_key(strftime, 4), be_const_func(l_strftime) },
-    { be_const_key(add_rule, 41), be_const_closure(add_rule_closure) },
-    { be_const_key(wire2, -1), be_const_var(8) },
-    { be_const_key(settings, -1), be_const_var(9) },
-    { be_const_key(exec_rules, -1), be_const_closure(exec_rules_closure) },
-    { be_const_key(cb_dispatch, -1), be_const_closure(cb_dispatch_closure) },
-    { be_const_key(yield, 68), be_const_func(l_yield) },
-    { be_const_key(_get_cb, 75), be_const_func(l_get_cb) },
-    { be_const_key(wire1, 33), be_const_var(10) },
+    { be_const_key(add_rule, -1), be_const_closure(Tasmota_add_rule_closure) },
+    { be_const_key(cb_dispatch, -1), be_const_closure(Tasmota_cb_dispatch_closure) },
+    { be_const_key(global, -1), be_const_var(1) },
+    { be_const_key(i2c_enabled, -1), be_const_func(l_i2cenabled) },
+    { be_const_key(remove_cmd, 10), be_const_closure(Tasmota_remove_cmd_closure) },
+    { be_const_key(millis, 18), be_const_func(l_millis) },
+    { be_const_key(publish, 69), be_const_func(l_publish) },
+    { be_const_key(_drivers, -1), be_const_var(2) },
     { be_const_key(resp_cmnd, -1), be_const_func(l_respCmnd) },
-    { be_const_key(resp_cmnd_failed, 16), be_const_func(l_respCmndFailed) },
+    { be_const_key(time_dump, -1), be_const_func(l_time_dump) },
+    { be_const_key(web_send, -1), be_const_func(l_webSend) },
+    { be_const_key(hs2rgb, -1), be_const_closure(Tasmota_hs2rgb_closure) },
+    { be_const_key(memory, -1), be_const_func(l_memory) },
+    { be_const_key(gen_cb, 0), be_const_closure(Tasmota_gen_cb_closure) },
+    { be_const_key(rtc, -1), be_const_func(l_rtc) },
+    { be_const_key(get_option, -1), be_const_func(l_getoption) },
+    { be_const_key(add_cmd, -1), be_const_closure(Tasmota_add_cmd_closure) },
+    { be_const_key(init, -1), be_const_closure(Tasmota_init_closure) },
+    { be_const_key(_timers, -1), be_const_var(3) },
     { be_const_key(_global_addr, -1), be_const_comptr(&TasmotaGlobal) },
-    { be_const_key(hs2rgb, -1), be_const_closure(hs2rgb_closure) },
-    { be_const_key(resp_cmnd_str, 76), be_const_func(l_respCmndStr) },
-    { be_const_key(_global_def, -1), be_const_comptr(&be_tasmota_global_struct) },
-    { be_const_key(kv, 74), be_const_closure(kv_closure) },
-    { be_const_key(delay, -1), be_const_func(l_delay) },
-    { be_const_key(remove_cmd, 19), be_const_closure(remove_cmd_closure) },
-    { be_const_key(set_timer, -1), be_const_closure(set_timer_closure) },
-    { be_const_key(_cmd, 54), be_const_func(l_cmd) },
-    { be_const_key(publish_result, -1), be_const_func(l_publish_result) },
-    { be_const_key(log, -1), be_const_func(l_logInfo) },
+    { be_const_key(wd, -1), be_const_var(4) },
+    { be_const_key(exec_cmd, -1), be_const_closure(Tasmota_exec_cmd_closure) },
+    { be_const_key(wire_scan, -1), be_const_closure(Tasmota_wire_scan_closure) },
+    { be_const_key(_global_def, 61), be_const_comptr(&be_tasmota_global_struct) },
+    { be_const_key(resp_cmnd_failed, 11), be_const_func(l_respCmndFailed) },
+    { be_const_key(chars_in_string, -1), be_const_closure(Tasmota_chars_in_string_closure) },
+    { be_const_key(web_send_decimal, -1), be_const_func(l_webSendDecimal) },
+    { be_const_key(_debug_present, 4), be_const_var(5) },
+    { be_const_key(cmd, -1), be_const_closure(Tasmota_cmd_closure) },
+    { be_const_key(_cb, -1), be_const_var(6) },
+    { be_const_key(remove_rule, -1), be_const_closure(Tasmota_remove_rule_closure) },
+    { be_const_key(run_deferred, -1), be_const_closure(Tasmota_run_deferred_closure) },
+    { be_const_key(strftime, -1), be_const_func(l_strftime) },
+    { be_const_key(add_driver, 3), be_const_closure(Tasmota_add_driver_closure) },
+    { be_const_key(kv, 60), be_const_closure(Tasmota_kv_closure) },
+    { be_const_key(set_timer, 58), be_const_closure(Tasmota_set_timer_closure) },
+    { be_const_key(scale_uint, -1), be_const_func(l_scaleuint) },
+    { be_const_key(remove_timer, -1), be_const_closure(Tasmota_remove_timer_closure) },
+    { be_const_key(settings, 49), be_const_var(7) },
     { be_const_key(arch, -1), be_const_func(l_arch) },
-    { be_const_key(remove_timer, 66), be_const_closure(remove_timer_closure) },
-    { be_const_key(_timers, -1), be_const_var(11) },
-    { be_const_key(read_sensors, -1), be_const_func(l_read_sensors) },
-    { be_const_key(exec_cmd, -1), be_const_closure(exec_cmd_closure) },
-    { be_const_key(response_append, -1), be_const_func(l_respAppend) },
-    { be_const_key(get_light, -1), be_const_closure(get_light_closure) },
+    { be_const_key(_ccmd, 64), be_const_var(8) },
+    { be_const_key(wire1, 46), be_const_var(9) },
+    { be_const_key(exec_rules, 66), be_const_closure(Tasmota_exec_rules_closure) },
+    { be_const_key(strptime, -1), be_const_func(l_strptime) },
+    { be_const_key(_cmd, -1), be_const_func(l_cmd) },
+    { be_const_key(resp_cmnd_error, -1), be_const_func(l_respCmndError) },
+    { be_const_key(time_reached, -1), be_const_func(l_timereached) },
+    { be_const_key(_rules, -1), be_const_var(10) },
+    { be_const_key(publish_result, -1), be_const_func(l_publish_result) },
+    { be_const_key(_settings_def, -1), be_const_comptr(&be_tasmota_settings_struct) },
+    { be_const_key(get_switch, -1), be_const_func(l_getswitch) },
+    { be_const_key(delay, 71), be_const_func(l_delay) },
+    { be_const_key(resp_cmnd_str, -1), be_const_func(l_respCmndStr) },
+    { be_const_key(wifi, -1), be_const_func(l_wifi) },
+    { be_const_key(save, 15), be_const_func(l_save) },
+    { be_const_key(log, 37), be_const_func(l_logInfo) },
+    { be_const_key(resolvecmnd, -1), be_const_func(l_resolveCmnd) },
+    { be_const_key(resp_cmnd_done, -1), be_const_func(l_respCmndDone) },
+    { be_const_key(get_light, 5), be_const_closure(Tasmota_get_light_closure) },
+    { be_const_key(get_free_heap, -1), be_const_func(l_getFreeHeap) },
+    { be_const_key(wire2, -1), be_const_var(11) },
+    { be_const_key(event, 34), be_const_closure(Tasmota_event_closure) },
 };
 
 static be_define_const_map(
     be_class_tasmota_map,
-    79
+    80
 );
 
 BE_EXPORT_VARIABLE be_define_const_class(
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_onewire.h b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_onewire.h
index 6363d83b2..a2619941b 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_onewire.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_onewire.h
@@ -8,7 +8,7 @@ static be_define_const_map_slots(be_class_tasmota_onewire_map) {
     { be_const_key(deinit, -1), be_const_func(b_onewire_deinit) },
     { be_const_key(reset_search, -1), be_const_func(b_onewire_reset_search) },
     { be_const_key(skip, -1), be_const_func(b_onewire_skip) },
-    { be_const_key(dot_p, -1), be_const_var(0) },
+    { be_const_key(_X2Ep, -1), be_const_var(0) },
     { be_const_key(write, -1), be_const_func(b_onewire_write) },
     { be_const_key(read, -1), be_const_func(b_onewire_read) },
     { be_const_key(select, 11), be_const_func(b_onewire_select) },
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h
index 630b45973..fab58e1f6 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_tasmota_serial.h
@@ -26,7 +26,7 @@ static be_define_const_map_slots(be_class_tasmota_serial_map) {
     { be_const_key(SERIAL_8N1, 1), be_const_int(SERIAL_8N1) },
     { be_const_key(SERIAL_7E1, -1), be_const_int(SERIAL_7E1) },
     { be_const_key(SERIAL_8N2, -1), be_const_int(SERIAL_8N2) },
-    { be_const_key(dot_p, 8), be_const_var(0) },
+    { be_const_key(_X2Ep, 8), be_const_var(0) },
     { be_const_key(SERIAL_8E2, -1), be_const_int(SERIAL_8E2) },
     { be_const_key(SERIAL_7O2, -1), be_const_int(SERIAL_7O2) },
     { be_const_key(SERIAL_7N2, -1), be_const_int(SERIAL_7N2) },
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_tcpclient.h b/lib/libesp32/Berry/generate/be_fixed_be_class_tcpclient.h
new file mode 100644
index 000000000..72bdbffb4
--- /dev/null
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_tcpclient.h
@@ -0,0 +1,26 @@
+#include "be_constobj.h"
+
+static be_define_const_map_slots(be_class_tcpclient_map) {
+    { be_const_key(write, 8), be_const_func(wc_tcp_write) },
+    { be_const_key(close, -1), be_const_func(wc_tcp_close) },
+    { be_const_key(connected, 3), be_const_func(wc_tcp_connected) },
+    { be_const_key(deinit, -1), be_const_func(wc_tcp_deinit) },
+    { be_const_key(_X2Ew, 0), be_const_var(0) },
+    { be_const_key(init, -1), be_const_func(wc_tcp_init) },
+    { be_const_key(readbytes, -1), be_const_func(wc_tcp_readbytes) },
+    { be_const_key(connect, -1), be_const_func(wc_tcp_connect) },
+    { be_const_key(available, -1), be_const_func(wc_tcp_available) },
+    { be_const_key(read, -1), be_const_func(wc_tcp_read) },
+};
+
+static be_define_const_map(
+    be_class_tcpclient_map,
+    10
+);
+
+BE_EXPORT_VARIABLE be_define_const_class(
+    be_class_tcpclient,
+    1,
+    NULL,
+    tcpclient
+);
diff --git a/lib/libesp32/Berry/generate/be_fixed_be_class_webclient.h b/lib/libesp32/Berry/generate/be_fixed_be_class_webclient.h
index 15eaa21d7..75c369e7d 100644
--- a/lib/libesp32/Berry/generate/be_fixed_be_class_webclient.h
+++ b/lib/libesp32/Berry/generate/be_fixed_be_class_webclient.h
@@ -3,8 +3,8 @@
 static be_define_const_map_slots(be_class_webclient_map) {
     { be_const_key(close, -1), be_const_func(wc_close) },
     { be_const_key(get_string, 5), be_const_func(wc_getstring) },
-    { be_const_key(dot_w, 11), be_const_var(0) },
-    { be_const_key(dot_p, 13), be_const_var(1) },
+    { be_const_key(_X2Ew, 11), be_const_var(0) },
+    { be_const_key(_X2Ep, 13), be_const_var(1) },
     { be_const_key(add_header, 10), be_const_func(wc_addheader) },
     { be_const_key(url_encode, -1), be_const_func(wc_urlencode) },
     { be_const_key(POST, -1), be_const_func(wc_POST) },
diff --git a/lib/libesp32/Berry/generate/be_fixed_energy.h b/lib/libesp32/Berry/generate/be_fixed_energy.h
deleted file mode 100644
index 3af466055..000000000
--- a/lib/libesp32/Berry/generate/be_fixed_energy.h
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "be_constobj.h"
-
-static be_define_const_map_slots(m_libenergy_map) {
-    { be_const_key(init, -1), be_const_closure(init_closure) },
-    { be_const_key(_ptr, 3), be_const_comptr(&Energy) },
-    { be_const_key(setmember, -1), be_const_closure(setmember_closure) },
-    { be_const_key(member, 2), be_const_closure(member_closure) },
-    { be_const_key(read, -1), be_const_closure(read_closure) },
-};
-
-static be_define_const_map(
-    m_libenergy_map,
-    5
-);
-
-static be_define_const_module(
-    m_libenergy,
-    "energy"
-);
-
-BE_EXPORT_VARIABLE be_define_const_native_module(energy);
diff --git a/lib/libesp32/Berry/generate/be_fixed_global.h b/lib/libesp32/Berry/generate/be_fixed_global.h
index 4094ca20d..31e615b88 100644
--- a/lib/libesp32/Berry/generate/be_fixed_global.h
+++ b/lib/libesp32/Berry/generate/be_fixed_global.h
@@ -3,7 +3,7 @@
 static be_define_const_map_slots(m_libglobal_map) {
     { be_const_key(member, -1), be_const_func(m_findglobal) },
     { be_const_key(setmember, 0), be_const_func(m_setglobal) },
-    { be_const_key(opt_call, -1), be_const_func(m_globals) },
+    { be_const_key(_X28_X29, -1), be_const_func(m_globals) },
 };
 
 static be_define_const_map(
diff --git a/lib/libesp32/Berry/generate/be_fixed_m_builtin.h b/lib/libesp32/Berry/generate/be_fixed_m_builtin.h
index 57e049fc3..1a803b21b 100644
--- a/lib/libesp32/Berry/generate/be_fixed_m_builtin.h
+++ b/lib/libesp32/Berry/generate/be_fixed_m_builtin.h
@@ -1,34 +1,35 @@
 #include "be_constobj.h"
 
 static be_define_const_map_slots(m_builtin_map) {
-    { be_const_key(number, 16), be_const_int(7) },
-    { be_const_key(map, -1), be_const_int(19) },
-    { be_const_key(classname, 22), be_const_int(5) },
-    { be_const_key(bytes, 2), be_const_int(21) },
-    { be_const_key(int, 12), be_const_int(9) },
-    { be_const_key(module, -1), be_const_int(11) },
-    { be_const_key(print, 20), be_const_int(1) },
-    { be_const_key(issubclass, -1), be_const_int(14) },
-    { be_const_key(assert, -1), be_const_int(0) },
-    { be_const_key(list, -1), be_const_int(18) },
-    { be_const_key(__iterator__, -1), be_const_int(16) },
-    { be_const_key(real, -1), be_const_int(10) },
-    { be_const_key(super, 21), be_const_int(3) },
-    { be_const_key(isinstance, 8), be_const_int(15) },
-    { be_const_key(classof, 4), be_const_int(6) },
-    { be_const_key(input, -1), be_const_int(2) },
-    { be_const_key(call, 19), be_const_int(22) },
-    { be_const_key(compile, -1), be_const_int(13) },
-    { be_const_key(open, -1), be_const_int(17) },
-    { be_const_key(size, -1), be_const_int(12) },
+    { be_const_key(number, 23), be_const_int(7) },
+    { be_const_key(call, -1), be_const_int(22) },
     { be_const_key(range, -1), be_const_int(20) },
+    { be_const_key(input, -1), be_const_int(2) },
+    { be_const_key(bytes, 11), be_const_int(21) },
+    { be_const_key(issubclass, -1), be_const_int(14) },
+    { be_const_key(compile, -1), be_const_int(13) },
+    { be_const_key(open, 22), be_const_int(17) },
+    { be_const_key(module, 17), be_const_int(11) },
+    { be_const_key(list, 7), be_const_int(18) },
+    { be_const_key(isinstance, -1), be_const_int(15) },
+    { be_const_key(classname, 20), be_const_int(5) },
+    { be_const_key(size, -1), be_const_int(12) },
+    { be_const_key(real, -1), be_const_int(10) },
+    { be_const_key(int, -1), be_const_int(9) },
+    { be_const_key(__iterator__, 5), be_const_int(16) },
     { be_const_key(str, -1), be_const_int(8) },
-    { be_const_key(type, -1), be_const_int(4) },
+    { be_const_key(bool, -1), be_const_int(23) },
+    { be_const_key(classof, -1), be_const_int(6) },
+    { be_const_key(assert, -1), be_const_int(0) },
+    { be_const_key(super, -1), be_const_int(3) },
+    { be_const_key(type, 8), be_const_int(4) },
+    { be_const_key(map, -1), be_const_int(19) },
+    { be_const_key(print, -1), be_const_int(1) },
 };
 
 static be_define_const_map(
     m_builtin_map,
-    23
+    24
 );
 
 static const bvalue __vlist_array[] = {
@@ -55,10 +56,11 @@ static const bvalue __vlist_array[] = {
     be_const_class(be_class_range),
     be_const_class(be_class_bytes),
     be_const_func(l_call),
+    be_const_func(l_bool),
 };
 
 static be_define_const_vector(
     m_builtin_vector,
     __vlist_array,
-    23
+    24
 );
diff --git a/lib/libesp32/Berry/src/be_api.c b/lib/libesp32/Berry/src/be_api.c
index d883c08d7..79d5c48ff 100644
--- a/lib/libesp32/Berry/src/be_api.c
+++ b/lib/libesp32/Berry/src/be_api.c
@@ -51,7 +51,7 @@ static void class_init(bvm *vm, bclass *c, const bnfuncinfo *lib)
                 ++slib;
             }
         }
-        be_map_release(vm, c->members); /* clear space */
+        be_map_compact(vm, c->members); /* clear space */
     }
 }
 
diff --git a/lib/libesp32/Berry/src/be_byteslib.c b/lib/libesp32/Berry/src/be_byteslib.c
index ee58c5be5..0c3085faa 100644
--- a/lib/libesp32/Berry/src/be_byteslib.c
+++ b/lib/libesp32/Berry/src/be_byteslib.c
@@ -1260,46 +1260,46 @@ be_local_closure(getbits,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
     /* K0   */  be_const_int(0),
-    /* K1   */  be_nested_string("value_error", 773297791, 11),
-    /* K2   */  be_nested_string("length in bits must be between 0 and 32", -1710458168, 39),
+    /* K1   */  be_nested_str(value_error),
+    /* K2   */  be_nested_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032),
     /* K3   */  be_const_int(3),
     /* K4   */  be_const_int(1),
     }),
-    (be_nested_const_str("getbits", -1200798317, 7)),
-    (be_nested_const_str("input", -103256197, 5)),
+    &be_const_str_getbits,
+    &be_const_str_solidified,
     ( &(const binstruction[32]) {  /* code */
-      0x180C0500,  //  0000  LE  R3  R2  K0
-      0x740E0002,  //  0001  JMPT  R3  #0005
-      0x540E001F,  //  0002  LDINT  R3  32
-      0x240C0403,  //  0003  GT  R3  R2  R3
-      0x780E0000,  //  0004  JMPF  R3  #0006
-      0xB0060302,  //  0005  RAISE  1  K1  K2
-      0x580C0000,  //  0006  LDCONST  R3  K0
-      0x3C100303,  //  0007  SHR  R4  R1  K3
-      0x54160007,  //  0008  LDINT  R5  8
-      0x10040205,  //  0009  MOD  R1  R1  R5
-      0x58140000,  //  000A  LDCONST  R5  K0
-      0x24180500,  //  000B  GT  R6  R2  K0
-      0x781A0011,  //  000C  JMPF  R6  #001F
-      0x541A0007,  //  000D  LDINT  R6  8
-      0x04180C01,  //  000E  SUB  R6  R6  R1
-      0x241C0C02,  //  000F  GT  R7  R6  R2
-      0x781E0000,  //  0010  JMPF  R7  #0012
-      0x5C180400,  //  0011  MOVE  R6  R2
-      0x381E0806,  //  0012  SHL  R7  K4  R6
-      0x041C0F04,  //  0013  SUB  R7  R7  K4
-      0x381C0E01,  //  0014  SHL  R7  R7  R1
-      0x94200004,  //  0015  GETIDX  R8  R0  R4
-      0x2C201007,  //  0016  AND  R8  R8  R7
-      0x3C201001,  //  0017  SHR  R8  R8  R1
-      0x38201005,  //  0018  SHL  R8  R8  R5
-      0x300C0608,  //  0019  OR  R3  R3  R8
-      0x00140A06,  //  001A  ADD  R5  R5  R6
-      0x04080406,  //  001B  SUB  R2  R2  R6
-      0x58040000,  //  001C  LDCONST  R1  K0
-      0x00100904,  //  001D  ADD  R4  R4  K4
-      0x7001FFEB,  //  001E  JMP    #000B
-      0x80040600,  //  001F  RET  1  R3
+      0x180C0500,  //  0000  LE	R3	R2	K0
+      0x740E0002,  //  0001  JMPT	R3	#0005
+      0x540E001F,  //  0002  LDINT	R3	32
+      0x240C0403,  //  0003  GT	R3	R2	R3
+      0x780E0000,  //  0004  JMPF	R3	#0006
+      0xB0060302,  //  0005  RAISE	1	K1	K2
+      0x580C0000,  //  0006  LDCONST	R3	K0
+      0x3C100303,  //  0007  SHR	R4	R1	K3
+      0x54160007,  //  0008  LDINT	R5	8
+      0x10040205,  //  0009  MOD	R1	R1	R5
+      0x58140000,  //  000A  LDCONST	R5	K0
+      0x24180500,  //  000B  GT	R6	R2	K0
+      0x781A0011,  //  000C  JMPF	R6	#001F
+      0x541A0007,  //  000D  LDINT	R6	8
+      0x04180C01,  //  000E  SUB	R6	R6	R1
+      0x241C0C02,  //  000F  GT	R7	R6	R2
+      0x781E0000,  //  0010  JMPF	R7	#0012
+      0x5C180400,  //  0011  MOVE	R6	R2
+      0x381E0806,  //  0012  SHL	R7	K4	R6
+      0x041C0F04,  //  0013  SUB	R7	R7	K4
+      0x381C0E01,  //  0014  SHL	R7	R7	R1
+      0x94200004,  //  0015  GETIDX	R8	R0	R4
+      0x2C201007,  //  0016  AND	R8	R8	R7
+      0x3C201001,  //  0017  SHR	R8	R8	R1
+      0x38201005,  //  0018  SHL	R8	R8	R5
+      0x300C0608,  //  0019  OR	R3	R3	R8
+      0x00140A06,  //  001A  ADD	R5	R5	R6
+      0x04080406,  //  001B  SUB	R2	R2	R6
+      0x58040000,  //  001C  LDCONST	R1	K0
+      0x00100904,  //  001D  ADD	R4	R4	K4
+      0x7001FFEB,  //  001E  JMP		#000B
+      0x80040600,  //  001F  RET	1	R3
     })
   )
 );
@@ -1320,51 +1320,51 @@ be_local_closure(setbits,   /* name */
     1,                          /* has constants */
     ( &(const bvalue[ 5]) {     /* constants */
     /* K0   */  be_const_int(0),
-    /* K1   */  be_nested_string("value_error", 773297791, 11),
-    /* K2   */  be_nested_string("length in bits must be between 0 and 32", -1710458168, 39),
+    /* K1   */  be_nested_str(value_error),
+    /* K2   */  be_nested_str(length_X20in_X20bits_X20must_X20be_X20between_X200_X20and_X2032),
     /* K3   */  be_const_int(3),
     /* K4   */  be_const_int(1),
     }),
-    (be_nested_const_str("setbits", -1532559129, 7)),
-    (be_nested_const_str("input", -103256197, 5)),
+    &be_const_str_setbits,
+    &be_const_str_solidified,
     ( &(const binstruction[37]) {  /* code */
-      0x14100500,  //  0000  LT  R4  R2  K0
-      0x74120002,  //  0001  JMPT  R4  #0005
-      0x5412001F,  //  0002  LDINT  R4  32
-      0x24100404,  //  0003  GT  R4  R2  R4
-      0x78120000,  //  0004  JMPF  R4  #0006
-      0xB0060302,  //  0005  RAISE  1  K1  K2
-      0x60100009,  //  0006  GETGBL  R4  G9
-      0x5C140600,  //  0007  MOVE  R5  R3
-      0x7C100200,  //  0008  CALL  R4  1
-      0x5C0C0800,  //  0009  MOVE  R3  R4
-      0x3C100303,  //  000A  SHR  R4  R1  K3
-      0x54160007,  //  000B  LDINT  R5  8
-      0x10040205,  //  000C  MOD  R1  R1  R5
-      0x24140500,  //  000D  GT  R5  R2  K0
-      0x78160014,  //  000E  JMPF  R5  #0024
-      0x54160007,  //  000F  LDINT  R5  8
-      0x04140A01,  //  0010  SUB  R5  R5  R1
-      0x24180A02,  //  0011  GT  R6  R5  R2
-      0x781A0000,  //  0012  JMPF  R6  #0014
-      0x5C140400,  //  0013  MOVE  R5  R2
-      0x381A0805,  //  0014  SHL  R6  K4  R5
-      0x04180D04,  //  0015  SUB  R6  R6  K4
-      0x541E00FE,  //  0016  LDINT  R7  255
-      0x38200C01,  //  0017  SHL  R8  R6  R1
-      0x041C0E08,  //  0018  SUB  R7  R7  R8
-      0x94200004,  //  0019  GETIDX  R8  R0  R4
-      0x2C201007,  //  001A  AND  R8  R8  R7
-      0x2C240606,  //  001B  AND  R9  R3  R6
-      0x38241201,  //  001C  SHL  R9  R9  R1
-      0x30201009,  //  001D  OR  R8  R8  R9
-      0x98000808,  //  001E  SETIDX  R0  R4  R8
-      0x3C0C0605,  //  001F  SHR  R3  R3  R5
-      0x04080405,  //  0020  SUB  R2  R2  R5
-      0x58040000,  //  0021  LDCONST  R1  K0
-      0x00100904,  //  0022  ADD  R4  R4  K4
-      0x7001FFE8,  //  0023  JMP    #000D
-      0x80040000,  //  0024  RET  1  R0
+      0x14100500,  //  0000  LT	R4	R2	K0
+      0x74120002,  //  0001  JMPT	R4	#0005
+      0x5412001F,  //  0002  LDINT	R4	32
+      0x24100404,  //  0003  GT	R4	R2	R4
+      0x78120000,  //  0004  JMPF	R4	#0006
+      0xB0060302,  //  0005  RAISE	1	K1	K2
+      0x60100009,  //  0006  GETGBL	R4	G9
+      0x5C140600,  //  0007  MOVE	R5	R3
+      0x7C100200,  //  0008  CALL	R4	1
+      0x5C0C0800,  //  0009  MOVE	R3	R4
+      0x3C100303,  //  000A  SHR	R4	R1	K3
+      0x54160007,  //  000B  LDINT	R5	8
+      0x10040205,  //  000C  MOD	R1	R1	R5
+      0x24140500,  //  000D  GT	R5	R2	K0
+      0x78160014,  //  000E  JMPF	R5	#0024
+      0x54160007,  //  000F  LDINT	R5	8
+      0x04140A01,  //  0010  SUB	R5	R5	R1
+      0x24180A02,  //  0011  GT	R6	R5	R2
+      0x781A0000,  //  0012  JMPF	R6	#0014
+      0x5C140400,  //  0013  MOVE	R5	R2
+      0x381A0805,  //  0014  SHL	R6	K4	R5
+      0x04180D04,  //  0015  SUB	R6	R6	K4
+      0x541E00FE,  //  0016  LDINT	R7	255
+      0x38200C01,  //  0017  SHL	R8	R6	R1
+      0x041C0E08,  //  0018  SUB	R7	R7	R8
+      0x94200004,  //  0019  GETIDX	R8	R0	R4
+      0x2C201007,  //  001A  AND	R8	R8	R7
+      0x2C240606,  //  001B  AND	R9	R3	R6
+      0x38241201,  //  001C  SHL	R9	R9	R1
+      0x30201009,  //  001D  OR	R8	R8	R9
+      0x98000808,  //  001E  SETIDX	R0	R4	R8
+      0x3C0C0605,  //  001F  SHR	R3	R3	R5
+      0x04080405,  //  0020  SUB	R2	R2	R5
+      0x58040000,  //  0021  LDCONST	R1	K0
+      0x00100904,  //  0022  ADD	R4	R4	K4
+      0x7001FFE8,  //  0023  JMP		#000D
+      0x80040000,  //  0024  RET	1	R0
     })
   )
 );
diff --git a/lib/libesp32/Berry/src/be_class.c b/lib/libesp32/Berry/src/be_class.c
index a960d4b24..0f4efb3d5 100644
--- a/lib/libesp32/Berry/src/be_class.c
+++ b/lib/libesp32/Berry/src/be_class.c
@@ -40,7 +40,7 @@ bclass* be_newclass(bvm *vm, bstring *name, bclass *super)
 void be_class_compress(bvm *vm, bclass *c)
 {
     if (!gc_isconst(c) && c->members) {
-        be_map_release(vm, c->members); /* clear space */
+        be_map_compact(vm, c->members); /* clear space */
     }
 }
 
@@ -220,7 +220,7 @@ static binstance* newobject(bvm *vm, bclass *c)
 /* Instanciate new instance from stack with argc parameters */
 /* Pushes the constructor on the stack to be executed if a construtor is found */
 /* Returns true if a constructor is found */
-bbool be_class_newobj(bvm *vm, bclass *c, int32_t pos, int argc, int mode)
+bbool be_class_newobj(bvm *vm, bclass *c, int pos, int argc, int mode)
 {
     bvalue init;
     binstance *obj = newobject(vm, c);  /* create empty object hierarchy from class hierarchy */
diff --git a/lib/libesp32/Berry/src/be_class.h b/lib/libesp32/Berry/src/be_class.h
index 59abbab30..405ea6d38 100644
--- a/lib/libesp32/Berry/src/be_class.h
+++ b/lib/libesp32/Berry/src/be_class.h
@@ -58,7 +58,7 @@ void be_prim_method_bind(bvm *vm, bclass *c, bstring *name, bntvfunc f);
 void be_closure_method_bind(bvm *vm, bclass *c, bstring *name, bclosure *cl);
 int be_class_closure_count(bclass *c);
 void be_class_upvalue_init(bvm *vm, bclass *c);
-bbool be_class_newobj(bvm *vm, bclass *c, int32_t pos, int argc, int mode);
+bbool be_class_newobj(bvm *vm, bclass *c, int pos, int argc, int mode);
 int be_instance_member_simple(bvm *vm, binstance *obj, bstring *name, bvalue *dst);
 int be_instance_member(bvm *vm, binstance *obj, bstring *name, bvalue *dst);
 int be_class_member(bvm *vm, bclass *obj, bstring *name, bvalue *dst);
diff --git a/lib/libesp32/Berry/src/be_constobj.h b/lib/libesp32/Berry/src/be_constobj.h
index 87ab6eecf..8716d7fe2 100644
--- a/lib/libesp32/Berry/src/be_constobj.h
+++ b/lib/libesp32/Berry/src/be_constobj.h
@@ -227,6 +227,12 @@ const bntvmodule be_native_module(_module) = {                  \
     .data = _items                                              \
   }
 
+#define be_nested_str(_name_)                                   \
+  {                                                             \
+    { .s=((bstring*)&be_const_str_##_name_) },                  \
+    BE_STRING                                                   \
+  }
+
 #define be_nested_str_literal(_str)                             \
   {                                                             \
     { .s=(be_nested_const_str(_str, 0, sizeof(_str)-1 ))        \
diff --git a/lib/libesp32/Berry/src/be_jsonlib.c b/lib/libesp32/Berry/src/be_jsonlib.c
index 2ee2a4daa..1d7049ea1 100644
--- a/lib/libesp32/Berry/src/be_jsonlib.c
+++ b/lib/libesp32/Berry/src/be_jsonlib.c
@@ -54,7 +54,7 @@ static int is_object(bvm *vm, const char *class, int idx)
             }
             be_remove(vm, -2);
         }
-        const char *name = be_classname(vm, idx);
+        const char *name = be_classname(vm, -1);
         bbool ret = !strcmp(name, class);
         be_pop(vm, 1);
         return ret;
diff --git a/lib/libesp32/Berry/src/be_listlib.c b/lib/libesp32/Berry/src/be_listlib.c
index b584aef90..a98b679df 100644
--- a/lib/libesp32/Berry/src/be_listlib.c
+++ b/lib/libesp32/Berry/src/be_listlib.c
@@ -134,9 +134,15 @@ static int item_range(bvm *vm)
     /* get index range */
     be_getmember(vm, 2, "__lower__");
     lower = be_toint(vm, -1);
+    if (lower < 0) {
+        lower = size + lower;
+    }
     be_pop(vm, 1);
     be_getmember(vm, 2, "__upper__");
     upper = be_toint(vm, -1);
+    if (upper < 0) {
+        upper = size + upper;
+    }
     be_pop(vm, 1);
     /* protection scope */
     upper = upper < size ? upper : size - 1;
diff --git a/lib/libesp32/Berry/src/be_map.c b/lib/libesp32/Berry/src/be_map.c
index 004406f46..37f9efc62 100644
--- a/lib/libesp32/Berry/src/be_map.c
+++ b/lib/libesp32/Berry/src/be_map.c
@@ -343,7 +343,7 @@ bmapnode* be_map_val2node(bvalue *value)
     return (bmapnode *)((size_t)value - sizeof(bmapkey));
 }
 
-void be_map_release(bvm *vm, bmap *map)
+void be_map_compact(bvm *vm, bmap *map)
 {
     (void)vm;
     if (!gc_isconst(map)) {
diff --git a/lib/libesp32/Berry/src/be_map.h b/lib/libesp32/Berry/src/be_map.h
index d632f0d0b..7ae76962c 100644
--- a/lib/libesp32/Berry/src/be_map.h
+++ b/lib/libesp32/Berry/src/be_map.h
@@ -56,6 +56,6 @@ bvalue* be_map_insertstr(bvm *vm, bmap *map, bstring *key, bvalue *value);
 void be_map_removestr(bvm *vm, bmap *map, bstring *key);
 bmapnode* be_map_next(bmap *map, bmapiter *iter);
 bmapnode* be_map_val2node(bvalue *value);
-void be_map_release(bvm *vm, bmap *map);
+void be_map_compact(bvm *vm, bmap *map);
 
 #endif
diff --git a/lib/libesp32/Berry/src/be_module.c b/lib/libesp32/Berry/src/be_module.c
index c661528a1..0256809af 100644
--- a/lib/libesp32/Berry/src/be_module.c
+++ b/lib/libesp32/Berry/src/be_module.c
@@ -99,7 +99,7 @@ static bmodule* new_module(bvm *vm, const bntvmodule *nm)
         obj->table = NULL; /* gc protection */
         obj->table = be_map_new(vm);
         insert_attrs(vm, obj->table, nm);
-        be_map_release(vm, obj->table); /* clear space */
+        be_map_compact(vm, obj->table); /* clear space */
         be_stackpop(vm, 1);
     }
     return obj;
diff --git a/lib/libesp32/Berry/src/be_solidifylib.c b/lib/libesp32/Berry/src/be_solidifylib.c
index 402db4547..581131b75 100644
--- a/lib/libesp32/Berry/src/be_solidifylib.c
+++ b/lib/libesp32/Berry/src/be_solidifylib.c
@@ -17,6 +17,7 @@
 #include "be_decoder.h"
 #include <string.h>
 #include <stdio.h>
+#include <ctype.h>
 
 extern const bclass be_class_list;
 extern const bclass be_class_map;
@@ -37,12 +38,68 @@ extern const bclass be_class_map;
         be_writestring(__lbuf);         \
     } while (0)
 
+/********************************************************************
+ * Encode string to identifiers
+ * 
+ * `_X` is used as an escape marker
+/********************************************************************/
+static unsigned toidentifier_length(const char *s)
+{
+    unsigned len = 1;
+    const char * p = s;
+    while (*p) {
+        if (p[0] == '_' && p[1] == 'X') {
+            len += 3;
+            p += 2;
+        } else if (isalnum(p[0]) || p[0] == '_') {
+            p++;
+            len++;
+        } else {        // escape
+            p++;
+            len += 4;
+        }
+    }
+    return len;
+}
+
+inline static char hexdigit(int v)
+{
+    v = v & 0xF;
+    if (v >= 10)    return v - 10 + 'A';
+    return v + '0';
+}
+
+static void toidentifier(char *to, const char *p)
+{
+    while (*p) {
+        if (p[0] == '_' && p[1] == 'X') {
+            to[0] = '_';
+            to[1] = 'X';
+            to[2] = '_';
+            p += 2;
+            to += 3;
+        } else if (isalnum(p[0]) || p[0] == '_') {
+            *to = *p;
+            to++;
+            p++;
+        } else {        // escape
+            to[0] = '_';
+            to[1] = 'X';
+            to[2] = hexdigit((*p & 0xF0) >> 4);
+            to[3] = hexdigit(*p & 0x0F);
+            p++;
+            to += 4;
+        }
+    }
+    *to = 0;      // final NULL
+}
+
 static void m_solidify_bvalue(bvm *vm, bvalue * value, const char *classname, const char *key);
 
 static void m_solidify_map(bvm *vm, bmap * map, const char *class_name)
 {
     // compact first
-    be_map_release(vm, map);
+    be_map_compact(vm, map);
     
     logfmt("    be_nested_map(%i,\n", map->count);
 
@@ -62,7 +119,12 @@ static void m_solidify_map(bvm *vm, bmap * map, const char *class_name)
         if (0xFFFFFF == key_next) {
             key_next = -1;      /* more readable */
         }
-        logfmt("        { be_nested_key(\"%s\", %i, %zu, %i), ", str(node->key.v.s), be_strhash(node->key.v.s), len >= 255 ? 255 : len, key_next);
+        /* convert the string literal to identifier */
+        const char * key = str(node->key.v.s);
+        size_t id_len = toidentifier_length(key);
+        char id_buf[id_len];
+        toidentifier(id_buf, key);
+        logfmt("        { be_const_key(%s, %i), ", id_buf, key_next);
         m_solidify_bvalue(vm, &node->value, class_name, str(node->key.v.s));
 
         logfmt(" },\n");
@@ -118,16 +180,15 @@ static void m_solidify_bvalue(bvm *vm, bvalue * value, const char *classname, co
         break;
     case BE_STRING:
         {
-            size_t len = strlen(str(var_tostr(value)));
+            const char * str = str(var_tostr(value));
+            size_t len = strlen(str);
             if (len >= 255) {
                 be_raise(vm, "internal_error", "Strings greater than 255 chars not supported yet");
             }
-            be_pushstring(vm, str(var_tostr(value)));
-            be_toescape(vm, -1, 'u');
-            logfmt("be_nested_str_literal(%s)", be_tostring(vm, -1));
-            // logfmt("be_nested_string(%s", be_tostring(vm, -1));
-            // be_pop(vm, 1);
-            // logfmt(", %i, %zu)", be_strhash(var_tostr(value)), len >= 255 ? 255 : len);
+            size_t id_len = toidentifier_length(str);
+            char id_buf[id_len];
+            toidentifier(id_buf, str);
+            logfmt("be_nested_str(%s)", id_buf);
         }
         break;
     case BE_CLOSURE:
@@ -253,10 +314,16 @@ static void m_solidify_proto(bvm *vm, bproto *pr, const char * func_name, int bu
         logfmt("%*sNULL,                       /* no const */\n", indent, "");
     }
 
-    logfmt("%*s(be_nested_const_str(\"%s\", %i, %i)),\n", indent, "", str(pr->name), be_strhash(pr->name), str_len(pr->name));
-    // logfmt("%*s(be_nested_const_str(\"%s\", %i, %i)),\n", indent, "", func_source, be_strhash(pr->source), str_len(pr->source));
-    // hard-code source as "input" for solidified
-    logfmt("%*s((bstring*) &be_const_str_input),\n", indent, "");
+    /* convert the string literal to identifier */
+    {
+        const char * key = str(pr->name);
+        size_t id_len = toidentifier_length(key);
+        char id_buf[id_len];
+        toidentifier(id_buf, key);
+        logfmt("%*s&be_const_str_%s,\n", indent, "", id_buf);
+    }
+    // hard-code source as "solidified" for solidified
+    logfmt("%*s&be_const_str_solidified,\n", indent, "");
 
     logfmt("%*s( &(const binstruction[%2d]) {  /* code */\n", indent, "", pr->codesize);
     for (int pc = 0; pc < pr->codesize; pc++) {
@@ -382,7 +449,7 @@ static void m_solidify_module(bvm *vm, bmodule *ml, int builtins)
         while ((node = be_map_next(ml->table, &iter)) != NULL) {
             if (var_isstr(&node->key) && var_isclosure(&node->value)) {
                 bclosure *f = var_toobj(&node->value);
-                m_solidify_closure(vm, f, NULL, builtins);
+                m_solidify_closure(vm, f, module_name, builtins);
             }
             if (var_isstr(&node->key) && var_isclass(&node->value)) {
                 bclass *cl = var_toobj(&node->value);
diff --git a/lib/libesp32/Berry/src/be_strlib.c b/lib/libesp32/Berry/src/be_strlib.c
index e82ec3cf2..e0636c100 100644
--- a/lib/libesp32/Berry/src/be_strlib.c
+++ b/lib/libesp32/Berry/src/be_strlib.c
@@ -330,7 +330,6 @@ static bstring* string_range(bvm *vm, bstring *str, binstance *range)
 {
     bint lower, upper;
     bint size = str_len(str);   /* size of source string */
-    // bint size = be_data_size(vm, -1); /* get source list size */
     /* get index range */
     bvalue temp;
     be_instance_member(vm, range, be_newstr(vm, "__lower__"), &temp);
@@ -794,9 +793,6 @@ static int str_tr(bvm *vm)
         const char *p, *s = be_tostring(vm, 1);
         const char *t1 = be_tostring(vm, 2);
         const char *t2 = be_tostring(vm, 3);
-        if (strlen(t2) < strlen(t1)) {
-            be_raise(vm, "value_error", "invalid translation pattern");
-        }
         size_t len = (size_t)be_strlen(vm, 1);
         char *buf, *q;
         buf = be_pushbuffer(vm, len);
@@ -804,11 +800,17 @@ static int str_tr(bvm *vm)
         for (p = s, q = buf; *p != '\0'; ++p, ++q) {
             const char *p1, *p2;
             *q = *p;  /* default to no change */
-            for (p1=t1, p2=t2; *p1 != '\0'; ++p1, ++p2) {
+            for (p1=t1, p2=t2; *p1 != '\0'; ++p1) {
                 if (*p == *p1) {
-                    *q = *p2;
+                    if (*p2) {
+                        *q = *p2;
+                    } else {
+                        q--;    /* remove this char */
+                        len--;
+                    }
                     break;
                 }
+                if (*p2) { p2++; }
             }
         }
         be_pushnstring(vm, buf, len); /* make escape string from buffer */
diff --git a/lib/libesp32/Berry/src/be_var.c b/lib/libesp32/Berry/src/be_var.c
index ebc70ecea..4fee144cd 100644
--- a/lib/libesp32/Berry/src/be_var.c
+++ b/lib/libesp32/Berry/src/be_var.c
@@ -87,7 +87,7 @@ bvalue* be_global_var(bvm *vm, int index)
 
 void be_global_release_space(bvm *vm)
 {
-    be_map_release(vm, global(vm).vtab);
+    be_map_compact(vm, global(vm).vtab);
     be_vector_release(vm, &global(vm).vlist);
 }
 
@@ -130,7 +130,7 @@ int be_builtin_new(bvm *vm, bstring *name)
 
 void be_bulitin_release_space(bvm *vm)
 {
-    be_map_release(vm, builtin(vm).vtab);
+    be_map_compact(vm, builtin(vm).vtab);
     be_vector_release(vm, &builtin(vm).vlist);
 }
 #else
diff --git a/lib/libesp32/Berry/src/be_vm.c b/lib/libesp32/Berry/src/be_vm.c
index f00cc128a..26c15a1a3 100644
--- a/lib/libesp32/Berry/src/be_vm.c
+++ b/lib/libesp32/Berry/src/be_vm.c
@@ -142,7 +142,7 @@
     _vm->cf->status = PRIM_FUNC; \
 }
 
-static void prep_closure(bvm *vm, int32_t pos, int argc, int mode);
+static void prep_closure(bvm *vm, int pos, int argc, int mode);
 
 static void attribute_error(bvm *vm, const char *t, bvalue *b, bvalue *c)
 {
@@ -853,9 +853,9 @@ newframe: /* a new call frame */
                 reg = vm->reg;
                 bvalue *a = RA();
                 *a = a_temp;
-                if (basetype(type) == BE_FUNCTION) {
-                    if (func_isstatic(a)) {
-                        /* static method, don't bother with the instance */
+                if (var_basetype(a) == BE_FUNCTION) {
+                    if (func_isstatic(a) || (type == BE_INDEX)) {    /* if instance variable then we consider it's non-method */
+                       /* static method, don't bother with the instance */
                         a[1] = a_temp;
                         var_settype(a, NOT_METHOD);
                     } else {
@@ -984,7 +984,12 @@ newframe: /* a new call frame */
             bvalue *a = RA(), *b = RKB();
             if (var_isclass(a) && var_isclass(b)) {
                 bclass *obj = var_toobj(a);
-                be_class_setsuper(obj, var_toobj(b));
+                if (!gc_isconst(obj))  {
+                   be_class_setsuper(obj, var_toobj(b));
+                } else {
+                    vm_error(vm, "internal_error",
+                    "cannot change superclass of a read-only class");
+                }
             } else {
                 vm_error(vm, "type_error",
                     "value '%s' does not support set super",
@@ -1181,7 +1186,7 @@ newframe: /* a new call frame */
     }
 }
 
-static void prep_closure(bvm *vm, int32_t pos, int argc, int mode)
+static void prep_closure(bvm *vm, int pos, int argc, int mode)
 {
     bvalue *v, *end;
     bproto *proto = var2cl(vm->reg + pos)->proto;
@@ -1206,7 +1211,7 @@ static void prep_closure(bvm *vm, int32_t pos, int argc, int mode)
     }
 }
 
-static void do_closure(bvm *vm, int32_t pos, int argc)
+static void do_closure(bvm *vm, int pos, int argc)
 {
     // bvalue *v, *end;
     // bproto *proto = var2cl(reg)->proto;
@@ -1220,7 +1225,7 @@ static void do_closure(bvm *vm, int32_t pos, int argc)
     vm_exec(vm);
 }
 
-static void do_ntvclos(bvm *vm, int32_t pos, int argc)
+static void do_ntvclos(bvm *vm, int pos, int argc)
 {
     bntvclos *f = var_toobj(vm->reg + pos);
     push_native(vm, vm->reg + pos, argc, 0);
@@ -1228,7 +1233,7 @@ static void do_ntvclos(bvm *vm, int32_t pos, int argc)
     ret_native(vm);
 }
 
-static void do_ntvfunc(bvm *vm, int32_t pos, int argc)
+static void do_ntvfunc(bvm *vm, int pos, int argc)
 {
     bntvfunc f = var_tontvfunc(vm->reg + pos);
     push_native(vm, vm->reg + pos, argc, 0);
@@ -1236,7 +1241,7 @@ static void do_ntvfunc(bvm *vm, int32_t pos, int argc)
     ret_native(vm);
 }
 
-static void do_class(bvm *vm, int32_t pos, int argc)
+static void do_class(bvm *vm, int pos, int argc)
 {
     if (be_class_newobj(vm, var_toobj(vm->reg + pos), pos, ++argc, 0)) {
         be_incrtop(vm);
@@ -1249,7 +1254,7 @@ void be_dofunc(bvm *vm, bvalue *v, int argc)
 {
     be_assert(vm->reg <= v && v < vm->stacktop);
     be_assert(vm->stack <= vm->reg && vm->reg < vm->stacktop);
-    int32_t pos = v - vm->reg;
+    int pos = v - vm->reg;
     switch (var_type(v)) {
     case BE_CLASS: do_class(vm, pos, argc); break;
     case BE_CLOSURE: do_closure(vm, pos, argc); break;
diff --git a/lib/libesp32/Berry/src/berry.h b/lib/libesp32/Berry/src/berry.h
index 9a174e3f2..e69a3bbe8 100644
--- a/lib/libesp32/Berry/src/berry.h
+++ b/lib/libesp32/Berry/src/berry.h
@@ -342,11 +342,11 @@ typedef struct bntvmodule {
     (bvalue*) _ktab,            /* ktab */                                        \
     (struct bproto**) _protos,  /* bproto **ptab */                               \
     (binstruction*) _code,      /* code */                                        \
-    _fname,                     /* name */                                        \
+    ((bstring*) _fname),        /* name */                                        \
     sizeof(*_code)/sizeof(binstruction),                        /* codesize */    \
     BE_IIF(_has_const)(sizeof(*_ktab)/sizeof(bvalue),0),        /* nconst */      \
     BE_IIF(_has_subproto)(sizeof(*_protos)/sizeof(bproto*),0),  /* proto */       \
-    _source,                    /* source */                                      \
+    ((bstring*) _source),        /* source */                                      \
     PROTO_RUNTIME_BLOCK                                                           \
     PROTO_VAR_INFO_BLOCK                                                          \
   }
diff --git a/lib/libesp32/Berry/tests/class_const.be b/lib/libesp32/Berry/tests/class_const.be
index 7c986bff0..e8f4c1920 100644
--- a/lib/libesp32/Berry/tests/class_const.be
+++ b/lib/libesp32/Berry/tests/class_const.be
@@ -64,7 +64,7 @@ A.h = def (x, y) return type(x) end
 assert(type(a.g) == 'function')
 assert(type(a.h) == 'function')
 
-assert_attribute_error("a.g(1,2)")
+assert(a.g(1) == 'int')
 assert(a.h(1) == 'int')
 assert(A.h(1) == 'int')
 
@@ -85,6 +85,9 @@ assert(a.g(1,2) == [1,2])
 assert(a.h(1,2) == [1,2])
 assert(A.g(1,2) == [1,2])
 assert(A.h(1,2) == [1,2])
+a.a = def (x,y) return [x,y] end
+assert(a.a(1,2) == [1,2])
+
 
 #- test static initializers -#
 class A
diff --git a/lib/libesp32/Berry/tests/list.be b/lib/libesp32/Berry/tests/list.be
index d0b9099ba..a2da2ca47 100644
--- a/lib/libesp32/Berry/tests/list.be
+++ b/lib/libesp32/Berry/tests/list.be
@@ -127,3 +127,14 @@ assert([1,2,3].concat('-') == "1-2-3")
 assert([1,"2",3].concat('-') == "1-2-3")
 
 assert(["",2,3].concat('-') == "-2-3")
+
+#- negative indices -#
+assert([1,2,3,4][0] == 1)
+assert([1,2,3,4][-1] == 4)
+assert([1,2,3,4][-2] == 3)
+
+assert([1,2,3,4][1..10] == [2,3,4])
+assert([1,2,3,4][1..-1] == [2,3,4])
+assert([1,2,3,4][1..-2] == [2,3])
+assert([1,2,3,4][3..2] == [])
+assert([1,2,3,4][2..-3] == [])
\ No newline at end of file
diff --git a/lib/libesp32/Berry/tools/pycoc/block_builder.py b/lib/libesp32/Berry/tools/pycoc/block_builder.py
new file mode 100644
index 000000000..9ddea1e3a
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/block_builder.py
@@ -0,0 +1,152 @@
+import copy
+from hash_map import *
+
+class block:
+    def __init__(self):
+        self.type = ""
+        self.name = ""
+        self.attr = {}
+        self.data = {}
+        self.data_ordered = []
+
+def depend(obj, macro):
+    if "depend" in obj.attr:
+        return macro.query(obj.attr["depend"])
+    else:
+        return True
+
+class block_builder:
+    """Output an object"""
+
+    def __init__(self, obj, macro):
+        self.block = block()
+        self.strtab = []
+
+        self.block.name = obj.name
+        if depend(obj, macro):
+            self.block.type = obj.type
+            self.block.attr = obj.attr
+            
+            if "name" in obj.attr:
+                self.strtab.append(obj.attr["name"])
+            
+            for key in obj.data_ordered:
+                second = obj.data[key]
+                if second.depend == None or macro.query(second.depend):
+                    self.block.data[key] = second.value
+                    self.strtab.append(key)
+                    self.block.data_ordered.append(key)
+    
+    def block_tostring(self, block):
+        ostr = ""
+        if block.type == "map":
+            ostr += self.map_tostring(block, block.name)
+        elif block.type == "class":
+            ostr += self.class_tostring(block)
+        elif block.type == "vartab":
+            ostr += self.vartab_tostring(block)
+        elif block.type == "module":
+            ostr += self.module_tostring(block)
+        return ostr
+
+    def class_tostring(self, block):
+        ostr = ""
+        hmap = hash_map(block.data)
+        map_name = block.name + "_map"
+        if len(block.data) > 0:
+            ostr += self.map_tostring(block, map_name, True) + "\n"
+        
+        ostr += self.scope(block) + " be_define_const_class(\n    "
+        ostr += block.name + ",\n    "
+        ostr += str(hmap.var_count()) + ",\n    "
+        ostr += self.get_super(block) + ",\n    "
+        ostr += self.name(block) + "\n);\n"
+        return ostr
+    
+    def map_tostring(self, block, name, local):
+        hmap = hash_map(block.data)
+        entlist = hmap.entry_list()
+        ostr = "static be_define_const_map_slots(" + name + ") {\n"
+        for ent in entlist:
+            ostr += "    { be_const_key(" + ent.key + ", "
+            ostr += str(ent.next) + "), " + ent.value + " },\n"
+        ostr += "};\n\n"
+
+        if local:
+            ostr += "static"
+        else:
+            ostr += self.scope(block)
+        ostr += " be_define_const_map(\n    "
+        ostr += name + ",\n    "
+        ostr += str(len(entlist)) + "\n);\n"
+        return ostr
+    
+    def vartab_tostring(self, block):
+        ostr = ""
+        varvec = []
+        idxblk = copy.deepcopy(block)
+        index = 0
+        idxblk.data = {}
+        for key in block.data_ordered:
+            varvec.append(block.data[key])
+            idxblk.data[key] = "int(" + str(index) + ")"
+            index += 1
+        
+        ostr += self.map_tostring(idxblk, block.name + "_map", True) + "\n"
+        ostr += "static const bvalue __vlist_array[] = {\n";
+        for it in varvec:
+            ostr += "    be_const_" + it + ",\n"
+        ostr += "};\n\n"
+
+        ostr += "static be_define_const_vector(\n    "
+        ostr += block.name + "_vector,\n    __vlist_array,\n    "
+        ostr += str(len(varvec)) + "\n);\n"
+        return ostr
+    
+    def module_tostring(self, block):
+        ostr = ""
+        name = "m_lib" + block.name
+        map_name = name + "_map"
+
+        ostr += self.map_tostring(block, map_name, True) + "\n"
+        ostr += "static be_define_const_module(\n    "
+        ostr += name + ",\n    "
+        ostr += "\"" + block.name + "\"\n);\n"
+        scp = self.scope(block)
+        if scp != "static":
+            ostr += "\n" + scp
+            ostr += " be_define_const_native_module("
+            ostr += block.name + ");\n"
+        return ostr
+
+    def scope(self, block):
+        if "local" in block.attr:
+            return "static"
+        else:
+            return "BE_EXPORT_VARIABLE"
+
+    def get_super(self, block):
+        if "super" in block.attr:
+            return "(bclass *)&" + block.attr["super"]
+        else:
+            return "NULL"
+    
+    def name(self, block):
+        if "name" in block.attr:
+            return block.attr["name"]
+        else:
+            return block.name
+    
+    def writefile(self, filename, text):
+        otext = "#include \"be_constobj.h\"\n\n" + text
+        with open(filename, "w") as f:
+            f.write(otext)
+
+    def dumpfile(self, path):
+        s = self.block_tostring(self.block)
+        if "file" in self.block.attr:
+            name = self.block.attr["file"]
+        else:
+            name = self.block.name
+        self.writefile(path + "/be_fixed_" + name + ".h", s)
+        
\ No newline at end of file
diff --git a/lib/libesp32/Berry/tools/pycoc/coc_parser.py b/lib/libesp32/Berry/tools/pycoc/coc_parser.py
new file mode 100644
index 000000000..c31e35814
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/coc_parser.py
@@ -0,0 +1,146 @@
+import re
+from coc_string import unescape_operator
+
+class data_value:
+    def __init__(self):
+        self.value = None
+        self.depend = None
+
+class object_block:
+    def __init__(self):
+        self.type = None
+        self.name = None
+        self.attr = {}
+        self.data = {}
+        self.data_ordered = []
+
+class coc_parser:
+    """Parser for Berry"""
+
+    def __init__(self, text):
+        """Parse text file"""
+        self.objects = []
+        self.strtab = set()
+        self.text = text
+        self.parsers = {
+            "@const_object_info_begin": self.parse_object,
+            "be_const_str_": self.parse_string,
+            "be_const_key(": self.parse_string,
+            "be_nested_str(": self.parse_string,
+        }
+
+        while len(self.text) > 0:
+            pattern = "|".join(self.parsers.keys())
+            pattern = re.sub("\\(", "\\(", pattern)
+            r = re.search(pattern, self.text)
+            if not r: break
+
+            self.text = self.text[r.end(0):]        # keep only after pattern
+            func = self.parsers[r[0]]                # retrieve function for matched
+            func()                                  # call function
+    
+    # def scan_const_string(self):
+    #     r = re.match(r"\w*", self.text)
+    #     if r:
+    #         self.text = self.text[r.end(0)]
+    #         self.strtab.append(r[0])
+    
+    def skip_space(self):
+        r = re.match(r"\s+", self.text)
+        if r:
+            self.text = self.text[r.end(0):]
+    
+    def parse_char_base(self, c, necessary):
+        res = self.text[0] == c
+        if not res and necessary:   print(self.text); raise "error"
+        if res: self.text = self.text[1:]
+        return res
+    
+    def parse_char(self, c, necessary = False):
+        self.skip_space()
+        return self.parse_char_base(c, necessary)
+    
+    def skip_char(self, c):
+        self.parse_char(c, True)
+
+    def parse_char_continue(self, c, necessary = False):
+        ch = self.text[0]
+        while ch == ' ' or ch == "\t":  self.text = self.text[1:]
+        return self.parse_char_base(c, necessary)
+
+    def parse_word(self):
+        self.skip_space()
+        r = re.match(r"\w+", self.text)
+        self.text = self.text[r.end(0):]
+        return r[0]
+
+    def parse_tocomma(self):
+        self.skip_space()
+        r = re.match(r"[^,\s]*", self.text)
+        self.text = self.text[r.end(0):]
+        return r[0]
+
+    def parse_tonewline(self):
+        self.skip_space()
+        r = re.match(r"[^\r\n]*", self.text)
+        self.text = self.text[r.end(0):]
+        return r[0]
+
+    def parse_object(self):
+        while True:
+            obj = self.parse_block()
+            self.objects.append(obj)
+            if self.parse_char("@"): break
+        
+        end_text = "const_object_info_end"
+        if not str.startswith(self.text, end_text): raise "error"
+        self.text = self.text[len(end_text):]
+        # print("END: @const_object_info_end test={self.text}")
+
+    def parse_string(self):
+        if not self.text[0].isalnum() and self.text[0] != '_': return      # do not proceed, maybe false positive in solidify
+        ident = self.parse_word()
+        literal = unescape_operator(ident)
+        if not literal in self.strtab:
+            self.strtab.add(literal)
+            # print(f"str '{ident}' -> {literal}")
+
+    def parse_block(self):
+        obj = object_block()
+        obj.type = self.parse_word()
+        obj.name = self.parse_word()
+        # print(f"parse_block: type={obj.type} name={obj.name}")
+        self.parse_attr(obj)
+        self.parse_body(obj)
+        return obj
+
+    def parse_attr(self, obj):
+        self.skip_char("(")
+        self.parse_attr_pair(obj)
+        while self.parse_char(","):
+            self.parse_attr_pair(obj)
+        self.skip_char(")")
+
+    def parse_attr_pair(self, obj):
+        key = self.parse_word()
+        self.skip_char(":")
+        value = self.parse_word()
+        obj.attr[key] = value
+    
+    def parse_body(self, obj):
+        self.skip_char("{")
+        if not self.parse_char("}"):
+            while True:
+                self.parse_body_item(obj)
+                if self.parse_char("}"): break
+    
+    def parse_body_item(self, obj):
+        value = data_value()
+        key = self.parse_tocomma()
+        # print(f"Key={key}")
+        self.parse_char_continue(",", True)
+        value.value = self.parse_tocomma()
+        if self.parse_char_continue(","):
+            value.depend = self.parse_tonewline()
+        obj.data[key] = value
+        obj.data_ordered.append(key)
diff --git a/lib/libesp32/Berry/tools/pycoc/coc_string.py b/lib/libesp32/Berry/tools/pycoc/coc_string.py
new file mode 100644
index 000000000..92b7d569d
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/coc_string.py
@@ -0,0 +1,40 @@
+import re
+
+def hashcode(s):
+    """Compute hash for a string, in uint32_t"""
+    hash = 2166136261
+    for c in s.encode('utf8'):
+        hash = ((hash ^ c) * 16777619) & 0xFFFFFFFF
+    return hash
+
+def escape_operator_v1(s):
+    tab = {
+        # "void": "",
+        "..": "opt_connect",
+        "+": "opt_add",        "-": "opt_sub",
+        "*": "opt_mul",        "/": "opt_div",
+        "%": "opt_mod",        "&": "opt_and",
+        "^": "opt_xor",        "|": "opt_or",
+        "<": "opt_lt",         ">": "opt_gt",
+        "<=": "opt_le",        ">=": "opt_ge",
+        "==": "opt_eq",        "!=": "opt_neq",
+        "<<": "opt_shl",       ">>": "opt_shr",
+        "-*": "opt_neg",       "~": "opt_flip",
+        "()": "opt_call",
+    }
+    if s in tab: return tab[s]
+    s2 = ""
+    for c in s:
+        if c == '.':     s2 += 'dot_'
+        else:            s2 += c
+    return s2
+
+def escape_operator(s):
+    s = re.sub('_X', '_X_', s)                  # replace any esape sequence '_X' with '_XX'
+    s = re.sub('[^a-zA-Z0-9_]', lambda m: "_X{0:02X}".format(ord(m.group())), s)
+    return s
+
+def unescape_operator(s):
+    s = re.sub('_X[0-9A-F][0-9A-F]', lambda m: chr(int(m.group()[2:], 16)), s)
+    s = re.sub('_X_', '_X', s)
+    return s
diff --git a/lib/libesp32/Berry/tools/pycoc/coc_string_test.py b/lib/libesp32/Berry/tools/pycoc/coc_string_test.py
new file mode 100644
index 000000000..fe51a721b
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/coc_string_test.py
@@ -0,0 +1,18 @@
+import unittest
+from coc_string import *
+
+class Test_coc_string(unittest.TestCase):
+
+    def test_hash(self):
+        self.assertEqual(hashcode("add"), 993596020)
+        self.assertEqual(hashcode("real"), 3604983901)
+
+    def test_escape(self):
+        self.assertEqual(escape_operator("foo"), "foo")
+        self.assertEqual(escape_operator(".."), "_opt_connect")
+        self.assertEqual(escape_operator("foo.bar"), "foo_dot_bar")
+        self.assertEqual(escape_operator("foo._bar"), "foo_dot___bar")
+        self.assertEqual(escape_operator("foo. bar"), "foo_dot__20bar")
+
+if __name__ == '__main__':
+    unittest.main()
\ No newline at end of file
diff --git a/lib/libesp32/Berry/tools/pycoc/hash_map.py b/lib/libesp32/Berry/tools/pycoc/hash_map.py
new file mode 100644
index 000000000..5686a0342
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/hash_map.py
@@ -0,0 +1,162 @@
+import copy
+from coc_string import *
+
+# resize a list, from https://stackoverflow.com/a/8850956
+def list_resize_entry(l, newsize, filling=None):                                                                                  
+    if newsize > len(l):                                                                                 
+        l.extend([entry() for x in range(len(l), newsize)])                                                 
+    else:                                                                                                
+        del l[newsize:]
+
+class entry:
+    def __init__(self):
+        self.key = ""
+        self.value = ""
+        self.next = hash_map.NODE_EMPTY
+    
+    def __repr__(self):
+        return f"<entry object; key='{self.key}', value='{self.value}', next={self.next}>"
+
+class hash_map:
+    NODE_EMPTY = -2
+    NODE_NULL = -1
+
+    def __init__(self, map):
+        self.count = 0
+        self.lastfree = 0
+        self.bucket = []
+
+        self.resize(2)
+        for key in sorted(map.keys()):
+            self.insert(key, map[key])
+    
+    def __repr__(self):
+        return f"<hash_map object; count={self.count}, bucket={self.bucket}, lastfree={self.lastfree}>"
+
+    def is_empty(self, ent):
+        return ent.next == hash_map.NODE_EMPTY
+    
+    def resize(self, size):
+        bucket = copy.deepcopy(self.bucket)
+        list_resize_entry(self.bucket, size)
+        # set all slot to empty
+        for i in range(size):
+            self.bucket[i].next = hash_map.NODE_EMPTY
+        self.lastfree = size - 1
+        for slot in bucket:
+            if slot.next != hash_map.NODE_EMPTY:
+                self.insert_p(slot.key, slot.value)
+
+    def findprev(self, prev, slot):
+        #print(f"findprev: prev={prev} slot={slot}")
+        while True:
+            next = prev.next
+            if next == hash_map.NODE_NULL or self.bucket[next] == slot: break
+            prev = self.bucket[next]
+        if next == hash_map.NODE_NULL: return None
+        return prev
+    
+    def nextfree(self):
+        while self.lastfree >= 0:
+            if self.bucket[self.lastfree].next == hash_map.NODE_EMPTY:
+                return self.lastfree
+            self.lastfree -= 1
+        return -1
+    
+    def find(self, key):
+        hash = hashcode(key)
+        null = entry()
+        slot = self.bucket[hash % len(self.bucket)]
+        if slot.next == hash_map.NODE_EMPTY:
+            return null
+        while slot.key != key:
+            if slot.next == hash_map.NODE_NULL: return null
+            slot = self.bucket[slot.next]
+        return slot
+    
+    def insert_p(self, key, value):
+        slot = self.bucket[hashcode(key) % len(self.bucket)]
+        #print(f"slot={slot}, index={hashcode(key) % len(self.bucket)}")
+        if slot.next == hash_map.NODE_EMPTY:
+            slot.next = hash_map.NODE_NULL
+        else:
+            newidx = self.nextfree()
+            #print(f"newidx={newidx}")
+            # get the main-slot index
+            mainslot = self.bucket[hashcode(slot.key) % len(self.bucket)]
+            newslot = self.bucket[newidx]
+            #print(f"self={self}\nslot={hashcode(key) % len(self.bucket)} idx_main={hashcode(slot.key) % len(self.bucket)} newidx={newidx}")
+            #print(f"insert_p: 1={mainslot} 2={newslot}")
+            if mainslot == slot:
+                newslot.next = mainslot.next
+                mainslot.next = newidx
+                slot = newslot
+            else:   # link to list
+                #print(f"insert_p: 1={mainslot} 2={slot}")
+                prev = self.findprev(mainslot, slot)
+                prev.next = newidx      # link the previous node
+                # copy to new slot
+                newslot.key = slot.key
+                newslot.value = slot.value
+                newslot.next = slot.next
+                slot.next = hash_map.NODE_NULL
+        slot.key = key
+        slot.value = value
+
+    def insert(self, key, value):
+        slot = self.find(key)
+        if slot.next == hash_map.NODE_EMPTY:
+            if self.count >= len(self.bucket):
+                self.resize(len(self.bucket) * 2)
+            self.insert_p(key, value)
+            self.count += 1
+    
+    # return a list (entiry, var_count)
+    def entry_modify(self, ent, var_count):
+        ent.key = escape_operator(ent.key)
+        if ent.value == "var":
+            ent.value = "be_const_var(" + str(var_count) + ")"
+            var_count += 1
+        else:
+            ent.value = "be_const_" + ent.value
+        return (ent, var_count)
+    
+    def entry_list(self):
+        l = []
+        var_count = 0
+        
+        self.resize(self.count)
+        for it in self.bucket:
+            (ent, var_count) = self.entry_modify(it, var_count)
+            l.append(ent)
+        return l
+    
+    def var_count(self):
+        count = 0
+
+        self.resize(self.count)
+        for it in self.bucket:
+            if it.value == "var": count += 1
+        return count
+
+if __name__ == '__main__':
+    # from hash_map import *
+    m = hash_map({})
+    print(m)
+    m.insert("foo","bar")
+    print(m)
+    m.insert("foo2","bar")
+    print(m)
+    m.insert(".","3")
+    print(m)
+    m.insert("foo","bar2")
+    print(m)
+    m.insert("+","bar2")
+    print(m)
+    m.insert("a","var")
+    m.insert("b","var")
+    m.insert("c","var")
+    print()
+    print(m)
+    print(f"var_count={m.var_count()}")
+    print(f"entry_list={m.entry_list()}")
\ No newline at end of file
diff --git a/lib/libesp32/Berry/tools/pycoc/macro_table.py b/lib/libesp32/Berry/tools/pycoc/macro_table.py
new file mode 100644
index 000000000..8b4518ddc
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/macro_table.py
@@ -0,0 +1,50 @@
+import re
+
+def int_safe(v):
+    try:     return int(v, 0)
+    except:  return 0
+
+class macro_table:
+    pat = re.compile("(?:\\n|$)\\s*#define\\s+(\\w+)[ \\t]+(\\w*)", re.MULTILINE)
+    pat_query = re.compile("(!?)(\\w+)")
+
+    def __init__(self):
+        self.map = {}
+    
+    # def readfile(self, filename):
+    #     with open(filename) as f:
+    #         return f.read()
+
+    def parse_value(self, s):
+        if len(s) == 0:             return 1    # defined a macro name but no content, considered true
+        if not s[0].isnumeric():    return 1
+        return int_safe(s)
+    
+    def scan_file(self, filename):
+        str = ""
+        with open(filename) as f:
+           str = f.read()
+        r = macro_table.pat.findall(str)
+        for it in r:
+            # print(f"> it0:{it[0]} it1:{it[1]}")
+            self.map[it[0]] = self.parse_value(it[1])
+    
+    def query(self, s):
+        r = macro_table.pat_query.search(s)
+        value = False
+        if r:
+            bang = r[1]
+            name = r[2]
+            # print(f">query: bang={bang} name={name} value={self.map.get(name)}")
+            if name in self.map:
+                value = int(self.map[name]) != 0
+            if bang == "!":
+                value = not value
+        # print(f">query: {s}:{value}")
+        return value
+
+if __name__ == '__main__':
+    # from hash_map import *
+    pat = re.compile("(?:\\n|$)\\s*#define\\s+(\\w+)[ \\t]+(\\w+)", re.MULTILINE)
+    s = "aaa\n#define A 1  // a \n  #define B 2\n#define C \n#define D 0 \n  #define E     11 \na"
+    
\ No newline at end of file
diff --git a/lib/libesp32/Berry/tools/pycoc/main.py b/lib/libesp32/Berry/tools/pycoc/main.py
new file mode 100644
index 000000000..231ae2afb
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/main.py
@@ -0,0 +1,64 @@
+# python3 main.py -o out in
+# coc 
+
+import re
+import os
+from coc_parser import *
+from str_build import *
+from block_builder import *
+from macro_table import *
+
+class builder:
+    Input = 0
+    Output = 1
+    Config = 2
+
+    def __init__(self, input_folders, output_folder, macro_files):
+        self.output = output_folder
+        self.input = input_folders
+        self.config = macro_files
+        self.macro = None
+        self.strmap = {}
+
+        self.macro = macro_table()
+        for path in self.config:
+            self.macro.scan_file(path)                
+
+        for d in self.input:
+            self.scandir(d)
+        
+        sb = str_build(self.strmap)
+        sb.build(self.output)
+    
+    def parse_file(self, filename):
+        if re.search(r"\.(c|cc|cpp)$", filename):
+            # print(f"> parse {filename}")
+            text = ""
+            with open(filename) as f:
+                text = f.read()
+            # print(f"> len(text)={len(text)}")
+            parser = coc_parser(text)
+            for s in parser.strtab:
+                self.strmap[s] = 0
+            for obj in parser.objects:
+                builder = block_builder(obj, self.macro)
+                for s in builder.strtab:
+                    self.strmap[s] = 0
+                builder.dumpfile(self.output)
+
+    def scandir(self, srcpath):
+        for item in os.listdir(srcpath):
+            path = os.path.join(srcpath, item)
+            if os.path.isfile(path): self.parse_file(path)
+
+
+if __name__ == '__main__':
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument("input_folder", nargs='+', help='folders containing the C/C++ files to be parsed')
+    parser.add_argument("-o", help='output folder', required=True)
+    parser.add_argument("-c", nargs='+', help='configuration folders for preprocessor')
+
+    args = vars(parser.parse_args())
+    # print(args)
+    b = builder(args["input_folder"], args["o"], args["c"])
diff --git a/lib/libesp32/Berry/tools/pycoc/str_build.py b/lib/libesp32/Berry/tools/pycoc/str_build.py
new file mode 100644
index 000000000..4ed8e7248
--- /dev/null
+++ b/lib/libesp32/Berry/tools/pycoc/str_build.py
@@ -0,0 +1,123 @@
+import json
+from coc_string import *
+
+class str_info:
+    def __init__(self):
+        self.hash = 0
+        self.str = ""
+        self.extra = 0
+
+class str_build:
+    def __init__(self, map):
+        size = int(len(map) / 2)         # voluntarily reduce hash size to half
+        if size < 4: size = 4
+        self.buckets = []
+        for i in range(size):
+            self.buckets.append([])
+        
+        self.make_ceil("", 0)   # add empty string as it is always useful
+        self.count = len(map) + 1       # TODO it is not actually accurate since keywords are not counted
+        for k in sorted(map.keys()):
+            self.make_ceil(k, map[k])
+        self.keywords()
+    
+    def build(self, path):
+        prefix = path + "/be_const_strtab"
+        self.writefile(prefix + "_def.h", self.build_table_def())
+        self.writefile(prefix + ".h", self.build_table_ext())
+    
+    def get_count(self):            # compute the total size by adding sizes of each bucket
+        size = 0
+        for bucket in self.buckets:
+            size += len(bucket)
+        return size
+    
+    def keywords(self):
+        opif = 50
+        tab = {
+            "if": opif,             "elif": opif + 1 ,
+            "else": opif + 2 ,      "while": opif + 3 ,
+            "for": opif + 4 ,       "def": opif + 5 ,
+            "end": opif + 6 ,       "class": opif + 7 ,
+            "break": opif + 8 ,     "continue": opif + 9 ,
+            "return": opif + 10 ,   "true": opif + 11 ,
+            "false": opif + 12 ,    "nil": opif + 13 ,
+            "var": opif + 14 ,      "do": opif + 15 ,
+            "import": opif + 16 ,   "as": opif + 17 ,
+            "try": opif + 18 ,      "except": opif + 19 ,
+            "raise": opif + 20 ,    "static": opif + 21,
+        }
+        for key in sorted(tab.keys()):
+            self.make_ceil(key, tab[key])
+    
+    def make_ceil(self, name, extra):
+        info = str_info()
+        info.hash = hashcode(name)
+        info.str = name
+        info.extra = extra
+        self.buckets[info.hash % len(self.buckets)].append(info)
+
+    def writefile(self, filename, text):
+        buf = ""
+        try:
+            with open(filename) as f:
+                buf = f.read()
+        except FileNotFoundError:
+            pass
+        if buf != text:
+            with open(filename, "w") as f:
+                f.write(text)
+    
+    def build_table_def(self):
+        strings = {}
+        for bucket in self.buckets:
+            # print(f"> Bucket= {[x.str for x in bucket]}")
+            size = len(bucket)
+            for i in range(size):
+                info = bucket[i]
+                node = escape_operator(info.str)
+                istr = ""
+                if i < size - 1:
+                    next = "&be_const_str_" + escape_operator(bucket[i + 1].str)
+                else:
+                    next = "NULL"
+                istr += "be_define_const_str("
+                istr += node + ", " + json.dumps(info.str) + ", "
+                istr += str(info.hash) + "u, " + str(info.extra) + ", "
+                istr += str(len(info.str)) + ", " + next + ");\n"
+                strings[info.str] = istr
+        
+        ostr = ""
+        for s in sorted(strings.keys()):
+            ostr += strings[s]
+        ostr += "\n"
+        ostr += "static const bstring* const m_string_table[] = {\n"
+
+
+        size = len(self.buckets)
+        for i in range(size):
+            bucket = self.buckets[i]
+            if len(bucket) > 0:
+                ostr += "    (const bstring *)&be_const_str_" + escape_operator(bucket[0].str)
+            else:
+                ostr += "    NULL"
+            if i < size - 1: ostr += ","
+            ostr += "\n"
+        ostr += "};\n\n"
+        ostr += "static const struct bconststrtab m_const_string_table = {\n"
+        ostr += "    .size = " + str(size) + ",\n"
+        ostr += "    .count = " + str(self.get_count()) + ",\n"
+        ostr += "    .table = m_string_table\n"
+        ostr += "};\n"
+        return ostr
+
+    def build_table_ext(self):
+        ostr = ""
+        # put all in a sorted sed
+        all = set()
+        for bucket in self.buckets:
+            for info in bucket:
+                all.add(escape_operator(info.str))
+        for s in sorted(all):
+            ostr += "extern const bcstring be_const_str_" + s + ";\n"
+        return ostr
diff --git a/lib/libesp32/Zip-readonly-FS/src/ZipReadFS.cpp b/lib/libesp32/Zip-readonly-FS/src/ZipReadFS.cpp
index 2f036ad8c..8b8df55c1 100644
--- a/lib/libesp32/Zip-readonly-FS/src/ZipReadFS.cpp
+++ b/lib/libesp32/Zip-readonly-FS/src/ZipReadFS.cpp
@@ -227,7 +227,7 @@ public:
   }
 
   bool seek(uint32_t pos, SeekMode mode) {
-    AddLog(LOG_LEVEL_DEBUG, "ZIP: seek pos=%i mode=%i", pos, mode);
+    // AddLog(LOG_LEVEL_DEBUG, "ZIP: seek pos=%i mode=%i", pos, mode);
     if (SeekSet == mode) {
       if (pos <= _len) {
         _seek = pos;
@@ -246,12 +246,12 @@ public:
   }
 
   size_t position() const {
-    AddLog(LOG_LEVEL_DEBUG, "ZIP: position return=%i", _seek);
+    // AddLog(LOG_LEVEL_DEBUG, "ZIP: position return=%i", _seek);
     return _seek;
   }
 
   size_t size() const {
-    AddLog(LOG_LEVEL_DEBUG, "ZIP: size return=%i", _len);
+    // AddLog(LOG_LEVEL_DEBUG, "ZIP: size return=%i", _len);
     return _len;
   }
 
@@ -322,7 +322,7 @@ bool ZipArchive::parse(void) {
       return false;
     }
     if (header.signature2 != 0x0403) {
-      AddLog(LOG_LEVEL_DEBUG, "ZIP: end of file section");
+      // AddLog(LOG_LEVEL_DEBUG, "ZIP: end of file section");
       break;
     }
     // Check no extra field
@@ -371,7 +371,7 @@ bool ZipArchive::parse(void) {
     entry.last_mod = dos2unixtime((header.last_mod_date << 16) | header.last_mod_time);
     offset += header.size_uncompressed;
 
-    AddLog(LOG_LEVEL_DEBUG_MORE, "ZIP: found file '%s' (%i bytes - offset %i) - next entry %i", &fname[0], header.size_uncompressed, entry.file_start, offset);
+    // AddLog(LOG_LEVEL_DEBUG_MORE, "ZIP: found file '%s' (%i bytes - offset %i) - next entry %i", &fname[0], header.size_uncompressed, entry.file_start, offset);
   }
 
   return true;
@@ -402,7 +402,7 @@ FileImplPtr ZipReadFSImpl::open(const char* path, const char* mode, const bool c
     char *suffix = strtok_r(NULL, "", &tok);
     // if suffix starts with '/', skip the first char
     if (*suffix == '/') { suffix++; }
-    AddLog(LOG_LEVEL_DEBUG, "ZIP: prefix=%s suffix=%s", prefix, suffix);
+    // AddLog(LOG_LEVEL_DEBUG, "ZIP: prefix=%s suffix=%s", prefix, suffix);
     // parse ZIP archive
     File zipfile = (*_fs)->open(prefix, "r", false);
     if ((bool)zipfile) {
@@ -413,7 +413,7 @@ FileImplPtr ZipReadFSImpl::open(const char* path, const char* mode, const bool c
       for (auto & entry : zip_archive.entries) {
         if (entry.file_name.equals(suffix)) {
           // found
-          AddLog(LOG_LEVEL_DEBUG, "ZIP: file '%s' in archive (start=%i - len=%i - last_mod=%i)", suffix, entry.file_start, entry.file_len, entry.last_mod);
+          // AddLog(LOG_LEVEL_DEBUG, "ZIP: file '%s' in archive (start=%i - len=%i - last_mod=%i)", suffix, entry.file_start, entry.file_len, entry.last_mod);
           return ZipItemImplPtr(new ZipItemImpl((*_fs)->open(prefix, "r", false), entry.file_start, entry.file_len, entry.last_mod));
         }
       }
diff --git a/lib/libesp32_div/NimBLE-Arduino/CHANGELOG.md b/lib/libesp32_div/NimBLE-Arduino/CHANGELOG.md
index 69bb956d7..b833a03dc 100644
--- a/lib/libesp32_div/NimBLE-Arduino/CHANGELOG.md
+++ b/lib/libesp32_div/NimBLE-Arduino/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 All notable changes to this project will be documented in this file.  
 
+## [1.3.3] - 2021-11-24
+
+### Fixed
+- Workaround added for FreeRTOS bug that affected timers, causing scan and advertising timer expirations to not correctly trigger callbacks.
+
+## [1.3.2] - 2021-11-20
+
+### Fixed
+- Added missing macros for scan filter.
+
+### Added
+- `NimBLEClient::getLastError` : Gets the error code of the last function call that produces a return code from the stack.
+
 ## [1.3.1] - 2021-08-04
 
 ### Fixed
diff --git a/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Client/NimBLE_Secure_Client.ino b/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Client/NimBLE_Secure_Client.ino
index 6f9af4f74..3a35ebeb2 100644
--- a/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Client/NimBLE_Secure_Client.ino
+++ b/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Client/NimBLE_Secure_Client.ino
@@ -1,91 +1,91 @@
-/** NimBLE_Secure_Client Demo:
- *  
- * This example demonstrates the secure passkey protected conenction and communication between an esp32 server and an esp32 client.
- * Please note that esp32 stores auth info in nvs memory. After a successful connection it is possible that a passkey change will be ineffective.
- * To avoid this clear the memory of the esp32's between security testings. esptool.py is capable of this, example: esptool.py --port /dev/ttyUSB0 erase_flash.
- *
- *  Created: on Jan 08 2021
- *      Author: mblasee
- */
- 
-#include <NimBLEDevice.h>
-
-class ClientCallbacks : public NimBLEClientCallbacks
-{
-  uint32_t onPassKeyRequest()
-  {
-    Serial.println("Client Passkey Request");
-    /** return the passkey to send to the server */
-    /** Change this to be different from NimBLE_Secure_Server if you want to test what happens on key mismatch */
-    return 123456;
-  };
-};
-static ClientCallbacks clientCB;
-
-void setup()
-{
-  Serial.begin(115200);
-  Serial.println("Starting NimBLE Client");
-
-  NimBLEDevice::init("");
-  NimBLEDevice::setPower(ESP_PWR_LVL_P9);
-  NimBLEDevice::setSecurityAuth(true, true, true);
-  NimBLEDevice::setSecurityIOCap(BLE_HS_IO_KEYBOARD_ONLY);
-  NimBLEScan *pScan = NimBLEDevice::getScan();
-  NimBLEScanResults results = pScan->start(5);
-
-  NimBLEUUID serviceUuid("ABCD");
-
-  for (int i = 0; i < results.getCount(); i++)
-  {
-    NimBLEAdvertisedDevice device = results.getDevice(i);
-    Serial.println(device.getName().c_str());
-
-    if (device.isAdvertisingService(serviceUuid))
-    {
-      NimBLEClient *pClient = NimBLEDevice::createClient();
-      pClient->setClientCallbacks(&clientCB, false);
-
-      if (pClient->connect(&device))
-      {
-        pClient->secureConnection();
-        NimBLERemoteService *pService = pClient->getService(serviceUuid);
-        if (pService != nullptr)
-        {
-          NimBLERemoteCharacteristic *pNonSecureCharacteristic = pService->getCharacteristic("1234");
-          
-          if (pNonSecureCharacteristic != nullptr)
-          {
-            // Testing to read a non secured characteristic, you should be able to read this even if you have mismatching passkeys.
-            std::string value = pNonSecureCharacteristic->readValue();
-            // print or do whatever you need with the value
-            Serial.println(value.c_str());
-          }
-
-          NimBLERemoteCharacteristic *pSecureCharacteristic = pService->getCharacteristic("1235");
-
-          if (pSecureCharacteristic != nullptr)
-          {
-            // Testing to read a secured characteristic, you should be able to read this only if you have matching passkeys, otherwise you should
-            // get an error like this. E NimBLERemoteCharacteristic: "<< readValue rc=261"
-            // This means you are trying to do something without the proper permissions. 
-            std::string value = pSecureCharacteristic->readValue();
-            // print or do whatever you need with the value
-            Serial.println(value.c_str());
-          }      
-        }
-      }
-      else
-      {
-        // failed to connect
-        Serial.println("failed to connect");
-      }
-
-      NimBLEDevice::deleteClient(pClient);
-    }
-  }
-}
-
-void loop()
-{
-}
+/** NimBLE_Secure_Client Demo:
+ *  
+ * This example demonstrates the secure passkey protected conenction and communication between an esp32 server and an esp32 client.
+ * Please note that esp32 stores auth info in nvs memory. After a successful connection it is possible that a passkey change will be ineffective.
+ * To avoid this clear the memory of the esp32's between security testings. esptool.py is capable of this, example: esptool.py --port /dev/ttyUSB0 erase_flash.
+ *
+ *  Created: on Jan 08 2021
+ *      Author: mblasee
+ */
+ 
+#include <NimBLEDevice.h>
+
+class ClientCallbacks : public NimBLEClientCallbacks
+{
+  uint32_t onPassKeyRequest()
+  {
+    Serial.println("Client Passkey Request");
+    /** return the passkey to send to the server */
+    /** Change this to be different from NimBLE_Secure_Server if you want to test what happens on key mismatch */
+    return 123456;
+  };
+};
+static ClientCallbacks clientCB;
+
+void setup()
+{
+  Serial.begin(115200);
+  Serial.println("Starting NimBLE Client");
+
+  NimBLEDevice::init("");
+  NimBLEDevice::setPower(ESP_PWR_LVL_P9);
+  NimBLEDevice::setSecurityAuth(true, true, true);
+  NimBLEDevice::setSecurityIOCap(BLE_HS_IO_KEYBOARD_ONLY);
+  NimBLEScan *pScan = NimBLEDevice::getScan();
+  NimBLEScanResults results = pScan->start(5);
+
+  NimBLEUUID serviceUuid("ABCD");
+
+  for (int i = 0; i < results.getCount(); i++)
+  {
+    NimBLEAdvertisedDevice device = results.getDevice(i);
+    Serial.println(device.getName().c_str());
+
+    if (device.isAdvertisingService(serviceUuid))
+    {
+      NimBLEClient *pClient = NimBLEDevice::createClient();
+      pClient->setClientCallbacks(&clientCB, false);
+
+      if (pClient->connect(&device))
+      {
+        pClient->secureConnection();
+        NimBLERemoteService *pService = pClient->getService(serviceUuid);
+        if (pService != nullptr)
+        {
+          NimBLERemoteCharacteristic *pNonSecureCharacteristic = pService->getCharacteristic("1234");
+          
+          if (pNonSecureCharacteristic != nullptr)
+          {
+            // Testing to read a non secured characteristic, you should be able to read this even if you have mismatching passkeys.
+            std::string value = pNonSecureCharacteristic->readValue();
+            // print or do whatever you need with the value
+            Serial.println(value.c_str());
+          }
+
+          NimBLERemoteCharacteristic *pSecureCharacteristic = pService->getCharacteristic("1235");
+
+          if (pSecureCharacteristic != nullptr)
+          {
+            // Testing to read a secured characteristic, you should be able to read this only if you have matching passkeys, otherwise you should
+            // get an error like this. E NimBLERemoteCharacteristic: "<< readValue rc=261"
+            // This means you are trying to do something without the proper permissions. 
+            std::string value = pSecureCharacteristic->readValue();
+            // print or do whatever you need with the value
+            Serial.println(value.c_str());
+          }      
+        }
+      }
+      else
+      {
+        // failed to connect
+        Serial.println("failed to connect");
+      }
+
+      NimBLEDevice::deleteClient(pClient);
+    }
+  }
+}
+
+void loop()
+{
+}
diff --git a/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Server/NimBLE_Secure_Server.ino b/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Server/NimBLE_Secure_Server.ino
index f63cbc162..4de731e9f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Server/NimBLE_Secure_Server.ino
+++ b/lib/libesp32_div/NimBLE-Arduino/examples/NimBLE_Secure_Server/NimBLE_Secure_Server.ino
@@ -1,37 +1,37 @@
-/** NimBLE_Secure_Server Demo:
- *  
- * This example demonstrates the secure passkey protected conenction and communication between an esp32 server and an esp32 client.
- * Please note that esp32 stores auth info in nvs memory. After a successful connection it is possible that a passkey change will be ineffective.
- * To avoid this clear the memory of the esp32's between security testings. esptool.py is capable of this, example: esptool.py --port /dev/ttyUSB0 erase_flash.
- *
- *  Created: on Jan 08 2021
- *      Author: mblasee
- */
-
-#include <NimBLEDevice.h>
-
-void setup() {
-  Serial.begin(115200);
-  Serial.println("Starting NimBLE Server");
-  NimBLEDevice::init("NimBLE");
-  NimBLEDevice::setPower(ESP_PWR_LVL_P9);
-
-  NimBLEDevice::setSecurityAuth(true, true, true);
-  NimBLEDevice::setSecurityPasskey(123456);
-  NimBLEDevice::setSecurityIOCap(BLE_HS_IO_DISPLAY_ONLY);
-  NimBLEServer *pServer = NimBLEDevice::createServer();
-  NimBLEService *pService = pServer->createService("ABCD");
-  NimBLECharacteristic *pNonSecureCharacteristic = pService->createCharacteristic("1234", NIMBLE_PROPERTY::READ );
-  NimBLECharacteristic *pSecureCharacteristic = pService->createCharacteristic("1235", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::READ_AUTHEN);
-
-  pService->start();
-  pNonSecureCharacteristic->setValue("Hello Non Secure BLE");
-  pSecureCharacteristic->setValue("Hello Secure BLE");
-
-  NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
-  pAdvertising->addServiceUUID("ABCD");
-  pAdvertising->start();
-}
-
-void loop() {
-}
+/** NimBLE_Secure_Server Demo:
+ *  
+ * This example demonstrates the secure passkey protected conenction and communication between an esp32 server and an esp32 client.
+ * Please note that esp32 stores auth info in nvs memory. After a successful connection it is possible that a passkey change will be ineffective.
+ * To avoid this clear the memory of the esp32's between security testings. esptool.py is capable of this, example: esptool.py --port /dev/ttyUSB0 erase_flash.
+ *
+ *  Created: on Jan 08 2021
+ *      Author: mblasee
+ */
+
+#include <NimBLEDevice.h>
+
+void setup() {
+  Serial.begin(115200);
+  Serial.println("Starting NimBLE Server");
+  NimBLEDevice::init("NimBLE");
+  NimBLEDevice::setPower(ESP_PWR_LVL_P9);
+
+  NimBLEDevice::setSecurityAuth(true, true, true);
+  NimBLEDevice::setSecurityPasskey(123456);
+  NimBLEDevice::setSecurityIOCap(BLE_HS_IO_DISPLAY_ONLY);
+  NimBLEServer *pServer = NimBLEDevice::createServer();
+  NimBLEService *pService = pServer->createService("ABCD");
+  NimBLECharacteristic *pNonSecureCharacteristic = pService->createCharacteristic("1234", NIMBLE_PROPERTY::READ );
+  NimBLECharacteristic *pSecureCharacteristic = pService->createCharacteristic("1235", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::READ_AUTHEN);
+
+  pService->start();
+  pNonSecureCharacteristic->setValue("Hello Non Secure BLE");
+  pSecureCharacteristic->setValue("Hello Secure BLE");
+
+  NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+  pAdvertising->addServiceUUID("ABCD");
+  pAdvertising->start();
+}
+
+void loop() {
+}
diff --git a/lib/libesp32_div/NimBLE-Arduino/library.json b/lib/libesp32_div/NimBLE-Arduino/library.json
index 29cff4dff..fd9dd44cf 100644
--- a/lib/libesp32_div/NimBLE-Arduino/library.json
+++ b/lib/libesp32_div/NimBLE-Arduino/library.json
@@ -2,7 +2,7 @@
     "name": "NimBLE-Arduino",
     "keywords": "esp32, bluetooth",
     "description": "Bluetooth low energy (BLE) library for arduino-esp32 based on NimBLE",
-    "version": "1.3.1",
+    "version": "1.3.3",
     "frameworks": "arduino",
     "platforms": "espressif32"
 }
diff --git a/lib/libesp32_div/NimBLE-Arduino/library.properties b/lib/libesp32_div/NimBLE-Arduino/library.properties
index b08519454..11abace65 100644
--- a/lib/libesp32_div/NimBLE-Arduino/library.properties
+++ b/lib/libesp32_div/NimBLE-Arduino/library.properties
@@ -1,5 +1,5 @@
 name=NimBLE-Arduino
-version=1.3.1
+version=1.3.3
 author=h2zero
 maintainer=h2zero <powellperalta@gmail.com>
 sentence=Bluetooth low energy (BLE) library for arduino-esp32 based on NimBLE.
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.cpp
index 80318b5b8..282eff55f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.cpp
@@ -16,11 +16,8 @@
  * See also:
  * https://www.bluetooth.com/specifications/gatt/viewer?attributeXmlFile=org.bluetooth.descriptor.gatt.characteristic_presentation_format.xml
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLE2904.h"
 
@@ -86,5 +83,4 @@ void NimBLE2904::setUnit(uint16_t unit) {
     setValue((uint8_t*) &m_data, sizeof(m_data));
 } // setUnit
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.h
index d8800dd2f..29dde51e8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLE2904.h
@@ -14,11 +14,8 @@
 
 #ifndef MAIN_NIMBLE2904_H_
 #define MAIN_NIMBLE2904_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEDescriptor.h"
 
@@ -82,6 +79,5 @@ private:
     BLE2904_Data m_data;
 }; // BLE2904
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
 #endif /* MAIN_NIMBLE2904_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.cpp
index e1d3e548b..b8df5ac83 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.cpp
@@ -11,7 +11,7 @@
  *  Created on: Jul 2, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include <algorithm>
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.h
index 50f9231fe..a6e10a09c 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAddress.h
@@ -14,10 +14,15 @@
 
 #ifndef COMPONENTS_NIMBLEADDRESS_H_
 #define COMPONENTS_NIMBLEADDRESS_H_
-#include "sdkconfig.h"
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "nimble/ble.h"
+#else
+#include "nimble/nimble/include/nimble/ble.h"
+#endif
+
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp
index ecfd49814..01dd75d41 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.cpp
@@ -11,11 +11,9 @@
  *  Created on: Jul 3, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEDevice.h"
 #include "NimBLEAdvertisedDevice.h"
@@ -783,7 +781,5 @@ size_t NimBLEAdvertisedDevice::getPayloadLength() {
     return m_payload.size();
 } // getPayloadLength
 
-
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED  && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h
index 7d378ed0f..39410e665 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertisedDevice.h
@@ -14,20 +14,22 @@
 
 #ifndef COMPONENTS_NIMBLEADVERTISEDDEVICE_H_
 #define COMPONENTS_NIMBLEADVERTISEDDEVICE_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEAddress.h"
 #include "NimBLEScan.h"
 #include "NimBLEUUID.h"
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_hs_adv.h"
+#else
+#include "nimble/nimble/host/include/host/ble_hs_adv.h"
+#endif
 
 #include <map>
 #include <vector>
+#include <time.h>
 
 
 class NimBLEScan;
@@ -171,6 +173,5 @@ public:
     virtual void onResult(NimBLEAdvertisedDevice* advertisedDevice) = 0;
 };
 
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_OBSERVER */
 #endif /* COMPONENTS_NIMBLEADVERTISEDDEVICE_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.cpp
index 3112efff0..a804130f8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.cpp
@@ -13,13 +13,14 @@
  *      Author: kolban
  *
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "services/gap/ble_svc_gap.h"
+#else
+#include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
+#endif
 #include "NimBLEAdvertising.h"
 #include "NimBLEDevice.h"
 #include "NimBLEServer.h"
@@ -68,6 +69,7 @@ void NimBLEAdvertising::reset() {
     m_advDataSet                     = false;
     // Set this to non-zero to prevent auto start if host reset before started by app.
     m_duration                       = BLE_HS_FOREVER;
+    m_advCompCB                      = nullptr;
 } // reset
 
 
@@ -653,12 +655,8 @@ bool NimBLEAdvertising::start(uint32_t duration, void (*advCompleteCB)(NimBLEAdv
             break;
     }
 
-    if(rc != 0) {
-        return false;
-    }
-
     NIMBLE_LOGD(LOG_TAG, "<< Advertising start");
-    return true;
+    return (rc == 0);
 } // start
 
 
@@ -1028,5 +1026,4 @@ std::string NimBLEAdvertisementData::getPayload() {
     return m_payload;
 } // getPayload
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.h
index 17a866561..63a21d846 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEAdvertising.h
@@ -14,13 +14,15 @@
 
 #ifndef MAIN_BLEADVERTISING_H_
 #define MAIN_BLEADVERTISING_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
+#else
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#endif
+
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
@@ -132,6 +134,5 @@ private:
     std::vector<uint8_t>    m_uri;
 };
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER */
 #endif /* MAIN_BLEADVERTISING_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEBeacon.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEBeacon.cpp
index 8c4574bc2..996893ab1 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEBeacon.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEBeacon.cpp
@@ -11,7 +11,7 @@
  *  Created on: Jan 4, 2018
  *      Author: kolban
  */
-#include "sdkconfig.h"
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include <string.h>
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.cpp
index f3965a4dc..cc87483b7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.cpp
@@ -9,11 +9,9 @@
  *  Created on: Jun 22, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLECharacteristic.h"
 #include "NimBLE2904.h"
@@ -51,7 +49,6 @@ NimBLECharacteristic::NimBLECharacteristic(const NimBLEUUID &uuid, uint16_t prop
     m_pCallbacks  = &defaultCallback;
     m_pService    = pService;
     m_value       = "";
-    m_valMux      = portMUX_INITIALIZER_UNLOCKED;
     m_timestamp   = 0;
     m_removed     = 0;
 } // NimBLECharacteristic
@@ -237,12 +234,12 @@ NimBLEUUID NimBLECharacteristic::getUUID() {
  * @return A std::string containing the current characteristic value.
  */
 std::string NimBLECharacteristic::getValue(time_t *timestamp) {
-    portENTER_CRITICAL(&m_valMux);
+    ble_npl_hw_enter_critical();
     std::string retVal = m_value;
     if(timestamp != nullptr) {
         *timestamp = m_timestamp;
     }
-    portEXIT_CRITICAL(&m_valMux);
+    ble_npl_hw_exit_critical(0);
 
     return retVal;
 } // getValue
@@ -253,10 +250,9 @@ std::string NimBLECharacteristic::getValue(time_t *timestamp) {
  * @return The length of the current characteristic data.
  */
 size_t NimBLECharacteristic::getDataLength() {
-    portENTER_CRITICAL(&m_valMux);
+    ble_npl_hw_enter_critical();
     size_t len = m_value.length();
-    portEXIT_CRITICAL(&m_valMux);
-
+    ble_npl_hw_exit_critical(0);
     return len;
 }
 
@@ -289,11 +285,10 @@ int NimBLECharacteristic::handleGapEvent(uint16_t conn_handle, uint16_t attr_han
                     pCharacteristic->m_pCallbacks->onRead(pCharacteristic, &desc);
                 }
 
-                portENTER_CRITICAL(&pCharacteristic->m_valMux);
+                ble_npl_hw_enter_critical();
                 rc = os_mbuf_append(ctxt->om, (uint8_t*)pCharacteristic->m_value.data(),
                                     pCharacteristic->m_value.length());
-                portEXIT_CRITICAL(&pCharacteristic->m_valMux);
-
+                ble_npl_hw_exit_critical(0);
                 return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
             }
 
@@ -432,7 +427,7 @@ void NimBLECharacteristic::notify(bool is_notification) {
     int rc = 0;
 
     for (auto &it : m_subscribedVec) {
-        uint16_t _mtu = getService()->getServer()->getPeerMTU(it.first);
+        uint16_t _mtu = getService()->getServer()->getPeerMTU(it.first) - 3;
 
         // check if connected and subscribed
         if(_mtu == 0 || it.second == 0) {
@@ -448,8 +443,8 @@ void NimBLECharacteristic::notify(bool is_notification) {
             }
         }
 
-        if (length > _mtu - 3) {
-            NIMBLE_LOGW(LOG_TAG, "- Truncating to %d bytes (maximum notify size)", _mtu - 3);
+        if (length > _mtu) {
+            NIMBLE_LOGW(LOG_TAG, "- Truncating to %d bytes (maximum notify size)", _mtu);
         }
 
         if(is_notification && (!(it.second & NIMBLE_SUB_NOTIFY))) {
@@ -528,10 +523,10 @@ void NimBLECharacteristic::setValue(const uint8_t* data, size_t length) {
     }
 
     time_t t = time(nullptr);
-    portENTER_CRITICAL(&m_valMux);
+    ble_npl_hw_enter_critical();
     m_value = std::string((char*)data, length);
     m_timestamp = t;
-    portEXIT_CRITICAL(&m_valMux);
+    ble_npl_hw_exit_critical(0);
 
     NIMBLE_LOGD(LOG_TAG, "<< setValue");
 } // setValue
@@ -641,6 +636,4 @@ void NimBLECharacteristicCallbacks::onSubscribe(NimBLECharacteristic* pCharacter
     NIMBLE_LOGD("NimBLECharacteristicCallbacks", "onSubscribe: default");
 }
 
-
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.h
index 6008d127f..9edfb54b3 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLECharacteristic.h
@@ -13,13 +13,15 @@
 
 #ifndef MAIN_NIMBLECHARACTERISTIC_H_
 #define MAIN_NIMBLECHARACTERISTIC_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_hs.h"
+#else
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#endif
+
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
@@ -151,7 +153,6 @@ private:
     NimBLEService*                 m_pService;
     std::string                    m_value;
     std::vector<NimBLEDescriptor*> m_dscVec;
-    portMUX_TYPE                   m_valMux;
     time_t                         m_timestamp;
     uint8_t                        m_removed;
 
@@ -195,6 +196,5 @@ public:
     virtual void onSubscribe(NimBLECharacteristic* pCharacteristic, ble_gap_conn_desc* desc, uint16_t subValue);
 };
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED  && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
 #endif /*MAIN_NIMBLECHARACTERISTIC_H_*/
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.cpp
index a171b8cc0..9f4e08fdb 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.cpp
@@ -11,11 +11,8 @@
  *      Author: kolban
  */
 
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLEClient.h"
 #include "NimBLEDevice.h"
@@ -24,8 +21,11 @@
 #include <string>
 #include <unordered_set>
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "nimble/nimble_port.h"
-
+#else
+#include "nimble/porting/nimble/include/nimble/nimble_port.h"
+#endif
 
 static const char* LOG_TAG = "NimBLEClient";
 static NimBLEClientCallbacks defaultCallbacks;
@@ -63,6 +63,7 @@ NimBLEClient::NimBLEClient(const NimBLEAddress &peerAddress) : m_peerAddress(pee
     m_deleteCallbacks  = false;
     m_pTaskData        = nullptr;
     m_connEstablished  = false;
+    m_lastErr          = 0;
 
     m_pConnParams.scan_itvl = 16;          // Scan interval in 0.625ms units (NimBLE Default)
     m_pConnParams.scan_window = 16;        // Scan window in 0.625ms units (NimBLE Default)
@@ -73,6 +74,7 @@ NimBLEClient::NimBLEClient(const NimBLEAddress &peerAddress) : m_peerAddress(pee
     m_pConnParams.min_ce_len = BLE_GAP_INITIAL_CONN_MIN_CE_LEN; // Minimum length of connection event in 0.625ms units
     m_pConnParams.max_ce_len = BLE_GAP_INITIAL_CONN_MAX_CE_LEN; // Maximum length of connection event in 0.625ms units
 
+    memset(&m_dcTimer, 0, sizeof(m_dcTimer));
     ble_npl_callout_init(&m_dcTimer, nimble_port_get_dflt_eventq(),
                          NimBLEClient::dcTimerCb, this);
 } // NimBLEClient
@@ -251,6 +253,8 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttibutes) {
 
     } while (rc == BLE_HS_EBUSY);
 
+    m_lastErr = rc;
+
     if(rc != 0) {
         m_pTaskData = nullptr;
         return false;
@@ -273,6 +277,7 @@ bool NimBLEClient::connect(const NimBLEAddress &address, bool deleteAttibutes) {
         return false;
 
     } else if(taskData.rc != 0){
+        m_lastErr = taskData.rc;
         NIMBLE_LOGE(LOG_TAG, "Connection failed; status=%d %s",
                     taskData.rc,
                     NimBLEUtils::returnCodeToString(taskData.rc));
@@ -314,6 +319,7 @@ bool NimBLEClient::secureConnection() {
 
         int rc = NimBLEDevice::startSecurity(m_conn_id);
         if(rc != 0){
+            m_lastErr = rc;
             m_pTaskData = nullptr;
             return false;
         }
@@ -322,6 +328,7 @@ bool NimBLEClient::secureConnection() {
     } while (taskData.rc == (BLE_HS_ERR_HCI_BASE + BLE_ERR_PINKEY_MISSING) && retryCount--);
 
     if(taskData.rc != 0){
+        m_lastErr = taskData.rc;
         return false;
     }
 
@@ -372,6 +379,7 @@ int NimBLEClient::disconnect(uint8_t reason) {
     }
 
     NIMBLE_LOGD(LOG_TAG, "<< disconnect()");
+    m_lastErr = rc;
     return rc;
 } // disconnect
 
@@ -436,6 +444,28 @@ void NimBLEClient::updateConnParams(uint16_t minInterval, uint16_t maxInterval,
 } // updateConnParams
 
 
+/**
+ * @brief Request an update of the data packet length.
+ * * Can only be used after a connection has been established.
+ * @details Sends a data length update request to the server the client is connected to.
+ * The Data Length Extension (DLE) allows to increase the Data Channel Payload from 27 bytes to up to 251 bytes.
+ * The server needs to support the Bluetooth 4.2 specifications, to be capable of DLE.
+ * @param [in] tx_octets The preferred number of payload octets to use (Range 0x001B-0x00FB).
+ */
+void NimBLEClient::setDataLen(uint16_t tx_octets) {
+#ifdef CONFIG_NIMBLE_CPP_IDF // not yet available in IDF, Sept 9 2021
+    return;
+#else
+    uint16_t tx_time = (tx_octets + 14) * 8;
+
+    int rc = ble_gap_set_data_len(m_conn_id, tx_octets, tx_time);
+    if(rc != 0) {
+        NIMBLE_LOGE(LOG_TAG, "Set data length error: %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
+    }
+#endif
+} // setDataLen
+
+
 /**
  * @brief Get detailed information about the current peer connection.
  */
@@ -512,6 +542,7 @@ int NimBLEClient::getRssi() {
     if(rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "Failed to read RSSI error code: %d, %s",
                                 rc, NimBLEUtils::returnCodeToString(rc));
+        m_lastErr = rc;
         return 0;
     }
 
@@ -650,11 +681,13 @@ bool NimBLEClient::retrieveServices(const NimBLEUUID *uuid_filter) {
 
     if (rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "ble_gattc_disc_all_svcs: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
+        m_lastErr = rc;
         return false;
     }
 
     // wait until we have all the services
     ulTaskNotifyTake(pdTRUE, portMAX_DELAY);
+    m_lastErr = taskData.rc;
 
     if(taskData.rc == 0){
         NIMBLE_LOGD(LOG_TAG, "<< retrieveServices");
@@ -925,11 +958,11 @@ uint16_t NimBLEClient::getMTU() {
                                 (*characteristic)->toString().c_str());
 
                     time_t t = time(nullptr);
-                    portENTER_CRITICAL(&(*characteristic)->m_valMux);
+                    ble_npl_hw_enter_critical();
                     (*characteristic)->m_value = std::string((char *)event->notify_rx.om->om_data,
                                                              event->notify_rx.om->om_len);
                     (*characteristic)->m_timestamp = t;
-                    portEXIT_CRITICAL(&(*characteristic)->m_valMux);
+                    ble_npl_hw_exit_critical(0);
 
                     if ((*characteristic)->m_notifyCallback != nullptr) {
                         NIMBLE_LOGD(LOG_TAG, "Invoking callback for notification on characteristic %s",
@@ -1136,6 +1169,15 @@ std::string NimBLEClient::toString() {
 } // toString
 
 
+/**
+ * @brief Get the last error code reported by the NimBLE host
+ * @return int, the NimBLE error code.
+ */
+int NimBLEClient::getLastError() {
+    return m_lastErr;
+} // getLastError
+
+
 void NimBLEClientCallbacks::onConnect(NimBLEClient* pClient) {
     NIMBLE_LOGD("NimBLEClientCallbacks", "onConnect: default");
 }
@@ -1170,5 +1212,4 @@ bool NimBLEClientCallbacks::onConfirmPIN(uint32_t pin){
     return true;
 }
 
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif // CONFIG_BT_ENABLED
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.h
index d90086c4a..37700b7c4 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEClient.h
@@ -14,11 +14,8 @@
 #ifndef MAIN_NIMBLECLIENT_H_
 #define MAIN_NIMBLECLIENT_H_
 
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLEAddress.h"
 #include "NimBLEUUID.h"
@@ -71,8 +68,10 @@ public:
                                                                     uint16_t scanInterval=16, uint16_t scanWindow=16);
     void                                        updateConnParams(uint16_t minInterval, uint16_t maxInterval,
                                                                  uint16_t latency, uint16_t timeout);
+    void                                        setDataLen(uint16_t tx_octets);
     void                                        discoverAttributes();
     NimBLEConnInfo                              getConnInfo();
+    int                                         getLastError();
 
 private:
     NimBLEClient(const NimBLEAddress &peerAddress);
@@ -90,6 +89,7 @@ private:
     bool                    retrieveServices(const NimBLEUUID *uuid_filter = nullptr);
 
     NimBLEAddress           m_peerAddress;
+    int                     m_lastErr;
     uint16_t                m_conn_id;
     bool                    m_connEstablished;
     bool                    m_deleteCallbacks;
@@ -158,6 +158,5 @@ public:
     virtual bool onConfirmPIN(uint32_t pin);
 };
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif // CONFIG_BT_ENABLED
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
 #endif /* MAIN_NIMBLECLIENT_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.cpp
index f94676607..5b0db1a64 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.cpp
@@ -11,11 +11,9 @@
  *  Created on: Jun 22, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEService.h"
 #include "NimBLEDescriptor.h"
@@ -51,7 +49,6 @@ NimBLEDescriptor::NimBLEDescriptor(NimBLEUUID uuid, uint16_t properties, uint16_
     m_pCharacteristic    = pCharacteristic;
     m_pCallbacks         = &defaultCallbacks;           // No initial callback.
     m_value.attr_value   = (uint8_t*) calloc(max_len,1);  // Allocate storage for the value.
-    m_valMux             = portMUX_INITIALIZER_UNLOCKED;
     m_properties         = 0;
     m_removed            = 0;
 
@@ -145,6 +142,9 @@ NimBLECharacteristic* NimBLEDescriptor::getCharacteristic() {
 
 int NimBLEDescriptor::handleGapEvent(uint16_t conn_handle, uint16_t attr_handle,
                                      struct ble_gatt_access_ctxt *ctxt, void *arg) {
+    (void)conn_handle;
+    (void)attr_handle;
+
     const ble_uuid_t *uuid;
     int rc;
     NimBLEDescriptor* pDescriptor = (NimBLEDescriptor*)arg;
@@ -161,9 +161,10 @@ int NimBLEDescriptor::handleGapEvent(uint16_t conn_handle, uint16_t attr_handle,
                 if(ctxt->om->om_pkthdr_len > 8) {
                     pDescriptor->m_pCallbacks->onRead(pDescriptor);
                 }
-                portENTER_CRITICAL(&pDescriptor->m_valMux);
+
+                ble_npl_hw_enter_critical();
                 rc = os_mbuf_append(ctxt->om, pDescriptor->getValue(), pDescriptor->getLength());
-                portEXIT_CRITICAL(&pDescriptor->m_valMux);
+                ble_npl_hw_exit_critical(0);
                 return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
             }
 
@@ -234,10 +235,12 @@ void NimBLEDescriptor::setValue(const uint8_t* data, size_t length) {
         NIMBLE_LOGE(LOG_TAG, "Size %d too large, must be no bigger than %d", length, m_value.attr_max_len);
         return;
     }
-    portENTER_CRITICAL(&m_valMux);
+
+    ble_npl_hw_enter_critical();
     m_value.attr_len = length;
     memcpy(m_value.attr_value, data, length);
-    portEXIT_CRITICAL(&m_valMux);
+    ble_npl_hw_exit_critical(0);
+
 } // setValue
 
 
@@ -277,6 +280,7 @@ NimBLEDescriptorCallbacks::~NimBLEDescriptorCallbacks() {}
  * @param [in] pDescriptor The descriptor that is the source of the event.
  */
 void NimBLEDescriptorCallbacks::onRead(NimBLEDescriptor* pDescriptor) {
+    (void)pDescriptor;
     NIMBLE_LOGD("NimBLEDescriptorCallbacks", "onRead: default");
 } // onRead
 
@@ -286,8 +290,8 @@ void NimBLEDescriptorCallbacks::onRead(NimBLEDescriptor* pDescriptor) {
  * @param [in] pDescriptor The descriptor that is the source of the event.
  */
 void NimBLEDescriptorCallbacks::onWrite(NimBLEDescriptor* pDescriptor) {
+    (void)pDescriptor;
     NIMBLE_LOGD("NimBLEDescriptorCallbacks", "onWrite: default");
 } // onWrite
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.h
index 5dc0ce89b..fe6c73303 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDescriptor.h
@@ -14,11 +14,9 @@
 
 #ifndef MAIN_NIMBLEDESCRIPTOR_H_
 #define MAIN_NIMBLEDESCRIPTOR_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLECharacteristic.h"
 #include "NimBLEUUID.h"
@@ -92,7 +90,6 @@ private:
     NimBLECharacteristic*      m_pCharacteristic;
     uint8_t                    m_properties;
     attr_value_t               m_value;
-    portMUX_TYPE               m_valMux;
     uint8_t                    m_removed;
 }; // NimBLEDescriptor
 
@@ -113,6 +110,5 @@ public:
 
 #include "NimBLE2904.h"
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
 #endif /* MAIN_NIMBLEDESCRIPTOR_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp
index bc253659a..0302cb8a8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.cpp
@@ -11,27 +11,45 @@
  *  Created on: Mar 16, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
+#if defined(CONFIG_BT_ENABLED)
+
 #include "NimBLEDevice.h"
 #include "NimBLEUtils.h"
 
-#include "esp_err.h"
-#include "esp_bt.h"
-#include "nvs_flash.h"
-#include "esp_nimble_hci.h"
-#include "nimble/nimble_port.h"
-#include "nimble/nimble_port_freertos.h"
-#include "host/ble_hs.h"
-#include "host/ble_hs_pvcy.h"
-#include "host/util/util.h"
-#include "services/gap/ble_svc_gap.h"
-#include "services/gatt/ble_svc_gatt.h"
+#ifdef ESP_PLATFORM
+#  include "esp_err.h"
+#  include "esp_bt.h"
+#  include "nvs_flash.h"
+#  if defined(CONFIG_NIMBLE_CPP_IDF)
+#    include "esp_nimble_hci.h"
+#    include "nimble/nimble_port.h"
+#    include "nimble/nimble_port_freertos.h"
+#    include "host/ble_hs.h"
+#    include "host/ble_hs_pvcy.h"
+#    include "host/util/util.h"
+#    include "services/gap/ble_svc_gap.h"
+#    include "services/gatt/ble_svc_gatt.h"
+#  else
+#    include "nimble/esp_port/esp-hci/include/esp_nimble_hci.h"
+#  endif
+#else
+#  include "nimble/nimble/controller/include/controller/ble_phy.h"
+#endif
 
-#ifdef CONFIG_ENABLE_ARDUINO_DEPENDS
-#include "esp32-hal-bt.h"
+#ifndef CONFIG_NIMBLE_CPP_IDF
+#  include "nimble/porting/nimble/include/nimble/nimble_port.h"
+#  include "nimble/porting/npl/freertos/include/nimble/nimble_port_freertos.h"
+#  include "nimble/nimble/host/include/host/ble_hs.h"
+#  include "nimble/nimble/host/include/host/ble_hs_pvcy.h"
+#  include "nimble/nimble/host/util/include/host/util/util.h"
+#  include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
+#  include "nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h"
+#endif
+
+#if defined(ESP_PLATFORM) && defined(CONFIG_ENABLE_ARDUINO_DEPENDS)
+#  include "esp32-hal-bt.h"
 #endif
 
 #include "NimBLELog.h"
@@ -63,9 +81,10 @@ std::list <NimBLEAddress>   NimBLEDevice::m_ignoreList;
 std::vector<NimBLEAddress>  NimBLEDevice::m_whiteList;
 NimBLESecurityCallbacks*    NimBLEDevice::m_securityCallbacks = nullptr;
 uint8_t                     NimBLEDevice::m_own_addr_type = BLE_OWN_ADDR_PUBLIC;
+#ifdef ESP_PLATFORM
 uint16_t                    NimBLEDevice::m_scanDuplicateSize = CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE;
 uint8_t                     NimBLEDevice::m_scanFilterMode = CONFIG_BTDM_SCAN_DUPL_TYPE;
-
+#endif
 
 /**
  * @brief Create a new instance of a server.
@@ -130,7 +149,8 @@ void NimBLEDevice::stopAdvertising() {
  * try and release/delete it.
  */
 #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
-/* STATIC */ NimBLEScan* NimBLEDevice::getScan() {
+/* STATIC */
+NimBLEScan* NimBLEDevice::getScan() {
     if (m_pScan == nullptr) {
         m_pScan = new NimBLEScan();
     }
@@ -147,7 +167,8 @@ void NimBLEDevice::stopAdvertising() {
  * @return A reference to the new client object.
  */
 #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-/* STATIC */ NimBLEClient* NimBLEDevice::createClient(NimBLEAddress peerAddress) {
+/* STATIC */
+NimBLEClient* NimBLEDevice::createClient(NimBLEAddress peerAddress) {
     if(m_cList.size() >= NIMBLE_MAX_CONNECTIONS) {
         NIMBLE_LOGW(LOG_TAG,"Number of clients exceeds Max connections. Cur=%d Max=%d",
                     m_cList.size(), NIMBLE_MAX_CONNECTIONS);
@@ -165,7 +186,8 @@ void NimBLEDevice::stopAdvertising() {
  * Checks if it is connected or trying to connect and disconnects/stops it first.
  * @param [in] pClient A pointer to the client object.
  */
-/* STATIC */ bool NimBLEDevice::deleteClient(NimBLEClient* pClient) {
+/* STATIC */
+bool NimBLEDevice::deleteClient(NimBLEClient* pClient) {
     if(pClient == nullptr) {
         return false;
     }
@@ -209,7 +231,8 @@ void NimBLEDevice::stopAdvertising() {
  * @brief Get the list of created client objects.
  * @return A pointer to the list of clients.
  */
-/* STATIC */std::list<NimBLEClient*>* NimBLEDevice::getClientList() {
+/* STATIC */
+std::list<NimBLEClient*>* NimBLEDevice::getClientList() {
     return &m_cList;
 } // getClientList
 
@@ -218,7 +241,8 @@ void NimBLEDevice::stopAdvertising() {
  * @brief Get the number of created client objects.
  * @return Number of client objects created.
  */
-/* STATIC */size_t NimBLEDevice::getClientListSize() {
+/* STATIC */
+size_t NimBLEDevice::getClientListSize() {
     return m_cList.size();
 } // getClientList
 
@@ -228,7 +252,8 @@ void NimBLEDevice::stopAdvertising() {
  * @param [in] conn_id The client connection ID to search for.
  * @return A pointer to the client object with the spcified connection ID.
  */
-/* STATIC */NimBLEClient* NimBLEDevice::getClientByID(uint16_t conn_id) {
+/* STATIC */
+NimBLEClient* NimBLEDevice::getClientByID(uint16_t conn_id) {
     for(auto it = m_cList.cbegin(); it != m_cList.cend(); ++it) {
         if((*it)->getConnId() == conn_id) {
             return (*it);
@@ -244,7 +269,8 @@ void NimBLEDevice::stopAdvertising() {
  * @param [in] peer_addr The address of the peer to search for.
  * @return A pointer to the client object with the peer address.
  */
-/* STATIC */NimBLEClient* NimBLEDevice::getClientByPeerAddress(const NimBLEAddress &peer_addr) {
+/* STATIC */
+NimBLEClient* NimBLEDevice::getClientByPeerAddress(const NimBLEAddress &peer_addr) {
     for(auto it = m_cList.cbegin(); it != m_cList.cend(); ++it) {
         if((*it)->getPeerAddress().equals(peer_addr)) {
             return (*it);
@@ -258,7 +284,8 @@ void NimBLEDevice::stopAdvertising() {
  * @brief Finds the first disconnected client in the list.
  * @return A pointer to the first client object that is not connected to a peer.
  */
-/* STATIC */NimBLEClient* NimBLEDevice::getDisconnectedClient() {
+/* STATIC */
+NimBLEClient* NimBLEDevice::getDisconnectedClient() {
     for(auto it = m_cList.cbegin(); it != m_cList.cend(); ++it) {
         if(!(*it)->isConnected()) {
             return (*it);
@@ -269,7 +296,7 @@ void NimBLEDevice::stopAdvertising() {
 
 #endif // #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
-
+#ifdef ESP_PLATFORM
 /**
  * @brief Set the transmission power.
  * @param [in] powerLevel The power level to set, can be one of:
@@ -295,12 +322,15 @@ void NimBLEDevice::stopAdvertising() {
  * *   ESP_BLE_PWR_TYPE_SCAN       = 10, For scan
  * *   ESP_BLE_PWR_TYPE_DEFAULT    = 11, For default, if not set other, it will use default value
  */
-/* STATIC */ void NimBLEDevice::setPower(esp_power_level_t powerLevel, esp_ble_power_type_t powerType) {
+/* STATIC */
+void NimBLEDevice::setPower(esp_power_level_t powerLevel, esp_ble_power_type_t powerType) {
     NIMBLE_LOGD(LOG_TAG, ">> setPower: %d (type: %d)", powerLevel, powerType);
+
     esp_err_t errRc = esp_ble_tx_power_set(powerType, powerLevel);
     if (errRc != ESP_OK) {
         NIMBLE_LOGE(LOG_TAG, "esp_ble_tx_power_set: rc=%d", errRc);
     }
+
     NIMBLE_LOGD(LOG_TAG, "<< setPower");
 } // setPower
 
@@ -322,9 +352,8 @@ void NimBLEDevice::stopAdvertising() {
  * *   ESP_BLE_PWR_TYPE_DEFAULT    = 11, For default, if not set other, it will use default value
  * @return the power level currently used by the type specified.
  */
-
-/* STATIC */ int NimBLEDevice::getPower(esp_ble_power_type_t powerType) {
-
+/* STATIC */
+int NimBLEDevice::getPower(esp_ble_power_type_t powerType) {
     switch(esp_ble_tx_power_get(powerType)) {
         case ESP_PWR_LVL_N12:
             return -12;
@@ -347,13 +376,25 @@ void NimBLEDevice::stopAdvertising() {
     }
 } // getPower
 
+#else
+
+void NimBLEDevice::setPower(int dbm) {
+    ble_phy_txpwr_set(dbm);
+}
+
+
+int NimBLEDevice::getPower() {
+    return ble_phy_txpwr_get();
+}
+#endif
 
 /**
  * @brief Get our device address.
  * @return A NimBLEAddress object of our public address if we have one,
  * if not then our current random address.
  */
-/* STATIC*/ NimBLEAddress NimBLEDevice::getAddress() {
+/* STATIC*/
+NimBLEAddress NimBLEDevice::getAddress() {
     ble_addr_t addr = {BLE_ADDR_PUBLIC, 0};
 
     if(BLE_HS_ENOADDR == ble_hs_id_copy_addr(BLE_ADDR_PUBLIC, addr.val, NULL)) {
@@ -370,7 +411,8 @@ void NimBLEDevice::stopAdvertising() {
  * @brief Return a string representation of the address of this device.
  * @return A string representation of this device address.
  */
-/* STATIC */ std::string NimBLEDevice::toString() {
+/* STATIC */
+std::string NimBLEDevice::toString() {
     return getAddress().toString();
 } // toString
 
@@ -380,7 +422,8 @@ void NimBLEDevice::stopAdvertising() {
  * @param [in] mtu Value to set local mtu:
  * * This should be larger than 23 and lower or equal to BLE_ATT_MTU_MAX = 527.
  */
-/* STATIC */int NimBLEDevice::setMTU(uint16_t mtu) {
+/* STATIC */
+int NimBLEDevice::setMTU(uint16_t mtu) {
     NIMBLE_LOGD(LOG_TAG, ">> setLocalMTU: %d", mtu);
 
     int rc =  ble_att_set_preferred_mtu(mtu);
@@ -398,11 +441,13 @@ void NimBLEDevice::stopAdvertising() {
  * @brief Get local MTU value set.
  * @return The current preferred MTU setting.
  */
-/* STATIC */uint16_t NimBLEDevice::getMTU() {
+/* STATIC */
+uint16_t NimBLEDevice::getMTU() {
     return ble_att_preferred_mtu();
 }
 
 
+#ifdef ESP_PLATFORM
 /**
  * @brief Set the duplicate filter cache size for filtering scanned devices.
  * @param [in] cacheSize The number of advertisements filtered before the cache is reset.\n
@@ -448,6 +493,7 @@ void NimBLEDevice::setScanFilterMode(uint8_t mode) {
 
     m_scanFilterMode = mode;
 }
+#endif
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) || defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 /**
@@ -470,7 +516,7 @@ int NimBLEDevice::getNumBonds() {
 /**
  * @brief Deletes all bonding information.
  */
- /*STATIC*/
+/*STATIC*/
 void NimBLEDevice::deleteAllBonds() {
     ble_store_clear();
 }
@@ -550,6 +596,7 @@ NimBLEAddress NimBLEDevice::getBondedAddress(int index) {
  * @param [in] address The address to check for in the whitelist.
  * @returns true if the address is in the whitelist.
  */
+/*STATIC*/
 bool NimBLEDevice::onWhiteList(const NimBLEAddress & address) {
     for (auto &it : m_whiteList) {
         if (it == address) {
@@ -566,6 +613,7 @@ bool NimBLEDevice::onWhiteList(const NimBLEAddress & address) {
  * @param [in] address The address to add to the whitelist.
  * @returns true if successful.
  */
+/*STATIC*/
 bool NimBLEDevice::whiteListAdd(const NimBLEAddress & address) {
     if (NimBLEDevice::onWhiteList(address)) {
         return true;
@@ -597,6 +645,7 @@ bool NimBLEDevice::whiteListAdd(const NimBLEAddress & address) {
  * @param [in] address The address to remove from the whitelist.
  * @returns true if successful.
  */
+/*STATIC*/
 bool NimBLEDevice::whiteListRemove(const NimBLEAddress & address) {
     if (!NimBLEDevice::onWhiteList(address)) {
         return true;
@@ -636,6 +685,7 @@ bool NimBLEDevice::whiteListRemove(const NimBLEAddress & address) {
  * @brief Gets the count of addresses in the whitelist.
  * @returns The number of addresses in the whitelist.
  */
+/*STATIC*/
 size_t NimBLEDevice::getWhiteListCount() {
     return m_whiteList.size();
 }
@@ -646,6 +696,7 @@ size_t NimBLEDevice::getWhiteListCount() {
  * @param [in] index The vector index to retrieve the address from.
  * @returns the NimBLEAddress at the whitelist index or nullptr if not found.
  */
+/*STATIC*/
 NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
     if (index > m_whiteList.size()) {
         NIMBLE_LOGE(LOG_TAG, "Invalid index; %u", index);
@@ -659,7 +710,8 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
  * @brief Host reset, we pass the message so we don't make calls until resynced.
  * @param [in] reason The reason code for the reset.
  */
-/* STATIC */  void NimBLEDevice::onReset(int reason)
+/* STATIC */
+void NimBLEDevice::onReset(int reason)
 {
     if(!m_synced) {
         return;
@@ -683,7 +735,8 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
 /**
  * @brief Host resynced with controller, all clear to make calls to the stack.
  */
-/* STATIC */ void NimBLEDevice::onSync(void)
+/* STATIC */
+void NimBLEDevice::onSync(void)
 {
     NIMBLE_LOGI(LOG_TAG, "NimBle host synced.");
     // This check is needed due to potentially being called multiple times in succession
@@ -696,6 +749,14 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
     int rc = ble_hs_util_ensure_addr(0);
     assert(rc == 0);
 
+#ifndef ESP_PLATFORM
+    rc = ble_hs_id_infer_auto(m_own_addr_type, &m_own_addr_type);
+    if (rc != 0) {
+        NIMBLE_LOGE(LOG_TAG, "error determining address type; rc=%d", rc);
+        return;
+    }
+#endif
+
     // Yield for houskeeping before returning to operations.
     // Occasionally triggers exception without.
     taskYIELD();
@@ -721,9 +782,11 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
 /**
  * @brief The main host task.
  */
-/* STATIC */ void NimBLEDevice::host_task(void *param)
+/* STATIC */
+void NimBLEDevice::host_task(void *param)
 {
     NIMBLE_LOGI(LOG_TAG, "BLE Host Task Started");
+
     /* This function will return only when nimble_port_stop() is executed */
     nimble_port_run();
 
@@ -735,9 +798,11 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
  * @brief Initialize the %BLE environment.
  * @param [in] deviceName The device name of the device.
  */
-/* STATIC */ void NimBLEDevice::init(const std::string &deviceName) {
+/* STATIC */
+void NimBLEDevice::init(const std::string &deviceName) {
     if(!initialized){
         int rc=0;
+#ifdef ESP_PLATFORM
         esp_err_t errRc = ESP_OK;
 
 #ifdef CONFIG_ENABLE_ARDUINO_DEPENDS
@@ -769,6 +834,7 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
         ESP_ERROR_CHECK(esp_bt_controller_init(&bt_cfg));
         ESP_ERROR_CHECK(esp_bt_controller_enable(ESP_BT_MODE_BLE));
         ESP_ERROR_CHECK(esp_nimble_hci_init());
+#endif
         nimble_port_init();
 
         // Setup callbacks for host events
@@ -793,9 +859,10 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
 
         nimble_port_freertos_init(NimBLEDevice::host_task);
     }
+
     // Wait for host and controller to sync before returning and accepting new tasks
     while(!m_synced){
-        vTaskDelay(1 / portTICK_PERIOD_MS);
+        taskYIELD();
     }
 
     initialized = true; // Set the initialization flag to ensure we are only initialized once.
@@ -807,16 +874,17 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
  * @param [in] clearAll If true, deletes all server/advertising/scan/client objects after deinitializing.
  * @note If clearAll is true when called, any references to the created objects become invalid.
  */
-/* STATIC */ void NimBLEDevice::deinit(bool clearAll) {
+/* STATIC */
+void NimBLEDevice::deinit(bool clearAll) {
     int ret = nimble_port_stop();
     if (ret == 0) {
         nimble_port_deinit();
-
+#ifdef ESP_PLATFORM
         ret = esp_nimble_hci_and_controller_deinit();
         if (ret != ESP_OK) {
             NIMBLE_LOGE(LOG_TAG, "esp_nimble_hci_and_controller_deinit() failed with error: %d", ret);
         }
-
+#endif
         initialized = false;
         m_synced = false;
 
@@ -863,6 +931,7 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
  * @brief Check if the initialization is complete.
  * @return true if initialized.
  */
+/*STATIC*/
 bool NimBLEDevice::getInitialized() {
     return initialized;
 } // getInitialized
@@ -874,7 +943,8 @@ bool NimBLEDevice::getInitialized() {
  * @param mitm If true we are capable of man in the middle protection, false if not.
  * @param sc If true we will perform secure connection pairing, false we will use legacy pairing.
  */
-/*STATIC*/ void NimBLEDevice::setSecurityAuth(bool bonding, bool mitm, bool sc) {
+/*STATIC*/
+void NimBLEDevice::setSecurityAuth(bool bonding, bool mitm, bool sc) {
     NIMBLE_LOGD(LOG_TAG, "Setting bonding: %d, mitm: %d, sc: %d",bonding,mitm,sc);
     ble_hs_cfg.sm_bonding = bonding;
     ble_hs_cfg.sm_mitm = mitm;
@@ -891,7 +961,8 @@ bool NimBLEDevice::getInitialized() {
  * * 0x08 BLE_SM_PAIR_AUTHREQ_SC
  * * 0x10 BLE_SM_PAIR_AUTHREQ_KEYPRESS  - not yet supported.
  */
-/*STATIC*/void NimBLEDevice::setSecurityAuth(uint8_t auth_req) {
+/*STATIC*/
+void NimBLEDevice::setSecurityAuth(uint8_t auth_req) {
     NimBLEDevice::setSecurityAuth((auth_req & BLE_SM_PAIR_AUTHREQ_BOND)>0,
                                 (auth_req & BLE_SM_PAIR_AUTHREQ_MITM)>0,
                                 (auth_req & BLE_SM_PAIR_AUTHREQ_SC)>0);
@@ -907,7 +978,8 @@ bool NimBLEDevice::getInitialized() {
  * * 0x03 BLE_HS_IO_NO_INPUT_OUTPUT      NoInputNoOutput IO capability
  * * 0x04 BLE_HS_IO_KEYBOARD_DISPLAY     KeyboardDisplay Only IO capability
  */
-/*STATIC*/ void NimBLEDevice::setSecurityIOCap(uint8_t iocap) {
+/*STATIC*/
+void NimBLEDevice::setSecurityIOCap(uint8_t iocap) {
     ble_hs_cfg.sm_io_cap = iocap;
 } // setSecurityIOCap
 
@@ -921,7 +993,8 @@ bool NimBLEDevice::getInitialized() {
  * * 0x04: BLE_SM_PAIR_KEY_DIST_SIGN
  * * 0x08: BLE_SM_PAIR_KEY_DIST_LINK
  */
-/*STATIC*/void NimBLEDevice::setSecurityInitKey(uint8_t init_key) {
+/*STATIC*/
+void NimBLEDevice::setSecurityInitKey(uint8_t init_key) {
     ble_hs_cfg.sm_our_key_dist = init_key;
 } // setsSecurityInitKey
 
@@ -935,7 +1008,8 @@ bool NimBLEDevice::getInitialized() {
  * * 0x04: BLE_SM_PAIR_KEY_DIST_SIGN
  * * 0x08: BLE_SM_PAIR_KEY_DIST_LINK
  */
-/*STATIC*/void NimBLEDevice::setSecurityRespKey(uint8_t resp_key) {
+/*STATIC*/
+void NimBLEDevice::setSecurityRespKey(uint8_t resp_key) {
     ble_hs_cfg.sm_their_key_dist = resp_key;
 } // setsSecurityRespKey
 
@@ -944,7 +1018,8 @@ bool NimBLEDevice::getInitialized() {
  * @brief Set the passkey the server will ask for when pairing.
  * @param [in] pin The passkey to use.
  */
-/*STATIC*/void NimBLEDevice::setSecurityPasskey(uint32_t pin) {
+/*STATIC*/
+void NimBLEDevice::setSecurityPasskey(uint32_t pin) {
     m_passkey = pin;
 } // setSecurityPasskey
 
@@ -953,7 +1028,8 @@ bool NimBLEDevice::getInitialized() {
  * @brief Get the current passkey used for pairing.
  * @return The current passkey.
  */
-/*STATIC*/uint32_t NimBLEDevice::getSecurityPasskey() {
+/*STATIC*/
+uint32_t NimBLEDevice::getSecurityPasskey() {
     return m_passkey;
 } // getSecurityPasskey
 
@@ -963,11 +1039,13 @@ bool NimBLEDevice::getInitialized() {
  * @param [in] callbacks Pointer to NimBLESecurityCallbacks class
  * @deprecated For backward compatibility, New code should use client/server callback methods.
  */
+/*STATIC*/
 void NimBLEDevice::setSecurityCallbacks(NimBLESecurityCallbacks* callbacks) {
     NimBLEDevice::m_securityCallbacks = callbacks;
 } // setSecurityCallbacks
 
 
+#ifdef ESP_PLATFORM
 /**
  * @brief Set the own address type.
  * @param [in] own_addr_type Own Bluetooth Device address type.\n
@@ -978,6 +1056,7 @@ void NimBLEDevice::setSecurityCallbacks(NimBLESecurityCallbacks* callbacks) {
  * * 0x03: BLE_OWN_ADDR_RPA_RANDOM_DEFAULT
  * @param [in] useNRPA If true, and address type is random, uses a non-resolvable random address.
  */
+/*STATIC*/
 void NimBLEDevice::setOwnAddrType(uint8_t own_addr_type, bool useNRPA) {
     m_own_addr_type = own_addr_type;
     switch (own_addr_type) {
@@ -1001,18 +1080,15 @@ void NimBLEDevice::setOwnAddrType(uint8_t own_addr_type, bool useNRPA) {
             break;
     }
 } // setOwnAddrType
-
+#endif
 
 /**
  * @brief Start the connection securing and authorization for this connection.
  * @param conn_id The connection id of the peer device.
  * @returns NimBLE stack return code, 0 = success.
  */
-/* STATIC */int NimBLEDevice::startSecurity(uint16_t conn_id) {
-  /*  if(m_securityCallbacks != nullptr) {
-        m_securityCallbacks->onSecurityRequest();
-    }
-  */
+/* STATIC */
+int NimBLEDevice::startSecurity(uint16_t conn_id) {
     int rc = ble_gap_security_initiate(conn_id);
     if(rc != 0){
         NIMBLE_LOGE(LOG_TAG, "ble_gap_security_initiate: rc=%d %s", rc, NimBLEUtils::returnCodeToString(rc));
@@ -1027,7 +1103,8 @@ void NimBLEDevice::setOwnAddrType(uint8_t own_addr_type, bool useNRPA) {
  * @param [in] address The address to look for.
  * @return True if ignoring.
  */
-/*STATIC*/ bool NimBLEDevice::isIgnored(const NimBLEAddress &address) {
+/*STATIC*/
+bool NimBLEDevice::isIgnored(const NimBLEAddress &address) {
     for(auto &it : m_ignoreList) {
         if(it.equals(address)){
             return true;
@@ -1042,7 +1119,8 @@ void NimBLEDevice::setOwnAddrType(uint8_t own_addr_type, bool useNRPA) {
  * @brief Add a device to the ignore list.
  * @param [in] address The address of the device we want to ignore.
  */
-/*STATIC*/ void NimBLEDevice::addIgnored(const NimBLEAddress &address) {
+/*STATIC*/
+void NimBLEDevice::addIgnored(const NimBLEAddress &address) {
     m_ignoreList.push_back(address);
 }
 
@@ -1051,7 +1129,8 @@ void NimBLEDevice::setOwnAddrType(uint8_t own_addr_type, bool useNRPA) {
  * @brief Remove a device from the ignore list.
  * @param [in] address The address of the device we want to remove from the list.
  */
-/*STATIC*/void  NimBLEDevice::removeIgnored(const NimBLEAddress &address) {
+/*STATIC*/
+void  NimBLEDevice::removeIgnored(const NimBLEAddress &address) {
     for(auto it = m_ignoreList.begin(); it != m_ignoreList.end(); ++it) {
         if((*it).equals(address)){
             m_ignoreList.erase(it);
@@ -1065,6 +1144,7 @@ void NimBLEDevice::setOwnAddrType(uint8_t own_addr_type, bool useNRPA) {
  * @brief Set a custom callback for gap events.
  * @param [in] handler The function to call when gap events occur.
  */
+/*STATIC*/
 void NimBLEDevice::setCustomGapHandler(gap_event_handler handler) {
     m_customGapHandler = handler;
     int rc = ble_gap_event_listener_register(&m_listener, m_customGapHandler, NULL);
@@ -1076,5 +1156,4 @@ void NimBLEDevice::setCustomGapHandler(gap_event_handler handler) {
     }
 } // setCustomGapHandler
 
-
 #endif // CONFIG_BT_ENABLED
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.h
index 08a042fc2..94ad29478 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEDevice.h
@@ -14,10 +14,9 @@
 
 #ifndef MAIN_NIMBLEDEVICE_H_
 #define MAIN_NIMBLEDEVICE_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
+#if defined(CONFIG_BT_ENABLED)
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 #include "NimBLEScan.h"
@@ -39,7 +38,9 @@
 #include "NimBLESecurity.h"
 #include "NimBLEAddress.h"
 
-#include "esp_bt.h"
+#ifdef ESP_PLATFORM
+#  include "esp_bt.h"
+#endif
 
 #include <map>
 #include <string>
@@ -110,8 +111,17 @@ public:
     static NimBLEServer*    getServer();
 #endif
 
+#ifdef ESP_PLATFORM
     static void             setPower(esp_power_level_t powerLevel, esp_ble_power_type_t powerType=ESP_BLE_PWR_TYPE_DEFAULT);
     static int              getPower(esp_ble_power_type_t powerType=ESP_BLE_PWR_TYPE_DEFAULT);
+    static void             setOwnAddrType(uint8_t own_addr_type, bool useNRPA=false);
+    static void             setScanDuplicateCacheSize(uint16_t cacheSize);
+    static void             setScanFilterMode(uint8_t type);
+#else
+    static void             setPower(int dbm);
+    static int              getPower();
+#endif
+
     static void             setCustomGapHandler(gap_event_handler handler);
     static void             setSecurityAuth(bool bonding, bool mitm, bool sc);
     static void             setSecurityAuth(uint8_t auth_req);
@@ -121,15 +131,12 @@ public:
     static void             setSecurityPasskey(uint32_t pin);
     static uint32_t         getSecurityPasskey();
     static void             setSecurityCallbacks(NimBLESecurityCallbacks* pCallbacks);
-    static void             setOwnAddrType(uint8_t own_addr_type, bool useNRPA=false);
     static int              startSecurity(uint16_t conn_id);
     static int              setMTU(uint16_t mtu);
     static uint16_t         getMTU();
     static bool             isIgnored(const NimBLEAddress &address);
     static void             addIgnored(const NimBLEAddress &address);
     static void             removeIgnored(const NimBLEAddress &address);
-    static void             setScanDuplicateCacheSize(uint16_t cacheSize);
-    static void             setScanFilterMode(uint8_t type);
 
 #if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
     static NimBLEAdvertising* getAdvertising();
@@ -199,8 +206,10 @@ private:
     static ble_gap_event_listener     m_listener;
     static gap_event_handler          m_customGapHandler;
     static uint8_t                    m_own_addr_type;
+#ifdef ESP_PLATFORM
     static uint16_t                   m_scanDuplicateSize;
     static uint8_t                    m_scanFilterMode;
+#endif
     static std::vector<NimBLEAddress> m_whiteList;
 };
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp
index a07294265..255131c02 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.cpp
@@ -11,12 +11,14 @@
  *  Created on: Mar 12, 2018
  *      Author: pcbreflux
  */
-#include "sdkconfig.h"
+
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "NimBLEEddystoneTLM.h"
 #include "NimBLELog.h"
 
+#include <stdio.h>
 #include <cstring>
 
 #define ENDIAN_CHANGE_U16(x) ((((x)&0xFF00)>>8) + (((x)&0xFF)<<8))
@@ -124,30 +126,30 @@ std::string NimBLEEddystoneTLM::toString() {
   out += " C\n";
 
   out += "Adv. Count ";
-  snprintf(val, sizeof(val), "%d", ENDIAN_CHANGE_U32(m_eddystoneData.advCount));
+  snprintf(val, sizeof(val), "%" PRIu32, ENDIAN_CHANGE_U32(m_eddystoneData.advCount));
   out += val;
   out += "\n";
 
   out += "Time in seconds ";
-  snprintf(val, sizeof(val), "%d", rawsec/10);
+  snprintf(val, sizeof(val), "%" PRIu32, rawsec/10);
   out += val;
   out += "\n";
 
   out += "Time ";
 
-  snprintf(val, sizeof(val), "%04d", rawsec / 864000);
+  snprintf(val, sizeof(val), "%04" PRIu32, rawsec / 864000);
   out += val;
   out += ".";
 
-  snprintf(val, sizeof(val), "%02d", (rawsec / 36000) % 24);
+  snprintf(val, sizeof(val), "%02" PRIu32, (rawsec / 36000) % 24);
   out += val;
   out += ":";
 
-  snprintf(val, sizeof(val), "%02d", (rawsec / 600) % 60);
+  snprintf(val, sizeof(val), "%02" PRIu32, (rawsec / 600) % 60);
   out += val;
   out += ":";
 
-  snprintf(val, sizeof(val), "%02d", (rawsec / 10) % 60);
+  snprintf(val, sizeof(val), "%02" PRIu32, (rawsec / 10) % 60);
   out += val;
   out += "\n";
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.h
index eb1cb0721..265c81b45 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneTLM.h
@@ -14,6 +14,7 @@
 
 #ifndef _NimBLEEddystoneTLM_H_
 #define _NimBLEEddystoneTLM_H_
+
 #include "NimBLEUUID.h"
 
 #include <string>
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp
index 7c3194c28..424df958e 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEEddystoneURL.cpp
@@ -11,7 +11,7 @@
  *  Created on: Mar 12, 2018
  *      Author: pcbreflux
  */
-#include "sdkconfig.h"
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "NimBLEEddystoneURL.h"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.cpp
index 37d0f52f5..78c8fea3c 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.cpp
@@ -11,11 +11,9 @@
  *  Created on: Jan 03, 2018
  *      Author: chegewara
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEHIDDevice.h"
 #include "NimBLE2904.h"
@@ -29,7 +27,7 @@ NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer* server) {
 	 * Here we create mandatory services described in bluetooth specification
 	 */
 	m_deviceInfoService = server->createService(NimBLEUUID((uint16_t) 0x180a));
-	m_hidService = server->createService(NimBLEUUID((uint16_t) 0x1812), 40);
+	m_hidService = server->createService(NimBLEUUID((uint16_t) 0x1812));
 	m_batteryService = server->createService(NimBLEUUID((uint16_t) 0x180f));
 
 	/*
@@ -247,5 +245,4 @@ NimBLEService* NimBLEHIDDevice::batteryService() {
 	return m_batteryService;
 }
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif // #if defined(CONFIG_BT_ENABLED)
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.h
index 6ed7c2bde..ef2ed7395 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEHIDDevice.h
@@ -15,11 +15,8 @@
 #ifndef _BLEHIDDEVICE_H_
 #define _BLEHIDDEVICE_H_
 
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_BROADCASTER)
 
 #include "NimBLECharacteristic.h"
 #include "NimBLEService.h"
@@ -84,6 +81,6 @@ private:
 	NimBLECharacteristic* 	m_protocolModeCharacteristic;	//0x2a4e
 	NimBLECharacteristic*	m_batteryLevelCharacteristic;	//0x2a19
 };
-#endif // CONFIG_BT_NIMBLE_ROLE_BROADCASTER
-#endif // CONFIG_BT_ENABLED
+
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_BROADCASTER */
 #endif /* _BLEHIDDEVICE_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLELog.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLELog.h
index 8c1314634..0cedca940 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLELog.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLELog.h
@@ -8,49 +8,11 @@
 #ifndef MAIN_NIMBLELOG_H_
 #define MAIN_NIMBLELOG_H_
 
-#include "sdkconfig.h"
+#include "nimconfig.h"
 
 #if defined(CONFIG_BT_ENABLED)
 
-#ifdef ARDUINO_ARCH_ESP32
-#include "syscfg/syscfg.h"
-#include "modlog/modlog.h"
-
-// If Arduino is being used, strip out the colors and ignore log printing below ui setting.
-// Note: because CONFIG_LOG_DEFAULT_LEVEL is set at ERROR in Arduino we must use MODLOG_DFLT(ERROR
-// otherwise no messages will be printed above that level.
-
-#ifndef CORE_DEBUG_LEVEL
-#define CORE_DEBUG_LEVEL CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL
-#endif
-
-#if CORE_DEBUG_LEVEL >= 4
-#define NIMBLE_LOGD( tag, format, ... ) MODLOG_DFLT(ERROR,      "D %s: "#format"\n",tag,##__VA_ARGS__)
-#else
-#define NIMBLE_LOGD( tag, format, ... ) (void)tag
-#endif
-
-#if CORE_DEBUG_LEVEL >= 3
-#define NIMBLE_LOGI( tag, format, ... ) MODLOG_DFLT(ERROR,      "I %s: "#format"\n",tag,##__VA_ARGS__)
-#else
-#define NIMBLE_LOGI( tag, format, ... ) (void)tag
-#endif
-
-#if CORE_DEBUG_LEVEL >= 2
-#define NIMBLE_LOGW( tag, format, ... ) MODLOG_DFLT(ERROR,      "W %s: "#format"\n",tag,##__VA_ARGS__)
-#else
-#define NIMBLE_LOGW( tag, format, ... ) (void)tag
-#endif
-
-#if CORE_DEBUG_LEVEL >= 1
-#define NIMBLE_LOGE( tag, format, ... ) MODLOG_DFLT(ERROR,      "E %s: "#format"\n",tag,##__VA_ARGS__)
-#else
-#define NIMBLE_LOGE( tag, format, ... ) (void)tag
-#endif
-
-#define NIMBLE_LOGC( tag, format, ... ) MODLOG_DFLT(CRITICAL,   "CRIT %s: "#format"\n",tag,##__VA_ARGS__)
-
-#else
+#if defined(CONFIG_NIMBLE_CPP_IDF) // using esp-idf
 
 #include "esp_log.h"
 
@@ -60,7 +22,51 @@
 #define NIMBLE_LOGD(tag, format, ...) ESP_LOGD(tag, format, ##__VA_ARGS__)
 #define NIMBLE_LOGC(tag, format, ...) ESP_LOGE(tag, format, ##__VA_ARGS__)
 
-#endif /*ARDUINO_ARCH_ESP32*/
+#else // using Arduino
 
-#endif /*CONFIG_BT_ENABLED*/
-#endif /*MAIN_NIMBLELOG_H_*/
\ No newline at end of file
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/console/console.h"
+
+// If Arduino is being used, strip out the colors and ignore log printing below ui setting.
+// Note: because CONFIG_LOG_DEFAULT_LEVEL is set at ERROR in Arduino we must use MODLOG_DFLT(ERROR
+// otherwise no messages will be printed above that level.
+
+#ifndef NIMBLE_CPP_DEBUG_LEVEL
+  #if defined(ARDUINO_ARCH_ESP32) && defined(CORE_DEBUG_LEVEL)
+    #define NIMBLE_CPP_DEBUG_LEVEL CORE_DEBUG_LEVEL
+  #else
+    #define NIMBLE_CPP_DEBUG_LEVEL 0
+  #endif
+#endif
+
+#if NIMBLE_CPP_DEBUG_LEVEL >= 4
+#define NIMBLE_LOGD( tag, format, ... ) console_printf("D %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGD( tag, format, ... ) (void)tag
+#endif
+
+#if NIMBLE_CPP_DEBUG_LEVEL >= 3
+#define NIMBLE_LOGI( tag, format, ... ) console_printf("I %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGI( tag, format, ... ) (void)tag
+#endif
+
+#if NIMBLE_CPP_DEBUG_LEVEL >= 2
+#define NIMBLE_LOGW( tag, format, ... ) console_printf("W %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGW( tag, format, ... ) (void)tag
+#endif
+
+#if NIMBLE_CPP_DEBUG_LEVEL >= 1
+#define NIMBLE_LOGE( tag, format, ... ) console_printf("E %s: "#format"\n",tag,##__VA_ARGS__)
+#define NIMBLE_LOGC( tag, format, ... ) console_printf("CRIT %s: "#format"\n",tag,##__VA_ARGS__)
+#else
+#define NIMBLE_LOGE( tag, format, ... ) (void)tag
+#define NIMBLE_LOGC( tag, format, ... ) (void)tag
+#endif
+
+
+
+#endif /* CONFIG_NIMBLE_CPP_IDF */
+#endif /* CONFIG_BT_ENABLED */
+#endif /* MAIN_NIMBLELOG_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp
index 85c854971..de5040672 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.cpp
@@ -12,11 +12,8 @@
  *      Author: kolban
  */
 
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteCharacteristic.h"
 #include "NimBLEUtils.h"
@@ -60,7 +57,6 @@ static const char* LOG_TAG = "NimBLERemoteCharacteristic";
     m_pRemoteService     = pRemoteService;
     m_notifyCallback     = nullptr;
     m_timestamp          = 0;
-    m_valMux             = portMUX_INITIALIZER_UNLOCKED;
 
     NIMBLE_LOGD(LOG_TAG, "<< NimBLERemoteCharacteristic(): %s", m_uuid.toString().c_str());
  } // NimBLERemoteCharacteristic
@@ -408,12 +404,12 @@ NimBLEUUID NimBLERemoteCharacteristic::getUUID() {
  * @return The value of the remote characteristic.
  */
 std::string NimBLERemoteCharacteristic::getValue(time_t *timestamp) {
-    portENTER_CRITICAL(&m_valMux);
+    ble_npl_hw_enter_critical();
     std::string value = m_value;
     if(timestamp != nullptr) {
         *timestamp = m_timestamp;
     }
-    portEXIT_CRITICAL(&m_valMux);
+    ble_npl_hw_exit_critical(0);
 
     return value;
 }
@@ -515,13 +511,13 @@ std::string NimBLERemoteCharacteristic::readValue(time_t *timestamp) {
     } while(rc != 0 && retryCount--);
 
     time_t t = time(nullptr);
-    portENTER_CRITICAL(&m_valMux);
+    ble_npl_hw_enter_critical();
     m_value = value;
     m_timestamp = t;
     if(timestamp != nullptr) {
         *timestamp = m_timestamp;
     }
-    portEXIT_CRITICAL(&m_valMux);
+    ble_npl_hw_exit_critical(0);
 
     NIMBLE_LOGD(LOG_TAG, "<< readValue length: %d rc=%d", value.length(), rc);
     return value;
@@ -819,6 +815,4 @@ int NimBLERemoteCharacteristic::onWriteCB(uint16_t conn_handle,
     return 0;
 }
 
-
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h
index 39e6d40fa..41ae816d4 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteCharacteristic.h
@@ -14,11 +14,9 @@
 
 #ifndef COMPONENTS_NIMBLEREMOTECHARACTERISTIC_H_
 #define COMPONENTS_NIMBLEREMOTECHARACTERISTIC_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteService.h"
 #include "NimBLERemoteDescriptor.h"
@@ -161,12 +159,10 @@ private:
     std::string             m_value;
     notify_callback         m_notifyCallback;
     time_t                  m_timestamp;
-    portMUX_TYPE            m_valMux;
 
     // We maintain a vector of descriptors owned by this characteristic.
     std::vector<NimBLERemoteDescriptor*> m_descriptorVector;
 }; // NimBLERemoteCharacteristic
 
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
 #endif /* COMPONENTS_NIMBLEREMOTECHARACTERISTIC_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp
index fc0f06b67..44b559000 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.cpp
@@ -11,11 +11,9 @@
  *  Created on: Jul 8, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteDescriptor.h"
 #include "NimBLEUtils.h"
@@ -188,6 +186,7 @@ int NimBLERemoteDescriptor::onReadCB(uint16_t conn_handle,
                 const struct ble_gatt_error *error,
                 struct ble_gatt_attr *attr, void *arg)
 {
+    (void)attr;
     ble_task_data_t *pTaskData = (ble_task_data_t*)arg;
     NimBLERemoteDescriptor* desc = (NimBLERemoteDescriptor*)pTaskData->pATT;
     uint16_t conn_id = desc->getRemoteCharacteristic()->getRemoteService()->getClient()->getConnId();
@@ -350,5 +349,4 @@ bool NimBLERemoteDescriptor::writeValue(const std::string &newValue, bool respon
     return writeValue((uint8_t*) newValue.data(), newValue.length(), response);
 } // writeValue
 
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.h
index b52738ef7..13e83516d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteDescriptor.h
@@ -14,11 +14,9 @@
 
 #ifndef COMPONENTS_NIMBLEREMOTEDESCRIPTOR_H_
 #define COMPONENTS_NIMBLEREMOTEDESCRIPTOR_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteCharacteristic.h"
 
@@ -81,6 +79,5 @@ private:
     NimBLERemoteCharacteristic* m_pRemoteCharacteristic;
 };
 
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
 #endif /* COMPONENTS_NIMBLEREMOTEDESCRIPTOR_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.cpp
index efb6662a8..b8ae4fce5 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.cpp
@@ -11,11 +11,9 @@
  *  Created on: Jul 8, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLERemoteService.h"
 #include "NimBLEUtils.h"
@@ -386,6 +384,4 @@ std::string NimBLERemoteService::toString() {
     return res;
 } // toString
 
-
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.h
index 751c9effb..0443cfd99 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLERemoteService.h
@@ -14,11 +14,9 @@
 
 #ifndef COMPONENTS_NIMBLEREMOTESERVICE_H_
 #define COMPONENTS_NIMBLEREMOTESERVICE_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL)
 
 #include "NimBLEClient.h"
 #include "NimBLEUUID.h"
@@ -83,6 +81,5 @@ private:
     uint16_t            m_endHandle;
 }; // NimBLERemoteService
 
-#endif // #if defined( CONFIG_BT_NIMBLE_ROLE_CENTRAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_CENTRAL */
 #endif /* COMPONENTS_NIMBLEREMOTESERVICE_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.cpp
index 037055208..d9dcb7de4 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.cpp
@@ -11,11 +11,9 @@
  *  Created on: Jul 1, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEScan.h"
 #include "NimBLEDevice.h"
@@ -534,5 +532,4 @@ NimBLEAdvertisedDevice *NimBLEScanResults::getDevice(const NimBLEAddress &addres
     return nullptr;
 }
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_OBSERVER */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.h
index 49d67c8ec..76a114276 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEScan.h
@@ -13,16 +13,18 @@
  */
 #ifndef COMPONENTS_NIMBLE_SCAN_H_
 #define COMPONENTS_NIMBLE_SCAN_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
 
 #include "NimBLEAdvertisedDevice.h"
 #include "NimBLEUtils.h"
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
+#else
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#endif
 
 #include <vector>
 
@@ -97,6 +99,5 @@ private:
     uint8_t                             m_maxResults;
 };
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED CONFIG_BT_NIMBLE_ROLE_OBSERVER */
 #endif /* COMPONENTS_NIMBLE_SCAN_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.cpp
index aa0629698..df6d192b4 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.cpp
@@ -12,7 +12,7 @@
  *      Author: chegewara
  */
 
-#include "sdkconfig.h"
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "NimBLESecurity.h"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.h
index 5a7619f45..157577d7b 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLESecurity.h
@@ -14,10 +14,16 @@
 
 #ifndef COMPONENTS_NIMBLESECURITY_H_
 #define COMPONENTS_NIMBLESECURITY_H_
-#include "sdkconfig.h"
+
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
+#else
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#endif
+
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.cpp
index 082c51ad8..e31c81b45 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.cpp
@@ -12,19 +12,20 @@
  *      Author: kolban
  */
 
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEServer.h"
 #include "NimBLEDevice.h"
 #include "NimBLELog.h"
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "services/gap/ble_svc_gap.h"
 #include "services/gatt/ble_svc_gatt.h"
-
+#else
+#include "nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h"
+#include "nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h"
+#endif
 
 static const char* LOG_TAG = "NimBLEServer";
 static NimBLEServerCallbacks defaultCallbacks;
@@ -79,18 +80,17 @@ NimBLEService* NimBLEServer::createService(const char* uuid) {
  *             to provide inst_id value different for each service.
  * @return A reference to the new service object.
  */
-NimBLEService* NimBLEServer::createService(const NimBLEUUID &uuid, uint32_t numHandles, uint8_t inst_id) {
+NimBLEService* NimBLEServer::createService(const NimBLEUUID &uuid) {
     NIMBLE_LOGD(LOG_TAG, ">> createService - %s", uuid.toString().c_str());
-    // TODO: add functionality to use inst_id for multiple services with same uuid
-    (void)inst_id;
+
     // Check that a service with the supplied UUID does not already exist.
     if(getServiceByUUID(uuid) != nullptr) {
         NIMBLE_LOGW(LOG_TAG, "Warning creating a duplicate service UUID: %s",
                              std::string(uuid).c_str());
     }
 
-    NimBLEService* pService = new NimBLEService(uuid, numHandles, this);
-    m_svcVec.push_back(pService); // Save a reference to this service being on this server.
+    NimBLEService* pService = new NimBLEService(uuid);
+    m_svcVec.push_back(pService);
     serviceChanged();
 
     NIMBLE_LOGD(LOG_TAG, "<< createService");
@@ -734,7 +734,7 @@ void NimBLEServer::startAdvertising() {
  */
 void NimBLEServer::stopAdvertising() {
     NimBLEDevice::stopAdvertising();
-} // startAdvertising
+} // stopAdvertising
 
 
 /**
@@ -772,7 +772,30 @@ void NimBLEServer::updateConnParams(uint16_t conn_handle,
     if(rc != 0) {
         NIMBLE_LOGE(LOG_TAG, "Update params error: %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
     }
-}// updateConnParams
+} // updateConnParams
+
+
+/**
+ * @brief Request an update of the data packet length.
+ * * Can only be used after a connection has been established.
+ * @details Sends a data length update request to the peer.
+ * The Data Length Extension (DLE) allows to increase the Data Channel Payload from 27 bytes to up to 251 bytes.
+ * The peer needs to support the Bluetooth 4.2 specifications, to be capable of DLE.
+ * @param [in] conn_handle The connection handle of the peer to send the request to.
+ * @param [in] tx_octets The preferred number of payload octets to use (Range 0x001B-0x00FB).
+ */
+void NimBLEServer::setDataLen(uint16_t conn_handle, uint16_t tx_octets) {
+#ifdef CONFIG_NIMBLE_CPP_IDF // not yet available in IDF, Sept 9 2021
+    return;
+#else
+    uint16_t tx_time = (tx_octets + 14) * 8;
+
+    int rc = ble_gap_set_data_len(conn_handle, tx_octets, tx_time);
+    if(rc != 0) {
+        NIMBLE_LOGE(LOG_TAG, "Set data length error: %d, %s", rc, NimBLEUtils::returnCodeToString(rc));
+    }
+#endif
+} // setDataLen
 
 
 bool NimBLEServer::setIndicateWait(uint16_t conn_handle) {
@@ -842,6 +865,4 @@ bool NimBLEServerCallbacks::onConfirmPIN(uint32_t pin){
     return true;
 }
 
-
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif // CONFIG_BT_ENABLED
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.h
index ebcf39f23..5054b844e 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEServer.h
@@ -14,11 +14,9 @@
 
 #ifndef MAIN_NIMBLESERVER_H_
 #define MAIN_NIMBLESERVER_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #define NIMBLE_ATT_REMOVE_HIDE 1
 #define NIMBLE_ATT_REMOVE_DELETE 2
@@ -43,8 +41,7 @@ class NimBLEServer {
 public:
     size_t                 getConnectedCount();
     NimBLEService*         createService(const char* uuid);
-    NimBLEService*         createService(const NimBLEUUID &uuid, uint32_t numHandles=15,
-                                         uint8_t inst_id=0);
+    NimBLEService*         createService(const NimBLEUUID &uuid);
     void                   removeService(NimBLEService* service, bool deleteSvc = false);
     void                   addService(NimBLEService* service);
     NimBLEAdvertising*     getAdvertising();
@@ -61,6 +58,7 @@ public:
     void                   updateConnParams(uint16_t conn_handle,
                                             uint16_t minInterval, uint16_t maxInterval,
                                             uint16_t latency, uint16_t timeout);
+    void                   setDataLen(uint16_t conn_handle, uint16_t tx_octets);
     uint16_t               getPeerMTU(uint16_t conn_id);
     std::vector<uint16_t>  getPeerDevices();
     NimBLEConnInfo         getPeerInfo(size_t index);
@@ -168,7 +166,5 @@ public:
     virtual bool onConfirmPIN(uint32_t pin);
 }; // NimBLEServerCallbacks
 
-
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif /* CONFIG_BT_ENABLED */
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
 #endif /* MAIN_NIMBLESERVER_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.cpp
index 9c43e900c..18e15bcbd 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.cpp
@@ -14,12 +14,10 @@
 
 // A service is identified by a UUID.  A service is also the container for one or more characteristics.
 
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
-
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
+#include "NimBLEDevice.h"
 #include "NimBLEService.h"
 #include "NimBLEUtils.h"
 #include "NimBLELog.h"
@@ -34,25 +32,19 @@ static const char* LOG_TAG = "NimBLEService"; // Tag for logging.
 /**
  * @brief Construct an instance of the NimBLEService
  * @param [in] uuid The UUID of the service.
- * @param [in] numHandles The maximum number of handles associated with the service.
- * @param [in] pServer A pointer to the server instance that this service belongs to.
  */
-NimBLEService::NimBLEService(const char* uuid, uint16_t numHandles, NimBLEServer* pServer)
-: NimBLEService(NimBLEUUID(uuid), numHandles, pServer) {
+NimBLEService::NimBLEService(const char* uuid)
+: NimBLEService(NimBLEUUID(uuid)) {
 }
 
 
 /**
  * @brief Construct an instance of the BLEService
  * @param [in] uuid The UUID of the service.
- * @param [in] numHandles The maximum number of handles associated with the service.
- * @param [in] pServer A pointer to the server instance that this service belongs to.
  */
-NimBLEService::NimBLEService(const NimBLEUUID &uuid, uint16_t numHandles, NimBLEServer* pServer) {
+NimBLEService::NimBLEService(const NimBLEUUID &uuid) {
     m_uuid         = uuid;
     m_handle       = NULL_HANDLE;
-    m_pServer      = pServer;
-    m_numHandles   = numHandles;
     m_pSvcDef      = nullptr;
     m_removed      = 0;
 
@@ -429,8 +421,7 @@ std::string NimBLEService::toString() {
  * @return The BLEServer associated with this service.
  */
 NimBLEServer* NimBLEService::getServer() {
-    return m_pServer;
+    return NimBLEDevice::getServer();
 }// getServer
 
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif // CONFIG_BT_ENABLED
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.h
index ebf913d32..fbdd2e1bd 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEService.h
@@ -14,11 +14,9 @@
 
 #ifndef MAIN_NIMBLESERVICE_H_
 #define MAIN_NIMBLESERVICE_H_
-#include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
 
 #include "nimconfig.h"
-#if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
 
 #include "NimBLEServer.h"
 #include "NimBLECharacteristic.h"
@@ -36,8 +34,8 @@ class NimBLECharacteristic;
 class NimBLEService {
 public:
 
-    NimBLEService(const char* uuid, uint16_t numHandles, NimBLEServer* pServer);
-    NimBLEService(const NimBLEUUID &uuid, uint16_t numHandles, NimBLEServer* pServer);
+    NimBLEService(const char* uuid);
+    NimBLEService(const NimBLEUUID &uuid);
     ~NimBLEService();
 
     NimBLEServer*         getServer();
@@ -76,16 +74,12 @@ private:
     friend class          NimBLEDevice;
 
     uint16_t              m_handle;
-    NimBLEServer*         m_pServer;
     NimBLEUUID            m_uuid;
-    uint16_t              m_numHandles;
     ble_gatt_svc_def*     m_pSvcDef;
     uint8_t               m_removed;
     std::vector<NimBLECharacteristic*> m_chrVec;
 
 }; // NimBLEService
 
-
-#endif // #if defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
-#endif // CONFIG_BT_ENABLED
+#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */
 #endif /* MAIN_NIMBLESERVICE_H_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.cpp
index 9338d7d00..4234650d8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.cpp
@@ -11,7 +11,8 @@
  *  Created on: Jun 21, 2017
  *      Author: kolban
  */
-#include "sdkconfig.h"
+
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "NimBLEUtils.h"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.h
index 982f9c36d..724db19fd 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUUID.h
@@ -14,10 +14,16 @@
 
 #ifndef COMPONENTS_NIMBLEUUID_H_
 #define COMPONENTS_NIMBLEUUID_H_
-#include "sdkconfig.h"
+
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_uuid.h"
+#else
+#include "nimble/nimble/host/include/host/ble_uuid.h"
+#endif
+
 /****  FIX COMPILATION ****/
 #undef min
 #undef max
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.cpp b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.cpp
index 7a1f55b41..c6bd823ff 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.cpp
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.cpp
@@ -6,12 +6,13 @@
  *
  */
 
-#include "sdkconfig.h"
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
 #include "NimBLEUtils.h"
 #include "NimBLELog.h"
-#include "nimconfig.h"
+
+#include <stdlib.h>
 
 static const char* LOG_TAG = "NimBLEUtils";
 
@@ -342,6 +343,7 @@ const char* NimBLEUtils::returnCodeToString(int rc) {
             return "Unknown";
     }
 #else // #if defined(CONFIG_NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT)
+    (void)rc;
     return "";
 #endif // #if defined(CONFIG_NIMBLE_CPP_ENABLE_RETURN_CODE_TEXT)
 }
@@ -369,6 +371,7 @@ const char* NimBLEUtils::advTypeToString(uint8_t advType) {
             return "Unknown flag";
     }
 #else // #if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT)
+    (void)advType;
     return "";
 #endif // #if defined(CONFIG_NIMBLE_CPP_ENABLE_ADVERTISMENT_TYPE_TEXT)
 } // adFlagsToString
@@ -416,8 +419,11 @@ char* NimBLEUtils::buildHexData(uint8_t* target, const uint8_t* source, uint8_t
  * @param [in] arg Unused.
  */
 void NimBLEUtils::dumpGapEvent(ble_gap_event *event, void *arg){
+    (void)arg;
 #if defined(CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT)
     NIMBLE_LOGD(LOG_TAG, "Received a GAP event: %s", gapEventToString(event->type));
+#else
+    (void)event;
 #endif
 }
 
@@ -504,6 +510,7 @@ const char* NimBLEUtils::gapEventToString(uint8_t eventType) {
             return "Unknown event type";
     }
 #else // #if defined(CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT)
+    (void)eventType;
     return "";
 #endif // #if defined(CONFIG_NIMBLE_CPP_ENABLE_GAP_EVENT_CODE_TEXT)
 } // gapEventToString
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.h b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.h
index acbc93e72..2fe4b3c41 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/NimBLEUtils.h
@@ -8,10 +8,15 @@
 
 #ifndef COMPONENTS_NIMBLEUTILS_H_
 #define COMPONENTS_NIMBLEUTILS_H_
-#include "sdkconfig.h"
+
+#include "nimconfig.h"
 #if defined(CONFIG_BT_ENABLED)
 
+#if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
+#else
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#endif
 
 /****  FIX COMPILATION ****/
 #undef min
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/console/console.h b/lib/libesp32_div/NimBLE-Arduino/src/console/console.h
deleted file mode 100644
index 96f965159..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/console/console.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2019 Espressif Systems (Shanghai) PTE LTD
-//
-//Licensed under the Apache License, Version 2.0 (the "License");
-//you may not use this file except in compliance with the License.
-//You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-//Unless required by applicable law or agreed to in writing, software
-//distributed under the License is distributed on an "AS IS" BASIS,
-//WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//See the License for the specific language governing permissions and
-//limitations under the License.
-#ifndef _CONSOLE_H
-#define _CONSOLE_H
-
-#include <stdio.h>
-
-#define console_printf printf
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/esp_compiler.h b/lib/libesp32_div/NimBLE-Arduino/src/esp_compiler.h
deleted file mode 100644
index 94ec29c23..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/esp_compiler.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-#ifndef __ESP_COMPILER_H
-#define __ESP_COMPILER_H
-
-/*
- * The likely and unlikely macro pairs:
- * These macros are useful to place when application  
- * knows the majority ocurrence of a decision paths,
- * placing one of these macros can hint the compiler
- * to reorder instructions producing more optimized 
- * code.
- */ 
-#if (CONFIG_COMPILER_OPTIMIZATION_PERF)
-#define likely(x)      __builtin_expect(!!(x), 1) 
-#define unlikely(x)    __builtin_expect(!!(x), 0) 
-#else
-#define likely(x)      (x)
-#define unlikely(x)    (x) 
-#endif
-
-#endif
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/CODING_STANDARDS.md b/lib/libesp32_div/NimBLE-Arduino/src/nimble/CODING_STANDARDS.md
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/CODING_STANDARDS.md
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/CODING_STANDARDS.md
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/LICENSE b/lib/libesp32_div/NimBLE-Arduino/src/nimble/LICENSE
new file mode 100644
index 000000000..08b9b218a
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/LICENSE
@@ -0,0 +1,217 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+This product bundles queue.h 8.5, which is available under the "3-clause BSD"
+license.  For details, see porting/nimble/include/os/queue.h
+
+This product partly derives from FreeBSD, which is available under the
+"3-clause BSD" license.  For details, see:
+    * porting/nimble/src/os_mbuf.c
+
+This product bundles Gary S. Brown's CRC32 implementation, which is available
+under the following license:
+    COPYRIGHT (C) 1986 Gary S. Brown.  You may use this program, or
+    code or tables extracted from it, as desired without restriction.
+
+This product bundles tinycrypt, which is available under the "3-clause BSD"
+license. For details, and bundled files see:
+    * ext/tinycrypt/LICENSE
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/NOTICE b/lib/libesp32_div/NimBLE-Arduino/src/nimble/NOTICE
similarity index 61%
rename from lib/libesp32_div/NimBLE-Arduino/src/NOTICE
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/NOTICE
index fc24c6abc..02fe5929d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/NOTICE
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/NOTICE
@@ -1,5 +1,6 @@
 Apache Mynewt NimBLE
-Copyright 2015-2018 The Apache Software Foundation
+Copyright 2015-2020 The Apache Software Foundation
+Modifications Copyright 2017-2020 Espressif Systems (Shanghai) CO., LTD.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/README.md b/lib/libesp32_div/NimBLE-Arduino/src/nimble/README.md
similarity index 90%
rename from lib/libesp32_div/NimBLE-Arduino/src/README.md
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/README.md
index bbd17fc85..37103be08 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/README.md
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/README.md
@@ -23,7 +23,7 @@
 
 ## Overview
 
-Apache NimBLE is an open-source Bluetooth 5.0 stack (both Host & Controller)
+Apache NimBLE is an open-source Bluetooth 5.1 stack (both Host & Controller)
 that completely replaces the proprietary SoftDevice on Nordic chipsets. It is
 part of [Apache Mynewt project](https://github.com/apache/mynewt-core).
 
@@ -33,7 +33,6 @@ Features highlight:
   - Support for up to 32 simultaneous connections.
   - Legacy and SC (secure connections) SMP support (pairing and bonding).
   - Advertising Extensions.
-  - Periodic Advertising.
   - Coded (aka Long Range) and 2M PHYs.
   - Bluetooth Mesh.
 
@@ -84,27 +83,24 @@ There are also some sample applications that show how to Apache Mynewt NimBLE
 stack. These sample applications are located in the `apps/` directory of
 Apache Mynewt [repo](https://github.com/apache/mynewt-core). Some examples:
 
-* [blecent](https://github.com/apache/mynewt-core/tree/master/apps/blecent):
+* [blecent](https://github.com/apache/mynewt-nimble/tree/master/apps/blecent):
 A basic central device with no user interface.  This application scans for
 a peripheral that supports the alert notification service (ANS). Upon
 discovering such a peripheral, blecent connects and performs a characteristic
 read, characteristic write, and notification subscription.
-* [blehci](https://github.com/apache/mynewt-core/tree/master/apps/blehci):
+* [blehci](https://github.com/apache/mynewt-nimble/tree/master/apps/blehci):
 Implements a BLE controller-only application.  A separate host-only
 implementation, such as Linux's BlueZ, can interface with this application via
 HCI over UART.
-* [bleprph](https://github.com/apache/mynewt-core/tree/master/apps/bleprph): An
+* [bleprph](https://github.com/apache/mynewt-nimble/tree/master/apps/bleprph): An
   implementation of a minimal BLE peripheral.
-* [btshell](https://github.com/apache/mynewt-core/tree/master/apps/btshell): A
+* [btshell](https://github.com/apache/mynewt-nimble/tree/master/apps/btshell): A
   shell-like application allowing to configure and use most of NimBLE
   functionality from command line.
 * [bleuart](https://github.com/apache/mynewt-core/tree/master/apps/bleuart):
 Implements a simple BLE peripheral that supports the Nordic
 UART / Serial Port Emulation service
 (https://developer.nordicsemi.com/nRF5_SDK/nRF51_SDK_v8.x.x/doc/8.0.0/s110/html/a00072.html).
-* [test](https://github.com/apache/mynewt-core/tree/master/apps/test): Test
-  project which can be compiled either with the simulator, or on a per-architecture basis.
-  Test will run all the package's unit tests.
 
 # Getting Help
 
@@ -113,7 +109,7 @@ want to talk to a human about what you're working on, you can contact us via the
 [developers mailing list](mailto:dev@mynewt.apache.org).
 
 Although not a formal channel, you can also find a number of core developers
-on the #mynewt channel on Freenode IRC or #general channel on [Mynewt Slack](https://join.slack.com/mynewt/shared_invite/MTkwMTg1ODM1NTg5LTE0OTYxNzQ4NzQtZTU1YmNhYjhkMg)
+on the #mynewt channel on Freenode IRC or #general channel on [Mynewt Slack](https://mynewt.slack.com/join/shared_invite/enQtNjA1MTg0NzgyNzg3LTcyMmZiOGQzOGMxM2U4ODFmMTIwNjNmYTE5Y2UwYjQwZWIxNTE0MTUzY2JmMTEzOWFjYWZkNGM0YmM4MzAxNWQ)
 
 Also, be sure to checkout the [Frequently Asked Questions](https://mynewt.apache.org/faq/answers)
 for some help troubleshooting first.
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/RELEASE_NOTES.md b/lib/libesp32_div/NimBLE-Arduino/src/nimble/RELEASE_NOTES.md
similarity index 56%
rename from lib/libesp32_div/NimBLE-Arduino/src/RELEASE_NOTES.md
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/RELEASE_NOTES.md
index cda8fe2e4..3bdd31ad0 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/RELEASE_NOTES.md
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/RELEASE_NOTES.md
@@ -1,26 +1,32 @@
 # RELEASE NOTES
 
-16 July 2019 - Apache NimBLE v1.2.0
+18 March 2020 - Apache NimBLE v1.3.0
 
 For full release notes, please visit the
 [Apache Mynewt Wiki](https://cwiki.apache.org/confluence/display/MYNEWT/Release+Notes).
 
-Apache NimBLE is an open-source Bluetooth 5.0 stack (both Host & Controller) that completely
+Apache NimBLE is an open-source Bluetooth 5.1 stack (both Host & Controller) that completely
 replaces the proprietary SoftDevice on Nordic chipsets.
 
 New features in this version of NimBLE include:
 
-* Perdiodic Advertising support with up to 1650 bytes of data (scanner and advertiser)
-* Support for scan request notification in GAP API
-* Updated host qualification ID
+* Support for Bluetooth Core Specification 5.1
+* New blestress test application
+* Dialog DA1469x CMAC driver
+* Support for LE Secure Connections out-of-band (OOB) association model
+* Support for automated generation of syscfg for ports
 * Qualification related bugfixes
-* GAP API doxygen documentation update
 * BLE Mesh improvements - fixes and resync with latest Zephyr code
 * RIOT OS port fixes and improvements
 * btshell sample application improvements
 * improvements for bttester application
 * Controller duplicates filtering improvements
-* Memory and CPU usage optimizations in controller
+* Multi PHY support improvements
+* Memory and CPU usage optimizations
+* Use of packed structs for HCI (code size reduction)
+* Linux sample improvements
+* PTS test instructions updates
+* Clock managements improvements in controller
 
 If working on next-generation RTOS and Bluetooth protocol stack
 sounds exciting to you, get in touch, by sending a mail to the Apache Mynewt
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/console/console.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/console/console.h
new file mode 100644
index 000000000..b1052e62e
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/console/console.h
@@ -0,0 +1,16 @@
+#ifndef __CONSOLE_H__
+#define __CONSOLE_H__
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define console_printf printf
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __CONSOLE_H__ */
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/include/esp_compiler.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/include/esp_compiler.h
new file mode 100644
index 000000000..7ab8cb9af
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/include/esp_compiler.h
@@ -0,0 +1,51 @@
+// Copyright 2016-2019 Espressif Systems (Shanghai) PTE LTD
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+#ifndef __ESP_COMPILER_H
+#define __ESP_COMPILER_H
+
+/*
+ * The likely and unlikely macro pairs:
+ * These macros are useful to place when application
+ * knows the majority ocurrence of a decision paths,
+ * placing one of these macros can hint the compiler
+ * to reorder instructions producing more optimized
+ * code.
+ */
+#if (CONFIG_COMPILER_OPTIMIZATION_PERF)
+#define likely(x)      __builtin_expect(!!(x), 1)
+#define unlikely(x)    __builtin_expect(!!(x), 0)
+#else
+#define likely(x)      (x)
+#define unlikely(x)    (x)
+#endif
+
+/*
+ * Utility macros used for designated initializers, which work differently
+ * in C99 and C++ standards mainly for aggregate types.
+ * The member separator, comma, is already part of the macro, please omit the trailing comma.
+ * Usage example:
+ *   struct config_t { char* pchr; char arr[SIZE]; } config = {
+ *              ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(pchr)
+ *              ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_STR(arr, "Value")
+ *          };
+ */
+#ifdef __cplusplus
+#define ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_STR(member, value)  { .member = value },
+#define ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(member) .member = { },
+#else
+#define ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_STR(member, value)  .member = value,
+#define ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(member)
+#endif
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/esp_nimble_hci.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/include/esp_nimble_hci.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/esp_nimble_hci.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/include/esp_nimble_hci.h
index e10436f3c..dda03216e 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/esp_nimble_hci.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/include/esp_nimble_hci.h
@@ -19,10 +19,11 @@
  * under the License.
  */
 
+#ifdef ESP_PLATFORM
 #ifndef __ESP_NIMBLE_HCI_H__
 #define __ESP_NIMBLE_HCI_H__
 
-#include "nimble/ble_hci_trans.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -136,3 +137,4 @@ esp_err_t esp_nimble_hci_and_controller_deinit(void);
 #endif
 
 #endif /* __ESP_NIMBLE_HCI_H__ */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/esp-hci/src/esp_nimble_hci.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/src/esp_nimble_hci.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/esp-hci/src/esp_nimble_hci.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/src/esp_nimble_hci.c
index 2963e15b3..f4df29a65 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/esp-hci/src/esp_nimble_hci.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/esp-hci/src/esp_nimble_hci.c
@@ -19,17 +19,19 @@
  * under the License.
  */
 
+#ifdef ESP_PLATFORM
+
 #include <assert.h>
-#include "sysinit/sysinit.h"
-#include "nimble/hci_common.h"
-#include "host/ble_hs.h"
-#include "nimble/nimble_port.h"
-#include "nimble/nimble_port_freertos.h"
-#include "esp_nimble_hci.h"
-#include "esp_nimble_mem.h"
-#include "esp_bt.h"
-#include "freertos/semphr.h"
-#include "esp_compiler.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "nimble/porting/nimble/include/nimble/nimble_port.h"
+#include "nimble/porting/npl/freertos/include/nimble/nimble_port_freertos.h"
+#include "../include/esp_nimble_hci.h"
+#include "../../port/include/esp_nimble_mem.h"
+#include <esp_bt.h>
+#include <freertos/semphr.h>
+#include "../include/esp_compiler.h"
 /* IPC is used to improve performance when calls come from a processor not running the NimBLE stack */
 /* but does not exist for solo */
 #ifndef CONFIG_FREERTOS_UNICORE
@@ -310,7 +312,6 @@ static struct os_mbuf *ble_hci_trans_acl_buf_alloc(void)
 static void ble_hci_rx_acl(uint8_t *data, uint16_t len)
 {
     struct os_mbuf *m;
-    int rc;
     int sr;
     if (len < BLE_HCI_DATA_HDR_SZ || len > MYNEWT_VAL(BLE_ACL_BUF_SIZE)) {
         return;
@@ -319,11 +320,9 @@ static void ble_hci_rx_acl(uint8_t *data, uint16_t len)
     m = ble_hci_trans_acl_buf_alloc();
 
     if (!m) {
-        ESP_LOGE(TAG, "%s failed to allocate ACL buffers; increase ACL_BUF_COUNT", __func__);
         return;
     }
-    if ((rc = os_mbuf_append(m, data, len)) != 0) {
-        ESP_LOGE(TAG, "%s failed to os_mbuf_append; rc = %d", __func__, rc);
+    if (os_mbuf_append(m, data, len)) {
         os_mbuf_free_chain(m);
         return;
     }
@@ -531,7 +530,6 @@ esp_err_t esp_nimble_hci_and_controller_init(void)
     if ((ret = esp_bt_controller_enable(ESP_BT_MODE_BLE)) != ESP_OK) {
         return ret;
     }
-
     return esp_nimble_hci_init();
 }
 
@@ -593,3 +591,5 @@ esp_err_t esp_nimble_hci_and_controller_deinit(void)
 
     return ESP_OK;
 }
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/esp_nimble_cfg.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/include/esp_nimble_cfg.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/esp_nimble_cfg.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/include/esp_nimble_cfg.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/esp_nimble_mem.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/include/esp_nimble_mem.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/esp_nimble_mem.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/include/esp_nimble_mem.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/port/src/esp_nimble_mem.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/port/src/esp_nimble_mem.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.c
index a26e9b2f4..21e22fd26 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/port/src/esp_nimble_mem.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/esp_port/port/src/esp_nimble_mem.c
@@ -18,11 +18,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+#ifdef ESP_PLATFORM
 
 #include "esp_attr.h"
 #include "esp_heap_caps.h"
 #include "nimconfig.h"
-#include "esp_nimble_mem.h"
+#include "../include/esp_nimble_mem.h"
 
 IRAM_ATTR void *nimble_platform_mem_malloc(size_t size)
 {
@@ -54,3 +55,4 @@ IRAM_ATTR void nimble_platform_mem_free(void *ptr)
 {
     heap_caps_free(ptr);
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/AUTHORS b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/AUTHORS
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/AUTHORS
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/AUTHORS
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/LICENSE b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/LICENSE
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/LICENSE
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/LICENSE
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/README b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/README
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/README
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/README
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/VERSION b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/VERSION
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/VERSION
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/VERSION
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/documentation/tinycrypt.rst b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/documentation/tinycrypt.rst
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/documentation/tinycrypt.rst
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/documentation/tinycrypt.rst
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/aes.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/aes.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/aes.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/aes.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/cbc_mode.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/cbc_mode.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/cbc_mode.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/cbc_mode.h
index 4a837fd01..a53318eed 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/cbc_mode.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/cbc_mode.h
@@ -74,7 +74,7 @@
 #ifndef __TC_CBC_MODE_H__
 #define __TC_CBC_MODE_H__
 
-#include <tinycrypt/aes.h>
+#include "aes.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ccm_mode.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ccm_mode.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ccm_mode.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ccm_mode.h
index 69c798e2f..c22ac08d4 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ccm_mode.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ccm_mode.h
@@ -74,7 +74,7 @@
 #ifndef __TC_CCM_MODE_H__
 #define __TC_CCM_MODE_H__
 
-#include <tinycrypt/aes.h>
+#include "aes.h"
 #include <stddef.h>
 
 #ifdef __cplusplus
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/cmac_mode.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/cmac_mode.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/cmac_mode.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/cmac_mode.h
index f44b0a53c..327097026 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/cmac_mode.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/cmac_mode.h
@@ -97,7 +97,7 @@
 #ifndef __TC_CMAC_MODE_H__
 #define __TC_CMAC_MODE_H__
 
-#include <tinycrypt/aes.h>
+#include "aes.h"
 
 #include <stddef.h>
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/constants.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/constants.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/constants.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/constants.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ctr_mode.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ctr_mode.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ctr_mode.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ctr_mode.h
index dc221f9ee..e2da5b43b 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ctr_mode.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ctr_mode.h
@@ -67,8 +67,8 @@
 #ifndef __TC_CTR_MODE_H__
 #define __TC_CTR_MODE_H__
 
-#include <tinycrypt/aes.h>
-#include <tinycrypt/constants.h>
+#include "aes.h"
+#include "constants.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ctr_prng.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ctr_prng.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ctr_prng.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ctr_prng.h
index 9be06dbb1..bff7f9726 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ctr_prng.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ctr_prng.h
@@ -59,7 +59,7 @@
 #ifndef __TC_CTR_PRNG_H__
 #define __TC_CTR_PRNG_H__
 
-#include <tinycrypt/aes.h>
+#include "aes.h"
 
 #define TC_CTR_PRNG_RESEED_REQ -1
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_dh.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_dh.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_dh.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_dh.h
index b828e195d..930e9162e 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_dh.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_dh.h
@@ -69,7 +69,7 @@
 #ifndef __TC_ECC_DH_H__
 #define __TC_ECC_DH_H__
 
-#include <tinycrypt/ecc.h>
+#include "ecc.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_dsa.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_dsa.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_dsa.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_dsa.h
index aca00bc95..8cb421b7a 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_dsa.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_dsa.h
@@ -78,7 +78,7 @@
 #ifndef __TC_ECC_DSA_H__
 #define __TC_ECC_DSA_H__
 
-#include <tinycrypt/ecc.h>
+#include "ecc.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_platform_specific.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_platform_specific.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/ecc_platform_specific.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/ecc_platform_specific.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/hmac.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/hmac.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/hmac.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/hmac.h
index 3a081494a..cfa7d38cd 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/hmac.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/hmac.h
@@ -63,7 +63,7 @@
 #ifndef __TC_HMAC_H__
 #define __TC_HMAC_H__
 
-#include <tinycrypt/sha256.h>
+#include "sha256.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/hmac_prng.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/hmac_prng.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/hmac_prng.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/hmac_prng.h
index ad12cbbf0..24f417e6b 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/hmac_prng.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/hmac_prng.h
@@ -68,8 +68,8 @@
 #ifndef __TC_HMAC_PRNG_H__
 #define __TC_HMAC_PRNG_H__
 
-#include <tinycrypt/sha256.h>
-#include <tinycrypt/hmac.h>
+#include "sha256.h"
+#include "hmac.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/sha256.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/sha256.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/sha256.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/sha256.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/utils.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/utils.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/utils.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/include/tinycrypt/utils.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/aes_decrypt.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/aes_decrypt.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/aes_decrypt.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/aes_decrypt.c
index 993a6180c..0bab6e280 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/aes_decrypt.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/aes_decrypt.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/aes.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/aes.h"
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/utils.h"
 
 static const uint8_t inv_sbox[256] = {
 	0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/aes_encrypt.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/aes_encrypt.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/aes_encrypt.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/aes_encrypt.c
index 8991aee52..bdc434bce 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/aes_encrypt.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/aes_encrypt.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/aes.h>
-#include <tinycrypt/utils.h>
-#include <tinycrypt/constants.h>
+#include "../include/tinycrypt/aes.h"
+#include "../include/tinycrypt/utils.h"
+#include "../include/tinycrypt/constants.h"
 
 static const uint8_t sbox[256] = {
 	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/cbc_mode.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/cbc_mode.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/cbc_mode.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/cbc_mode.c
index 62d7879eb..b743878a9 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/cbc_mode.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/cbc_mode.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/cbc_mode.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/cbc_mode.h"
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/utils.h"
 
 int tc_cbc_mode_encrypt(uint8_t *out, unsigned int outlen, const uint8_t *in,
 			    unsigned int inlen, const uint8_t *iv,
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ccm_mode.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ccm_mode.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ccm_mode.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ccm_mode.c
index 929adac63..598531252 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ccm_mode.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ccm_mode.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/ccm_mode.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/ccm_mode.h"
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/utils.h"
 
 #include <stdio.h>
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/cmac_mode.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/cmac_mode.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/cmac_mode.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/cmac_mode.c
index 96d147e80..dff28cf03 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/cmac_mode.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/cmac_mode.c
@@ -30,10 +30,10 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/aes.h>
-#include <tinycrypt/cmac_mode.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/aes.h"
+#include "../include/tinycrypt/cmac_mode.h"
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/utils.h"
 
 /* max number of calls until change the key (2^48).*/
 const static uint64_t MAX_CALLS = ((uint64_t)1 << 48);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_mode.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ctr_mode.c
similarity index 95%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_mode.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ctr_mode.c
index 1dfb92dfe..6653afc52 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_mode.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ctr_mode.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/constants.h>
-#include <tinycrypt/ctr_mode.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/ctr_mode.h"
+#include "../include/tinycrypt/utils.h"
 
 int tc_ctr_mode(uint8_t *out, unsigned int outlen, const uint8_t *in,
 		unsigned int inlen, uint8_t *ctr, const TCAesKeySched_t sched)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_prng.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ctr_prng.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_prng.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ctr_prng.c
index cac2cc41d..f908932e2 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ctr_prng.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ctr_prng.c
@@ -27,9 +27,9 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/ctr_prng.h>
-#include <tinycrypt/utils.h>
-#include <tinycrypt/constants.h>
+#include "../include/tinycrypt/ctr_prng.h"
+#include "../include/tinycrypt/utils.h"
+#include "../include/tinycrypt/constants.h"
 #include <string.h>
 
 /*
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc.c
index 46080bf61..e7fce278d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc.c
@@ -52,8 +52,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/ecc.h>
-#include <tinycrypt/ecc_platform_specific.h>
+#include "../include/tinycrypt/ecc.h"
+#include "../include/tinycrypt/ecc_platform_specific.h"
 #include <string.h>
 
 /* IMPORTANT: Make sure a cryptographically-secure PRNG is set and the platform
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dh.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_dh.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dh.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_dh.c
index e5257d2d4..5cd6a2e2f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dh.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_dh.c
@@ -54,9 +54,9 @@
  *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  */
-#include <tinycrypt/constants.h>
-#include <tinycrypt/ecc.h>
-#include <tinycrypt/ecc_dh.h>
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/ecc.h"
+#include "../include/tinycrypt/ecc_dh.h"
 #include <string.h>
 
 #if default_RNG_defined
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dsa.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_dsa.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dsa.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_dsa.c
index 064dfe5ae..31046c860 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_dsa.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_dsa.c
@@ -53,9 +53,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/constants.h>
-#include <tinycrypt/ecc.h>
-#include <tinycrypt/ecc_dsa.h>
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/ecc.h"
+#include "../include/tinycrypt/ecc_dsa.h"
 
 #if default_RNG_defined
 static uECC_RNG_Function g_rng_function = &default_CSPRNG;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_platform_specific.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_platform_specific.c
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/ecc_platform_specific.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/ecc_platform_specific.c
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/hmac.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/hmac.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/hmac.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/hmac.c
index 89878cec7..c86fd35a7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/hmac.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/hmac.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/hmac.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/hmac.h"
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/utils.h"
 
 static void rekey(uint8_t *key, const uint8_t *new_key, unsigned int key_size)
 {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/hmac_prng.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/hmac_prng.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/hmac_prng.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/hmac_prng.c
index 68b5b1faf..a41ea43d5 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/hmac_prng.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/hmac_prng.c
@@ -30,10 +30,10 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/hmac_prng.h>
-#include <tinycrypt/hmac.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/hmac_prng.h"
+#include "../include/tinycrypt/hmac.h"
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/utils.h"
 
 /*
  * min bytes in the seed string.
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/sha256.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/sha256.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/sha256.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/sha256.c
index b4efd2044..b7e0bba55 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/sha256.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/sha256.c
@@ -30,9 +30,9 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/sha256.h>
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
+#include "../include/tinycrypt/sha256.h"
+#include "../include/tinycrypt/constants.h"
+#include "../include/tinycrypt/utils.h"
 
 static void compress(unsigned int *iv, const uint8_t *data);
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/utils.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/utils.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/utils.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/utils.c
index 13cc49512..792a78178 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/ext/tinycrypt/src/utils.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/ext/tinycrypt/src/utils.c
@@ -30,8 +30,8 @@
  *  POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <tinycrypt/utils.h>
-#include <tinycrypt/constants.h>
+#include "../include/tinycrypt/utils.h"
+#include "../include/tinycrypt/constants.h"
 
 #include <string.h>
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_att_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_att_priv.h
deleted file mode 100644
index 2201d4ddb..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_att_priv.h
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_ATT_PRIV_
-#define H_BLE_ATT_PRIV_
-
-#include <inttypes.h>
-#include "stats/stats.h"
-#include "host/ble_att.h"
-#include "host/ble_uuid.h"
-#include "nimble/nimble_npl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct os_mbuf;
-struct ble_hs_conn;
-struct ble_l2cap_chan;
-struct ble_att_find_info_req;
-struct ble_att_error_rsp;
-struct ble_att_mtu_cmd;
-struct ble_att_read_req;
-struct ble_att_read_blob_req;
-struct ble_att_read_type_req;
-struct ble_att_read_group_type_req;
-struct ble_att_read_group_type_rsp;
-struct ble_att_find_type_value_req;
-struct ble_att_write_req;
-struct ble_att_prep_write_cmd;
-struct ble_att_exec_write_req;
-struct ble_att_notify_req;
-struct ble_att_indicate_req;
-
-STATS_SECT_START(ble_att_stats)
-    STATS_SECT_ENTRY(error_rsp_rx)
-    STATS_SECT_ENTRY(error_rsp_tx)
-    STATS_SECT_ENTRY(mtu_req_rx)
-    STATS_SECT_ENTRY(mtu_req_tx)
-    STATS_SECT_ENTRY(mtu_rsp_rx)
-    STATS_SECT_ENTRY(mtu_rsp_tx)
-    STATS_SECT_ENTRY(find_info_req_rx)
-    STATS_SECT_ENTRY(find_info_req_tx)
-    STATS_SECT_ENTRY(find_info_rsp_rx)
-    STATS_SECT_ENTRY(find_info_rsp_tx)
-    STATS_SECT_ENTRY(find_type_value_req_rx)
-    STATS_SECT_ENTRY(find_type_value_req_tx)
-    STATS_SECT_ENTRY(find_type_value_rsp_rx)
-    STATS_SECT_ENTRY(find_type_value_rsp_tx)
-    STATS_SECT_ENTRY(read_type_req_rx)
-    STATS_SECT_ENTRY(read_type_req_tx)
-    STATS_SECT_ENTRY(read_type_rsp_rx)
-    STATS_SECT_ENTRY(read_type_rsp_tx)
-    STATS_SECT_ENTRY(read_req_rx)
-    STATS_SECT_ENTRY(read_req_tx)
-    STATS_SECT_ENTRY(read_rsp_rx)
-    STATS_SECT_ENTRY(read_rsp_tx)
-    STATS_SECT_ENTRY(read_blob_req_rx)
-    STATS_SECT_ENTRY(read_blob_req_tx)
-    STATS_SECT_ENTRY(read_blob_rsp_rx)
-    STATS_SECT_ENTRY(read_blob_rsp_tx)
-    STATS_SECT_ENTRY(read_mult_req_rx)
-    STATS_SECT_ENTRY(read_mult_req_tx)
-    STATS_SECT_ENTRY(read_mult_rsp_rx)
-    STATS_SECT_ENTRY(read_mult_rsp_tx)
-    STATS_SECT_ENTRY(read_group_type_req_rx)
-    STATS_SECT_ENTRY(read_group_type_req_tx)
-    STATS_SECT_ENTRY(read_group_type_rsp_rx)
-    STATS_SECT_ENTRY(read_group_type_rsp_tx)
-    STATS_SECT_ENTRY(write_req_rx)
-    STATS_SECT_ENTRY(write_req_tx)
-    STATS_SECT_ENTRY(write_rsp_rx)
-    STATS_SECT_ENTRY(write_rsp_tx)
-    STATS_SECT_ENTRY(prep_write_req_rx)
-    STATS_SECT_ENTRY(prep_write_req_tx)
-    STATS_SECT_ENTRY(prep_write_rsp_rx)
-    STATS_SECT_ENTRY(prep_write_rsp_tx)
-    STATS_SECT_ENTRY(exec_write_req_rx)
-    STATS_SECT_ENTRY(exec_write_req_tx)
-    STATS_SECT_ENTRY(exec_write_rsp_rx)
-    STATS_SECT_ENTRY(exec_write_rsp_tx)
-    STATS_SECT_ENTRY(notify_req_rx)
-    STATS_SECT_ENTRY(notify_req_tx)
-    STATS_SECT_ENTRY(indicate_req_rx)
-    STATS_SECT_ENTRY(indicate_req_tx)
-    STATS_SECT_ENTRY(indicate_rsp_rx)
-    STATS_SECT_ENTRY(indicate_rsp_tx)
-    STATS_SECT_ENTRY(write_cmd_rx)
-    STATS_SECT_ENTRY(write_cmd_tx)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_att_stats) ble_att_stats;
-
-struct ble_att_prep_entry {
-    SLIST_ENTRY(ble_att_prep_entry) bape_next;
-    uint16_t bape_handle;
-    uint16_t bape_offset;
-
-    /* XXX: This is wasteful; we should use one mbuf chain for the entire
-     * prepared write, and compress the data into as few mbufs as possible.
-     */
-    struct os_mbuf *bape_value;
-};
-
-SLIST_HEAD(ble_att_prep_entry_list, ble_att_prep_entry);
-
-struct ble_att_svr_conn {
-    /** This list is sorted by attribute handle ID. */
-    struct ble_att_prep_entry_list basc_prep_list;
-    ble_npl_time_t basc_prep_timeout_at;
-};
-
-/**
- * Handles a host attribute request.
- *
- * @param entry                 The host attribute being requested.
- * @param op                    The operation being performed on the attribute.
- * @param arg                   The request data associated with that host
- *                                  attribute.
- *
- * @return                      0 on success;
- *                              One of the BLE_ATT_ERR_[...] codes on
- *                                  failure.
- */
-typedef int ble_att_svr_access_fn(uint16_t conn_handle, uint16_t attr_handle,
-                                  uint8_t op, uint16_t offset,
-                                  struct os_mbuf **om, void *arg);
-
-int ble_att_svr_register(const ble_uuid_t *uuid, uint8_t flags,
-                         uint8_t min_key_size, uint16_t *handle_id,
-                         ble_att_svr_access_fn *cb, void *cb_arg);
-
-struct ble_att_svr_entry {
-    STAILQ_ENTRY(ble_att_svr_entry) ha_next;
-
-    const ble_uuid_t *ha_uuid;
-    uint8_t ha_flags;
-    uint8_t ha_min_key_size;
-    uint16_t ha_handle_id;
-    ble_att_svr_access_fn *ha_cb;
-    void *ha_cb_arg;
-};
-
-SLIST_HEAD(ble_att_clt_entry_list, ble_att_clt_entry);
-
-/*** @gen */
-
-struct ble_l2cap_chan *ble_att_create_chan(uint16_t conn_handle);
-int ble_att_conn_chan_find(uint16_t conn_handle, struct ble_hs_conn **out_conn,
-                           struct ble_l2cap_chan **out_chan);
-void ble_att_inc_tx_stat(uint8_t att_op);
-void ble_att_truncate_to_mtu(const struct ble_l2cap_chan *att_chan,
-                             struct os_mbuf *txom);
-void ble_att_set_peer_mtu(struct ble_l2cap_chan *chan, uint16_t peer_mtu);
-uint16_t ble_att_chan_mtu(const struct ble_l2cap_chan *chan);
-int ble_att_init(void);
-
-#define BLE_ATT_LOG_CMD(is_tx, cmd_name, conn_handle, log_cb, cmd) \
-    BLE_HS_LOG_CMD((is_tx), "att", (cmd_name), (conn_handle), (log_cb), (cmd))
-
-#define BLE_ATT_LOG_EMPTY_CMD(is_tx, cmd_name, conn_handle) \
-    BLE_HS_LOG_EMPTY_CMD((is_tx), "att", (cmd_name), (conn_handle))
-
-/*** @svr */
-
-int ble_att_svr_start(void);
-void ble_att_svr_stop(void);
-
-struct ble_att_svr_entry *
-ble_att_svr_find_by_uuid(struct ble_att_svr_entry *start_at,
-                         const ble_uuid_t *uuid,
-                         uint16_t end_handle);
-uint16_t ble_att_svr_prev_handle(void);
-int ble_att_svr_rx_mtu(uint16_t conn_handle, struct os_mbuf **rxom);
-struct ble_att_svr_entry *ble_att_svr_find_by_handle(uint16_t handle_id);
-int32_t ble_att_svr_ticks_until_tmo(const struct ble_att_svr_conn *svr,
-                                    ble_npl_time_t now);
-int ble_att_svr_rx_find_info(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_svr_rx_find_type_value(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_svr_rx_read_type(uint16_t conn_handle,
-                             struct os_mbuf **rxom);
-int ble_att_svr_rx_read_group_type(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_svr_rx_read(uint16_t conn_handle,
-                        struct os_mbuf **rxom);
-int ble_att_svr_rx_read_blob(uint16_t conn_handle,
-                             struct os_mbuf **rxom);
-int ble_att_svr_rx_read_mult(uint16_t conn_handle,
-                             struct os_mbuf **rxom);
-int ble_att_svr_rx_write(uint16_t conn_handle,
-                         struct os_mbuf **rxom);
-int ble_att_svr_rx_write_no_rsp(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_svr_rx_prep_write(uint16_t conn_handle,
-                              struct os_mbuf **rxom);
-int ble_att_svr_rx_exec_write(uint16_t conn_handle,
-                              struct os_mbuf **rxom);
-int ble_att_svr_rx_notify(uint16_t conn_handle,
-                          struct os_mbuf **rxom);
-int ble_att_svr_rx_indicate(uint16_t conn_handle,
-                            struct os_mbuf **rxom);
-void ble_att_svr_prep_clear(struct ble_att_prep_entry_list *prep_list);
-int ble_att_svr_read_handle(uint16_t conn_handle, uint16_t attr_handle,
-                            uint16_t offset, struct os_mbuf *om,
-                            uint8_t *out_att_err);
-void ble_att_svr_reset(void);
-int ble_att_svr_init(void);
-
-void ble_att_svr_hide_range(uint16_t start_handle, uint16_t end_handle);
-void ble_att_svr_restore_range(uint16_t start_handle, uint16_t end_handle);
-
-int ble_att_svr_tx_error_rsp(uint16_t conn_handle, struct os_mbuf *txom,
-                             uint8_t req_op, uint16_t handle,
-                             uint8_t error_code);
-/*** $clt */
-
-/** An information-data entry in a find information response. */
-struct ble_att_find_info_idata {
-    uint16_t attr_handle;
-    ble_uuid_any_t uuid;
-};
-
-/** A handles-information entry in a find by type value response. */
-struct ble_att_find_type_value_hinfo {
-    uint16_t attr_handle;
-    uint16_t group_end_handle;
-};
-
-/** An attribute-data entry in a read by type response. */
-struct ble_att_read_type_adata {
-    uint16_t att_handle;
-    int value_len;
-    uint8_t *value;
-
-};
-
-/** An attribute-data entry in a read by group type response. */
-struct ble_att_read_group_type_adata {
-    uint16_t att_handle;
-    uint16_t end_group_handle;
-    int value_len;
-    uint8_t *value;
-};
-
-int ble_att_clt_rx_error(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_mtu(uint16_t conn_handle, uint16_t mtu);
-int ble_att_clt_rx_mtu(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read(uint16_t conn_handle, uint16_t handle);
-int ble_att_clt_rx_read(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_blob(uint16_t conn_handle, uint16_t handle,
-                             uint16_t offset);
-int ble_att_clt_rx_read_blob(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_mult(uint16_t conn_handle,
-                             const uint16_t *handles, int num_handles);
-int ble_att_clt_rx_read_mult(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_type(uint16_t conn_handle, uint16_t start_handle,
-                             uint16_t end_handle, const ble_uuid_t *uuid);
-int ble_att_clt_rx_read_type(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_group_type(uint16_t conn_handle,
-                                   uint16_t start_handle, uint16_t end_handle,
-                                   const ble_uuid_t *uuid128);
-int ble_att_clt_rx_read_group_type(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_clt_tx_find_info(uint16_t conn_handle, uint16_t start_handle,
-                             uint16_t end_handle);
-int ble_att_clt_rx_find_info(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_find_type_value(uint16_t conn_handle, uint16_t start_handle,
-                                   uint16_t end_handle, uint16_t attribute_type,
-                                   const void *attribute_value, int value_len);
-int ble_att_clt_rx_find_type_value(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_clt_tx_write_req(uint16_t conn_handle, uint16_t handle,
-                             struct os_mbuf *txom);
-int ble_att_clt_tx_write_cmd(uint16_t conn_handle, uint16_t handle,
-                             struct os_mbuf *txom);
-int ble_att_clt_tx_prep_write(uint16_t conn_handle, uint16_t handle,
-                              uint16_t offset, struct os_mbuf *txom);
-int ble_att_clt_rx_prep_write(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_exec_write(uint16_t conn_handle, uint8_t flags);
-int ble_att_clt_rx_exec_write(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_rx_write(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_notify(uint16_t conn_handle, uint16_t handle,
-                          struct os_mbuf *txom);
-int ble_att_clt_tx_indicate(uint16_t conn_handle, uint16_t handle,
-                            struct os_mbuf *txom);
-int ble_att_clt_rx_indicate(uint16_t conn_handle, struct os_mbuf **rxom);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_gatt_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_gatt_priv.h
deleted file mode 100644
index 4a59635b8..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_gatt_priv.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_GATT_PRIV_
-#define H_BLE_GATT_PRIV_
-
-#include "syscfg/syscfg.h"
-#include "stats/stats.h"
-#include "host/ble_gatt.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_att_read_type_adata;
-struct ble_att_find_type_value_hinfo;
-struct ble_att_find_info_idata;
-struct ble_att_read_group_type_adata;
-struct ble_att_prep_write_cmd;
-
-STATS_SECT_START(ble_gattc_stats)
-    STATS_SECT_ENTRY(mtu)
-    STATS_SECT_ENTRY(mtu_fail)
-    STATS_SECT_ENTRY(disc_all_svcs)
-    STATS_SECT_ENTRY(disc_all_svcs_fail)
-    STATS_SECT_ENTRY(disc_svc_uuid)
-    STATS_SECT_ENTRY(disc_svc_uuid_fail)
-    STATS_SECT_ENTRY(find_inc_svcs)
-    STATS_SECT_ENTRY(find_inc_svcs_fail)
-    STATS_SECT_ENTRY(disc_all_chrs)
-    STATS_SECT_ENTRY(disc_all_chrs_fail)
-    STATS_SECT_ENTRY(disc_chrs_uuid)
-    STATS_SECT_ENTRY(disc_chrs_uuid_fail)
-    STATS_SECT_ENTRY(disc_all_dscs)
-    STATS_SECT_ENTRY(disc_all_dscs_fail)
-    STATS_SECT_ENTRY(read)
-    STATS_SECT_ENTRY(read_fail)
-    STATS_SECT_ENTRY(read_uuid)
-    STATS_SECT_ENTRY(read_uuid_fail)
-    STATS_SECT_ENTRY(read_long)
-    STATS_SECT_ENTRY(read_long_fail)
-    STATS_SECT_ENTRY(read_mult)
-    STATS_SECT_ENTRY(read_mult_fail)
-    STATS_SECT_ENTRY(write_no_rsp)
-    STATS_SECT_ENTRY(write_no_rsp_fail)
-    STATS_SECT_ENTRY(write)
-    STATS_SECT_ENTRY(write_fail)
-    STATS_SECT_ENTRY(write_long)
-    STATS_SECT_ENTRY(write_long_fail)
-    STATS_SECT_ENTRY(write_reliable)
-    STATS_SECT_ENTRY(write_reliable_fail)
-    STATS_SECT_ENTRY(notify)
-    STATS_SECT_ENTRY(notify_fail)
-    STATS_SECT_ENTRY(indicate)
-    STATS_SECT_ENTRY(indicate_fail)
-    STATS_SECT_ENTRY(proc_timeout)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_gattc_stats) ble_gattc_stats;
-
-STATS_SECT_START(ble_gatts_stats)
-    STATS_SECT_ENTRY(svcs)
-    STATS_SECT_ENTRY(chrs)
-    STATS_SECT_ENTRY(dscs)
-    STATS_SECT_ENTRY(svc_def_reads)
-    STATS_SECT_ENTRY(svc_inc_reads)
-    STATS_SECT_ENTRY(chr_def_reads)
-    STATS_SECT_ENTRY(chr_val_reads)
-    STATS_SECT_ENTRY(chr_val_writes)
-    STATS_SECT_ENTRY(dsc_reads)
-    STATS_SECT_ENTRY(dsc_writes)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_gatts_stats) ble_gatts_stats;
-
-#define BLE_GATT_CHR_DECL_SZ_16     5
-#define BLE_GATT_CHR_DECL_SZ_128    19
-
-typedef uint8_t ble_gatts_conn_flags;
-
-struct ble_gatts_conn {
-    struct ble_gatts_clt_cfg *clt_cfgs;
-    int num_clt_cfgs;
-
-    uint16_t indicate_val_handle;
-};
-
-/*** @client. */
-
-int ble_gattc_locked_by_cur_task(void);
-void ble_gatts_indicate_fail_notconn(uint16_t conn_handle);
-
-void ble_gattc_rx_err(uint16_t conn_handle, uint16_t handle, uint16_t status);
-void ble_gattc_rx_mtu(uint16_t conn_handle, int status, uint16_t chan_mtu);
-void ble_gattc_rx_read_type_adata(uint16_t conn_handle,
-                                  struct ble_att_read_type_adata *adata);
-void ble_gattc_rx_read_type_complete(uint16_t conn_handle, int status);
-void ble_gattc_rx_read_rsp(uint16_t conn_handle, int status,
-                           struct os_mbuf **rxom);
-void ble_gattc_rx_read_blob_rsp(uint16_t conn_handle, int status,
-                                struct os_mbuf **rxom);
-void ble_gattc_rx_read_mult_rsp(uint16_t conn_handle, int status,
-                                struct os_mbuf **rxom);
-void ble_gattc_rx_read_group_type_adata(
-    uint16_t conn_handle, struct ble_att_read_group_type_adata *adata);
-void ble_gattc_rx_read_group_type_complete(uint16_t conn_handle, int rc);
-void ble_gattc_rx_find_type_value_hinfo(
-    uint16_t conn_handle, struct ble_att_find_type_value_hinfo *hinfo);
-void ble_gattc_rx_find_type_value_complete(uint16_t conn_handle, int status);
-void ble_gattc_rx_write_rsp(uint16_t conn_handle);
-void ble_gattc_rx_prep_write_rsp(uint16_t conn_handle, int status,
-                                 uint16_t handle, uint16_t offset,
-                                 struct os_mbuf **rxom);
-void ble_gattc_rx_exec_write_rsp(uint16_t conn_handle, int status);
-void ble_gattc_rx_indicate_rsp(uint16_t conn_handle);
-void ble_gattc_rx_find_info_idata(uint16_t conn_handle,
-                                  struct ble_att_find_info_idata *idata);
-void ble_gattc_rx_find_info_complete(uint16_t conn_handle, int status);
-void ble_gattc_connection_txable(uint16_t conn_handle);
-void ble_gattc_connection_broken(uint16_t conn_handle);
-int32_t ble_gattc_timer(void);
-
-int ble_gattc_any_jobs(void);
-int ble_gattc_init(void);
-
-/*** @server. */
-#define BLE_GATTS_CLT_CFG_F_NOTIFY              0x0001
-#define BLE_GATTS_CLT_CFG_F_INDICATE            0x0002
-#define BLE_GATTS_CLT_CFG_F_MODIFIED            0x0080 /* Internal only. */
-#define BLE_GATTS_CLT_CFG_F_RESERVED            0xfffc
-
-#define BLE_GATTS_INC_SVC_LEN_NO_UUID           4
-#define BLE_GATTS_INC_SVC_LEN_UUID              6
-
-/**
- * Contains counts of resources required by the GATT server.  The contents of
- * this struct are generally used to populate a configuration struct before
- * the host is initialized.
- */
-struct ble_gatt_resources {
-    /** Number of services. */
-    uint16_t svcs;
-
-    /** Number of included services. */
-    uint16_t incs;
-
-    /** Number of characteristics. */
-    uint16_t chrs;
-
-    /** Number of descriptors. */
-    uint16_t dscs;
-
-    /**
-     * Number of client characteristic configuration descriptors.  Each of
-     * these also contributes to the total descriptor count.
-     */
-    uint16_t cccds;
-
-    /** Total number of ATT attributes. */
-    uint16_t attrs;
-};
-
-int ble_gatts_rx_indicate_ack(uint16_t conn_handle, uint16_t chr_val_handle);
-int ble_gatts_send_next_indicate(uint16_t conn_handle);
-void ble_gatts_tx_notifications(void);
-void ble_gatts_bonding_established(uint16_t conn_handle);
-void ble_gatts_bonding_restored(uint16_t conn_handle);
-void ble_gatts_connection_broken(uint16_t conn_handle);
-void ble_gatts_lcl_svc_foreach(ble_gatt_svc_foreach_fn cb, void *arg);
-int ble_gatts_register_svcs(const struct ble_gatt_svc_def *svcs,
-                            ble_gatt_register_fn *register_cb,
-                            void *cb_arg);
-int ble_gatts_clt_cfg_access(uint16_t conn_handle, uint16_t attr_handle,
-                             uint8_t op, uint16_t offset, struct os_mbuf **om,
-                             void *arg);
-
-/*** @misc. */
-int ble_gatts_conn_can_alloc(void);
-int ble_gatts_conn_init(struct ble_gatts_conn *gatts_conn);
-int ble_gatts_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_hs_conn_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_hs_conn_priv.h
deleted file mode 100644
index 92aacd405..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_hs_conn_priv.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_CONN_
-#define H_BLE_HS_CONN_
-
-#include <inttypes.h>
-#include "ble_l2cap_priv.h"
-#include "ble_gatt_priv.h"
-#include "ble_att_priv.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct hci_le_conn_complete;
-struct hci_create_conn;
-struct ble_l2cap_chan;
-
-typedef uint8_t ble_hs_conn_flags_t;
-
-#define BLE_HS_CONN_F_MASTER        0x01
-#define BLE_HS_CONN_F_TERMINATING   0x02
-#define BLE_HS_CONN_F_TX_FRAG       0x04 /* Cur ACL packet partially txed. */
-
-struct ble_hs_conn {
-    SLIST_ENTRY(ble_hs_conn) bhc_next;
-    uint16_t bhc_handle;
-    uint8_t bhc_our_addr_type;
-#if MYNEWT_VAL(BLE_EXT_ADV)
-    uint8_t bhc_our_rnd_addr[6];
-#endif
-    ble_addr_t bhc_peer_addr;
-    ble_addr_t bhc_our_rpa_addr;
-    ble_addr_t bhc_peer_rpa_addr;
-
-    uint16_t bhc_itvl;
-    uint16_t bhc_latency;
-    uint16_t bhc_supervision_timeout;
-    uint8_t bhc_master_clock_accuracy;
-
-    uint32_t supported_feat;
-
-    ble_hs_conn_flags_t bhc_flags;
-
-    struct ble_l2cap_chan_list bhc_channels;
-    struct ble_l2cap_chan *bhc_rx_chan; /* Channel rxing current packet. */
-    ble_npl_time_t bhc_rx_timeout;
-
-    /**
-     * Count of packets sent over this connection that the controller has not
-     * transmitted or flushed yet.
-     */
-    uint16_t bhc_outstanding_pkts;
-
-#if MYNEWT_VAL(BLE_HS_FLOW_CTRL)
-    /**
-     * Count of packets received over this connection that have been processed
-     * and freed.
-     */
-    uint16_t bhc_completed_pkts;
-#endif
-
-    /** Queue of outgoing packets that could not be sent. */
-    STAILQ_HEAD(, os_mbuf_pkthdr) bhc_tx_q;
-
-    struct ble_att_svr_conn bhc_att_svr;
-    struct ble_gatts_conn bhc_gatt_svr;
-
-    struct ble_gap_sec_state bhc_sec_state;
-
-    ble_gap_event_fn *bhc_cb;
-    void *bhc_cb_arg;
-};
-
-struct ble_hs_conn_addrs {
-    ble_addr_t our_id_addr;
-    ble_addr_t peer_id_addr;
-    ble_addr_t our_ota_addr;
-    ble_addr_t peer_ota_addr;
-};
-
-int ble_hs_conn_can_alloc(void);
-struct ble_hs_conn *ble_hs_conn_alloc(uint16_t conn_handle);
-void ble_hs_conn_free(struct ble_hs_conn *conn);
-void ble_hs_conn_insert(struct ble_hs_conn *conn);
-void ble_hs_conn_remove(struct ble_hs_conn *conn);
-struct ble_hs_conn *ble_hs_conn_find(uint16_t conn_handle);
-struct ble_hs_conn *ble_hs_conn_find_assert(uint16_t conn_handle);
-struct ble_hs_conn *ble_hs_conn_find_by_addr(const ble_addr_t *addr);
-struct ble_hs_conn *ble_hs_conn_find_by_idx(int idx);
-int ble_hs_conn_exists(uint16_t conn_handle);
-struct ble_hs_conn *ble_hs_conn_first(void);
-struct ble_l2cap_chan *ble_hs_conn_chan_find_by_scid(struct ble_hs_conn *conn,
-                                             uint16_t cid);
-struct ble_l2cap_chan *ble_hs_conn_chan_find_by_dcid(struct ble_hs_conn *conn,
-                                             uint16_t cid);
-int ble_hs_conn_chan_insert(struct ble_hs_conn *conn,
-                            struct ble_l2cap_chan *chan);
-void
-ble_hs_conn_delete_chan(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan);
-
-void ble_hs_conn_addrs(const struct ble_hs_conn *conn,
-                       struct ble_hs_conn_addrs *addrs);
-int32_t ble_hs_conn_timer(void);
-
-int ble_hs_conn_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_coc_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_coc_priv.h
deleted file mode 100644
index 0a1a97b77..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_coc_priv.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_L2CAP_COC_PRIV_
-#define H_L2CAP_COC_PRIV_
-
-#include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "os/queue.h"
-#include "os/os_mbuf.h"
-#include "host/ble_l2cap.h"
-#include "ble_l2cap_sig_priv.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BLE_L2CAP_COC_CID_START                 0x0040
-#define BLE_L2CAP_COC_CID_END                   0x007F
-
-struct ble_l2cap_chan;
-
-#define BLE_L2CAP_COC_FLAG_STALLED              0x01
-
-struct ble_l2cap_coc_endpoint {
-    struct os_mbuf *sdu;
-    uint16_t mtu;
-    uint16_t credits;
-    uint16_t data_offset;
-    uint8_t flags;
-};
-
-struct ble_l2cap_coc_srv {
-    STAILQ_ENTRY(ble_l2cap_coc_srv) next;
-    uint16_t psm;
-    uint16_t mtu;
-    ble_l2cap_event_fn *cb;
-    void *cb_arg;
-};
-
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0
-int ble_l2cap_coc_init(void);
-int ble_l2cap_coc_create_server(uint16_t psm, uint16_t mtu,
-                                ble_l2cap_event_fn *cb, void *cb_arg);
-int ble_l2cap_coc_create_srv_chan(uint16_t conn_handle, uint16_t psm,
-                                  struct ble_l2cap_chan **chan);
-struct ble_l2cap_chan * ble_l2cap_coc_chan_alloc(uint16_t conn_handle,
-                                                 uint16_t psm, uint16_t mtu,
-                                                 struct os_mbuf *sdu_rx,
-                                                 ble_l2cap_event_fn *cb,
-                                                 void *cb_arg);
-void ble_l2cap_coc_cleanup_chan(struct ble_l2cap_chan *chan);
-void ble_l2cap_coc_le_credits_update(uint16_t conn_handle, uint16_t dcid,
-                                    uint16_t credits);
-int ble_l2cap_coc_recv_ready(struct ble_l2cap_chan *chan,
-                             struct os_mbuf *sdu_rx);
-int ble_l2cap_coc_send(struct ble_l2cap_chan *chan, struct os_mbuf *sdu_tx);
-#else
-#define ble_l2cap_coc_init()                                    0
-#define ble_l2cap_coc_create_server(psm, mtu, cb, cb_arg)       BLE_HS_ENOTSUP
-#define ble_l2cap_coc_recv_ready(chan, sdu_rx)                  BLE_HS_ENOTSUP
-#define ble_l2cap_coc_cleanup_chan(chan)
-#define ble_l2cap_coc_send(chan, sdu_tx)                        BLE_HS_ENOTSUP
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_L2CAP_COC_PRIV_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_priv.h
deleted file mode 100644
index 640974d2a..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_priv.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_L2CAP_PRIV_
-#define H_L2CAP_PRIV_
-
-#include "ble_l2cap_coc_priv.h"
-#include "host/ble_l2cap.h"
-#include <inttypes.h>
-#include "stats/stats.h"
-#include "os/queue.h"
-#include "os/os_mbuf.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_hs_conn;
-struct hci_data_hdr;
-
-STATS_SECT_START(ble_l2cap_stats)
-    STATS_SECT_ENTRY(chan_create)
-    STATS_SECT_ENTRY(chan_delete)
-    STATS_SECT_ENTRY(update_init)
-    STATS_SECT_ENTRY(update_rx)
-    STATS_SECT_ENTRY(update_fail)
-    STATS_SECT_ENTRY(proc_timeout)
-    STATS_SECT_ENTRY(sig_tx)
-    STATS_SECT_ENTRY(sig_rx)
-    STATS_SECT_ENTRY(sm_tx)
-    STATS_SECT_ENTRY(sm_rx)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_l2cap_stats) ble_l2cap_stats;
-
-extern struct os_mempool ble_l2cap_chan_pool;
-
-/* This is nimble specific; packets sent to the black hole CID do not elicit
- * an "invalid CID" response.
- */
-#define BLE_L2CAP_CID_BLACK_HOLE    0xffff
-
-#define BLE_L2CAP_HDR_SZ    4
-
-typedef uint8_t ble_l2cap_chan_flags;
-
-typedef int ble_l2cap_rx_fn(struct ble_l2cap_chan *chan);
-
-struct ble_l2cap_chan {
-    SLIST_ENTRY(ble_l2cap_chan) next;
-    uint16_t conn_handle;
-    uint16_t dcid;
-    uint16_t scid;
-    uint16_t my_mtu;
-    uint16_t peer_mtu;      /* 0 if not exchanged. */
-    ble_l2cap_chan_flags flags;
-
-    struct os_mbuf *rx_buf;
-    uint16_t rx_len;        /* Length of current reassembled rx packet. */
-
-    ble_l2cap_rx_fn *rx_fn;
-
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0
-    uint16_t psm;
-    struct ble_l2cap_coc_endpoint coc_rx;
-    struct ble_l2cap_coc_endpoint coc_tx;
-    uint16_t initial_credits;
-    ble_l2cap_event_fn *cb;
-    void *cb_arg;
-#endif
-};
-
-struct ble_l2cap_hdr {
-    uint16_t len;
-    uint16_t cid;
-};
-
-typedef int ble_l2cap_tx_fn(struct ble_hs_conn *conn,
-                            struct ble_l2cap_chan *chan);
-
-#define BLE_L2CAP_CHAN_F_TXED_MTU       0x01    /* We have sent our MTU. */
-
-SLIST_HEAD(ble_l2cap_chan_list, ble_l2cap_chan);
-
-int ble_l2cap_parse_hdr(struct os_mbuf *om, int off,
-                        struct ble_l2cap_hdr *l2cap_hdr);
-struct os_mbuf *ble_l2cap_prepend_hdr(struct os_mbuf *om, uint16_t cid,
-                                      uint16_t len);
-
-struct ble_l2cap_chan *ble_l2cap_chan_alloc(uint16_t conn_handle);
-void ble_l2cap_chan_free(struct ble_l2cap_chan *chan);
-
-bool ble_l2cap_is_mtu_req_sent(const struct ble_l2cap_chan *chan);
-
-int ble_l2cap_rx(struct ble_hs_conn *conn,
-                 struct hci_data_hdr *hci_hdr,
-                 struct os_mbuf *om,
-                 ble_l2cap_rx_fn **out_rx_cb,
-                 int *out_reject_cid);
-int ble_l2cap_tx(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
-                 struct os_mbuf *txom);
-
-void ble_l2cap_remove_rx(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan);
-
-int ble_l2cap_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_sig_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_sig_priv.h
deleted file mode 100644
index 1a6fb8293..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/ble_l2cap_sig_priv.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_L2CAP_SIG_
-#define H_BLE_L2CAP_SIG_
-
-#include "syscfg/syscfg.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BLE_L2CAP_SIG_MTU           100  /* This is our own default. */
-
-#define BLE_L2CAP_SIG_HDR_SZ                4
-struct ble_l2cap_sig_hdr {
-    uint8_t op;
-    uint8_t identifier;
-    uint16_t length;
-    uint8_t data[0];
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_REJECT_MIN_SZ         2
-struct ble_l2cap_sig_reject {
-    uint16_t reason;
-    uint8_t data[0];
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_UPDATE_REQ_SZ         8
-struct ble_l2cap_sig_update_req {
-    uint16_t itvl_min;
-    uint16_t itvl_max;
-    uint16_t slave_latency;
-    uint16_t timeout_multiplier;
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_UPDATE_RSP_SZ         2
-struct ble_l2cap_sig_update_rsp {
-    uint16_t result;
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_UPDATE_RSP_RESULT_ACCEPT  0x0000
-#define BLE_L2CAP_SIG_UPDATE_RSP_RESULT_REJECT  0x0001
-
-struct ble_l2cap_sig_le_con_req {
-    uint16_t psm;
-    uint16_t scid;
-    uint16_t mtu;
-    uint16_t mps;
-    uint16_t credits;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_le_con_rsp {
-    uint16_t dcid;
-    uint16_t mtu;
-    uint16_t mps;
-    uint16_t credits;
-    uint16_t result;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_disc_req {
-    uint16_t dcid;
-    uint16_t scid;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_disc_rsp {
-    uint16_t dcid;
-    uint16_t scid;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_le_credits {
-    uint16_t scid;
-    uint16_t credits;
-} __attribute__((packed));
-
-void ble_l2cap_sig_hdr_parse(void *payload, uint16_t len,
-                             struct ble_l2cap_sig_hdr *hdr);
-int ble_l2cap_sig_reject_tx(uint16_t conn_handle,
-                            uint8_t id, uint16_t reason,
-                            void *data, int data_len);
-int ble_l2cap_sig_reject_invalid_cid_tx(uint16_t conn_handle, uint8_t id,
-                                        uint16_t src_cid, uint16_t dst_cid);
-int ble_l2cap_sig_tx(uint16_t conn_handle, struct os_mbuf *txom);
-void *ble_l2cap_sig_cmd_get(uint8_t opcode, uint8_t id, uint16_t len,
-                            struct os_mbuf **txom);
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0
-int ble_l2cap_sig_coc_connect(uint16_t conn_handle, uint16_t psm, uint16_t mtu,
-                              struct os_mbuf *sdu_rx,
-                              ble_l2cap_event_fn *cb, void *cb_arg);
-int ble_l2cap_sig_disconnect(struct ble_l2cap_chan *chan);
-int ble_l2cap_sig_le_credits(uint16_t conn_handle, uint16_t scid,
-                             uint16_t credits);
-#else
-#define ble_l2cap_sig_coc_connect(conn_handle, psm, mtu, sdu_rx, cb, cb_arg) \
-                                                                BLE_HS_ENOTSUP
-#define ble_l2cap_sig_disconnect(chan)                          BLE_HS_ENOTSUP
-#endif
-
-void ble_l2cap_sig_conn_broken(uint16_t conn_handle, int reason);
-int32_t ble_l2cap_sig_timer(void);
-struct ble_l2cap_chan *ble_l2cap_sig_create_chan(uint16_t conn_handle);
-int ble_l2cap_sig_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gatt_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gatt_priv.h
deleted file mode 100644
index 4a59635b8..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gatt_priv.h
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_GATT_PRIV_
-#define H_BLE_GATT_PRIV_
-
-#include "syscfg/syscfg.h"
-#include "stats/stats.h"
-#include "host/ble_gatt.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_att_read_type_adata;
-struct ble_att_find_type_value_hinfo;
-struct ble_att_find_info_idata;
-struct ble_att_read_group_type_adata;
-struct ble_att_prep_write_cmd;
-
-STATS_SECT_START(ble_gattc_stats)
-    STATS_SECT_ENTRY(mtu)
-    STATS_SECT_ENTRY(mtu_fail)
-    STATS_SECT_ENTRY(disc_all_svcs)
-    STATS_SECT_ENTRY(disc_all_svcs_fail)
-    STATS_SECT_ENTRY(disc_svc_uuid)
-    STATS_SECT_ENTRY(disc_svc_uuid_fail)
-    STATS_SECT_ENTRY(find_inc_svcs)
-    STATS_SECT_ENTRY(find_inc_svcs_fail)
-    STATS_SECT_ENTRY(disc_all_chrs)
-    STATS_SECT_ENTRY(disc_all_chrs_fail)
-    STATS_SECT_ENTRY(disc_chrs_uuid)
-    STATS_SECT_ENTRY(disc_chrs_uuid_fail)
-    STATS_SECT_ENTRY(disc_all_dscs)
-    STATS_SECT_ENTRY(disc_all_dscs_fail)
-    STATS_SECT_ENTRY(read)
-    STATS_SECT_ENTRY(read_fail)
-    STATS_SECT_ENTRY(read_uuid)
-    STATS_SECT_ENTRY(read_uuid_fail)
-    STATS_SECT_ENTRY(read_long)
-    STATS_SECT_ENTRY(read_long_fail)
-    STATS_SECT_ENTRY(read_mult)
-    STATS_SECT_ENTRY(read_mult_fail)
-    STATS_SECT_ENTRY(write_no_rsp)
-    STATS_SECT_ENTRY(write_no_rsp_fail)
-    STATS_SECT_ENTRY(write)
-    STATS_SECT_ENTRY(write_fail)
-    STATS_SECT_ENTRY(write_long)
-    STATS_SECT_ENTRY(write_long_fail)
-    STATS_SECT_ENTRY(write_reliable)
-    STATS_SECT_ENTRY(write_reliable_fail)
-    STATS_SECT_ENTRY(notify)
-    STATS_SECT_ENTRY(notify_fail)
-    STATS_SECT_ENTRY(indicate)
-    STATS_SECT_ENTRY(indicate_fail)
-    STATS_SECT_ENTRY(proc_timeout)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_gattc_stats) ble_gattc_stats;
-
-STATS_SECT_START(ble_gatts_stats)
-    STATS_SECT_ENTRY(svcs)
-    STATS_SECT_ENTRY(chrs)
-    STATS_SECT_ENTRY(dscs)
-    STATS_SECT_ENTRY(svc_def_reads)
-    STATS_SECT_ENTRY(svc_inc_reads)
-    STATS_SECT_ENTRY(chr_def_reads)
-    STATS_SECT_ENTRY(chr_val_reads)
-    STATS_SECT_ENTRY(chr_val_writes)
-    STATS_SECT_ENTRY(dsc_reads)
-    STATS_SECT_ENTRY(dsc_writes)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_gatts_stats) ble_gatts_stats;
-
-#define BLE_GATT_CHR_DECL_SZ_16     5
-#define BLE_GATT_CHR_DECL_SZ_128    19
-
-typedef uint8_t ble_gatts_conn_flags;
-
-struct ble_gatts_conn {
-    struct ble_gatts_clt_cfg *clt_cfgs;
-    int num_clt_cfgs;
-
-    uint16_t indicate_val_handle;
-};
-
-/*** @client. */
-
-int ble_gattc_locked_by_cur_task(void);
-void ble_gatts_indicate_fail_notconn(uint16_t conn_handle);
-
-void ble_gattc_rx_err(uint16_t conn_handle, uint16_t handle, uint16_t status);
-void ble_gattc_rx_mtu(uint16_t conn_handle, int status, uint16_t chan_mtu);
-void ble_gattc_rx_read_type_adata(uint16_t conn_handle,
-                                  struct ble_att_read_type_adata *adata);
-void ble_gattc_rx_read_type_complete(uint16_t conn_handle, int status);
-void ble_gattc_rx_read_rsp(uint16_t conn_handle, int status,
-                           struct os_mbuf **rxom);
-void ble_gattc_rx_read_blob_rsp(uint16_t conn_handle, int status,
-                                struct os_mbuf **rxom);
-void ble_gattc_rx_read_mult_rsp(uint16_t conn_handle, int status,
-                                struct os_mbuf **rxom);
-void ble_gattc_rx_read_group_type_adata(
-    uint16_t conn_handle, struct ble_att_read_group_type_adata *adata);
-void ble_gattc_rx_read_group_type_complete(uint16_t conn_handle, int rc);
-void ble_gattc_rx_find_type_value_hinfo(
-    uint16_t conn_handle, struct ble_att_find_type_value_hinfo *hinfo);
-void ble_gattc_rx_find_type_value_complete(uint16_t conn_handle, int status);
-void ble_gattc_rx_write_rsp(uint16_t conn_handle);
-void ble_gattc_rx_prep_write_rsp(uint16_t conn_handle, int status,
-                                 uint16_t handle, uint16_t offset,
-                                 struct os_mbuf **rxom);
-void ble_gattc_rx_exec_write_rsp(uint16_t conn_handle, int status);
-void ble_gattc_rx_indicate_rsp(uint16_t conn_handle);
-void ble_gattc_rx_find_info_idata(uint16_t conn_handle,
-                                  struct ble_att_find_info_idata *idata);
-void ble_gattc_rx_find_info_complete(uint16_t conn_handle, int status);
-void ble_gattc_connection_txable(uint16_t conn_handle);
-void ble_gattc_connection_broken(uint16_t conn_handle);
-int32_t ble_gattc_timer(void);
-
-int ble_gattc_any_jobs(void);
-int ble_gattc_init(void);
-
-/*** @server. */
-#define BLE_GATTS_CLT_CFG_F_NOTIFY              0x0001
-#define BLE_GATTS_CLT_CFG_F_INDICATE            0x0002
-#define BLE_GATTS_CLT_CFG_F_MODIFIED            0x0080 /* Internal only. */
-#define BLE_GATTS_CLT_CFG_F_RESERVED            0xfffc
-
-#define BLE_GATTS_INC_SVC_LEN_NO_UUID           4
-#define BLE_GATTS_INC_SVC_LEN_UUID              6
-
-/**
- * Contains counts of resources required by the GATT server.  The contents of
- * this struct are generally used to populate a configuration struct before
- * the host is initialized.
- */
-struct ble_gatt_resources {
-    /** Number of services. */
-    uint16_t svcs;
-
-    /** Number of included services. */
-    uint16_t incs;
-
-    /** Number of characteristics. */
-    uint16_t chrs;
-
-    /** Number of descriptors. */
-    uint16_t dscs;
-
-    /**
-     * Number of client characteristic configuration descriptors.  Each of
-     * these also contributes to the total descriptor count.
-     */
-    uint16_t cccds;
-
-    /** Total number of ATT attributes. */
-    uint16_t attrs;
-};
-
-int ble_gatts_rx_indicate_ack(uint16_t conn_handle, uint16_t chr_val_handle);
-int ble_gatts_send_next_indicate(uint16_t conn_handle);
-void ble_gatts_tx_notifications(void);
-void ble_gatts_bonding_established(uint16_t conn_handle);
-void ble_gatts_bonding_restored(uint16_t conn_handle);
-void ble_gatts_connection_broken(uint16_t conn_handle);
-void ble_gatts_lcl_svc_foreach(ble_gatt_svc_foreach_fn cb, void *arg);
-int ble_gatts_register_svcs(const struct ble_gatt_svc_def *svcs,
-                            ble_gatt_register_fn *register_cb,
-                            void *cb_arg);
-int ble_gatts_clt_cfg_access(uint16_t conn_handle, uint16_t attr_handle,
-                             uint8_t op, uint16_t offset, struct os_mbuf **om,
-                             void *arg);
-
-/*** @misc. */
-int ble_gatts_conn_can_alloc(void);
-int ble_gatts_conn_init(struct ble_gatts_conn *gatts_conn);
-int ble_gatts_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_hci_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_hci_priv.h
deleted file mode 100644
index 362f12cbd..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_hci_priv.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_HCI_PRIV_
-#define H_BLE_HS_HCI_PRIV_
-
-#include "nimble/hci_common.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_hs_conn;
-struct os_mbuf;
-
-#define BLE_HS_HCI_LE_FEAT_ENCRYPTION                   (0x00000001)
-#define BLE_HS_HCI_LE_FEAT_CONN_PARAM_REQUEST           (0x00000002)
-#define BLE_HS_HCI_LE_FEAT_EXT_REJECT                   (0x00000004)
-#define BLE_HS_HCI_LE_FEAT_SLAVE_FEAT_EXCHANGE          (0x00000008)
-#define BLE_HS_HCI_LE_FEAT_PING                         (0x00000010)
-#define BLE_HS_HCI_LE_FEAT_DATA_PACKET_LENGTH_EXT       (0x00000020)
-#define BLE_HS_HCI_LE_FEAT_LL_PRIVACY                   (0x00000040)
-#define BLE_HS_HCI_LE_FEAT_EXT_SCANNER_FILTER_POLICIES  (0x00000080)
-#define BLE_HS_HCI_LE_FEAT_2M_PHY                       (0x00000100)
-#define BLE_HS_HCI_LE_FEAT_STABLE_MOD_INDEX_TX          (0x00000200)
-#define BLE_HS_HCI_LE_FEAT_STABLE_MOD_INDEX_RX          (0x00000400)
-#define BLE_HS_HCI_LE_FEAT_CODED_PHY                    (0x00000800)
-#define BLE_HS_HCI_LE_FEAT_EXT_ADV                      (0x00001000)
-#define BLE_HS_HCI_LE_FEAT_PERIODIC_ADV                 (0x00002000)
-#define BLE_HS_HCI_LE_FEAT_CSA2                         (0x00004000)
-#define BLE_HS_HCI_LE_FEAT_POWER_CLASS_1                (0x00008000)
-#define BLE_HS_HCI_LE_FEAT_MIN_NUM_USED_CHAN            (0x00010000)
-
-struct ble_hs_hci_ack {
-    int bha_status;         /* A BLE_HS_E<...> error; NOT a naked HCI code. */
-    const uint8_t *bha_params;
-    int bha_params_len;
-    uint16_t bha_opcode;
-    uint8_t bha_hci_handle;
-};
-
-#if MYNEWT_VAL(BLE_EXT_ADV)
-struct ble_hs_hci_ext_scan_param {
-    uint8_t scan_type;
-    uint16_t scan_itvl;
-    uint16_t scan_window;
-};
-
-struct ble_hs_hci_ext_conn_params {
-    uint16_t scan_itvl;
-    uint16_t scan_window;
-    uint16_t conn_itvl;
-    uint16_t conn_windows;
-};
-
-#if MYNEWT_VAL(BLE_PERIODIC_ADV)
-/* Periodic Advertising Parameters */
-struct hci_periodic_adv_params
-{
-    uint16_t min_interval;
-    uint16_t max_interval;
-    uint16_t properties;
-};
-#endif
-#endif
-
-extern uint16_t ble_hs_hci_avail_pkts;
-
-int ble_hs_hci_cmd_tx(uint16_t opcode, const void *cmd, uint8_t cmd_len,
-                      void *rsp, uint8_t rsp_len);
-void ble_hs_hci_init(void);
-void ble_hs_hci_deinit(void);
-
-void ble_hs_hci_set_le_supported_feat(uint32_t feat);
-uint32_t ble_hs_hci_get_le_supported_feat(void);
-void ble_hs_hci_set_hci_version(uint8_t hci_version);
-uint8_t ble_hs_hci_get_hci_version(void);
-
-#if MYNEWT_VAL(BLE_HS_PHONY_HCI_ACKS)
-typedef int ble_hs_hci_phony_ack_fn(uint8_t *ack, int ack_buf_len);
-void ble_hs_hci_set_phony_ack_cb(ble_hs_hci_phony_ack_fn *cb);
-#endif
-
-int ble_hs_hci_util_read_adv_tx_pwr(int8_t *out_pwr);
-int ble_hs_hci_util_rand(void *dst, int len);
-int ble_hs_hci_util_read_rssi(uint16_t conn_handle, int8_t *out_rssi);
-int ble_hs_hci_util_set_random_addr(const uint8_t *addr);
-int ble_hs_hci_util_data_hdr_strip(struct os_mbuf *om,
-                                   struct hci_data_hdr *out_hdr);
-int ble_hs_hci_evt_process(const struct ble_hci_ev *ev);
-
-int ble_hs_hci_cmd_send_buf(uint16_t opcode, const void *buf, uint8_t buf_len);
-int ble_hs_hci_set_buf_sz(uint16_t pktlen, uint16_t max_pkts);
-void ble_hs_hci_add_avail_pkts(uint16_t delta);
-
-uint16_t ble_hs_hci_util_handle_pb_bc_join(uint16_t handle, uint8_t pb,
-                                           uint8_t bc);
-
-int ble_hs_hci_acl_tx_now(struct ble_hs_conn *conn, struct os_mbuf **om);
-int ble_hs_hci_acl_tx(struct ble_hs_conn *conn, struct os_mbuf **om);
-
-int ble_hs_hci_frag_num_mbufs(void);
-int ble_hs_hci_frag_num_mbufs_free(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_periodic_sync_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_periodic_sync_priv.h
deleted file mode 100644
index c82ea7904..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_periodic_sync_priv.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_PERIODIC_SYNC_
-#define H_BLE_HS_PERIODIC_SYNC_
-
-#include <inttypes.h>
-#include "os/queue.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_hs_periodic_sync {
-    SLIST_ENTRY(ble_hs_periodic_sync) next;
-    uint16_t   sync_handle;
-    ble_addr_t advertiser_addr;
-    uint8_t    adv_sid;
-
-    ble_gap_event_fn *cb;
-    void *cb_arg;
-
-    struct ble_npl_event lost_ev;
-};
-
-struct ble_hs_periodic_sync *ble_hs_periodic_sync_alloc(void);
-void ble_hs_periodic_sync_free(struct ble_hs_periodic_sync *psync);
-void ble_hs_periodic_sync_insert(struct ble_hs_periodic_sync *psync);
-void ble_hs_periodic_sync_remove(struct ble_hs_periodic_sync *psync);
-struct ble_hs_periodic_sync *ble_hs_periodic_sync_find_by_handle(uint16_t sync_handle);
-struct ble_hs_periodic_sync *ble_hs_periodic_sync_find(const ble_addr_t *addr,
-                                                       uint8_t sid);
-struct ble_hs_periodic_sync *ble_hs_periodic_sync_first(void);
-int ble_hs_periodic_sync_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_coc_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_coc_priv.h
deleted file mode 100644
index 5ebdaa050..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_coc_priv.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_L2CAP_COC_PRIV_
-#define H_L2CAP_COC_PRIV_
-
-#include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "os/queue.h"
-#include "os/os_mbuf.h"
-#include "host/ble_l2cap.h"
-#include "ble_l2cap_sig_priv.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BLE_L2CAP_COC_CID_START                 0x0040
-#define BLE_L2CAP_COC_CID_END                   0x007F
-
-struct ble_l2cap_chan;
-
-#define BLE_L2CAP_COC_FLAG_STALLED              0x01
-
-struct ble_l2cap_coc_endpoint {
-    struct os_mbuf *sdu;
-    uint16_t mtu;
-    uint16_t credits;
-    uint16_t data_offset;
-    uint8_t flags;
-};
-
-struct ble_l2cap_coc_srv {
-    STAILQ_ENTRY(ble_l2cap_coc_srv) next;
-    uint16_t psm;
-    uint16_t mtu;
-    ble_l2cap_event_fn *cb;
-    void *cb_arg;
-};
-
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0
-int ble_l2cap_coc_init(void);
-int ble_l2cap_coc_create_server(uint16_t psm, uint16_t mtu,
-                                ble_l2cap_event_fn *cb, void *cb_arg);
-int ble_l2cap_coc_create_srv_chan(struct ble_hs_conn *conn, uint16_t psm,
-                                  struct ble_l2cap_chan **chan);
-struct ble_l2cap_chan * ble_l2cap_coc_chan_alloc(struct ble_hs_conn *conn,
-                                                 uint16_t psm, uint16_t mtu,
-                                                 struct os_mbuf *sdu_rx,
-                                                 ble_l2cap_event_fn *cb,
-                                                 void *cb_arg);
-void ble_l2cap_coc_cleanup_chan(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan);
-void ble_l2cap_coc_le_credits_update(uint16_t conn_handle, uint16_t dcid,
-                                    uint16_t credits);
-int ble_l2cap_coc_recv_ready(struct ble_l2cap_chan *chan,
-                             struct os_mbuf *sdu_rx);
-int ble_l2cap_coc_send(struct ble_l2cap_chan *chan, struct os_mbuf *sdu_tx);
-void ble_l2cap_coc_set_new_mtu_mps(struct ble_l2cap_chan *chan, uint16_t mtu, uint16_t mps);
-#else
-static inline int
-ble_l2cap_coc_init(void) {
-    return 0;
-}
-
-static inline int
-ble_l2cap_coc_create_server(uint16_t psm, uint16_t mtu,
-                            ble_l2cap_event_fn *cb, void *cb_arg) {
-    return BLE_HS_ENOTSUP;
-}
-
-static inline int
-ble_l2cap_coc_recv_ready(struct ble_l2cap_chan *chan,
-                         struct os_mbuf *sdu_rx) {
-    return BLE_HS_ENOTSUP;
-}
-
-static inline void
-ble_l2cap_coc_cleanup_chan(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan) {
-}
-
-static inline int
-ble_l2cap_coc_send(struct ble_l2cap_chan *chan, struct os_mbuf *sdu_tx) {
-    return BLE_HS_ENOTSUP;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* H_L2CAP_COC_PRIV_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_priv.h
deleted file mode 100644
index e3409743b..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_priv.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_L2CAP_PRIV_
-#define H_L2CAP_PRIV_
-
-#include "ble_l2cap_coc_priv.h"
-#include "host/ble_l2cap.h"
-#include <inttypes.h>
-#include "stats/stats.h"
-#include "os/queue.h"
-#include "os/os_mbuf.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_hs_conn;
-struct hci_data_hdr;
-
-STATS_SECT_START(ble_l2cap_stats)
-    STATS_SECT_ENTRY(chan_create)
-    STATS_SECT_ENTRY(chan_delete)
-    STATS_SECT_ENTRY(update_init)
-    STATS_SECT_ENTRY(update_rx)
-    STATS_SECT_ENTRY(update_fail)
-    STATS_SECT_ENTRY(proc_timeout)
-    STATS_SECT_ENTRY(sig_tx)
-    STATS_SECT_ENTRY(sig_rx)
-    STATS_SECT_ENTRY(sm_tx)
-    STATS_SECT_ENTRY(sm_rx)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_l2cap_stats) ble_l2cap_stats;
-
-extern struct os_mempool ble_l2cap_chan_pool;
-
-/* This is nimble specific; packets sent to the black hole CID do not elicit
- * an "invalid CID" response.
- */
-#define BLE_L2CAP_CID_BLACK_HOLE    0xffff
-
-#define BLE_L2CAP_HDR_SZ    4
-
-typedef uint8_t ble_l2cap_chan_flags;
-
-typedef int ble_l2cap_rx_fn(struct ble_l2cap_chan *chan);
-
-struct ble_l2cap_chan {
-    SLIST_ENTRY(ble_l2cap_chan) next;
-    uint16_t conn_handle;
-    uint16_t dcid;
-    uint16_t scid;
-
-    /* Unions just to avoid confusion on MPS/MTU.
-     * In CoC context, L2CAP MTU is MPS
-     */
-    union {
-        uint16_t my_mtu;
-        uint16_t my_coc_mps;
-    };
-
-    union {
-        uint16_t peer_mtu;
-        uint16_t peer_coc_mps;
-    };
-
-    ble_l2cap_chan_flags flags;
-
-    struct os_mbuf *rx_buf;
-    uint16_t rx_len;        /* Length of current reassembled rx packet. */
-
-    ble_l2cap_rx_fn *rx_fn;
-
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0
-    uint16_t psm;
-    struct ble_l2cap_coc_endpoint coc_rx;
-    struct ble_l2cap_coc_endpoint coc_tx;
-    uint16_t initial_credits;
-    ble_l2cap_event_fn *cb;
-    void *cb_arg;
-#endif
-};
-
-struct ble_l2cap_hdr {
-    uint16_t len;
-    uint16_t cid;
-};
-
-typedef int ble_l2cap_tx_fn(struct ble_hs_conn *conn,
-                            struct ble_l2cap_chan *chan);
-
-#define BLE_L2CAP_CHAN_F_TXED_MTU       0x01    /* We have sent our MTU. */
-
-SLIST_HEAD(ble_l2cap_chan_list, ble_l2cap_chan);
-
-int ble_l2cap_parse_hdr(struct os_mbuf *om, int off,
-                        struct ble_l2cap_hdr *l2cap_hdr);
-struct os_mbuf *ble_l2cap_prepend_hdr(struct os_mbuf *om, uint16_t cid,
-                                      uint16_t len);
-
-struct ble_l2cap_chan *ble_l2cap_chan_alloc(uint16_t conn_handle);
-void ble_l2cap_chan_free(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan);
-
-bool ble_l2cap_is_mtu_req_sent(const struct ble_l2cap_chan *chan);
-
-int ble_l2cap_rx(struct ble_hs_conn *conn,
-                 struct hci_data_hdr *hci_hdr,
-                 struct os_mbuf *om,
-                 ble_l2cap_rx_fn **out_rx_cb,
-                 int *out_reject_cid);
-int ble_l2cap_tx(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan,
-                 struct os_mbuf *txom);
-
-void ble_l2cap_remove_rx(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan);
-
-int ble_l2cap_init(void);
-
-/* Below experimental API is available when BLE_VERSION >= 52 */
-int ble_l2cap_enhanced_connect(uint16_t conn_handle,
-                               uint16_t psm, uint16_t mtu,
-                               uint8_t num, struct os_mbuf *sdu_rx[],
-                               ble_l2cap_event_fn *cb, void *cb_arg);
-int ble_l2cap_reconfig(struct ble_l2cap_chan *chans[], uint8_t num, uint16_t new_mtu);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_sm_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_sm_priv.h
deleted file mode 100644
index def0a32f5..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_sm_priv.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_SM_PRIV_
-#define H_BLE_SM_PRIV_
-
-#include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "os/queue.h"
-#include "nimble/nimble_opt.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_gap_sec_state;
-struct hci_le_lt_key_req;
-struct hci_encrypt_change;
-
-#define BLE_SM_MTU                  65
-
-#define BLE_SM_OP_PAIR_REQ                      0x01
-#define BLE_SM_OP_PAIR_RSP                      0x02
-#define BLE_SM_OP_PAIR_CONFIRM                  0x03
-#define BLE_SM_OP_PAIR_RANDOM                   0x04
-#define BLE_SM_OP_PAIR_FAIL                     0x05
-#define BLE_SM_OP_ENC_INFO                      0x06
-#define BLE_SM_OP_MASTER_ID                     0x07
-#define BLE_SM_OP_IDENTITY_INFO                 0x08
-#define BLE_SM_OP_IDENTITY_ADDR_INFO            0x09
-#define BLE_SM_OP_SIGN_INFO                     0x0a
-#define BLE_SM_OP_SEC_REQ                       0x0b
-#define BLE_SM_OP_PAIR_PUBLIC_KEY               0x0c
-#define BLE_SM_OP_PAIR_DHKEY_CHECK              0x0d
-#define BLE_SM_OP_PAIR_KEYPRESS_NOTIFY          0x0e
-
-struct ble_sm_hdr {
-    uint8_t opcode;
-    uint8_t data[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x01/0x02 [req/rsp])         | 1                 |
- * | IO Capability                      | 1                 |
- * | OOB data flag                      | 1                 |
- * | AuthReq                            | 1                 |
- * | Maximum Encryption Key Size        | 1                 |
- * | Initiator Key Distribution         | 1                 |
- * | Responder Key Distribution         | 1                 |
- */
-
-struct ble_sm_pair_cmd {
-    uint8_t io_cap;
-    uint8_t oob_data_flag;
-    uint8_t authreq;
-    uint8_t max_enc_key_size;
-    uint8_t init_key_dist;
-    uint8_t resp_key_dist;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x03)                        | 1                 |
- * | Confirm Value                      | 16                |
- */
-
-struct ble_sm_pair_confirm {
-    uint8_t value[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x04)                        | 1                 |
- * | Random Value                       | 16                |
- */
-struct ble_sm_pair_random {
-    uint8_t value[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x05)                        | 1                 |
- * | Reason                             | 1                 |
- */
-struct ble_sm_pair_fail {
-    uint8_t reason;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x06)                        | 1                 |
- * | ltk                                | 16                |
- */
-struct ble_sm_enc_info {
-    uint8_t ltk[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x07)                        | 1                 |
- * | EDIV                               | 2                 |
- * | RAND                               | 8                 |
- */
-struct ble_sm_master_id {
-    uint16_t ediv;
-    uint64_t rand_val;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x08)                        | 1                 |
- * | irk                                | 16                |
- */
-struct ble_sm_id_info {
-    uint8_t irk[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x09)                        | 1                 |
- * | addr_type                          | 1                 |
- * | address                            | 6                 |
- */
-struct ble_sm_id_addr_info {
-    uint8_t addr_type;
-    uint8_t bd_addr[6];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0A)                        | 1                 |
- * | csrk                               | 16                |
- */
-struct ble_sm_sign_info {
-    uint8_t sig_key[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0B)                        | 1                 |
- * | authreq                            | 1                 |
- */
-struct ble_sm_sec_req {
-    uint8_t authreq;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0c)                        | 1                 |
- * | Public Key X                       | 32                |
- * | Public Key Y                       | 32                |
- */
-struct ble_sm_public_key {
-    uint8_t x[32];
-    uint8_t y[32];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0d)                        | 1                 |
- * | DHKey Check                        | 16                |
- */
-struct ble_sm_dhkey_check {
-    uint8_t value[16];
-} __attribute__((packed));
-
-#if NIMBLE_BLE_SM
-
-#define BLE_SM_PROC_STATE_NONE              ((uint8_t)-1)
-
-#define BLE_SM_PROC_STATE_PAIR              0
-#define BLE_SM_PROC_STATE_CONFIRM           1
-#define BLE_SM_PROC_STATE_RANDOM            2
-#define BLE_SM_PROC_STATE_LTK_START         3
-#define BLE_SM_PROC_STATE_LTK_RESTORE       4
-#define BLE_SM_PROC_STATE_ENC_START         5
-#define BLE_SM_PROC_STATE_ENC_RESTORE       6
-#define BLE_SM_PROC_STATE_KEY_EXCH          7
-#define BLE_SM_PROC_STATE_SEC_REQ           8
-#define BLE_SM_PROC_STATE_PUBLIC_KEY        9
-#define BLE_SM_PROC_STATE_DHKEY_CHECK       10
-#define BLE_SM_PROC_STATE_CNT               11
-
-#define BLE_SM_PROC_F_INITIATOR             0x01
-#define BLE_SM_PROC_F_IO_INJECTED           0x02
-#define BLE_SM_PROC_F_ADVANCE_ON_IO         0x04
-#define BLE_SM_PROC_F_AUTHENTICATED         0x08
-#define BLE_SM_PROC_F_SC                    0x10
-#define BLE_SM_PROC_F_BONDING               0x20
-
-#define BLE_SM_KE_F_ENC_INFO                0x01
-#define BLE_SM_KE_F_MASTER_ID               0x02
-#define BLE_SM_KE_F_ID_INFO                 0x04
-#define BLE_SM_KE_F_ADDR_INFO               0x08
-#define BLE_SM_KE_F_SIGN_INFO               0x10
-
-typedef uint8_t ble_sm_proc_flags;
-
-struct ble_sm_keys {
-    unsigned ltk_valid:1;
-    unsigned ediv_rand_valid:1;
-    unsigned irk_valid:1;
-    unsigned csrk_valid:1;
-    unsigned addr_valid:1;
-    uint16_t ediv;
-    uint64_t rand_val;
-    uint8_t addr_type;
-    uint8_t key_size;
-    uint8_t ltk[16];    /* Little endian. */
-    uint8_t irk[16];    /* Little endian. */
-    uint8_t csrk[16];   /* Little endian. */
-    uint8_t addr[6];    /* Little endian. */
-};
-
-struct ble_sm_proc {
-    STAILQ_ENTRY(ble_sm_proc) next;
-
-    ble_npl_time_t exp_os_ticks;
-    ble_sm_proc_flags flags;
-    uint16_t conn_handle;
-    uint8_t pair_alg;
-    uint8_t state;
-    uint8_t rx_key_flags;
-    uint8_t key_size;
-
-    uint8_t pair_req[sizeof(struct ble_sm_hdr) + sizeof(struct ble_sm_pair_cmd)];
-    uint8_t pair_rsp[sizeof(struct ble_sm_hdr) + sizeof(struct ble_sm_pair_cmd)];
-    uint8_t tk[16];
-    uint8_t confirm_peer[16];
-    uint8_t randm[16];
-    uint8_t rands[16];
-    uint8_t ltk[16]; /* Little endian. */
-    struct ble_sm_keys our_keys;
-    struct ble_sm_keys peer_keys;
-
-#if MYNEWT_VAL(BLE_SM_SC)
-    /* Secure connections. */
-    uint8_t passkey_bits_exchanged;
-    uint8_t ri;
-    struct ble_sm_public_key pub_key_peer;
-    uint8_t mackey[16];
-    uint8_t dhkey[32];
-    const struct ble_sm_sc_oob_data *oob_data_local;
-    const struct ble_sm_sc_oob_data *oob_data_remote;
-#endif
-};
-
-struct ble_sm_result {
-    int app_status;
-    uint8_t sm_err;
-    struct ble_gap_passkey_params passkey_params;
-    void *state_arg;
-    unsigned execute : 1;
-    unsigned enc_cb : 1;
-    unsigned bonded : 1;
-    unsigned restore : 1;
-};
-
-#if MYNEWT_VAL(BLE_HS_DEBUG)
-void ble_sm_dbg_set_next_pair_rand(uint8_t *next_pair_rand);
-void ble_sm_dbg_set_next_ediv(uint16_t next_ediv);
-void ble_sm_dbg_set_next_master_id_rand(uint64_t next_master_id_rand);
-void ble_sm_dbg_set_next_ltk(uint8_t *next_ltk);
-void ble_sm_dbg_set_next_csrk(uint8_t *next_csrk);
-void ble_sm_dbg_set_sc_keys(uint8_t *pubkey, uint8_t *privkey);
-#endif
-
-int ble_sm_num_procs(void);
-
-int ble_sm_alg_s1(const uint8_t *k, const uint8_t *r1, const uint8_t *r2,
-                  uint8_t *out);
-int ble_sm_alg_c1(const uint8_t *k, const uint8_t *r,
-                  const uint8_t *preq, const uint8_t *pres,
-                  uint8_t iat, uint8_t rat,
-                  const uint8_t *ia, const uint8_t *ra,
-                  uint8_t *out_enc_data);
-int ble_sm_alg_f4(const uint8_t *u, const uint8_t *v, const uint8_t *x,
-                  uint8_t z, uint8_t *out_enc_data);
-int ble_sm_alg_g2(const uint8_t *u, const uint8_t *v, const uint8_t *x,
-                  const uint8_t *y, uint32_t *passkey);
-int ble_sm_alg_f5(const uint8_t *w, const uint8_t *n1, const uint8_t *n2,
-                  uint8_t a1t, const uint8_t *a1, uint8_t a2t,
-                  const uint8_t *a2, uint8_t *mackey, uint8_t *ltk);
-int ble_sm_alg_f6(const uint8_t *w, const uint8_t *n1, const uint8_t *n2,
-                  const uint8_t *r, const uint8_t *iocap, uint8_t a1t,
-                  const uint8_t *a1, uint8_t a2t, const uint8_t *a2,
-                  uint8_t *check);
-int ble_sm_alg_gen_dhkey(const uint8_t *peer_pub_key_x,
-                         const uint8_t *peer_pub_key_y,
-                         const uint8_t *our_priv_key, uint8_t *out_dhkey);
-int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv);
-void ble_sm_alg_ecc_init(void);
-
-void ble_sm_enc_change_rx(const struct ble_hci_ev_enrypt_chg *ev);
-void ble_sm_enc_key_refresh_rx(const struct ble_hci_ev_enc_key_refresh *ev);
-int ble_sm_ltk_req_rx(const struct ble_hci_ev_le_subev_lt_key_req *ev);
-
-#if MYNEWT_VAL(BLE_SM_LEGACY)
-int ble_sm_lgcy_io_action(struct ble_sm_proc *proc, uint8_t *action);
-void ble_sm_lgcy_confirm_exec(struct ble_sm_proc *proc,
-                              struct ble_sm_result *res);
-void ble_sm_lgcy_random_exec(struct ble_sm_proc *proc,
-                             struct ble_sm_result *res);
-void ble_sm_lgcy_random_rx(struct ble_sm_proc *proc,
-                           struct ble_sm_result *res);
-#else
-#define ble_sm_lgcy_io_action(proc, action) (BLE_HS_ENOTSUP)
-#define ble_sm_lgcy_confirm_exec(proc, res)
-#define ble_sm_lgcy_random_exec(proc, res)
-#define ble_sm_lgcy_random_rx(proc, res)
-#endif
-
-#if MYNEWT_VAL(BLE_SM_SC)
-int ble_sm_sc_io_action(struct ble_sm_proc *proc, uint8_t *action);
-void ble_sm_sc_confirm_exec(struct ble_sm_proc *proc,
-                            struct ble_sm_result *res);
-void ble_sm_sc_random_exec(struct ble_sm_proc *proc,
-                           struct ble_sm_result *res);
-void ble_sm_sc_random_rx(struct ble_sm_proc *proc, struct ble_sm_result *res);
-void ble_sm_sc_public_key_exec(struct ble_sm_proc *proc,
-                               struct ble_sm_result *res,
-                               void *arg);
-void ble_sm_sc_public_key_rx(uint16_t conn_handle, struct os_mbuf **rxom,
-                             struct ble_sm_result *res);
-void ble_sm_sc_dhkey_check_exec(struct ble_sm_proc *proc,
-                                struct ble_sm_result *res, void *arg);
-void ble_sm_sc_dhkey_check_rx(uint16_t conn_handle, struct os_mbuf **rxom,
-                              struct ble_sm_result *res);
-bool ble_sm_sc_oob_data_check(struct ble_sm_proc *proc,
-                              bool oob_data_local_present,
-                              bool oob_data_remote_present);
-void ble_sm_sc_oob_confirm(struct ble_sm_proc *proc, struct ble_sm_result *res);
-void ble_sm_sc_init(void);
-#else
-#define ble_sm_sc_io_action(proc, action) (BLE_HS_ENOTSUP)
-#define ble_sm_sc_confirm_exec(proc, res)
-#define ble_sm_sc_random_exec(proc, res)
-#define ble_sm_sc_random_rx(proc, res)
-#define ble_sm_sc_public_key_exec(proc, res, arg)
-#define ble_sm_sc_public_key_rx(conn_handle, op, om, res)
-#define ble_sm_sc_dhkey_check_exec(proc, res, arg)
-#define ble_sm_sc_dhkey_check_rx(conn_handle, op, om, res)
-#define ble_sm_sc_init()
-
-#endif
-
-struct ble_sm_proc *ble_sm_proc_find(uint16_t conn_handle, uint8_t state,
-                                     int is_initiator,
-                                     struct ble_sm_proc **out_prev);
-int ble_sm_gen_pair_rand(uint8_t *pair_rand);
-uint8_t *ble_sm_our_pair_rand(struct ble_sm_proc *proc);
-uint8_t *ble_sm_peer_pair_rand(struct ble_sm_proc *proc);
-int ble_sm_ioact_state(uint8_t action);
-int ble_sm_proc_can_advance(struct ble_sm_proc *proc);
-void ble_sm_process_result(uint16_t conn_handle, struct ble_sm_result *res);
-void ble_sm_confirm_advance(struct ble_sm_proc *proc);
-void ble_sm_ia_ra(struct ble_sm_proc *proc,
-                  uint8_t *out_iat, uint8_t *out_ia,
-                  uint8_t *out_rat, uint8_t *out_ra);
-
-int32_t ble_sm_timer(void);
-void ble_sm_connection_broken(uint16_t conn_handle);
-int ble_sm_pair_initiate(uint16_t conn_handle);
-int ble_sm_slave_initiate(uint16_t conn_handle);
-int ble_sm_enc_initiate(uint16_t conn_handle, uint8_t key_size,
-                        const uint8_t *ltk, uint16_t ediv,
-                        uint64_t rand_val, int auth);
-int ble_sm_alg_encrypt(const uint8_t *key, const uint8_t *plaintext,
-                       uint8_t *enc_data);
-int ble_sm_init(void);
-#else
-
-#define ble_sm_enc_change_rx(evt) ((void)(evt))
-#define ble_sm_ltk_req_rx(evt) ((void)(evt))
-#define ble_sm_enc_key_refresh_rx(evt) ((void)(evt))
-
-#define ble_sm_timer() BLE_HS_FOREVER
-#define ble_sm_connection_broken(conn_handle)
-#define ble_sm_pair_initiate(conn_handle)   BLE_HS_ENOTSUP
-#define ble_sm_slave_initiate(conn_handle)  BLE_HS_ENOTSUP
-#define ble_sm_enc_initiate(conn_handle, keysize, ltk, ediv, rand_val, auth) \
-        BLE_HS_ENOTSUP
-
-#define ble_sm_init() 0
-
-#define ble_sm_alg_encrypt(key, plaintext, enc_data) \
-        BLE_HS_ENOTSUP
-
-#endif
-
-struct ble_l2cap_chan *ble_sm_create_chan(uint16_t handle);
-void *ble_sm_cmd_get(uint8_t opcode, size_t len, struct os_mbuf **txom);
-int ble_sm_tx(uint16_t conn_handle, struct os_mbuf *txom);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/testing.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/testing.c
deleted file mode 100644
index d0a053760..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/testing.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2017 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include <stddef.h>
-
-#include "console/console.h"
-#include "mesh/testing.h"
-#include "mesh/slist.h"
-#include "mesh/glue.h"
-#include "mesh/access.h"
-
-#include "net.h"
-#include "testing.h"
-#include "access.h"
-#include "foundation.h"
-#include "lpn.h"
-#include "transport.h"
-
-static sys_slist_t cb_slist;
-
-void bt_test_cb_register(struct bt_test_cb *cb)
-{
-	sys_slist_append(&cb_slist, &cb->node);
-}
-
-void bt_test_cb_unregister(struct bt_test_cb *cb)
-{
-	sys_slist_find_and_remove(&cb_slist, &cb->node);
-}
-
-void bt_test_mesh_net_recv(u8_t ttl, u8_t ctl, u16_t src, u16_t dst,
-			   const void *payload, size_t payload_len)
-{
-	struct bt_test_cb *cb;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&cb_slist, cb, node) {
-		if (cb->mesh_net_recv) {
-			cb->mesh_net_recv(ttl, ctl, src, dst, payload,
-					  payload_len);
-		}
-	}
-}
-
-void bt_test_mesh_model_bound(u16_t addr, struct bt_mesh_model *model,
-			      u16_t key_idx)
-{
-	struct bt_test_cb *cb;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&cb_slist, cb, node) {
-		if (cb->mesh_model_bound) {
-			cb->mesh_model_bound(addr, model, key_idx);
-		}
-	}
-}
-
-void bt_test_mesh_model_unbound(u16_t addr, struct bt_mesh_model *model,
-				u16_t key_idx)
-{
-	struct bt_test_cb *cb;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&cb_slist, cb, node) {
-		if (cb->mesh_model_unbound) {
-			cb->mesh_model_unbound(addr, model, key_idx);
-		}
-	}
-}
-
-void bt_test_mesh_prov_invalid_bearer(u8_t opcode)
-{
-	struct bt_test_cb *cb;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&cb_slist, cb, node) {
-		if (cb->mesh_prov_invalid_bearer) {
-			cb->mesh_prov_invalid_bearer(opcode);
-		}
-	}
-}
-
-void bt_test_mesh_trans_incomp_timer_exp(void)
-{
-	struct bt_test_cb *cb;
-
-	SYS_SLIST_FOR_EACH_CONTAINER(&cb_slist, cb, node) {
-		if (cb->mesh_trans_incomp_timer_exp) {
-			cb->mesh_trans_incomp_timer_exp();
-		}
-	}
-}
-
-int bt_test_mesh_lpn_group_add(u16_t group)
-{
-	bt_mesh_lpn_group_add(group);
-
-	return 0;
-}
-
-int bt_test_mesh_lpn_group_remove(u16_t *groups, size_t groups_count)
-{
-	bt_mesh_lpn_group_del(groups, groups_count);
-
-	return 0;
-}
-
-int bt_test_mesh_rpl_clear(void)
-{
-	bt_mesh_rpl_clear();
-
-	return 0;
-}
-
-void bt_test_print_credentials(void)
-{
-	int i;
-	u8_t nid;
-	const u8_t *enc;
-	const u8_t *priv;
-	struct bt_mesh_subnet *sub;
-	struct bt_mesh_app_key *app_key;
-
-	console_printf("IV Index: %08lx\n", (long) bt_mesh.iv_index);
-	console_printf("Dev key: %s\n", bt_hex(bt_mesh.dev_key, 16));
-
-	for (i = 0; i < MYNEWT_VAL(BLE_MESH_SUBNET_COUNT); ++i)
-	{
-		if (bt_mesh.app_keys[i].net_idx == BT_MESH_KEY_UNUSED) {
-			continue;
-		}
-
-		sub = &bt_mesh.sub[i];
-
-		console_printf("Subnet: %d\n", i);
-		console_printf("\tNetKeyIdx: %04x\n",
-			       sub->net_idx);
-		console_printf("\tNetKey: %s\n",
-			       bt_hex(sub->keys[sub->kr_flag].net, 16));
-	}
-
-	for (i = 0; i < MYNEWT_VAL(BLE_MESH_APP_KEY_COUNT); ++i)
-	{
-		if (bt_mesh.app_keys[i].net_idx == BT_MESH_KEY_UNUSED) {
-			continue;
-		}
-
-		sub = &bt_mesh.sub[i];
-		app_key = &bt_mesh.app_keys[i];
-
-		console_printf("AppKey: %d\n", i);
-		console_printf("\tNetKeyIdx: %04x\n",
-			       app_key->net_idx);
-		console_printf("\tAppKeyIdx: %04x\n",
-			       app_key->app_idx);
-		console_printf("\tAppKey: %s\n",
-			       bt_hex(app_key->keys[sub->kr_flag].val, 16));
-	}
-
-	for (i = 0; i < MYNEWT_VAL(BLE_MESH_SUBNET_COUNT); ++i)
-	{
-		if (bt_mesh.sub[i].net_idx == BT_MESH_KEY_UNUSED) {
-			continue;
-		}
-
-		if (friend_cred_get(&bt_mesh.sub[i], BT_MESH_ADDR_UNASSIGNED,
-				&nid, &enc, &priv)) {
-			return;
-		}
-
-		console_printf("Friend cred: %d\n", i);
-		console_printf("\tNetKeyIdx: %04x\n",
-			       bt_mesh.sub[i].net_idx);
-		console_printf("\tNID: %02x\n", nid);
-		console_printf("\tEncKey: %s\n",
-			       bt_hex(enc, 16));
-		console_printf("\tPrivKey: %s\n",
-			       bt_hex(priv, 16));
-	}
-}
-
-int bt_test_shell_init(void)
-{
-#if MYNEWT_VAL(BLE_MESH_SHELL)
-	return cmd_mesh_init(0, NULL);
-#else
-	return -ENOTSUP;
-#endif
-}
-
-int bt_test_bind_app_key_to_model(struct bt_mesh_model *model, u16_t key_idx, u16_t id)
-{
-	struct bt_mesh_model *found_model;
-
-	found_model = bt_mesh_model_find(bt_mesh_model_elem(model), id);
-	if (!found_model) {
-		return STATUS_INVALID_MODEL;
-	}
-
-	return mod_bind(found_model, key_idx);
-}
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/testing.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/testing.h
deleted file mode 100644
index 166a9eea6..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/testing.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file testing.h
- * @brief Internal API for Bluetooth testing.
- */
-
-/*
- * Copyright (c) 2017 Intel Corporation
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#include "mesh/glue.h"
-#include "mesh/access.h"
-
-void bt_test_mesh_model_bound(u16_t addr, struct bt_mesh_model *model,
-			      u16_t key_idx);
-void bt_test_mesh_model_unbound(u16_t addr, struct bt_mesh_model *model,
-				u16_t key_idx);
-void bt_test_mesh_prov_invalid_bearer(u8_t opcode);
-void bt_test_mesh_net_recv(u8_t ttl, u8_t ctl, u16_t src, u16_t dst,
-			   const void *payload, size_t payload_len);
-void bt_test_mesh_trans_incomp_timer_exp(void);
-void bt_test_print_credentials(void);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd_priv.h
deleted file mode 100644
index 70f33260a..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd_priv.h
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_ATT_CMD_
-#define H_BLE_ATT_CMD_
-
-#include <inttypes.h>
-#include <stddef.h>
-#include "os/os_mbuf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_att_hdr {
-    uint8_t opcode;
-    uint8_t data[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Request Opcode In Error            | 1                 |
- * | Attribute Handle In Error          | 2                 |
- * | Error Code                         | 1                 |
- */
-#define BLE_ATT_ERROR_RSP_SZ             5
-struct ble_att_error_rsp {
-    uint8_t baep_req_op;
-    uint16_t baep_handle;
-    uint8_t baep_error_code;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Server Rx MTU                      | 2                 |
- */
-#define BLE_ATT_MTU_CMD_SZ               3
-struct ble_att_mtu_cmd {
-    uint16_t bamc_mtu;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Starting Handle                    | 2                 |
- * | Ending Handle                      | 2                 |
- */
-#define BLE_ATT_FIND_INFO_REQ_SZ         5
-struct ble_att_find_info_req {
-    uint16_t bafq_start_handle;
-    uint16_t bafq_end_handle;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Format                             | 1                 |
- * | Information Data                   | 4 to (ATT_MTU-2)  |
- */
-#define BLE_ATT_FIND_INFO_RSP_BASE_SZ       2
-struct ble_att_find_info_rsp {
-    uint8_t bafp_format;
-    /* Followed by information data. */
-} __attribute__((packed));
-
-#define BLE_ATT_FIND_INFO_RSP_FORMAT_16BIT   1
-#define BLE_ATT_FIND_INFO_RSP_FORMAT_128BIT  2
-
-#define BLE_ATT_FIND_INFO_IDATA_16_SZ           4
-#define BLE_ATT_FIND_INFO_IDATA_128_SZ          18
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Starting Handle                    | 2                 |
- * | Ending Handle                      | 2                 |
- * | Attribute Type                     | 2                 |
- * | Attribute Value                    | 0 to (ATT_MTU-7)  |
- */
-#define BLE_ATT_FIND_TYPE_VALUE_REQ_BASE_SZ   7
-struct ble_att_find_type_value_req {
-    uint16_t bavq_start_handle;
-    uint16_t bavq_end_handle;
-    uint16_t bavq_attr_type;
-    uint16_t bavq_value[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Information Data                   | 4 to (ATT_MTU-1)  |
- */
-#define BLE_ATT_FIND_TYPE_VALUE_RSP_BASE_SZ     1
-#define BLE_ATT_FIND_TYPE_VALUE_HINFO_BASE_SZ   4
-
-struct ble_att_handle_group {
-        uint16_t attr_handle;
-        uint16_t group_end_handle;
-} __attribute__((packed));
-
-struct ble_att_find_type_value_rsp {
-    struct ble_att_handle_group list[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Starting Handle                    | 2                 |
- * | Ending Handle                      | 2                 |
- * | Attribute Type                     | 2 or 16           |
- */
-#define BLE_ATT_READ_TYPE_REQ_BASE_SZ   5
-#define BLE_ATT_READ_TYPE_REQ_SZ_16     7
-#define BLE_ATT_READ_TYPE_REQ_SZ_128    21
-struct ble_att_read_type_req {
-    uint16_t batq_start_handle;
-    uint16_t batq_end_handle;
-    uint8_t uuid[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Length                             | 1                 |
- * | Attribute Data List                | 2 to (ATT_MTU-2)  |
- */
-#define BLE_ATT_READ_TYPE_RSP_BASE_SZ       2
-
-struct ble_att_attr_data_list {
-    uint16_t handle;
-    uint8_t value[0];
-} __attribute__((packed));
-
-struct ble_att_read_type_rsp {
-    uint8_t batp_length;
-    struct ble_att_attr_data_list batp_list[0];
-} __attribute__((packed));
-
-#define BLE_ATT_READ_TYPE_ADATA_BASE_SZ     2
-#define BLE_ATT_READ_TYPE_ADATA_SZ_16       6
-#define BLE_ATT_READ_TYPE_ADATA_SZ_128      20
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Handle                   | 2                 |
- */
-#define BLE_ATT_READ_REQ_SZ              3
-struct ble_att_read_req {
-    uint16_t barq_handle;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Value                    | 0 to (ATT_MTU-1)  |
- */
-#define BLE_ATT_READ_RSP_BASE_SZ        1
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Handle                   | 2                 |
- * | Value Offset                       | 2                 |
- */
-#define BLE_ATT_READ_BLOB_REQ_SZ        5
-struct ble_att_read_blob_req {
-    uint16_t babq_handle;
-    uint16_t babq_offset;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Value                    | 0 to (ATT_MTU-1)  |
- */
-#define BLE_ATT_READ_BLOB_RSP_BASE_SZ   1
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Set Of Handles                     | 4 to (ATT_MTU-1)  |
- */
-#define BLE_ATT_READ_MULT_REQ_BASE_SZ   1
-struct ble_att_read_mult_req {
-        uint16_t handles[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Set Of Values                      | 4 to (ATT_MTU-1)  |
- */
-#define BLE_ATT_READ_MULT_RSP_BASE_SZ   1
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Starting Handle                    | 2                 |
- * | Ending Handle                      | 2                 |
- * | Attribute Group Type               | 2 or 16           |
- */
-#define BLE_ATT_READ_GROUP_TYPE_REQ_BASE_SZ  5
-#define BLE_ATT_READ_GROUP_TYPE_REQ_SZ_16    7
-#define BLE_ATT_READ_GROUP_TYPE_REQ_SZ_128   21
-struct ble_att_read_group_type_req {
-    uint16_t bagq_start_handle;
-    uint16_t bagq_end_handle;
-    uint8_t uuid[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Length                             | 1                 |
- * | Attribute Data List                | 2 to (ATT_MTU-2)  |
- */
-#define BLE_ATT_READ_GROUP_TYPE_RSP_BASE_SZ  2
-struct ble_att_read_group_type_rsp {
-    uint8_t bagp_length;
-} __attribute__((packed));
-
-#define BLE_ATT_READ_GROUP_TYPE_ADATA_BASE_SZ   4
-#define BLE_ATT_READ_GROUP_TYPE_ADATA_SZ_16     6
-#define BLE_ATT_READ_GROUP_TYPE_ADATA_SZ_128    20
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Handle                   | 2                 |
- * | Attribute Value                    | 0 to (ATT_MTU-3)  |
- */
-#define BLE_ATT_WRITE_REQ_BASE_SZ       3
-struct ble_att_write_req {
-    uint16_t bawq_handle;
-    uint8_t value[0];
-} __attribute__((packed));
-
-#define BLE_ATT_WRITE_RSP_SZ            1
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Handle                   | 2                 |
- * | Value Offset                       | 2                 |
- * | Part Attribute Value               | 0 to (ATT_MTU-5)  |
- */
-#define BLE_ATT_PREP_WRITE_CMD_BASE_SZ  5
-struct ble_att_prep_write_cmd {
-    uint16_t bapc_handle;
-    uint16_t bapc_offset;
-    uint16_t bapc_value[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Flags                              | 1                 |
- */
-#define BLE_ATT_EXEC_WRITE_REQ_SZ       2
-struct ble_att_exec_write_req {
-    uint8_t baeq_flags;
-} __attribute__((packed));
-
-#define BLE_ATT_EXEC_WRITE_F_CANCEL     0x00
-#define BLE_ATT_EXEC_WRITE_F_EXECUTE    0x01
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- */
-#define BLE_ATT_EXEC_WRITE_RSP_SZ       1
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Handle                   | 2                 |
- * | Attribute Value                    | 0 to (ATT_MTU-3)  |
- */
-#define BLE_ATT_NOTIFY_REQ_BASE_SZ      3
-struct ble_att_notify_req {
-    uint16_t banq_handle;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Handle                   | 2                 |
- * | Attribute Value                    | 0 to (ATT_MTU-3)  |
- */
-#define BLE_ATT_INDICATE_REQ_BASE_SZ    3
-struct ble_att_indicate_req {
-    uint16_t baiq_handle;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- */
-#define BLE_ATT_INDICATE_RSP_SZ         1
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | Attribute Opcode                   | 1                 |
- * | Attribute Handle                   | 2                 |
- * | Attribute Value                    | 0 to (ATT_MTU-3)  |
- */
-#define BLE_ATT_WRITE_CMD_BASE_SZ       3
-struct ble_att_write_cmd {
-    uint16_t handle;
-    uint8_t value[0];
-} __attribute__((packed));
-
-void ble_att_error_rsp_parse(const void *payload, int len,
-                             struct ble_att_error_rsp *rsp);
-void ble_att_error_rsp_write(void *payload, int len,
-                             const struct ble_att_error_rsp *rsp);
-void ble_att_mtu_req_parse(const void *payload, int len,
-                           struct ble_att_mtu_cmd *cmd);
-void ble_att_mtu_req_write(void *payload, int len,
-                           const struct ble_att_mtu_cmd *cmd);
-void ble_att_mtu_rsp_parse(const void *payload, int len,
-                           struct ble_att_mtu_cmd *cmd);
-void ble_att_mtu_rsp_write(void *payload, int len,
-                           const struct ble_att_mtu_cmd *cmd);
-void ble_att_find_info_req_parse(const void *payload, int len,
-                                 struct ble_att_find_info_req *req);
-void ble_att_find_info_req_write(void *payload, int len,
-                                 const struct ble_att_find_info_req *req);
-void ble_att_find_info_rsp_parse(const void *payload, int len,
-                                 struct ble_att_find_info_rsp *rsp);
-void ble_att_find_info_rsp_write(void *payload, int len,
-                                 const struct ble_att_find_info_rsp *rsp);
-void ble_att_find_type_value_req_parse(
-    const void *payload, int len, struct ble_att_find_type_value_req *req);
-void ble_att_find_type_value_req_write(
-    void *payload, int len, const struct ble_att_find_type_value_req *req);
-void ble_att_read_type_req_parse(const void *payload, int len,
-                                 struct ble_att_read_type_req *req);
-void ble_att_read_type_req_write(void *payload, int len,
-                                 const struct ble_att_read_type_req *req);
-void ble_att_read_type_rsp_parse(const void *payload, int len,
-                                 struct ble_att_read_type_rsp *rsp);
-void ble_att_read_type_rsp_write(void *payload, int len,
-                                 const struct ble_att_read_type_rsp *rsp);
-void ble_att_read_req_parse(const void *payload, int len,
-                            struct ble_att_read_req *req);
-void ble_att_read_req_write(void *payload, int len,
-                            const struct ble_att_read_req *req);
-void ble_att_read_blob_req_parse(const void *payload, int len,
-                                 struct ble_att_read_blob_req *req);
-void ble_att_read_blob_req_write(void *payload, int len,
-                                 const struct ble_att_read_blob_req *req);
-void ble_att_read_mult_req_parse(const void *payload, int len);
-void ble_att_read_mult_req_write(void *payload, int len);
-void ble_att_read_mult_rsp_parse(const void *payload, int len);
-void ble_att_read_mult_rsp_write(void *payload, int len);
-void ble_att_read_group_type_req_parse(
-    const void *payload, int len, struct ble_att_read_group_type_req *req);
-void ble_att_read_group_type_req_write(
-    void *payload, int len, const struct ble_att_read_group_type_req *req);
-void ble_att_read_group_type_rsp_parse(
-    const void *payload, int len, struct ble_att_read_group_type_rsp *rsp);
-void ble_att_read_group_type_rsp_write(
-    void *payload, int len, const struct ble_att_read_group_type_rsp *rsp);
-void ble_att_write_req_parse(const void *payload, int len,
-                             struct ble_att_write_req *req);
-void ble_att_write_req_write(void *payload, int len,
-                             const struct ble_att_write_req *req);
-void ble_att_write_cmd_parse(const void *payload, int len,
-                             struct ble_att_write_req *req);
-void ble_att_write_cmd_write(void *payload, int len,
-                             const struct ble_att_write_req *req);
-void ble_att_prep_write_req_parse(const void *payload, int len,
-                                  struct ble_att_prep_write_cmd *cmd);
-void ble_att_prep_write_req_write(void *payload, int len,
-                                  const struct ble_att_prep_write_cmd *cmd);
-void ble_att_prep_write_rsp_parse(const void *payload, int len,
-                                  struct ble_att_prep_write_cmd *cmd);
-void ble_att_prep_write_rsp_write(void *payload, int len,
-                                  const struct ble_att_prep_write_cmd *cmd);
-void ble_att_exec_write_req_parse(const void *payload, int len,
-                                  struct ble_att_exec_write_req *req);
-void ble_att_exec_write_req_write(void *payload, int len,
-                                  const struct ble_att_exec_write_req *req);
-void ble_att_exec_write_rsp_parse(const void *payload, int len);
-void ble_att_exec_write_rsp_write(void *payload, int len);
-void ble_att_notify_req_parse(const void *payload, int len,
-                              struct ble_att_notify_req *req);
-void ble_att_notify_req_write(void *payload, int len,
-                              const struct ble_att_notify_req *req);
-void ble_att_indicate_req_parse(const void *payload, int len,
-                                struct ble_att_indicate_req *req);
-void ble_att_indicate_req_write(void *payload, int len,
-                                const struct ble_att_indicate_req *req);
-void ble_att_indicate_rsp_parse(const void *payload, int len);
-void ble_att_indicate_rsp_write(void *payload, int len);
-
-void *ble_att_cmd_prepare(uint8_t opcode, size_t len, struct os_mbuf *txom);
-void *ble_att_cmd_get(uint8_t opcode, size_t len, struct os_mbuf **txom);
-int ble_att_tx(uint16_t conn_handle, struct os_mbuf *txom);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_priv.h
deleted file mode 100644
index 73b6aeab0..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_priv.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_ATT_PRIV_
-#define H_BLE_ATT_PRIV_
-
-#include <inttypes.h>
-#include "stats/stats.h"
-#include "host/ble_att.h"
-#include "host/ble_uuid.h"
-#include "nimble/nimble_npl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct os_mbuf;
-struct ble_hs_conn;
-struct ble_l2cap_chan;
-struct ble_att_find_info_req;
-struct ble_att_error_rsp;
-struct ble_att_mtu_cmd;
-struct ble_att_read_req;
-struct ble_att_read_blob_req;
-struct ble_att_read_type_req;
-struct ble_att_read_group_type_req;
-struct ble_att_read_group_type_rsp;
-struct ble_att_find_type_value_req;
-struct ble_att_write_req;
-struct ble_att_prep_write_cmd;
-struct ble_att_exec_write_req;
-struct ble_att_notify_req;
-struct ble_att_indicate_req;
-
-STATS_SECT_START(ble_att_stats)
-    STATS_SECT_ENTRY(error_rsp_rx)
-    STATS_SECT_ENTRY(error_rsp_tx)
-    STATS_SECT_ENTRY(mtu_req_rx)
-    STATS_SECT_ENTRY(mtu_req_tx)
-    STATS_SECT_ENTRY(mtu_rsp_rx)
-    STATS_SECT_ENTRY(mtu_rsp_tx)
-    STATS_SECT_ENTRY(find_info_req_rx)
-    STATS_SECT_ENTRY(find_info_req_tx)
-    STATS_SECT_ENTRY(find_info_rsp_rx)
-    STATS_SECT_ENTRY(find_info_rsp_tx)
-    STATS_SECT_ENTRY(find_type_value_req_rx)
-    STATS_SECT_ENTRY(find_type_value_req_tx)
-    STATS_SECT_ENTRY(find_type_value_rsp_rx)
-    STATS_SECT_ENTRY(find_type_value_rsp_tx)
-    STATS_SECT_ENTRY(read_type_req_rx)
-    STATS_SECT_ENTRY(read_type_req_tx)
-    STATS_SECT_ENTRY(read_type_rsp_rx)
-    STATS_SECT_ENTRY(read_type_rsp_tx)
-    STATS_SECT_ENTRY(read_req_rx)
-    STATS_SECT_ENTRY(read_req_tx)
-    STATS_SECT_ENTRY(read_rsp_rx)
-    STATS_SECT_ENTRY(read_rsp_tx)
-    STATS_SECT_ENTRY(read_blob_req_rx)
-    STATS_SECT_ENTRY(read_blob_req_tx)
-    STATS_SECT_ENTRY(read_blob_rsp_rx)
-    STATS_SECT_ENTRY(read_blob_rsp_tx)
-    STATS_SECT_ENTRY(read_mult_req_rx)
-    STATS_SECT_ENTRY(read_mult_req_tx)
-    STATS_SECT_ENTRY(read_mult_rsp_rx)
-    STATS_SECT_ENTRY(read_mult_rsp_tx)
-    STATS_SECT_ENTRY(read_group_type_req_rx)
-    STATS_SECT_ENTRY(read_group_type_req_tx)
-    STATS_SECT_ENTRY(read_group_type_rsp_rx)
-    STATS_SECT_ENTRY(read_group_type_rsp_tx)
-    STATS_SECT_ENTRY(write_req_rx)
-    STATS_SECT_ENTRY(write_req_tx)
-    STATS_SECT_ENTRY(write_rsp_rx)
-    STATS_SECT_ENTRY(write_rsp_tx)
-    STATS_SECT_ENTRY(prep_write_req_rx)
-    STATS_SECT_ENTRY(prep_write_req_tx)
-    STATS_SECT_ENTRY(prep_write_rsp_rx)
-    STATS_SECT_ENTRY(prep_write_rsp_tx)
-    STATS_SECT_ENTRY(exec_write_req_rx)
-    STATS_SECT_ENTRY(exec_write_req_tx)
-    STATS_SECT_ENTRY(exec_write_rsp_rx)
-    STATS_SECT_ENTRY(exec_write_rsp_tx)
-    STATS_SECT_ENTRY(notify_req_rx)
-    STATS_SECT_ENTRY(notify_req_tx)
-    STATS_SECT_ENTRY(indicate_req_rx)
-    STATS_SECT_ENTRY(indicate_req_tx)
-    STATS_SECT_ENTRY(indicate_rsp_rx)
-    STATS_SECT_ENTRY(indicate_rsp_tx)
-    STATS_SECT_ENTRY(write_cmd_rx)
-    STATS_SECT_ENTRY(write_cmd_tx)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_att_stats) ble_att_stats;
-
-struct ble_att_prep_entry {
-    SLIST_ENTRY(ble_att_prep_entry) bape_next;
-    uint16_t bape_handle;
-    uint16_t bape_offset;
-
-    /* XXX: This is wasteful; we should use one mbuf chain for the entire
-     * prepared write, and compress the data into as few mbufs as possible.
-     */
-    struct os_mbuf *bape_value;
-};
-
-SLIST_HEAD(ble_att_prep_entry_list, ble_att_prep_entry);
-
-struct ble_att_svr_conn {
-    /** This list is sorted by attribute handle ID. */
-    struct ble_att_prep_entry_list basc_prep_list;
-    ble_npl_time_t basc_prep_timeout_at;
-};
-
-/**
- * Handles a host attribute request.
- *
- * @param entry                 The host attribute being requested.
- * @param op                    The operation being performed on the attribute.
- * @param arg                   The request data associated with that host
- *                                  attribute.
- *
- * @return                      0 on success;
- *                              One of the BLE_ATT_ERR_[...] codes on
- *                                  failure.
- */
-typedef int ble_att_svr_access_fn(uint16_t conn_handle, uint16_t attr_handle,
-                                  uint8_t op, uint16_t offset,
-                                  struct os_mbuf **om, void *arg);
-
-int ble_att_svr_register(const ble_uuid_t *uuid, uint8_t flags,
-                         uint8_t min_key_size, uint16_t *handle_id,
-                         ble_att_svr_access_fn *cb, void *cb_arg);
-
-struct ble_att_svr_entry {
-    STAILQ_ENTRY(ble_att_svr_entry) ha_next;
-
-    const ble_uuid_t *ha_uuid;
-    uint8_t ha_flags;
-    uint8_t ha_min_key_size;
-    uint16_t ha_handle_id;
-    ble_att_svr_access_fn *ha_cb;
-    void *ha_cb_arg;
-};
-
-SLIST_HEAD(ble_att_clt_entry_list, ble_att_clt_entry);
-
-/*** @gen */
-
-struct ble_l2cap_chan *ble_att_create_chan(uint16_t conn_handle);
-int ble_att_conn_chan_find(uint16_t conn_handle, struct ble_hs_conn **out_conn,
-                           struct ble_l2cap_chan **out_chan);
-void ble_att_inc_tx_stat(uint8_t att_op);
-void ble_att_truncate_to_mtu(const struct ble_l2cap_chan *att_chan,
-                             struct os_mbuf *txom);
-void ble_att_set_peer_mtu(struct ble_l2cap_chan *chan, uint16_t peer_mtu);
-uint16_t ble_att_chan_mtu(const struct ble_l2cap_chan *chan);
-int ble_att_init(void);
-
-/*** @svr */
-
-int ble_att_svr_start(void);
-void ble_att_svr_stop(void);
-
-struct ble_att_svr_entry *
-ble_att_svr_find_by_uuid(struct ble_att_svr_entry *start_at,
-                         const ble_uuid_t *uuid,
-                         uint16_t end_handle);
-uint16_t ble_att_svr_prev_handle(void);
-int ble_att_svr_rx_mtu(uint16_t conn_handle, struct os_mbuf **rxom);
-struct ble_att_svr_entry *ble_att_svr_find_by_handle(uint16_t handle_id);
-int32_t ble_att_svr_ticks_until_tmo(const struct ble_att_svr_conn *svr,
-                                    ble_npl_time_t now);
-int ble_att_svr_rx_find_info(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_svr_rx_find_type_value(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_svr_rx_read_type(uint16_t conn_handle,
-                             struct os_mbuf **rxom);
-int ble_att_svr_rx_read_group_type(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_svr_rx_read(uint16_t conn_handle,
-                        struct os_mbuf **rxom);
-int ble_att_svr_rx_read_blob(uint16_t conn_handle,
-                             struct os_mbuf **rxom);
-int ble_att_svr_rx_read_mult(uint16_t conn_handle,
-                             struct os_mbuf **rxom);
-int ble_att_svr_rx_write(uint16_t conn_handle,
-                         struct os_mbuf **rxom);
-int ble_att_svr_rx_write_no_rsp(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_svr_rx_prep_write(uint16_t conn_handle,
-                              struct os_mbuf **rxom);
-int ble_att_svr_rx_exec_write(uint16_t conn_handle,
-                              struct os_mbuf **rxom);
-int ble_att_svr_rx_notify(uint16_t conn_handle,
-                          struct os_mbuf **rxom);
-int ble_att_svr_rx_indicate(uint16_t conn_handle,
-                            struct os_mbuf **rxom);
-void ble_att_svr_prep_clear(struct ble_att_prep_entry_list *prep_list);
-int ble_att_svr_read_handle(uint16_t conn_handle, uint16_t attr_handle,
-                            uint16_t offset, struct os_mbuf *om,
-                            uint8_t *out_att_err);
-void ble_att_svr_reset(void);
-int ble_att_svr_init(void);
-
-void ble_att_svr_hide_range(uint16_t start_handle, uint16_t end_handle);
-void ble_att_svr_restore_range(uint16_t start_handle, uint16_t end_handle);
-
-int ble_att_svr_tx_error_rsp(uint16_t conn_handle, struct os_mbuf *txom,
-                             uint8_t req_op, uint16_t handle,
-                             uint8_t error_code);
-/*** $clt */
-
-/** An information-data entry in a find information response. */
-struct ble_att_find_info_idata {
-    uint16_t attr_handle;
-    ble_uuid_any_t uuid;
-};
-
-/** A handles-information entry in a find by type value response. */
-struct ble_att_find_type_value_hinfo {
-    uint16_t attr_handle;
-    uint16_t group_end_handle;
-};
-
-/** An attribute-data entry in a read by type response. */
-struct ble_att_read_type_adata {
-    uint16_t att_handle;
-    int value_len;
-    uint8_t *value;
-
-};
-
-/** An attribute-data entry in a read by group type response. */
-struct ble_att_read_group_type_adata {
-    uint16_t att_handle;
-    uint16_t end_group_handle;
-    int value_len;
-    uint8_t *value;
-};
-
-int ble_att_clt_rx_error(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_mtu(uint16_t conn_handle, uint16_t mtu);
-int ble_att_clt_rx_mtu(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read(uint16_t conn_handle, uint16_t handle);
-int ble_att_clt_rx_read(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_blob(uint16_t conn_handle, uint16_t handle,
-                             uint16_t offset);
-int ble_att_clt_rx_read_blob(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_mult(uint16_t conn_handle,
-                             const uint16_t *handles, int num_handles);
-int ble_att_clt_rx_read_mult(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_type(uint16_t conn_handle, uint16_t start_handle,
-                             uint16_t end_handle, const ble_uuid_t *uuid);
-int ble_att_clt_rx_read_type(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_read_group_type(uint16_t conn_handle,
-                                   uint16_t start_handle, uint16_t end_handle,
-                                   const ble_uuid_t *uuid128);
-int ble_att_clt_rx_read_group_type(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_clt_tx_find_info(uint16_t conn_handle, uint16_t start_handle,
-                             uint16_t end_handle);
-int ble_att_clt_rx_find_info(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_find_type_value(uint16_t conn_handle, uint16_t start_handle,
-                                   uint16_t end_handle, uint16_t attribute_type,
-                                   const void *attribute_value, int value_len);
-int ble_att_clt_rx_find_type_value(uint16_t conn_handle,
-                                   struct os_mbuf **rxom);
-int ble_att_clt_tx_write_req(uint16_t conn_handle, uint16_t handle,
-                             struct os_mbuf *txom);
-int ble_att_clt_tx_write_cmd(uint16_t conn_handle, uint16_t handle,
-                             struct os_mbuf *txom);
-int ble_att_clt_tx_prep_write(uint16_t conn_handle, uint16_t handle,
-                              uint16_t offset, struct os_mbuf *txom);
-int ble_att_clt_rx_prep_write(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_exec_write(uint16_t conn_handle, uint8_t flags);
-int ble_att_clt_rx_exec_write(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_rx_write(uint16_t conn_handle, struct os_mbuf **rxom);
-int ble_att_clt_tx_notify(uint16_t conn_handle, uint16_t handle,
-                          struct os_mbuf *txom);
-int ble_att_clt_tx_indicate(uint16_t conn_handle, uint16_t handle,
-                            struct os_mbuf *txom);
-int ble_att_clt_rx_indicate(uint16_t conn_handle, struct os_mbuf **rxom);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gap_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gap_priv.h
deleted file mode 100644
index 2b6b40696..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gap_priv.h
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_GAP_CONN_
-#define H_BLE_GAP_CONN_
-
-#include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "stats/stats.h"
-#include "host/ble_gap.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct hci_le_conn_upd_complete;
-struct hci_le_conn_param_req;
-struct hci_le_conn_complete;
-struct hci_disconn_complete;
-struct hci_encrypt_change;
-struct ble_hs_hci_ack;
-struct ble_hs_adv;
-
-STATS_SECT_START(ble_gap_stats)
-    STATS_SECT_ENTRY(wl_set)
-    STATS_SECT_ENTRY(wl_set_fail)
-    STATS_SECT_ENTRY(adv_stop)
-    STATS_SECT_ENTRY(adv_stop_fail)
-    STATS_SECT_ENTRY(adv_start)
-    STATS_SECT_ENTRY(adv_start_fail)
-    STATS_SECT_ENTRY(adv_set_data)
-    STATS_SECT_ENTRY(adv_set_data_fail)
-    STATS_SECT_ENTRY(adv_rsp_set_data)
-    STATS_SECT_ENTRY(adv_rsp_set_data_fail)
-    STATS_SECT_ENTRY(discover)
-    STATS_SECT_ENTRY(discover_fail)
-    STATS_SECT_ENTRY(initiate)
-    STATS_SECT_ENTRY(initiate_fail)
-    STATS_SECT_ENTRY(terminate)
-    STATS_SECT_ENTRY(terminate_fail)
-    STATS_SECT_ENTRY(cancel)
-    STATS_SECT_ENTRY(cancel_fail)
-    STATS_SECT_ENTRY(update)
-    STATS_SECT_ENTRY(update_fail)
-    STATS_SECT_ENTRY(connect_mst)
-    STATS_SECT_ENTRY(connect_slv)
-    STATS_SECT_ENTRY(disconnect)
-    STATS_SECT_ENTRY(rx_disconnect)
-    STATS_SECT_ENTRY(rx_update_complete)
-    STATS_SECT_ENTRY(rx_adv_report)
-    STATS_SECT_ENTRY(rx_conn_complete)
-    STATS_SECT_ENTRY(discover_cancel)
-    STATS_SECT_ENTRY(discover_cancel_fail)
-    STATS_SECT_ENTRY(security_initiate)
-    STATS_SECT_ENTRY(security_initiate_fail)
-STATS_SECT_END
-
-extern STATS_SECT_DECL(ble_gap_stats) ble_gap_stats;
-
-#define BLE_GAP_CONN_MODE_MAX               3
-#define BLE_GAP_DISC_MODE_MAX               3
-
-#if MYNEWT_VAL(BLE_EXT_ADV) && NIMBLE_BLE_SCAN
-void ble_gap_rx_le_scan_timeout(void);
-#endif
-
-#if MYNEWT_VAL(BLE_EXT_ADV)
-void ble_gap_rx_ext_adv_report(struct ble_gap_ext_disc_desc *desc);
-void ble_gap_rx_adv_set_terminated(const struct ble_hci_ev_le_subev_adv_set_terminated *ev);
-#if MYNEWT_VAL(BLE_PERIODIC_ADV)
-void ble_gap_rx_peroidic_adv_sync_estab(const struct ble_hci_ev_le_subev_periodic_adv_sync_estab *ev);
-void ble_gap_rx_periodic_adv_rpt(const struct ble_hci_ev_le_subev_periodic_adv_rpt *ev);
-void ble_gap_rx_periodic_adv_sync_lost(const struct ble_hci_ev_le_subev_periodic_adv_sync_lost *ev);
-void ble_gap_rx_periodic_adv_sync_transfer(const struct ble_hci_ev_le_subev_periodic_adv_sync_transfer *ev);
-#endif
-void ble_gap_rx_scan_req_rcvd(const struct ble_hci_ev_le_subev_scan_req_rcvd *ev);
-#endif
-void ble_gap_rx_adv_report(struct ble_gap_disc_desc *desc);
-void ble_gap_rx_rd_rem_sup_feat_complete(const struct ble_hci_ev_le_subev_rd_rem_used_feat *ev);
-
-struct ble_gap_conn_complete
-{
-    uint8_t status;
-    uint16_t connection_handle;
-    uint8_t role;
-    uint8_t peer_addr_type;
-    uint8_t peer_addr[BLE_DEV_ADDR_LEN];
-    uint16_t conn_itvl;
-    uint16_t conn_latency;
-    uint16_t supervision_timeout;
-    uint8_t master_clk_acc;
-    uint8_t local_rpa[BLE_DEV_ADDR_LEN];
-    uint8_t peer_rpa[BLE_DEV_ADDR_LEN];
-};
-
-int ble_gap_rx_conn_complete(struct ble_gap_conn_complete *evt, uint8_t instance);
-void ble_gap_rx_disconn_complete(const struct ble_hci_ev_disconn_cmp *ev);
-void ble_gap_rx_update_complete(const struct ble_hci_ev_le_subev_conn_upd_complete *ev);
-void ble_gap_rx_param_req(const struct ble_hci_ev_le_subev_rem_conn_param_req *ev);
-int ble_gap_rx_l2cap_update_req(uint16_t conn_handle,
-                                struct ble_gap_upd_params *params);
-void ble_gap_rx_phy_update_complete(const struct ble_hci_ev_le_subev_phy_update_complete *ev);
-void ble_gap_enc_event(uint16_t conn_handle, int status,
-                       int security_restored, int bonded);
-void ble_gap_passkey_event(uint16_t conn_handle,
-                           struct ble_gap_passkey_params *passkey_params);
-void ble_gap_notify_rx_event(uint16_t conn_handle, uint16_t attr_handle,
-                             struct os_mbuf *om, int is_indication);
-void ble_gap_notify_tx_event(int status, uint16_t conn_handle,
-                             uint16_t attr_handle, int is_indication);
-void ble_gap_subscribe_event(uint16_t conn_handle, uint16_t attr_handle,
-                             uint8_t reason,
-                             uint8_t prev_notify, uint8_t cur_notify,
-                             uint8_t prev_indicate, uint8_t cur_indicate);
-void ble_gap_mtu_event(uint16_t conn_handle, uint16_t cid, uint16_t mtu);
-void ble_gap_identity_event(uint16_t conn_handle);
-int ble_gap_repeat_pairing_event(const struct ble_gap_repeat_pairing *rp);
-int ble_gap_master_in_progress(void);
-
-void ble_gap_preempt(void);
-void ble_gap_preempt_done(void);
-
-int ble_gap_terminate_with_conn(struct ble_hs_conn *conn, uint8_t hci_reason);
-void ble_gap_conn_broken(uint16_t conn_handle, int reason);
-void ble_gap_reset_state(int reason);
-int32_t ble_gap_timer(void);
-
-int ble_gap_init(void);
-void ble_gap_deinit(void);
-
-#if MYNEWT_VAL(BLE_HS_DEBUG)
-int ble_gap_dbg_update_active(uint16_t conn_handle);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv_priv.h
deleted file mode 100644
index 5c8a6ecc9..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv_priv.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_ADV_PRIV_
-#define H_BLE_HS_ADV_PRIV_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int ble_hs_adv_set_flat(uint8_t type, int data_len, const void *data,
-                        uint8_t *dst, uint8_t *dst_len, uint8_t max_len);
-int ble_hs_adv_find_field(uint8_t type, const uint8_t *data, uint8_t length,
-                          const struct ble_hs_adv_field **out);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic_priv.h
deleted file mode 100644
index 9f7d8d16b..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic_priv.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_ATOMIC_
-#define H_BLE_HS_ATOMIC_
-
-#include "ble_hs_conn_priv.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-int ble_hs_atomic_conn_delete(uint16_t conn_handle);
-void ble_hs_atomic_conn_insert(struct ble_hs_conn *conn);
-int ble_hs_atomic_conn_flags(uint16_t conn_handle,
-                             ble_hs_conn_flags_t *out_flags);
-int ble_hs_atomic_conn_set_flags(uint16_t conn_handle,
-                                 ble_hs_conn_flags_t flags, int on);
-uint16_t ble_hs_atomic_first_conn_handle(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn_priv.h
deleted file mode 100644
index 0e451194d..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn_priv.h
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_CONN_
-#define H_BLE_HS_CONN_
-
-#include <inttypes.h>
-#include "ble_l2cap_priv.h"
-#include "ble_gatt_priv.h"
-#include "ble_att_priv.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct hci_le_conn_complete;
-struct hci_create_conn;
-struct ble_l2cap_chan;
-
-typedef uint8_t ble_hs_conn_flags_t;
-
-#define BLE_HS_CONN_F_MASTER        0x01
-#define BLE_HS_CONN_F_TERMINATING   0x02
-#define BLE_HS_CONN_F_TX_FRAG       0x04 /* Cur ACL packet partially txed. */
-
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM)
-#define BLE_HS_CONN_L2CAP_COC_CID_MASK_LEN_REM \
-                      ((MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) % (8 * sizeof(uint32_t))) ? 1 : 0)
-
-#define BLE_HS_CONN_L2CAP_COC_CID_MASK_LEN  \
-                      (MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) / (8 * sizeof(uint32_t)) + \
-                       BLE_HS_CONN_L2CAP_COC_CID_MASK_LEN_REM)
-#endif
-
-struct ble_hs_conn {
-    SLIST_ENTRY(ble_hs_conn) bhc_next;
-    uint16_t bhc_handle;
-    uint8_t bhc_our_addr_type;
-#if MYNEWT_VAL(BLE_EXT_ADV)
-    uint8_t bhc_our_rnd_addr[6];
-#endif
-    ble_addr_t bhc_peer_addr;
-    ble_addr_t bhc_our_rpa_addr;
-    ble_addr_t bhc_peer_rpa_addr;
-
-    uint16_t bhc_itvl;
-    uint16_t bhc_latency;
-    uint16_t bhc_supervision_timeout;
-    uint8_t bhc_master_clock_accuracy;
-
-    uint32_t supported_feat;
-
-    ble_hs_conn_flags_t bhc_flags;
-
-    struct ble_l2cap_chan_list bhc_channels;
-    struct ble_l2cap_chan *bhc_rx_chan; /* Channel rxing current packet. */
-    ble_npl_time_t bhc_rx_timeout;
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM)
-    uint32_t l2cap_coc_cid_mask[BLE_HS_CONN_L2CAP_COC_CID_MASK_LEN];
-#endif
-
-    /**
-     * Count of packets sent over this connection that the controller has not
-     * transmitted or flushed yet.
-     */
-    uint16_t bhc_outstanding_pkts;
-
-#if MYNEWT_VAL(BLE_HS_FLOW_CTRL)
-    /**
-     * Count of packets received over this connection that have been processed
-     * and freed.
-     */
-    uint16_t bhc_completed_pkts;
-#endif
-
-    /** Queue of outgoing packets that could not be sent. */
-    STAILQ_HEAD(, os_mbuf_pkthdr) bhc_tx_q;
-
-    struct ble_att_svr_conn bhc_att_svr;
-    struct ble_gatts_conn bhc_gatt_svr;
-
-    struct ble_gap_sec_state bhc_sec_state;
-
-    ble_gap_event_fn *bhc_cb;
-    void *bhc_cb_arg;
-
-#if MYNEWT_VAL(BLE_PERIODIC_ADV)
-    struct ble_hs_periodic_sync *psync;
-#endif
-};
-
-struct ble_hs_conn_addrs {
-    ble_addr_t our_id_addr;
-    ble_addr_t peer_id_addr;
-    ble_addr_t our_ota_addr;
-    ble_addr_t peer_ota_addr;
-};
-
-int ble_hs_conn_can_alloc(void);
-struct ble_hs_conn *ble_hs_conn_alloc(uint16_t conn_handle);
-void ble_hs_conn_free(struct ble_hs_conn *conn);
-void ble_hs_conn_insert(struct ble_hs_conn *conn);
-void ble_hs_conn_remove(struct ble_hs_conn *conn);
-struct ble_hs_conn *ble_hs_conn_find(uint16_t conn_handle);
-struct ble_hs_conn *ble_hs_conn_find_assert(uint16_t conn_handle);
-struct ble_hs_conn *ble_hs_conn_find_by_addr(const ble_addr_t *addr);
-struct ble_hs_conn *ble_hs_conn_find_by_idx(int idx);
-int ble_hs_conn_exists(uint16_t conn_handle);
-struct ble_hs_conn *ble_hs_conn_first(void);
-struct ble_l2cap_chan *ble_hs_conn_chan_find_by_scid(struct ble_hs_conn *conn,
-                                             uint16_t cid);
-struct ble_l2cap_chan *ble_hs_conn_chan_find_by_dcid(struct ble_hs_conn *conn,
-                                             uint16_t cid);
-bool ble_hs_conn_chan_exist(struct ble_hs_conn *conn, struct ble_l2cap_chan *chan);
-int ble_hs_conn_chan_insert(struct ble_hs_conn *conn,
-                            struct ble_l2cap_chan *chan);
-void ble_hs_conn_delete_chan(struct ble_hs_conn *conn,
-                             struct ble_l2cap_chan *chan);
-
-void ble_hs_conn_addrs(const struct ble_hs_conn *conn,
-                       struct ble_hs_conn_addrs *addrs);
-int32_t ble_hs_conn_timer(void);
-
-typedef int ble_hs_conn_foreach_fn(struct ble_hs_conn *conn, void *arg);
-void ble_hs_conn_foreach(ble_hs_conn_foreach_fn *cb, void *arg);
-
-int ble_hs_conn_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_priv.h
deleted file mode 100644
index 362f12cbd..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_priv.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_HCI_PRIV_
-#define H_BLE_HS_HCI_PRIV_
-
-#include "nimble/hci_common.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_hs_conn;
-struct os_mbuf;
-
-#define BLE_HS_HCI_LE_FEAT_ENCRYPTION                   (0x00000001)
-#define BLE_HS_HCI_LE_FEAT_CONN_PARAM_REQUEST           (0x00000002)
-#define BLE_HS_HCI_LE_FEAT_EXT_REJECT                   (0x00000004)
-#define BLE_HS_HCI_LE_FEAT_SLAVE_FEAT_EXCHANGE          (0x00000008)
-#define BLE_HS_HCI_LE_FEAT_PING                         (0x00000010)
-#define BLE_HS_HCI_LE_FEAT_DATA_PACKET_LENGTH_EXT       (0x00000020)
-#define BLE_HS_HCI_LE_FEAT_LL_PRIVACY                   (0x00000040)
-#define BLE_HS_HCI_LE_FEAT_EXT_SCANNER_FILTER_POLICIES  (0x00000080)
-#define BLE_HS_HCI_LE_FEAT_2M_PHY                       (0x00000100)
-#define BLE_HS_HCI_LE_FEAT_STABLE_MOD_INDEX_TX          (0x00000200)
-#define BLE_HS_HCI_LE_FEAT_STABLE_MOD_INDEX_RX          (0x00000400)
-#define BLE_HS_HCI_LE_FEAT_CODED_PHY                    (0x00000800)
-#define BLE_HS_HCI_LE_FEAT_EXT_ADV                      (0x00001000)
-#define BLE_HS_HCI_LE_FEAT_PERIODIC_ADV                 (0x00002000)
-#define BLE_HS_HCI_LE_FEAT_CSA2                         (0x00004000)
-#define BLE_HS_HCI_LE_FEAT_POWER_CLASS_1                (0x00008000)
-#define BLE_HS_HCI_LE_FEAT_MIN_NUM_USED_CHAN            (0x00010000)
-
-struct ble_hs_hci_ack {
-    int bha_status;         /* A BLE_HS_E<...> error; NOT a naked HCI code. */
-    const uint8_t *bha_params;
-    int bha_params_len;
-    uint16_t bha_opcode;
-    uint8_t bha_hci_handle;
-};
-
-#if MYNEWT_VAL(BLE_EXT_ADV)
-struct ble_hs_hci_ext_scan_param {
-    uint8_t scan_type;
-    uint16_t scan_itvl;
-    uint16_t scan_window;
-};
-
-struct ble_hs_hci_ext_conn_params {
-    uint16_t scan_itvl;
-    uint16_t scan_window;
-    uint16_t conn_itvl;
-    uint16_t conn_windows;
-};
-
-#if MYNEWT_VAL(BLE_PERIODIC_ADV)
-/* Periodic Advertising Parameters */
-struct hci_periodic_adv_params
-{
-    uint16_t min_interval;
-    uint16_t max_interval;
-    uint16_t properties;
-};
-#endif
-#endif
-
-extern uint16_t ble_hs_hci_avail_pkts;
-
-int ble_hs_hci_cmd_tx(uint16_t opcode, const void *cmd, uint8_t cmd_len,
-                      void *rsp, uint8_t rsp_len);
-void ble_hs_hci_init(void);
-void ble_hs_hci_deinit(void);
-
-void ble_hs_hci_set_le_supported_feat(uint32_t feat);
-uint32_t ble_hs_hci_get_le_supported_feat(void);
-void ble_hs_hci_set_hci_version(uint8_t hci_version);
-uint8_t ble_hs_hci_get_hci_version(void);
-
-#if MYNEWT_VAL(BLE_HS_PHONY_HCI_ACKS)
-typedef int ble_hs_hci_phony_ack_fn(uint8_t *ack, int ack_buf_len);
-void ble_hs_hci_set_phony_ack_cb(ble_hs_hci_phony_ack_fn *cb);
-#endif
-
-int ble_hs_hci_util_read_adv_tx_pwr(int8_t *out_pwr);
-int ble_hs_hci_util_rand(void *dst, int len);
-int ble_hs_hci_util_read_rssi(uint16_t conn_handle, int8_t *out_rssi);
-int ble_hs_hci_util_set_random_addr(const uint8_t *addr);
-int ble_hs_hci_util_data_hdr_strip(struct os_mbuf *om,
-                                   struct hci_data_hdr *out_hdr);
-int ble_hs_hci_evt_process(const struct ble_hci_ev *ev);
-
-int ble_hs_hci_cmd_send_buf(uint16_t opcode, const void *buf, uint8_t buf_len);
-int ble_hs_hci_set_buf_sz(uint16_t pktlen, uint16_t max_pkts);
-void ble_hs_hci_add_avail_pkts(uint16_t delta);
-
-uint16_t ble_hs_hci_util_handle_pb_bc_join(uint16_t handle, uint8_t pb,
-                                           uint8_t bc);
-
-int ble_hs_hci_acl_tx_now(struct ble_hs_conn *conn, struct os_mbuf **om);
-int ble_hs_hci_acl_tx(struct ble_hs_conn *conn, struct os_mbuf **om);
-
-int ble_hs_hci_frag_num_mbufs(void);
-int ble_hs_hci_frag_num_mbufs_free(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_priv.h
deleted file mode 100644
index 538d07a97..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_priv.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_PRIV_
-#define H_BLE_HS_PRIV_
-
-#include <assert.h>
-#include <inttypes.h>
-#include "ble_att_cmd_priv.h"
-#include "ble_att_priv.h"
-#include "ble_gap_priv.h"
-#include "ble_gatt_priv.h"
-#include "ble_hs_hci_priv.h"
-#include "ble_hs_atomic_priv.h"
-#include "ble_hs_conn_priv.h"
-#include "ble_hs_atomic_priv.h"
-#include "ble_hs_mbuf_priv.h"
-#include "ble_hs_startup_priv.h"
-#include "ble_l2cap_priv.h"
-#include "ble_l2cap_sig_priv.h"
-#include "ble_l2cap_coc_priv.h"
-#include "ble_sm_priv.h"
-#include "ble_hs_adv_priv.h"
-#include "ble_hs_flow_priv.h"
-#include "ble_hs_pvcy_priv.h"
-#include "ble_hs_id_priv.h"
-#include "ble_hs_periodic_sync_priv.h"
-#include "ble_uuid_priv.h"
-#include "host/ble_hs.h"
-#include "host/ble_monitor.h"
-#include "nimble/nimble_opt.h"
-#include "stats/stats.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_hs_conn;
-struct ble_l2cap_chan;
-struct os_mbuf;
-struct os_mempool;
-struct os_event;
-
-#define BLE_HS_SYNC_STATE_BAD           0
-#define BLE_HS_SYNC_STATE_BRINGUP       1
-#define BLE_HS_SYNC_STATE_GOOD          2
-
-#define BLE_HS_ENABLED_STATE_OFF        0
-#define BLE_HS_ENABLED_STATE_STOPPING   1
-#define BLE_HS_ENABLED_STATE_ON         2
-
-#if NIMBLE_BLE_CONNECT
-#define BLE_HS_MAX_CONNECTIONS MYNEWT_VAL(BLE_MAX_CONNECTIONS)
-#else
-#define BLE_HS_MAX_CONNECTIONS 0
-#endif
-
-#if !MYNEWT_VAL(BLE_ATT_SVR_QUEUED_WRITE)
-#define BLE_HS_ATT_SVR_QUEUED_WRITE_TMO 0
-#else
-#define BLE_HS_ATT_SVR_QUEUED_WRITE_TMO \
-    MYNEWT_VAL(BLE_ATT_SVR_QUEUED_WRITE_TMO)
-#endif
-
-STATS_SECT_START(ble_hs_stats)
-    STATS_SECT_ENTRY(conn_create)
-    STATS_SECT_ENTRY(conn_delete)
-    STATS_SECT_ENTRY(hci_cmd)
-    STATS_SECT_ENTRY(hci_event)
-    STATS_SECT_ENTRY(hci_invalid_ack)
-    STATS_SECT_ENTRY(hci_unknown_event)
-    STATS_SECT_ENTRY(hci_timeout)
-    STATS_SECT_ENTRY(reset)
-    STATS_SECT_ENTRY(sync)
-    STATS_SECT_ENTRY(pvcy_add_entry)
-    STATS_SECT_ENTRY(pvcy_add_entry_fail)
-STATS_SECT_END
-extern STATS_SECT_DECL(ble_hs_stats) ble_hs_stats;
-
-extern struct os_mbuf_pool ble_hs_mbuf_pool;
-extern uint8_t ble_hs_sync_state;
-extern uint8_t ble_hs_enabled_state;
-
-extern const uint8_t ble_hs_misc_null_addr[6];
-
-extern uint16_t ble_hs_max_attrs;
-extern uint16_t ble_hs_max_services;
-extern uint16_t ble_hs_max_client_configs;
-
-void ble_hs_process_rx_data_queue(void);
-int ble_hs_tx_data(struct os_mbuf *om);
-void ble_hs_wakeup_tx(void);
-void ble_hs_enqueue_hci_event(uint8_t *hci_evt);
-void ble_hs_event_enqueue(struct os_event *ev);
-
-int ble_hs_hci_rx_evt(uint8_t *hci_ev, void *arg);
-int ble_hs_hci_evt_acl_process(struct os_mbuf *om);
-
-int ble_hs_misc_conn_chan_find(uint16_t conn_handle, uint16_t cid,
-                               struct ble_hs_conn **out_conn,
-                               struct ble_l2cap_chan **out_chan);
-int ble_hs_misc_conn_chan_find_reqd(uint16_t conn_handle, uint16_t cid,
-                                    struct ble_hs_conn **out_conn,
-                                    struct ble_l2cap_chan **out_chan);
-uint8_t ble_hs_misc_own_addr_type_to_id(uint8_t addr_type);
-uint8_t ble_hs_misc_peer_addr_type_to_id(uint8_t addr_type);
-int ble_hs_misc_restore_irks(void);
-
-int ble_hs_locked_by_cur_task(void);
-int ble_hs_is_parent_task(void);
-void ble_hs_lock_nested(void);
-void ble_hs_unlock_nested(void);
-void ble_hs_lock(void);
-void ble_hs_unlock(void);
-void ble_hs_hw_error(uint8_t hw_code);
-void ble_hs_timer_resched(void);
-void ble_hs_notifications_sched(void);
-struct ble_npl_eventq *ble_hs_evq_get(void);
-void ble_hs_stop_init(void);
-
-struct ble_mqueue {
-    STAILQ_HEAD(, os_mbuf_pkthdr) head;
-    struct ble_npl_event ev;
-};
-
-int ble_mqueue_init(struct ble_mqueue *mq, ble_npl_event_fn *ev_fn, void *ev_arg);
-struct os_mbuf *ble_mqueue_get(struct ble_mqueue *mq);
-int ble_mqueue_put(struct ble_mqueue *mq, struct ble_npl_eventq *evq, struct os_mbuf *om);
-
-#if MYNEWT_VAL(BLE_HS_DEBUG)
-    #define BLE_HS_DBG_ASSERT(x) assert(x)
-    #define BLE_HS_DBG_ASSERT_EVAL(x) assert(x)
-#else
-    #define BLE_HS_DBG_ASSERT(x)
-    #define BLE_HS_DBG_ASSERT_EVAL(x) ((void)(x))
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv_priv.h
deleted file mode 100644
index 7bc8a2fe6..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv_priv.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright 2020 Espressif Systems (Shanghai) PTE LTD
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
-/*
- * An entry in the resolving list.
- */
-struct ble_hs_resolv_entry {
-    uint8_t rl_addr_type;
-    uint8_t rl_local_irk[16];
-    uint8_t rl_peer_irk[16];
-    uint8_t rl_identity_addr[BLE_DEV_ADDR_LEN];
-    uint8_t rl_pseudo_id[BLE_DEV_ADDR_LEN];
-    uint8_t rl_local_rpa[BLE_DEV_ADDR_LEN];
-    uint8_t rl_peer_rpa[BLE_DEV_ADDR_LEN];
-};
-
-#if MYNEWT_VAL(BLE_STORE_CONFIG_PERSIST)
-/* Persist peer records in NVS. XXX Need to handle this in `store` module */
-int ble_store_persist_peer_records(void);
-#endif
-
-struct ble_hs_peer_sec {
-    ble_addr_t peer_addr;
-    uint8_t irk[16];
-    uint8_t irk_present: 1;
-};
-/*
- * BLE host peer device record, this helps in storing peer RPA before bond is
- * created and IRKs are exchanged.
- */
-struct ble_hs_dev_records {
-    bool rec_used;
-    uint8_t rand_addr_type;
-    uint8_t pseudo_addr[BLE_DEV_ADDR_LEN];
-    uint8_t rand_addr[BLE_DEV_ADDR_LEN];
-    uint8_t identity_addr[BLE_DEV_ADDR_LEN];
-    struct ble_hs_peer_sec peer_sec;
-};
-
-/* Add a device to the resolving list */
-int ble_hs_resolv_list_add(uint8_t *cmdbuf);
-int ble_hs_gen_own_private_rnd(void);
-uint8_t *ble_hs_get_rpa_local(void);
-
-/* Remove a device from the resolving list */
-int ble_hs_resolv_list_rmv(uint8_t, uint8_t *);
-/* Clear the resolving list and peer dev record */
-void ble_hs_resolv_list_clear_all(void);
-
-/* Address resolution enable command */
-void ble_hs_resolv_enable(bool);
-void ble_hs_resolv_nrpa_enable(void);
-void ble_hs_resolv_nrpa_disable(void);
-
-/* Finds 'addr' in resolving list. Doesnt check if address resolution enabled */
-struct ble_hs_resolv_entry *
-ble_hs_resolv_list_find(uint8_t *addr);
-
-/* Returns true if host based RPA (privacy) is enabled */
-bool ble_host_rpa_enabled(void);
-
-/* Searches peer device records (RPA) and fetches matching RL, peer_address
- * into input parameters if RL is found */
-void
-ble_rpa_replace_peer_params_with_rl(uint8_t *, uint8_t *, struct ble_hs_resolv_entry **);
-
-int ble_rpa_resolv_add_peer_rec(uint8_t *);
-
-struct ble_hs_dev_records *ble_rpa_get_peer_dev_records(void);
-int ble_rpa_get_num_peer_dev_records(void);
-void ble_rpa_set_num_peer_dev_records(int);
-int ble_rpa_remove_peer_dev_rec(struct ble_hs_dev_records *);
-struct ble_hs_dev_records *ble_rpa_find_peer_dev_rec(uint8_t *);
-
-/* Set the resolvable private address timeout */
-int ble_hs_resolv_set_rpa_tmo(uint16_t);
-
-/* Resolve a resolvable private address */
-int ble_hs_resolv_rpa(uint8_t *rpa, uint8_t *irk);
-
-/* Initialize resolv*/
-void ble_hs_resolv_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_priv.h
deleted file mode 100644
index a698cd0d8..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_priv.h
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_L2CAP_SIG_
-#define H_BLE_L2CAP_SIG_
-
-#include "syscfg/syscfg.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BLE_L2CAP_SIG_MTU           100  /* This is our own default. */
-
-#define BLE_L2CAP_SIG_HDR_SZ                4
-struct ble_l2cap_sig_hdr {
-    uint8_t op;
-    uint8_t identifier;
-    uint16_t length;
-    uint8_t data[0];
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_REJECT_MIN_SZ         2
-struct ble_l2cap_sig_reject {
-    uint16_t reason;
-    uint8_t data[0];
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_UPDATE_REQ_SZ         8
-struct ble_l2cap_sig_update_req {
-    uint16_t itvl_min;
-    uint16_t itvl_max;
-    uint16_t slave_latency;
-    uint16_t timeout_multiplier;
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_UPDATE_RSP_SZ         2
-struct ble_l2cap_sig_update_rsp {
-    uint16_t result;
-} __attribute__((packed));
-
-#define BLE_L2CAP_SIG_UPDATE_RSP_RESULT_ACCEPT  0x0000
-#define BLE_L2CAP_SIG_UPDATE_RSP_RESULT_REJECT  0x0001
-
-struct ble_l2cap_sig_le_con_req {
-    uint16_t psm;
-    uint16_t scid;
-    uint16_t mtu;
-    uint16_t mps;
-    uint16_t credits;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_le_con_rsp {
-    uint16_t dcid;
-    uint16_t mtu;
-    uint16_t mps;
-    uint16_t credits;
-    uint16_t result;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_credit_base_connect_req {
-    uint16_t psm;
-    uint16_t mtu;
-    uint16_t mps;
-    uint16_t credits;
-    uint16_t scids[0];
-} __attribute__((packed));
-
-struct ble_l2cap_sig_credit_base_connect_rsp {
-    uint16_t mtu;
-    uint16_t mps;
-    uint16_t credits;
-    uint16_t result;
-    uint16_t dcids[0];
-} __attribute__((packed));
-
-struct ble_l2cap_sig_credit_base_reconfig_req {
-    uint16_t mtu;
-    uint16_t mps;
-    uint16_t dcids[0];
-} __attribute__((packed));
-
-struct ble_l2cap_sig_credit_base_reconfig_rsp {
-    uint16_t result;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_disc_req {
-    uint16_t dcid;
-    uint16_t scid;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_disc_rsp {
-    uint16_t dcid;
-    uint16_t scid;
-} __attribute__((packed));
-
-struct ble_l2cap_sig_le_credits {
-    uint16_t scid;
-    uint16_t credits;
-} __attribute__((packed));
-
-void ble_l2cap_sig_hdr_parse(void *payload, uint16_t len,
-                             struct ble_l2cap_sig_hdr *hdr);
-int ble_l2cap_sig_reject_tx(uint16_t conn_handle,
-                            uint8_t id, uint16_t reason,
-                            void *data, int data_len);
-int ble_l2cap_sig_reject_invalid_cid_tx(uint16_t conn_handle, uint8_t id,
-                                        uint16_t src_cid, uint16_t dst_cid);
-int ble_l2cap_sig_tx(uint16_t conn_handle, struct os_mbuf *txom);
-void *ble_l2cap_sig_cmd_get(uint8_t opcode, uint8_t id, uint16_t len,
-                            struct os_mbuf **txom);
-#if MYNEWT_VAL(BLE_L2CAP_COC_MAX_NUM) != 0
-int ble_l2cap_sig_coc_connect(uint16_t conn_handle, uint16_t psm, uint16_t mtu,
-                              struct os_mbuf *sdu_rx,
-                              ble_l2cap_event_fn *cb, void *cb_arg);
-int ble_l2cap_sig_disconnect(struct ble_l2cap_chan *chan);
-int ble_l2cap_sig_le_credits(uint16_t conn_handle, uint16_t scid,
-                             uint16_t credits);
-#else
-static inline int
-ble_l2cap_sig_coc_connect(uint16_t conn_handle, uint16_t psm, uint16_t mtu,
-                          struct os_mbuf *sdu_rx,
-                          ble_l2cap_event_fn *cb, void *cb_arg)
-{
-    return BLE_HS_ENOTSUP;
-}
-
-static inline int
-ble_l2cap_sig_disconnect(struct ble_l2cap_chan *chan)
-{
-    return BLE_HS_ENOTSUP;
-}
-#endif
-
-#if MYNEWT_VAL(BLE_L2CAP_ENHANCED_COC)
-int ble_l2cap_sig_ecoc_connect(uint16_t conn_handle,
-                                       uint16_t psm, uint16_t mtu,
-                                       uint8_t num, struct os_mbuf *sdu_rx[],
-                                       ble_l2cap_event_fn *cb, void *cb_arg);
-int ble_l2cap_sig_coc_reconfig(uint16_t conn_handle, struct ble_l2cap_chan *chans[],
-                               uint8_t num, uint16_t new_mtu);
-#else
-static inline int
-ble_l2cap_sig_ecoc_connect(uint16_t conn_handle,
-                           uint16_t psm, uint16_t mtu,
-                           uint8_t num, struct os_mbuf *sdu_rx[],
-                           ble_l2cap_event_fn *cb, void *cb_arg)
-{
-    return BLE_HS_ENOTSUP;
-}
-static inline int
-ble_l2cap_sig_coc_reconfig(uint16_t conn_handle, struct ble_l2cap_chan *chans[],
-                           uint8_t num, uint16_t new_mtu)
-{
-    return BLE_HS_ENOTSUP;
-}
-#endif
-
-void ble_l2cap_sig_conn_broken(uint16_t conn_handle, int reason);
-int32_t ble_l2cap_sig_timer(void);
-struct ble_l2cap_chan *ble_l2cap_sig_create_chan(uint16_t conn_handle);
-int ble_l2cap_sig_init(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_monitor_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_monitor_priv.h
deleted file mode 100644
index 935787040..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_monitor_priv.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_MONITOR_PRIV_
-#define H_BLE_MONITOR_PRIV_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define BLE_MONITOR_OPCODE_NEW_INDEX    0
-#define BLE_MONITOR_OPCODE_DEL_INDEX    1
-#define BLE_MONITOR_OPCODE_COMMAND_PKT  2
-#define BLE_MONITOR_OPCODE_EVENT_PKT    3
-#define BLE_MONITOR_OPCODE_ACL_TX_PKT   4
-#define BLE_MONITOR_OPCODE_ACL_RX_PKT   5
-#define BLE_MONITOR_OPCODE_SCO_TX_PKT   6
-#define BLE_MONITOR_OPCODE_SCO_RX_PKT   7
-#define BLE_MONITOR_OPCODE_OPEN_INDEX   8
-#define BLE_MONITOR_OPCODE_CLOSE_INDEX  9
-#define BLE_MONITOR_OPCODE_INDEX_INFO   10
-#define BLE_MONITOR_OPCODE_VENDOR_DIAG  11
-#define BLE_MONITOR_OPCODE_SYSTEM_NOTE  12
-#define BLE_MONITOR_OPCODE_USER_LOGGING 13
-
-#define BLE_MONITOR_EXTHDR_COMMAND_DROPS    1
-#define BLE_MONITOR_EXTHDR_EVENT_DROPS      2
-#define BLE_MONITOR_EXTHDR_ACL_RX_DROPS     3
-#define BLE_MONITOR_EXTHDR_ACL_TX_DROPS     4
-#define BLE_MONITOR_EXTHDR_SCO_RX_DROPS     5
-#define BLE_MONITOR_EXTHDR_SCO_TX_DROPS     6
-#define BLE_MONITOR_EXTHDR_OTHER_DROPS      7
-#define BLE_MONITOR_EXTHDR_TS32             8
-
-struct ble_monitor_hdr {
-    uint16_t  data_len;
-    uint16_t  opcode;
-    uint8_t   flags;
-    uint8_t   hdr_len;
-} __attribute__((packed));
-
-struct ble_monitor_drops_hdr {
-    uint8_t type_cmd;
-    uint8_t cmd;
-    uint8_t type_evt;
-    uint8_t evt;
-    uint8_t type_acl_tx;
-    uint8_t acl_tx;
-    uint8_t type_acl_rx;
-    uint8_t acl_rx;
-    uint8_t type_other;
-    uint8_t other;
-} __attribute__((packed));
-
-struct ble_monitor_ts_hdr {
-    uint8_t   type;
-    uint32_t  ts32;
-} __attribute__((packed));
-
-struct ble_monitor_new_index {
-    uint8_t  type;
-    uint8_t  bus;
-    uint8_t  bdaddr[6];
-    char     name[8];
-} __attribute__((packed));
-
-struct ble_monitor_user_logging {
-    uint8_t  priority;
-    uint8_t  ident_len;
-} __attribute__((packed));
-
-int ble_monitor_init(void);
-
-int ble_monitor_send(uint16_t opcode, const void *data, size_t len);
-
-int ble_monitor_send_om(uint16_t opcode, const struct os_mbuf *om);
-
-int ble_monitor_new_index(uint8_t bus, uint8_t *addr, const char *name);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/ram/src/ble_store_ram.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/ram/src/ble_store_ram.c
deleted file mode 100644
index ab5cdb9f6..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/ram/src/ble_store_ram.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/**
- * This file implements a simple in-RAM key database for BLE host security
- * material and CCCDs.  As this database is only ble_store_ramd in RAM, its
- * contents are lost when the application terminates.
- */
-
-#include <inttypes.h>
-#include <string.h>
-
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "host/ble_hs.h"
-#include "store/ram/ble_store_ram.h"
-
-static struct ble_store_value_sec
-    ble_store_ram_our_secs[MYNEWT_VAL(BLE_STORE_MAX_BONDS)];
-static int ble_store_ram_num_our_secs;
-
-static struct ble_store_value_sec
-    ble_store_ram_peer_secs[MYNEWT_VAL(BLE_STORE_MAX_BONDS)];
-static int ble_store_ram_num_peer_secs;
-
-static struct ble_store_value_cccd
-    ble_store_ram_cccds[MYNEWT_VAL(BLE_STORE_MAX_CCCDS)];
-static int ble_store_ram_num_cccds;
-
-/*****************************************************************************
- * $sec                                                                      *
- *****************************************************************************/
-
-static void
-ble_store_ram_print_value_sec(const struct ble_store_value_sec *sec)
-{
-    if (sec->ltk_present) {
-        BLE_HS_LOG(DEBUG, "ediv=%u rand=%llu authenticated=%d ltk=",
-                       sec->ediv, sec->rand_num, sec->authenticated);
-        ble_hs_log_flat_buf(sec->ltk, 16);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-    if (sec->irk_present) {
-        BLE_HS_LOG(DEBUG, "irk=");
-        ble_hs_log_flat_buf(sec->irk, 16);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-    if (sec->csrk_present) {
-        BLE_HS_LOG(DEBUG, "csrk=");
-        ble_hs_log_flat_buf(sec->csrk, 16);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-
-    BLE_HS_LOG(DEBUG, "\n");
-}
-
-static void
-ble_store_ram_print_key_sec(const struct ble_store_key_sec *key_sec)
-{
-    if (ble_addr_cmp(&key_sec->peer_addr, BLE_ADDR_ANY)) {
-        BLE_HS_LOG(DEBUG, "peer_addr_type=%d peer_addr=",
-                       key_sec->peer_addr.type);
-        ble_hs_log_flat_buf(key_sec->peer_addr.val, 6);
-        BLE_HS_LOG(DEBUG, " ");
-    }
-    if (key_sec->ediv_rand_present) {
-        BLE_HS_LOG(DEBUG, "ediv=0x%02x rand=0x%llx ",
-                       key_sec->ediv, key_sec->rand_num);
-    }
-}
-
-static int
-ble_store_ram_find_sec(const struct ble_store_key_sec *key_sec,
-                       const struct ble_store_value_sec *value_secs,
-                       int num_value_secs)
-{
-    const struct ble_store_value_sec *cur;
-    int skipped;
-    int i;
-
-    skipped = 0;
-
-    for (i = 0; i < num_value_secs; i++) {
-        cur = value_secs + i;
-
-        if (ble_addr_cmp(&key_sec->peer_addr, BLE_ADDR_ANY)) {
-            if (ble_addr_cmp(&cur->peer_addr, &key_sec->peer_addr)) {
-                continue;
-            }
-        }
-
-        if (key_sec->ediv_rand_present) {
-            if (cur->ediv != key_sec->ediv) {
-                continue;
-            }
-
-            if (cur->rand_num != key_sec->rand_num) {
-                continue;
-            }
-        }
-
-        if (key_sec->idx > skipped) {
-            skipped++;
-            continue;
-        }
-
-        return i;
-    }
-
-    return -1;
-}
-
-static int
-ble_store_ram_read_our_sec(const struct ble_store_key_sec *key_sec,
-                           struct ble_store_value_sec *value_sec)
-{
-    int idx;
-
-    idx = ble_store_ram_find_sec(key_sec, ble_store_ram_our_secs,
-                                 ble_store_ram_num_our_secs);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    *value_sec = ble_store_ram_our_secs[idx];
-    return 0;
-}
-
-static int
-ble_store_ram_write_our_sec(const struct ble_store_value_sec *value_sec)
-{
-    struct ble_store_key_sec key_sec;
-    int idx;
-
-    BLE_HS_LOG(DEBUG, "persisting our sec; ");
-    ble_store_ram_print_value_sec(value_sec);
-
-    ble_store_key_from_value_sec(&key_sec, value_sec);
-    idx = ble_store_ram_find_sec(&key_sec, ble_store_ram_our_secs,
-                                 ble_store_ram_num_our_secs);
-    if (idx == -1) {
-        if (ble_store_ram_num_our_secs >= MYNEWT_VAL(BLE_STORE_MAX_BONDS)) {
-            BLE_HS_LOG(DEBUG, "error persisting our sec; too many entries "
-                              "(%d)\n", ble_store_ram_num_our_secs);
-            return BLE_HS_ESTORE_CAP;
-        }
-
-        idx = ble_store_ram_num_our_secs;
-        ble_store_ram_num_our_secs++;
-    }
-
-    ble_store_ram_our_secs[idx] = *value_sec;
-    return 0;
-}
-
-static int
-ble_store_ram_delete_obj(void *values, int value_size, int idx,
-                         int *num_values)
-{
-    uint8_t *dst;
-    uint8_t *src;
-    int move_count;
-
-    (*num_values)--;
-    if (idx < *num_values) {
-        dst = values;
-        dst += idx * value_size;
-        src = dst + value_size;
-
-        move_count = *num_values - idx;
-        memmove(dst, src, move_count);
-    }
-
-    return 0;
-}
-
-static int
-ble_store_ram_delete_sec(const struct ble_store_key_sec *key_sec,
-                         struct ble_store_value_sec *value_secs,
-                         int *num_value_secs)
-{
-    int idx;
-    int rc;
-
-    idx = ble_store_ram_find_sec(key_sec, value_secs, *num_value_secs);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    rc = ble_store_ram_delete_obj(value_secs, sizeof *value_secs, idx,
-                                  num_value_secs);
-    if (rc != 0) {
-        return rc;
-    }
-
-    return 0;
-}
-
-static int
-ble_store_ram_delete_our_sec(const struct ble_store_key_sec *key_sec)
-{
-    int rc;
-
-    rc = ble_store_ram_delete_sec(key_sec, ble_store_ram_our_secs,
-                                  &ble_store_ram_num_our_secs);
-    if (rc != 0) {
-        return rc;
-    }
-
-    return 0;
-}
-
-static int
-ble_store_ram_delete_peer_sec(const struct ble_store_key_sec *key_sec)
-{
-    int rc;
-
-    rc = ble_store_ram_delete_sec(key_sec, ble_store_ram_peer_secs,
-                                  &ble_store_ram_num_peer_secs);
-    if (rc != 0) {
-        return rc;
-    }
-
-    return 0;
-}
-
-static int
-ble_store_ram_read_peer_sec(const struct ble_store_key_sec *key_sec,
-                            struct ble_store_value_sec *value_sec)
-{
-    int idx;
-
-    idx = ble_store_ram_find_sec(key_sec, ble_store_ram_peer_secs,
-                             ble_store_ram_num_peer_secs);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    *value_sec = ble_store_ram_peer_secs[idx];
-    return 0;
-}
-
-static int
-ble_store_ram_write_peer_sec(const struct ble_store_value_sec *value_sec)
-{
-    struct ble_store_key_sec key_sec;
-    int idx;
-
-    BLE_HS_LOG(DEBUG, "persisting peer sec; ");
-    ble_store_ram_print_value_sec(value_sec);
-
-    ble_store_key_from_value_sec(&key_sec, value_sec);
-    idx = ble_store_ram_find_sec(&key_sec, ble_store_ram_peer_secs,
-                                 ble_store_ram_num_peer_secs);
-    if (idx == -1) {
-        if (ble_store_ram_num_peer_secs >= MYNEWT_VAL(BLE_STORE_MAX_BONDS)) {
-            BLE_HS_LOG(DEBUG, "error persisting peer sec; too many entries "
-                             "(%d)\n", ble_store_ram_num_peer_secs);
-            return BLE_HS_ESTORE_CAP;
-        }
-
-        idx = ble_store_ram_num_peer_secs;
-        ble_store_ram_num_peer_secs++;
-    }
-
-    ble_store_ram_peer_secs[idx] = *value_sec;
-    return 0;
-}
-
-/*****************************************************************************
- * $cccd                                                                     *
- *****************************************************************************/
-
-static int
-ble_store_ram_find_cccd(const struct ble_store_key_cccd *key)
-{
-    struct ble_store_value_cccd *cccd;
-    int skipped;
-    int i;
-
-    skipped = 0;
-    for (i = 0; i < ble_store_ram_num_cccds; i++) {
-        cccd = ble_store_ram_cccds + i;
-
-        if (ble_addr_cmp(&key->peer_addr, BLE_ADDR_ANY)) {
-            if (ble_addr_cmp(&cccd->peer_addr, &key->peer_addr)) {
-                continue;
-            }
-        }
-
-        if (key->chr_val_handle != 0) {
-            if (cccd->chr_val_handle != key->chr_val_handle) {
-                continue;
-            }
-        }
-
-        if (key->idx > skipped) {
-            skipped++;
-            continue;
-        }
-
-        return i;
-    }
-
-    return -1;
-}
-
-static int
-ble_store_ram_delete_cccd(const struct ble_store_key_cccd *key_cccd)
-{
-    int idx;
-    int rc;
-
-    idx = ble_store_ram_find_cccd(key_cccd);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    rc = ble_store_ram_delete_obj(ble_store_ram_cccds,
-                                  sizeof *ble_store_ram_cccds,
-                                  idx,
-                                  &ble_store_ram_num_cccds);
-    if (rc != 0) {
-        return rc;
-    }
-
-    return 0;
-}
-
-static int
-ble_store_ram_read_cccd(const struct ble_store_key_cccd *key_cccd,
-                        struct ble_store_value_cccd *value_cccd)
-{
-    int idx;
-
-    idx = ble_store_ram_find_cccd(key_cccd);
-    if (idx == -1) {
-        return BLE_HS_ENOENT;
-    }
-
-    *value_cccd = ble_store_ram_cccds[idx];
-    return 0;
-}
-
-static int
-ble_store_ram_write_cccd(const struct ble_store_value_cccd *value_cccd)
-{
-    struct ble_store_key_cccd key_cccd;
-    int idx;
-
-    ble_store_key_from_value_cccd(&key_cccd, value_cccd);
-    idx = ble_store_ram_find_cccd(&key_cccd);
-    if (idx == -1) {
-        if (ble_store_ram_num_cccds >= MYNEWT_VAL(BLE_STORE_MAX_CCCDS)) {
-            BLE_HS_LOG(DEBUG, "error persisting cccd; too many entries (%d)\n",
-                       ble_store_ram_num_cccds);
-            return BLE_HS_ESTORE_CAP;
-        }
-
-        idx = ble_store_ram_num_cccds;
-        ble_store_ram_num_cccds++;
-    }
-
-    ble_store_ram_cccds[idx] = *value_cccd;
-    return 0;
-}
-
-/*****************************************************************************
- * $api                                                                      *
- *****************************************************************************/
-
-/**
- * Searches the database for an object matching the specified criteria.
- *
- * @return                      0 if a key was found; else BLE_HS_ENOENT.
- */
-int
-ble_store_ram_read(int obj_type, const union ble_store_key *key,
-                   union ble_store_value *value)
-{
-    int rc;
-
-    switch (obj_type) {
-    case BLE_STORE_OBJ_TYPE_PEER_SEC:
-        /* An encryption procedure (bonding) is being attempted.  The nimble
-         * stack is asking us to look in our key database for a long-term key
-         * corresponding to the specified ediv and random number.
-         *
-         * Perform a key lookup and populate the context object with the
-         * result.  The nimble stack will use this key if this function returns
-         * success.
-         */
-        BLE_HS_LOG(DEBUG, "looking up peer sec; ");
-        ble_store_ram_print_key_sec(&key->sec);
-        BLE_HS_LOG(DEBUG, "\n");
-        rc = ble_store_ram_read_peer_sec(&key->sec, &value->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_OUR_SEC:
-        BLE_HS_LOG(DEBUG, "looking up our sec; ");
-        ble_store_ram_print_key_sec(&key->sec);
-        BLE_HS_LOG(DEBUG, "\n");
-        rc = ble_store_ram_read_our_sec(&key->sec, &value->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_CCCD:
-        rc = ble_store_ram_read_cccd(&key->cccd, &value->cccd);
-        return rc;
-
-    default:
-        return BLE_HS_ENOTSUP;
-    }
-}
-
-/**
- * Adds the specified object to the database.
- *
- * @return                      0 on success; BLE_HS_ESTORE_CAP if the database
- *                                  is full.
- */
-int
-ble_store_ram_write(int obj_type, const union ble_store_value *val)
-{
-    int rc;
-
-    switch (obj_type) {
-    case BLE_STORE_OBJ_TYPE_PEER_SEC:
-        rc = ble_store_ram_write_peer_sec(&val->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_OUR_SEC:
-        rc = ble_store_ram_write_our_sec(&val->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_CCCD:
-        rc = ble_store_ram_write_cccd(&val->cccd);
-        return rc;
-
-    default:
-        return BLE_HS_ENOTSUP;
-    }
-}
-
-int
-ble_store_ram_delete(int obj_type, const union ble_store_key *key)
-{
-    int rc;
-
-    switch (obj_type) {
-    case BLE_STORE_OBJ_TYPE_PEER_SEC:
-        rc = ble_store_ram_delete_peer_sec(&key->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_OUR_SEC:
-        rc = ble_store_ram_delete_our_sec(&key->sec);
-        return rc;
-
-    case BLE_STORE_OBJ_TYPE_CCCD:
-        rc = ble_store_ram_delete_cccd(&key->cccd);
-        return rc;
-
-    default:
-        return BLE_HS_ENOTSUP;
-    }
-}
-
-void
-ble_store_ram_init(void)
-{
-    /* Ensure this function only gets called by sysinit. */
-    SYSINIT_ASSERT_ACTIVE();
-
-    ble_hs_cfg.store_read_cb = ble_store_ram_read;
-    ble_hs_cfg.store_write_cb = ble_store_ram_write;
-    ble_hs_cfg.store_delete_cb = ble_store_ram_delete;
-
-    /* Re-initialize BSS values in case of unit tests. */
-    ble_store_ram_num_our_secs = 0;
-    ble_store_ram_num_peer_secs = 0;
-    ble_store_ram_num_cccds = 0;
-}
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_hw.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_hw.h
new file mode 100644
index 000000000..dfac69b60
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_hw.h
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_HW_
+#define H_BLE_HW_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+
+#if defined(ARCH_sim)
+#define BLE_USES_HW_WHITELIST   (0)
+#else
+#define BLE_USES_HW_WHITELIST   MYNEWT_VAL(BLE_HW_WHITELIST_ENABLE)
+#endif
+
+/* Returns the number of hw whitelist elements */
+uint8_t ble_hw_whitelist_size(void);
+
+/* Clear the whitelist */
+void ble_hw_whitelist_clear(void);
+
+/* Remove a device from the hw whitelist */
+void ble_hw_whitelist_rmv(const uint8_t *addr, uint8_t addr_type);
+
+/* Add a device to the hw whitelist */
+int ble_hw_whitelist_add(const uint8_t *addr, uint8_t addr_type);
+
+/* Enable hw whitelisting */
+void ble_hw_whitelist_enable(void);
+
+/* Enable hw whitelisting */
+void ble_hw_whitelist_disable(void);
+
+/* Boolean function returning true if address matches a whitelist entry */
+int ble_hw_whitelist_match(void);
+
+/* Encrypt data */
+struct ble_encryption_block;
+int ble_hw_encrypt_block(struct ble_encryption_block *ecb);
+
+/* Random number generation */
+typedef void (*ble_rng_isr_cb_t)(uint8_t rnum);
+int ble_hw_rng_init(ble_rng_isr_cb_t cb, int bias);
+
+/**
+ * Start the random number generator
+ *
+ * @return int
+ */
+int ble_hw_rng_start(void);
+
+/**
+ * Stop the random generator
+ *
+ * @return int
+ */
+int ble_hw_rng_stop(void);
+
+/**
+ * Read the random number generator.
+ *
+ * @return uint8_t
+ */
+uint8_t ble_hw_rng_read(void);
+
+/*  Clear the resolving list*/
+void ble_hw_resolv_list_clear(void);
+
+/* Add a device to the hw resolving list */
+int ble_hw_resolv_list_add(uint8_t *irk);
+
+/* Remove a device from the hw resolving list */
+void ble_hw_resolv_list_rmv(int index);
+
+/* Returns the size of the whitelist in HW */
+uint8_t ble_hw_resolv_list_size(void);
+
+/* Enable the resolving list */
+void ble_hw_resolv_list_enable(void);
+
+/* Disables resolving list devices */
+void ble_hw_resolv_list_disable(void);
+
+/* Returns index of resolved address; -1 if not resolved */
+int ble_hw_resolv_list_match(void);
+
+/* Returns public device address or -1 if not present */
+int ble_hw_get_public_addr(ble_addr_t *addr);
+
+/* Returns random static address or -1 if not present */
+int ble_hw_get_static_addr(ble_addr_t *addr);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_HW_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll.h
new file mode 100644
index 000000000..3b165a706
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll.h
@@ -0,0 +1,584 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_
+#define H_BLE_LL_
+
+#include "nimble/porting/nimble/include/stats/stats.h"
+#include "nimble/porting/nimble/include/os/os_cputime.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
+#include "ble_phy.h"
+
+#ifdef MYNEWT
+#include "./ble_ll_ctrl.h"
+#include "hal/hal_system.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if MYNEWT_VAL(OS_CPUTIME_FREQ) != 32768
+#error 32.768kHz clock required
+#endif
+
+#if defined(MYNEWT) && MYNEWT_VAL(BLE_LL_VND_EVENT_ON_ASSERT)
+#ifdef NDEBUG
+#define BLE_LL_ASSERT(cond) (void(0))
+#else
+#define BLE_LL_ASSERT(cond) \
+    if (!(cond)) { \
+        if (hal_debugger_connected()) { \
+            assert(0);\
+        } else {\
+            ble_ll_hci_ev_send_vendor_err(__FILE__, __LINE__); \
+            while(1) {}\
+        }\
+    }
+#endif
+#else
+#define BLE_LL_ASSERT(cond) assert(cond)
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) || MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+#define BLE_LL_BT5_PHY_SUPPORTED    (1)
+#else
+#define BLE_LL_BT5_PHY_SUPPORTED    (0)
+#endif
+
+/* Controller revision. */
+#define BLE_LL_SUB_VERS_NR      (0x0000)
+
+/* Timing jitter as per spec is +/16 usecs */
+#define BLE_LL_JITTER_USECS         (16)
+
+/* Packet queue header definition */
+STAILQ_HEAD(ble_ll_pkt_q, os_mbuf_pkthdr);
+
+/*
+ * Global Link Layer data object. There is only one Link Layer data object
+ * per controller although there may be many instances of the link layer state
+ * machine running.
+ */
+struct ble_ll_obj
+{
+    /* Supported features */
+    uint64_t ll_supp_features;
+
+    /* Current Link Layer state */
+    uint8_t ll_state;
+
+    /* Number of ACL data packets supported */
+    uint8_t ll_num_acl_pkts;
+
+    /* ACL data packet size */
+    uint16_t ll_acl_pkt_size;
+
+    /* Preferred PHY's */
+    uint8_t ll_pref_tx_phys;
+    uint8_t ll_pref_rx_phys;
+
+    /* Task event queue */
+    struct ble_npl_eventq ll_evq;
+
+    /* Wait for response timer */
+    struct hal_timer ll_wfr_timer;
+
+    /* Packet receive queue (and event). Holds received packets from PHY */
+    struct ble_npl_event ll_rx_pkt_ev;
+    struct ble_ll_pkt_q ll_rx_pkt_q;
+
+    /* Packet transmit queue */
+    struct ble_npl_event ll_tx_pkt_ev;
+    struct ble_ll_pkt_q ll_tx_pkt_q;
+
+    /* Data buffer overflow event */
+    struct ble_npl_event ll_dbuf_overflow_ev;
+
+    /* Number of completed packets event */
+    struct ble_npl_event ll_comp_pkt_ev;
+
+    /* HW error callout */
+    struct ble_npl_callout ll_hw_err_timer;
+};
+extern struct ble_ll_obj g_ble_ll_data;
+
+/* Link layer statistics */
+STATS_SECT_START(ble_ll_stats)
+    STATS_SECT_ENTRY(hci_cmds)
+    STATS_SECT_ENTRY(hci_cmd_errs)
+    STATS_SECT_ENTRY(hci_events_sent)
+    STATS_SECT_ENTRY(bad_ll_state)
+    STATS_SECT_ENTRY(bad_acl_hdr)
+    STATS_SECT_ENTRY(no_bufs)
+    STATS_SECT_ENTRY(rx_adv_pdu_crc_ok)
+    STATS_SECT_ENTRY(rx_adv_pdu_crc_err)
+    STATS_SECT_ENTRY(rx_adv_bytes_crc_ok)
+    STATS_SECT_ENTRY(rx_adv_bytes_crc_err)
+    STATS_SECT_ENTRY(rx_data_pdu_crc_ok)
+    STATS_SECT_ENTRY(rx_data_pdu_crc_err)
+    STATS_SECT_ENTRY(rx_data_bytes_crc_ok)
+    STATS_SECT_ENTRY(rx_data_bytes_crc_err)
+    STATS_SECT_ENTRY(rx_adv_malformed_pkts)
+    STATS_SECT_ENTRY(rx_adv_ind)
+    STATS_SECT_ENTRY(rx_adv_direct_ind)
+    STATS_SECT_ENTRY(rx_adv_nonconn_ind)
+    STATS_SECT_ENTRY(rx_adv_ext_ind)
+    STATS_SECT_ENTRY(rx_scan_reqs)
+    STATS_SECT_ENTRY(rx_scan_rsps)
+    STATS_SECT_ENTRY(rx_connect_reqs)
+    STATS_SECT_ENTRY(rx_scan_ind)
+    STATS_SECT_ENTRY(rx_aux_connect_rsp)
+    STATS_SECT_ENTRY(adv_txg)
+    STATS_SECT_ENTRY(adv_late_starts)
+    STATS_SECT_ENTRY(adv_resched_pdu_fail)
+    STATS_SECT_ENTRY(adv_drop_event)
+    STATS_SECT_ENTRY(sched_state_conn_errs)
+    STATS_SECT_ENTRY(sched_state_adv_errs)
+    STATS_SECT_ENTRY(scan_starts)
+    STATS_SECT_ENTRY(scan_stops)
+    STATS_SECT_ENTRY(scan_req_txf)
+    STATS_SECT_ENTRY(scan_req_txg)
+    STATS_SECT_ENTRY(scan_rsp_txg)
+    STATS_SECT_ENTRY(aux_missed_adv)
+    STATS_SECT_ENTRY(aux_scheduled)
+    STATS_SECT_ENTRY(aux_received)
+    STATS_SECT_ENTRY(aux_fired_for_read)
+    STATS_SECT_ENTRY(aux_allocated)
+    STATS_SECT_ENTRY(aux_freed)
+    STATS_SECT_ENTRY(aux_sched_cb)
+    STATS_SECT_ENTRY(aux_conn_req_tx)
+    STATS_SECT_ENTRY(aux_conn_rsp_tx)
+    STATS_SECT_ENTRY(aux_conn_rsp_err)
+    STATS_SECT_ENTRY(aux_scan_req_tx)
+    STATS_SECT_ENTRY(aux_scan_rsp_err)
+    STATS_SECT_ENTRY(aux_chain_cnt)
+    STATS_SECT_ENTRY(aux_chain_err)
+    STATS_SECT_ENTRY(aux_scan_drop)
+    STATS_SECT_ENTRY(adv_evt_dropped)
+    STATS_SECT_ENTRY(scan_timer_stopped)
+    STATS_SECT_ENTRY(scan_timer_restarted)
+    STATS_SECT_ENTRY(periodic_adv_drop_event)
+    STATS_SECT_ENTRY(periodic_chain_drop_event)
+    STATS_SECT_ENTRY(sync_event_failed)
+    STATS_SECT_ENTRY(sync_received)
+    STATS_SECT_ENTRY(sync_chain_failed)
+    STATS_SECT_ENTRY(sync_missed_err)
+    STATS_SECT_ENTRY(sync_crc_err)
+    STATS_SECT_ENTRY(sync_rx_buf_err)
+    STATS_SECT_ENTRY(sync_scheduled)
+    STATS_SECT_ENTRY(sched_state_sync_errs)
+    STATS_SECT_ENTRY(sched_invalid_pdu)
+STATS_SECT_END
+extern STATS_SECT_DECL(ble_ll_stats) ble_ll_stats;
+
+/* States */
+#define BLE_LL_STATE_STANDBY        (0)
+#define BLE_LL_STATE_ADV            (1)
+#define BLE_LL_STATE_SCANNING       (2)
+#define BLE_LL_STATE_INITIATING     (3)
+#define BLE_LL_STATE_CONNECTION     (4)
+#define BLE_LL_STATE_DTM            (5)
+#define BLE_LL_STATE_SYNC           (6)
+
+/* LL Features */
+#define BLE_LL_FEAT_LE_ENCRYPTION    (0x0000000001)
+#define BLE_LL_FEAT_CONN_PARM_REQ    (0x0000000002)
+#define BLE_LL_FEAT_EXTENDED_REJ     (0x0000000004)
+#define BLE_LL_FEAT_SLAVE_INIT       (0x0000000008)
+#define BLE_LL_FEAT_LE_PING          (0x0000000010)
+#define BLE_LL_FEAT_DATA_LEN_EXT     (0x0000000020)
+#define BLE_LL_FEAT_LL_PRIVACY       (0x0000000040)
+#define BLE_LL_FEAT_EXT_SCAN_FILT    (0x0000000080)
+#define BLE_LL_FEAT_LE_2M_PHY        (0x0000000100)
+#define BLE_LL_FEAT_STABLE_MOD_ID_TX (0x0000000200)
+#define BLE_LL_FEAT_STABLE_MOD_ID_RX (0x0000000400)
+#define BLE_LL_FEAT_LE_CODED_PHY     (0x0000000800)
+#define BLE_LL_FEAT_EXT_ADV          (0x0000001000)
+#define BLE_LL_FEAT_PERIODIC_ADV     (0x0000002000)
+#define BLE_LL_FEAT_CSA2             (0x0000004000)
+#define BLE_LL_FEAT_LE_POWER_CLASS_1 (0x0000008000)
+#define BLE_LL_FEAT_MIN_USED_CHAN    (0x0000010000)
+#define BLE_LL_FEAT_CTE_REQ          (0x0000020000)
+#define BLE_LL_FEAT_CTE_RSP          (0x0000040000)
+#define BLE_LL_FEAT_CTE_TX           (0x0000080000)
+#define BLE_LL_FEAT_CTE_RX           (0x0000100000)
+#define BLE_LL_FEAT_CTE_AOD          (0x0000200000)
+#define BLE_LL_FEAT_CTE_AOA          (0x0000400000)
+#define BLE_LL_FEAT_CTE_RECV         (0x0000800000)
+#define BLE_LL_FEAT_SYNC_TRANS_SEND  (0x0001000000)
+#define BLE_LL_FEAT_SYNC_TRANS_RECV  (0x0002000000)
+#define BLE_LL_FEAT_SCA_UPDATE       (0x0004000000)
+#define BLE_LL_FEAT_REM_PKEY         (0x0008000000)
+#define BLE_LL_FEAT_CIS_MASTER       (0x0010000000)
+#define BLE_LL_FEAT_CIS_SLAVE        (0x0020000000)
+#define BLE_LL_FEAT_ISO_BROADCASTER  (0x0040000000)
+#define BLE_LL_FEAT_SYNC_RECV        (0x0080000000)
+#define BLE_LL_FEAT_ISO_HOST_SUPPORT (0x0100000000)
+#define BLE_LL_FEAT_POWER_CTRL_REQ   (0x0200000000)
+#define BLE_LL_FEAT_POWER_CHANGE_IND (0x0400000000)
+#define BLE_LL_FEAT_PATH_LOSS_MON    (0x0800000000)
+
+/* This is initial mask, so if feature exchange will not happen,
+ * but host will want to use this procedure, we will try. If not
+ * succeed, feature bit will be cleared.
+ * Look at LL Features above to find out what is allowed
+ */
+#define BLE_LL_CONN_INITIAL_FEATURES    (0x00000022)
+#define BLE_LL_CONN_CLEAR_FEATURE(connsm, feature)   (connsm->conn_features &= ~(feature))
+
+/* All the features which can be controlled by the Host */
+#define BLE_LL_HOST_CONTROLLED_FEATURES (BLE_LL_FEAT_ISO_HOST_SUPPORT)
+
+/* LL timing */
+#define BLE_LL_IFS                  (150)       /* usecs */
+#define BLE_LL_MAFS                 (300)       /* usecs */
+
+/*
+ * BLE LL device address. Note that element 0 of the array is the LSB and
+ * is sent over the air first. Byte 5 is the MSB and is the last one sent over
+ * the air.
+ */
+#define BLE_DEV_ADDR_LEN            (6)     /* bytes */
+
+struct ble_dev_addr
+{
+    uint8_t u8[BLE_DEV_ADDR_LEN];
+};
+
+#define BLE_IS_DEV_ADDR_STATIC(addr)        ((addr->u8[5] & 0xc0) == 0xc0)
+#define BLE_IS_DEV_ADDR_RESOLVABLE(addr)    ((addr->u8[5] & 0xc0) == 0x40)
+#define BLE_IS_DEV_ADDR_UNRESOLVABLE(addr)  ((addr->u8[5] & 0xc0) == 0x00)
+
+/*
+ * LL packet format
+ *
+ *  -> Preamble         (1/2 bytes)
+ *  -> Access Address   (4 bytes)
+ *  -> PDU              (2 to 257 octets)
+ *  -> CRC              (3 bytes)
+ */
+#define BLE_LL_PREAMBLE_LEN     (1)
+#define BLE_LL_ACC_ADDR_LEN     (4)
+#define BLE_LL_CRC_LEN          (3)
+#define BLE_LL_PDU_HDR_LEN      (2)
+#define BLE_LL_MAX_PAYLOAD_LEN  (255)
+#define BLE_LL_MIN_PDU_LEN      (BLE_LL_PDU_HDR_LEN)
+#define BLE_LL_MAX_PDU_LEN      ((BLE_LL_PDU_HDR_LEN) + (BLE_LL_MAX_PAYLOAD_LEN))
+#define BLE_LL_CRCINIT_ADV      (0x555555)
+
+/* Access address for advertising channels */
+#define BLE_ACCESS_ADDR_ADV             (0x8E89BED6)
+
+/*
+ * Advertising PDU format:
+ * -> 2 byte header
+ *      -> LSB contains pdu type, txadd and rxadd bits.
+ *      -> MSB contains length (6 bits). Length is length of payload. Does
+ *         not include the header length itself.
+ * -> Payload (max 37 bytes)
+ */
+#define BLE_ADV_PDU_HDR_TYPE_MASK           (0x0F)
+#define BLE_ADV_PDU_HDR_CHSEL_MASK          (0x20)
+#define BLE_ADV_PDU_HDR_TXADD_MASK          (0x40)
+#define BLE_ADV_PDU_HDR_RXADD_MASK          (0x80)
+
+/* Advertising channel PDU types */
+#define BLE_ADV_PDU_TYPE_ADV_IND            (0)
+#define BLE_ADV_PDU_TYPE_ADV_DIRECT_IND     (1)
+#define BLE_ADV_PDU_TYPE_ADV_NONCONN_IND    (2)
+#define BLE_ADV_PDU_TYPE_SCAN_REQ           (3)
+#define BLE_ADV_PDU_TYPE_SCAN_RSP           (4)
+#define BLE_ADV_PDU_TYPE_CONNECT_IND        (5)
+#define BLE_ADV_PDU_TYPE_ADV_SCAN_IND       (6)
+#define BLE_ADV_PDU_TYPE_ADV_EXT_IND        (7)
+#define BLE_ADV_PDU_TYPE_AUX_ADV_IND        BLE_ADV_PDU_TYPE_ADV_EXT_IND
+#define BLE_ADV_PDU_TYPE_AUX_SCAN_RSP       BLE_ADV_PDU_TYPE_ADV_EXT_IND
+#define BLE_ADV_PDU_TYPE_AUX_SYNC_IND       BLE_ADV_PDU_TYPE_ADV_EXT_IND
+#define BLE_ADV_PDU_TYPE_AUX_CHAIN_IND      BLE_ADV_PDU_TYPE_ADV_EXT_IND
+#define BLE_ADV_PDU_TYPE_AUX_CONNECT_REQ    BLE_ADV_PDU_TYPE_CONNECT_IND
+#define BLE_ADV_PDU_TYPE_AUX_SCAN_REQ       BLE_ADV_PDU_TYPE_SCAN_REQ
+#define BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP    (8)
+
+/* Extended Header Length (6b) + AdvMode (2b) */
+#define BLE_LL_EXT_ADV_HDR_LEN          (1)
+
+#define BLE_LL_EXT_ADV_ADVA_BIT         (0)
+#define BLE_LL_EXT_ADV_TARGETA_BIT      (1)
+#define BLE_LL_EXT_ADV_CTE_INFO_BIT     (2)
+#define BLE_LL_EXT_ADV_DATA_INFO_BIT    (3)
+#define BLE_LL_EXT_ADV_AUX_PTR_BIT      (4)
+#define BLE_LL_EXT_ADV_SYNC_INFO_BIT    (5)
+#define BLE_LL_EXT_ADV_TX_POWER_BIT     (6)
+
+#define BLE_LL_EXT_ADV_FLAGS_SIZE       (1)
+#define BLE_LL_EXT_ADV_ADVA_SIZE        (6)
+#define BLE_LL_EXT_ADV_TARGETA_SIZE     (6)
+#define BLE_LL_EXT_ADV_DATA_INFO_SIZE   (2)
+#define BLE_LL_EXT_ADV_AUX_PTR_SIZE     (3)
+#define BLE_LL_EXT_ADV_SYNC_INFO_SIZE   (18)
+#define BLE_LL_EXT_ADV_TX_POWER_SIZE    (1)
+
+#define BLE_LL_EXT_ADV_MODE_NON_CONN    (0x00)
+#define BLE_LL_EXT_ADV_MODE_CONN        (0x01)
+#define BLE_LL_EXT_ADV_MODE_SCAN        (0x02)
+
+/* If Channel Selection Algorithm #2 is supported */
+#define BLE_ADV_PDU_HDR_CHSEL               (0x20)
+
+/*
+ * TxAdd and RxAdd bit definitions. A 0 is a public address; a 1 is a
+ * random address.
+ */
+#define BLE_ADV_PDU_HDR_TXADD_RAND          (0x40)
+#define BLE_ADV_PDU_HDR_RXADD_RAND          (0x80)
+
+/*
+ * Data Channel format
+ *
+ *  -> Header (2 bytes)
+ *      -> LSB contains llid, nesn, sn and md
+ *      -> MSB contains length (8 bits)
+ *  -> Payload (0 to 251)
+ *  -> MIC (0 or 4 bytes)
+ */
+#define BLE_LL_DATA_HDR_LLID_MASK       (0x03)
+#define BLE_LL_DATA_HDR_NESN_MASK       (0x04)
+#define BLE_LL_DATA_HDR_SN_MASK         (0x08)
+#define BLE_LL_DATA_HDR_MD_MASK         (0x10)
+#define BLE_LL_DATA_HDR_RSRVD_MASK      (0xE0)
+#define BLE_LL_DATA_PDU_MAX_PYLD        (251)
+#define BLE_LL_DATA_MIC_LEN             (4)
+
+/* LLID definitions */
+#define BLE_LL_LLID_RSRVD               (0)
+#define BLE_LL_LLID_DATA_FRAG           (1)
+#define BLE_LL_LLID_DATA_START          (2)
+#define BLE_LL_LLID_CTRL                (3)
+
+/*
+ * CONNECT_REQ
+ *      -> InitA        (6 bytes)
+ *      -> AdvA         (6 bytes)
+ *      -> LLData       (22 bytes)
+ *          -> Access address (4 bytes)
+ *          -> CRC init (3 bytes)
+ *          -> WinSize (1 byte)
+ *          -> WinOffset (2 bytes)
+ *          -> Interval (2 bytes)
+ *          -> Latency (2 bytes)
+ *          -> Timeout (2 bytes)
+ *          -> Channel Map (5 bytes)
+ *          -> Hop Increment (5 bits)
+ *          -> SCA (3 bits)
+ *
+ *  InitA is the initiators public (TxAdd=0) or random (TxAdd=1) address.
+ *  AdvaA is the advertisers public (RxAdd=0) or random (RxAdd=1) address.
+ *  LLData contains connection request data.
+ *      aa: Link Layer's access address
+ *      crc_init: The CRC initialization value used for CRC calculation.
+ *      winsize: The transmit window size = winsize * 1.25 msecs
+ *      winoffset: The transmit window offset =  winoffset * 1.25 msecs
+ *      interval: The connection interval = interval * 1.25 msecs.
+ *      latency: connection slave latency = latency
+ *      timeout: Connection supervision timeout = timeout * 10 msecs.
+ *      chanmap: contains channel mapping indicating used and unused data
+ *               channels. Only bits that are 1 are usable. LSB is channel 0.
+ *      hop_inc: Hop increment used for frequency hopping. Random value in
+ *               range of 5 to 16.
+ */
+#define BLE_CONNECT_REQ_LEN         (34)
+#define BLE_CONNECT_REQ_PDU_LEN     (BLE_CONNECT_REQ_LEN + BLE_LL_PDU_HDR_LEN)
+
+#define BLE_SCAN_REQ_LEN            (12)
+#define BLE_SCAN_RSP_MAX_LEN        (37)
+#define BLE_SCAN_RSP_MAX_EXT_LEN    (251)
+
+#define BLE_LL_ADDR_SUBTYPE_IDENTITY    (0)
+#define BLE_LL_ADDR_SUBTYPE_RPA         (1)
+#define BLE_LL_ADDR_SUBTYPE_NRPA        (2)
+
+/*--- External API ---*/
+/* Initialize the Link Layer */
+void ble_ll_init(void);
+
+/* Reset the Link Layer */
+int ble_ll_reset(void);
+
+int ble_ll_is_valid_public_addr(const uint8_t *addr);
+
+/* 'Boolean' function returning true if address is a valid random address */
+int ble_ll_is_valid_random_addr(const uint8_t *addr);
+
+/*
+ * Check if given own_addr_type is valid for current controller configuration
+ * given the random address provided (when applicable)
+ */
+int ble_ll_is_valid_own_addr_type(uint8_t own_addr_type,
+                                  const uint8_t *random_addr);
+
+/* Calculate the amount of time in microseconds a PDU with payload length of
+ * 'payload_len' will take to transmit on a PHY 'phy_mode'. */
+uint32_t ble_ll_pdu_tx_time_get(uint16_t payload_len, int phy_mode);
+
+/* Calculate maximum octets of PDU payload which can be transmitted during
+ * 'usecs' on a PHY 'phy_mode'. */
+uint16_t ble_ll_pdu_max_tx_octets_get(uint32_t usecs, int phy_mode);
+
+/* Is this address a resolvable private address? */
+int ble_ll_is_rpa(const uint8_t *addr, uint8_t addr_type);
+
+int ble_ll_addr_subtype(const uint8_t *addr, uint8_t addr_type);
+
+/* Is this address an identity address? */
+int ble_ll_addr_is_id(uint8_t *addr, uint8_t addr_type);
+
+/* Is 'addr' our device address? 'addr_type' is public (0) or random (!=0) */
+int ble_ll_is_our_devaddr(uint8_t *addr, int addr_type);
+
+/* Get identity address 'addr_type' is public (0) or random (!=0) */
+uint8_t *ble_ll_get_our_devaddr(uint8_t addr_type);
+
+/**
+ * Called to put a packet on the Link Layer transmit packet queue.
+ *
+ * @param txpdu Pointer to transmit packet
+ */
+void ble_ll_acl_data_in(struct os_mbuf *txpkt);
+
+/**
+ * Allocates mbuf for received PDU
+ *
+ * This allocated mbuf (may be chained if necessary) that has capacity large
+ * enough to store received PDU of given length. It does not set mbufs length
+ * as this has to be done by PHY when copying data.
+ *
+ * @param len  Length of PDU, including PDU header and excluding MIC (if encrypted)
+ *
+ * @return mbuf large enough to store received PDU on success
+ *         NULL on failure (oom)
+ */
+struct os_mbuf *ble_ll_rxpdu_alloc(uint16_t len);
+
+/* Tell the Link Layer there has been a data buffer overflow */
+void ble_ll_data_buffer_overflow(void);
+
+/* Tell the link layer there has been a hardware error */
+void ble_ll_hw_error(void);
+
+/*--- PHY interfaces ---*/
+struct ble_mbuf_hdr;
+
+/* Called by the PHY when a packet has started */
+int ble_ll_rx_start(uint8_t *rxbuf, uint8_t chan, struct ble_mbuf_hdr *hdr);
+
+/* Called by the PHY when a packet reception ends */
+int ble_ll_rx_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr);
+
+/* Helper callback to tx mbuf using ble_phy_tx() */
+uint8_t ble_ll_tx_mbuf_pducb(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte);
+uint8_t ble_ll_tx_flat_mbuf_pducb(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte);
+
+/*--- Controller API ---*/
+void ble_ll_mbuf_init(struct os_mbuf *m, uint8_t pdulen, uint8_t hdr);
+
+/* Set the link layer state */
+void ble_ll_state_set(uint8_t ll_state);
+
+/* Get the link layer state */
+uint8_t ble_ll_state_get(void);
+
+/* Send an event to LL task */
+void ble_ll_event_send(struct ble_npl_event *ev);
+
+/* Hand received pdu's to LL task  */
+void ble_ll_rx_pdu_in(struct os_mbuf *rxpdu);
+
+/*
+ * Set public address
+ *
+ * This can be used to set controller public address from vendor specific storage,
+ * usually should be done in hal_bsp_init().
+ * Shall be *only* called before LL is initialized, i.e. before sysinit stage.
+ */
+int ble_ll_set_public_addr(const uint8_t *addr);
+
+/* Set random address */
+int ble_ll_set_random_addr(const uint8_t *cmdbuf, uint8_t len, bool hci_adv_ext);
+
+/* Wait for response timer expiration callback */
+void ble_ll_wfr_timer_exp(void *arg);
+
+/* Read set of features supported by the Link Layer */
+uint64_t ble_ll_read_supp_features(void);
+
+/* Set host supported features */
+int ble_ll_set_host_feat(const uint8_t *cmdbuf, uint8_t len);
+
+/* Read set of states supported by the Link Layer */
+uint64_t ble_ll_read_supp_states(void);
+
+/* Check if octets and time are valid. Returns 0 if not valid */
+int ble_ll_chk_txrx_octets(uint16_t octets);
+int ble_ll_chk_txrx_time(uint16_t time);
+
+/* Random numbers */
+int ble_ll_rand_init(void);
+void ble_ll_rand_sample(uint8_t rnum);
+int ble_ll_rand_data_get(uint8_t *buf, uint8_t len);
+void ble_ll_rand_prand_get(uint8_t *prand);
+int ble_ll_rand_start(void);
+
+static inline int
+ble_ll_get_addr_type(uint8_t txrxflag)
+{
+    if (txrxflag) {
+        return BLE_HCI_ADV_OWN_ADDR_RANDOM;
+    }
+    return BLE_HCI_ADV_OWN_ADDR_PUBLIC;
+}
+
+/* Convert usecs to ticks and round up to nearest tick */
+static inline uint32_t
+ble_ll_usecs_to_ticks_round_up(uint32_t usecs)
+{
+    return os_cputime_usecs_to_ticks(usecs + 30);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/* LTK 0x4C68384139F574D836BCF34E9DFB01BF */
+extern const uint8_t g_bletest_LTK[];
+extern uint16_t g_bletest_EDIV;
+extern uint64_t g_bletest_RAND;
+extern uint64_t g_bletest_SKDm;
+extern uint64_t g_bletest_SKDs;
+extern uint32_t g_bletest_IVm;
+extern uint32_t g_bletest_IVs;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+void ble_ll_dtm_init(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_LL_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_adv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_adv.h
new file mode 100644
index 000000000..eee07cbf0
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_adv.h
@@ -0,0 +1,209 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_ADV_
+#define H_BLE_LL_ADV_
+
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * ADV event timing
+ *      T_advEvent = advInterval + advDelay
+ *
+ *      advInterval: increments of 625 usecs
+ *      advDelay: RAND[0, 10] msecs
+ *
+ */
+#define BLE_LL_ADV_ITVL                 (625)           /* usecs */
+#define BLE_LL_ADV_ITVL_MIN             (32)            /* units */
+#define BLE_LL_ADV_ITVL_MAX             (16384)         /* units */
+#define BLE_LL_ADV_ITVL_MS_MIN          (20)            /* msecs */
+#define BLE_LL_ADV_ITVL_MS_MAX          (10240)         /* msecs */
+#define BLE_LL_ADV_ITVL_SCAN_MIN        (160)           /* units */
+#define BLE_LL_ADV_ITVL_SCAN_MS_MIN     (100)           /* msecs */
+#define BLE_LL_ADV_ITVL_NONCONN_MS_MIN  (100)           /* msecs */
+#define BLE_LL_ADV_DELAY_MS_MIN         (0)             /* msecs */
+#define BLE_LL_ADV_DELAY_MS_MAX         (10)            /* msecs */
+#define BLE_LL_ADV_PDU_ITVL_LD_MS_MAX   (10)            /* msecs */
+#define BLE_LL_ADV_PDU_ITVL_HD_MS_MAX   (3750)          /* usecs */
+#define BLE_LL_ADV_STATE_HD_MAX         (1280)          /* msecs */
+#define BLE_LL_ADV_PERIODIC_ITVL        (1250)          /* usecs */
+
+/* Maximum advertisement data length */
+#define BLE_ADV_LEGACY_DATA_MAX_LEN     (31)
+#define BLE_ADV_LEGACY_MAX_PKT_LEN      (37)
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define BLE_ADV_DATA_MAX_LEN            MYNEWT_VAL(BLE_EXT_ADV_MAX_SIZE)
+#else
+#define BLE_ADV_DATA_MAX_LEN            BLE_ADV_LEGACY_DATA_MAX_LEN
+#endif
+
+/*
+ * ADV_IND
+ *      -> AdvA     (6 bytes)
+ *      -> AdvData  (0 - 31 bytes)
+ *
+ *  The advertising address (AdvA) is a public address (TxAdd=0) or random
+ *  address (TxAdd = 1)
+ */
+#define BLE_ADV_IND_MIN_LEN             (6)
+#define BLE_ADV_IND_MAX_LEN             (37)
+
+/*
+ * ADV_DIRECT_IND
+ *      -> AdvA     (6 bytes)
+ *      -> InitA    (6 bytes)
+ *
+ *  AdvA is the advertisers public address (TxAdd=0) or random address
+ *  (TxAdd = 1).
+ *
+ *  InitA is the initiators public or random address. This is the address
+ *  to which this packet is addressed.
+ *
+ */
+#define BLE_ADV_DIRECT_IND_LEN          (12)
+
+/*
+ * ADV_NONCONN_IND
+ *      -> AdvA     (6 bytes)
+ *      -> AdvData  (0 - 31 bytes)
+ *
+ *  The advertising address (AdvA) is a public address (TxAdd=0) or random
+ *  address (TxAdd = 1)
+ *
+ */
+#define BLE_ADV_NONCONN_IND_MIN_LEN     (6)
+#define BLE_ADV_NONCONN_IND_MAX_LEN     (37)
+
+/*
+ * ADV_SCAN_IND
+ *      -> AdvA     (6 bytes)
+ *      -> AdvData  (0 - 31 bytes)
+ *
+ *  The advertising address (AdvA) is a public address (TxAdd=0) or random
+ *  address (TxAdd = 1)
+ *
+ */
+#define BLE_ADV_SCAN_IND_MIN_LEN        (6)
+#define BLE_ADV_SCAN_IND_MAX_LEN        (37)
+
+/*---- HCI ----*/
+struct ble_ll_adv_sm;
+struct ble_ll_conn_sm;
+
+/* Start an advertiser */
+int ble_ll_adv_start_req(uint8_t adv_chanmask, uint8_t adv_type,
+                         uint8_t *init_addr, uint16_t adv_itvl, void *handle);
+
+/* Start or stop advertising */
+int ble_ll_hci_adv_set_enable(const uint8_t *cmdbuf, uint8_t len);
+
+/* Set legacy advertising data */
+int ble_ll_hci_set_adv_data(const uint8_t *cmdbuf, uint8_t len);
+
+/* Set scan response data */
+int ble_ll_hci_set_scan_rsp_data(const uint8_t *cmd, uint8_t cmd_len);
+
+/* Set advertising parameters */
+int ble_ll_adv_set_adv_params(const uint8_t *cmdbuf, uint8_t len);
+
+/* Read advertising channel power */
+int ble_ll_adv_read_txpwr(uint8_t *rspbuf, uint8_t *rsplen);
+
+/*---- API used by BLE LL ----*/
+/* Send the connection complete event */
+void ble_ll_adv_send_conn_comp_ev(struct ble_ll_conn_sm *connsm,
+                                  struct ble_mbuf_hdr *rxhdr);
+
+/* Returns local resolvable private address */
+uint8_t *ble_ll_adv_get_local_rpa(struct ble_ll_adv_sm *advsm);
+
+/* Returns peer resolvable private address */
+uint8_t *ble_ll_adv_get_peer_rpa(struct ble_ll_adv_sm *advsm);
+
+/* Called to initialize advertising functionality. */
+void ble_ll_adv_init(void);
+
+/* Called when LL wait for response timer expires in advertising state */
+void ble_ll_adv_wfr_timer_exp(void);
+
+/* Called to reset the advertiser. */
+void ble_ll_adv_reset(void);
+
+/* Called on rx pdu start when in advertising state */
+int ble_ll_adv_rx_isr_start(uint8_t pdu_type);
+
+/* Called on rx pdu end when in advertising state */
+int ble_ll_adv_rx_isr_end(uint8_t pdu_type, struct os_mbuf *rxpdu, int crcok);
+
+/* Processes received packets at the link layer task */
+void ble_ll_adv_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf,
+                          struct ble_mbuf_hdr *hdr);
+
+/* Boolean function denoting whether or not the whitelist can be changed */
+int ble_ll_adv_can_chg_whitelist(void);
+
+/*
+ * Called when an advertising event has been removed from the scheduler
+ * without being run.
+ */
+void ble_ll_adv_event_rmvd_from_sched(struct ble_ll_adv_sm *advsm);
+
+/*
+ * Called when a periodic event has been removed from the scheduler
+ * without being run.
+ */
+void ble_ll_adv_periodic_rmvd_from_sched(struct ble_ll_adv_sm *advsm);
+
+/* Called to halt currently running advertising event */
+void ble_ll_adv_halt(void);
+
+/* Called to determine if advertising is enabled */
+uint8_t ble_ll_adv_enabled(void);
+
+int ble_ll_adv_hci_set_random_addr(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_adv_set_random_addr(const uint8_t *addr, uint8_t instance);
+int ble_ll_adv_remove(const uint8_t *addr, uint8_t len);
+int ble_ll_adv_clear_all(void);
+int ble_ll_adv_ext_set_param(const uint8_t *cmdbuf, uint8_t len,
+                             uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_adv_ext_set_adv_data(const uint8_t *cmdbuf, uint8_t cmdlen);
+int ble_ll_adv_ext_set_scan_rsp(const uint8_t *cmdbuf, uint8_t cmdlen);
+int ble_ll_adv_ext_set_enable(const uint8_t *cmdbuf, uint8_t len);
+
+int ble_ll_adv_periodic_set_param(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_adv_periodic_set_data(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_adv_periodic_enable(const uint8_t *cmdbuf, uint8_t len);
+
+int ble_ll_adv_periodic_set_info_transfer(const uint8_t *cmdbuf, uint8_t len,
+                                          uint8_t *rspbuf, uint8_t *rsplen);
+
+/* Called to notify adv code about RPA rotation */
+void ble_ll_adv_rpa_timeout(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_ADV_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_conn.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_conn.h
new file mode 100644
index 000000000..178d67117
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_conn.h
@@ -0,0 +1,425 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_CONN_
+#define H_BLE_LL_CONN_
+
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
+#include "ble_ll_sched.h"
+#include "ble_ll_ctrl.h"
+#include "ble_phy.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Roles */
+#define BLE_LL_CONN_ROLE_NONE           (0)
+#define BLE_LL_CONN_ROLE_MASTER         (1)
+#define BLE_LL_CONN_ROLE_SLAVE          (2)
+
+/* Connection states */
+#define BLE_LL_CONN_STATE_IDLE          (0)
+#define BLE_LL_CONN_STATE_CREATED       (1)
+#define BLE_LL_CONN_STATE_ESTABLISHED   (2)
+
+/* Channel map size */
+#define BLE_LL_CONN_CHMAP_LEN           (5)
+
+/* Definitions for source clock accuracy */
+#define BLE_MASTER_SCA_251_500_PPM      (0)
+#define BLE_MASTER_SCA_151_250_PPM      (1)
+#define BLE_MASTER_SCA_101_150_PPM      (2)
+#define BLE_MASTER_SCA_76_100_PPM       (3)
+#define BLE_MASTER_SCA_51_75_PPM        (4)
+#define BLE_MASTER_SCA_31_50_PPM        (5)
+#define BLE_MASTER_SCA_21_30_PPM        (6)
+#define BLE_MASTER_SCA_0_20_PPM         (7)
+
+/* Definition for RSSI when the RSSI is unknown */
+#define BLE_LL_CONN_UNKNOWN_RSSI        (127)
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/*
+ * Encryption states for a connection
+ *
+ * NOTE: the states are ordered so that we can check to see if the state
+ * is greater than ENCRYPTED. If so, it means that the start or pause
+ * encryption procedure is running and we should not send data pdu's.
+ */
+enum conn_enc_state {
+    CONN_ENC_S_UNENCRYPTED = 1,
+    CONN_ENC_S_ENCRYPTED,
+    CONN_ENC_S_ENC_RSP_WAIT,
+    CONN_ENC_S_PAUSE_ENC_RSP_WAIT,
+    CONN_ENC_S_PAUSED,
+    CONN_ENC_S_START_ENC_REQ_WAIT,
+    CONN_ENC_S_START_ENC_RSP_WAIT,
+    CONN_ENC_S_LTK_REQ_WAIT,
+    CONN_ENC_S_LTK_NEG_REPLY
+};
+
+/*
+ * Note that the LTK is the key, the SDK is the plain text, and the
+ * session key is the cipher text portion of the encryption block.
+ *
+ * NOTE: we have intentionally violated the specification by making the
+ * transmit and receive packet counters 32-bits as opposed to 39 (as per the
+ * specification). We do this to save code space, ram and calculation time. The
+ * only drawback is that any encrypted connection that sends more than 2^32
+ * packets will suffer a MIC failure and thus be disconnected.
+ */
+struct ble_ll_conn_enc_data
+{
+    uint8_t enc_state;
+    uint8_t tx_encrypted;
+    uint16_t enc_div;
+    uint32_t tx_pkt_cntr;
+    uint32_t rx_pkt_cntr;
+    uint64_t host_rand_num;
+    uint8_t iv[8];
+    struct ble_encryption_block enc_block;
+};
+#endif
+
+/* Connection state machine flags. */
+union ble_ll_conn_sm_flags {
+    struct {
+        uint32_t pkt_rxd:1;
+        uint32_t terminate_ind_txd:1;
+        uint32_t terminate_ind_rxd:1;
+        uint32_t terminate_ind_rxd_acked:1;
+        uint32_t allow_slave_latency:1;
+        uint32_t slave_set_last_anchor:1;
+        uint32_t awaiting_host_reply:1;
+        uint32_t terminate_started:1;
+        uint32_t conn_update_sched:1;
+        uint32_t host_expects_upd_event:1;
+        uint32_t version_ind_sent:1;
+        uint32_t rxd_version_ind:1;
+        uint32_t chanmap_update_scheduled:1;
+        uint32_t conn_empty_pdu_txd:1;
+        uint32_t last_txd_md:1;
+        uint32_t conn_req_txd:1;
+        uint32_t send_ltk_req:1;
+        uint32_t encrypted:1;
+        uint32_t encrypt_chg_sent:1;
+        uint32_t le_ping_supp:1;
+        uint32_t csa2_supp:1;
+        uint32_t host_phy_update: 1;
+        uint32_t phy_update_sched: 1;
+        uint32_t ctrlr_phy_update: 1;
+        uint32_t phy_update_event: 1;
+        uint32_t peer_phy_update: 1; /* XXX:combine with ctrlr udpate bit? */
+        uint32_t aux_conn_req: 1;
+        uint32_t rxd_features:1;
+        uint32_t pending_hci_rd_features:1;
+        uint32_t pending_initiate_dle:1;
+    } cfbit;
+    uint32_t conn_flags;
+} __attribute__((packed));
+
+/**
+ * Structure used for PHY data inside a connection.
+ *
+ * NOTE: the new phy's are the phys we will change to when a phy update
+ * procedure is ongoing and the event counter hits the instant.
+ *
+ * tx_phy_mode: chip specific phy mode for tx
+ * rx_phy_mode: chip specific phy mode for rx
+ * cur_tx_phy: value denoting current tx_phy (not a bitmask!)
+ * cur_rx_phy: value denoting current rx phy (not a bitmask!)
+ * new_tx_phy: value denoting new tx_phy (not a bitmask!)
+ * new_rx_phy: value denoting new rx phy (not a bitmask!)
+ * req_pref_tx_phy: tx phy sent in a phy request (may be different than host)
+ * req_pref_rx_phy: rx phy sent in a phy request (may be different than host)
+ * host_pref_tx_phys: bitmask of preferred transmit PHYs sent by host
+ * host_pref_rx_phys: bitmask of preferred receive PHYs sent by host
+ * phy_options: preferred phy options for coded phy
+ */
+struct ble_ll_conn_phy_data
+{
+    uint32_t tx_phy_mode: 2;
+    uint32_t rx_phy_mode: 2;
+    uint32_t cur_tx_phy: 2;
+    uint32_t cur_rx_phy: 2;
+    uint32_t new_tx_phy: 2;
+    uint32_t new_rx_phy: 2;
+    uint32_t host_pref_tx_phys_mask: 3;
+    uint32_t host_pref_rx_phys_mask: 3;
+    uint32_t req_pref_tx_phys_mask: 3;
+    uint32_t req_pref_rx_phys_mask: 3;
+    uint32_t phy_options: 2;
+}  __attribute__((packed));
+
+#define CONN_CUR_TX_PHY_MASK(csm)   (1 << ((csm)->phy_data.cur_tx_phy - 1))
+#define CONN_CUR_RX_PHY_MASK(csm)   (1 << ((csm)->phy_data.cur_rx_phy - 1))
+
+struct hci_conn_update
+{
+    uint16_t handle;
+    uint16_t conn_itvl_min;
+    uint16_t conn_itvl_max;
+    uint16_t conn_latency;
+    uint16_t supervision_timeout;
+    uint16_t min_ce_len;
+    uint16_t max_ce_len;
+};
+
+struct hci_ext_conn_params
+{
+    uint16_t scan_itvl;
+    uint16_t scan_window;
+    uint16_t conn_itvl_min;
+    uint16_t conn_itvl_max;
+    uint16_t conn_latency;
+    uint16_t supervision_timeout;
+    uint16_t min_ce_len;
+    uint16_t max_ce_len;
+};
+
+struct hci_ext_create_conn
+{
+    uint8_t filter_policy;
+    uint8_t own_addr_type;
+    uint8_t peer_addr_type;
+    uint8_t peer_addr[BLE_DEV_ADDR_LEN];
+    uint8_t init_phy_mask;
+    struct hci_ext_conn_params params[3];
+};
+
+/* Connection state machine */
+struct ble_ll_conn_sm
+{
+    /* Connection state machine flags */
+    union ble_ll_conn_sm_flags csmflags;
+
+    /* Current connection handle, state and role */
+    uint16_t conn_handle;
+    uint8_t conn_state;
+    uint8_t conn_role;          /* Can possibly be 1 bit */
+
+    /* RSSI */
+    int8_t conn_rssi;
+
+    /* For privacy */
+    int8_t rpa_index;
+
+    /* Connection data length management */
+    uint8_t max_tx_octets;
+    uint8_t max_rx_octets;
+    uint8_t rem_max_tx_octets;
+    uint8_t rem_max_rx_octets;
+    uint8_t eff_max_tx_octets;
+    uint8_t eff_max_rx_octets;
+    uint16_t max_tx_time;
+    uint16_t max_rx_time;
+    uint16_t rem_max_tx_time;
+    uint16_t rem_max_rx_time;
+    uint16_t eff_max_tx_time;
+    uint16_t eff_max_rx_time;
+    uint8_t max_tx_octets_phy_mode[BLE_PHY_NUM_MODE];
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    uint16_t host_req_max_tx_time;
+#endif
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    struct ble_ll_conn_phy_data phy_data;
+    uint16_t phy_instant;
+    uint8_t phy_tx_transition;
+#endif
+
+    /* Used to calculate data channel index for connection */
+    uint8_t chanmap[BLE_LL_CONN_CHMAP_LEN];
+    uint8_t req_chanmap[BLE_LL_CONN_CHMAP_LEN];
+    uint16_t chanmap_instant;
+    uint16_t channel_id; /* TODO could be union with hop and last chan used */
+    uint8_t hop_inc;
+    uint8_t data_chan_index;
+    uint8_t last_unmapped_chan;
+    uint8_t num_used_chans;
+
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+    uint8_t period_occ_mask;    /* mask: period 0 = 0x01, period 3 = 0x08 */
+#endif
+
+    /* Ack/Flow Control */
+    uint8_t tx_seqnum;          /* note: can be 1 bit */
+    uint8_t next_exp_seqnum;    /* note: can be 1 bit */
+    uint8_t cons_rxd_bad_crc;   /* note: can be 1 bit */
+    uint8_t last_rxd_sn;        /* note: cant be 1 bit given current code */
+    uint8_t last_rxd_hdr_byte;  /* note: possibly can make 1 bit since we
+                                   only use the MD bit now */
+
+    /* connection event mgmt */
+    uint8_t reject_reason;
+    uint8_t host_reply_opcode;
+    uint8_t master_sca;
+    uint8_t tx_win_size;
+    uint8_t cur_ctrl_proc;
+    uint8_t disconnect_reason;
+    uint8_t rxd_disconnect_reason;
+    uint8_t vers_nr;
+    uint8_t conn_features;
+    uint8_t remote_features[7];
+    uint16_t pending_ctrl_procs;
+    uint16_t event_cntr;
+    uint16_t completed_pkts;
+    uint16_t comp_id;
+    uint16_t sub_vers_nr;
+    uint16_t auth_pyld_tmo;         /* could be ifdef'd. 10 msec units */
+
+    uint32_t access_addr;
+    uint32_t crcinit;               /* only low 24 bits used */
+    /* XXX: do we need ce_end_time? Cant this be sched end time? */
+    uint32_t ce_end_time;   /* cputime at which connection event should end */
+    uint32_t terminate_timeout;
+    uint32_t last_scheduled;
+
+    /* Connection timing */
+    uint16_t conn_itvl;
+    uint16_t slave_latency;
+    uint16_t supervision_tmo;
+    uint16_t min_ce_len;
+    uint16_t max_ce_len;
+    uint16_t tx_win_off;
+    uint32_t anchor_point;
+    uint8_t anchor_point_usecs;     /* XXX: can this be uint8_t ?*/
+    uint8_t conn_itvl_usecs;
+    uint32_t conn_itvl_ticks;
+    uint32_t last_anchor_point;     /* Slave only */
+    uint32_t slave_cur_tx_win_usecs;
+    uint32_t slave_cur_window_widening;
+    uint32_t last_rxd_pdu_cputime;  /* Used exclusively for supervision timer */
+
+    /*
+     * Used to mark that identity address was used as InitA
+     */
+    uint8_t inita_identity_used;
+
+    /* address information */
+    uint8_t own_addr_type;
+    uint8_t peer_addr_type;
+    uint8_t peer_addr[BLE_DEV_ADDR_LEN];
+
+    /*
+     * XXX: TODO. Could save memory. Have single event at LL and put these
+     * on a singly linked list. Only would need list pointer here.
+     */
+    /* Connection end event */
+    struct ble_npl_event conn_ev_end;
+
+    /* Packet transmit queue */
+    struct os_mbuf *cur_tx_pdu;
+    STAILQ_HEAD(conn_txq_head, os_mbuf_pkthdr) conn_txq;
+
+    /* List entry for active/free connection pools */
+    union {
+        SLIST_ENTRY(ble_ll_conn_sm) act_sle;
+        STAILQ_ENTRY(ble_ll_conn_sm) free_stqe;
+    };
+
+    /* LL control procedure response timer */
+    struct ble_npl_callout ctrl_proc_rsp_timer;
+
+    /* For scheduling connections */
+    struct ble_ll_sched_item conn_sch;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+    struct ble_npl_callout auth_pyld_timer;
+#endif
+
+    /*
+     * XXX: a note on all these structures for control procedures. First off,
+     * all of these need to be ifdef'd to save memory. Another thing to
+     * consider is this: since most control procedures can only run when no
+     * others are running, can I use just one structure (a union)? Should I
+     * allocate these from a pool? Not sure what to do. For now, I just use
+     * a large chunk of memory per connection.
+     */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    struct ble_ll_conn_enc_data enc_data;
+#endif
+    /*
+     * For connection update procedure. XXX: can make this a pointer and
+     * malloc it if we want to save space.
+     */
+    struct hci_conn_update conn_param_req;
+
+    /* For connection update procedure */
+    struct ble_ll_conn_upd_req conn_update_req;
+
+    /* XXX: for now, just store them all */
+    struct ble_ll_conn_params conn_cp;
+
+    struct ble_ll_scan_sm *scansm;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct hci_ext_create_conn initial_params;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    uint8_t  sync_transfer_mode;
+    uint16_t sync_transfer_skip;
+    uint32_t sync_transfer_sync_timeout;
+#endif
+};
+
+/* Flags */
+#define CONN_F_UPDATE_SCHED(csm)    ((csm)->csmflags.cfbit.conn_update_sched)
+#define CONN_F_EMPTY_PDU_TXD(csm)   ((csm)->csmflags.cfbit.conn_empty_pdu_txd)
+#define CONN_F_LAST_TXD_MD(csm)     ((csm)->csmflags.cfbit.last_txd_md)
+#define CONN_F_CONN_REQ_TXD(csm)    ((csm)->csmflags.cfbit.conn_req_txd)
+#define CONN_F_ENCRYPTED(csm)       ((csm)->csmflags.cfbit.encrypted)
+#define CONN_F_ENC_CHANGE_SENT(csm) ((csm)->csmflags.cfbit.encrypt_chg_sent)
+#define CONN_F_LE_PING_SUPP(csm)    ((csm)->csmflags.cfbit.le_ping_supp)
+#define CONN_F_TERMINATE_STARTED(csm) ((csm)->csmflags.cfbit.terminate_started)
+#define CONN_F_CSA2_SUPP(csm)       ((csm)->csmflags.cfbit.csa2_supp)
+#define CONN_F_HOST_PHY_UPDATE(csm) ((csm)->csmflags.cfbit.host_phy_update)
+#define CONN_F_PHY_UPDATE_SCHED(csm) ((csm)->csmflags.cfbit.phy_update_sched)
+#define CONN_F_CTRLR_PHY_UPDATE(csm) ((csm)->csmflags.cfbit.ctrlr_phy_update)
+#define CONN_F_PHY_UPDATE_EVENT(csm) ((csm)->csmflags.cfbit.phy_update_event)
+#define CONN_F_PEER_PHY_UPDATE(csm)  ((csm)->csmflags.cfbit.peer_phy_update)
+#define CONN_F_AUX_CONN_REQ(csm)  ((csm)->csmflags.cfbit.aux_conn_req)
+
+/* Role */
+#define CONN_IS_MASTER(csm)         (csm->conn_role == BLE_LL_CONN_ROLE_MASTER)
+#define CONN_IS_SLAVE(csm)          (csm->conn_role == BLE_LL_CONN_ROLE_SLAVE)
+
+/*
+ * Given a handle, returns an active connection state machine (or NULL if the
+ * handle does not exist
+ *
+ */
+struct ble_ll_conn_sm *ble_ll_conn_find_active_conn(uint16_t handle);
+
+/* required for unit testing */
+uint8_t ble_ll_conn_calc_dci(struct ble_ll_conn_sm *conn, uint16_t latency);
+
+/* used to get anchor point for connection event specified */
+void ble_ll_conn_get_anchor(struct ble_ll_conn_sm *connsm, uint16_t conn_event,
+                            uint32_t *anchor, uint8_t *anchor_usecs);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_CONN_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_ctrl.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_ctrl.h
new file mode 100644
index 000000000..b0da1e736
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_ctrl.h
@@ -0,0 +1,313 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_CTRL_
+#define H_BLE_LL_CTRL_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * LL control procedures. This "enumeration" is not in the specification;
+ * It is used to determine which LL control procedure is currently running
+ * in a connection and which ones may be pending.
+ */
+#define BLE_LL_CTRL_PROC_CONN_UPDATE    (0)
+#define BLE_LL_CTRL_PROC_CHAN_MAP_UPD   (1)
+#define BLE_LL_CTRL_PROC_ENCRYPT        (2)
+#define BLE_LL_CTRL_PROC_FEATURE_XCHG   (3)
+#define BLE_LL_CTRL_PROC_VERSION_XCHG   (4)
+#define BLE_LL_CTRL_PROC_TERMINATE      (5)
+#define BLE_LL_CTRL_PROC_CONN_PARAM_REQ (6)
+#define BLE_LL_CTRL_PROC_LE_PING        (7)
+#define BLE_LL_CTRL_PROC_DATA_LEN_UPD   (8)
+#define BLE_LL_CTRL_PROC_PHY_UPDATE     (9)
+#define BLE_LL_CTRL_PROC_NUM            (10)
+#define BLE_LL_CTRL_PROC_IDLE           (255)
+
+/* Checks if a particular control procedure is running */
+#define IS_PENDING_CTRL_PROC(sm, proc)  (sm->pending_ctrl_procs & (1 << proc))
+#define CLR_PENDING_CTRL_PROC(sm, proc) (sm->pending_ctrl_procs &= ~(1 << proc))
+
+/* LL control procedure timeout */
+#define BLE_LL_CTRL_PROC_TIMEOUT_MS     (40000) /* ms */
+
+/*
+ * LL CTRL PDU format
+ *  -> Opcode   (1 byte)
+ *  -> Data     (0 - 26 bytes)
+ */
+#define BLE_LL_CTRL_CONN_UPDATE_IND     (0)
+#define BLE_LL_CTRL_CHANNEL_MAP_REQ     (1)
+#define BLE_LL_CTRL_TERMINATE_IND       (2)
+#define BLE_LL_CTRL_ENC_REQ             (3)
+#define BLE_LL_CTRL_ENC_RSP             (4)
+#define BLE_LL_CTRL_START_ENC_REQ       (5)
+#define BLE_LL_CTRL_START_ENC_RSP       (6)
+#define BLE_LL_CTRL_UNKNOWN_RSP         (7)
+#define BLE_LL_CTRL_FEATURE_REQ         (8)
+#define BLE_LL_CTRL_FEATURE_RSP         (9)
+#define BLE_LL_CTRL_PAUSE_ENC_REQ       (10)
+#define BLE_LL_CTRL_PAUSE_ENC_RSP       (11)
+#define BLE_LL_CTRL_VERSION_IND         (12)
+#define BLE_LL_CTRL_REJECT_IND          (13)
+#define BLE_LL_CTRL_SLAVE_FEATURE_REQ   (14)
+#define BLE_LL_CTRL_CONN_PARM_REQ       (15)
+#define BLE_LL_CTRL_CONN_PARM_RSP       (16)
+#define BLE_LL_CTRL_REJECT_IND_EXT      (17)
+#define BLE_LL_CTRL_PING_REQ            (18)
+#define BLE_LL_CTRL_PING_RSP            (19)
+#define BLE_LL_CTRL_LENGTH_REQ          (20)
+#define BLE_LL_CTRL_LENGTH_RSP          (21)
+#define BLE_LL_CTRL_PHY_REQ             (22)
+#define BLE_LL_CTRL_PHY_RSP             (23)
+#define BLE_LL_CTRL_PHY_UPDATE_IND      (24)
+#define BLE_LL_CTRL_MIN_USED_CHAN_IND   (25)
+#define BLE_LL_CTRL_CTE_REQ             (26)
+#define BLE_LL_CTRL_CTE_RSP             (27)
+#define BLE_LL_CTRL_PERIODIC_SYNC_IND   (28)
+#define BLE_LL_CTRL_CLOCK_ACCURACY_REQ  (29)
+#define BLE_LL_CTRL_CLOCK_ACCURACY_RSP  (30)
+
+/* Maximum opcode value */
+#define BLE_LL_CTRL_OPCODES             (BLE_LL_CTRL_CLOCK_ACCURACY_RSP + 1)
+
+extern const uint8_t g_ble_ll_ctrl_pkt_lengths[BLE_LL_CTRL_OPCODES];
+
+/* Maximum LL control PDU size */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+#define BLE_LL_CTRL_MAX_PDU_LEN         (35)
+#else
+#define BLE_LL_CTRL_MAX_PDU_LEN         (27)
+#endif
+
+/* LL control connection update request */
+struct ble_ll_conn_upd_req
+{
+    uint8_t winsize;
+    uint16_t winoffset;
+    uint16_t interval;
+    uint16_t latency;
+    uint16_t timeout;
+    uint16_t instant;
+};
+#define BLE_LL_CTRL_CONN_UPD_REQ_LEN        (11)
+
+/* LL control channel map request */
+struct ble_ll_chan_map_req
+{
+    uint8_t chmap[5];
+    uint16_t instant;
+};
+#define BLE_LL_CTRL_CHAN_MAP_LEN            (7)
+
+/*
+ * LL control terminate ind
+ *  -> error code (1 byte)
+ */
+#define BLE_LL_CTRL_TERMINATE_IND_LEN      (1)
+
+/* LL control enc req */
+struct ble_ll_enc_req
+{
+    uint8_t rand[8];
+    uint16_t ediv;
+    uint8_t skdm[8];
+    uint32_t ivm;
+};
+
+#define BLE_LL_CTRL_ENC_REQ_LEN             (22)
+
+/* LL control enc rsp */
+struct ble_ll_enc_rsp
+{
+    uint8_t skds[8];
+    uint32_t ivs;
+};
+
+#define BLE_LL_CTRL_ENC_RSP_LEN             (12)
+
+/* LL control start/pause enc request and response */
+#define BLE_LL_CTRL_START_ENC_REQ_LEN       (0)
+#define BLE_LL_CTRL_START_ENC_RSP_LEN       (0)
+#define BLE_LL_CTRL_PAUSE_ENC_REQ_LEN       (0)
+#define BLE_LL_CTRL_PAUSE_ENC_RSP_LEN       (0)
+
+/*
+ * LL control unknown response
+ *  -> 1 byte which contains the unknown or un-supported opcode.
+ */
+#define BLE_LL_CTRL_UNK_RSP_LEN             (1)
+
+/*
+ * LL control feature req and LL control feature rsp
+ *  -> 8 bytes of data containing features supported by device.
+ */
+#define BLE_LL_CTRL_FEATURE_LEN             (8)
+
+/*
+ * LL control version ind
+ *  -> version (1 byte):
+ *      Contains the version number of the bluetooth controller specification.
+ *  -> comp_id (2 bytes)
+ *      Contains the company identifier of the manufacturer of the controller.
+ *  -> sub_ver_num: Contains a unique value for implementation or revision of
+ *      the bluetooth controller.
+ */
+struct ble_ll_version_ind
+{
+    uint8_t ble_ctrlr_ver;
+    uint16_t company_id;
+    uint16_t sub_ver_num;
+};
+
+#define BLE_LL_CTRL_VERSION_IND_LEN         (5)
+
+/*
+ * LL control reject ind
+ *  -> error code (1 byte): contains reason why request was rejected.
+ */
+#define BLE_LL_CTRL_REJ_IND_LEN             (1)
+
+/*
+ * LL control slave feature req
+ *  -> 8 bytes of data containing features supported by device.
+ */
+#define BLE_LL_CTRL_SLAVE_FEATURE_REQ_LEN   (8)
+
+/* LL control connection param req and connection param rsp */
+struct ble_ll_conn_params
+{
+    uint16_t interval_min;
+    uint16_t interval_max;
+    uint16_t latency;
+    uint16_t timeout;
+    uint8_t pref_periodicity;
+    uint16_t ref_conn_event_cnt;
+    uint16_t offset0;
+    uint16_t offset1;
+    uint16_t offset2;
+    uint16_t offset3;
+    uint16_t offset4;
+    uint16_t offset5;
+};
+
+#define BLE_LL_CTRL_CONN_PARAMS_LEN     (23)
+
+/* LL control reject ind ext */
+struct ble_ll_reject_ind_ext
+{
+    uint8_t reject_opcode;
+    uint8_t err_code;
+};
+
+#define BLE_LL_CTRL_REJECT_IND_EXT_LEN  (2)
+
+/* LL control ping req and ping rsp (contain no data) */
+#define BLE_LL_CTRL_PING_LEN            (0)
+
+/*
+ * LL control length req and length rsp
+ *  -> max_rx_bytes (2 bytes): defines connMaxRxOctets. Range 27 to 251
+ *  -> max_rx_time (2 bytes): defines connMaxRxTime. Range 328 to 2120 usecs.
+ *  -> max_tx_bytes (2 bytes): defines connMaxTxOctets. Range 27 to 251
+ *  -> max_tx_time (2 bytes): defines connMaxTxTime. Range 328 to 2120 usecs.
+ */
+struct ble_ll_len_req
+{
+    uint16_t max_rx_bytes;
+    uint16_t max_rx_time;
+    uint16_t max_tx_bytes;
+    uint16_t max_tx_time;
+};
+
+#define BLE_LL_CTRL_LENGTH_REQ_LEN      (8)
+
+/* PHY request/response */
+#define BLE_LL_CTRL_PHY_REQ_LEN         (2)
+#define BLE_LL_CTRL_PHY_RSP_LEN         (2)
+#define BLE_LL_CTRL_PHY_UPD_IND_LEN     (4)
+
+/* Min used channels */
+#define BLE_LL_CTRL_MIN_USED_CHAN_LEN   (2)
+
+/* CTE REQ */
+#define BLE_LL_CTRL_CTE_REQ_LEN         (1)
+
+/* CTE RSP (contains no data) */
+#define BLE_LL_CTRL_CTE_RSP_LEN     (0)
+
+/* Periodic Sync Transfer IND */
+#define BLE_LL_CTRL_PERIODIC_SYNC_IND_LEN   (34)
+
+/* Clock accuracy request/response */
+#define BLE_LL_CTRL_CLOCK_ACCURACY_REQ_LEN  (1)
+#define BLE_LL_CTRL_CLOCK_ACCURACY_RSP_LEN  (1)
+
+/* API */
+struct ble_ll_conn_sm;
+void ble_ll_ctrl_proc_start(struct ble_ll_conn_sm *connsm, int ctrl_proc);
+void ble_ll_ctrl_proc_stop(struct ble_ll_conn_sm *connsm, int ctrl_proc);
+int ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om);
+void ble_ll_ctrl_chk_proc_start(struct ble_ll_conn_sm *connsm);
+void ble_ll_ctrl_terminate_start(struct ble_ll_conn_sm *connsm);
+int ble_ll_ctrl_is_terminate_ind(uint8_t hdr, uint8_t opcode);
+uint8_t ble_ll_ctrl_conn_param_reply(struct ble_ll_conn_sm *connsm,
+                                     uint8_t *rsp,
+                                     struct ble_ll_conn_params *req);
+int ble_ll_ctrl_reject_ind_send(struct ble_ll_conn_sm *connsm,
+                                uint8_t rej_opcode, uint8_t err);
+int ble_ll_ctrl_start_enc_send(struct ble_ll_conn_sm *connsm);
+int ble_ll_ctrl_enc_allowed_pdu_rx(struct os_mbuf *rxpdu);
+int ble_ll_ctrl_enc_allowed_pdu_tx(struct os_mbuf_pkthdr *pkthdr);
+int ble_ll_ctrl_tx_done(struct os_mbuf *txpdu, struct ble_ll_conn_sm *connsm);
+int ble_ll_ctrl_is_start_enc_rsp(struct os_mbuf *txpdu);
+
+void ble_ll_hci_ev_datalen_chg(struct ble_ll_conn_sm *connsm);
+void ble_ll_hci_ev_rem_conn_parm_req(struct ble_ll_conn_sm *connsm,
+                                     struct ble_ll_conn_params *cp);
+void ble_ll_hci_ev_conn_update(struct ble_ll_conn_sm *connsm, uint8_t status);
+void ble_ll_hci_ev_rd_rem_used_feat(struct ble_ll_conn_sm *connsm,
+                                      uint8_t status);
+void ble_ll_hci_ev_rd_rem_ver(struct ble_ll_conn_sm *connsm, uint8_t status);
+void ble_ll_hci_ev_encrypt_chg(struct ble_ll_conn_sm *connsm, uint8_t status);
+int ble_ll_hci_ev_ltk_req(struct ble_ll_conn_sm *connsm);
+int ble_ll_hci_ev_hw_err(uint8_t hw_err);
+void ble_ll_hci_ev_databuf_overflow(void);
+void ble_ll_hci_ev_le_csa(struct ble_ll_conn_sm *connsm);
+void ble_ll_hci_ev_send_scan_req_recv(uint8_t adv_handle, const uint8_t *peer,
+                                      uint8_t peer_addr_type);
+void ble_ll_hci_ev_send_scan_timeout(void);
+void ble_ll_hci_ev_send_adv_set_terminated(uint8_t status, uint8_t adv_handle,
+                                           uint16_t conn_handle, uint8_t events);
+int ble_ll_hci_ev_phy_update(struct ble_ll_conn_sm *connsm, uint8_t status);
+void ble_ll_calc_session_key(struct ble_ll_conn_sm *connsm);
+void ble_ll_ctrl_phy_update_proc_complete(struct ble_ll_conn_sm *connsm);
+void ble_ll_ctrl_initiate_dle(struct ble_ll_conn_sm *connsm);
+void ble_ll_hci_ev_send_vendor_err(const char *file, uint32_t line);
+
+uint8_t ble_ll_ctrl_phy_tx_transition_get(uint8_t phy_mask);
+uint8_t ble_ll_ctrl_phy_from_phy_mask(uint8_t phy_mask);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_CTRL_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_hci.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_hci.h
new file mode 100644
index 000000000..5806f6737
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_hci.h
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_HCI_
+#define H_BLE_LL_HCI_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "nimble/nimble/include/nimble/hci_common.h"
+
+/* For supported commands */
+#define BLE_LL_SUPP_CMD_LEN (42)
+extern const uint8_t g_ble_ll_supp_cmds[BLE_LL_SUPP_CMD_LEN];
+
+/* The largest event the controller will send. */
+#define BLE_LL_MAX_EVT_LEN  MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE)
+
+/*
+ * This determines the number of outstanding commands allowed from the
+ * host to the controller. NOTE: you cannot change this without modifying
+ * other portions of the code as we currently use a global os event for
+ * the command; you would need to allocate a pool of these.
+ */
+#define BLE_LL_CFG_NUM_HCI_CMD_PKTS     (1)
+
+typedef void (*ble_ll_hci_post_cmd_complete_cb)(void);
+
+/* Initialize LL HCI */
+void ble_ll_hci_init(void);
+
+/* Used to determine if the LE event is enabled/disabled */
+bool ble_ll_hci_is_le_event_enabled(unsigned int subev);
+
+/* Used to determine if event is enabled/disabled */
+bool ble_ll_hci_is_event_enabled(unsigned int evcode);
+
+/* Send event from controller to host */
+int ble_ll_hci_event_send(struct ble_hci_ev *hci_ev);
+
+/* Sends a command complete with a no-op opcode to host */
+void ble_ll_hci_send_noop(void);
+
+/* Checks the preferref phy masks from set default phy and set phy commands */
+int ble_ll_hci_chk_phy_masks(uint8_t all_phys, uint8_t tx_phys, uint8_t rx_phys,
+                             uint8_t *txphy, uint8_t *rxphy);
+
+/* Returns true if Extended Advertising HCI commands are in use */
+bool ble_ll_hci_adv_mode_ext(void);
+
+/* Get TX power compensation rounded to integer dB */
+int8_t ble_ll_get_tx_pwr_compensation(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_HCI_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_resolv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_resolv.h
new file mode 100644
index 000000000..228e0a370
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_resolv.h
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_RESOLV_
+#define H_BLE_LL_RESOLV_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * An entry in the resolving list.
+ *      The identity address is stored in little endian format.
+ *      The local rpa is stored in little endian format.
+ *      The IRKs are stored in big endian format.
+ *
+ *  Note:
+ *  rl_local_irk and rl_peer_irk need to be word aligned
+ */
+struct ble_ll_resolv_entry
+{
+    uint8_t rl_addr_type;
+    uint8_t rl_priv_mode;
+    uint8_t rl_has_local;
+    uint8_t rl_has_peer;
+    uint8_t rl_local_irk[16];
+    uint8_t rl_peer_irk[16];
+    uint8_t rl_identity_addr[BLE_DEV_ADDR_LEN];
+    uint8_t rl_local_rpa[BLE_DEV_ADDR_LEN];
+    uint8_t rl_peer_rpa[BLE_DEV_ADDR_LEN];
+};
+
+extern struct ble_ll_resolv_entry g_ble_ll_resolv_list[];
+
+/* Clear the resolving list */
+int ble_ll_resolv_list_clr(void);
+
+/* Read the size of the resolving list */
+int ble_ll_resolv_list_read_size(uint8_t *rspbuf, uint8_t *rsplen);
+
+/* Add a device to the resolving list */
+int ble_ll_resolv_list_add(const uint8_t *cmdbuf, uint8_t len);
+
+/* Remove a device from the resolving list */
+int ble_ll_resolv_list_rmv(const uint8_t *cmdbuf, uint8_t len);
+
+/* Address resolution enable command */
+int ble_ll_resolv_enable_cmd(const uint8_t *cmdbuf, uint8_t len);
+
+int ble_ll_resolv_peer_addr_rd(const uint8_t *cmdbuf, uint8_t len,
+                               uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_resolv_local_addr_rd(const uint8_t *cmdbuf, uint8_t len,
+                                uint8_t *rspbuf, uint8_t *rsplen);
+
+/* Finds 'addr' in resolving list. Doesnt check if address resolution enabled */
+struct ble_ll_resolv_entry *
+ble_ll_resolv_list_find(const uint8_t *addr, uint8_t addr_type);
+
+/* Returns true if address resolution is enabled */
+uint8_t ble_ll_resolv_enabled(void);
+
+/* Reset private address resolution */
+void ble_ll_resolv_list_reset(void);
+
+/* Generate local or peer RPA. It is up to caller to make sure required IRK
+ * is present on RL
+ */
+void ble_ll_resolv_get_priv_addr(struct ble_ll_resolv_entry *rl, int local,
+                                 uint8_t *addr);
+
+void ble_ll_resolv_set_peer_rpa(int index, uint8_t *rpa);
+void ble_ll_resolv_set_local_rpa(int index, uint8_t *rpa);
+
+/* Generate a resolvable private address. */
+int ble_ll_resolv_gen_rpa(uint8_t *addr, uint8_t addr_type, uint8_t *rpa,
+                          int local);
+
+/* Set the resolvable private address timeout */
+int ble_ll_resolv_set_rpa_tmo(const uint8_t *cmdbuf, uint8_t len);
+
+/* Set the privacy mode */
+int ble_ll_resolve_set_priv_mode(const uint8_t *cmdbuf, uint8_t len);
+
+/* Get the RPA timeout, in seconds */
+uint32_t ble_ll_resolv_get_rpa_tmo(void);
+
+/* Resolve a resolvable private address */
+int ble_ll_resolv_rpa(const uint8_t *rpa, const uint8_t *irk);
+
+/* Try to resolve peer RPA and return index on RL if matched */
+int ble_ll_resolv_peer_rpa_any(const uint8_t *rpa);
+
+/* Initialize resolv*/
+void ble_ll_resolv_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h
new file mode 100644
index 000000000..37b81a88b
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_rfmgmt.h
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_RFMGMT_
+#define H_BLE_LL_RFMGMT_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void ble_ll_rfmgmt_init(void);
+
+#if MYNEWT_VAL(BLE_LL_RFMGMT_ENABLE_TIME) > 0
+
+void ble_ll_rfmgmt_reset(void);
+
+/* Notify rfmgmt that scan window has changed (only called from ble_ll_scan) */
+void ble_ll_rfmgmt_scan_changed(bool enabled, uint32_t next_window);
+
+/* Notify rfmgmt that 1st scheduled item has changed (only called from ble_ll_sched) */
+void ble_ll_rfmgmt_sched_changed(struct ble_ll_sched_item *first);
+
+/* Notify rfmgmt that RF is no longer needed by current event */
+void ble_ll_rfmgmt_release(void);
+
+/* Enables RF immediately and returns tick at which RF will be fully enabled */
+uint32_t ble_ll_rfmgmt_enable_now(void);
+
+/* Returns true only if RF is currently fully enabled (i.e. not off or enabling) */
+bool ble_ll_rfmgmt_is_enabled(void);
+
+#else
+
+static inline void ble_ll_rfmgmt_reset(void) { }
+static inline void ble_ll_rfmgmt_scan_changed(bool e, uint32_t n) { }
+static inline void ble_ll_rfmgmt_sched_changed(struct ble_ll_sched_item *f) { }
+static inline void ble_ll_rfmgmt_release(void) { }
+static inline uint32_t ble_ll_rfmgmt_enable_now(void) { return 0; }
+static inline bool ble_ll_rfmgmt_is_enabled(void) { return true; }
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_RFMGMT_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_scan.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_scan.h
new file mode 100644
index 000000000..ca50824d0
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_scan.h
@@ -0,0 +1,293 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_SCAN_
+#define H_BLE_LL_SCAN_
+
+#include "ble_ll_sched.h"
+#include "nimble/porting/nimble/include/hal/hal_timer.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * SCAN_REQ
+ *      -> ScanA    (6 bytes)
+ *      -> AdvA     (6 bytes)
+ *
+ *  ScanA is the scanners public (TxAdd=0) or random (TxAdd = 1) address
+ *  AdvaA is the advertisers public (RxAdd=0) or random (RxAdd=1) address.
+ *
+ * Sent by the LL in the Scanning state; received by the LL in the advertising
+ * state. The advertising address is the intended recipient of this frame.
+ */
+#define BLE_SCAN_REQ_LEN                (12)
+
+/*
+ * SCAN_RSP
+ *      -> AdvA         (6 bytes)
+ *      -> ScanRspData  (0 - 31 bytes)
+ *
+ *  AdvaA is the advertisers public (TxAdd=0) or random (TxAdd=1) address.
+ *  ScanRspData may contain any data from the advertisers host.
+ *
+ * Sent by the LL in the advertising state; received by the LL in the
+ * scanning state.
+ */
+#define BLE_SCAN_RSP_LEGACY_DATA_MAX_LEN       (31)
+#define BLE_SCAN_LEGACY_MAX_PKT_LEN            (37)
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define BLE_SCAN_RSP_DATA_MAX_LEN       MYNEWT_VAL(BLE_EXT_ADV_MAX_SIZE)
+
+/* For Bluetooth 5.0 we need state machine for two PHYs*/
+#define BLE_LL_SCAN_PHY_NUMBER          (2)
+#else
+#define BLE_LL_SCAN_PHY_NUMBER          (1)
+#define BLE_SCAN_RSP_DATA_MAX_LEN       BLE_SCAN_RSP_LEGACY_DATA_MAX_LEN
+#endif
+
+#define PHY_UNCODED                    (0)
+#define PHY_CODED                      (1)
+
+#define BLE_LL_EXT_ADV_MODE_NON_CONN    (0x00)
+#define BLE_LL_EXT_ADV_MODE_CONN        (0x01)
+#define BLE_LL_EXT_ADV_MODE_SCAN        (0x02)
+
+/* All values are stored as ticks */
+struct ble_ll_scan_timing {
+    uint32_t interval;
+    uint32_t window;
+    uint32_t start_time;
+};
+
+struct ble_ll_scan_params
+{
+    uint8_t phy;
+    uint8_t own_addr_type;
+    uint8_t scan_filt_policy;
+    uint8_t configured;
+    uint8_t scan_type;
+    uint8_t scan_chan;
+    struct ble_ll_scan_timing timing;
+};
+
+#define BLE_LL_AUX_HAS_ADVA                     0x01
+#define BLE_LL_AUX_HAS_TARGETA                  0x02
+#define BLE_LL_AUX_HAS_ADI                      0x04
+#define BLE_LL_AUX_IS_MATCHED                   0x08
+#define BLE_LL_AUX_IS_TARGETA_RESOLVED          0x10
+
+#define BLE_LL_AUX_FLAG_HCI_SENT_ANY            0x02
+#define BLE_LL_AUX_FLAG_HCI_SENT_COMPLETED      0x04
+#define BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED      0x08
+#define BLE_LL_AUX_FLAG_SCAN_COMPLETE           0x10
+#define BLE_LL_AUX_FLAG_SCAN_ERROR              0x20
+#define BLE_LL_AUX_FLAG_AUX_ADV_RECEIVED        0x40
+#define BLE_LL_AUX_FLAG_AUX_CHAIN_RECEIVED      0x80
+
+struct ble_ll_aux_data {
+    uint8_t flags;
+
+    /*
+     * Since aux_data can be accessed from ISR and LL, we have separate copies
+     * of flags to make sure that ISR does not modify flags while LL uses them.
+     * ISR updates 'flags_isr' and LL adds these to 'flags_ll' which it then
+     * uses for further processing allowing to update 'flags_isr' if another
+     * scan for given 'aux_data' is scheduled. Note that flags must not be unset
+     * while aux_data is valid.
+     */
+    uint8_t flags_isr;
+    uint8_t flags_ll;
+
+    uint8_t ref_cnt;
+    uint8_t chan;
+    uint8_t aux_phy;
+    uint8_t aux_primary_phy;
+    uint8_t mode;
+    uint8_t scanning;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    int8_t rpa_index;
+#endif
+    uint16_t adi;
+    uint32_t offset;
+    uint8_t offset_units;
+    uint8_t adva[6];
+    uint8_t adva_type;
+    uint8_t targeta[6];
+    uint8_t targeta_type;
+    uint16_t evt_type;
+    struct ble_ll_sched_item sch;
+    struct ble_hci_ev *evt;
+    struct ble_npl_event ev;
+};
+
+struct ble_ll_scan_pdu_data {
+    uint8_t hdr_byte;
+    /* ScanA for SCAN_REQ and InitA for CONNECT_IND */
+    union {
+        uint8_t scana[BLE_DEV_ADDR_LEN];
+        uint8_t inita[BLE_DEV_ADDR_LEN];
+    };
+    uint8_t adva[BLE_DEV_ADDR_LEN];
+};
+
+struct ble_ll_scan_sm
+{
+    uint8_t scan_enabled;
+    uint8_t own_addr_type;
+    uint8_t scan_filt_dups;
+    uint8_t scan_rsp_pending;
+    uint8_t scan_rsp_cons_fails;
+    uint8_t scan_rsp_cons_ok;
+    uint8_t scan_peer_rpa[BLE_DEV_ADDR_LEN];
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    ble_npl_time_t scan_nrpa_timer;
+    uint8_t scan_nrpa[BLE_DEV_ADDR_LEN];
+#endif
+    struct ble_ll_scan_pdu_data pdu_data;
+
+    /* XXX: Shall we count backoff per phy? */
+    uint16_t upper_limit;
+    uint16_t backoff_count;
+    uint32_t scan_win_start_time;
+    struct ble_npl_event scan_sched_ev;
+    struct hal_timer scan_timer;
+    struct ble_npl_event scan_interrupted_ev;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct hal_timer duration_timer;
+    struct hal_timer period_timer;
+    uint32_t duration_ticks;
+    uint32_t period_ticks;
+    uint8_t ext_scanning;
+#endif
+
+    uint8_t restart_timer_needed;
+    struct ble_ll_aux_data *cur_aux_data;
+
+    struct ble_ll_scan_params *scanp;
+    struct ble_ll_scan_params *scanp_next;
+    struct ble_ll_scan_params scanp_phys[BLE_LL_SCAN_PHY_NUMBER];
+};
+
+/* Scan types */
+#define BLE_SCAN_TYPE_PASSIVE   (BLE_HCI_SCAN_TYPE_PASSIVE)
+#define BLE_SCAN_TYPE_ACTIVE    (BLE_HCI_SCAN_TYPE_ACTIVE)
+#define BLE_SCAN_TYPE_INITIATE  (2)
+
+/*---- HCI ----*/
+/* Set scanning parameters */
+int ble_ll_scan_set_scan_params(const uint8_t *cmdbuf, uint8_t len);
+
+/* Turn scanning on/off */
+int ble_ll_hci_scan_set_enable(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_hci_ext_scan_set_enable(const uint8_t *cmdbuf, uint8_t len);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+int ble_ll_set_ext_scan_params(const uint8_t *cmdbuf, uint8_t len);
+#endif
+
+/*--- Controller Internal API ---*/
+/* Initialize the scanner */
+void ble_ll_scan_init(void);
+
+/* Reset the scanner */
+void ble_ll_scan_reset(void);
+
+/* Called when Link Layer starts to receive a PDU and is in scanning state */
+int ble_ll_scan_rx_isr_start(uint8_t pdu_type, uint16_t *rxflags);
+
+/* Called when Link Layer has finished receiving a PDU while scanning */
+int ble_ll_scan_rx_isr_end(struct os_mbuf *rxpdu, uint8_t crcok);
+
+/* Process a scan response PDU */
+void ble_ll_scan_rx_pkt_in(uint8_t pdu_type, struct os_mbuf *om,
+                           struct ble_mbuf_hdr *hdr);
+
+/* Boolean function denoting whether or not the whitelist can be changed */
+int ble_ll_scan_can_chg_whitelist(void);
+
+/* Boolean function returning true if scanning enabled */
+int ble_ll_scan_enabled(void);
+
+/* Boolean function returns true if whitelist is enabled for scanning */
+int ble_ll_scan_whitelist_enabled(void);
+
+/* Initialize the scanner when we start initiating */
+struct hci_create_conn;
+int ble_ll_scan_initiator_start(struct hci_create_conn *hcc,
+                                struct ble_ll_scan_sm **sm);
+
+/* Returns storage for PDU data (for SCAN_REQ or CONNECT_IND) */
+struct ble_ll_scan_pdu_data *ble_ll_scan_get_pdu_data(void);
+
+/* Called to set the resolvable private address of the last connected peer */
+void ble_ll_scan_set_peer_rpa(uint8_t *rpa);
+
+/* Returns peer RPA of last connection made */
+uint8_t *ble_ll_scan_get_peer_rpa(void);
+
+/* Returns the local RPA used by the scanner/initiator */
+uint8_t *ble_ll_scan_get_local_rpa(void);
+
+/* Stop the scanning state machine */
+void ble_ll_scan_sm_stop(int chk_disable);
+
+/* Resume scanning */
+void ble_ll_scan_chk_resume(void);
+
+/* Called when wait for response timer expires in scanning mode */
+void ble_ll_scan_wfr_timer_exp(void);
+
+/* Called when scan could be interrupted  */
+void ble_ll_scan_interrupted(struct ble_ll_scan_sm *scansm);
+
+int ble_ll_scan_adv_decode_addr(uint8_t pdu_type, uint8_t *rxbuf,
+                                struct ble_mbuf_hdr *ble_hdr,
+                                uint8_t **addr, uint8_t *addr_type,
+                                uint8_t **inita, uint8_t *init_addr_type,
+                                int *ext_mode);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+int ble_ll_scan_update_aux_data(struct ble_mbuf_hdr *ble_hdr, uint8_t *rxbuf,
+                                bool *adva_present);
+
+/* Initialize the extended scanner when we start initiating */
+struct hci_ext_create_conn;
+int ble_ll_scan_ext_initiator_start(struct hci_ext_create_conn *hcc,
+                                    struct ble_ll_scan_sm **sm);
+
+/* Called to parse extended advertising*/
+struct ble_ll_aux_data *ble_ll_scan_aux_data_ref(struct ble_ll_aux_data *aux_scan);
+void ble_ll_scan_aux_data_unref(struct ble_ll_aux_data *aux_scan);
+void ble_ll_scan_end_adv_evt(struct ble_ll_aux_data *aux_data);
+#endif
+
+/* Called to halt currently running scan */
+void ble_ll_scan_halt(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_SCAN_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_sched.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_sched.h
new file mode 100644
index 000000000..a614cf090
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_sched.h
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_SCHED_
+#define H_BLE_LL_SCHED_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Time per BLE scheduler slot */
+#define BLE_LL_SCHED_USECS_PER_SLOT         (1250)
+#define BLE_LL_SCHED_32KHZ_TICKS_PER_SLOT   (41)    /* 1 tick = 30.517 usecs */
+
+/*
+ * Worst case time needed for scheduled advertising item. This is the longest
+ * possible time to receive a scan request and send a scan response (with the
+ * appropriate IFS time between them). This number is calculated using the
+ * following formula: IFS + SCAN_REQ + IFS + SCAN_RSP = 150 + 176 + 150 + 376.
+ * Note: worst case time to tx adv, rx scan req and send scan rsp is 1228 usecs.
+ * This assumes maximum sized advertising PDU and scan response PDU.
+ *
+ * For connectable advertising events no scan request is allowed. In this case
+ * we just need to receive a connect request PDU: IFS + CONNECT_REQ = 150 + 352.
+ * Note: worst-case is 376 + 150 + 352 = 878 usecs
+ *
+ * NOTE: The advertising PDU transmit time is NOT included here since we know
+ * how long that will take (worst-case is 376 usecs).
+ */
+#define BLE_LL_SCHED_ADV_MAX_USECS          (852)
+#define BLE_LL_SCHED_DIRECT_ADV_MAX_USECS   (502)
+#define BLE_LL_SCHED_MAX_ADV_PDU_USECS      (376)
+
+/*
+ * This is the offset from the start of the scheduled item until the actual
+ * tx/rx should occur, in ticks.
+ */
+extern uint8_t g_ble_ll_sched_offset_ticks;
+
+/*
+ * This is the number of slots needed to transmit and receive a maximum
+ * size PDU, including an IFS time before each. The actual time is
+ * 2120 usecs for tx/rx and 150 for IFS = 4540 usecs.
+ */
+#define BLE_LL_SCHED_MAX_TXRX_SLOT  (4 * BLE_LL_SCHED_USECS_PER_SLOT)
+
+/* BLE scheduler errors */
+#define BLE_LL_SCHED_ERR_OVERLAP    (1)
+
+/* Types of scheduler events */
+#define BLE_LL_SCHED_TYPE_ADV       (1)
+#define BLE_LL_SCHED_TYPE_SCAN      (2)
+#define BLE_LL_SCHED_TYPE_CONN      (3)
+#define BLE_LL_SCHED_TYPE_AUX_SCAN  (4)
+#define BLE_LL_SCHED_TYPE_DTM       (5)
+#define BLE_LL_SCHED_TYPE_PERIODIC  (6)
+#define BLE_LL_SCHED_TYPE_SYNC      (7)
+
+/* Return values for schedule callback. */
+#define BLE_LL_SCHED_STATE_RUNNING  (0)
+#define BLE_LL_SCHED_STATE_DONE     (1)
+
+/* Callback function */
+struct ble_ll_sched_item;
+typedef int (*sched_cb_func)(struct ble_ll_sched_item *sch);
+typedef void (*sched_remove_cb_func)(struct ble_ll_sched_item *sch);
+/*
+ * Strict connection scheduling (for the master) is different than how
+ * connections are normally scheduled. With strict connection scheduling we
+ * introduce the concept of a "period". A period is a collection of slots. Each
+ * slot is 1.25 msecs in length. The number of slots in a period is determined
+ * by the syscfg value BLE_LL_CONN_INIT_SLOTS. A collection of periods is called
+ * an epoch. The length of an epoch is determined by the number of connections
+ * (BLE_MAX_CONNECTIONS plus BLE_LL_ADD_STRICT_SCHED_PERIODS). Connections
+ * will be scheduled at period boundaries. Any scanning/initiating/advertising
+ * will be done in unused periods, if possible.
+ */
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+#define BLE_LL_SCHED_PERIODS    (MYNEWT_VAL(BLE_MAX_CONNECTIONS) + \
+                                 MYNEWT_VAL(BLE_LL_ADD_STRICT_SCHED_PERIODS))
+
+struct ble_ll_sched_obj
+{
+    uint8_t sch_num_occ_periods;
+    uint32_t sch_occ_period_mask;
+    uint32_t sch_ticks_per_period;
+    uint32_t sch_ticks_per_epoch;
+    uint32_t sch_epoch_start;
+};
+
+extern struct ble_ll_sched_obj g_ble_ll_sched_data;
+
+/*
+ * XXX: TODO:
+ * -> How do we know epoch start is up to date? Not wrapped?
+ * -> for now, only do this with no more than 32 connections.
+ * -> Do not let initiating occur if no empty sched slots
+ */
+#endif
+
+/*
+ * Schedule item
+ *  sched_type: This is the type of the schedule item.
+ *  enqueued: Flag denoting if item is on the scheduler list. 0: no, 1:yes
+ *  remainder: # of usecs from offset till tx/rx should occur
+ *  txrx_offset: Number of ticks from start time until tx/rx should occur.
+ *
+ */
+struct ble_ll_sched_item
+{
+    uint8_t         sched_type;
+    uint8_t         enqueued;
+    uint8_t         remainder;
+    uint32_t        start_time;
+    uint32_t        end_time;
+    void            *cb_arg;
+    sched_cb_func   sched_cb;
+    TAILQ_ENTRY(ble_ll_sched_item) link;
+};
+
+/* Initialize the scheduler */
+int ble_ll_sched_init(void);
+
+/* Remove item(s) from schedule */
+int ble_ll_sched_rmv_elem(struct ble_ll_sched_item *sch);
+
+void ble_ll_sched_rmv_elem_type(uint8_t type, sched_remove_cb_func remove_cb);
+
+/* Schedule a new master connection */
+struct ble_ll_conn_sm;
+int ble_ll_sched_master_new(struct ble_ll_conn_sm *connsm,
+                            struct ble_mbuf_hdr *ble_hdr, uint8_t pyld_len);
+
+/* Schedule a new slave connection */
+int ble_ll_sched_slave_new(struct ble_ll_conn_sm *connsm);
+
+struct ble_ll_adv_sm;
+typedef void ble_ll_sched_adv_new_cb(struct ble_ll_adv_sm *advsm,
+                                     uint32_t sch_start, void *arg);
+
+/* Schedule a new advertising event */
+int ble_ll_sched_adv_new(struct ble_ll_sched_item *sch,
+                         ble_ll_sched_adv_new_cb cb, void *arg);
+
+/* Schedule periodic advertising event */
+int ble_ll_sched_periodic_adv(struct ble_ll_sched_item *sch, uint32_t *start,
+                              bool after_overlap);
+
+int ble_ll_sched_sync_reschedule(struct ble_ll_sched_item *sch,
+                                 uint32_t anchor_point,
+                                 uint8_t anchor_point_usecs,
+                                 uint32_t window_widening, int8_t phy_mode);
+int ble_ll_sched_sync(struct ble_ll_sched_item *sch,
+                      uint32_t beg_cputime, uint32_t rem_usecs, uint32_t offset,
+                      int8_t phy_mode);
+
+/* Reschedule an advertising event */
+int ble_ll_sched_adv_reschedule(struct ble_ll_sched_item *sch, uint32_t *start,
+                                uint32_t max_delay_ticks);
+
+/* Reschedule and advertising pdu */
+int ble_ll_sched_adv_resched_pdu(struct ble_ll_sched_item *sch);
+
+/* Reschedule a connection that had previously been scheduled or that is over */
+int ble_ll_sched_conn_reschedule(struct ble_ll_conn_sm * connsm);
+
+/**
+ * Called to determine when the next scheduled event will occur.
+ *
+ * If there are not scheduled events this function returns 0; otherwise it
+ * returns 1 and *next_event_time is set to the start time of the next event.
+ *
+ * @param next_event_time cputime at which next scheduled event will occur
+ *
+ * @return int 0: No events are scheduled 1: there is an upcoming event
+ */
+int ble_ll_sched_next_time(uint32_t *next_event_time);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+struct ble_ll_scan_sm;
+struct ble_ll_aux_data;
+int ble_ll_sched_aux_scan(struct ble_mbuf_hdr *ble_hdr,
+                          struct ble_ll_scan_sm *scansm,
+                          struct ble_ll_aux_data *aux_scan);
+
+int ble_ll_sched_scan_req_over_aux_ptr(uint32_t chan, uint8_t phy_mode);
+#endif
+
+/* Stop the scheduler */
+void ble_ll_sched_stop(void);
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+int ble_ll_sched_dtm(struct ble_ll_sched_item *sch);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_LL_SCHED_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_sync.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_sync.h
new file mode 100644
index 000000000..96c52a92a
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_sync.h
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_SYNC_
+#define H_BLE_LL_SYNC_
+
+#include <stdint.h>
+
+#include "nimble/nimble/include/nimble/ble.h"
+#include "ble_ll_hci.h"
+#include "ble_ll_conn.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct ble_ll_sync_sm;
+
+int ble_ll_sync_create(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_sync_cancel(ble_ll_hci_post_cmd_complete_cb *post_cmd_cb);
+int ble_ll_sync_terminate(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_sync_list_add(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_sync_list_remove(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_sync_list_clear(void);
+int ble_ll_sync_list_size(uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_sync_receive_enable(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_sync_transfer(const uint8_t *cmdbuf, uint8_t len,
+                         uint8_t *rspbuf, uint8_t *rsplen);
+
+void ble_ll_sync_periodic_ind(struct ble_ll_conn_sm *connsm,
+                              const uint8_t *sync_ind, bool reports_disabled,
+                              uint16_t max_skip, uint32_t sync_timeout);
+void ble_ll_sync_transfer_disconnected(struct ble_ll_conn_sm *connsm);
+
+void ble_ll_sync_info_event(const uint8_t *addr, uint8_t addr_type,
+                            int rpa_index, uint8_t sid,
+                            struct ble_mbuf_hdr *rxhdr,
+                            const uint8_t *syncinfo);
+
+int ble_ll_sync_rx_isr_start(uint8_t pdu_type, struct ble_mbuf_hdr *rxhdr);
+int ble_ll_sync_rx_isr_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr);
+void ble_ll_sync_rx_pkt_in(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr);
+void ble_ll_sync_wfr_timer_exp(void);
+void ble_ll_sync_halt(void);
+void ble_ll_sync_rmvd_from_sched(struct ble_ll_sync_sm *sm);
+
+uint32_t ble_ll_sync_get_event_end_time(void);
+
+bool ble_ll_sync_enabled(void);
+
+void ble_ll_sync_reset(void);
+void ble_ll_sync_init(void);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_SYNC_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_test.h
similarity index 90%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_test.h
index a2d328756..32984c6b3 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_test.h
@@ -17,14 +17,16 @@
  * under the License.
  */
 
-#ifndef H_BLE_HS_STARTUP_
-#define H_BLE_HS_STARTUP_
+#ifndef H_LL_TEST_
+#define H_LL_TEST_
+
+#include <stddef.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-int ble_hs_startup_go(void);
+int ble_ll_csa2_test_all(void);
 
 #ifdef __cplusplus
 }
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_trace.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_trace.h
new file mode 100644
index 000000000..f0af4de50
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_trace.h
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_TRACE_
+#define H_BLE_LL_TRACE_
+
+#include "nimble/porting/nimble/include/os/os_trace_api.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BLE_LL_TRACE_ID_SCHED                   0
+#define BLE_LL_TRACE_ID_RX_START                1
+#define BLE_LL_TRACE_ID_RX_END                  2
+#define BLE_LL_TRACE_ID_WFR_EXP                 3
+#define BLE_LL_TRACE_ID_CTRL_RX                 4
+#define BLE_LL_TRACE_ID_CONN_EV_START           5
+#define BLE_LL_TRACE_ID_CONN_EV_END             6
+#define BLE_LL_TRACE_ID_CONN_END                7
+#define BLE_LL_TRACE_ID_CONN_TX                 8
+#define BLE_LL_TRACE_ID_CONN_RX                 9
+#define BLE_LL_TRACE_ID_ADV_TXDONE              10
+#define BLE_LL_TRACE_ID_ADV_HALT                11
+#define BLE_LL_TRACE_ID_AUX_REF                 12
+#define BLE_LL_TRACE_ID_AUX_UNREF               13
+
+#if MYNEWT_VAL(BLE_LL_SYSVIEW)
+
+extern uint32_t ble_ll_trace_off;
+
+void ble_ll_trace_init(void);
+
+static inline void
+ble_ll_trace_u32(unsigned id, uint32_t p1)
+{
+    os_trace_api_u32(ble_ll_trace_off + id, p1);
+}
+
+static inline void
+ble_ll_trace_u32x2(unsigned id, uint32_t p1, uint32_t p2)
+{
+    os_trace_api_u32x2(ble_ll_trace_off + id, p1, p2);
+}
+
+static inline void
+ble_ll_trace_u32x3(unsigned id, uint32_t p1, uint32_t p2, uint32_t p3)
+{
+    os_trace_api_u32x3(ble_ll_trace_off + id, p1, p2, p3);
+}
+
+#else
+
+static inline void
+ble_ll_trace_init(void)
+{
+}
+
+static inline void
+ble_ll_trace_u32(unsigned id, uint32_t p1)
+{
+}
+
+static inline void
+ble_ll_trace_u32x2(unsigned id, uint32_t p1, uint32_t p2)
+{
+}
+
+static inline void
+ble_ll_trace_u32x3(unsigned id, uint32_t p1, uint32_t p2, uint32_t p3)
+{
+}
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_TRACE_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_utils.h
similarity index 58%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_utils.h
index 8923678a3..248309009 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_utils.h
@@ -17,22 +17,13 @@
  * under the License.
  */
 
-#ifndef H_BLE_HS_MBUF_PRIV_
-#define H_BLE_HS_MBUF_PRIV_
+#include <stdint.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct os_mbuf;
-
-struct os_mbuf *ble_hs_mbuf_bare_pkt(void);
-struct os_mbuf *ble_hs_mbuf_acl_pkt(void);
-struct os_mbuf *ble_hs_mbuf_l2cap_pkt(void);
-int ble_hs_mbuf_pullup_base(struct os_mbuf **om, int base_len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+uint32_t ble_ll_utils_calc_access_addr(void);
+uint8_t ble_ll_utils_remapped_channel(uint8_t remap_index, const uint8_t *chanmap);
+uint8_t ble_ll_utils_calc_dci_csa2(uint16_t event_cntr, uint16_t channel_id,
+                                   uint8_t num_used_chans, const uint8_t *chanmap);
+uint8_t ble_ll_utils_calc_num_used_chans(const uint8_t *chanmap);
+uint32_t ble_ll_utils_calc_window_widening(uint32_t anchor_point,
+                                           uint32_t last_anchor_point,
+                                           uint8_t master_sca);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/include/nimble/nimble_port.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_whitelist.h
similarity index 54%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/include/nimble/nimble_port.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_whitelist.h
index fe9592764..2d3b6c5dd 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/include/nimble/nimble_port.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_ll_whitelist.h
@@ -17,32 +17,36 @@
  * under the License.
  */
 
-#ifndef _NIMBLE_PORT_H
-#define _NIMBLE_PORT_H
-
-#include "nimble/nimble_npl.h"
-
-#define NIMBLE_CORE (CONFIG_BT_NIMBLE_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BT_NIMBLE_PINNED_TO_CORE : tskNO_AFFINITY)
-#define NIMBLE_STACK_SIZE CONFIG_BT_NIMBLE_TASK_STACK_SIZE
+#ifndef H_BLE_LL_WHITELIST_
+#define H_BLE_LL_WHITELIST_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void nimble_port_init(void);
-void nimble_port_deinit(void);
+/* Clear the whitelist */
+int ble_ll_whitelist_clear(void);
 
-void nimble_port_run(void);
-int nimble_port_stop(void);
+/* Read the size of the whitelist */
+int ble_ll_whitelist_read_size(uint8_t *rspbuf, uint8_t *rsplen);
 
-struct ble_npl_eventq *nimble_port_get_dflt_eventq(void);
+/* Add a device to the whitelist */
+int ble_ll_whitelist_add(const uint8_t *cmdbuf, uint8_t len);
 
-#if NIMBLE_CFG_CONTROLLER
-void nimble_port_ll_task_func(void *arg);
-#endif
+/* Remove a device fromthe whitelist */
+int ble_ll_whitelist_rmv(const uint8_t *cmdbuf, uint8_t len);
+
+/* Enable whitelisting */
+void ble_ll_whitelist_enable(void);
+
+/* Disable whitelisting */
+void ble_ll_whitelist_disable(void);
+
+/* Boolean function returning true if address matches a whitelist entry */
+int ble_ll_whitelist_match(uint8_t *addr, uint8_t addr_type, int is_ident);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* _NIMBLE_PORT_H */
+#endif /* H_BLE_LL_WHITELIST_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_phy.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_phy.h
new file mode 100644
index 000000000..8a6fd174e
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_phy.h
@@ -0,0 +1,242 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_PHY_
+#define H_BLE_PHY_
+
+#include "nimble/nimble/include/nimble/hci_common.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Forward declarations */
+struct os_mbuf;
+
+/* Channel/Frequency defintions */
+#define BLE_PHY_NUM_CHANS           (40)
+#define BLE_PHY_NUM_DATA_CHANS      (37)
+#define BLE_PHY_CHAN0_FREQ_MHZ      (2402)
+#define BLE_PHY_DATA_CHAN0_FREQ_MHZ (2404)
+#define BLE_PHY_CHAN_SPACING_MHZ    (2)
+#define BLE_PHY_NUM_ADV_CHANS       (3)
+#define BLE_PHY_ADV_CHAN_START      (37)
+
+/* Power */
+#define BLE_PHY_MAX_PWR_DBM         (10)
+
+/* Deviation */
+#define BLE_PHY_DEV_KHZ             (185)
+#define BLE_PHY_BINARY_ZERO         (-BLE_PHY_DEV)
+#define BLE_PHY_BINARY_ONE          (BLE_PHY_DEV)
+
+/* Max. clock drift */
+#define BLE_PHY_MAX_DRIFT_PPM       (50)
+
+/* Data rate */
+#define BLE_PHY_BIT_RATE_BPS        (1000000)
+
+/* Macros */
+#define BLE_IS_ADV_CHAN(chan)       (chan >= BLE_PHY_ADV_CHAN_START)
+#define BLE_IS_DATA_CHAN(chan)      (chan < BLE_PHY_ADV_CHAN_START)
+
+/* PHY states */
+#define BLE_PHY_STATE_IDLE          (0)
+#define BLE_PHY_STATE_RX            (1)
+#define BLE_PHY_STATE_TX            (2)
+
+/* BLE PHY transitions */
+#define BLE_PHY_TRANSITION_NONE     (0)
+#define BLE_PHY_TRANSITION_RX_TX    (1)
+#define BLE_PHY_TRANSITION_TX_RX    (2)
+
+/* PHY error codes */
+#define BLE_PHY_ERR_RADIO_STATE     (1)
+#define BLE_PHY_ERR_INIT            (2)
+#define BLE_PHY_ERR_INV_PARAM       (3)
+#define BLE_PHY_ERR_NO_BUFS         (4)
+#define BLE_PHY_ERR_TX_LATE         (5)
+#define BLE_PHY_ERR_RX_LATE         (6)
+
+/* Maximun PDU length. Includes LL header of 2 bytes and 255 bytes payload. */
+#define BLE_PHY_MAX_PDU_LEN         (257)
+
+/* Wait for response timer */
+typedef void (*ble_phy_tx_end_func)(void *arg);
+
+/* Initialize the PHY */
+int ble_phy_init(void);
+
+/* Reset the PHY */
+int ble_phy_reset(void);
+
+/* Set the PHY channel */
+int ble_phy_setchan(uint8_t chan, uint32_t access_addr, uint32_t crcinit);
+
+/* Set transmit start time */
+int ble_phy_tx_set_start_time(uint32_t cputime, uint8_t rem_usecs);
+
+/* Set receive start time */
+int ble_phy_rx_set_start_time(uint32_t cputime, uint8_t rem_usecs);
+
+/* Set the transmit end callback and argument */
+void ble_phy_set_txend_cb(ble_phy_tx_end_func txend_cb, void *arg);
+
+typedef uint8_t (*ble_phy_tx_pducb_t)(uint8_t *dptr, void *pducb_arg,
+                                      uint8_t *hdr_byte);
+
+/* Place the PHY into transmit mode */
+int ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans);
+
+/* Place the PHY into receive mode */
+int ble_phy_rx(void);
+
+/* Copies the received PHY buffer into the allocated pdu */
+void ble_phy_rxpdu_copy(uint8_t *dptr, struct os_mbuf *rxpdu);
+
+/* Set the transmit power */
+int ble_phy_txpwr_set(int dbm);
+
+/* Get highest allowed power from range */
+int ble_phy_txpower_round(int dbm);
+
+/* Get the transmit power */
+int ble_phy_txpwr_get(void);
+
+/* Set RX path power compensation value rounded to integer dB */
+void ble_phy_set_rx_pwr_compensation(int8_t compensation);
+
+/* Disable the PHY */
+void ble_phy_disable(void);
+
+#define BLE_PHY_WFR_ENABLE_RX       (0)
+#define BLE_PHY_WFR_ENABLE_TXRX     (1)
+
+void ble_phy_wfr_enable(int txrx, uint8_t tx_phy_mode, uint32_t wfr_usecs);
+
+/* Starts rf clock */
+void ble_phy_rfclk_enable(void);
+
+/* Stops rf clock */
+void ble_phy_rfclk_disable(void);
+
+/*
+ * Used to restart reception on same channel after wfr timer expiration or
+ * frame received.
+ */
+void ble_phy_restart_rx(void);
+
+/* Gets the current state of the PHY */
+int ble_phy_state_get(void);
+
+/* Gets current state of transceiver */
+uint8_t ble_phy_xcvr_state_get(void);
+
+/* Returns 'true' if a reception has started */
+int ble_phy_rx_started(void);
+
+/*
+ * Returns the maximum supported tx/rx PDU payload size, in bytes, for data
+ * channel PDUs (this does not apply to advertising channel PDUs). Note
+ * that the data channel PDU is composed of a 2-byte header, the payload, and
+ * an optional MIC. The maximum payload is 251 bytes.
+ */
+uint8_t ble_phy_max_data_pdu_pyld(void);
+
+/* Gets the current access address */
+uint32_t ble_phy_access_addr_get(void);
+
+/* Enable encryption */
+void ble_phy_encrypt_enable(uint64_t pkt_counter, uint8_t *iv, uint8_t *key,
+                            uint8_t is_master);
+
+/* Disable encryption */
+void ble_phy_encrypt_disable(void);
+
+/* Set the packet counters and dir used by LE encyption */
+void ble_phy_encrypt_set_pkt_cntr(uint64_t pkt_counter, int dir);
+
+/* Enable phy resolving list */
+void ble_phy_resolv_list_enable(void);
+
+/* Disable phy resolving list */
+void ble_phy_resolv_list_disable(void);
+
+/*
+ * PHY mode values for 1M, 2M and Coded S=8 are the same as corresponding values
+ * of PHY. This makes conversion between 'phy' and 'phy_mode' easier and it also
+ * means that default coding for Coded will be S=8, unless explicitly translated
+ * to S=2.
+ */
+#define BLE_PHY_MODE_CODED_500KBPS  (0)
+#define BLE_PHY_MODE_1M             (1)
+#define BLE_PHY_MODE_2M             (2)
+#define BLE_PHY_MODE_CODED_125KBPS  (3)
+
+/* The number of different modes */
+#define BLE_PHY_NUM_MODE            (4)
+
+/* PHY numbers (compatible with HCI) */
+#define BLE_PHY_1M                  (BLE_HCI_LE_PHY_1M)
+#define BLE_PHY_2M                  (BLE_HCI_LE_PHY_2M)
+#define BLE_PHY_CODED               (BLE_HCI_LE_PHY_CODED)
+
+/* PHY bitmasks (compatible with HCI) */
+#define BLE_PHY_MASK_1M             (BLE_HCI_LE_PHY_1M_PREF_MASK)
+#define BLE_PHY_MASK_2M             (BLE_HCI_LE_PHY_2M_PREF_MASK)
+#define BLE_PHY_MASK_CODED          (BLE_HCI_LE_PHY_CODED_PREF_MASK)
+
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) || MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY))
+uint32_t ble_phy_mode_pdu_start_off(int phy);
+void ble_phy_mode_set(uint8_t tx_phy_mode, uint8_t rx_phy_mode);
+#else
+#define ble_phy_mode_pdu_start_off(phy)     (40)
+
+#endif
+
+int ble_phy_get_cur_phy(void);
+static inline int ble_ll_phy_to_phy_mode(int phy, int phy_options)
+{
+    int phy_mode;
+
+    /*
+     * 'phy' value can be used as 'phy_mode' value unless S=2 coding is explicitly
+     * required. By default we'll use S=2 for Coded.
+     */
+    phy_mode = phy;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    if (phy == BLE_PHY_CODED && phy_options == BLE_HCI_LE_PHY_CODED_S2_PREF) {
+        phy_mode = BLE_PHY_MODE_CODED_500KBPS;
+    }
+#endif
+
+    return phy_mode;
+}
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+void ble_phy_enable_dtm(void);
+void ble_phy_disable_dtm(void);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_PHY_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_phy_trace.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_phy_trace.h
new file mode 100644
index 000000000..c0dca7a0f
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/include/controller/ble_phy_trace.h
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_PHY_TRACE_
+#define H_BLE_PHY_TRACE_
+
+#include "nimble/porting/nimble/include/os/os_trace_api.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define BLE_PHY_TRACE_ID_START_TX       0
+#define BLE_PHY_TRACE_ID_START_RX       1
+#define BLE_PHY_TRACE_ID_DISABLE        2
+
+#if MYNEWT_VAL(BLE_PHY_SYSVIEW)
+
+extern uint32_t ble_phy_trace_off;
+
+void ble_phy_trace_init(void);
+
+static inline void
+ble_phy_trace_void(unsigned id)
+{
+    os_trace_api_void(ble_phy_trace_off + id);
+}
+
+static inline void
+ble_phy_trace_u32(unsigned id, uint32_t p1)
+{
+    os_trace_api_u32(ble_phy_trace_off + id, p1);
+}
+
+static inline void
+ble_phy_trace_u32x2(unsigned id, uint32_t p1, uint32_t p2)
+{
+    os_trace_api_u32x2(ble_phy_trace_off + id, p1, p2);
+}
+
+static inline void
+ble_phy_trace_u32x3(unsigned id, uint32_t p1, uint32_t p2, uint32_t p3)
+{
+    os_trace_api_u32x3(ble_phy_trace_off + id, p1, p2, p3);
+}
+
+#else
+
+static inline void
+ble_phy_trace_init(void)
+{
+}
+
+static inline void
+ble_phy_trace_void(unsigned id)
+{
+}
+
+static inline void
+ble_phy_trace_u32(unsigned id, uint32_t p1)
+{
+}
+
+static inline void
+ble_phy_trace_u32x2(unsigned id, uint32_t p1, uint32_t p2)
+{
+}
+
+static inline void
+ble_phy_trace_u32x3(unsigned id, uint32_t p1, uint32_t p2, uint32_t p3)
+{
+}
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_PHY_TRACE_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/pkg.yml
new file mode 100644
index 000000000..96c636798
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/pkg.yml
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/controller
+pkg.description: Controller side of the nimble Bluetooth Smart stack.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.req_apis:
+    - ble_driver
+    - ble_transport
+    - stats
+
+pkg.deps:
+    - "@apache-mynewt-core/kernel/os"
+    - nimble
+
+pkg.init:
+    ble_ll_init: 'MYNEWT_VAL(BLE_LL_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll.c
new file mode 100644
index 000000000..6a2ca63b9
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll.c
@@ -0,0 +1,1720 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/os/os_cputime.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "../include/controller/ble_hw.h"
+#include "../include/controller/ble_phy.h"
+#include "../include/controller/ble_phy_trace.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_whitelist.h"
+#include "../include/controller/ble_ll_resolv.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+#include "../include/controller/ble_ll_trace.h"
+#include "../include/controller/ble_ll_sync.h"
+#include "ble_ll_conn_priv.h"
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+#include "ble_ll_dtm_priv.h"
+#endif
+
+/* XXX:
+ *
+ * 1) use the sanity task!
+ * 2) Need to figure out what to do with packets that we hand up that did
+ * not pass the filter policy for the given state. Currently I count all
+ * packets I think. Need to figure out what to do with this.
+ * 3) For the features defined, we need to conditionally compile code.
+ * 4) Should look into always disabled the wfr interrupt if we receive the
+ * start of a frame. Need to look at the various states to see if this is the
+ * right thing to do.
+ */
+
+/* Supported states */
+#define BLE_LL_S_NCA                    (0x00000000001)
+#define BLE_LL_S_SA                     (0x00000000002)
+#define BLE_LL_S_CA                     (0x00000000004)
+#define BLE_LL_S_HDCA                   (0x00000000008)
+#define BLE_LL_S_PS                     (0x00000000010)
+#define BLE_LL_S_AS                     (0x00000000020)
+#define BLE_LL_S_INIT                   (0x00000000040)
+#define BLE_LL_S_SLAVE                  (0x00000000080)
+#define BLE_LL_S_NCA_PS                 (0x00000000100)
+#define BLE_LL_S_SA_PS                  (0x00000000200)
+#define BLE_LL_S_CA_PS                  (0x00000000400)
+#define BLE_LL_S_HDCA_PS                (0x00000000800)
+#define BLE_LL_S_NCA_AS                 (0x00000001000)
+#define BLE_LL_S_SA_AS                  (0x00000002000)
+#define BLE_LL_S_CA_AS                  (0x00000004000)
+#define BLE_LL_S_HDCA_AS                (0x00000008000)
+#define BLE_LL_S_NCA_INIT               (0x00000010000)
+#define BLE_LL_S_SA_INIT                (0x00000020000)
+#define BLE_LL_S_NCA_MASTER             (0x00000040000)
+#define BLE_LL_S_SA_MASTER              (0x00000080000)
+#define BLE_LL_S_NCA_SLAVE              (0x00000100000)
+#define BLE_LL_S_SA_SLAVE               (0x00000200000)
+#define BLE_LL_S_PS_INIT                (0x00000400000)
+#define BLE_LL_S_AS_INIT                (0x00000800000)
+#define BLE_LL_S_PS_MASTER              (0x00001000000)
+#define BLE_LL_S_AS_MASTER              (0x00002000000)
+#define BLE_LL_S_PS_SLAVE               (0x00004000000)
+#define BLE_LL_S_AS_SLAVE               (0x00008000000)
+#define BLE_LL_S_INIT_MASTER            (0x00010000000)
+#define BLE_LL_S_LDCA                   (0x00020000000)
+#define BLE_LL_S_LDCA_PS                (0x00040000000)
+#define BLE_LL_S_LDCA_AS                (0x00080000000)
+#define BLE_LL_S_CA_INIT                (0x00100000000)
+#define BLE_LL_S_HDCA_INIT              (0x00200000000)
+#define BLE_LL_S_LDCA_INIT              (0x00400000000)
+#define BLE_LL_S_CA_MASTER              (0x00800000000)
+#define BLE_LL_S_HDCA_MASTER            (0x01000000000)
+#define BLE_LL_S_LDCA_MASTER            (0x02000000000)
+#define BLE_LL_S_CA_SLAVE               (0x04000000000)
+#define BLE_LL_S_HDCA_SLAVE             (0x08000000000)
+#define BLE_LL_S_LDCA_SLAVE             (0x10000000000)
+#define BLE_LL_S_INIT_SLAVE             (0x20000000000)
+
+#define BLE_LL_SUPPORTED_STATES             \
+(                                           \
+    BLE_LL_S_NCA                    |       \
+    BLE_LL_S_SA                     |       \
+    BLE_LL_S_CA                     |       \
+    BLE_LL_S_HDCA                   |       \
+    BLE_LL_S_PS                     |       \
+    BLE_LL_S_AS                     |       \
+    BLE_LL_S_INIT                   |       \
+    BLE_LL_S_SLAVE                  |       \
+    BLE_LL_S_NCA_PS                 |       \
+    BLE_LL_S_SA_PS                  |       \
+    BLE_LL_S_CA_PS                  |       \
+    BLE_LL_S_HDCA_PS                |       \
+    BLE_LL_S_NCA_AS                 |       \
+    BLE_LL_S_SA_AS                  |       \
+    BLE_LL_S_CA_AS                  |       \
+    BLE_LL_S_HDCA_AS                |       \
+    BLE_LL_S_NCA_INIT               |       \
+    BLE_LL_S_SA_INIT                |       \
+    BLE_LL_S_NCA_MASTER             |       \
+    BLE_LL_S_SA_MASTER              |       \
+    BLE_LL_S_NCA_SLAVE              |       \
+    BLE_LL_S_SA_SLAVE               |       \
+    BLE_LL_S_PS_INIT                |       \
+    BLE_LL_S_AS_INIT                |       \
+    BLE_LL_S_PS_MASTER              |       \
+    BLE_LL_S_AS_MASTER              |       \
+    BLE_LL_S_PS_SLAVE               |       \
+    BLE_LL_S_AS_SLAVE               |       \
+    BLE_LL_S_INIT_MASTER            |       \
+    BLE_LL_S_LDCA                   |       \
+    BLE_LL_S_LDCA_PS                |       \
+    BLE_LL_S_LDCA_AS                |       \
+    BLE_LL_S_CA_INIT                |       \
+    BLE_LL_S_HDCA_INIT              |       \
+    BLE_LL_S_LDCA_INIT              |       \
+    BLE_LL_S_CA_MASTER              |       \
+    BLE_LL_S_HDCA_MASTER            |       \
+    BLE_LL_S_LDCA_MASTER            |       \
+    BLE_LL_S_CA_SLAVE               |       \
+    BLE_LL_S_HDCA_SLAVE             |       \
+    BLE_LL_S_LDCA_SLAVE             |       \
+    BLE_LL_S_INIT_SLAVE)
+
+/* The global BLE LL data object */
+struct ble_ll_obj g_ble_ll_data;
+
+/* Global link layer statistics */
+STATS_SECT_DECL(ble_ll_stats) ble_ll_stats;
+STATS_NAME_START(ble_ll_stats)
+    STATS_NAME(ble_ll_stats, hci_cmds)
+    STATS_NAME(ble_ll_stats, hci_cmd_errs)
+    STATS_NAME(ble_ll_stats, hci_events_sent)
+    STATS_NAME(ble_ll_stats, bad_ll_state)
+    STATS_NAME(ble_ll_stats, bad_acl_hdr)
+    STATS_NAME(ble_ll_stats, no_bufs)
+    STATS_NAME(ble_ll_stats, rx_adv_pdu_crc_ok)
+    STATS_NAME(ble_ll_stats, rx_adv_pdu_crc_err)
+    STATS_NAME(ble_ll_stats, rx_adv_bytes_crc_ok)
+    STATS_NAME(ble_ll_stats, rx_adv_bytes_crc_err)
+    STATS_NAME(ble_ll_stats, rx_data_pdu_crc_ok)
+    STATS_NAME(ble_ll_stats, rx_data_pdu_crc_err)
+    STATS_NAME(ble_ll_stats, rx_data_bytes_crc_ok)
+    STATS_NAME(ble_ll_stats, rx_data_bytes_crc_err)
+    STATS_NAME(ble_ll_stats, rx_adv_malformed_pkts)
+    STATS_NAME(ble_ll_stats, rx_adv_ind)
+    STATS_NAME(ble_ll_stats, rx_adv_direct_ind)
+    STATS_NAME(ble_ll_stats, rx_adv_nonconn_ind)
+    STATS_NAME(ble_ll_stats, rx_adv_ext_ind)
+    STATS_NAME(ble_ll_stats, rx_scan_reqs)
+    STATS_NAME(ble_ll_stats, rx_scan_rsps)
+    STATS_NAME(ble_ll_stats, rx_connect_reqs)
+    STATS_NAME(ble_ll_stats, rx_scan_ind)
+    STATS_NAME(ble_ll_stats, rx_aux_connect_rsp)
+    STATS_NAME(ble_ll_stats, adv_txg)
+    STATS_NAME(ble_ll_stats, adv_late_starts)
+    STATS_NAME(ble_ll_stats, adv_resched_pdu_fail)
+    STATS_NAME(ble_ll_stats, adv_drop_event)
+    STATS_NAME(ble_ll_stats, sched_state_conn_errs)
+    STATS_NAME(ble_ll_stats, sched_state_adv_errs)
+    STATS_NAME(ble_ll_stats, scan_starts)
+    STATS_NAME(ble_ll_stats, scan_stops)
+    STATS_NAME(ble_ll_stats, scan_req_txf)
+    STATS_NAME(ble_ll_stats, scan_req_txg)
+    STATS_NAME(ble_ll_stats, scan_rsp_txg)
+    STATS_NAME(ble_ll_stats, aux_missed_adv)
+    STATS_NAME(ble_ll_stats, aux_scheduled)
+    STATS_NAME(ble_ll_stats, aux_received)
+    STATS_NAME(ble_ll_stats, aux_fired_for_read)
+    STATS_NAME(ble_ll_stats, aux_allocated)
+    STATS_NAME(ble_ll_stats, aux_freed)
+    STATS_NAME(ble_ll_stats, aux_sched_cb)
+    STATS_NAME(ble_ll_stats, aux_conn_req_tx)
+    STATS_NAME(ble_ll_stats, aux_conn_rsp_tx)
+    STATS_NAME(ble_ll_stats, aux_conn_rsp_err)
+    STATS_NAME(ble_ll_stats, aux_scan_req_tx)
+    STATS_NAME(ble_ll_stats, aux_scan_rsp_err)
+    STATS_NAME(ble_ll_stats, aux_chain_cnt)
+    STATS_NAME(ble_ll_stats, aux_chain_err)
+    STATS_NAME(ble_ll_stats, aux_scan_drop)
+    STATS_NAME(ble_ll_stats, adv_evt_dropped)
+    STATS_NAME(ble_ll_stats, scan_timer_stopped)
+    STATS_NAME(ble_ll_stats, scan_timer_restarted)
+    STATS_NAME(ble_ll_stats, periodic_adv_drop_event)
+    STATS_NAME(ble_ll_stats, periodic_chain_drop_event)
+    STATS_NAME(ble_ll_stats, sync_event_failed)
+    STATS_NAME(ble_ll_stats, sync_received)
+    STATS_NAME(ble_ll_stats, sync_chain_failed)
+    STATS_NAME(ble_ll_stats, sync_missed_err)
+    STATS_NAME(ble_ll_stats, sync_crc_err)
+    STATS_NAME(ble_ll_stats, sync_rx_buf_err)
+    STATS_NAME(ble_ll_stats, sync_scheduled)
+    STATS_NAME(ble_ll_stats, sched_state_sync_errs)
+    STATS_NAME(ble_ll_stats, sched_invalid_pdu)
+STATS_NAME_END(ble_ll_stats)
+
+static void ble_ll_event_rx_pkt(struct ble_npl_event *ev);
+static void ble_ll_event_tx_pkt(struct ble_npl_event *ev);
+static void ble_ll_event_dbuf_overflow(struct ble_npl_event *ev);
+
+#if MYNEWT
+
+/* The BLE LL task data structure */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define BLE_LL_STACK_SIZE   (120)
+#else
+#define BLE_LL_STACK_SIZE   (90)
+#endif
+
+struct os_task g_ble_ll_task;
+
+OS_TASK_STACK_DEFINE(g_ble_ll_stack, BLE_LL_STACK_SIZE);
+
+#endif /* MYNEWT */
+
+/** Our global device address (public) */
+uint8_t g_dev_addr[BLE_DEV_ADDR_LEN];
+
+/** Our random address */
+uint8_t g_random_addr[BLE_DEV_ADDR_LEN];
+
+/** Our supported features which can be controller by the host */
+uint64_t g_ble_ll_supported_host_features = 0;
+
+static const uint16_t g_ble_ll_pdu_header_tx_time[BLE_PHY_NUM_MODE] =
+{
+    [BLE_PHY_MODE_1M] =
+            (BLE_LL_PREAMBLE_LEN + BLE_LL_ACC_ADDR_LEN + BLE_LL_CRC_LEN +
+                    BLE_LL_PDU_HDR_LEN) << 3,
+    [BLE_PHY_MODE_2M] =
+            (BLE_LL_PREAMBLE_LEN * 2 + BLE_LL_ACC_ADDR_LEN + BLE_LL_CRC_LEN +
+                    BLE_LL_PDU_HDR_LEN) << 2,
+    /* For Coded PHY we have exact TX times provided by specification:
+     * - Preamble, Access Address, CI, TERM1 (always coded as S=8)
+     * - PDU, CRC, TERM2 (coded as S=2 or S=8)
+     * (Vol 6, Part B, 2.2).
+     */
+    [BLE_PHY_MODE_CODED_125KBPS] =
+            (80 + 256 + 16 + 24 + 8 * (BLE_LL_PDU_HDR_LEN * 8 + 24 + 3)),
+    [BLE_PHY_MODE_CODED_500KBPS] =
+            (80 + 256 + 16 + 24 + 2 * (BLE_LL_PDU_HDR_LEN * 8 + 24 + 3)),
+};
+
+/**
+ * Counts the number of advertising PDU's received, by type. For advertising
+ * PDU's that contain a destination address, we still count these packets even
+ * if they are not for us.
+ *
+ * @param pdu_type
+ */
+static void
+ble_ll_count_rx_adv_pdus(uint8_t pdu_type)
+{
+    /* Count received packet types  */
+    switch (pdu_type) {
+    case BLE_ADV_PDU_TYPE_ADV_EXT_IND:
+        STATS_INC(ble_ll_stats, rx_adv_ext_ind);
+        break;
+    case BLE_ADV_PDU_TYPE_ADV_IND:
+        STATS_INC(ble_ll_stats, rx_adv_ind);
+        break;
+    case BLE_ADV_PDU_TYPE_ADV_DIRECT_IND:
+        STATS_INC(ble_ll_stats, rx_adv_direct_ind);
+        break;
+    case BLE_ADV_PDU_TYPE_ADV_NONCONN_IND:
+        STATS_INC(ble_ll_stats, rx_adv_nonconn_ind);
+        break;
+    case BLE_ADV_PDU_TYPE_SCAN_REQ:
+        STATS_INC(ble_ll_stats, rx_scan_reqs);
+        break;
+    case BLE_ADV_PDU_TYPE_SCAN_RSP:
+        STATS_INC(ble_ll_stats, rx_scan_rsps);
+        break;
+    case BLE_ADV_PDU_TYPE_CONNECT_IND:
+        STATS_INC(ble_ll_stats, rx_connect_reqs);
+        break;
+    case BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP:
+        STATS_INC(ble_ll_stats, rx_aux_connect_rsp);
+        break;
+    case BLE_ADV_PDU_TYPE_ADV_SCAN_IND:
+        STATS_INC(ble_ll_stats, rx_scan_ind);
+        break;
+    default:
+        break;
+    }
+}
+
+struct os_mbuf *
+ble_ll_rxpdu_alloc(uint16_t len)
+{
+    struct os_mbuf *om_ret;
+    struct os_mbuf *om_next;
+    struct os_mbuf *om;
+    struct os_mbuf_pkthdr *pkthdr;
+    uint16_t databuf_len;
+    int rem_len;
+
+    /*
+     * Make sure that data in mbuf are word-aligned with and without packet
+     * header. This is essential for proper and quick copying of received PDUs
+     * into mbufs.
+     */
+    _Static_assert((offsetof(struct os_mbuf, om_data) & 3) == 0,
+                   "Unaligned om_data");
+    _Static_assert(((offsetof(struct os_mbuf, om_data) +
+                     sizeof(struct os_mbuf_pkthdr) +
+                     sizeof(struct ble_mbuf_hdr)) & 3) == 0,
+                   "Unaligned data trailing packet header");
+
+    om_ret = os_msys_get_pkthdr(len, sizeof(struct ble_mbuf_hdr));
+    if (!om_ret) {
+        goto rxpdu_alloc_fail;
+    }
+
+    /* Set complete PDU length in packet header */
+    pkthdr = OS_MBUF_PKTHDR(om_ret);
+    pkthdr->omp_len = len;
+
+    rem_len = len;
+
+    /*
+     * Calculate length of data in memory block. We assume length is rounded
+     * down to word size so PHY can do word-size aligned data copy to mbufs
+     * (except for last one) and leave remainder unused.
+     *
+     * Note that there likely won't be any remainder here since all pools have
+     * block size aligned to word size anyway.
+     */
+    databuf_len = om_ret->om_omp->omp_databuf_len & ~3;
+
+    /*
+     * First mbuf can store less data due to packet header. Also we reserve one
+     * word for leading space to prepend header when necessary (like for data
+     * PDU before handing over to HCI)
+     */
+    om_ret->om_data += 4;
+    rem_len -= databuf_len - om_ret->om_pkthdr_len - 4;
+
+    /* Allocate and chain mbufs until there's enough space to store complete PDU */
+    om = om_ret;
+    while (rem_len > 0) {
+        om_next = os_msys_get(rem_len, 0);
+        if (!om_next) {
+            os_mbuf_free_chain(om_ret);
+            goto rxpdu_alloc_fail;
+        }
+
+        SLIST_NEXT(om, om_next) = om_next;
+        om = om_next;
+
+        rem_len -= databuf_len;
+    }
+
+    return om_ret;
+
+rxpdu_alloc_fail:
+    STATS_INC(ble_ll_stats, no_bufs);
+    return NULL;
+}
+
+int
+ble_ll_chk_txrx_octets(uint16_t octets)
+{
+    int rc;
+
+    if ((octets < BLE_LL_CONN_SUPP_BYTES_MIN) ||
+        (octets > BLE_LL_CONN_SUPP_BYTES_MAX)) {
+        rc = 0;
+    } else {
+        rc = 1;
+    }
+
+    return rc;
+}
+
+int
+ble_ll_chk_txrx_time(uint16_t time)
+{
+    int rc;
+
+    if ((time < BLE_LL_CONN_SUPP_TIME_MIN) ||
+        (time > BLE_LL_CONN_SUPP_TIME_MAX)) {
+        rc = 0;
+    } else {
+        rc = 1;
+    }
+
+    return rc;
+}
+
+/**
+ * Checks to see if the address is a resolvable private address.
+ *
+ * NOTE: the addr_type parameter will be 0 if the address is public;
+ * any other value is random (all non-zero values).
+ *
+ * @param addr
+ * @param addr_type Public (zero) or Random (non-zero) address
+ *
+ * @return int
+ */
+int
+ble_ll_is_rpa(const uint8_t *addr, uint8_t addr_type)
+{
+    int rc;
+
+    if (addr_type && ((addr[5] & 0xc0) == 0x40)) {
+        rc = 1;
+    } else {
+        rc = 0;
+    }
+    return rc;
+}
+
+int
+ble_ll_addr_is_id(uint8_t *addr, uint8_t addr_type)
+{
+    return !addr_type || ((addr[5] & 0xc0) == 0xc0);
+}
+
+int
+ble_ll_addr_subtype(const uint8_t *addr, uint8_t addr_type)
+{
+    if (!addr_type) {
+        return BLE_LL_ADDR_SUBTYPE_IDENTITY;
+    }
+
+    switch (addr[5] >> 6) {
+    case 0:
+        return BLE_LL_ADDR_SUBTYPE_NRPA; /* NRPA */
+    case 1:
+        return BLE_LL_ADDR_SUBTYPE_RPA; /* RPA */
+    default:
+        return BLE_LL_ADDR_SUBTYPE_IDENTITY; /* static random */
+    }
+}
+
+int
+ble_ll_is_valid_public_addr(const uint8_t *addr)
+{
+    int i;
+
+    for (i = 0; i < BLE_DEV_ADDR_LEN; ++i) {
+        if (addr[i]) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+/* Checks to see that the device is a valid random address */
+int
+ble_ll_is_valid_random_addr(const uint8_t *addr)
+{
+    int i;
+    int rc;
+    uint16_t sum;
+    uint8_t addr_type;
+
+    /* Make sure all bits are neither one nor zero */
+    sum = 0;
+    for (i = 0; i < (BLE_DEV_ADDR_LEN -1); ++i) {
+        sum += addr[i];
+    }
+    sum += addr[5] & 0x3f;
+
+    if ((sum == 0) || (sum == ((5*255) + 0x3f))) {
+        return 0;
+    }
+
+    /* Get the upper two bits of the address */
+    rc = 1;
+    addr_type = addr[5] & 0xc0;
+    if (addr_type == 0xc0) {
+        /* Static random address. No other checks needed */
+    } else if (addr_type == 0x40) {
+        /* Resolvable */
+        sum = addr[3] + addr[4] + (addr[5] & 0x3f);
+        if ((sum == 0) || (sum == (255 + 255 + 0x3f))) {
+            rc = 0;
+        }
+    } else if (addr_type == 0) {
+        /* non-resolvable. Cant be equal to public */
+        if (!memcmp(g_dev_addr, addr, BLE_DEV_ADDR_LEN)) {
+            rc = 0;
+        }
+    } else {
+        /* Invalid upper two bits */
+        rc = 0;
+    }
+
+    return rc;
+}
+int
+ble_ll_is_valid_own_addr_type(uint8_t own_addr_type, const uint8_t *random_addr)
+{
+    int rc;
+
+    switch (own_addr_type) {
+    case BLE_HCI_ADV_OWN_ADDR_PUBLIC:
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    case BLE_HCI_ADV_OWN_ADDR_PRIV_PUB:
+#endif
+        rc = ble_ll_is_valid_public_addr(g_dev_addr);
+        break;
+    case BLE_HCI_ADV_OWN_ADDR_RANDOM:
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    case BLE_HCI_ADV_OWN_ADDR_PRIV_RAND:
+#endif
+        rc = ble_ll_is_valid_random_addr(random_addr);
+        break;
+    default:
+        rc = 0;
+        break;
+    }
+
+    return rc;
+}
+
+int
+ble_ll_set_public_addr(const uint8_t *addr)
+{
+    memcpy(g_dev_addr, addr, BLE_DEV_ADDR_LEN);
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Called from the HCI command parser when the set random address command
+ * is received.
+ *
+ * Context: Link Layer task (HCI command parser)
+ *
+ * @param addr Pointer to address
+ *
+ * @return int 0: success
+ */
+int
+ble_ll_set_random_addr(const uint8_t *cmdbuf, uint8_t len, bool hci_adv_ext)
+{
+    const struct ble_hci_le_set_rand_addr_cp *cmd = (const void *) cmdbuf;
+
+    if (len < sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* If the Host issues this command when scanning or legacy advertising is
+     * enabled, the Controller shall return the error code Command Disallowed.
+     *
+     * Test specification extends this also to initiating.
+     */
+
+    if (g_ble_ll_conn_create_sm || ble_ll_scan_enabled() ||
+                                (!hci_adv_ext && ble_ll_adv_enabled())) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if (!ble_ll_is_valid_random_addr(cmd->addr)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    memcpy(g_random_addr, cmd->addr, BLE_DEV_ADDR_LEN);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* For instance 0 we need same address if legacy advertising might be
+     * used. If extended advertising is in use than this command doesn't
+     * affect instance 0.
+     */
+    if (!hci_adv_ext)
+        ble_ll_adv_set_random_addr(cmd->addr, 0);
+#endif
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Checks to see if an address is our device address (either public or
+ * random)
+ *
+ * @param addr
+ * @param addr_type
+ *
+ * @return int 0: not our device address. 1: is our device address
+ */
+int
+ble_ll_is_our_devaddr(uint8_t *addr, int addr_type)
+{
+    int rc;
+    uint8_t *our_addr;
+
+    if (addr_type) {
+        our_addr = g_random_addr;
+    } else {
+        our_addr = g_dev_addr;
+    }
+
+    rc = 0;
+    if (!memcmp(our_addr, addr, BLE_DEV_ADDR_LEN)) {
+        rc = 1;
+    }
+
+    return rc;
+}
+
+/**
+ * Get identity address
+ *
+ * @param addr_type Random (1). Public(0)
+ *
+ * @return pointer to identity address of given type.
+ */
+uint8_t*
+ble_ll_get_our_devaddr(uint8_t addr_type)
+{
+    if (addr_type) {
+        return g_random_addr;
+    }
+
+    return g_dev_addr;
+}
+
+/**
+ * Wait for response timeout function
+ *
+ * Context: interrupt (ble scheduler)
+ *
+ * @param arg
+ */
+void
+ble_ll_wfr_timer_exp(void *arg)
+{
+    int rx_start;
+    uint8_t lls;
+
+    rx_start = ble_phy_rx_started();
+    lls = g_ble_ll_data.ll_state;
+
+    ble_ll_trace_u32x3(BLE_LL_TRACE_ID_WFR_EXP, lls, ble_phy_xcvr_state_get(),
+                       (uint32_t)rx_start);
+
+    /* If we have started a reception, there is nothing to do here */
+    if (!rx_start) {
+        switch (lls) {
+        case BLE_LL_STATE_ADV:
+            ble_ll_adv_wfr_timer_exp();
+            break;
+        case BLE_LL_STATE_CONNECTION:
+            ble_ll_conn_wfr_timer_exp();
+            break;
+        case BLE_LL_STATE_SCANNING:
+            ble_ll_scan_wfr_timer_exp();
+            break;
+        case BLE_LL_STATE_INITIATING:
+            ble_ll_conn_init_wfr_timer_exp();
+            break;
+#if MYNEWT_VAL(BLE_LL_DTM)
+        case BLE_LL_STATE_DTM:
+            ble_ll_dtm_wfr_timer_exp();
+            break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+        case BLE_LL_STATE_SYNC:
+            ble_ll_sync_wfr_timer_exp();
+            break;
+#endif
+        default:
+            break;
+        }
+    }
+}
+
+/**
+ * ll tx pkt in proc
+ *
+ * Process ACL data packet input from host
+ *
+ * Context: Link layer task
+ *
+ */
+static void
+ble_ll_tx_pkt_in(void)
+{
+    uint16_t handle;
+    uint16_t length;
+    uint16_t pb;
+    struct os_mbuf_pkthdr *pkthdr;
+    struct os_mbuf *om;
+
+    /* Drain all packets off the queue */
+    while (STAILQ_FIRST(&g_ble_ll_data.ll_tx_pkt_q)) {
+        /* Get mbuf pointer from packet header pointer */
+        pkthdr = STAILQ_FIRST(&g_ble_ll_data.ll_tx_pkt_q);
+        om = (struct os_mbuf *)((uint8_t *)pkthdr - sizeof(struct os_mbuf));
+
+        /* Remove from queue */
+        STAILQ_REMOVE_HEAD(&g_ble_ll_data.ll_tx_pkt_q, omp_next);
+
+        /* Strip HCI ACL header to get handle and length */
+        handle = get_le16(om->om_data);
+        length = get_le16(om->om_data + 2);
+        os_mbuf_adj(om, sizeof(struct hci_data_hdr));
+
+        /* Do some basic error checking */
+        pb = handle & 0x3000;
+        if ((pkthdr->omp_len != length) || (pb > 0x1000) || (length == 0)) {
+            /* This is a bad ACL packet. Count a stat and free it */
+            STATS_INC(ble_ll_stats, bad_acl_hdr);
+            os_mbuf_free_chain(om);
+            continue;
+        }
+
+        /* Hand to connection state machine */
+        ble_ll_conn_tx_pkt_in(om, handle, length);
+    }
+}
+
+/**
+ * Count Link Layer statistics for received PDUs
+ *
+ * Context: Link layer task
+ *
+ * @param hdr
+ * @param len
+ */
+static void
+ble_ll_count_rx_stats(struct ble_mbuf_hdr *hdr, uint16_t len, uint8_t pdu_type)
+{
+    uint8_t crcok;
+    bool connection_data;
+
+    crcok = BLE_MBUF_HDR_CRC_OK(hdr);
+    connection_data = (BLE_MBUF_HDR_RX_STATE(hdr) == BLE_LL_STATE_CONNECTION);
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+    /* Reuse connection stats for DTM */
+    if (!connection_data) {
+        connection_data = (BLE_MBUF_HDR_RX_STATE(hdr) == BLE_LL_STATE_DTM);
+    }
+#endif
+
+    if (crcok) {
+        if (connection_data) {
+            STATS_INC(ble_ll_stats, rx_data_pdu_crc_ok);
+            STATS_INCN(ble_ll_stats, rx_data_bytes_crc_ok, len);
+        } else {
+            STATS_INC(ble_ll_stats, rx_adv_pdu_crc_ok);
+            STATS_INCN(ble_ll_stats, rx_adv_bytes_crc_ok, len);
+            ble_ll_count_rx_adv_pdus(pdu_type);
+        }
+    } else {
+        if (connection_data) {
+            STATS_INC(ble_ll_stats, rx_data_pdu_crc_err);
+            STATS_INCN(ble_ll_stats, rx_data_bytes_crc_err, len);
+        } else {
+            STATS_INC(ble_ll_stats, rx_adv_pdu_crc_err);
+            STATS_INCN(ble_ll_stats, rx_adv_bytes_crc_err, len);
+        }
+    }
+}
+
+/**
+ * ll rx pkt in
+ *
+ * Process received packet from PHY.
+ *
+ * Context: Link layer task
+ *
+ */
+static void
+ble_ll_rx_pkt_in(void)
+{
+    os_sr_t sr;
+    uint8_t pdu_type;
+    uint8_t *rxbuf;
+    struct os_mbuf_pkthdr *pkthdr;
+    struct ble_mbuf_hdr *ble_hdr;
+    struct os_mbuf *m;
+
+    /* Drain all packets off the queue */
+    while (STAILQ_FIRST(&g_ble_ll_data.ll_rx_pkt_q)) {
+        /* Get mbuf pointer from packet header pointer */
+        pkthdr = STAILQ_FIRST(&g_ble_ll_data.ll_rx_pkt_q);
+        m = (struct os_mbuf *)((uint8_t *)pkthdr - sizeof(struct os_mbuf));
+
+        /* Remove from queue */
+        OS_ENTER_CRITICAL(sr);
+        STAILQ_REMOVE_HEAD(&g_ble_ll_data.ll_rx_pkt_q, omp_next);
+        OS_EXIT_CRITICAL(sr);
+
+        /* Note: pdu type wont get used unless this is an advertising pdu */
+        ble_hdr = BLE_MBUF_HDR_PTR(m);
+        rxbuf = m->om_data;
+        pdu_type = rxbuf[0] & BLE_ADV_PDU_HDR_TYPE_MASK;
+        ble_ll_count_rx_stats(ble_hdr, pkthdr->omp_len, pdu_type);
+
+        /* Process the data or advertising pdu */
+        /* Process the PDU */
+        switch (BLE_MBUF_HDR_RX_STATE(ble_hdr)) {
+        case BLE_LL_STATE_CONNECTION:
+            ble_ll_conn_rx_data_pdu(m, ble_hdr);
+            /* m is going to be free by function above */
+            m = NULL;
+            break;
+        case BLE_LL_STATE_ADV:
+            ble_ll_adv_rx_pkt_in(pdu_type, rxbuf, ble_hdr);
+            break;
+        case BLE_LL_STATE_SCANNING:
+            ble_ll_scan_rx_pkt_in(pdu_type, m, ble_hdr);
+            break;
+        case BLE_LL_STATE_INITIATING:
+            ble_ll_init_rx_pkt_in(pdu_type, rxbuf, ble_hdr);
+            break;
+#if MYNEWT_VAL(BLE_LL_DTM)
+        case BLE_LL_STATE_DTM:
+            ble_ll_dtm_rx_pkt_in(m, ble_hdr);
+            break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+        case BLE_LL_STATE_SYNC:
+            ble_ll_sync_rx_pkt_in(m, ble_hdr);
+            break;
+#endif
+        default:
+            /* Any other state should never occur */
+            STATS_INC(ble_ll_stats, bad_ll_state);
+            break;
+        }
+        if (m) {
+            /* Free the packet buffer */
+            os_mbuf_free_chain(m);
+        }
+    }
+}
+
+/**
+ * Called to put a packet on the Link Layer receive packet queue.
+ *
+ * @param rxpdu Pointer to received PDU
+ */
+void
+ble_ll_rx_pdu_in(struct os_mbuf *rxpdu)
+{
+    struct os_mbuf_pkthdr *pkthdr;
+
+    pkthdr = OS_MBUF_PKTHDR(rxpdu);
+    STAILQ_INSERT_TAIL(&g_ble_ll_data.ll_rx_pkt_q, pkthdr, omp_next);
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &g_ble_ll_data.ll_rx_pkt_ev);
+}
+
+/**
+ * Called to put a packet on the Link Layer transmit packet queue.
+ *
+ * @param txpdu Pointer to transmit packet
+ */
+void
+ble_ll_acl_data_in(struct os_mbuf *txpkt)
+{
+    os_sr_t sr;
+    struct os_mbuf_pkthdr *pkthdr;
+
+    pkthdr = OS_MBUF_PKTHDR(txpkt);
+    OS_ENTER_CRITICAL(sr);
+    STAILQ_INSERT_TAIL(&g_ble_ll_data.ll_tx_pkt_q, pkthdr, omp_next);
+    OS_EXIT_CRITICAL(sr);
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &g_ble_ll_data.ll_tx_pkt_ev);
+}
+
+/**
+ * Called to post event to Link Layer when a data buffer overflow has
+ * occurred.
+ *
+ * Context: Interrupt
+ *
+ */
+void
+ble_ll_data_buffer_overflow(void)
+{
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &g_ble_ll_data.ll_dbuf_overflow_ev);
+}
+
+/**
+ * Called when a HW error occurs.
+ *
+ * Context: Interrupt
+ */
+void
+ble_ll_hw_error(void)
+{
+    ble_npl_callout_reset(&g_ble_ll_data.ll_hw_err_timer, 0);
+}
+
+/**
+ * Called when the HW error timer expires.
+ *
+ * @param arg
+ */
+static void
+ble_ll_hw_err_timer_cb(struct ble_npl_event *ev)
+{
+    if (ble_ll_hci_ev_hw_err(BLE_HW_ERR_HCI_SYNC_LOSS)) {
+        /*
+         * Restart callout if failed to allocate event. Try to allocate an
+         * event every 50 milliseconds (or each OS tick if a tick is longer
+         * than 100 msecs).
+         */
+        ble_npl_callout_reset(&g_ble_ll_data.ll_hw_err_timer,
+                         ble_npl_time_ms_to_ticks32(50));
+    }
+}
+
+/**
+ * Called upon start of received PDU
+ *
+ * Context: Interrupt
+ *
+ * @param rxpdu
+ *        chan
+ *
+ * @return int
+ *   < 0: A frame we dont want to receive.
+ *   = 0: Continue to receive frame. Dont go from rx to tx
+ *   > 0: Continue to receive frame and go from rx to tx when done
+ */
+int
+ble_ll_rx_start(uint8_t *rxbuf, uint8_t chan, struct ble_mbuf_hdr *rxhdr)
+{
+    int rc;
+    uint8_t pdu_type;
+
+    /* Advertising channel PDU */
+    pdu_type = rxbuf[0] & BLE_ADV_PDU_HDR_TYPE_MASK;
+
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_RX_START, g_ble_ll_data.ll_state,
+                       pdu_type);
+
+    switch (g_ble_ll_data.ll_state) {
+    case BLE_LL_STATE_CONNECTION:
+        rc = ble_ll_conn_rx_isr_start(rxhdr, ble_phy_access_addr_get());
+        break;
+    case BLE_LL_STATE_ADV:
+        rc = ble_ll_adv_rx_isr_start(pdu_type);
+        break;
+    case BLE_LL_STATE_INITIATING:
+        rc = ble_ll_init_rx_isr_start(pdu_type, rxhdr);
+        break;
+    case BLE_LL_STATE_SCANNING:
+        rc = ble_ll_scan_rx_isr_start(pdu_type, &rxhdr->rxinfo.flags);
+        break;
+#if MYNEWT_VAL(BLE_LL_DTM)
+    case BLE_LL_STATE_DTM:
+        rc = ble_ll_dtm_rx_isr_start(rxhdr, ble_phy_access_addr_get());
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    case BLE_LL_STATE_SYNC:
+        rc = ble_ll_sync_rx_isr_start(pdu_type, rxhdr);
+        break;
+#endif
+    default:
+        /* Should not be in this state! */
+        rc = -1;
+        STATS_INC(ble_ll_stats, bad_ll_state);
+        break;
+    }
+
+    return rc;
+}
+
+/**
+ * Called by the PHY when a receive packet has ended.
+ *
+ * NOTE: Called from interrupt context!
+ *
+ * @param rxbuf Pointer to received PDU data
+ *        rxhdr Pointer to BLE header of received mbuf
+ *
+ * @return int
+ *       < 0: Disable the phy after reception.
+ *      == 0: Success. Do not disable the PHY.
+ *       > 0: Do not disable PHY as that has already been done.
+ */
+int
+ble_ll_rx_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr)
+{
+    int rc;
+    int badpkt;
+    uint8_t pdu_type;
+    uint8_t len;
+    uint8_t crcok;
+    struct os_mbuf *rxpdu;
+
+    /* Get CRC status from BLE header */
+    crcok = BLE_MBUF_HDR_CRC_OK(rxhdr);
+
+    /* Get advertising PDU type and length */
+    pdu_type = rxbuf[0] & BLE_ADV_PDU_HDR_TYPE_MASK;
+    len = rxbuf[1];
+
+    ble_ll_trace_u32x3(BLE_LL_TRACE_ID_RX_END, pdu_type, len,
+                       rxhdr->rxinfo.flags);
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+    if (BLE_MBUF_HDR_RX_STATE(rxhdr) == BLE_LL_STATE_DTM) {
+        rc = ble_ll_dtm_rx_isr_end(rxbuf, rxhdr);
+        return rc;
+    }
+#endif
+
+    if (BLE_MBUF_HDR_RX_STATE(rxhdr) == BLE_LL_STATE_CONNECTION) {
+        rc = ble_ll_conn_rx_isr_end(rxbuf, rxhdr);
+        return rc;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    if (BLE_MBUF_HDR_RX_STATE(rxhdr) == BLE_LL_STATE_SYNC) {
+        rc = ble_ll_sync_rx_isr_end(rxbuf, rxhdr);
+        return rc;
+    }
+#endif
+
+    /* If the CRC checks, make sure lengths check! */
+    badpkt = 0;
+    if (crcok) {
+        switch (pdu_type) {
+        case BLE_ADV_PDU_TYPE_SCAN_REQ:
+        case BLE_ADV_PDU_TYPE_ADV_DIRECT_IND:
+            if (len != BLE_SCAN_REQ_LEN) {
+                badpkt = 1;
+            }
+            break;
+        case BLE_ADV_PDU_TYPE_SCAN_RSP:
+        case BLE_ADV_PDU_TYPE_ADV_IND:
+        case BLE_ADV_PDU_TYPE_ADV_SCAN_IND:
+        case BLE_ADV_PDU_TYPE_ADV_NONCONN_IND:
+            if ((len < BLE_DEV_ADDR_LEN) || (len > BLE_ADV_SCAN_IND_MAX_LEN)) {
+                badpkt = 1;
+            }
+            break;
+        case BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP:
+            break;
+        case BLE_ADV_PDU_TYPE_ADV_EXT_IND:
+            break;
+        case BLE_ADV_PDU_TYPE_CONNECT_IND:
+            if (len != BLE_CONNECT_REQ_LEN) {
+                badpkt = 1;
+            }
+            break;
+        default:
+            badpkt = 1;
+            break;
+        }
+
+        /* If this is a malformed packet, just kill it here */
+        if (badpkt) {
+            STATS_INC(ble_ll_stats, rx_adv_malformed_pkts);
+        }
+    }
+
+    /* Hand packet to the appropriate state machine (if crc ok) */
+    rxpdu = NULL;
+    switch (BLE_MBUF_HDR_RX_STATE(rxhdr)) {
+    case BLE_LL_STATE_ADV:
+        if (!badpkt) {
+            rxpdu = ble_ll_rxpdu_alloc(len + BLE_LL_PDU_HDR_LEN);
+            if (rxpdu) {
+                ble_phy_rxpdu_copy(rxbuf, rxpdu);
+            }
+        }
+        rc = ble_ll_adv_rx_isr_end(pdu_type, rxpdu, crcok);
+        break;
+    case BLE_LL_STATE_SCANNING:
+        if (!badpkt) {
+            rxpdu = ble_ll_rxpdu_alloc(len + BLE_LL_PDU_HDR_LEN);
+            if (rxpdu) {
+                ble_phy_rxpdu_copy(rxbuf, rxpdu);
+            }
+        }
+        rc = ble_ll_scan_rx_isr_end(rxpdu, crcok);
+        break;
+    case BLE_LL_STATE_INITIATING:
+        rc = ble_ll_init_rx_isr_end(rxbuf, crcok, rxhdr);
+        break;
+    default:
+        rc = -1;
+        STATS_INC(ble_ll_stats, bad_ll_state);
+        break;
+    }
+
+    /* Hand packet up to higher layer (regardless of CRC failure) */
+    if (rxpdu) {
+        ble_ll_rx_pdu_in(rxpdu);
+    }
+
+    return rc;
+}
+
+uint8_t
+ble_ll_tx_mbuf_pducb(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct os_mbuf *txpdu;
+    struct ble_mbuf_hdr *ble_hdr;
+
+    txpdu = pducb_arg;
+    BLE_LL_ASSERT(txpdu);
+    ble_hdr = BLE_MBUF_HDR_PTR(txpdu);
+
+    os_mbuf_copydata(txpdu, ble_hdr->txinfo.offset, ble_hdr->txinfo.pyld_len,
+                     dptr);
+
+    *hdr_byte = ble_hdr->txinfo.hdr_byte;
+
+    return ble_hdr->txinfo.pyld_len;
+}
+
+uint8_t
+ble_ll_tx_flat_mbuf_pducb(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct os_mbuf *txpdu;
+    struct ble_mbuf_hdr *ble_hdr;
+
+    txpdu = pducb_arg;
+    BLE_LL_ASSERT(txpdu);
+    ble_hdr = BLE_MBUF_HDR_PTR(txpdu);
+
+    memcpy(dptr, txpdu->om_data, ble_hdr->txinfo.pyld_len);
+
+    *hdr_byte = ble_hdr->txinfo.hdr_byte;
+
+    return ble_hdr->txinfo.pyld_len;
+}
+
+static void
+ble_ll_event_rx_pkt(struct ble_npl_event *ev)
+{
+    ble_ll_rx_pkt_in();
+}
+
+static void
+ble_ll_event_tx_pkt(struct ble_npl_event *ev)
+{
+    ble_ll_tx_pkt_in();
+}
+
+static void
+ble_ll_event_dbuf_overflow(struct ble_npl_event *ev)
+{
+    ble_ll_hci_ev_databuf_overflow();
+}
+
+static void
+ble_ll_event_comp_pkts(struct ble_npl_event *ev)
+{
+    ble_ll_conn_num_comp_pkts_event_send(NULL);
+}
+
+/**
+ * Link Layer task.
+ *
+ * This is the task that runs the Link Layer.
+ *
+ * @param arg
+ */
+void
+ble_ll_task(void *arg)
+{
+    struct ble_npl_event *ev;
+
+    /* Init ble phy */
+    ble_phy_init();
+
+    /* Set output power to 1mW (0 dBm) */
+    ble_phy_txpwr_set(MYNEWT_VAL(BLE_LL_TX_PWR_DBM));
+
+    /* Register callback for transport */
+    ble_hci_trans_cfg_ll(ble_ll_hci_cmd_rx, NULL, ble_ll_hci_acl_rx, NULL);
+
+    /* Tell the host that we are ready to receive packets */
+    ble_ll_hci_send_noop();
+
+    ble_ll_rand_start();
+
+    while (1) {
+        ev = ble_npl_eventq_get(&g_ble_ll_data.ll_evq, BLE_NPL_TIME_FOREVER);
+        assert(ev);
+        ble_npl_event_run(ev);
+    }
+}
+
+/**
+ * ble ll state set
+ *
+ * Called to set the current link layer state.
+ *
+ * Context: Interrupt and Link Layer task
+ *
+ * @param ll_state
+ */
+void
+ble_ll_state_set(uint8_t ll_state)
+{
+    g_ble_ll_data.ll_state = ll_state;
+}
+
+/**
+ * ble ll state get
+ *
+ * Called to get the current link layer state.
+ *
+ * Context: Link Layer task (can be called from interrupt context though).
+ *
+ * @return ll_state
+ */
+uint8_t
+ble_ll_state_get(void)
+{
+    return g_ble_ll_data.ll_state;
+}
+
+/**
+ * ble ll event send
+ *
+ * Send an event to the Link Layer task
+ *
+ * @param ev Event to add to the Link Layer event queue.
+ */
+void
+ble_ll_event_send(struct ble_npl_event *ev)
+{
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, ev);
+}
+
+/**
+ * Returns the features supported by the link layer
+ *
+ * @return uint8_t bitmask of supported features.
+ */
+uint64_t
+ble_ll_read_supp_states(void)
+{
+    return BLE_LL_SUPPORTED_STATES;
+}
+
+/**
+ * Returns the features supported by the link layer
+ *
+ * @return uint64_t bitmask of supported features.
+ */
+uint64_t
+ble_ll_read_supp_features(void)
+{
+    return g_ble_ll_data.ll_supp_features;
+}
+
+/**
+ * Sets the features controlled by the host.
+ *
+ * @return HCI command status
+ */
+int
+ble_ll_set_host_feat(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_host_feat_cp *cmd = (const void *) cmdbuf;
+    uint64_t mask;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (!SLIST_EMPTY(&g_ble_ll_conn_active_list)) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if ((cmd->bit_num > 0x3F) || (cmd->val > 1)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    mask = (uint64_t)1 << (cmd->bit_num);
+    if (!(mask & BLE_LL_HOST_CONTROLLED_FEATURES)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (!(mask & g_ble_ll_supported_host_features)) {
+        return BLE_ERR_UNSUPPORTED;
+    }
+
+    if (cmd->val == 0) {
+        g_ble_ll_data.ll_supp_features &= ~(mask);
+    } else {
+        g_ble_ll_data.ll_supp_features |= mask;
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+/**
+ * Flush a link layer packet queue.
+ *
+ * @param pktq
+ */
+static void
+ble_ll_flush_pkt_queue(struct ble_ll_pkt_q *pktq)
+{
+    struct os_mbuf_pkthdr *pkthdr;
+    struct os_mbuf *om;
+
+    /* FLush all packets from Link layer queues */
+    while (STAILQ_FIRST(pktq)) {
+        /* Get mbuf pointer from packet header pointer */
+        pkthdr = STAILQ_FIRST(pktq);
+        om = OS_MBUF_PKTHDR_TO_MBUF(pkthdr);
+
+        /* Remove from queue and free the mbuf */
+        STAILQ_REMOVE_HEAD(pktq, omp_next);
+        os_mbuf_free_chain(om);
+    }
+}
+
+/**
+ * Called to initialize a mbuf used by the controller
+ *
+ * NOTE: this is only used when the mbuf is created by the controller;
+ * it should not be used for data packets (ACL data packets) that come from
+ * the host. This routine assumes that the entire pdu length can fit in
+ * one mbuf contiguously.
+ *
+ * @param m
+ * @param pdulen
+ * @param hdr
+ */
+void
+ble_ll_mbuf_init(struct os_mbuf *m, uint8_t pdulen, uint8_t hdr)
+{
+    struct ble_mbuf_hdr *ble_hdr;
+
+    /* Set mbuf length and packet length */
+    m->om_len = pdulen;
+    OS_MBUF_PKTHDR(m)->omp_len = pdulen;
+
+    /* Set BLE transmit header */
+    ble_hdr = BLE_MBUF_HDR_PTR(m);
+    ble_hdr->txinfo.flags = 0;
+    ble_hdr->txinfo.offset = 0;
+    ble_hdr->txinfo.pyld_len = pdulen;
+    ble_hdr->txinfo.hdr_byte = hdr;
+}
+
+/**
+ * Called to reset the controller. This performs a "software reset" of the link
+ * layer; it does not perform a HW reset of the controller nor does it reset
+ * the HCI interface.
+ *
+ * Context: Link Layer task (HCI command)
+ *
+ * @return int The ble error code to place in the command complete event that
+ * is returned when this command is issued.
+ */
+int
+ble_ll_reset(void)
+{
+    int rc;
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    ble_phy_disable();
+    ble_ll_sched_stop();
+    ble_ll_scan_reset();
+    ble_ll_rfmgmt_reset();
+    OS_EXIT_CRITICAL(sr);
+
+    /* Stop any advertising */
+    ble_ll_adv_reset();
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+    ble_ll_dtm_reset();
+#endif
+
+    /* Stop sync */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    ble_ll_sync_reset();
+#endif
+
+    /* FLush all packets from Link layer queues */
+    ble_ll_flush_pkt_queue(&g_ble_ll_data.ll_tx_pkt_q);
+    ble_ll_flush_pkt_queue(&g_ble_ll_data.ll_rx_pkt_q);
+
+    /* Reset LL stats */
+    STATS_RESET(ble_ll_stats);
+
+    /* Reset any preferred PHYs */
+    g_ble_ll_data.ll_pref_tx_phys = 0;
+    g_ble_ll_data.ll_pref_rx_phys = 0;
+
+    /* Reset connection module */
+    ble_ll_conn_module_reset();
+
+    /* All this does is re-initialize the event masks so call the hci init */
+    ble_ll_hci_init();
+
+    /* Reset scheduler */
+    ble_ll_sched_init();
+
+    /* Set state to standby */
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+
+    /* Reset our random address */
+    memset(g_random_addr, 0, BLE_DEV_ADDR_LEN);
+
+    /* Clear the whitelist */
+    ble_ll_whitelist_clear();
+
+    /* Reset resolving list */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    ble_ll_resolv_list_reset();
+#endif
+
+    /* Re-initialize the PHY */
+    rc = ble_phy_init();
+
+    return rc;
+}
+
+static void
+ble_ll_seed_prng(void)
+{
+    uint32_t seed;
+    int i;
+
+    /* Seed random number generator with least significant bytes of device
+     * address.
+     */
+    seed = 0;
+    for (i = 0; i < 4; ++i) {
+        seed |= g_dev_addr[i];
+        seed <<= 8;
+    }
+    srand(seed);
+}
+
+uint32_t
+ble_ll_pdu_tx_time_get(uint16_t payload_len, int phy_mode)
+{
+    uint32_t usecs;
+
+#if (BLE_LL_BT5_PHY_SUPPORTED)
+    if (phy_mode == BLE_PHY_MODE_1M) {
+        /* 8 usecs per byte */
+        usecs = payload_len << 3;
+    } else if (phy_mode == BLE_PHY_MODE_2M) {
+        /* 4 usecs per byte */
+        usecs = payload_len << 2;
+    } else if (phy_mode == BLE_PHY_MODE_CODED_125KBPS) {
+        /* S=8 => 8 * 8 = 64 usecs per byte */
+        usecs = payload_len << 6;
+    } else if (phy_mode == BLE_PHY_MODE_CODED_500KBPS) {
+        /* S=2 => 2 * 8 = 16 usecs per byte */
+        usecs = payload_len << 4;
+    } else {
+        BLE_LL_ASSERT(0);
+    }
+
+    usecs += g_ble_ll_pdu_header_tx_time[phy_mode];
+#else
+    usecs = (((payload_len) + BLE_LL_PDU_HDR_LEN + BLE_LL_ACC_ADDR_LEN
+            + BLE_LL_PREAMBLE_LEN + BLE_LL_CRC_LEN) << 3);
+#endif
+
+    return usecs;
+}
+
+uint16_t
+ble_ll_pdu_max_tx_octets_get(uint32_t usecs, int phy_mode)
+{
+    uint32_t header_tx_time;
+    uint16_t octets = 0;
+
+    BLE_LL_ASSERT(phy_mode < BLE_PHY_NUM_MODE);
+
+    header_tx_time = g_ble_ll_pdu_header_tx_time[phy_mode];
+
+    /*
+     * Current conn max tx time can be too short to even send a packet header
+     * and this can happen if we changed connection form uncoded to coded phy.
+     * However, the lower bound for conn max tx time (all of them) depends on
+     * current phy (uncoded/coded) but it always allows to send at least 27
+     * bytes of payload thus we alwyas return at least 27 from here.
+     *
+     * Reference:
+     * Core v5.0, Vol 6, Part B, section 4.5.10
+     * see connEffectiveMaxTxTime and connEffectiveMaxRxTime definitions
+     */
+
+    if (usecs < header_tx_time) {
+        return 27;
+    }
+
+    usecs -= header_tx_time;
+
+    if (phy_mode == BLE_PHY_MODE_1M) {
+        /* 8 usecs per byte */
+        octets = usecs >> 3;
+    } else if (phy_mode == BLE_PHY_MODE_2M) {
+        /* 4 usecs per byte */
+        octets = usecs >> 2;
+    } else if (phy_mode == BLE_PHY_MODE_CODED_125KBPS) {
+        /* S=8 => 8 * 8 = 64 usecs per byte */
+        octets = usecs >> 6;
+    } else if (phy_mode == BLE_PHY_MODE_CODED_500KBPS) {
+        /* S=2 => 2 * 8 = 16 usecs per byte */
+        octets = usecs >> 4;
+    } else {
+        BLE_LL_ASSERT(0);
+    }
+
+    /* see comment at the beginning */
+    return max(27, octets);
+}
+
+static inline bool
+ble_ll_is_addr_empty(const uint8_t *addr)
+{
+    return memcmp(addr, BLE_ADDR_ANY, BLE_DEV_ADDR_LEN) == 0;
+}
+
+/**
+ * Initialize the Link Layer. Should be called only once
+ *
+ * @return int
+ */
+void
+ble_ll_init(void)
+{
+    int rc;
+    uint64_t features;
+    ble_addr_t addr;
+    struct ble_ll_obj *lldata;
+
+    /* Ensure this function only gets called by sysinit. */
+    SYSINIT_ASSERT_ACTIVE();
+
+    ble_ll_trace_init();
+    ble_phy_trace_init();
+
+    /* Set public device address if not already set */
+    if (ble_ll_is_addr_empty(g_dev_addr)) {
+        /* Use sycfg address if configured, otherwise try to read from HW */
+        if (!ble_ll_is_addr_empty(MYNEWT_VAL(BLE_PUBLIC_DEV_ADDR))) {
+            memcpy(g_dev_addr, MYNEWT_VAL(BLE_PUBLIC_DEV_ADDR), BLE_DEV_ADDR_LEN);
+        } else {
+            rc = ble_hw_get_public_addr(&addr);
+            if (!rc) {
+                memcpy(g_dev_addr, &addr.val[0], BLE_DEV_ADDR_LEN);
+            }
+        }
+    }
+
+    ble_ll_rfmgmt_init();
+
+    /* Get pointer to global data object */
+    lldata = &g_ble_ll_data;
+
+    /* Set acl pkt size and number */
+    lldata->ll_num_acl_pkts = MYNEWT_VAL(BLE_ACL_BUF_COUNT);
+    lldata->ll_acl_pkt_size = MYNEWT_VAL(BLE_ACL_BUF_SIZE);
+
+    /* Initialize eventq */
+    ble_npl_eventq_init(&lldata->ll_evq);
+
+    /* Initialize the transmit (from host) and receive (from phy) queues */
+    STAILQ_INIT(&lldata->ll_tx_pkt_q);
+    STAILQ_INIT(&lldata->ll_rx_pkt_q);
+
+    /* Initialize transmit (from host) and receive packet (from phy) event */
+    ble_npl_event_init(&lldata->ll_rx_pkt_ev, ble_ll_event_rx_pkt, NULL);
+    ble_npl_event_init(&lldata->ll_tx_pkt_ev, ble_ll_event_tx_pkt, NULL);
+
+    /* Initialize data buffer overflow event and completed packets */
+    ble_npl_event_init(&lldata->ll_dbuf_overflow_ev, ble_ll_event_dbuf_overflow, NULL);
+    ble_npl_event_init(&lldata->ll_comp_pkt_ev, ble_ll_event_comp_pkts, NULL);
+
+    /* Initialize the HW error timer */
+    /* NOT USED WITH RAM HCI
+     * Commented out to prevent creating an unnecessary timer
+    ble_npl_callout_init(&g_ble_ll_data.ll_hw_err_timer,
+                         &g_ble_ll_data.ll_evq,
+                         ble_ll_hw_err_timer_cb,
+                         NULL);
+    */
+
+    /* Initialize LL HCI */
+    ble_ll_hci_init();
+
+    /* Init the scheduler */
+    ble_ll_sched_init();
+
+    /* Initialize advertiser */
+    ble_ll_adv_init();
+
+    /* Initialize a scanner */
+    ble_ll_scan_init();
+
+    /* Initialize the connection module */
+    ble_ll_conn_module_init();
+
+    /* Set the supported features. NOTE: we always support extended reject. */
+    features = BLE_LL_FEAT_EXTENDED_REJ;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
+    features |= BLE_LL_FEAT_DATA_LEN_EXT;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_CONN_PARAM_REQ)
+    features |= BLE_LL_FEAT_CONN_PARM_REQ;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG)
+    features |= BLE_LL_FEAT_SLAVE_INIT;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    features |= BLE_LL_FEAT_LE_ENCRYPTION;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    features |= (BLE_LL_FEAT_LL_PRIVACY | BLE_LL_FEAT_EXT_SCAN_FILT);
+    ble_ll_resolv_init();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+    features |= BLE_LL_FEAT_LE_PING;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    features |= BLE_LL_FEAT_EXT_ADV;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    /* CSA2 */
+    features |= BLE_LL_FEAT_CSA2;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    features |= BLE_LL_FEAT_LE_2M_PHY;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    features |= BLE_LL_FEAT_LE_CODED_PHY;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    features |= BLE_LL_FEAT_PERIODIC_ADV;
+    ble_ll_sync_init();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    features |= BLE_LL_FEAT_SYNC_TRANS_RECV;
+    features |= BLE_LL_FEAT_SYNC_TRANS_SEND;
+#endif
+
+    /* Initialize random number generation */
+    ble_ll_rand_init();
+
+    /* XXX: This really doesn't belong here, as the address probably has not
+     * been set yet.
+     */
+    ble_ll_seed_prng();
+
+    lldata->ll_supp_features = features;
+
+    rc = stats_init_and_reg(STATS_HDR(ble_ll_stats),
+                            STATS_SIZE_INIT_PARMS(ble_ll_stats, STATS_SIZE_32),
+                            STATS_NAME_INIT_PARMS(ble_ll_stats),
+                            "ble_ll");
+    SYSINIT_PANIC_ASSERT(rc == 0);
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+    ble_ll_dtm_init();
+#endif
+
+#if MYNEWT
+    /* Initialize the LL task */
+    os_task_init(&g_ble_ll_task, "ble_ll", ble_ll_task, NULL,
+                 MYNEWT_VAL(BLE_LL_PRIO), OS_WAIT_FOREVER, g_ble_ll_stack,
+                 BLE_LL_STACK_SIZE);
+#else
+
+/*
+ * For non-Mynewt OS it is required that OS creates task for LL and run LL
+ * routine which is wrapped by nimble_port_ll_task_func().
+ */
+
+#endif
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_adv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_adv.c
new file mode 100644
index 000000000..83fd2506c
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_adv.c
@@ -0,0 +1,5143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/os/os_cputime.h"
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF51)
+#include "nimble/nimble/drivers/nrf51/include/ble/xcvr.h"
+#elif defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+#include "nimble/nimble/drivers/nrf52/include/ble/xcvr.h"
+#endif
+
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "../include/controller/ble_phy.h"
+#include "../include/controller/ble_hw.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_whitelist.h"
+#include "../include/controller/ble_ll_resolv.h"
+#include "../include/controller/ble_ll_trace.h"
+#include "../include/controller/ble_ll_utils.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+#include "ble_ll_conn_priv.h"
+
+#ifndef ARRAY_SIZE
+#define ARRAY_SIZE(array) \
+        (sizeof(array) / sizeof((array)[0]))
+#endif
+
+/* XXX: TODO
+ * 1) Need to look at advertising and scan request PDUs. Do I allocate these
+ * once? Do I use a different pool for smaller ones? Do I statically declare
+ * them?
+ * 3) How do features get supported? What happens if device does not support
+ * advertising? (for example)
+ * 4) How to determine the advertising interval we will actually use. As of
+ * now, we set it to max.
+ */
+
+/* Scheduling data for secondary channel */
+struct ble_ll_adv_aux {
+    struct ble_ll_sched_item sch;
+    uint32_t start_time;
+    uint16_t aux_data_offset;
+    uint8_t chan;
+    uint8_t ext_hdr;
+    uint8_t aux_data_len;
+    uint8_t payload_len;
+};
+
+/* Scheduling data for sync PDUs */
+struct ble_ll_adv_sync {
+    struct ble_ll_sched_item sch;
+    uint32_t start_time;
+    uint16_t sync_data_offset;
+    uint8_t chan;
+    uint8_t ext_hdr;
+    uint8_t sync_data_len;
+    uint8_t payload_len;
+};
+
+/*
+ * Advertising state machine
+ *
+ * The advertising state machine data structure.
+ *
+ *  adv_pdu_len
+ *      The length of the advertising PDU that will be sent. This does not
+ *      include the preamble, access address and CRC.
+ *
+ *  initiator_addr:
+ *      This is the address that we send in directed advertisements (the
+ *      INITA field). If we are using Privacy this is a RPA that we need to
+ *      generate. We reserve space in the advsm to save time when creating
+ *      the ADV_DIRECT_IND. If own address type is not 2 or 3, this is simply
+ *      the peer address from the set advertising parameters.
+ */
+struct ble_ll_adv_sm
+{
+    uint8_t adv_enabled;
+    uint8_t adv_instance;
+    uint8_t adv_chanmask;
+    uint8_t adv_filter_policy;
+    uint8_t own_addr_type;
+    uint8_t peer_addr_type;
+    uint8_t adv_chan;
+    uint8_t adv_pdu_len;
+    int8_t adv_rpa_index;
+    int8_t adv_txpwr;
+    uint16_t flags;
+    uint16_t props;
+    uint16_t adv_itvl_min;
+    uint16_t adv_itvl_max;
+    uint32_t adv_itvl_usecs;
+    uint32_t adv_event_start_time;
+    uint32_t adv_pdu_start_time;
+    uint32_t adv_end_time;
+    uint32_t adv_rpa_timer;
+    uint8_t adva[BLE_DEV_ADDR_LEN];
+    uint8_t adv_rpa[BLE_DEV_ADDR_LEN];
+    uint8_t peer_addr[BLE_DEV_ADDR_LEN];
+    uint8_t initiator_addr[BLE_DEV_ADDR_LEN];
+    struct os_mbuf *adv_data;
+    struct os_mbuf *new_adv_data;
+    struct os_mbuf *scan_rsp_data;
+    struct os_mbuf *new_scan_rsp_data;
+    uint8_t *conn_comp_ev;
+    struct ble_npl_event adv_txdone_ev;
+    struct ble_ll_sched_item adv_sch;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    uint16_t channel_id;
+    uint16_t event_cntr;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    uint8_t aux_active : 1;
+    uint8_t aux_index : 1;
+    uint8_t aux_first_pdu : 1;
+    uint8_t aux_not_scanned : 1;
+    struct ble_mbuf_hdr *rx_ble_hdr;
+    struct os_mbuf **aux_data;
+    struct ble_ll_adv_aux aux[2];
+    struct ble_npl_event adv_sec_txdone_ev;
+    uint16_t duration;
+    uint16_t adi;
+    uint8_t adv_random_addr[BLE_DEV_ADDR_LEN];
+    uint8_t events_max;
+    uint8_t events;
+    uint8_t pri_phy;
+    uint8_t sec_phy;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    struct os_mbuf *periodic_adv_data;
+    struct os_mbuf *periodic_new_data;
+    uint32_t periodic_crcinit; /* only 3 bytes are used */
+    uint32_t periodic_access_addr;
+    uint16_t periodic_adv_itvl_min;
+    uint16_t periodic_adv_itvl_max;
+    uint16_t periodic_adv_props;
+    uint16_t periodic_channel_id;
+    uint16_t periodic_event_cntr;
+    uint16_t periodic_chain_event_cntr;
+    uint8_t periodic_adv_enabled : 1;
+    uint8_t periodic_adv_active : 1;
+    uint8_t periodic_sync_active : 1;
+    uint8_t periodic_sync_index : 1;
+    uint8_t periodic_num_used_chans;
+    uint8_t periodic_chanmap[BLE_LL_CONN_CHMAP_LEN];
+    uint32_t periodic_adv_itvl_ticks;
+    uint8_t periodic_adv_itvl_rem_usec;
+    uint8_t periodic_adv_event_start_time_remainder;
+    uint32_t periodic_adv_event_start_time;
+    struct ble_ll_adv_sync periodic_sync[2];
+    struct ble_npl_event adv_periodic_txdone_ev;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    uint16_t periodic_event_cntr_last_sent;
+#endif
+#endif
+#endif
+};
+
+#define BLE_LL_ADV_SM_FLAG_TX_ADD                   0x0001
+#define BLE_LL_ADV_SM_FLAG_RX_ADD                   0x0002
+#define BLE_LL_ADV_SM_FLAG_SCAN_REQ_NOTIF           0x0004
+#define BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD             0x0008
+#define BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK      0x0030 /* use helpers! */
+#define BLE_LL_ADV_SM_FLAG_ADV_DATA_INCOMPLETE      0x0040
+#define BLE_LL_ADV_SM_FLAG_CONFIGURED               0x0080
+#define BLE_LL_ADV_SM_FLAG_ADV_RPA_TMO              0x0100
+#define BLE_LL_ADV_SM_FLAG_NEW_ADV_DATA             0x0200
+#define BLE_LL_ADV_SM_FLAG_NEW_SCAN_RSP_DATA        0x0400
+#define BLE_LL_ADV_SM_FLAG_PERIODIC_CONFIGURED      0x0800
+#define BLE_LL_ADV_SM_FLAG_PERIODIC_DATA_INCOMPLETE 0x1000
+#define BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING    0x2000
+#define BLE_LL_ADV_SM_FLAG_PERIODIC_NEW_DATA        0x4000
+
+#define ADV_DATA_LEN(_advsm) \
+                ((_advsm->adv_data) ? OS_MBUF_PKTLEN(advsm->adv_data) : 0)
+#define SCAN_RSP_DATA_LEN(_advsm) \
+                ((_advsm->scan_rsp_data) ? OS_MBUF_PKTLEN(advsm->scan_rsp_data) : 0)
+#define AUX_DATA_LEN(_advsm) \
+                (*(_advsm->aux_data) ? OS_MBUF_PKTLEN(*advsm->aux_data) : 0)
+
+#define AUX_CURRENT(_advsm)     (&(_advsm->aux[_advsm->aux_index]))
+#define AUX_NEXT(_advsm)        (&(_advsm->aux[_advsm->aux_index ^ 1]))
+
+#define SYNC_CURRENT(_advsm) (&(_advsm->periodic_sync[_advsm->periodic_sync_index]))
+#define SYNC_NEXT(_advsm)    (&(_advsm->periodic_sync[_advsm->periodic_sync_index ^ 1]))
+#define SYNC_DATA_LEN(_advsm) \
+                (_advsm->periodic_adv_data ? OS_MBUF_PKTLEN(advsm->periodic_adv_data) : 0)
+
+/* The advertising state machine global object */
+struct ble_ll_adv_sm g_ble_ll_adv_sm[BLE_ADV_INSTANCES];
+struct ble_ll_adv_sm *g_ble_ll_cur_adv_sm;
+
+static struct ble_ll_adv_sm *
+ble_ll_adv_sm_find_configured(uint8_t instance)
+{
+    struct ble_ll_adv_sm *advsm;
+    int i;
+
+    /* in legacy mode we only allow instance 0 */
+    if (!ble_ll_hci_adv_mode_ext()) {
+        BLE_LL_ASSERT(instance == 0);
+        return &g_ble_ll_adv_sm[0];
+    }
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_adv_sm); i++) {
+        advsm = &g_ble_ll_adv_sm[i];
+
+        if ((advsm->flags & BLE_LL_ADV_SM_FLAG_CONFIGURED) &&
+                (advsm->adv_instance == instance)) {
+            return advsm;
+        }
+    }
+
+    return NULL;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static int
+ble_ll_adv_active_chanset_is_pri(struct ble_ll_adv_sm *advsm)
+{
+    return (advsm->flags & BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK) == 0x10;
+}
+
+static int
+ble_ll_adv_active_chanset_is_sec(struct ble_ll_adv_sm *advsm)
+{
+    return (advsm->flags & BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK) == 0x20;
+}
+#endif
+
+static void
+ble_ll_adv_active_chanset_clear(struct ble_ll_adv_sm *advsm)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    advsm->flags &= ~BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK;
+    OS_EXIT_CRITICAL(sr);
+}
+
+static void
+ble_ll_adv_active_chanset_set_pri(struct ble_ll_adv_sm *advsm)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    assert((advsm->flags & BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK) == 0);
+    advsm->flags &= ~BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK;
+    advsm->flags |= 0x10;
+    OS_EXIT_CRITICAL(sr);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_adv_active_chanset_set_sec(struct ble_ll_adv_sm *advsm)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    assert((advsm->flags & BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK) == 0);
+    advsm->flags &= ~BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK;
+    advsm->flags |= 0x20;
+    OS_EXIT_CRITICAL(sr);
+}
+#endif
+
+static void
+ble_ll_adv_flags_set(struct ble_ll_adv_sm *advsm, uint16_t flags)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    advsm->flags |= flags;
+    OS_EXIT_CRITICAL(sr);
+}
+
+static void
+ble_ll_adv_flags_clear(struct ble_ll_adv_sm *advsm, uint16_t flags)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    advsm->flags &= ~flags;
+    OS_EXIT_CRITICAL(sr);
+}
+
+static void ble_ll_adv_make_done(struct ble_ll_adv_sm *advsm, struct ble_mbuf_hdr *hdr);
+static void ble_ll_adv_sm_init(struct ble_ll_adv_sm *advsm);
+static void ble_ll_adv_sm_stop_timeout(struct ble_ll_adv_sm *advsm);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+static void
+ble_ll_adv_rpa_update(struct ble_ll_adv_sm *advsm)
+{
+    if (ble_ll_resolv_gen_rpa(advsm->peer_addr, advsm->peer_addr_type,
+                          advsm->adva, 1)) {
+        ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_TX_ADD);
+    } else {
+        if (advsm->own_addr_type & 1) {
+            ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_TX_ADD);
+        } else {
+            ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_TX_ADD);
+        }
+    }
+
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+        if (ble_ll_resolv_gen_rpa(advsm->peer_addr, advsm->peer_addr_type,
+                              advsm->initiator_addr, 0)) {
+            ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_RX_ADD);
+        } else {
+            if (advsm->peer_addr_type & 1) {
+                ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_RX_ADD);
+            } else {
+                ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_RX_ADD);
+            }
+        }
+    }
+}
+
+/**
+ * Called to change advertisers ADVA and INITA (for directed advertisements)
+ * as an advertiser needs to adhere to the resolvable private address generation
+ * timer.
+ *
+ * NOTE: the resolvable private address code uses its own timer to regenerate
+ * local resolvable private addresses. The advertising code uses its own
+ * timer to reset the INITA (for directed advertisements). This code also sets
+ * the appropriate txadd and rxadd bits that will go into the advertisement.
+ *
+ * Another thing to note: it is possible that an IRK is all zeroes in the
+ * resolving list. That is why we need to check if the generated address is
+ * in fact a RPA as a resolving list entry with all zeroes will use the
+ * identity address (which may be a private address or public).
+ *
+ * @param advsm
+ */
+void
+ble_ll_adv_chk_rpa_timeout(struct ble_ll_adv_sm *advsm)
+{
+    if (advsm->own_addr_type < BLE_HCI_ADV_OWN_ADDR_PRIV_PUB) {
+        return;
+    }
+
+    if (advsm->flags & BLE_LL_ADV_SM_FLAG_ADV_RPA_TMO) {
+        ble_ll_adv_rpa_update(advsm);
+        ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_ADV_RPA_TMO);
+    }
+}
+
+void
+ble_ll_adv_rpa_timeout(void)
+{
+    struct ble_ll_adv_sm *advsm;
+    int i;
+
+    for (i = 0; i < BLE_ADV_INSTANCES; i++) {
+        advsm = &g_ble_ll_adv_sm[i];
+
+        if (advsm->adv_enabled &&
+                advsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+            /* Mark RPA as timed out so we get a new RPA */
+            ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_ADV_RPA_TMO);
+        }
+    }
+}
+#endif
+
+/**
+ * Calculate the first channel that we should advertise upon when we start
+ * an advertising event.
+ *
+ * @param advsm
+ *
+ * @return uint8_t The number of the first channel usable for advertising.
+ */
+static uint8_t
+ble_ll_adv_first_chan(struct ble_ll_adv_sm *advsm)
+{
+    uint8_t adv_chan;
+
+    /* Set first advertising channel */
+    if (advsm->adv_chanmask & 0x01) {
+        adv_chan = BLE_PHY_ADV_CHAN_START;
+    } else if (advsm->adv_chanmask & 0x02) {
+        adv_chan = BLE_PHY_ADV_CHAN_START + 1;
+    } else {
+        adv_chan = BLE_PHY_ADV_CHAN_START + 2;
+    }
+
+    return adv_chan;
+}
+
+/**
+ * Calculate the final channel that we should advertise upon when we start
+ * an advertising event.
+ *
+ * @param advsm
+ *
+ * @return uint8_t The number of the final channel usable for advertising.
+ */
+static uint8_t
+ble_ll_adv_final_chan(struct ble_ll_adv_sm *advsm)
+{
+    uint8_t adv_chan;
+
+    if (advsm->adv_chanmask & 0x04) {
+        adv_chan = BLE_PHY_ADV_CHAN_START + 2;
+    } else if (advsm->adv_chanmask & 0x02) {
+        adv_chan = BLE_PHY_ADV_CHAN_START + 1;
+    } else {
+        adv_chan = BLE_PHY_ADV_CHAN_START;
+    }
+
+    return adv_chan;
+}
+
+/**
+ * Create the advertising legacy PDU
+ *
+ * @param advsm Pointer to advertisement state machine
+ */
+static uint8_t
+ble_ll_adv_legacy_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_adv_sm *advsm;
+    uint8_t     adv_data_len;
+    uint8_t     pdulen;
+    uint8_t     pdu_type;
+
+    advsm = pducb_arg;
+
+    /* assume this is not a direct ind */
+    adv_data_len = ADV_DATA_LEN(advsm);
+    pdulen = BLE_DEV_ADDR_LEN + adv_data_len;
+
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+        pdu_type = BLE_ADV_PDU_TYPE_ADV_DIRECT_IND;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+        pdu_type |= BLE_ADV_PDU_HDR_CHSEL;
+#endif
+
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_RX_ADD) {
+            pdu_type |= BLE_ADV_PDU_HDR_RXADD_RAND;
+        }
+
+        adv_data_len = 0;
+        pdulen = BLE_ADV_DIRECT_IND_LEN;
+    } else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+        pdu_type = BLE_ADV_PDU_TYPE_ADV_IND;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+        pdu_type |= BLE_ADV_PDU_HDR_CHSEL;
+#endif
+    } else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
+        pdu_type = BLE_ADV_PDU_TYPE_ADV_SCAN_IND;
+    } else {
+        pdu_type = BLE_ADV_PDU_TYPE_ADV_NONCONN_IND;
+    }
+
+    /* An invalid advertising data length indicates a memory overwrite */
+    assert(adv_data_len <= BLE_ADV_LEGACY_DATA_MAX_LEN);
+
+    /* Set the PDU length in the state machine (includes header) */
+    advsm->adv_pdu_len = pdulen + BLE_LL_PDU_HDR_LEN;
+
+    /* Set TxAdd to random if needed. */
+    if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+        pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
+    }
+
+    *hdr_byte = pdu_type;
+
+    /* Construct advertisement */
+    memcpy(dptr, advsm->adva, BLE_DEV_ADDR_LEN);
+    dptr += BLE_DEV_ADDR_LEN;
+
+    /* For ADV_DIRECT_IND add inita */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+        memcpy(dptr, advsm->initiator_addr, BLE_DEV_ADDR_LEN);
+    }
+
+    /* Copy in advertising data, if any */
+    if (adv_data_len != 0) {
+        os_mbuf_copydata(advsm->adv_data, 0, adv_data_len, dptr);
+    }
+
+    return pdulen;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_adv_put_aux_ptr(uint8_t chan, uint8_t phy, uint32_t offset,
+                       uint8_t *dptr)
+{
+    dptr[0] = chan;
+
+    if (offset > 245700) {
+        dptr[0] |= 0x80;
+        offset = offset / 300;
+    } else {
+        offset = offset / 30;
+    }
+
+    if (offset > 0x1fff) {
+        offset = 0;
+    }
+
+    /* offset is 13bits and PHY 3 bits */
+    dptr[1] = (offset & 0x000000ff);
+    dptr[2] = ((offset >> 8) & 0x0000001f) | (phy - 1) << 5;
+}
+
+/**
+ * Create the advertising PDU
+ */
+static uint8_t
+ble_ll_adv_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_adv_sm *advsm;
+    uint8_t pdu_type;
+    uint8_t adv_mode;
+    uint8_t ext_hdr_len;
+    uint8_t ext_hdr_flags;
+    uint32_t offset;
+
+    advsm = pducb_arg;
+
+    assert(ble_ll_adv_active_chanset_is_pri(advsm));
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        return ble_ll_adv_legacy_pdu_make(dptr, advsm, hdr_byte);
+    }
+
+    /* only ADV_EXT_IND goes on primary advertising channels */
+    pdu_type = BLE_ADV_PDU_TYPE_ADV_EXT_IND;
+
+    /* Set TxAdd to random if needed. */
+    if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+        pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
+    }
+
+    *hdr_byte = pdu_type;
+
+    adv_mode = 0;
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+        adv_mode |= BLE_LL_EXT_ADV_MODE_CONN;
+    }
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
+        adv_mode |= BLE_LL_EXT_ADV_MODE_SCAN;
+    }
+
+    ext_hdr_len = BLE_LL_EXT_ADV_FLAGS_SIZE + BLE_LL_EXT_ADV_DATA_INFO_SIZE +
+                  BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+    ext_hdr_flags = (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT) |
+                    (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT);
+
+    /* ext hdr len and adv mode */
+    dptr[0] = ext_hdr_len | (adv_mode << 6);
+    dptr += 1;
+
+    /* ext hdr flags */
+    dptr[0] = ext_hdr_flags;
+    dptr += 1;
+
+    /* ADI */
+    dptr[0] = advsm->adi & 0x00ff;
+    dptr[1] = advsm->adi >> 8;
+    dptr += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+
+    /* AuxPtr */
+    if (AUX_CURRENT(advsm)->sch.enqueued) {
+        offset = os_cputime_ticks_to_usecs(AUX_CURRENT(advsm)->start_time - advsm->adv_pdu_start_time);
+    } else {
+        offset = 0;
+    }
+    /* Always use channel from 1st AUX */
+    ble_ll_adv_put_aux_ptr(AUX_CURRENT(advsm)->chan, advsm->sec_phy,
+                           offset, dptr);
+
+    return BLE_LL_EXT_ADV_HDR_LEN + ext_hdr_len;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+static void
+ble_ll_adv_put_syncinfo(struct ble_ll_adv_sm *advsm,
+                        struct ble_ll_conn_sm *connsm, uint8_t *conn_event_cnt,
+                        uint8_t *dptr)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    uint8_t anchor_usecs;
+    uint16_t conn_cnt;
+#endif
+    unsigned int event_cnt_off = 0;
+    uint32_t offset = 0;
+    uint32_t anchor;
+    uint8_t units;
+
+    if (connsm) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+        anchor = connsm->anchor_point;
+        anchor_usecs = connsm->anchor_point_usecs;
+        conn_cnt = connsm->event_cntr;
+
+        /* get anchor for conn event that is before periodic_adv_event_start_time */
+        while (CPUTIME_GT(anchor, advsm->periodic_adv_event_start_time)) {
+            ble_ll_conn_get_anchor(connsm, --conn_cnt, &anchor, &anchor_usecs);
+        }
+
+        offset = os_cputime_ticks_to_usecs(advsm->periodic_adv_event_start_time - anchor);
+        offset -= anchor_usecs;
+        offset += advsm->periodic_adv_event_start_time_remainder;
+
+        /* connEventCount */
+        put_le16(conn_event_cnt, conn_cnt);
+#endif
+    } else {
+        anchor = advsm->periodic_adv_event_start_time;
+
+        /* Get periodic event that is past AUX start time (so that we always
+         * provide valid offset if it is not too far in future). This can
+         * happen if advertising event is interleaved with periodic advertising
+         * event (when chaining).
+         */
+        while (CPUTIME_GT(AUX_CURRENT(advsm)->start_time, anchor)) {
+            anchor += advsm->periodic_adv_itvl_ticks;
+            event_cnt_off++;
+        }
+
+        offset = os_cputime_ticks_to_usecs(anchor - AUX_CURRENT(advsm)->start_time);
+        offset += advsm->periodic_adv_event_start_time_remainder;
+        offset += advsm->periodic_adv_itvl_rem_usec;
+    }
+
+    /* Sync Packet Offset (13 bits), Offset Units (1 bit), Offset Adjust (1 bit),
+     * RFU (1 bit)
+     */
+    if (offset > 245700) {
+        units = 0x20;
+        offset = offset / 300;
+
+        if (offset >= 0x2000) {
+            if (connsm) {
+                offset -= 0x2000;
+                units |= 0x40;
+            } else {
+                /* not able to represent time in offset */
+                offset = 0;
+                units = 0x00;
+                event_cnt_off = 0;
+            }
+        }
+
+    } else {
+        units = 0x00;
+        offset = offset / 30;
+    }
+
+    dptr[0] = (offset & 0x000000ff);
+    dptr[1] = ((offset >> 8) & 0x0000001f) | units;
+
+    /* Interval (2 bytes) */
+    put_le16(&dptr[2], advsm->periodic_adv_itvl_max);
+
+    /* Channels Mask (37 bits) */
+    dptr[4] = advsm->periodic_chanmap[0];
+    dptr[5] = advsm->periodic_chanmap[1];
+    dptr[6] = advsm->periodic_chanmap[2];
+    dptr[7] = advsm->periodic_chanmap[3];
+    dptr[8] = advsm->periodic_chanmap[4] & 0x1f;
+
+    /* SCA (3 bits) */
+    dptr[8] |= MYNEWT_VAL(BLE_LL_MASTER_SCA) << 5;
+
+    /* AA (4 bytes) */
+    put_le32(&dptr[9], advsm->periodic_access_addr);
+
+    /* CRCInit (3 bytes) */
+    dptr[13] = (uint8_t)advsm->periodic_crcinit;
+    dptr[14] = (uint8_t)(advsm->periodic_crcinit >> 8);
+    dptr[15] = (uint8_t)(advsm->periodic_crcinit >> 16);
+
+    /* Event Counter (2 bytes) */
+    put_le16(&dptr[16], advsm->periodic_event_cntr + event_cnt_off);
+}
+#endif
+
+/**
+ * Create the AUX PDU
+ */
+static uint8_t
+ble_ll_adv_aux_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_adv_sm *advsm;
+    struct ble_ll_adv_aux *aux;
+    uint8_t adv_mode;
+    uint8_t pdu_type;
+    uint8_t ext_hdr_len;
+    uint32_t offset;
+
+    advsm = pducb_arg;
+    aux = AUX_CURRENT(advsm);
+
+    assert(!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY));
+    assert(ble_ll_adv_active_chanset_is_sec(advsm));
+
+    /* It's the same for AUX_ADV_IND and AUX_CHAIN_IND */
+    pdu_type = BLE_ADV_PDU_TYPE_AUX_ADV_IND;
+
+    /* We do not create scannable PDUs here - this is handled separately */
+    adv_mode = 0;
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+        adv_mode |= BLE_LL_EXT_ADV_MODE_CONN;
+    }
+
+    ext_hdr_len = aux->payload_len - BLE_LL_EXT_ADV_HDR_LEN - aux->aux_data_len;
+    dptr[0] = (adv_mode << 6) | ext_hdr_len;
+    dptr += 1;
+
+    /* only put flags if needed */
+    if (aux->ext_hdr) {
+        dptr[0] = aux->ext_hdr;
+        dptr += 1;
+    }
+
+    if (aux->ext_hdr & (1 << BLE_LL_EXT_ADV_ADVA_BIT)) {
+
+        /* Set TxAdd to random if needed. */
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+            pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
+        }
+
+        memcpy(dptr, advsm->adva, BLE_LL_EXT_ADV_ADVA_SIZE);
+        dptr += BLE_LL_EXT_ADV_ADVA_SIZE;
+    }
+
+    if (aux->ext_hdr & (1 << BLE_LL_EXT_ADV_TARGETA_BIT)) {
+        memcpy(dptr, advsm->initiator_addr, BLE_LL_EXT_ADV_TARGETA_SIZE);
+        dptr += BLE_LL_EXT_ADV_TARGETA_SIZE;
+
+        /* Set RxAdd to random if needed. */
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_RX_ADD) {
+            pdu_type |= BLE_ADV_PDU_HDR_RXADD_RAND;
+        }
+    }
+
+    if (aux->ext_hdr & (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT)) {
+        dptr[0] = advsm->adi & 0x00ff;
+        dptr[1] = advsm->adi >> 8;
+        dptr += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+    }
+
+    if (aux->ext_hdr & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT)) {
+        if (!AUX_NEXT(advsm)->sch.enqueued) {
+            /*
+             * Trim data here in case we do not have next aux scheduled. This
+             * can happen if next aux was outside advertising set period and
+             * was removed from scheduler.
+             */
+            offset = 0;
+        } else if (advsm->rx_ble_hdr) {
+            offset = os_cputime_ticks_to_usecs(AUX_NEXT(advsm)->start_time - advsm->rx_ble_hdr->beg_cputime);
+            offset -= (advsm->rx_ble_hdr->rem_usecs + ble_ll_pdu_tx_time_get(12, advsm->sec_phy) + BLE_LL_IFS);
+        } else {
+            offset = os_cputime_ticks_to_usecs(AUX_NEXT(advsm)->start_time - aux->start_time);
+        }
+
+        ble_ll_adv_put_aux_ptr(AUX_NEXT(advsm)->chan, advsm->sec_phy,
+                               offset, dptr);
+
+        dptr += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    if (aux->ext_hdr & (1 << BLE_LL_EXT_ADV_SYNC_INFO_BIT)) {
+        ble_ll_adv_put_syncinfo(advsm, NULL, NULL, dptr);
+        dptr += BLE_LL_EXT_ADV_SYNC_INFO_SIZE;
+    }
+#endif
+
+    if (aux->ext_hdr & (1 << BLE_LL_EXT_ADV_TX_POWER_BIT)) {
+        dptr[0] = advsm->adv_txpwr + ble_ll_get_tx_pwr_compensation();
+        dptr += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+    }
+
+    if (aux->aux_data_len) {
+        os_mbuf_copydata(*advsm->aux_data, aux->aux_data_offset,
+                         aux->aux_data_len, dptr);
+    }
+
+    *hdr_byte = pdu_type;
+
+    return aux->payload_len;
+}
+
+static uint8_t
+ble_ll_adv_aux_scannable_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_adv_sm *advsm;
+    uint8_t pdu_type;
+    uint8_t *ext_hdr_len;
+    uint8_t *ext_hdr;
+    uint8_t pdulen;
+
+    advsm = pducb_arg;
+
+    assert(!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY));
+    assert(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE);
+    assert(advsm->aux_first_pdu);
+    assert(ble_ll_adv_active_chanset_is_sec(advsm));
+
+    pdu_type = BLE_ADV_PDU_TYPE_AUX_ADV_IND;
+
+    ext_hdr_len = &dptr[0];
+    ext_hdr = &dptr[1];
+    dptr += 2;
+
+    /* Flags always */
+    *ext_hdr_len = BLE_LL_EXT_ADV_FLAGS_SIZE;
+    *ext_hdr = 0;
+
+    /* AdvA when non anonymous */
+    if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
+        /* Set TxAdd to random if needed. */
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+            pdu_type |= BLE_ADV_PDU_HDR_TXADD_RAND;
+        }
+
+        *ext_hdr_len += BLE_LL_EXT_ADV_ADVA_SIZE;
+        *ext_hdr |= (1 << BLE_LL_EXT_ADV_ADVA_BIT);
+        memcpy(dptr, advsm->adva, BLE_LL_EXT_ADV_ADVA_SIZE);
+        dptr += BLE_LL_EXT_ADV_ADVA_SIZE;
+    }
+
+    /* TargetA only for directed */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+        *ext_hdr_len += BLE_LL_EXT_ADV_TARGETA_SIZE;
+        *ext_hdr |= (1 << BLE_LL_EXT_ADV_TARGETA_BIT);
+        memcpy(dptr, advsm->initiator_addr, BLE_LL_EXT_ADV_TARGETA_SIZE);
+        dptr += BLE_LL_EXT_ADV_TARGETA_SIZE;
+
+        /* Set RxAdd to random if needed. */
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_RX_ADD) {
+            pdu_type |= BLE_ADV_PDU_HDR_RXADD_RAND;
+        }
+    }
+
+    /* ADI always */
+    *ext_hdr_len += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+    *ext_hdr |= (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT);
+    dptr[0] = advsm->adi & 0x00ff;
+    dptr[1] = advsm->adi >> 8;
+    dptr += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+
+    /* TxPower if configured */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_INC_TX_PWR) {
+        *ext_hdr_len += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+        *ext_hdr |= (1 << BLE_LL_EXT_ADV_TX_POWER_BIT);
+        dptr[0] = advsm->adv_txpwr + ble_ll_get_tx_pwr_compensation();
+        dptr += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+    }
+
+    pdulen = BLE_LL_EXT_ADV_HDR_LEN + *ext_hdr_len;
+
+    *hdr_byte = pdu_type;
+    *ext_hdr_len |= (BLE_LL_EXT_ADV_MODE_SCAN << 6);
+
+    return pdulen;
+}
+#endif
+
+static uint8_t
+ble_ll_adv_scan_rsp_legacy_pdu_make(uint8_t *dptr, void *pducb_arg,
+                                    uint8_t *hdr_byte)
+{
+    struct ble_ll_adv_sm *advsm;
+    uint8_t     scan_rsp_len;
+    uint8_t     pdulen;
+    uint8_t     hdr;
+
+    advsm = pducb_arg;
+
+    /* Make sure that the length is valid */
+    scan_rsp_len = SCAN_RSP_DATA_LEN(advsm);
+    assert(scan_rsp_len <= BLE_SCAN_RSP_LEGACY_DATA_MAX_LEN);
+
+    /* Set BLE transmit header */
+    pdulen = BLE_DEV_ADDR_LEN + scan_rsp_len;
+    hdr = BLE_ADV_PDU_TYPE_SCAN_RSP;
+    if (advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+        hdr |= BLE_ADV_PDU_HDR_TXADD_RAND;
+    }
+
+    *hdr_byte = hdr;
+
+    /*
+     * The adva in this packet will be the same one that was being advertised
+     * and is based on the peer identity address in the set advertising
+     * parameters. If a different peer sends us a scan request (for some reason)
+     * we will reply with an adva that was not generated based on the local irk
+     * of the peer sending the scan request.
+     */
+
+    /* Construct scan response */
+    memcpy(dptr, advsm->adva, BLE_DEV_ADDR_LEN);
+    if (scan_rsp_len != 0) {
+        os_mbuf_copydata(advsm->scan_rsp_data, 0, scan_rsp_len,
+                         dptr + BLE_DEV_ADDR_LEN);
+    }
+
+    return pdulen;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+/**
+ * Create a scan response PDU
+ *
+ * @param advsm
+ */
+static uint8_t
+ble_ll_adv_scan_rsp_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_adv_sm *advsm;
+
+    advsm = pducb_arg;
+
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        return ble_ll_adv_scan_rsp_legacy_pdu_make(dptr, pducb_arg, hdr_byte);
+    }
+
+    return ble_ll_adv_aux_pdu_make(dptr, pducb_arg, hdr_byte);
+}
+
+struct aux_conn_rsp_data {
+    struct ble_ll_adv_sm *advsm;
+    uint8_t *peer;
+    uint8_t rxadd;
+};
+
+/**
+ * Create a AUX connect response PDU
+ *
+ * @param advsm
+ */
+static uint8_t
+ble_ll_adv_aux_conn_rsp_pdu_make(uint8_t *dptr, void *pducb_arg,
+                                 uint8_t *hdr_byte)
+{
+    struct aux_conn_rsp_data *rsp_data;
+    uint8_t     pdulen;
+    uint8_t     ext_hdr_len;
+    uint8_t     ext_hdr_flags;
+    uint8_t     hdr;
+
+    rsp_data = pducb_arg;
+
+    /* flags,AdvA and TargetA */
+    ext_hdr_len = BLE_LL_EXT_ADV_FLAGS_SIZE + BLE_LL_EXT_ADV_ADVA_SIZE +
+                  BLE_LL_EXT_ADV_TARGETA_SIZE;
+    ext_hdr_flags = (1 << BLE_LL_EXT_ADV_ADVA_BIT);
+    ext_hdr_flags |= (1 << BLE_LL_EXT_ADV_TARGETA_BIT);
+
+    pdulen = BLE_LL_EXT_ADV_HDR_LEN + ext_hdr_len;
+
+    /* Set BLE transmit header */
+    hdr = BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP;
+    if (rsp_data->rxadd) {
+        hdr |= BLE_ADV_PDU_HDR_RXADD_MASK;
+    }
+    if (rsp_data->advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) {
+        hdr |= BLE_ADV_PDU_HDR_TXADD_MASK;
+    }
+
+    *hdr_byte = hdr;
+
+    /* ext hdr len and adv mode (00b) */
+    dptr[0] = ext_hdr_len;
+    dptr += 1;
+
+    /* ext hdr flags */
+    dptr[0] = ext_hdr_flags;
+    dptr += 1;
+
+    memcpy(dptr, rsp_data->advsm->adva, BLE_LL_EXT_ADV_ADVA_SIZE);
+    dptr += BLE_LL_EXT_ADV_ADVA_SIZE;
+
+    memcpy(dptr, rsp_data->peer, BLE_LL_EXT_ADV_TARGETA_SIZE);
+    dptr += BLE_LL_EXT_ADV_ADVA_SIZE;
+
+    return pdulen;
+}
+#endif
+
+/**
+ * Called to indicate the advertising event is over.
+ *
+ * Context: Interrupt
+ *
+ * @param advsm
+ *
+ */
+static void
+ble_ll_adv_tx_done(void *arg)
+{
+    struct ble_ll_adv_sm *advsm;
+
+    /* reset power to max after advertising */
+    ble_phy_txpwr_set(MYNEWT_VAL(BLE_LL_TX_PWR_DBM));
+
+    advsm = (struct ble_ll_adv_sm *)arg;
+
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_ADV_TXDONE, advsm->adv_instance,
+                       advsm->flags & BLE_LL_ADV_SM_FLAG_ACTIVE_CHANSET_MASK);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (ble_ll_adv_active_chanset_is_pri(advsm)) {
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+    } else if (ble_ll_adv_active_chanset_is_sec(advsm)) {
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_sec_txdone_ev);
+    } else {
+        assert(0);
+    }
+#else
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+#endif
+
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+
+    ble_ll_adv_active_chanset_clear(advsm);
+
+    /* We no longer have a current state machine */
+    g_ble_ll_cur_adv_sm = NULL;
+}
+
+/*
+ * Called when an advertising event has been removed from the scheduler
+ * without being run.
+ */
+void
+ble_ll_adv_event_rmvd_from_sched(struct ble_ll_adv_sm *advsm)
+{
+    /*
+     * Need to set advertising channel to final chan so new event gets
+     * scheduled.
+     */
+    advsm->adv_chan = ble_ll_adv_final_chan(advsm);
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+/*
+ * Called when a periodic event has been removed from the scheduler
+ * without being run.
+ */
+void
+ble_ll_adv_periodic_rmvd_from_sched(struct ble_ll_adv_sm *advsm)
+{
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_periodic_txdone_ev);
+}
+#endif
+
+/**
+ * This is the scheduler callback (called from interrupt context) which
+ * transmits an advertisement.
+ *
+ * Context: Interrupt (scheduler)
+ *
+ * @param sch
+ *
+ * @return int
+ */
+static int
+ble_ll_adv_tx_start_cb(struct ble_ll_sched_item *sch)
+{
+    int rc;
+    uint8_t end_trans;
+    uint32_t txstart;
+    struct ble_ll_adv_sm *advsm;
+
+    /* Get the state machine for the event */
+    advsm = (struct ble_ll_adv_sm *)sch->cb_arg;
+
+    /* Set the current advertiser */
+    g_ble_ll_cur_adv_sm = advsm;
+
+    ble_ll_adv_active_chanset_set_pri(advsm);
+
+    if ((advsm->flags & BLE_LL_ADV_SM_FLAG_NEW_ADV_DATA) ||
+        (advsm->flags & BLE_LL_ADV_SM_FLAG_NEW_SCAN_RSP_DATA)) {
+        goto adv_tx_done;
+    }
+
+    /* Set the power */
+    ble_phy_txpwr_set(advsm->adv_txpwr);
+
+    /* Set channel */
+    rc = ble_phy_setchan(advsm->adv_chan, BLE_ACCESS_ADDR_ADV, BLE_LL_CRCINIT_ADV);
+    assert(rc == 0);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    /* Set phy mode */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        ble_phy_mode_set(BLE_PHY_MODE_1M, BLE_PHY_MODE_1M);
+    } else {
+        ble_phy_mode_set(advsm->pri_phy, advsm->pri_phy);
+    }
+#else
+    ble_phy_mode_set(BLE_PHY_MODE_1M, BLE_PHY_MODE_1M);
+#endif
+#endif
+
+    /* Set transmit start time. */
+    txstart = sch->start_time + g_ble_ll_sched_offset_ticks;
+    rc = ble_phy_tx_set_start_time(txstart, sch->remainder);
+    if (rc) {
+        STATS_INC(ble_ll_stats, adv_late_starts);
+        goto adv_tx_done;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    ble_phy_encrypt_disable();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    advsm->adv_rpa_index = -1;
+    if (ble_ll_resolv_enabled()) {
+        ble_phy_resolv_list_enable();
+    } else {
+        ble_phy_resolv_list_disable();
+    }
+#endif
+
+    /* We switch to RX after connectable or scannable legacy packets. */
+    if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
+            ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) ||
+             (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE))) {
+        end_trans = BLE_PHY_TRANSITION_TX_RX;
+        ble_phy_set_txend_cb(NULL, NULL);
+    } else {
+        end_trans = BLE_PHY_TRANSITION_NONE;
+        ble_phy_set_txend_cb(ble_ll_adv_tx_done, advsm);
+    }
+
+    /* Transmit advertisement */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    rc = ble_phy_tx(ble_ll_adv_pdu_make, advsm, end_trans);
+#else
+    rc = ble_phy_tx(ble_ll_adv_legacy_pdu_make, advsm, end_trans);
+#endif
+    if (rc) {
+        goto adv_tx_done;
+    }
+
+    /* Enable/disable whitelisting based on filter policy */
+    if (advsm->adv_filter_policy != BLE_HCI_ADV_FILT_NONE) {
+        ble_ll_whitelist_enable();
+    } else {
+        ble_ll_whitelist_disable();
+    }
+
+    /* Set link layer state to advertising */
+    ble_ll_state_set(BLE_LL_STATE_ADV);
+
+    /* Count # of adv. sent */
+    STATS_INC(ble_ll_stats, adv_txg);
+
+    return BLE_LL_SCHED_STATE_RUNNING;
+
+adv_tx_done:
+    ble_ll_adv_tx_done(advsm);
+    return BLE_LL_SCHED_STATE_DONE;
+}
+
+static void
+ble_ll_adv_set_sched(struct ble_ll_adv_sm *advsm)
+{
+    uint32_t max_usecs;
+    struct ble_ll_sched_item *sch;
+
+    sch = &advsm->adv_sch;
+    sch->cb_arg = advsm;
+    sch->sched_cb = ble_ll_adv_tx_start_cb;
+    sch->sched_type = BLE_LL_SCHED_TYPE_ADV;
+
+    /* Set end time to maximum time this schedule item may take */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        max_usecs = ble_ll_pdu_tx_time_get(advsm->adv_pdu_len, BLE_PHY_MODE_1M);
+
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+            max_usecs += BLE_LL_SCHED_DIRECT_ADV_MAX_USECS;
+        } else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+            max_usecs += BLE_LL_SCHED_ADV_MAX_USECS;
+        }
+    } else {
+        /*
+         * In ADV_EXT_IND we always set only ADI and AUX so the payload length
+         * is always 7 bytes.
+         */
+        max_usecs = ble_ll_pdu_tx_time_get(7, advsm->pri_phy);
+    }
+#else
+    max_usecs = ble_ll_pdu_tx_time_get(advsm->adv_pdu_len, BLE_PHY_MODE_1M);
+
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+        max_usecs += BLE_LL_SCHED_DIRECT_ADV_MAX_USECS;
+    } else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+        max_usecs += BLE_LL_SCHED_ADV_MAX_USECS;
+    }
+#endif
+
+    sch->start_time = advsm->adv_pdu_start_time - g_ble_ll_sched_offset_ticks;
+    sch->remainder = 0;
+    sch->end_time = advsm->adv_pdu_start_time +
+                    ble_ll_usecs_to_ticks_round_up(max_usecs);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static int
+ble_ll_adv_secondary_tx_start_cb(struct ble_ll_sched_item *sch)
+{
+    int rc;
+    uint8_t end_trans;
+    uint32_t txstart;
+    struct ble_ll_adv_sm *advsm;
+    ble_phy_tx_pducb_t pducb;
+    struct ble_ll_adv_aux *aux;
+
+    /* Get the state machine for the event */
+    advsm = (struct ble_ll_adv_sm *)sch->cb_arg;
+
+    /* Set the current advertiser */
+    g_ble_ll_cur_adv_sm = advsm;
+
+    ble_ll_adv_active_chanset_set_sec(advsm);
+
+    /* Set the power */
+    ble_phy_txpwr_set(advsm->adv_txpwr);
+
+    /* Set channel */
+    aux = AUX_CURRENT(advsm);
+    rc = ble_phy_setchan(aux->chan, BLE_ACCESS_ADDR_ADV,
+                         BLE_LL_CRCINIT_ADV);
+    assert(rc == 0);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    /* Set phy mode */
+     ble_phy_mode_set(advsm->sec_phy, advsm->sec_phy);
+#endif
+
+    /* Set transmit start time. */
+    txstart = sch->start_time + g_ble_ll_sched_offset_ticks;
+    rc = ble_phy_tx_set_start_time(txstart, sch->remainder);
+    if (rc) {
+        STATS_INC(ble_ll_stats, adv_late_starts);
+        goto adv_tx_done;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    ble_phy_encrypt_disable();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    advsm->adv_rpa_index = -1;
+    if (ble_ll_resolv_enabled()) {
+        ble_phy_resolv_list_enable();
+    } else {
+        ble_phy_resolv_list_disable();
+    }
+#endif
+
+    /* Set phy mode based on type of advertisement */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+        end_trans = BLE_PHY_TRANSITION_TX_RX;
+        ble_phy_set_txend_cb(NULL, NULL);
+        pducb = ble_ll_adv_aux_pdu_make;
+    } else if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) &&
+               advsm->aux_first_pdu) {
+        end_trans = BLE_PHY_TRANSITION_TX_RX;
+        ble_phy_set_txend_cb(NULL, NULL);
+        pducb = ble_ll_adv_aux_scannable_pdu_make;
+    } else {
+        end_trans = BLE_PHY_TRANSITION_NONE;
+        ble_phy_set_txend_cb(ble_ll_adv_tx_done, advsm);
+        pducb = ble_ll_adv_aux_pdu_make;
+    }
+
+    /* Transmit advertisement */
+    rc = ble_phy_tx(pducb, advsm, end_trans);
+    if (rc) {
+        goto adv_tx_done;
+    }
+
+    /* Enable/disable whitelisting based on filter policy */
+    if (advsm->adv_filter_policy != BLE_HCI_ADV_FILT_NONE) {
+        ble_ll_whitelist_enable();
+    } else {
+        ble_ll_whitelist_disable();
+    }
+
+    /* Set link layer state to advertising */
+    ble_ll_state_set(BLE_LL_STATE_ADV);
+
+    /* Count # of adv. sent */
+    STATS_INC(ble_ll_stats, adv_txg);
+
+    return BLE_LL_SCHED_STATE_RUNNING;
+
+adv_tx_done:
+    ble_ll_adv_tx_done(advsm);
+    return BLE_LL_SCHED_STATE_DONE;
+}
+
+static uint8_t
+ble_ll_adv_aux_scannable_pdu_payload_len(struct ble_ll_adv_sm *advsm)
+{
+    uint8_t len;
+
+    /* Flags, ADI always */
+    len = BLE_LL_EXT_ADV_HDR_LEN + BLE_LL_EXT_ADV_FLAGS_SIZE
+            + BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+
+    /* AdvA if not anonymous */
+    if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
+        len += BLE_LL_EXT_ADV_ADVA_SIZE;
+    }
+
+    /* TargetA only for directed */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+        len += BLE_LL_EXT_ADV_TARGETA_SIZE;
+    }
+
+    /* TxPower if configured */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_INC_TX_PWR) {
+        len += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+    }
+
+    return len;
+}
+
+static void
+ble_ll_adv_aux_calculate(struct ble_ll_adv_sm *advsm,
+                         struct ble_ll_adv_aux *aux, uint16_t aux_data_offset)
+{
+    uint16_t rem_aux_data_len;
+    uint8_t hdr_len;
+    bool chainable;
+
+    assert(!aux->sch.enqueued);
+    assert((AUX_DATA_LEN(advsm) > aux_data_offset) ||
+           (AUX_DATA_LEN(advsm) == 0 && aux_data_offset == 0));
+
+    aux->aux_data_offset = aux_data_offset;
+    aux->aux_data_len = 0;
+    aux->payload_len = 0;
+    aux->ext_hdr = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    aux->chan = ble_ll_utils_calc_dci_csa2(advsm->event_cntr++,
+                                           advsm->channel_id,
+                                           g_ble_ll_conn_params.num_used_chans,
+                                           g_ble_ll_conn_params.master_chan_map);
+#else
+    aux->chan = ble_ll_utils_remapped_channel(rand() % BLE_PHY_NUM_DATA_CHANS,
+                                              g_ble_ll_conn_params.master_chan_map);
+#endif
+
+    rem_aux_data_len = AUX_DATA_LEN(advsm) - aux_data_offset;
+    chainable = !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE);
+
+    hdr_len = BLE_LL_EXT_ADV_HDR_LEN;
+
+    if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE)) {
+        /* ADI */
+        aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT);
+        hdr_len += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+    }
+
+    /* AdvA for 1st PDU in chain (i.e. AUX_ADV_IND or AUX_SCAN_RSP) */
+    if (aux_data_offset == 0 &&
+        !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
+        aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_ADVA_BIT);
+        hdr_len += BLE_LL_EXT_ADV_ADVA_SIZE;
+    }
+
+    /* Note: this function does not calculate AUX_ADV_IND when advertising is
+     * scannable. Instead it is calculated in ble_ll_adv_aux_schedule_first().
+     *
+     * However this function calculates length of AUX_SCAN_RSP and according
+     * to BT 5.0 Vol 6 Part B, 2.3.2.3, TargetA shall not be include there.
+     *
+     * This is why TargetA is added to all directed advertising here unless it
+     * is scannable one.
+     *
+     * Note. TargetA shall not be also in AUX_CHAIN_IND
+     */
+    if (aux_data_offset == 0  &&
+        (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) &&
+            !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE)) {
+        aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_TARGETA_BIT);
+        hdr_len += BLE_LL_EXT_ADV_TARGETA_SIZE;
+    }
+
+    /* TxPower if configured.
+     * Note: TxPower should not be be present in AUX_CHAIN_IND
+     */
+    if (aux_data_offset == 0 &&
+        (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_INC_TX_PWR)) {
+        aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_TX_POWER_BIT);
+        hdr_len += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    /* SyncInfo for 1st PDU in chain (i.e. AUX_ADV_IND only) if periodic
+     * advertising is enabled
+     */
+    if (aux_data_offset == 0 && advsm->periodic_adv_active) {
+        aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_SYNC_INFO_BIT);
+        hdr_len += BLE_LL_EXT_ADV_SYNC_INFO_SIZE;
+    }
+#endif
+
+    /* if we have any fields in ext header we need to add flags, note that Aux
+     * PTR is handled later and it will account for flags if needed
+     */
+    if (aux->ext_hdr) {
+        hdr_len += BLE_LL_EXT_ADV_FLAGS_SIZE;
+    }
+
+    /* AdvData always */
+    aux->aux_data_len = min(BLE_LL_MAX_PAYLOAD_LEN - hdr_len, rem_aux_data_len);
+
+    /* AuxPtr if there are more AdvData remaining that we can fit here */
+    if (chainable && (rem_aux_data_len > aux->aux_data_len)) {
+            /* adjust for flags that needs to be added if AuxPtr is only field
+             * in Extended Header
+             */
+            if (!aux->ext_hdr) {
+                hdr_len += BLE_LL_EXT_ADV_FLAGS_SIZE;
+                aux->aux_data_len -= BLE_LL_EXT_ADV_FLAGS_SIZE;
+            }
+
+            aux->ext_hdr |= (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT);
+            hdr_len += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+            aux->aux_data_len -= BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+
+            /* PDU payload should be full if chained */
+            assert(hdr_len + aux->aux_data_len == BLE_LL_MAX_PAYLOAD_LEN);
+    }
+
+    aux->payload_len = hdr_len + aux->aux_data_len;
+}
+
+static void
+ble_ll_adv_aux_scheduled(struct ble_ll_adv_sm *advsm, uint32_t sch_start,
+                         void *arg)
+{
+    struct ble_ll_adv_aux *aux = arg;
+
+    aux->start_time = sch_start + g_ble_ll_sched_offset_ticks;
+}
+
+static void
+ble_ll_adv_aux_schedule_next(struct ble_ll_adv_sm *advsm)
+{
+    struct ble_ll_adv_aux *aux;
+    struct ble_ll_adv_aux *aux_next;
+    struct ble_ll_sched_item *sch;
+    uint16_t rem_aux_data_len;
+    uint16_t next_aux_data_offset;
+    uint32_t max_usecs;
+
+    assert(advsm->aux_active);
+
+    aux = AUX_CURRENT(advsm);
+    aux_next = AUX_NEXT(advsm);
+
+    assert(!aux_next->sch.enqueued);
+
+    /*
+     * Do not schedule next aux if current aux is no longer scheduled since we
+     * do not have reference time for scheduling.
+     */
+    if (!aux->sch.enqueued) {
+        return;
+    }
+
+    /*
+     * Do not schedule next aux if current aux does not have AuxPtr in extended
+     * header as this means we do not need subsequent ADV_CHAIN_IND to be sent.
+     */
+    if (!(aux->ext_hdr & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT))) {
+        return;
+    }
+
+    next_aux_data_offset = aux->aux_data_offset + aux->aux_data_len;
+
+    assert(AUX_DATA_LEN(advsm) >= next_aux_data_offset);
+
+    rem_aux_data_len = AUX_DATA_LEN(advsm) - next_aux_data_offset;
+    assert(rem_aux_data_len > 0);
+
+    ble_ll_adv_aux_calculate(advsm, aux_next, next_aux_data_offset);
+    max_usecs = ble_ll_pdu_tx_time_get(aux_next->payload_len, advsm->sec_phy);
+
+    aux_next->start_time = aux->sch.end_time +
+                           ble_ll_usecs_to_ticks_round_up(BLE_LL_MAFS + MYNEWT_VAL(BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY));
+
+    sch = &aux_next->sch;
+    sch->start_time = aux_next->start_time - g_ble_ll_sched_offset_ticks;
+    sch->remainder = 0;
+    sch->end_time = aux_next->start_time +
+                    ble_ll_usecs_to_ticks_round_up(max_usecs);
+    ble_ll_sched_adv_new(&aux_next->sch, ble_ll_adv_aux_scheduled, aux_next);
+
+    /*
+     * In case duration is set for advertising set we need to check if newly
+     * scheduled aux will fit inside duration. If not, remove it from scheduler
+     * so advertising will stop after current aux.
+     */
+    if (advsm->duration && (aux_next->sch.end_time > advsm->adv_end_time)) {
+        ble_ll_sched_rmv_elem(&aux_next->sch);
+    }
+}
+
+static void
+ble_ll_adv_aux_schedule_first(struct ble_ll_adv_sm *advsm)
+{
+    struct ble_ll_adv_aux *aux;
+    struct ble_ll_sched_item *sch;
+    uint32_t max_usecs;
+
+    assert(!advsm->aux_active);
+    assert(!advsm->aux[0].sch.enqueued);
+    assert(!advsm->aux[1].sch.enqueued);
+
+    advsm->aux_active = 1;
+    advsm->aux_index = 0;
+    advsm->aux_first_pdu = 1;
+    advsm->aux_not_scanned = 0;
+
+    aux = AUX_CURRENT(advsm);
+    ble_ll_adv_aux_calculate(advsm, aux, 0);
+
+    /* Set end time to maximum time this schedule item may take */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+        max_usecs = ble_ll_pdu_tx_time_get(aux->payload_len, advsm->sec_phy) +
+                    BLE_LL_IFS +
+                    /* AUX_CONN_REQ */
+                    ble_ll_pdu_tx_time_get(34 + 14, advsm->sec_phy)  +
+                    BLE_LL_IFS +
+                    /* AUX_CONN_RSP */
+                    ble_ll_pdu_tx_time_get(14, advsm->sec_phy);
+    } else if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
+        /* For scannable advertising we need to calculate how much time we
+         * need for AUX_ADV_IND along with AUX_SCAN_REQ, AUX_SCAN_RSP and
+         * IFS in between.
+         *
+         * Note:
+         *  1. aux->payload_len, which calculated by above ble_ll_adv_aux_calulcate(),
+         * contains AUX_SCAN_RSP length.
+         *  2. length of AUX_ADV_IND is calculated by special function:
+         *      ble_ll_adv_aux_scannable_pdu_payload_len()
+         */
+        max_usecs = ble_ll_pdu_tx_time_get(ble_ll_adv_aux_scannable_pdu_payload_len(advsm),
+                                           advsm->sec_phy) +
+                    BLE_LL_IFS +
+                    /* AUX_SCAN_REQ */
+                    ble_ll_pdu_tx_time_get(12, advsm->sec_phy)  +
+                    BLE_LL_IFS +
+                    /* AUX_SCAN_RSP */
+                    ble_ll_pdu_tx_time_get(aux->payload_len, advsm->sec_phy);
+    } else {
+        max_usecs = ble_ll_pdu_tx_time_get(aux->payload_len, advsm->sec_phy);
+    }
+
+    sch = &aux->sch;
+    sch->start_time = aux->start_time - g_ble_ll_sched_offset_ticks;
+    sch->remainder = 0;
+    sch->end_time = aux->start_time + ble_ll_usecs_to_ticks_round_up(max_usecs);
+    ble_ll_sched_adv_new(sch, ble_ll_adv_aux_scheduled, aux);
+}
+
+static void
+ble_ll_adv_aux_set_start_time(struct ble_ll_adv_sm *advsm)
+{
+    static const uint8_t bits[8] = {0, 1, 1, 2, 1, 2, 2, 3};
+    struct ble_ll_sched_item *sched = &advsm->adv_sch;
+    uint32_t adv_pdu_dur;
+    uint32_t adv_event_dur;
+    uint8_t chans;
+
+    assert(!advsm->aux_active);
+    assert(!advsm->aux[0].sch.enqueued);
+    assert(!advsm->aux[1].sch.enqueued);
+
+    assert(advsm->adv_chanmask > 0 &&
+           advsm->adv_chanmask <= BLE_HCI_ADV_CHANMASK_DEF);
+
+    chans = bits[advsm->adv_chanmask];
+
+    /*
+     * We want to schedule auxiliary packet as soon as possible after the end
+     * of advertising event, but no sooner than T_MAFS. The interval between
+     * advertising packets is 250 usecs (8.19 ticks) on LE Coded and a bit less
+     * on 1M, but it can vary a bit due to scheduling which we can't really
+     * control. Since we round ticks up for both interval and T_MAFS, we still
+     * have some margin here. The worst thing that can happen is that we skip
+     * last advertising packet which is not a bit problem so leave it as-is, no
+     * need to make code more complicated.
+     */
+
+    /*
+     * XXX: this could be improved if phy has TX-TX transition with controlled
+     *      or predefined interval, but since it makes advertising code even
+     *      more complicated let's skip it for now...
+     */
+
+    adv_pdu_dur = (int32_t)(sched->end_time - sched->start_time) -
+                  g_ble_ll_sched_offset_ticks;
+
+    /* 9 is 8.19 ticks rounded up - see comment above */
+    adv_event_dur = (adv_pdu_dur * chans) + (9 * (chans - 1));
+
+    advsm->aux[0].start_time = advsm->adv_event_start_time + adv_event_dur +
+                               ble_ll_usecs_to_ticks_round_up(BLE_LL_MAFS + MYNEWT_VAL(BLE_LL_SCHED_AUX_MAFS_DELAY));
+}
+
+static void
+ble_ll_adv_aux_schedule(struct ble_ll_adv_sm *advsm)
+{
+    /*
+     * For secondary channel we always start by scheduling two consecutive
+     * auxiliary packets at once. Then, after sending one packet we try to
+     * schedule another one as long as there are some data left to send. This
+     * is to make sure we can always calculate AuxPtr to subsequent packet
+     * without need to scheduled it in an interrupt.
+     */
+
+    ble_ll_adv_aux_set_start_time(advsm);
+    ble_ll_adv_aux_schedule_first(advsm);
+    ble_ll_adv_aux_schedule_next(advsm);
+
+    /*
+     * In case duration is set for advertising set we need to check if at least
+     * 1st aux will fit inside duration. If not, stop advertising now so we do
+     * not start extended advertising event which we cannot finish in time.
+     */
+    if (advsm->duration &&
+            (AUX_CURRENT(advsm)->sch.end_time > advsm->adv_end_time)) {
+        ble_ll_adv_sm_stop_timeout(advsm);
+    }
+}
+#endif
+
+/**
+ * Called when advertising need to be halted. This normally should not be called
+ * and is only called when a scheduled item executes but advertising is still
+ * running.
+ *
+ * Context: Interrupt
+ */
+void
+ble_ll_adv_halt(void)
+{
+    struct ble_ll_adv_sm *advsm;
+
+    if (g_ble_ll_cur_adv_sm != NULL) {
+        advsm = g_ble_ll_cur_adv_sm;
+
+        ble_ll_trace_u32(BLE_LL_TRACE_ID_ADV_HALT, advsm->adv_instance);
+
+        ble_phy_txpwr_set(MYNEWT_VAL(BLE_LL_TX_PWR_DBM));
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING) {
+            ble_ll_adv_flags_clear(advsm,
+                                   BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING);
+            ble_npl_eventq_put(&g_ble_ll_data.ll_evq,
+                               &advsm->adv_periodic_txdone_ev);
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+            g_ble_ll_cur_adv_sm = NULL;
+            return;
+        }
+#endif
+
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY)) {
+            ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_sec_txdone_ev);
+        }
+#endif
+
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        ble_ll_adv_active_chanset_clear(g_ble_ll_cur_adv_sm);
+        g_ble_ll_cur_adv_sm = NULL;
+    } else {
+        ble_ll_trace_u32(BLE_LL_TRACE_ID_ADV_HALT, UINT32_MAX);
+    }
+}
+
+/**
+ * Called by the HCI command parser when a set advertising parameters command
+ * has been received.
+ *
+ * Context: Link Layer task (HCI command parser)
+ *
+ * @param cmd
+ *
+ * @return int
+ */
+int
+ble_ll_adv_set_adv_params(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_adv_params_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_adv_sm *advsm;
+    uint8_t adv_filter_policy;
+    uint16_t adv_itvl_min;
+    uint16_t adv_itvl_max;
+    uint16_t props;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    advsm = &g_ble_ll_adv_sm[0];
+    if (advsm->adv_enabled) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Make sure intervals are OK (along with advertising type */
+    adv_itvl_min = le16toh(cmd->min_interval);
+    adv_itvl_max = le16toh(cmd->max_interval);
+
+    /*
+     * Get the filter policy now since we will ignore it if we are doing
+     * directed advertising
+     */
+    adv_filter_policy = cmd->filter_policy;
+
+    switch (cmd->type) {
+    case BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_HD:
+        adv_filter_policy = BLE_HCI_ADV_FILT_NONE;
+        memcpy(advsm->peer_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+
+        /* Ignore min/max interval */
+        adv_itvl_min = 0;
+        adv_itvl_max = 0;
+
+        props = BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_HD_DIR ;
+        break;
+    case BLE_HCI_ADV_TYPE_ADV_DIRECT_IND_LD:
+        adv_filter_policy = BLE_HCI_ADV_FILT_NONE;
+        memcpy(advsm->peer_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+
+        props = BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_LD_DIR ;
+        break;
+    case BLE_HCI_ADV_TYPE_ADV_IND:
+        props = BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_IND;
+        break;
+    case BLE_HCI_ADV_TYPE_ADV_NONCONN_IND:
+        props = BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_NONCONN;
+        break;
+    case BLE_HCI_ADV_TYPE_ADV_SCAN_IND:
+        props = BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_SCAN;
+        break;
+    default:
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Make sure intervals values are valid
+     * (HD directed advertising ignores those parameters)
+     */
+    if (!(props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED)) {
+        if ((adv_itvl_min > adv_itvl_max) ||
+                (adv_itvl_min < BLE_HCI_ADV_ITVL_MIN) ||
+                (adv_itvl_min > BLE_HCI_ADV_ITVL_MAX) ||
+                (adv_itvl_max < BLE_HCI_ADV_ITVL_MIN) ||
+                (adv_itvl_max > BLE_HCI_ADV_ITVL_MAX)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+    }
+
+    if ((cmd->own_addr_type > BLE_HCI_ADV_OWN_ADDR_MAX) ||
+        (cmd->peer_addr_type > BLE_HCI_ADV_PEER_ADDR_MAX)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    advsm->adv_txpwr = MYNEWT_VAL(BLE_LL_TX_PWR_DBM);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (cmd->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+        /* Copy peer address */
+        memcpy(advsm->peer_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+    }
+#else
+    /* If we dont support privacy some address types wont work */
+    if (cmd->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+        return BLE_ERR_UNSUPPORTED;
+    }
+#endif
+
+    /* There are only three adv channels, so check for any outside the range */
+    if (((cmd->chan_map & 0xF8) != 0) || (cmd->chan_map == 0)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check for valid filter policy */
+    if (adv_filter_policy > BLE_HCI_ADV_FILT_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Fill out rest of advertising state machine */
+    advsm->own_addr_type = cmd->own_addr_type;
+    advsm->peer_addr_type = cmd->peer_addr_type;
+    advsm->adv_filter_policy = adv_filter_policy;
+    advsm->adv_chanmask = cmd->chan_map;
+    advsm->adv_itvl_min = adv_itvl_min;
+    advsm->adv_itvl_max = adv_itvl_max;
+    advsm->props = props;
+
+    return 0;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_adv_update_did(struct ble_ll_adv_sm *advsm)
+{
+    uint16_t old_adi = advsm->adi;
+
+    /*
+     * The Advertising DID for a given advertising set shall be initialized
+     * with a randomly chosen value. Whenever the Host provides new advertising
+     * data or scan response data for a given advertising set (whether it is the
+     * same as the previous data or not), the Advertising DID shall be updated.
+     * The new value shall be a randomly chosen value that is not the same as
+     * the previously used value.
+     */
+    do {
+        advsm->adi = (advsm->adi & 0xf000) | (rand() & 0x0fff);
+    } while (old_adi == advsm->adi);
+}
+#endif
+
+static void
+ble_ll_adv_update_adv_scan_rsp_data(struct ble_ll_adv_sm *advsm)
+{
+    if (!(advsm->flags & BLE_LL_ADV_SM_FLAG_NEW_ADV_DATA) &&
+                    !(advsm->flags & BLE_LL_ADV_SM_FLAG_NEW_SCAN_RSP_DATA)) {
+        return;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (advsm->aux_active) {
+        return;
+    }
+#endif
+
+    if (advsm->flags & BLE_LL_ADV_SM_FLAG_NEW_ADV_DATA) {
+        if (advsm->new_adv_data) {
+            os_mbuf_free_chain(advsm->adv_data);
+            advsm->adv_data = advsm->new_adv_data;
+            advsm->new_adv_data = NULL;
+        }
+        ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_NEW_ADV_DATA);
+    } else if (advsm->flags & BLE_LL_ADV_SM_FLAG_NEW_SCAN_RSP_DATA) {
+        os_mbuf_free_chain(advsm->scan_rsp_data);
+        advsm->scan_rsp_data = advsm->new_scan_rsp_data;
+        advsm->new_scan_rsp_data = NULL;
+        ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_NEW_SCAN_RSP_DATA);
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* DID shall be updated when host provides new advertising data */
+    ble_ll_adv_update_did(advsm);
+#endif
+}
+
+/**
+ * Stop advertising state machine
+ *
+ * Context: Link Layer task.
+ *
+ * @param advsm
+ */
+static void
+ble_ll_adv_sm_stop(struct ble_ll_adv_sm *advsm)
+{
+    os_sr_t sr;
+
+    if (advsm->adv_enabled) {
+        ble_ll_rfmgmt_release();
+
+        /* Remove any scheduled advertising items */
+        ble_ll_sched_rmv_elem(&advsm->adv_sch);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        advsm->aux_active = 0;
+        ble_ll_sched_rmv_elem(&advsm->aux[0].sch);
+        ble_ll_sched_rmv_elem(&advsm->aux[1].sch);
+#endif
+
+        /* Set to standby if we are no longer advertising */
+        OS_ENTER_CRITICAL(sr);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if ((g_ble_ll_cur_adv_sm == advsm) &&
+               !(advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING)) {
+            ble_phy_disable();
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+            g_ble_ll_cur_adv_sm = NULL;
+            ble_ll_scan_chk_resume();
+        }
+#else
+        if (ble_ll_state_get() == BLE_LL_STATE_ADV) {
+            ble_phy_disable();
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+            g_ble_ll_cur_adv_sm = NULL;
+            ble_ll_scan_chk_resume();
+        }
+#endif
+        OS_EXIT_CRITICAL(sr);
+
+        ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &advsm->adv_sec_txdone_ev);
+#endif
+
+        /* If there is an event buf we need to free it */
+        if (advsm->conn_comp_ev) {
+            ble_hci_trans_buf_free(advsm->conn_comp_ev);
+            advsm->conn_comp_ev = NULL;
+        }
+
+        ble_ll_adv_active_chanset_clear(advsm);
+
+        /* Disable advertising */
+        advsm->adv_enabled = 0;
+
+        /* Check if there is outstanding update */
+        ble_ll_adv_update_adv_scan_rsp_data(advsm);
+    }
+}
+
+static void
+ble_ll_adv_sm_stop_timeout(struct ble_ll_adv_sm *advsm)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (ble_ll_hci_adv_mode_ext()) {
+        ble_ll_hci_ev_send_adv_set_terminated(BLE_ERR_DIR_ADV_TMO,
+                                                        advsm->adv_instance, 0,
+                                                        advsm->events);
+    }
+#endif
+
+    /*
+     * For high duty directed advertising we need to send connection
+     * complete event with proper status
+     */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+        ble_ll_conn_comp_event_send(NULL, BLE_ERR_DIR_ADV_TMO,
+                                    advsm->conn_comp_ev, advsm);
+        advsm->conn_comp_ev = NULL;
+    }
+
+    /* Disable advertising */
+    ble_ll_adv_sm_stop(advsm);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_adv_sm_stop_limit_reached(struct ble_ll_adv_sm *advsm)
+{
+    ble_ll_hci_ev_send_adv_set_terminated(BLE_ERR_LIMIT_REACHED,
+                                          advsm->adv_instance, 0,
+                                          advsm->events);
+
+    /*
+     * For high duty directed advertising we need to send connection
+     * complete event with proper status
+     *
+     * Spec is a bit unambiguous here since it doesn't define what code should
+     * be used if HD directed advertising was terminated before timeout due to
+     * events count limit. For now just use same code as with duration timeout.
+     */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+        ble_ll_conn_comp_event_send(NULL, BLE_ERR_DIR_ADV_TMO,
+                                    advsm->conn_comp_ev, advsm);
+        advsm->conn_comp_ev = NULL;
+    }
+
+    /* Disable advertising */
+    ble_ll_adv_sm_stop(advsm);
+}
+#endif
+
+static void
+ble_ll_adv_scheduled(struct ble_ll_adv_sm *advsm, uint32_t sch_start, void *arg)
+{
+    /* The event start time is when we start transmission of the adv PDU */
+    advsm->adv_event_start_time = sch_start + g_ble_ll_sched_offset_ticks;
+    advsm->adv_pdu_start_time = advsm->adv_event_start_time;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* this is validated for HD adv so no need to do additional checks here
+     * duration is in 10ms units
+     */
+    if (advsm->duration) {
+        advsm->adv_end_time = advsm->adv_event_start_time +
+                             os_cputime_usecs_to_ticks(advsm->duration * 10000);
+    }
+#else
+    /* Set the time at which we must end directed, high-duty cycle advertising.
+     */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+        advsm->adv_end_time = advsm->adv_event_start_time +
+                     os_cputime_usecs_to_ticks(BLE_LL_ADV_STATE_HD_MAX * 1000);
+    }
+#endif
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+static uint8_t
+ble_ll_adv_sync_pdu_make(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_adv_sm *advsm;
+    struct ble_ll_adv_sync *sync;
+    uint8_t adv_mode;
+    uint8_t pdu_type;
+    uint8_t ext_hdr_len;
+    uint32_t offset;
+
+    advsm = pducb_arg;
+    sync = SYNC_CURRENT(advsm);
+
+    assert(!ble_ll_adv_active_chanset_is_sec(advsm));
+    assert(advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING);
+
+    /* It's the same for AUX_SYNC_IND and AUX_CHAIN_IND */
+    pdu_type = BLE_ADV_PDU_TYPE_AUX_SYNC_IND;
+
+    /* non-connectable and non-scannable */
+    adv_mode = 0;
+
+    ext_hdr_len = sync->payload_len - BLE_LL_EXT_ADV_HDR_LEN - sync->sync_data_len;
+    dptr[0] = (adv_mode << 6) | ext_hdr_len;
+    dptr += 1;
+
+    /* only put flags if needed */
+    if (sync->ext_hdr) {
+        dptr[0] = sync->ext_hdr;
+        dptr += 1;
+    }
+
+    if (sync->ext_hdr & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT)) {
+        if (!SYNC_NEXT(advsm)->sch.enqueued) {
+            /*
+             * Trim data here in case we do not have next sync scheduled. This
+             * can happen if next sync was outside advertising set period and
+             * was removed from scheduler.
+             */
+            offset = 0;
+        } else {
+            offset = os_cputime_ticks_to_usecs(SYNC_NEXT(advsm)->start_time - sync->start_time);
+        }
+
+        ble_ll_adv_put_aux_ptr(SYNC_NEXT(advsm)->chan, advsm->sec_phy,
+                               offset, dptr);
+
+        dptr += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+    }
+
+    if (sync->ext_hdr & (1 << BLE_LL_EXT_ADV_TX_POWER_BIT)) {
+        dptr[0] = advsm->adv_txpwr + ble_ll_get_tx_pwr_compensation();
+        dptr += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+    }
+
+    if (sync->sync_data_len) {
+        os_mbuf_copydata(advsm->periodic_adv_data, sync->sync_data_offset,
+                         sync->sync_data_len, dptr);
+    }
+
+    *hdr_byte = pdu_type;
+
+    return sync->payload_len;
+}
+
+
+static void
+ble_ll_adv_sync_tx_done(struct ble_ll_adv_sm *advsm)
+{
+    /* reset power to max after advertising */
+    ble_phy_txpwr_set(MYNEWT_VAL(BLE_LL_TX_PWR_DBM));
+
+    /* for sync we trace a no pri nor sec set */
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_ADV_TXDONE, advsm->adv_instance, 0);
+
+    assert(advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING);
+    assert(!ble_ll_adv_active_chanset_is_sec(advsm));
+
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_periodic_txdone_ev);
+
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING);
+
+    /* We no longer have a current state machine */
+    g_ble_ll_cur_adv_sm = NULL;
+}
+
+/**
+ * Called to indicate the advertising sync event is over.
+ *
+ * Context: Interrupt
+ *
+ * @param advsm
+ *
+ */
+static void
+ble_ll_adv_sync_tx_end(void *arg)
+{
+    struct ble_ll_adv_sm *advsm = arg;
+
+    ble_ll_adv_sync_tx_done(advsm);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    /* store last sent periodic counter */
+    advsm->periodic_event_cntr_last_sent = advsm->periodic_event_cntr;
+#endif
+}
+
+static int
+ble_ll_adv_sync_tx_start_cb(struct ble_ll_sched_item *sch)
+{
+    int rc;
+    uint32_t txstart;
+    struct ble_ll_adv_sm *advsm;
+    struct ble_ll_adv_sync *sync;
+
+    /* Get the state machine for the event */
+    advsm = (struct ble_ll_adv_sm *)sch->cb_arg;
+
+    /* Set the current advertiser */
+    g_ble_ll_cur_adv_sm = advsm;
+
+    ble_ll_adv_active_chanset_clear(advsm);
+    ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING);
+
+    /* Set the power */
+    ble_phy_txpwr_set(advsm->adv_txpwr);
+
+    /* Set channel */
+    sync = SYNC_CURRENT(advsm);
+    rc = ble_phy_setchan(sync->chan, advsm->periodic_access_addr,
+                         advsm->periodic_crcinit);
+
+    assert(rc == 0);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    /* Set phy mode */
+     ble_phy_mode_set(advsm->sec_phy, advsm->sec_phy);
+#endif
+
+    /* Set transmit start time. */
+    txstart = sch->start_time + g_ble_ll_sched_offset_ticks;
+    rc = ble_phy_tx_set_start_time(txstart, sch->remainder);
+    if (rc) {
+        STATS_INC(ble_ll_stats, adv_late_starts);
+        goto adv_tx_done;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    ble_phy_encrypt_disable();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    ble_phy_resolv_list_disable();
+#endif
+
+    /* Transmit advertisement */
+    ble_phy_set_txend_cb(ble_ll_adv_sync_tx_end, advsm);
+    rc = ble_phy_tx(ble_ll_adv_sync_pdu_make, advsm, BLE_PHY_TRANSITION_NONE);
+    if (rc) {
+        goto adv_tx_done;
+    }
+
+    /* disable whitelisting, we are always non-connectable non-scannable */
+    ble_ll_whitelist_disable();
+
+    /* Set link layer state to advertising */
+    ble_ll_state_set(BLE_LL_STATE_ADV);
+
+    /* Count # of adv. sent */
+    STATS_INC(ble_ll_stats, adv_txg);
+
+    return BLE_LL_SCHED_STATE_RUNNING;
+
+adv_tx_done:
+    ble_ll_adv_sync_tx_done(advsm);
+    return BLE_LL_SCHED_STATE_DONE;
+}
+
+static void
+ble_ll_adv_sync_calculate(struct ble_ll_adv_sm *advsm,
+                          struct ble_ll_adv_sync *sync,
+                          uint16_t sync_data_offset,
+                          uint8_t chan)
+{
+    uint16_t rem_sync_data_len;
+    uint8_t hdr_len;
+
+    assert(!sync->sch.enqueued);
+    assert((SYNC_DATA_LEN(advsm) > sync_data_offset) ||
+           (SYNC_DATA_LEN(advsm) == 0 && sync_data_offset == 0));
+
+    sync->sync_data_offset = sync_data_offset;
+    sync->sync_data_len = 0;
+    sync->payload_len = 0;
+    sync->ext_hdr = 0;
+    sync->chan = chan;
+
+    rem_sync_data_len = SYNC_DATA_LEN(advsm) - sync_data_offset;
+
+    hdr_len = BLE_LL_EXT_ADV_HDR_LEN;
+
+    /* TxPower if configured
+     * Note: TxPower shall not be present in chain PDU for SYNC
+     */
+    if (sync_data_offset == 0 &&
+        (advsm->periodic_adv_props & BLE_HCI_LE_SET_PERIODIC_ADV_PROP_INC_TX_PWR)) {
+        sync->ext_hdr |= (1 << BLE_LL_EXT_ADV_TX_POWER_BIT);
+        hdr_len += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+    }
+
+    /* if we have any fields in ext header we need to add flags, note that Aux
+     * PTR is handled later and it will account for flags if needed
+     *
+     * This could be handled inside TxPower but lets keep code consistent with
+     * how Aux calculate works and this also make it easier to add more fields
+     * into flags if needed in future
+     */
+    if (sync->ext_hdr) {
+        hdr_len += BLE_LL_EXT_ADV_FLAGS_SIZE;
+    }
+
+    /* AdvData always */
+    sync->sync_data_len = min(BLE_LL_MAX_PAYLOAD_LEN - hdr_len, rem_sync_data_len);
+
+    /* AuxPtr if there are more AdvData remaining that we can fit here */
+    if ((rem_sync_data_len > sync->sync_data_len)) {
+            /* adjust for flags that needs to be added if AuxPtr is only field
+             * in Extended Header
+             */
+            if (!sync->ext_hdr) {
+                hdr_len += BLE_LL_EXT_ADV_FLAGS_SIZE;
+                sync->sync_data_len -= BLE_LL_EXT_ADV_FLAGS_SIZE;
+            }
+
+            sync->ext_hdr |= (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT);
+            hdr_len += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+            sync->sync_data_len -= BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+
+            /* PDU payload should be full if chained */
+            assert(hdr_len + sync->sync_data_len == BLE_LL_MAX_PAYLOAD_LEN);
+    }
+
+    sync->payload_len = hdr_len + sync->sync_data_len;
+}
+
+static void
+ble_ll_adv_periodic_schedule_first(struct ble_ll_adv_sm *advsm,
+                                   bool first_pdu)
+{
+    struct ble_ll_adv_sync *sync;
+    struct ble_ll_sched_item *sch;
+    uint32_t sch_start;
+    uint32_t max_usecs;
+    uint8_t chan;
+    int rc;
+
+    assert(!advsm->periodic_sync_active);
+    assert(!advsm->periodic_sync[0].sch.enqueued);
+    assert(!advsm->periodic_sync[1].sch.enqueued);
+
+    advsm->periodic_sync_active = 1;
+    advsm->periodic_sync_index = 0;
+
+    sync = SYNC_CURRENT(advsm);
+
+    /* For first SYNC packet in chain we use separate CSA#2 state to maintain
+     * freq hopping as advertised in SyncInfo
+     *
+     * Preincrement event counter as we later send this in PDU so make sure
+     * same values are used
+     */
+    chan = ble_ll_utils_calc_dci_csa2(++advsm->periodic_event_cntr,
+                                      advsm->periodic_channel_id,
+                                      advsm->periodic_num_used_chans,
+                                      advsm->periodic_chanmap);
+
+    ble_ll_adv_sync_calculate(advsm, sync, 0, chan);
+
+    /* sync is always non-connectable and non-scannable*/
+    max_usecs = ble_ll_pdu_tx_time_get(sync->payload_len, advsm->sec_phy);
+
+    sch = &sync->sch;
+
+    advsm->periodic_adv_event_start_time_remainder += advsm->periodic_adv_itvl_rem_usec;
+    if (advsm->periodic_adv_event_start_time_remainder >= 31) {
+        advsm->periodic_adv_event_start_time++;
+        advsm->periodic_adv_event_start_time_remainder -= 31;
+    }
+
+    sch->start_time = advsm->periodic_adv_event_start_time;
+    sch->remainder = advsm->periodic_adv_event_start_time_remainder;
+    sch->end_time = sch->start_time + ble_ll_usecs_to_ticks_round_up(max_usecs);
+    sch->start_time -= g_ble_ll_sched_offset_ticks;
+
+    rc = ble_ll_sched_periodic_adv(sch, &sch_start, first_pdu);
+    if (rc) {
+        STATS_INC(ble_ll_stats, periodic_adv_drop_event);
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq,
+                           &advsm->adv_periodic_txdone_ev);
+        return;
+    }
+
+    sync->start_time = sch_start + g_ble_ll_sched_offset_ticks;
+
+    assert(first_pdu ||
+           (sync->start_time == advsm->periodic_adv_event_start_time));
+
+    /* The event start time is when we start transmission of the SYNC PDU */
+    advsm->periodic_adv_event_start_time = sync->start_time;
+}
+
+static void
+ble_ll_adv_sync_next_scheduled(struct ble_ll_adv_sm *advsm, uint32_t sch_start,
+                         void *arg)
+{
+    struct ble_ll_adv_sync *sync = arg;
+
+    sync->start_time = sch_start + g_ble_ll_sched_offset_ticks;
+}
+
+static void
+ble_ll_adv_periodic_schedule_next(struct ble_ll_adv_sm *advsm)
+{
+    struct ble_ll_adv_sync *sync;
+    struct ble_ll_adv_sync *sync_next;
+    struct ble_ll_sched_item *sch;
+    uint16_t rem_sync_data_len;
+    uint16_t next_sync_data_offset;
+    uint32_t max_usecs;
+    uint8_t chan;
+
+    assert(advsm->periodic_sync_active);
+
+    sync = SYNC_CURRENT(advsm);
+    sync_next = SYNC_NEXT(advsm);
+
+    assert(!sync_next->sch.enqueued);
+
+    /*
+     * Do not schedule next sync if current sync is no longer scheduled since we
+     * do not have reference time for scheduling.
+     */
+    if (!sync->sch.enqueued) {
+        return;
+    }
+
+    /*
+     * Do not schedule next sync if current sync does not have AuxPtr in extended
+     * header as this means we do not need subsequent ADV_CHAIN_IND to be sent.
+     */
+    if (!(sync->ext_hdr & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT))) {
+        return;
+    }
+
+    next_sync_data_offset = sync->sync_data_offset + sync->sync_data_len;
+
+    assert(SYNC_DATA_LEN(advsm) >= next_sync_data_offset);
+
+    rem_sync_data_len = SYNC_DATA_LEN(advsm) - next_sync_data_offset;
+    assert(rem_sync_data_len > 0);
+
+    /* we use separate counter for chaining */
+    chan = ble_ll_utils_calc_dci_csa2(advsm->periodic_chain_event_cntr++,
+                                      advsm->periodic_channel_id,
+                                      advsm->periodic_num_used_chans,
+                                      advsm->periodic_chanmap);
+
+    ble_ll_adv_sync_calculate(advsm, sync_next, next_sync_data_offset, chan);
+    max_usecs = ble_ll_pdu_tx_time_get(sync_next->payload_len, advsm->sec_phy);
+
+    sync_next->start_time = sync->sch.end_time +
+                            ble_ll_usecs_to_ticks_round_up(BLE_LL_MAFS + MYNEWT_VAL(BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY));
+
+    sch = &sync_next->sch;
+    sch->start_time = sync_next->start_time - g_ble_ll_sched_offset_ticks;
+
+    /* adjust for previous packets remainder */
+    sch->remainder = sync->sch.remainder;
+    sch->end_time = sync_next->start_time +
+                    ble_ll_usecs_to_ticks_round_up(max_usecs);
+
+    /* here we can use ble_ll_sched_adv_new as we don't care about timing */
+    ble_ll_sched_adv_new(&sync_next->sch, ble_ll_adv_sync_next_scheduled,
+                         sync_next);
+
+    /* if we are pass advertising interval, drop chain */
+    if (sch->end_time > advsm->periodic_adv_event_start_time +
+            advsm->periodic_adv_itvl_ticks) {
+        STATS_INC(ble_ll_stats, periodic_chain_drop_event);
+        ble_ll_sched_rmv_elem(&sync->sch);
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq,
+                           &advsm->adv_periodic_txdone_ev);
+    }
+}
+
+static void
+ble_ll_adv_sync_schedule(struct ble_ll_adv_sm *advsm, bool first_pdu)
+{
+    /*
+     * For secondary channel we always start by scheduling two consecutive
+     * auxiliary packets at once. Then, after sending one packet we try to
+     * schedule another one as long as there are some data left to send. This
+     * is to make sure we can always calculate AuxPtr to subsequent packet
+     * without need to scheduled it in an interrupt.
+     */
+
+    ble_ll_adv_periodic_schedule_first(advsm, first_pdu);
+    ble_ll_adv_periodic_schedule_next(advsm);
+}
+
+static void
+ble_ll_adv_reschedule_periodic_event(struct ble_ll_adv_sm *advsm)
+{
+    advsm->periodic_adv_event_start_time += advsm->periodic_adv_itvl_ticks;
+    ble_ll_adv_sync_schedule(advsm, false);
+}
+
+static void
+ble_ll_adv_update_periodic_data(struct ble_ll_adv_sm *advsm)
+{
+    if (!(advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_NEW_DATA)) {
+        return;
+    }
+
+    if (advsm->periodic_sync_active) {
+        return;
+    }
+
+    if (advsm->periodic_new_data) {
+        os_mbuf_free_chain(advsm->periodic_adv_data);
+        advsm->periodic_adv_data = advsm->periodic_new_data;
+        advsm->periodic_new_data = NULL;
+    }
+
+    ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_NEW_DATA);
+}
+
+/**
+ * Called when periodic packet is txd on secondary channel
+ *
+ * Context: Link Layer task.
+ *
+ * @param ev
+ */
+static void
+ble_ll_adv_periodic_done(struct ble_ll_adv_sm *advsm)
+{
+    struct ble_ll_adv_sync *sync;
+    struct ble_ll_adv_sync *sync_next;
+
+    assert(advsm->periodic_adv_enabled);
+    assert(advsm->periodic_adv_active);
+    assert(advsm->periodic_sync_active);
+
+    ble_ll_rfmgmt_release();
+
+    sync = SYNC_CURRENT(advsm);
+    sync_next = SYNC_NEXT(advsm);
+
+    /* Remove anything else scheduled for periodic */
+    ble_ll_sched_rmv_elem(&sync->sch);
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &advsm->adv_periodic_txdone_ev);
+
+    /* If we have next SYNC scheduled, try to schedule another one */
+    if (sync_next->sch.enqueued) {
+        advsm->periodic_sync_index ^= 1;
+        ble_ll_adv_periodic_schedule_next(advsm);
+        return;
+    }
+
+    /* Check if we need to resume scanning */
+    ble_ll_scan_chk_resume();
+
+    advsm->periodic_sync_active = 0;
+    ble_ll_adv_update_periodic_data(advsm);
+    ble_ll_adv_reschedule_periodic_event(advsm);
+}
+
+static void
+ble_ll_adv_periodic_event_done(struct ble_npl_event *ev)
+{
+    ble_ll_adv_periodic_done(ble_npl_event_get_arg(ev));
+}
+
+static void
+ble_ll_adv_sm_start_periodic(struct ble_ll_adv_sm *advsm)
+{
+    uint32_t usecs;
+    uint32_t ticks;
+
+    /*
+     * The Advertising DID is not required to change when a SyncInfo field is
+     * added to or removed from an advertising set. However, if it does not
+     * change, then scanners may fail to synchronize to periodic advertising
+     * because entries in the Advertising DID cache (see Section 4.3.3) mean
+     * they ignore the advertisements containing the SyncInfo field. Therefore,
+     * advertisers should update the Advertising DID when a periodic advertising
+     * train is enabled.
+     */
+    ble_ll_adv_update_did(advsm);
+
+    advsm->periodic_adv_active = 1;
+
+    /* keep channel map since we cannot change it later on */
+    memcpy(advsm->periodic_chanmap, g_ble_ll_conn_params.master_chan_map,
+           BLE_LL_CONN_CHMAP_LEN);
+    advsm->periodic_num_used_chans = g_ble_ll_conn_params.num_used_chans;
+    advsm->periodic_event_cntr = 0;
+    /* for chaining we start with random counter as we share access addr */
+    advsm->periodic_chain_event_cntr = rand();
+    advsm->periodic_access_addr = ble_ll_utils_calc_access_addr();
+    advsm->periodic_channel_id = ((advsm->periodic_access_addr & 0xffff0000) >> 16) ^
+                                 (advsm->periodic_access_addr & 0x0000ffff);
+    advsm->periodic_crcinit = rand() & 0xffffff;
+
+    usecs = (uint32_t)advsm->periodic_adv_itvl_max * BLE_LL_ADV_PERIODIC_ITVL;
+    ticks = os_cputime_usecs_to_ticks(usecs);
+
+    advsm->periodic_adv_itvl_rem_usec = (usecs - os_cputime_ticks_to_usecs(ticks));
+    if (advsm->periodic_adv_itvl_rem_usec == 31) {
+        advsm->periodic_adv_itvl_rem_usec = 0;
+        ticks++;
+    }
+    advsm->periodic_adv_itvl_ticks = ticks;
+
+    /* There is no point in starting periodic advertising until next advertising
+     * event since SyncInfo is needed for synchronization
+     */
+    advsm->periodic_adv_event_start_time_remainder = 0;
+    advsm->periodic_adv_event_start_time = advsm->adv_pdu_start_time +
+                      os_cputime_usecs_to_ticks(advsm->adv_itvl_usecs + 5000);
+
+    ble_ll_adv_sync_schedule(advsm, true);
+}
+
+static void
+ble_ll_adv_sm_stop_periodic(struct ble_ll_adv_sm *advsm)
+{
+    os_sr_t sr;
+
+    ble_ll_rfmgmt_release();
+
+    if (!advsm->periodic_adv_active) {
+        return;
+    }
+
+    /*
+     * The Advertising DID is not required to change when a SyncInfo field is
+     * added to or removed from an advertising set. However, if it does not
+     * change, then scanners may unnecessary try to synchronize to instance that
+     * no longer has periodic advertising enabled  because entries in the
+     * Advertising DID cache (see Section 4.3.3) mean they ignore the
+     * advertisements no longer containing the SyncInfo field. Therefore,
+     * advertisers should update the Advertising DID when a periodic advertising
+     * train is disabled.
+     */
+    ble_ll_adv_update_did(advsm);
+
+    /* Remove any scheduled advertising items */
+    advsm->periodic_adv_active = 0;
+    advsm->periodic_sync_active = 0;
+    ble_ll_sched_rmv_elem(&advsm->periodic_sync[0].sch);
+    ble_ll_sched_rmv_elem(&advsm->periodic_sync[1].sch);
+
+    /* Set to standby if we are no longer advertising */
+    OS_ENTER_CRITICAL(sr);
+    if ((g_ble_ll_cur_adv_sm == advsm) &&
+            (advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING)) {
+        ble_phy_disable();
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        g_ble_ll_cur_adv_sm = NULL;
+        ble_ll_scan_chk_resume();
+    }
+    OS_EXIT_CRITICAL(sr);
+
+    ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_SYNC_SENDING);
+
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq,
+                          &advsm->adv_periodic_txdone_ev);
+
+    ble_ll_adv_update_periodic_data(advsm);
+}
+#endif
+
+/**
+ * Start the advertising state machine. This is called when the host sends
+ * the "enable advertising" command and is not called again while in the
+ * advertising state.
+ *
+ * Context: Link-layer task.
+ *
+ * @param advsm Pointer to advertising state machine
+ *
+ * @return int
+ */
+static int
+ble_ll_adv_sm_start(struct ble_ll_adv_sm *advsm)
+{
+    uint8_t adv_chan;
+    uint8_t *addr;
+    uint8_t *evbuf;
+    uint32_t start_delay_us;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    uint32_t access_addr;
+#endif
+    const uint8_t *random_addr;
+    uint32_t earliest_start_time;
+    int32_t delta;
+
+    /* only clear flags that are not set from HCI */
+    ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_TX_ADD |
+                                  BLE_LL_ADV_SM_FLAG_RX_ADD |
+                                  BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    random_addr = advsm->adv_random_addr;
+#else
+    random_addr = g_random_addr;
+#endif
+
+    if (!ble_ll_is_valid_own_addr_type(advsm->own_addr_type, random_addr)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /*
+     * Get an event with which to send the connection complete event if
+     * this is connectable
+     */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+        /* We expect this to be NULL but if not we wont allocate one... */
+        if (advsm->conn_comp_ev == NULL) {
+            evbuf = ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+            if (!evbuf) {
+                return BLE_ERR_MEM_CAPACITY;
+            }
+            advsm->conn_comp_ev = evbuf;
+        }
+    }
+
+    /* Set advertising address */
+    if ((advsm->own_addr_type & 1) == 0) {
+        addr = g_dev_addr;
+    } else {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        addr = advsm->adv_random_addr;
+#else
+        addr = g_random_addr;
+#endif
+        advsm->flags |= BLE_LL_ADV_SM_FLAG_TX_ADD;
+    }
+    memcpy(advsm->adva, addr, BLE_DEV_ADDR_LEN);
+
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+        memcpy(advsm->initiator_addr, advsm->peer_addr, BLE_DEV_ADDR_LEN);
+        if (advsm->peer_addr_type & 1) {
+            advsm->flags |= BLE_LL_ADV_SM_FLAG_RX_ADD;
+        }
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /* This will generate an RPA for both initiator addr and adva */
+    if (advsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+        ble_ll_adv_rpa_update(advsm);
+    }
+#endif
+
+    /* Set flag telling us that advertising is enabled */
+    advsm->adv_enabled = 1;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    advsm->event_cntr = 0;
+    access_addr = ble_ll_utils_calc_access_addr();
+    advsm->channel_id = ((access_addr & 0xffff0000) >> 16) ^
+                         (access_addr & 0x0000ffff);
+#endif
+
+    /* Determine the advertising interval we will use */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+        /* Set it to max. allowed for high duty cycle advertising */
+        advsm->adv_itvl_usecs = BLE_LL_ADV_PDU_ITVL_HD_MS_MAX;
+    } else {
+        advsm->adv_itvl_usecs = (uint32_t)advsm->adv_itvl_max;
+        advsm->adv_itvl_usecs *= BLE_LL_ADV_ITVL;
+    }
+
+    /* Set first advertising channel */
+    adv_chan = ble_ll_adv_first_chan(advsm);
+    advsm->adv_chan = adv_chan;
+
+    /*
+     * Scheduling 1st PDU is a bit tricky.
+     * Earliest possible start time is after RF is enabled so just force RF to
+     * start here to see when if will be fully enabled - it will be too early,
+     * but this is the only reliable way to have it enabled on time.
+     * Next we calculate expected start time (randomize it a bit) and this is
+     * used to setup start time for scheduler item.
+     * Then we check if start time for scheduler item (which includes scheduler
+     * overhead) is no earlier than calculated earliest possible start time and
+     * adjust scheduler item if necessary.
+     */
+    earliest_start_time = ble_ll_rfmgmt_enable_now();
+
+    start_delay_us = rand() % (BLE_LL_ADV_DELAY_MS_MAX * 1000);
+    advsm->adv_pdu_start_time = os_cputime_get32() +
+                                os_cputime_usecs_to_ticks(start_delay_us);
+
+    ble_ll_adv_set_sched(advsm);
+
+    delta = (int32_t)(advsm->adv_sch.start_time - earliest_start_time);
+    if (delta < 0) {
+        advsm->adv_sch.start_time -= delta;
+        advsm->adv_sch.end_time -= delta;
+    }
+
+    /* This does actual scheduling */
+    ble_ll_sched_adv_new(&advsm->adv_sch, ble_ll_adv_scheduled, NULL);
+
+    /* we start periodic before AE since we need PDU start time in SyncInfo */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    if (advsm->periodic_adv_enabled && !advsm->periodic_adv_active) {
+        ble_ll_adv_sm_start_periodic(advsm);
+    }
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY)) {
+        ble_ll_adv_aux_schedule(advsm);
+    }
+#endif
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Called when the LE HCI command read advertising channel tx power command
+ * has been received. Returns the current advertising transmit power.
+ *
+ * Context: Link Layer task (HCI command parser)
+ *
+ * @return int
+ */
+int
+ble_ll_adv_read_txpwr(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_adv_chan_txpwr_rp *rsp = (void *) rspbuf;
+
+    rsp->power_level = MYNEWT_VAL(BLE_LL_TX_PWR_DBM);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Turn advertising on/off.
+ *
+ * Context: Link Layer task
+ *
+ * @param cmd
+ *
+ * @return int
+ */
+static int
+ble_ll_adv_set_enable(uint8_t instance, uint8_t enable, int duration,
+                      uint8_t events)
+{
+    int rc;
+    struct ble_ll_adv_sm *advsm;
+
+    advsm = ble_ll_adv_sm_find_configured(instance);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    rc = BLE_ERR_SUCCESS;
+    if (enable == 1) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_ADV_DATA_INCOMPLETE) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        if (ble_ll_hci_adv_mode_ext() &&
+                (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) &&
+                !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
+                SCAN_RSP_DATA_LEN(advsm) == 0) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        /* handle specifics of HD dir adv enabled in legacy way */
+        if (duration < 0) {
+            if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+                duration = BLE_LL_ADV_STATE_HD_MAX / 10;
+            } else {
+                duration = 0;
+            }
+        }
+        advsm->duration = duration;
+        advsm->events_max = events;
+        advsm->events = 0;
+#endif
+
+        /* If already enabled, do nothing */
+        if (!advsm->adv_enabled) {
+            /* Start the advertising state machine */
+            rc = ble_ll_adv_sm_start(advsm);
+        }
+    } else if (enable == 0) {
+        ble_ll_adv_sm_stop(advsm);
+    } else {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return rc;
+}
+
+int
+ble_ll_hci_adv_set_enable(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_adv_enable_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_adv_set_enable(0, cmd->enable, -1, 0);
+}
+
+static void
+ble_ll_adv_update_data_mbuf(struct os_mbuf **omp, bool new_data, uint16_t maxlen,
+                            const void *data, uint16_t datalen)
+{
+    struct os_mbuf *om;
+    int ret;
+
+    om = *omp;
+
+    if (new_data) {
+        if (om) {
+            os_mbuf_free_chain(om);
+        }
+
+        om = os_msys_get_pkthdr(datalen, 0);
+        if (!om) {
+            goto done;
+        }
+    }
+
+    assert(om);
+
+    if (OS_MBUF_PKTLEN(om) + datalen > maxlen) {
+        os_mbuf_free_chain(om);
+        om = NULL;
+        goto done;
+    }
+
+    ret = os_mbuf_append(om, data, datalen);
+    if (ret) {
+        os_mbuf_free_chain(om);
+        om = NULL;
+    }
+
+done:
+    *omp = om;
+}
+
+/**
+ * Set the scan response data that the controller will send.
+ *
+ * @param cmd
+ * @param len
+ *
+ * @return int
+ */
+static int
+ble_ll_adv_set_scan_rsp_data(const uint8_t *data, uint8_t datalen,
+                             uint8_t instance, uint8_t operation)
+{
+    struct ble_ll_adv_sm *advsm;
+    bool new_data;
+
+    advsm = ble_ll_adv_sm_find_configured(instance);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    /* check if type of advertising support scan rsp */
+    if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE)) {
+        if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+    }
+
+    switch (operation) {
+    case BLE_HCI_LE_SET_DATA_OPER_COMPLETE:
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            if (datalen > BLE_SCAN_RSP_LEGACY_DATA_MAX_LEN) {
+                return BLE_ERR_INV_HCI_CMD_PARMS;
+            }
+        }
+
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    case BLE_HCI_LE_SET_DATA_OPER_LAST:
+        /* TODO mark scan rsp as complete? */
+        /* fall through */
+    case BLE_HCI_LE_SET_DATA_OPER_INT:
+        if (!advsm->scan_rsp_data) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (advsm->adv_enabled) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        if (!datalen) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+        break;
+    case BLE_HCI_LE_SET_DATA_OPER_FIRST:
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (advsm->adv_enabled) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        if (!datalen) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        break;
+#endif
+    default:
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    new_data = (operation == BLE_HCI_LE_SET_DATA_OPER_COMPLETE) ||
+               (operation == BLE_HCI_LE_SET_DATA_OPER_FIRST);
+
+    if (advsm->adv_enabled) {
+        if (advsm->new_scan_rsp_data) {
+            ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_NEW_SCAN_RSP_DATA);
+            os_mbuf_free_chain(advsm->new_scan_rsp_data);
+            advsm->new_scan_rsp_data = NULL;
+        }
+
+        ble_ll_adv_update_data_mbuf(&advsm->new_scan_rsp_data, new_data,
+                                    BLE_ADV_DATA_MAX_LEN, data, datalen);
+        if (!advsm->new_scan_rsp_data) {
+            return BLE_ERR_MEM_CAPACITY;
+        }
+        ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_NEW_SCAN_RSP_DATA);
+    } else {
+        ble_ll_adv_update_data_mbuf(&advsm->scan_rsp_data, new_data,
+                                    BLE_SCAN_RSP_DATA_MAX_LEN, data, datalen);
+        if (!advsm->scan_rsp_data) {
+            return BLE_ERR_MEM_CAPACITY;
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        /* DID shall be updated when host provides new scan response data */
+        ble_ll_adv_update_did(advsm);
+#endif
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_hci_set_scan_rsp_data(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_scan_rsp_data_cp *cmd = (const void *) cmdbuf;
+
+    if ((len != sizeof(*cmd)) || (cmd->scan_rsp_len > sizeof(cmd->scan_rsp))) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_adv_set_scan_rsp_data(cmd->scan_rsp, cmd->scan_rsp_len, 0,
+                                        BLE_HCI_LE_SET_DATA_OPER_COMPLETE);
+}
+/**
+ * Called by the LL HCI command parser when a set advertising
+ * data command has been sent from the host to the controller.
+ *
+ * @param cmd Pointer to command data
+ * @param len Length of command data
+ *
+ * @return int 0: success; BLE_ERR_INV_HCI_CMD_PARMS otherwise.
+ */
+static int
+ble_ll_adv_set_adv_data(const uint8_t *data, uint8_t datalen, uint8_t instance,
+                        uint8_t operation)
+{
+    struct ble_ll_adv_sm *advsm;
+    bool new_data;
+
+    advsm = ble_ll_adv_sm_find_configured(instance);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    /* check if type of advertising support adv data */
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+            if (ble_ll_hci_adv_mode_ext()) {
+                return BLE_ERR_INV_HCI_CMD_PARMS;
+            }
+        }
+    } else {
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+    }
+
+    switch (operation) {
+    case BLE_HCI_LE_SET_DATA_OPER_COMPLETE:
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            if (datalen > BLE_ADV_LEGACY_DATA_MAX_LEN) {
+                return BLE_ERR_INV_HCI_CMD_PARMS;
+            }
+        }
+
+        ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_ADV_DATA_INCOMPLETE);
+
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    case BLE_HCI_LE_SET_DATA_OPER_UNCHANGED:
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (!advsm->adv_enabled || !ADV_DATA_LEN(advsm) || datalen) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        /* update DID only */
+        ble_ll_adv_update_did(advsm);
+        return BLE_ERR_SUCCESS;
+    case BLE_HCI_LE_SET_DATA_OPER_LAST:
+        ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_ADV_DATA_INCOMPLETE);
+        /* fall through */
+    case BLE_HCI_LE_SET_DATA_OPER_INT:
+        if (!advsm->adv_data) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (!datalen) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (advsm->adv_enabled) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+        break;
+    case BLE_HCI_LE_SET_DATA_OPER_FIRST:
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (advsm->adv_enabled) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        if (!datalen) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_ADV_DATA_INCOMPLETE);
+        break;
+#endif
+    default:
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    new_data = (operation == BLE_HCI_LE_SET_DATA_OPER_COMPLETE) ||
+               (operation == BLE_HCI_LE_SET_DATA_OPER_FIRST);
+
+    if (advsm->adv_enabled) {
+        if (advsm->new_adv_data) {
+            ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_NEW_ADV_DATA);
+            os_mbuf_free_chain(advsm->new_adv_data);
+            advsm->new_adv_data = NULL;
+        }
+
+        ble_ll_adv_update_data_mbuf(&advsm->new_adv_data, new_data,
+                                    BLE_ADV_DATA_MAX_LEN, data, datalen);
+        if (!advsm->new_adv_data) {
+            return BLE_ERR_MEM_CAPACITY;
+        }
+        ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_NEW_ADV_DATA);
+    } else {
+        ble_ll_adv_update_data_mbuf(&advsm->adv_data, new_data,
+                                    BLE_ADV_DATA_MAX_LEN, data, datalen);
+        if (!advsm->adv_data) {
+            return BLE_ERR_MEM_CAPACITY;
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        /* DID shall be updated when host provides new advertising data */
+        ble_ll_adv_update_did(advsm);
+#endif
+        }
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_hci_set_adv_data(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_adv_data_cp *cmd = (const void *) cmdbuf;
+
+    if ((len != sizeof(*cmd)) || (cmd->adv_data_len > sizeof(cmd->adv_data))) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_adv_set_adv_data(cmd->adv_data, cmd->adv_data_len, 0,
+                                   BLE_HCI_LE_SET_DATA_OPER_COMPLETE);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static bool
+pri_phy_valid(uint8_t phy)
+{
+    switch (phy) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case BLE_HCI_LE_PHY_CODED:
+#endif
+    case BLE_HCI_LE_PHY_1M:
+        return true;
+    default:
+        return false;
+    }
+}
+
+static bool
+sec_phy_valid(uint8_t phy)
+{
+    switch (phy) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case BLE_HCI_LE_PHY_CODED:
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    case BLE_HCI_LE_PHY_2M:
+#endif
+    case BLE_HCI_LE_PHY_1M:
+        return true;
+    default:
+        return false;
+    }
+}
+
+static struct ble_ll_adv_sm *
+ble_ll_adv_sm_get(uint8_t instance)
+{
+    struct ble_ll_adv_sm *advsm;
+    int i;
+
+    advsm = ble_ll_adv_sm_find_configured(instance);
+    if (advsm) {
+        return advsm;
+    }
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_adv_sm); i++) {
+        advsm = &g_ble_ll_adv_sm[i];
+
+        if (!(advsm->flags & BLE_LL_ADV_SM_FLAG_CONFIGURED)) {
+            ble_ll_adv_sm_init(advsm);
+
+           /* configured flag is set by caller on success config */
+           advsm->adv_instance = instance;
+           return advsm;
+        }
+    }
+
+    return NULL;
+}
+
+int
+ble_ll_adv_ext_set_param(const uint8_t *cmdbuf, uint8_t len,
+                         uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_set_ext_adv_params_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_set_ext_adv_params_rp *rsp = (void *) rspbuf;
+    struct ble_ll_adv_sm *advsm;
+    uint32_t adv_itvl_min;
+    uint32_t adv_itvl_max;
+    uint16_t props;
+    int rc;
+
+    if (len != sizeof(*cmd )) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    advsm = ble_ll_adv_sm_get(cmd->adv_handle);
+    if (!advsm) {
+        rc = BLE_ERR_MEM_CAPACITY;
+        goto done;
+    }
+
+    if (advsm->adv_enabled) {
+        rc = BLE_ERR_CMD_DISALLOWED;
+        goto done;
+    }
+
+    props = le16toh(cmd->props);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    /* If the Host issues this command when periodic advertising is enabled for
+     * the specified advertising set and connectable, scannable, legacy, or
+     * anonymous advertising is specified, the Controller shall return the
+     * error code Invalid HCI Command Parameters (0x12).
+     */
+    if (advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_CONFIGURED) {
+        if (advsm->periodic_adv_enabled) {
+            if (props & (BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE |
+                         BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE |
+                         BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY |
+                         BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV)) {
+                rc = BLE_ERR_INV_HCI_CMD_PARMS;
+                goto done;
+            }
+        }
+    }
+#endif
+
+    adv_itvl_min = cmd->pri_itvl_min[2] << 16 | cmd->pri_itvl_min[1] << 8 |
+                   cmd->pri_itvl_min[0];
+    adv_itvl_max = cmd->pri_itvl_max[2] << 16 | cmd->pri_itvl_max[1] << 8 |
+                   cmd->pri_itvl_max[0];
+
+    if (props & ~BLE_HCI_LE_SET_EXT_ADV_PROP_MASK) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    if (props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        if (ADV_DATA_LEN(advsm) > BLE_ADV_LEGACY_DATA_MAX_LEN ||
+            SCAN_RSP_DATA_LEN(advsm) > BLE_SCAN_RSP_LEGACY_DATA_MAX_LEN) {
+            rc = BLE_ERR_INV_HCI_CMD_PARMS;
+            goto done;
+        }
+
+        /* if legacy bit is set possible values are limited */
+        switch (props) {
+        case BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_IND:
+        case BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_LD_DIR:
+        case BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_HD_DIR:
+        case BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_SCAN:
+        case BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY_NONCONN:
+            break;
+        default:
+            rc = BLE_ERR_INV_HCI_CMD_PARMS;
+            goto done;
+        }
+    } else {
+        /* HD directed advertising allowed only on legacy PDUs */
+        if (props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+            rc = BLE_ERR_INV_HCI_CMD_PARMS;
+            goto done;
+        }
+
+        /* if ext advertising PDUs are used then it shall not be both
+         * connectable and scanable
+         */
+        if ((props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) &&
+            (props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE)) {
+            rc = BLE_ERR_INV_HCI_CMD_PARMS;
+            goto done;
+        }
+    }
+
+    /* High Duty Directed advertising is special */
+    if (props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+        if (ADV_DATA_LEN(advsm) || SCAN_RSP_DATA_LEN(advsm)) {
+            rc = BLE_ERR_INV_HCI_CMD_PARMS;
+            goto done;
+        }
+
+        /* Ignore min/max interval */
+        adv_itvl_min = 0;
+        adv_itvl_max = 0;
+    } else {
+        /* validate intervals for non HD-directed advertising */
+        if ((adv_itvl_min > adv_itvl_max) ||
+                (adv_itvl_min < BLE_HCI_ADV_ITVL_MIN) ||
+                (adv_itvl_max < BLE_HCI_ADV_ITVL_MIN)) {
+            rc = BLE_ERR_INV_HCI_CMD_PARMS;
+            goto done;
+        }
+
+        /* TODO for now limit those to values from legacy advertising
+         *
+         * If the primary advertising interval range is outside the advertising
+         * interval range supported by the Controller, then the Controller shall
+         * return the error code Unsupported Feature or Parameter Value (0x11).
+         */
+        if ((adv_itvl_min > BLE_HCI_ADV_ITVL_MAX) ||
+                (adv_itvl_max > BLE_HCI_ADV_ITVL_MAX)) {
+            rc = BLE_ERR_UNSUPPORTED;
+            goto done;
+        }
+    }
+
+    /* There are only three adv channels, so check for any outside the range */
+    if (((cmd->pri_chan_map & 0xF8) != 0) || (cmd->pri_chan_map == 0)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    if (cmd->own_addr_type > BLE_HCI_ADV_OWN_ADDR_MAX) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /* If we dont support privacy some address types wont work */
+    if (cmd->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+        rc = BLE_ERR_UNSUPPORTED;
+        goto done;
+    }
+#endif
+
+    /* peer address type is only valid for directed */
+    if ((props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) &&
+            (cmd->peer_addr_type > BLE_HCI_ADV_PEER_ADDR_MAX)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    /* Check filter policy (valid only for undirected) */
+    if (!(props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) &&
+         cmd->filter_policy > BLE_HCI_ADV_FILT_MAX) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    if (!pri_phy_valid(cmd->pri_phy)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    /* check secondary phy only if not using legacy PDUs */
+    if (!(props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
+            !sec_phy_valid(cmd->sec_phy)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    if (cmd->sid > 0x0f) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    if (cmd->scan_req_notif > 0x01) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    rc = BLE_ERR_SUCCESS;
+
+    if (cmd->tx_power == 127) {
+        /* no preference */
+        advsm->adv_txpwr = MYNEWT_VAL(BLE_LL_TX_PWR_DBM);
+    } else {
+        advsm->adv_txpwr = ble_phy_txpower_round(cmd->tx_power);
+    }
+
+    /* we can always store as those are validated and used only when needed */
+    advsm->peer_addr_type = cmd->peer_addr_type;
+    memcpy(advsm->peer_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+    advsm->own_addr_type = cmd->own_addr_type;
+    advsm->adv_filter_policy = cmd->filter_policy;
+    advsm->adv_chanmask = cmd->pri_chan_map;
+    advsm->adv_itvl_min = adv_itvl_min;
+    advsm->adv_itvl_max = adv_itvl_max;
+    advsm->pri_phy = cmd->pri_phy;
+    advsm->sec_phy = cmd->sec_phy;
+    /* Update SID only */
+    advsm->adi = (advsm->adi & 0x0fff) | ((cmd->sid << 12));
+
+    advsm->props = props;
+
+    /* Set proper mbuf chain for aux data */
+    if (props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        advsm->aux_data = NULL;
+    } else if (props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
+        advsm->aux_data = &advsm->scan_rsp_data;
+    } else {
+        advsm->aux_data = &advsm->adv_data;
+    }
+
+    if (cmd->scan_req_notif) {
+        ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_SCAN_REQ_NOTIF);
+    } else {
+        ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_SCAN_REQ_NOTIF);
+    }
+
+    ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_CONFIGURED);
+
+done:
+    /* Update TX power */
+    rsp->tx_power = rc ? 0 : advsm->adv_txpwr;
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+int
+ble_ll_adv_ext_set_adv_data(const uint8_t *cmdbuf, uint8_t cmdlen)
+{
+    const struct ble_hci_le_set_ext_adv_data_cp *cmd = (const void *) cmdbuf;
+
+    if (cmdlen < sizeof(*cmd )) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->adv_data_len > BLE_HCI_MAX_EXT_ADV_DATA_LEN ||
+            cmd->adv_data_len > cmdlen - sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* TODO fragment preference ignored for now */
+
+    return ble_ll_adv_set_adv_data(cmd->adv_data, cmd->adv_data_len,
+                                   cmd->adv_handle, cmd->operation);
+}
+
+int
+ble_ll_adv_ext_set_scan_rsp(const uint8_t *cmdbuf, uint8_t cmdlen)
+{
+    const struct ble_hci_le_set_ext_scan_rsp_data_cp *cmd = (const void *) cmdbuf;
+
+    if (cmdlen < sizeof(*cmd )) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->scan_rsp_len > BLE_HCI_MAX_EXT_ADV_DATA_LEN ||
+            cmd->scan_rsp_len > cmdlen - sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* TODO fragment preference ignored for now */
+
+    return ble_ll_adv_set_scan_rsp_data(cmd->scan_rsp, cmd->scan_rsp_len,
+                                        cmd->adv_handle, cmd->operation);
+}
+
+/**
+ * HCI LE extended advertising enable command
+ *
+ * @param cmd Pointer to command data
+ * @param len Command data length
+ *
+ * @return int BLE error code
+ */
+int
+ble_ll_adv_ext_set_enable(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_ext_adv_enable_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_adv_sm *advsm;
+    int i, j, rc;
+
+    if (len < sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* check if length is correct */
+    if (len != 2 + (cmd->num_sets * sizeof(cmd->sets[0]))) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->num_sets > BLE_ADV_INSTANCES) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->num_sets == 0) {
+        if (cmd->enable) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        /* disable all instances */
+        for (i = 0; i < BLE_ADV_INSTANCES; i++) {
+            ble_ll_adv_set_enable(i, 0, 0, 0);
+        }
+
+        return BLE_ERR_SUCCESS;
+    }
+
+    /* validate instances */
+    for (i = 0; i < cmd->num_sets; i++) {
+        /* validate duplicated sets */
+        for (j = i + 1; j < cmd->num_sets; j++) {
+            if (cmd->sets[i].adv_handle == cmd->sets[j].adv_handle) {
+                return BLE_ERR_INV_HCI_CMD_PARMS;
+            }
+        }
+
+        advsm = ble_ll_adv_sm_find_configured(cmd->sets[i].adv_handle);
+        if (!advsm) {
+            return BLE_ERR_UNK_ADV_INDENT;
+        }
+
+        if (cmd->enable) {
+            if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+                if (cmd->sets[i].duration == 0 ||
+                        le16toh(cmd->sets[i].duration) > 128) {
+                    return BLE_ERR_INV_HCI_CMD_PARMS;
+                }
+            }
+        }
+    }
+
+    for (i = 0; i < cmd->num_sets; i++) {
+        rc = ble_ll_adv_set_enable(cmd->sets[i].adv_handle, cmd->enable,
+                                   le16toh(cmd->sets[i].duration),
+                                   cmd->sets[i].max_events);
+        if (rc) {
+            return rc;
+        }
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_adv_set_random_addr(const uint8_t *addr, uint8_t instance)
+{
+    struct ble_ll_adv_sm *advsm;
+
+    advsm = ble_ll_adv_sm_find_configured(instance);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    /*
+     * Reject if connectable advertising is on
+     * Core Spec Vol. 2 Part E 7.8.52
+     */
+    if (advsm->adv_enabled &&
+            (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE)) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    memcpy(advsm->adv_random_addr, addr, BLE_DEV_ADDR_LEN);
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_adv_hci_set_random_addr(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_adv_set_rnd_addr_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_adv_set_random_addr(cmd->addr, cmd->adv_handle);
+}
+
+/**
+ * HCI LE extended advertising remove command
+ *
+ * @return int BLE error code
+ */
+int
+ble_ll_adv_remove(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_remove_adv_set_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_adv_sm *advsm;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    advsm = ble_ll_adv_sm_find_configured(cmd->adv_handle);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    if (advsm->adv_enabled) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    if (advsm->periodic_adv_enabled) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if (advsm->periodic_adv_data) {
+        os_mbuf_free_chain(advsm->periodic_adv_data);
+    }
+#endif
+
+    if (advsm->adv_data) {
+        os_mbuf_free_chain(advsm->adv_data);
+    }
+    if (advsm->scan_rsp_data) {
+        os_mbuf_free_chain(advsm->scan_rsp_data);
+    }
+
+    ble_ll_adv_sm_init(advsm);
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * HCI LE extended advertising clear command
+ *
+ * @return int BLE error code
+ */
+int
+ble_ll_adv_clear_all(void)
+{
+    int i;
+
+    for (i = 0; i < BLE_ADV_INSTANCES; i++) {
+        if (g_ble_ll_adv_sm[i].adv_enabled) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    if (g_ble_ll_adv_sm[i].periodic_adv_enabled) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+#endif
+    }
+
+    ble_ll_adv_reset();
+
+    return BLE_ERR_SUCCESS;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+static uint16_t
+ble_ll_adv_sync_get_pdu_len(uint16_t data_len, uint16_t *data_offset,
+                            uint16_t props)
+{
+    uint16_t rem_data_len = data_len - *data_offset;
+    uint8_t hdr_len = BLE_LL_EXT_ADV_HDR_LEN;
+    uint8_t ext_hdr = 0;
+
+    /* TxPower if configured
+     * Note: TxPower shall not be present in chain PDU for SYNC
+     */
+    if (*data_offset == 0 &&
+        (props & BLE_HCI_LE_SET_PERIODIC_ADV_PROP_INC_TX_PWR)) {
+        ext_hdr |= (1 << BLE_LL_EXT_ADV_TX_POWER_BIT);
+        hdr_len += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+    }
+
+    /* if we have any fields in ext header we need to add flags, note that Aux
+     * PTR is handled later and it will account for flags if needed
+     *
+     * This could be handled inside TxPower but lets keep code consistent with
+     * how Aux calculate works and this also make it easier to add more fields
+     * into flags if needed in future
+     */
+    if (ext_hdr) {
+        hdr_len += BLE_LL_EXT_ADV_FLAGS_SIZE;
+    }
+
+    /* AdvData always */
+    data_len = min(BLE_LL_MAX_PAYLOAD_LEN - hdr_len, rem_data_len);
+
+    /* AuxPtr if there are more AdvData remaining that we can fit here */
+    if (rem_data_len > data_len) {
+            /* adjust for flags that needs to be added if AuxPtr is only field
+             * in Extended Header
+             */
+            if (!ext_hdr) {
+                hdr_len += BLE_LL_EXT_ADV_FLAGS_SIZE;
+                data_len -= BLE_LL_EXT_ADV_FLAGS_SIZE;
+            }
+
+            hdr_len += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+            data_len -= BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+
+            /* PDU payload should be full if chained */
+            BLE_LL_ASSERT(hdr_len + data_len == BLE_LL_MAX_PAYLOAD_LEN);
+    }
+
+    *data_offset += data_len;
+
+    return hdr_len + data_len;
+}
+
+static bool
+ble_ll_adv_periodic_check_data_itvl(uint16_t payload_len, uint16_t props,
+                                    uint16_t itvl, uint8_t phy)
+{
+    uint32_t max_usecs = 0;
+    uint32_t itvl_usecs;
+    uint16_t offset = 0;
+    uint16_t pdu_len;
+
+    while (offset < payload_len) {
+        pdu_len = ble_ll_adv_sync_get_pdu_len(payload_len, &offset, props);
+
+        max_usecs += ble_ll_pdu_tx_time_get(pdu_len, phy);
+        max_usecs += ble_ll_usecs_to_ticks_round_up(BLE_LL_MAFS +
+                                MYNEWT_VAL(BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY));
+    }
+
+    itvl_usecs = (uint32_t)itvl * BLE_LL_ADV_PERIODIC_ITVL;
+
+    return max_usecs < itvl_usecs;
+}
+
+int
+ble_ll_adv_periodic_set_param(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_periodic_adv_params_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_adv_sm *advsm;
+    uint16_t adv_itvl_min;
+    uint16_t adv_itvl_max;
+    uint16_t props;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    adv_itvl_min = le16toh(cmd->min_itvl);
+    adv_itvl_max = le16toh(cmd->max_itvl);
+    props = le16toh(cmd->props);
+
+    advsm = ble_ll_adv_sm_find_configured(cmd->adv_handle);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    /* If the advertising set identified by the Advertising_Handle specified
+     * scannable, connectable, legacy, or anonymous advertising, the Controller
+     * shall return the error code Invalid HCI Command Parameters (0x12).
+     */
+    if (advsm->props & (BLE_HCI_LE_SET_EXT_ADV_PROP_ANON_ADV |
+                        BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE |
+                        BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE |
+                        BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* If the Host issues this command when periodic advertising is enabled for
+     * the specified advertising set, the Controller shall return the error code
+     * Command Disallowed (0x0C).
+     */
+    if (advsm->periodic_adv_enabled) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* validate intervals */
+    if ((adv_itvl_min < 0x0006) || (adv_itvl_max < 0x006) ||
+            (adv_itvl_min > adv_itvl_max)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* validate properties */
+    if (props & ~BLE_HCI_LE_SET_PERIODIC_ADV_PROP_MASK) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* If the advertising set already contains periodic advertising data and the
+     * length of the data is greater than the maximum that the Controller can
+     * transmit within a periodic advertising interval of
+     * Periodic_Advertising_Interval_Max, the Controller shall return the error
+     * code Packet Too Long (0x45).
+     */
+    if (!ble_ll_adv_periodic_check_data_itvl(SYNC_DATA_LEN(advsm), props,
+                                             adv_itvl_max, advsm->sec_phy)) {
+        return BLE_ERR_PACKET_TOO_LONG;
+    }
+
+    advsm->periodic_adv_itvl_min = adv_itvl_min;
+    advsm->periodic_adv_itvl_max = adv_itvl_max;
+    advsm->periodic_adv_props = props;
+
+    ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_CONFIGURED);
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_adv_periodic_set_data(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_periodic_adv_data_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_adv_sm *advsm;
+    uint16_t payload_total_len;
+    bool new_data = false;
+
+    if (len < sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->adv_data_len > BLE_HCI_MAX_PERIODIC_ADV_DATA_LEN ||
+            cmd->adv_data_len != len - sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    advsm = ble_ll_adv_sm_find_configured(cmd->adv_handle);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    if (!(advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_CONFIGURED)) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    switch (cmd->operation) {
+    case BLE_HCI_LE_SET_DATA_OPER_LAST:
+    case BLE_HCI_LE_SET_DATA_OPER_INT:
+        if (!(advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_DATA_INCOMPLETE)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (!advsm->periodic_adv_data || !cmd->adv_data_len) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (advsm->periodic_adv_enabled) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+        break;
+    case BLE_HCI_LE_SET_DATA_OPER_FIRST:
+        if (advsm->periodic_adv_enabled) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        if (!cmd->adv_data_len) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+        new_data = true;
+        break;
+    case BLE_HCI_LE_SET_DATA_OPER_COMPLETE:
+        new_data = true;
+        break;
+    default:
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    payload_total_len = cmd->adv_data_len;
+    if (!new_data) {
+        payload_total_len += SYNC_DATA_LEN(advsm);
+    }
+
+    /* If the combined length of the data is greater than the maximum that the
+     * Controller can transmit within the current periodic advertising interval
+     * (if periodic advertising is currently enabled) or the
+     * Periodic_Advertising_Interval_Max for the advertising set (if currently
+     * disabled), all the data shall be discarded and the Controller shall
+     * return the error code Packet Too Long (0x45).
+     */
+    if (!ble_ll_adv_periodic_check_data_itvl(payload_total_len,
+                                             advsm->periodic_adv_props,
+                                             advsm->periodic_adv_itvl_max,
+                                             advsm->sec_phy)) {
+        return BLE_ERR_PACKET_TOO_LONG;
+    }
+
+    if (advsm->periodic_adv_active) {
+        ble_ll_adv_flags_clear(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_NEW_DATA);
+
+        ble_ll_adv_update_data_mbuf(&advsm->periodic_new_data, true,
+                                    BLE_ADV_DATA_MAX_LEN,
+                                    cmd->adv_data, cmd->adv_data_len);
+        if (!advsm->periodic_new_data) {
+            return BLE_ERR_MEM_CAPACITY;
+        }
+
+        ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_PERIODIC_NEW_DATA);
+    } else {
+        ble_ll_adv_update_data_mbuf(&advsm->periodic_adv_data, new_data,
+                                    BLE_ADV_DATA_MAX_LEN, cmd->adv_data,
+                                    cmd->adv_data_len);
+        if (!advsm->periodic_adv_data) {
+            return BLE_ERR_MEM_CAPACITY;
+        }
+    }
+
+    /* set/clear incomplete data flag only on success */
+    switch (cmd->operation) {
+    case BLE_HCI_LE_SET_DATA_OPER_LAST:
+    case BLE_HCI_LE_SET_DATA_OPER_COMPLETE:
+        ble_ll_adv_flags_clear(advsm,
+                               BLE_LL_ADV_SM_FLAG_PERIODIC_DATA_INCOMPLETE);
+        break;
+    case BLE_HCI_LE_SET_DATA_OPER_INT:
+    case BLE_HCI_LE_SET_DATA_OPER_FIRST:
+    default:
+        ble_ll_adv_flags_set(advsm,
+                             BLE_LL_ADV_SM_FLAG_PERIODIC_DATA_INCOMPLETE);
+        break;
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_adv_periodic_enable(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_periodic_adv_enable_cp *cmd = (const void *)cmdbuf;
+    struct ble_ll_adv_sm *advsm;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    advsm = ble_ll_adv_sm_find_configured(cmd->adv_handle);
+    if (!advsm) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    if (cmd->enable) {
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_PERIODIC_DATA_INCOMPLETE) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        /* If Enable is set to 0x01 and the length of the periodic advertising
+         * data is greater than the maximum that the Controller can transmit
+         * within the chosen periodicadvertising interval, the Controller shall
+         * return the error code Packet Too Long (0x45).
+         */
+        if (!ble_ll_adv_periodic_check_data_itvl(SYNC_DATA_LEN(advsm),
+                                                 advsm->periodic_adv_props,
+                                                 advsm->periodic_adv_itvl_max,
+                                                 advsm->sec_phy)) {
+            return BLE_ERR_PACKET_TOO_LONG;
+        }
+
+        /* If the advertising set is not currently enabled (see the
+         * LE_Set_Extended_Advertising_Enable command), the periodic advertising
+         * is not started until the advertising set is enabled.
+         */
+        if (advsm->adv_enabled && !advsm->periodic_adv_active) {
+            /* Start the periodic advertising state machine */
+            ble_ll_adv_sm_start_periodic(advsm);
+        }
+    } else {
+        /* Stop the periodic advertising state machine */
+        ble_ll_adv_sm_stop_periodic(advsm);
+    }
+
+    advsm->periodic_adv_enabled = cmd->enable;
+
+    return BLE_ERR_SUCCESS;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+static int
+ble_ll_adv_periodic_send_sync_ind(struct ble_ll_adv_sm *advsm,
+                                  struct ble_ll_conn_sm *connsm,
+                                  uint16_t service_data)
+{
+    struct os_mbuf *om;
+    uint8_t *sync_ind;
+
+    om = os_msys_get_pkthdr(BLE_LL_CTRL_MAX_PDU_LEN,
+                            sizeof(struct ble_mbuf_hdr));
+    if (!om) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    om->om_data[0] = BLE_LL_CTRL_PERIODIC_SYNC_IND;
+
+    sync_ind = om->om_data + 1;
+
+    /* ID (service_data), already in LE order */
+    memcpy(sync_ind, &service_data, sizeof(service_data));
+
+    /* fill in syncinfo */
+    ble_ll_adv_put_syncinfo(advsm, connsm, sync_ind + 20, sync_ind + 2);
+
+    /* lastPaEventCounter */
+    put_le16(sync_ind + 22, advsm->periodic_event_cntr_last_sent);
+
+    /* SID, AType, SCA */
+    sync_ind[24] = (advsm->adi >> 12);
+    sync_ind[24] |= !!(advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) << 4 ;
+    sync_ind[24] |= MYNEWT_VAL(BLE_LL_MASTER_SCA) << 5;
+
+    /* PHY */
+    sync_ind[25] = (0x01 << (advsm->sec_phy - 1));
+
+    /* AdvA */
+    memcpy(sync_ind + 26, advsm->adva, BLE_DEV_ADDR_LEN);
+
+    /* syncConnEventCount */
+    put_le16(sync_ind + 32, connsm->event_cntr);
+
+    ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL,
+                            BLE_LL_CTRL_PERIODIC_SYNC_IND_LEN + 1);
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_adv_periodic_set_info_transfer(const uint8_t *cmdbuf, uint8_t len,
+                                      uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_periodic_adv_set_info_transfer_cp *cmd = (const void *)cmdbuf;
+     struct ble_hci_le_periodic_adv_set_info_transfer_rp *rsp = (void *) rspbuf;
+     struct ble_ll_conn_sm *connsm;
+     struct ble_ll_adv_sm *advsm;
+     uint16_t handle;
+     int rc;
+
+     if (len != sizeof(*cmd)) {
+         rc = BLE_ERR_INV_HCI_CMD_PARMS;
+         goto done;
+     }
+
+     advsm = ble_ll_adv_sm_find_configured(cmd->adv_handle);
+     if (!advsm) {
+         rc = BLE_ERR_UNK_ADV_INDENT;
+         goto done;
+     }
+
+     if (!advsm->periodic_adv_active) {
+         rc = BLE_ERR_CMD_DISALLOWED;
+         goto done;
+     }
+
+     handle = le16toh(cmd->conn_handle);
+     if (handle > 0xeff) {
+         rc = BLE_ERR_INV_HCI_CMD_PARMS;
+         goto done;
+     }
+
+     connsm = ble_ll_conn_find_active_conn(handle);
+     if (!connsm) {
+         rc = BLE_ERR_UNK_CONN_ID;
+         goto done;
+     }
+
+     /* TODO should not need to shift
+      * byte 3 (0 byte is conn_feature) , bit 1
+      *
+      * Allow initiate LL procedure only if remote supports it.
+      */
+     if (!(connsm->remote_features[2] & (BLE_LL_FEAT_SYNC_TRANS_RECV >> (8 * 3)))) {
+         rc = BLE_ERR_UNSUPP_REM_FEATURE;
+         goto done;
+     }
+
+     rc = ble_ll_adv_periodic_send_sync_ind(advsm, connsm, cmd->service_data);
+ done:
+     rsp->conn_handle = cmd->conn_handle;
+     *rsplen = sizeof(*rsp);
+     return rc;
+}
+#endif
+#endif
+#endif
+
+/**
+ * Says whether the specified address is already connected or not.
+ * @param   [in]    addr        The peer address.
+ * @param   [in]    addr_type   Public address (0) or random address (1).
+ * @return  Return 1 if already connected, 0 otherwise.
+ */
+static int
+ble_ll_adv_already_connected(const uint8_t* addr, uint8_t addr_type)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    /* extracted from ble_ll_conn_slave_start function */
+    SLIST_FOREACH(connsm, &g_ble_ll_conn_active_list, act_sle) {
+        if (!memcmp(&connsm->peer_addr, addr, BLE_DEV_ADDR_LEN)) {
+            if (addr_type == BLE_ADDR_RANDOM) {
+                if (connsm->peer_addr_type & 1) {
+                    return 1;
+                }
+            } else {
+                if ((connsm->peer_addr_type & 1) == 0) {
+                    return 1;
+                }
+            }
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Called when the LL receives a scan request or connection request
+ *
+ * Context: Called from interrupt context.
+ *
+ * @param rxbuf
+ *
+ * @return -1: request not for us or is a connect request.
+ *          0: request (scan) is for us and we successfully went from rx to tx.
+ *        > 0: PHY error attempting to go from rx to tx.
+ */
+static int
+ble_ll_adv_rx_req(uint8_t pdu_type, struct os_mbuf *rxpdu)
+{
+    int rc;
+    int resolved;
+    uint8_t chk_wl;
+    uint8_t txadd;
+    uint8_t peer_addr_type;
+    uint8_t *rxbuf;
+    uint8_t *adva;
+    uint8_t *peer;
+    struct ble_mbuf_hdr *ble_hdr;
+    struct ble_ll_adv_sm *advsm;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct aux_conn_rsp_data rsp_data;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    struct ble_ll_resolv_entry *rl;
+#endif
+
+    /* See if adva in the request (scan or connect) matches what we sent */
+    advsm = g_ble_ll_cur_adv_sm;
+    rxbuf = rxpdu->om_data;
+    adva = rxbuf + BLE_LL_PDU_HDR_LEN + BLE_DEV_ADDR_LEN;
+    if (memcmp(advsm->adva, adva, BLE_DEV_ADDR_LEN)) {
+        return -1;
+    }
+
+    /* Set device match bit if we are whitelisting */
+    if (pdu_type == BLE_ADV_PDU_TYPE_SCAN_REQ) {
+        chk_wl = advsm->adv_filter_policy & 1;
+    } else {
+        chk_wl = advsm->adv_filter_policy & 2;
+    }
+
+    /* Get the peer address type */
+    if (rxbuf[0] & BLE_ADV_PDU_HDR_TXADD_MASK) {
+        txadd = BLE_ADDR_RANDOM;
+    } else {
+        txadd = BLE_ADDR_PUBLIC;
+    }
+
+    ble_hdr = BLE_MBUF_HDR_PTR(rxpdu);
+    peer = rxbuf + BLE_LL_PDU_HDR_LEN;
+    peer_addr_type = txadd;
+    resolved = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    rl = NULL;
+    if (ble_ll_resolv_enabled()) {
+        if (ble_ll_is_rpa(peer, txadd)) {
+            advsm->adv_rpa_index = ble_hw_resolv_list_match();
+            if (advsm->adv_rpa_index >= 0) {
+                ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_RESOLVED;
+                rl = &g_ble_ll_resolv_list[advsm->adv_rpa_index];
+                if (chk_wl) {
+                    peer = rl->rl_identity_addr;
+                    peer_addr_type = rl->rl_addr_type;
+                    resolved = 1;
+                }
+            } else {
+                if (chk_wl) {
+                    return -1;
+                }
+            }
+        } else {
+            /* Verify privacy mode */
+            rl = ble_ll_resolv_list_find(peer, peer_addr_type);
+            if (rl && (rl->rl_priv_mode == BLE_HCI_PRIVACY_NETWORK) &&
+                rl->rl_has_peer) {
+                return -1;
+            }
+        }
+    }
+#endif
+
+    /* Set device match bit if we are whitelisting */
+    if (chk_wl && !ble_ll_whitelist_match(peer, peer_addr_type, resolved)) {
+        return -1;
+    }
+
+    /*
+     * We set the device match bit to tell the upper layer that we will
+     * accept the request
+     */
+    ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_DEVMATCH;
+
+    /* Setup to transmit the scan response if appropriate */
+    rc = -1;
+
+    if (pdu_type == BLE_ADV_PDU_TYPE_SCAN_REQ) {
+        /* PHY used for scan requests shall be the same as the PHY used for the
+         * PDU that they reply to so no need to change PHY mode.
+         */
+        ble_phy_set_txend_cb(ble_ll_adv_tx_done, advsm);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_SCAN_REQ_NOTIF) {
+            ble_ll_hci_ev_send_scan_req_recv(advsm->adv_instance, peer,
+                                             peer_addr_type);
+        }
+
+        /*
+         * We need to store current rxed packet header temporarily so AuxPtr
+         * can be calculated (if necessary) relative to AUX_SCAN_RSP instead of
+         * AUX_ADV_IND.
+         */
+
+        advsm->rx_ble_hdr = ble_hdr;
+        rc = ble_phy_tx(ble_ll_adv_scan_rsp_pdu_make, advsm,
+                        BLE_PHY_TRANSITION_NONE);
+        advsm->rx_ble_hdr = NULL;
+#else
+        rc = ble_phy_tx(ble_ll_adv_scan_rsp_legacy_pdu_make, advsm,
+                        BLE_PHY_TRANSITION_NONE);
+#endif
+
+        if (!rc) {
+            ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_SCAN_RSP_TXD;
+            STATS_INC(ble_ll_stats, scan_rsp_txg);
+        }
+    } else if (pdu_type == BLE_ADV_PDU_TYPE_AUX_CONNECT_REQ) {
+        /* See if the device is already connected */
+        if (ble_ll_adv_already_connected(peer, peer_addr_type)) {
+            return -1;
+        }
+
+        /*
+         * Only accept connect requests from the desired address if we
+         * are doing directed advertising
+         */
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+            if (memcmp(advsm->initiator_addr, peer, BLE_DEV_ADDR_LEN)) {
+                return -1;
+            }
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+            return -1;
+        }
+
+        /* use remote address used over the air */
+        rsp_data.advsm = advsm;
+        rsp_data.peer = rxbuf + BLE_LL_PDU_HDR_LEN;
+        rsp_data.rxadd = rxbuf[0] & BLE_ADV_PDU_HDR_TXADD_MASK;
+
+        ble_phy_set_txend_cb(ble_ll_adv_tx_done, advsm);
+        rc = ble_phy_tx(ble_ll_adv_aux_conn_rsp_pdu_make, &rsp_data,
+                        BLE_PHY_TRANSITION_NONE);
+        if (!rc) {
+            ble_ll_adv_flags_set(advsm, BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD);
+            STATS_INC(ble_ll_stats, aux_conn_rsp_tx);
+        }
+#endif
+    }
+
+    return rc;
+}
+
+/**
+ * Called when a connect request has been received.
+ *
+ * Context: Link Layer
+ *
+ * @param rxbuf
+ * @param flags
+ *
+ * @return 0: no connection started. 1: connection started
+ */
+static int
+ble_ll_adv_conn_req_rxd(uint8_t *rxbuf, struct ble_mbuf_hdr *hdr,
+                        struct ble_ll_adv_sm *advsm)
+{
+    int valid;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    uint8_t resolved;
+#endif
+    uint8_t addr_type;
+    uint8_t *inita;
+    uint8_t *ident_addr;
+
+    /* Don't create connection if AUX_CONNECT_RSP was not send */
+    if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY)) {
+        if (!(advsm->flags & BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD)) {
+            return 0;
+        }
+    }
+
+    /* Check filter policy. */
+    valid = 0;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    resolved = BLE_MBUF_HDR_RESOLVED(hdr);
+#endif
+    inita = rxbuf + BLE_LL_PDU_HDR_LEN;
+    if (hdr->rxinfo.flags & BLE_MBUF_HDR_F_DEVMATCH) {
+
+        valid = 1;
+        if (rxbuf[0] & BLE_ADV_PDU_HDR_TXADD_MASK) {
+            addr_type = BLE_ADDR_RANDOM;
+        } else {
+            addr_type = BLE_ADDR_PUBLIC;
+        }
+
+        /*
+         * Only accept connect requests from the desired address if we
+         * are doing directed advertising
+         */
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_DIRECTED) {
+            ident_addr = inita;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+            if (resolved) {
+                ident_addr = g_ble_ll_resolv_list[advsm->adv_rpa_index].rl_identity_addr;
+                addr_type = g_ble_ll_resolv_list[advsm->adv_rpa_index].rl_addr_type;
+            }
+#endif
+            if ((addr_type != advsm->peer_addr_type) ||
+                memcmp(advsm->peer_addr, ident_addr, BLE_DEV_ADDR_LEN)) {
+                valid = 0;
+            }
+        }
+    }
+
+    if (valid) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        if (resolved) {
+            /* Retain the resolvable private address that we received. */
+            memcpy(advsm->adv_rpa, inita, BLE_DEV_ADDR_LEN);
+
+            /* Update resolving list with current peer RPA */
+            ble_ll_resolv_set_peer_rpa(advsm->adv_rpa_index, inita);
+
+            /*
+             * Overwrite received inita with identity address since that
+             * is used from now on.
+             */
+            memcpy(inita,
+                   g_ble_ll_resolv_list[advsm->adv_rpa_index].rl_identity_addr,
+                   BLE_DEV_ADDR_LEN);
+
+            /* Peer address type is an identity address */
+            addr_type = g_ble_ll_resolv_list[advsm->adv_rpa_index].rl_addr_type;
+            addr_type += 2;
+        }
+#endif
+
+        /* Try to start slave connection. If successful, stop advertising */
+        valid = ble_ll_conn_slave_start(rxbuf, addr_type, hdr,
+                          !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY));
+        if (valid) {
+            /* stop advertising only if not transmitting connection response */
+            if (!(advsm->flags & BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD)) {
+                ble_ll_adv_sm_stop(advsm);
+            }
+        }
+    }
+
+    return valid;
+}
+
+/**
+ * Called on phy rx pdu end when in advertising state.
+ *
+ * There are only two pdu types we care about in this state: scan requests
+ * and connection requests. When we receive a scan request we must determine if
+ * we need to send a scan response and that needs to be acted on within T_IFS.
+ *
+ * When we receive a connection request, we need to determine if we will allow
+ * this device to start a connection with us. However, no immediate response is
+ * sent so we handle this at the link layer task.
+ *
+ * Context: Interrupt
+ *
+ * @param pdu_type Type of pdu received.
+ * @param rxpdu Pointer to received PDU
+ *
+ * @return int
+ *       < 0: Disable the phy after reception.
+ *      == 0: Do not disable the PHY
+ *       > 0: Do not disable PHY as that has already been done.
+ */
+int
+ble_ll_adv_rx_isr_end(uint8_t pdu_type, struct os_mbuf *rxpdu, int crcok)
+{
+    int rc;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_mbuf_hdr *rxhdr;
+#endif
+
+    rc = -1;
+    if (rxpdu == NULL) {
+        ble_ll_adv_tx_done(g_ble_ll_cur_adv_sm);
+    } else {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        rxhdr = BLE_MBUF_HDR_PTR(rxpdu);
+        rxhdr->rxinfo.user_data = g_ble_ll_cur_adv_sm;
+        if (ble_ll_adv_active_chanset_is_sec(g_ble_ll_cur_adv_sm)) {
+            rxhdr->rxinfo.flags |= BLE_MBUF_HDR_F_EXT_ADV_SEC;
+        } else {
+            assert(ble_ll_adv_active_chanset_is_pri(g_ble_ll_cur_adv_sm));
+        }
+#endif
+        if (crcok) {
+            if ((pdu_type == BLE_ADV_PDU_TYPE_SCAN_REQ) ||
+                (pdu_type == BLE_ADV_PDU_TYPE_CONNECT_IND)) {
+                /* Process request */
+                rc = ble_ll_adv_rx_req(pdu_type, rxpdu);
+            }
+        }
+
+        if (rc) {
+            /* We no longer have a current state machine */
+            g_ble_ll_cur_adv_sm = NULL;
+        }
+    }
+
+    if (rc) {
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    }
+
+    return rc;
+}
+
+/**
+ * Process a received packet at the link layer task when in the advertising
+ * state
+ *
+ * Context: Link Layer
+ *
+ *
+ * @param ptype
+ * @param rxbuf
+ * @param hdr
+ *
+ * @return int
+ */
+void
+ble_ll_adv_rx_pkt_in(uint8_t ptype, uint8_t *rxbuf, struct ble_mbuf_hdr *hdr)
+{
+    int adv_event_over;
+    struct ble_ll_adv_sm *advsm;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    advsm = (struct ble_ll_adv_sm *)hdr->rxinfo.user_data;
+#else
+    advsm = &g_ble_ll_adv_sm[0];
+#endif
+
+    /*
+     * It is possible that advertising was stopped and a packet plcaed on the
+     * LL receive packet queue. In this case, just ignore the received packet
+     * as the advertising state machine is no longer "valid"
+     */
+    if (!advsm->adv_enabled) {
+        return;
+    }
+
+    /*
+     * If we have received a scan request and we are transmitting a response
+     * or we have received a valid connect request, dont "end" the advertising
+     * event. In the case of a connect request we will stop advertising. In
+     * the case of the scan response transmission we will get a transmit
+     * end callback.
+     */
+    adv_event_over = 1;
+    if (BLE_MBUF_HDR_CRC_OK(hdr)) {
+        if (ptype == BLE_ADV_PDU_TYPE_CONNECT_IND) {
+            if (ble_ll_adv_conn_req_rxd(rxbuf, hdr, advsm)) {
+                adv_event_over = 0;
+            }
+        } else {
+            if ((ptype == BLE_ADV_PDU_TYPE_SCAN_REQ) &&
+                (hdr->rxinfo.flags & BLE_MBUF_HDR_F_SCAN_RSP_TXD)) {
+                adv_event_over = 0;
+            }
+        }
+    }
+
+    if (adv_event_over) {
+        ble_ll_adv_make_done(advsm, hdr);
+    }
+}
+
+/**
+ * Called when a receive PDU has started and we are advertising.
+ *
+ * Context: interrupt
+ *
+ * @param pdu_type
+ * @param rxpdu
+ *
+ * @return int
+ *   < 0: A frame we dont want to receive.
+ *   = 0: Continue to receive frame. Dont go from rx to tx
+ *   > 0: Continue to receive frame and go from rx to tx when done
+ */
+int
+ble_ll_adv_rx_isr_start(uint8_t pdu_type)
+{
+    int rc;
+    struct ble_ll_adv_sm *advsm;
+
+    /* Assume we will abort the frame */
+    rc = -1;
+
+    /* If we get a scan request we must tell the phy to go from rx to tx */
+    advsm = g_ble_ll_cur_adv_sm;
+    if (pdu_type == BLE_ADV_PDU_TYPE_SCAN_REQ) {
+        /* Only accept scan requests if we are indirect adv or scan adv */
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE) {
+            rc = 1;
+        }
+    } else {
+        /* Only accept connect requests if connectable advertising event */
+        if (pdu_type == BLE_ADV_PDU_TYPE_CONNECT_IND) {
+            if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_CONNECTABLE) {
+                /* Need transition to TX if extended adv */
+                rc = !(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY);
+            }
+        }
+    }
+
+    /*
+     * If we abort the frame, we need to post the LL task to check if the
+     * advertising event is over.
+     */
+    if (rc < 0) {
+        ble_ll_adv_tx_done(advsm);
+    }
+
+    return rc;
+}
+
+static void
+ble_ll_adv_drop_event(struct ble_ll_adv_sm *advsm)
+{
+    STATS_INC(ble_ll_stats, adv_drop_event);
+
+    ble_ll_sched_rmv_elem(&advsm->adv_sch);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    ble_ll_sched_rmv_elem(&advsm->aux[0].sch);
+    ble_ll_sched_rmv_elem(&advsm->aux[1].sch);
+
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &advsm->adv_sec_txdone_ev);
+    advsm->aux_active = 0;
+#endif
+
+    advsm->adv_chan = ble_ll_adv_final_chan(advsm);
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+}
+
+static void
+ble_ll_adv_reschedule_event(struct ble_ll_adv_sm *advsm)
+{
+    int rc;
+    uint32_t start_time;
+    uint32_t max_delay_ticks;
+
+    assert(advsm->adv_enabled);
+
+    if (!advsm->adv_sch.enqueued) {
+        if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) {
+            max_delay_ticks = 0;
+        } else {
+            max_delay_ticks =
+                    os_cputime_usecs_to_ticks(BLE_LL_ADV_DELAY_MS_MAX * 1000);
+        }
+
+        rc = ble_ll_sched_adv_reschedule(&advsm->adv_sch, &start_time,
+                                         max_delay_ticks);
+        if (rc) {
+            ble_ll_adv_drop_event(advsm);
+            return;
+        }
+
+        start_time += g_ble_ll_sched_offset_ticks;
+        advsm->adv_event_start_time = start_time;
+        advsm->adv_pdu_start_time = start_time;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
+                                                        !advsm->aux_active) {
+        ble_ll_adv_aux_schedule(advsm);
+    }
+#endif
+}
+
+/**
+ * Called when an advertising event is over.
+ *
+ * Context: Link Layer task.
+ *
+ * @param arg Pointer to advertising state machine.
+ */
+static void
+ble_ll_adv_done(struct ble_ll_adv_sm *advsm)
+
+{
+    int rc;
+    int resched_pdu;
+    uint8_t mask;
+    uint8_t final_adv_chan;
+    int32_t delta_t;
+    uint32_t itvl;
+    uint32_t tick_itvl;
+    uint32_t start_time;
+
+    assert(advsm->adv_enabled);
+
+    ble_ll_rfmgmt_release();
+
+    ble_ll_adv_update_adv_scan_rsp_data(advsm);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) {
+        /* stop advertising this was due to transmitting connection response */
+        if (advsm->flags & BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD) {
+            ble_ll_adv_sm_stop(advsm);
+            return;
+        }
+    }
+#endif
+
+    /* Remove the element from the schedule if it is still there. */
+    ble_ll_sched_rmv_elem(&advsm->adv_sch);
+
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+
+    /*
+     * Check if we have ended our advertising event. If our last advertising
+     * packet was sent on the last channel, it means we are done with this
+     * event.
+     */
+    final_adv_chan = ble_ll_adv_final_chan(advsm);
+
+    if (advsm->adv_chan == final_adv_chan) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if (advsm->events_max) {
+            advsm->events++;
+        }
+#endif
+
+        ble_ll_scan_chk_resume();
+
+        /* This event is over. Set adv channel to first one */
+        advsm->adv_chan = ble_ll_adv_first_chan(advsm);
+
+        /*
+         * Calculate start time of next advertising event. NOTE: we do not
+         * add the random advDelay as the scheduling code will do that.
+         */
+        itvl = advsm->adv_itvl_usecs;
+        tick_itvl = os_cputime_usecs_to_ticks(itvl);
+        advsm->adv_event_start_time += tick_itvl;
+        advsm->adv_pdu_start_time = advsm->adv_event_start_time;
+
+        /*
+         * The scheduled time better be in the future! If it is not, we will
+         * just keep advancing until we the time is in the future
+         */
+        start_time = advsm->adv_pdu_start_time - g_ble_ll_sched_offset_ticks;
+
+        delta_t = (int32_t)(start_time - os_cputime_get32());
+        if (delta_t < 0) {
+            /*
+             * NOTE: we just the same interval that we calculated earlier.
+             * No real need to keep recalculating a new interval.
+             */
+            while (delta_t < 0) {
+                advsm->adv_event_start_time += tick_itvl;
+                advsm->adv_pdu_start_time = advsm->adv_event_start_time;
+                delta_t += (int32_t)tick_itvl;
+            }
+        }
+        resched_pdu = 0;
+    } else {
+        /*
+         * Move to next advertising channel. If not in the mask, just
+         * increment by 1. We can do this because we already checked if we
+         * just transmitted on the last advertising channel
+         */
+        ++advsm->adv_chan;
+        mask = 1 << (advsm->adv_chan - BLE_PHY_ADV_CHAN_START);
+        if ((mask & advsm->adv_chanmask) == 0) {
+            ++advsm->adv_chan;
+        }
+
+        /*
+         * We will transmit right away. Set next pdu start time to now
+         * plus a xcvr start delay just so we dont count late adv starts
+         */
+        advsm->adv_pdu_start_time = os_cputime_get32() +
+                                    g_ble_ll_sched_offset_ticks;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        /* If we're past aux (unlikely, but can happen), just drop an event */
+        if (!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) &&
+                advsm->aux_active &&
+                advsm->adv_pdu_start_time > AUX_CURRENT(advsm)->start_time) {
+            ble_ll_adv_drop_event(advsm);
+            return;
+        }
+#endif
+
+        resched_pdu = 1;
+    }
+
+    /* check if advertising timed out */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (advsm->duration &&
+        advsm->adv_pdu_start_time >= advsm->adv_end_time) {
+        /* Legacy PDUs need to be stop here.
+         * For ext adv it will be stopped when AUX is done (unless it was
+         * dropped so check if AUX is active here as well).
+         */
+        if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) ||
+                !advsm->aux_active) {
+            ble_ll_adv_sm_stop_timeout(advsm);
+        }
+
+        return;
+    }
+#else
+    if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_HD_DIRECTED) &&
+            (advsm->adv_pdu_start_time >= advsm->adv_end_time)) {
+        ble_ll_adv_sm_stop_timeout(advsm);
+        return;
+    }
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (advsm->events_max && (advsm->events >= advsm->events_max)) {
+        /* Legacy PDUs need to be stop here.
+         * For ext adv it will be stopped when AUX is done (unless it was
+         * dropped so check if AUX is active here as well).
+         */
+        if ((advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY) ||
+                !advsm->aux_active) {
+            ble_ll_adv_sm_stop_limit_reached(advsm);
+        }
+
+        return;
+    }
+#endif
+
+    /* We need to regenerate our RPA's if we have passed timeout */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    ble_ll_adv_chk_rpa_timeout(advsm);
+#endif
+
+    /* Schedule advertising transmit */
+    ble_ll_adv_set_sched(advsm);
+
+    if (!resched_pdu) {
+        ble_ll_adv_reschedule_event(advsm);
+        return;
+    }
+
+    /*
+     * In the unlikely event we can't reschedule this, just post a done event
+     * and we will reschedule the next advertising PDU.
+     */
+    rc = ble_ll_sched_adv_resched_pdu(&advsm->adv_sch);
+    if (rc) {
+        STATS_INC(ble_ll_stats, adv_resched_pdu_fail);
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &advsm->adv_txdone_ev);
+    }
+}
+
+static void
+ble_ll_adv_event_done(struct ble_npl_event *ev)
+{
+    ble_ll_adv_done(ble_npl_event_get_arg(ev));
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+/**
+ * Called when auxiliary packet is txd on secondary channel
+ *
+ * Context: Link Layer task.
+ *
+ * @param ev
+ */
+static void
+ble_ll_adv_sec_done(struct ble_ll_adv_sm *advsm)
+{
+    struct ble_ll_adv_aux *aux;
+    struct ble_ll_adv_aux *aux_next;
+
+    assert(advsm->adv_enabled);
+    assert(advsm->aux_active);
+
+    aux = AUX_CURRENT(advsm);
+    aux_next = AUX_NEXT(advsm);
+
+    /* We don't need RF anymore */
+    ble_ll_rfmgmt_release();
+
+    if (advsm->aux_not_scanned) {
+        ble_ll_sched_rmv_elem(&aux_next->sch);
+    }
+
+    /* Remove anything else scheduled for secondary channel */
+    ble_ll_sched_rmv_elem(&aux->sch);
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &advsm->adv_sec_txdone_ev);
+
+    /* Stop advertising due to transmitting connection response */
+    if (advsm->flags & BLE_LL_ADV_SM_FLAG_CONN_RSP_TXD) {
+        ble_ll_adv_sm_stop(advsm);
+        return;
+    }
+
+    /* If we have next AUX scheduled, try to schedule another one */
+    if (aux_next->sch.enqueued) {
+        advsm->aux_index ^= 1;
+        advsm->aux_first_pdu = 0;
+        ble_ll_adv_aux_schedule_next(advsm);
+        return;
+    }
+
+    ble_ll_scan_chk_resume();
+
+    /* Check if advertising timed out */
+    if (advsm->duration && (advsm->adv_pdu_start_time >= advsm->adv_end_time)) {
+        ble_ll_adv_sm_stop_timeout(advsm);
+        return;
+    }
+
+    if (advsm->events_max && (advsm->events >= advsm->events_max)) {
+        ble_ll_adv_sm_stop_limit_reached(advsm);
+        return;
+    }
+
+    advsm->aux_active = 0;
+    ble_ll_adv_update_adv_scan_rsp_data(advsm);
+    ble_ll_adv_reschedule_event(advsm);
+}
+
+static void
+ble_ll_adv_sec_event_done(struct ble_npl_event *ev)
+{
+    ble_ll_adv_sec_done(ble_npl_event_get_arg(ev));
+}
+#endif
+
+static void
+ble_ll_adv_make_done(struct ble_ll_adv_sm *advsm, struct ble_mbuf_hdr *hdr)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (BLE_MBUF_HDR_EXT_ADV_SEC(hdr)) {
+        assert(!(advsm->props & BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY));
+        assert(ble_ll_adv_active_chanset_is_sec(advsm));
+        ble_ll_adv_active_chanset_clear(advsm);
+        ble_ll_adv_sec_done(advsm);
+    } else {
+        assert(ble_ll_adv_active_chanset_is_pri(advsm));
+        ble_ll_adv_active_chanset_clear(advsm);
+        ble_ll_adv_done(advsm);
+    }
+#else
+    ble_ll_adv_active_chanset_clear(advsm);
+    ble_ll_adv_done(advsm);
+#endif
+}
+
+/**
+ * Checks if the controller can change the whitelist. If advertising is enabled
+ * and is using the whitelist the controller is not allowed to change the
+ * whitelist.
+ *
+ * @return int 0: not allowed to change whitelist; 1: change allowed.
+ */
+int
+ble_ll_adv_can_chg_whitelist(void)
+{
+    struct ble_ll_adv_sm *advsm;
+    int rc;
+    int i;
+
+    rc = 1;
+    for (i = 0; i < BLE_ADV_INSTANCES; ++i) {
+        advsm = &g_ble_ll_adv_sm[i];
+        if (advsm->adv_enabled &&
+            (advsm->adv_filter_policy != BLE_HCI_ADV_FILT_NONE)) {
+            rc = 0;
+            break;
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Sends the connection complete event when advertising a connection starts.
+ *
+ * @return uint8_t* Pointer to event buffer
+ */
+void
+ble_ll_adv_send_conn_comp_ev(struct ble_ll_conn_sm *connsm,
+                             struct ble_mbuf_hdr *rxhdr)
+{
+    uint8_t *evbuf;
+    struct ble_ll_adv_sm *advsm;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    advsm = (struct ble_ll_adv_sm *)rxhdr->rxinfo.user_data;
+#else
+    advsm = &g_ble_ll_adv_sm[0];
+#endif
+
+    evbuf = advsm->conn_comp_ev;
+    assert(evbuf != NULL);
+    advsm->conn_comp_ev = NULL;
+
+    ble_ll_conn_comp_event_send(connsm, BLE_ERR_SUCCESS, evbuf, advsm);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    ble_ll_hci_ev_le_csa(connsm);
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (ble_ll_hci_adv_mode_ext()) {
+        ble_ll_hci_ev_send_adv_set_terminated(0, advsm->adv_instance,
+                                          connsm->conn_handle, advsm->events);
+    }
+#endif
+}
+
+/**
+ * Returns the local resolvable private address currently being using by
+ * the advertiser
+ *
+ * @return uint8_t*
+ */
+uint8_t *
+ble_ll_adv_get_local_rpa(struct ble_ll_adv_sm *advsm)
+{
+    uint8_t *rpa = NULL;
+
+    if (advsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+        if ((advsm->flags & BLE_LL_ADV_SM_FLAG_TX_ADD) &&
+                                    ble_ll_is_rpa(advsm->adva, 1)) {
+            rpa = advsm->adva;
+        }
+    }
+
+    return rpa;
+}
+
+/**
+ * Returns the peer resolvable private address of last device connecting to us
+ *
+ * @return uint8_t*
+ */
+uint8_t *
+ble_ll_adv_get_peer_rpa(struct ble_ll_adv_sm *advsm)
+{
+    /* XXX: should this go into IRK list or connection? */
+    return advsm->adv_rpa;
+}
+
+/**
+ * Called when the LL wait for response timer expires while in the advertising
+ * state. Disables the phy and
+ *
+ */
+void
+ble_ll_adv_wfr_timer_exp(void)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    g_ble_ll_cur_adv_sm->aux_not_scanned = 1;
+#endif
+
+    ble_phy_disable();
+    ble_ll_adv_tx_done(g_ble_ll_cur_adv_sm);
+}
+
+/**
+ * Reset the advertising state machine.
+ *
+ * Context: Link Layer task
+ *
+ */
+void
+ble_ll_adv_reset(void)
+{
+    int i;
+    struct ble_ll_adv_sm *advsm;
+
+    for (i = 0; i < BLE_ADV_INSTANCES; ++i) {
+        advsm = &g_ble_ll_adv_sm[i];
+
+        /* Stop advertising state machine */
+        ble_ll_adv_sm_stop(advsm);
+
+        /* clear any data present */
+        os_mbuf_free_chain(advsm->adv_data);
+        os_mbuf_free_chain(advsm->scan_rsp_data);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+        /* Stop periodic advertising state machine */
+        ble_ll_adv_sm_stop_periodic(advsm);
+
+        /* clear any periodic data present */
+        os_mbuf_free_chain(advsm->periodic_adv_data);
+#endif
+
+        /* re-initialize the advertiser state machine */
+        ble_ll_adv_sm_init(advsm);
+    }
+}
+
+/* Called to determine if advertising is enabled.
+ */
+uint8_t
+ble_ll_adv_enabled(void)
+{
+    int i;
+
+    for (i = 0; i < BLE_ADV_INSTANCES; i++) {
+        if (g_ble_ll_adv_sm[i].adv_enabled) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+static void
+ble_ll_adv_sm_init(struct ble_ll_adv_sm *advsm)
+{
+    memset(advsm, 0, sizeof(struct ble_ll_adv_sm));
+
+    advsm->adv_itvl_min = BLE_HCI_ADV_ITVL_DEF;
+    advsm->adv_itvl_max = BLE_HCI_ADV_ITVL_DEF;
+    advsm->adv_chanmask = BLE_HCI_ADV_CHANMASK_DEF;
+
+    /* Initialize advertising tx done event */
+    ble_npl_event_init(&advsm->adv_txdone_ev, ble_ll_adv_event_done, advsm);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    ble_npl_event_init(&advsm->adv_sec_txdone_ev, ble_ll_adv_sec_event_done, advsm);
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    ble_npl_event_init(&advsm->adv_periodic_txdone_ev,
+                       ble_ll_adv_periodic_event_done, advsm);
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* Initialize aux schedulers */
+    advsm->aux_active = 0;
+    advsm->aux[0].sch.cb_arg = advsm;
+    advsm->aux[0].sch.sched_cb = ble_ll_adv_secondary_tx_start_cb;
+    advsm->aux[0].sch.sched_type = BLE_LL_SCHED_TYPE_ADV;
+    advsm->aux[1].sch.cb_arg = advsm;
+    advsm->aux[1].sch.sched_cb = ble_ll_adv_secondary_tx_start_cb;
+    advsm->aux[1].sch.sched_type = BLE_LL_SCHED_TYPE_ADV;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    /* Initialize sync schedulers */
+    advsm->periodic_sync_active = 0;
+    advsm->periodic_sync[0].sch.cb_arg = advsm;
+    advsm->periodic_sync[0].sch.sched_cb = ble_ll_adv_sync_tx_start_cb;
+    advsm->periodic_sync[0].sch.sched_type = BLE_LL_SCHED_TYPE_PERIODIC;
+    advsm->periodic_sync[1].sch.cb_arg = advsm;
+    advsm->periodic_sync[1].sch.sched_cb = ble_ll_adv_sync_tx_start_cb;
+    advsm->periodic_sync[1].sch.sched_type = BLE_LL_SCHED_TYPE_PERIODIC;
+#endif
+#endif
+
+    /* Configure instances to be legacy on start */
+    advsm->props |= BLE_HCI_LE_SET_EXT_ADV_PROP_SCANNABLE;
+    advsm->props |= BLE_HCI_LE_SET_EXT_ADV_PROP_LEGACY;
+}
+
+/**
+ * Initialize the advertising functionality of a BLE device. This should
+ * be called once on initialization
+ */
+void
+ble_ll_adv_init(void)
+{
+    int i;
+
+    /* Set default advertising parameters */
+    for (i = 0; i < BLE_ADV_INSTANCES; ++i) {
+        ble_ll_adv_sm_init(&g_ble_ll_adv_sm[i]);
+    }
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn.c
new file mode 100644
index 000000000..b3788de1d
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn.c
@@ -0,0 +1,4279 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/os/os_cputime.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF51)
+#include "nimble/nimble/drivers/nrf51/include/ble/xcvr.h"
+#elif defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+#include "nimble/nimble/drivers/nrf52/include/ble/xcvr.h"
+#endif
+
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_whitelist.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_ctrl.h"
+#include "../include/controller/ble_ll_resolv.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_trace.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+#include "../include/controller/ble_phy.h"
+#include "../include/controller/ble_hw.h"
+#include "../include/controller/ble_ll_utils.h"
+#include "ble_ll_conn_priv.h"
+
+#if (BLETEST_THROUGHPUT_TEST == 1)
+extern void bletest_completed_pkt(uint16_t handle);
+#endif
+
+/* XXX TODO
+ * 1) I think if we are initiating and we already have a connection with
+ * a device that we will still try and connect to it. Fix this.
+ *  -> This is true. There are a couple things to do
+ *      i) When a connection create is issued, if we already are connected
+ *      deny it. BLE ERROR = 0x0B (ACL connection exists).
+ *      ii) If we receive an advertisement while initiating and want to send
+ *      a connect request to the device, make sure we dont have it.
+ *      iii) I think I need to do something like this: I am initiating and
+ *      advertising. Suppose the device I want to connect to sends me a connect
+ *      request because I am advertising? What happens to connection? Deal
+ *      with this!
+ *
+ * 2) Make sure we check incoming data packets for size and all that. You
+ * know, supported octets and all that. For both rx and tx.
+ *
+ * 3) Make sure we are setting the schedule end time properly for both slave
+ * and master. We should just set this to the end of the connection event.
+ * We might want to guarantee a IFS time as well since the next event needs
+ * to be scheduled prior to the start of the event to account for the time it
+ * takes to get a frame ready (which is pretty much the IFS time).
+ *
+ * 4) looks like the current code will allow the 1st packet in a
+ * connection to extend past the end of the allocated connection end
+ * time. That is not good. Need to deal with that. Need to extend connection
+ * end time.
+ *
+ * 6) Use error code 0x3E correctly! Connection failed to establish. If you
+ * read the LE connection complete event, it says that if the connection
+ * fails to be established that the connection complete event gets sent to
+ * the host that issued the create connection. Need to resolve this.
+ *
+ * 7) How does peer address get set if we are using whitelist? Look at filter
+ * policy and make sure you are doing this correctly.
+ *
+ * 8) Right now I use a fixed definition for required slots. CHange this.
+ *
+ * 10) See what connection state machine elements are purely master and
+ * purely slave. We can make a union of them.
+ *
+ * 11) Not sure I am dealing with the connection terminate timeout perfectly.
+ * I may extend a connection event too long although if it is always in terms
+ * of connection events I am probably fine. Checking at end that the next
+ * connection event will occur past terminate timeould would be fine.
+ *
+ * 12) When a slave receives a data packet in a connection it has to send a
+ * response. Well, it should. If this packet will overrun the next scheduled
+ * event, what should we do? Transmit anyway? Not transmit? For now, we just
+ * transmit.
+ *
+ * 32kHz crystal
+ * 1) When scheduling, I need to make sure I have time between
+ * this one and the next. Should I deal with this in the sched. Or
+ * is this basically accounted for given a slot? I really just need to
+ * make sure everything is over N ticks before the next sched start!
+ * Just add to end time?
+ *
+ * 2) I think one way to handle the problem of losing up to a microsecond
+ * every time we call ble_ll_conn_next_event in a loop is to do everything by
+ * keeping track of last anchor point. Would need last anchor usecs too. I guess
+ * we could also keep last anchor usecs as a uint32 or something and when we
+ * do the next event keep track of the residual using a different ticks to
+ * usecs calculation. Not sure.
+ */
+
+/*
+ * XXX: How should we deal with a late connection event? We need to determine
+ * what we want to do under the following cases:
+ *  1) The current connection event has not ended but a schedule item starts
+ */
+
+/* This is a dummy structure we use for the empty PDU */
+struct ble_ll_empty_pdu
+{
+    struct os_mbuf om;
+    struct os_mbuf_pkthdr pkt_hdr;
+    struct ble_mbuf_hdr ble_hdr;
+};
+
+/* We cannot have more than 254 connections given our current implementation */
+#if (MYNEWT_VAL(BLE_MAX_CONNECTIONS) >= 255)
+    #error "Maximum # of connections is 254"
+#endif
+
+/* Global connection complete event. Used when initiating */
+uint8_t *g_ble_ll_conn_comp_ev;
+
+/* Global LL connection parameters */
+struct ble_ll_conn_global_params g_ble_ll_conn_params;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+/* Global default sync transfer params */
+struct ble_ll_conn_sync_transfer_params g_ble_ll_conn_sync_transfer_params;
+#endif
+
+/* Pointer to connection state machine we are trying to create */
+struct ble_ll_conn_sm *g_ble_ll_conn_create_sm;
+
+/* Pointer to current connection */
+struct ble_ll_conn_sm *g_ble_ll_conn_cur_sm;
+
+/* Connection state machine array */
+struct ble_ll_conn_sm g_ble_ll_conn_sm[MYNEWT_VAL(BLE_MAX_CONNECTIONS)];
+
+/* List of active connections */
+struct ble_ll_conn_active_list g_ble_ll_conn_active_list;
+
+/* List of free connections */
+struct ble_ll_conn_free_list g_ble_ll_conn_free_list;
+
+STATS_SECT_START(ble_ll_conn_stats)
+    STATS_SECT_ENTRY(cant_set_sched)
+    STATS_SECT_ENTRY(conn_ev_late)
+    STATS_SECT_ENTRY(wfr_expirations)
+    STATS_SECT_ENTRY(handle_not_found)
+    STATS_SECT_ENTRY(no_conn_sm)
+    STATS_SECT_ENTRY(no_free_conn_sm)
+    STATS_SECT_ENTRY(rx_data_pdu_no_conn)
+    STATS_SECT_ENTRY(rx_data_pdu_bad_aa)
+    STATS_SECT_ENTRY(slave_rxd_bad_conn_req_params)
+    STATS_SECT_ENTRY(slave_ce_failures)
+    STATS_SECT_ENTRY(data_pdu_rx_dup)
+    STATS_SECT_ENTRY(data_pdu_txg)
+    STATS_SECT_ENTRY(data_pdu_txf)
+    STATS_SECT_ENTRY(conn_req_txd)
+    STATS_SECT_ENTRY(l2cap_enqueued)
+    STATS_SECT_ENTRY(rx_ctrl_pdus)
+    STATS_SECT_ENTRY(rx_l2cap_pdus)
+    STATS_SECT_ENTRY(rx_l2cap_bytes)
+    STATS_SECT_ENTRY(rx_malformed_ctrl_pdus)
+    STATS_SECT_ENTRY(rx_bad_llid)
+    STATS_SECT_ENTRY(tx_ctrl_pdus)
+    STATS_SECT_ENTRY(tx_ctrl_bytes)
+    STATS_SECT_ENTRY(tx_l2cap_pdus)
+    STATS_SECT_ENTRY(tx_l2cap_bytes)
+    STATS_SECT_ENTRY(tx_empty_pdus)
+    STATS_SECT_ENTRY(mic_failures)
+    STATS_SECT_ENTRY(sched_start_in_idle)
+    STATS_SECT_ENTRY(sched_end_in_idle)
+    STATS_SECT_ENTRY(conn_event_while_tmo)
+STATS_SECT_END
+STATS_SECT_DECL(ble_ll_conn_stats) ble_ll_conn_stats;
+
+STATS_NAME_START(ble_ll_conn_stats)
+    STATS_NAME(ble_ll_conn_stats, cant_set_sched)
+    STATS_NAME(ble_ll_conn_stats, conn_ev_late)
+    STATS_NAME(ble_ll_conn_stats, wfr_expirations)
+    STATS_NAME(ble_ll_conn_stats, handle_not_found)
+    STATS_NAME(ble_ll_conn_stats, no_conn_sm)
+    STATS_NAME(ble_ll_conn_stats, no_free_conn_sm)
+    STATS_NAME(ble_ll_conn_stats, rx_data_pdu_no_conn)
+    STATS_NAME(ble_ll_conn_stats, rx_data_pdu_bad_aa)
+    STATS_NAME(ble_ll_conn_stats, slave_rxd_bad_conn_req_params)
+    STATS_NAME(ble_ll_conn_stats, slave_ce_failures)
+    STATS_NAME(ble_ll_conn_stats, data_pdu_rx_dup)
+    STATS_NAME(ble_ll_conn_stats, data_pdu_txg)
+    STATS_NAME(ble_ll_conn_stats, data_pdu_txf)
+    STATS_NAME(ble_ll_conn_stats, conn_req_txd)
+    STATS_NAME(ble_ll_conn_stats, l2cap_enqueued)
+    STATS_NAME(ble_ll_conn_stats, rx_ctrl_pdus)
+    STATS_NAME(ble_ll_conn_stats, rx_l2cap_pdus)
+    STATS_NAME(ble_ll_conn_stats, rx_l2cap_bytes)
+    STATS_NAME(ble_ll_conn_stats, rx_malformed_ctrl_pdus)
+    STATS_NAME(ble_ll_conn_stats, rx_bad_llid)
+    STATS_NAME(ble_ll_conn_stats, tx_ctrl_pdus)
+    STATS_NAME(ble_ll_conn_stats, tx_ctrl_bytes)
+    STATS_NAME(ble_ll_conn_stats, tx_l2cap_pdus)
+    STATS_NAME(ble_ll_conn_stats, tx_l2cap_bytes)
+    STATS_NAME(ble_ll_conn_stats, tx_empty_pdus)
+    STATS_NAME(ble_ll_conn_stats, mic_failures)
+    STATS_NAME(ble_ll_conn_stats, sched_start_in_idle)
+    STATS_NAME(ble_ll_conn_stats, sched_end_in_idle)
+    STATS_NAME(ble_ll_conn_stats, conn_event_while_tmo)
+STATS_NAME_END(ble_ll_conn_stats)
+
+static void ble_ll_conn_event_end(struct ble_npl_event *ev);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+/**
+ * Checks to see if we should start a PHY update procedure
+ *
+ * If current phy is not one of the preferred we need to start control
+ * procedure.
+ *
+ * XXX: we could also decide to change the PHY if RSSI is really good
+ * and we are currently at 1Mbps or lower data rate and we could use
+ * a higher data rate.
+ *
+ * @param connsm
+ * @return 0: success; -1: no phy update procedure started
+ */
+int
+ble_ll_conn_chk_phy_upd_start(struct ble_ll_conn_sm *csm)
+{
+    int rc;
+
+    /* If no host preferences or  */
+    if (((csm->phy_data.host_pref_tx_phys_mask == 0) &&
+         (csm->phy_data.host_pref_rx_phys_mask == 0)) ||
+        ((csm->phy_data.host_pref_tx_phys_mask & CONN_CUR_TX_PHY_MASK(csm)) &&
+         (csm->phy_data.host_pref_rx_phys_mask & CONN_CUR_RX_PHY_MASK(csm)))) {
+        rc = -1;
+    } else {
+        csm->phy_data.req_pref_tx_phys_mask = csm->phy_data.host_pref_tx_phys_mask;
+        csm->phy_data.req_pref_rx_phys_mask = csm->phy_data.host_pref_rx_phys_mask;
+        ble_ll_ctrl_proc_start(csm, BLE_LL_CTRL_PROC_PHY_UPDATE);
+        rc = 0;
+    }
+
+    return rc;
+}
+#endif
+
+static void
+ble_ll_conn_calc_itvl_ticks(struct ble_ll_conn_sm *connsm)
+{
+    uint32_t ticks;
+    uint32_t usecs;
+
+    /*
+     * Precalculate the number of ticks and remaining microseconds for
+     * the connection interval
+     */
+    usecs = connsm->conn_itvl * BLE_LL_CONN_ITVL_USECS;
+    ticks = os_cputime_usecs_to_ticks(usecs);
+    connsm->conn_itvl_usecs = (uint8_t)(usecs -
+                                        os_cputime_ticks_to_usecs(ticks));
+    if (connsm->conn_itvl_usecs == 31) {
+        connsm->conn_itvl_usecs = 0;
+        ++ticks;
+    }
+    connsm->conn_itvl_ticks = ticks;
+}
+
+/**
+ * Get the event buffer allocated to send the connection complete event
+ * when we are initiating.
+ *
+ * @return uint8_t*
+ */
+static uint8_t *
+ble_ll_init_get_conn_comp_ev(void)
+{
+    uint8_t *evbuf;
+
+    evbuf = g_ble_ll_conn_comp_ev;
+    BLE_LL_ASSERT(evbuf != NULL);
+    g_ble_ll_conn_comp_ev = NULL;
+
+    return evbuf;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/**
+ * Called to determine if the received PDU is an empty PDU or not.
+ */
+static int
+ble_ll_conn_is_empty_pdu(uint8_t *rxbuf)
+{
+    int rc;
+    uint8_t llid;
+
+    llid = rxbuf[0] & BLE_LL_DATA_HDR_LLID_MASK;
+    if ((llid == BLE_LL_LLID_DATA_FRAG) && (rxbuf[1] == 0)) {
+        rc = 1;
+    } else {
+        rc = 0;
+    }
+    return rc;
+}
+#endif
+
+/**
+ * Called to return the currently running connection state machine end time.
+ * Always called when interrupts are disabled.
+ *
+ * @return int 0: s1 is not least recently used. 1: s1 is least recently used
+ */
+int
+ble_ll_conn_is_lru(struct ble_ll_conn_sm *s1, struct ble_ll_conn_sm *s2)
+{
+    int rc;
+
+    /* Set time that we last serviced the schedule */
+    if ((int32_t)(s1->last_scheduled - s2->last_scheduled) < 0) {
+        rc = 1;
+    } else {
+        rc = 0;
+    }
+
+    return rc;
+}
+
+/**
+ * Called to return the currently running connection state machine end time.
+ * Always called when interrupts are disabled.
+ *
+ * @return uint32_t
+ */
+uint32_t
+ble_ll_conn_get_ce_end_time(void)
+{
+    uint32_t ce_end_time;
+
+    if (g_ble_ll_conn_cur_sm) {
+        ce_end_time = g_ble_ll_conn_cur_sm->ce_end_time;
+    } else {
+        ce_end_time = os_cputime_get32();
+    }
+    return ce_end_time;
+}
+
+/**
+ * Called when connection state machine needs to halt. This function will:
+ *  -> Disable the PHY, which will prevent any transmit/receive interrupts.
+ *  -> Disable the wait for response timer, if running.
+ *  -> Remove the connection state machine from the scheduler.
+ *  -> Sets the Link Layer state to standby.
+ *  -> Sets the current state machine to NULL.
+ *
+ *  NOTE: the ordering of these function calls is important! We have to stop
+ *  the PHY and remove the schedule item before we can set the state to
+ *  standby and set the current state machine pointer to NULL.
+ */
+static void
+ble_ll_conn_halt(void)
+{
+    ble_phy_disable();
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    g_ble_ll_conn_cur_sm = NULL;
+}
+
+/**
+ * Called when the current connection state machine is no longer being used.
+ */
+static void
+ble_ll_conn_current_sm_over(struct ble_ll_conn_sm *connsm)
+{
+
+    ble_ll_conn_halt();
+
+    /*
+     * NOTE: the connection state machine may be NULL if we are calling
+     * this when we are ending the connection. In that case, there is no
+     * need to post to the LL the connection event end event
+     */
+    if (connsm) {
+        ble_ll_event_send(&connsm->conn_ev_end);
+    }
+}
+
+/**
+ * Given a handle, find an active connection matching the handle
+ *
+ * @param handle
+ *
+ * @return struct ble_ll_conn_sm*
+ */
+struct ble_ll_conn_sm *
+ble_ll_conn_find_active_conn(uint16_t handle)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = NULL;
+    if ((handle != 0) && (handle <= MYNEWT_VAL(BLE_MAX_CONNECTIONS))) {
+        connsm = &g_ble_ll_conn_sm[handle - 1];
+        if (connsm->conn_state == BLE_LL_CONN_STATE_IDLE) {
+            connsm = NULL;
+        }
+    }
+    return connsm;
+}
+
+/**
+ * Get a connection state machine.
+ */
+struct ble_ll_conn_sm *
+ble_ll_conn_sm_get(void)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = STAILQ_FIRST(&g_ble_ll_conn_free_list);
+    if (connsm) {
+        STAILQ_REMOVE_HEAD(&g_ble_ll_conn_free_list, free_stqe);
+    } else {
+        STATS_INC(ble_ll_conn_stats, no_free_conn_sm);
+    }
+
+    return connsm;
+}
+
+static uint8_t
+ble_ll_conn_calc_dci_csa1(struct ble_ll_conn_sm *conn)
+{
+    uint8_t curchan;
+    uint8_t remap_index;
+    uint8_t bitpos;
+
+    /* Get next unmapped channel */
+    curchan = conn->last_unmapped_chan + conn->hop_inc;
+    if (curchan > BLE_PHY_NUM_DATA_CHANS) {
+        curchan -= BLE_PHY_NUM_DATA_CHANS;
+    }
+
+    /* Save unmapped channel */
+    conn->last_unmapped_chan = curchan;
+
+    /* Is this a valid channel? */
+    bitpos = 1 << (curchan & 0x07);
+    if (conn->chanmap[curchan >> 3] & bitpos) {
+        return curchan;
+    }
+
+    /* Calculate remap index */
+    remap_index = curchan % conn->num_used_chans;
+
+    return ble_ll_utils_remapped_channel(remap_index, conn->chanmap);
+}
+
+/**
+ * Determine data channel index to be used for the upcoming/current
+ * connection event
+ *
+ * @param conn
+ * @param latency Used only for CSA #1
+ *
+ * @return uint8_t
+ */
+uint8_t
+ble_ll_conn_calc_dci(struct ble_ll_conn_sm *conn, uint16_t latency)
+{
+    uint8_t index;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    if (CONN_F_CSA2_SUPP(conn)) {
+        return ble_ll_utils_calc_dci_csa2(conn->event_cntr, conn->channel_id,
+                                          conn->num_used_chans, conn->chanmap);
+    }
+#endif
+
+    index = conn->data_chan_index;
+
+    while (latency > 0) {
+        index = ble_ll_conn_calc_dci_csa1(conn);
+        latency--;
+    }
+
+    return index;
+}
+
+/**
+ * Called when we are in the connection state and the wait for response timer
+ * fires off.
+ *
+ * Context: Interrupt
+ */
+void
+ble_ll_conn_wfr_timer_exp(void)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = g_ble_ll_conn_cur_sm;
+    ble_ll_conn_current_sm_over(connsm);
+    STATS_INC(ble_ll_conn_stats, wfr_expirations);
+}
+
+void
+ble_ll_conn_reset_pending_aux_conn_rsp(void)
+{
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    return;
+#endif
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = g_ble_ll_conn_create_sm;
+    if (!connsm) {
+        return;
+    }
+
+    if (CONN_F_AUX_CONN_REQ(connsm)) {
+        STATS_INC(ble_ll_stats, aux_conn_rsp_err);
+        CONN_F_CONN_REQ_TXD(connsm) = 0;
+        CONN_F_AUX_CONN_REQ(connsm) = 0;
+        ble_ll_sched_rmv_elem(&connsm->conn_sch);
+        return;
+    }
+
+    return;
+}
+
+bool
+ble_ll_conn_init_pending_aux_conn_rsp(void)
+{
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    return false;
+#endif
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = g_ble_ll_conn_create_sm;
+    if (!connsm) {
+        return false;
+    }
+
+    return CONN_F_AUX_CONN_REQ(connsm);
+}
+
+void
+ble_ll_conn_init_wfr_timer_exp(void)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = g_ble_ll_conn_create_sm;
+    if (!connsm) {
+        return;
+    }
+
+    ble_ll_conn_reset_pending_aux_conn_rsp();
+    connsm->inita_identity_used = 0;
+
+    ble_ll_scan_interrupted(connsm->scansm);
+
+#endif
+}
+/**
+ * Callback for slave when it transmits a data pdu and the connection event
+ * ends after the transmission.
+ *
+ * Context: Interrupt
+ *
+ * @param sch
+ *
+ */
+static void
+ble_ll_conn_wait_txend(void *arg)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)arg;
+    ble_ll_conn_current_sm_over(connsm);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+static void
+ble_ll_conn_start_rx_encrypt(void *arg)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)arg;
+    CONN_F_ENCRYPTED(connsm) = 1;
+    ble_phy_encrypt_enable(connsm->enc_data.rx_pkt_cntr,
+                           connsm->enc_data.iv,
+                           connsm->enc_data.enc_block.cipher_text,
+                           !CONN_IS_MASTER(connsm));
+}
+
+static void
+ble_ll_conn_start_rx_unencrypt(void *arg)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)arg;
+    CONN_F_ENCRYPTED(connsm) = 0;
+    ble_phy_encrypt_disable();
+}
+
+static void
+ble_ll_conn_txend_encrypt(void *arg)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)arg;
+    CONN_F_ENCRYPTED(connsm) = 1;
+    ble_ll_conn_current_sm_over(connsm);
+}
+
+static void
+ble_ll_conn_rxend_unencrypt(void *arg)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)arg;
+    CONN_F_ENCRYPTED(connsm) = 0;
+    ble_ll_conn_current_sm_over(connsm);
+}
+
+static void
+ble_ll_conn_continue_rx_encrypt(void *arg)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)arg;
+    ble_phy_encrypt_set_pkt_cntr(connsm->enc_data.rx_pkt_cntr,
+                                 !CONN_IS_MASTER(connsm));
+}
+#endif
+
+/**
+ * Returns the cputime of the next scheduled item on the scheduler list or
+ * when the current connection will start its next interval (whichever is
+ * earlier). This API is called when determining at what time we should end
+ * the current connection event. The current connection event must end before
+ * the next scheduled item. However, the current connection itself is not
+ * in the scheduler list! Thus, we need to calculate the time at which the
+ * next connection will start (the schedule start time; not the anchor point)
+ * and not overrun it.
+ *
+ * Context: Interrupt
+ *
+ * @param connsm
+ *
+ * @return uint32_t
+ */
+static uint32_t
+ble_ll_conn_get_next_sched_time(struct ble_ll_conn_sm *connsm)
+{
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+    uint32_t ce_end;
+    ce_end = connsm->ce_end_time;
+#else
+    uint32_t ce_end;
+    uint32_t next_sched_time;
+
+    /* Calculate time at which next connection event will start */
+    /* NOTE: We dont care if this time is tick short. */
+    ce_end = connsm->anchor_point + connsm->conn_itvl_ticks -
+        g_ble_ll_sched_offset_ticks;
+    if ((connsm->anchor_point_usecs + connsm->conn_itvl_usecs) >= 31) {
+        ++ce_end;
+    }
+
+    if (ble_ll_sched_next_time(&next_sched_time)) {
+        if (CPUTIME_LT(next_sched_time, ce_end)) {
+            ce_end = next_sched_time;
+        }
+    }
+#endif
+
+    return ce_end;
+}
+
+/**
+ * Called to check if certain connection state machine flags have been
+ * set.
+ *
+ * @param connsm
+ */
+static void
+ble_ll_conn_chk_csm_flags(struct ble_ll_conn_sm *connsm)
+{
+    uint8_t update_status;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    if (connsm->csmflags.cfbit.send_ltk_req) {
+        /*
+         * Send Long term key request event to host. If masked, we need to
+         * send a REJECT_IND.
+         */
+        if (ble_ll_hci_ev_ltk_req(connsm)) {
+            ble_ll_ctrl_reject_ind_send(connsm, BLE_LL_CTRL_ENC_REQ,
+                                        BLE_ERR_PINKEY_MISSING);
+        }
+        connsm->csmflags.cfbit.send_ltk_req = 0;
+    }
+#endif
+
+    /*
+     * There are two cases where this flag gets set:
+     * 1) A connection update procedure was started and the event counter
+     * has passed the instant.
+     * 2) We successfully sent the reject reason.
+     */
+    if (connsm->csmflags.cfbit.host_expects_upd_event) {
+        update_status = BLE_ERR_SUCCESS;
+        if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_CONN_UPDATE)) {
+            ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_CONN_UPDATE);
+        } else {
+            if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ)) {
+                ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ);
+                update_status = connsm->reject_reason;
+            }
+        }
+        ble_ll_hci_ev_conn_update(connsm, update_status);
+        connsm->csmflags.cfbit.host_expects_upd_event = 0;
+    }
+
+    /* Check if we need to send PHY update complete event */
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    if (CONN_F_PHY_UPDATE_EVENT(connsm)) {
+        if (!ble_ll_hci_ev_phy_update(connsm, BLE_ERR_SUCCESS)) {
+            /* Sent event. Clear flag */
+            CONN_F_PHY_UPDATE_EVENT(connsm) = 0;
+        }
+    }
+#endif
+}
+
+/**
+ * Called when we want to send a data channel pdu inside a connection event.
+ *
+ * Context: interrupt
+ *
+ * @param connsm
+ *
+ * @return int 0: success; otherwise failure to transmit
+ */
+static uint16_t
+ble_ll_conn_adjust_pyld_len(struct ble_ll_conn_sm *connsm, uint16_t pyld_len)
+{
+    uint16_t phy_max_tx_octets;
+    uint16_t ret;
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    uint8_t phy_mode;
+
+    if (connsm->phy_tx_transition) {
+        phy_mode = ble_ll_phy_to_phy_mode(connsm->phy_tx_transition,
+                                          connsm->phy_data.phy_options);
+    } else {
+        phy_mode = connsm->phy_data.tx_phy_mode;
+    }
+
+    phy_max_tx_octets = ble_ll_pdu_max_tx_octets_get(connsm->eff_max_tx_time,
+                                                     phy_mode);
+
+#else
+    phy_max_tx_octets = ble_ll_pdu_max_tx_octets_get(connsm->eff_max_tx_time,
+                                                     BLE_PHY_MODE_1M);
+#endif
+
+    ret = pyld_len;
+
+    if (ret > connsm->eff_max_tx_octets) {
+        ret = connsm->eff_max_tx_octets;
+    }
+
+    if (ret > phy_max_tx_octets) {
+        ret = phy_max_tx_octets;
+    }
+
+    return ret;
+}
+
+static int
+ble_ll_conn_tx_pdu(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+    uint8_t md;
+    uint8_t hdr_byte;
+    uint8_t end_transition;
+    uint8_t cur_txlen;
+    uint8_t next_txlen;
+    uint8_t cur_offset;
+    uint16_t pktlen;
+    uint32_t next_event_time;
+    uint32_t ticks;
+    struct os_mbuf *m;
+    struct ble_mbuf_hdr *ble_hdr;
+    struct os_mbuf_pkthdr *pkthdr = NULL;
+    struct os_mbuf_pkthdr *nextpkthdr;
+    struct ble_ll_empty_pdu empty_pdu;
+    ble_phy_tx_end_func txend_func;
+    int tx_phy_mode;
+    uint8_t llid;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    int is_ctrl;
+    uint8_t opcode;
+#endif
+
+    /* For compiler warnings... */
+    ble_hdr = NULL;
+    m = NULL;
+    md = 0;
+    hdr_byte = BLE_LL_LLID_DATA_FRAG;
+
+    if (connsm->csmflags.cfbit.terminate_ind_rxd) {
+        /* We just received terminate indication.
+         * Just send empty packet as an ACK
+         */
+        CONN_F_EMPTY_PDU_TXD(connsm) = 1;
+        goto conn_tx_pdu;
+    }
+
+    /*
+     * We need to check if we are retrying a pdu or if there is a pdu on
+     * the transmit queue.
+     */
+    pkthdr = STAILQ_FIRST(&connsm->conn_txq);
+    if (!connsm->cur_tx_pdu && !CONN_F_EMPTY_PDU_TXD(connsm) && !pkthdr) {
+        CONN_F_EMPTY_PDU_TXD(connsm) = 1;
+        goto conn_tx_pdu;
+    }
+
+    /*
+     * If we dont have a pdu we have previously transmitted, take it off
+     * the connection transmit queue
+     */
+    cur_offset = 0;
+    if (!connsm->cur_tx_pdu && !CONN_F_EMPTY_PDU_TXD(connsm)) {
+        /* Convert packet header to mbuf */
+        m = OS_MBUF_PKTHDR_TO_MBUF(pkthdr);
+        nextpkthdr = STAILQ_NEXT(pkthdr, omp_next);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        /*
+         * If we are encrypting, we are only allowed to send certain
+         * kinds of LL control PDU's. If none is enqueued, send empty pdu!
+         */
+        if (connsm->enc_data.enc_state > CONN_ENC_S_ENCRYPTED) {
+            if (!ble_ll_ctrl_enc_allowed_pdu_tx(pkthdr)) {
+                CONN_F_EMPTY_PDU_TXD(connsm) = 1;
+                goto conn_tx_pdu;
+            }
+
+            /*
+             * We will allow a next packet if it itself is allowed or we are
+             * a slave and we are sending the START_ENC_RSP. The master has
+             * to wait to receive the START_ENC_RSP from the slave before
+             * packets can be let go.
+             */
+            if (nextpkthdr && !ble_ll_ctrl_enc_allowed_pdu_tx(nextpkthdr)
+                && ((connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) ||
+                    !ble_ll_ctrl_is_start_enc_rsp(m))) {
+                nextpkthdr = NULL;
+            }
+        }
+#endif
+        /* Take packet off queue*/
+        STAILQ_REMOVE_HEAD(&connsm->conn_txq, omp_next);
+        ble_hdr = BLE_MBUF_HDR_PTR(m);
+
+        /*
+         * We dequeued new packet for transmission.
+         * If this is a data PDU we need to calculate payload length we can send
+         * over current PHY. Effectively, this determines fragmentation of packet
+         * into PDUs.
+         * If this is a control PDU we send complete PDU as only data PDU can be
+         * fragmented. We assume that checks (i.e. if remote supports such PDU)
+         * were already performed before putting packet on queue.
+         */
+        llid = ble_hdr->txinfo.hdr_byte & BLE_LL_DATA_HDR_LLID_MASK;
+        pktlen = pkthdr->omp_len;
+        if (llid == BLE_LL_LLID_CTRL) {
+            cur_txlen = pktlen;
+        } else {
+            cur_txlen = ble_ll_conn_adjust_pyld_len(connsm, pktlen);
+        }
+        ble_hdr->txinfo.pyld_len = cur_txlen;
+
+        /* NOTE: header was set when first enqueued */
+        hdr_byte = ble_hdr->txinfo.hdr_byte;
+        connsm->cur_tx_pdu = m;
+    } else {
+        nextpkthdr = pkthdr;
+        if (connsm->cur_tx_pdu) {
+            m = connsm->cur_tx_pdu;
+            ble_hdr = BLE_MBUF_HDR_PTR(m);
+            pktlen = OS_MBUF_PKTLEN(m);
+            cur_txlen = ble_hdr->txinfo.pyld_len;
+            cur_offset = ble_hdr->txinfo.offset;
+            if (cur_offset == 0) {
+                hdr_byte = ble_hdr->txinfo.hdr_byte & BLE_LL_DATA_HDR_LLID_MASK;
+            }
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+            if (connsm->enc_data.enc_state > CONN_ENC_S_ENCRYPTED) {
+                /* We will allow a next packet if it itself is allowed */
+                pkthdr = OS_MBUF_PKTHDR(connsm->cur_tx_pdu);
+                if (nextpkthdr && !ble_ll_ctrl_enc_allowed_pdu_tx(nextpkthdr)
+                    && ((connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) ||
+                        !ble_ll_ctrl_is_start_enc_rsp(connsm->cur_tx_pdu))) {
+                    nextpkthdr = NULL;
+                }
+            }
+#endif
+        } else {
+            /* Empty PDU here. NOTE: header byte gets set later */
+            pktlen = 0;
+            cur_txlen = 0;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+            if (connsm->enc_data.enc_state > CONN_ENC_S_ENCRYPTED) {
+                /* We will allow a next packet if it itself is allowed */
+                if (nextpkthdr && !ble_ll_ctrl_enc_allowed_pdu_tx(nextpkthdr)) {
+                    nextpkthdr = NULL;
+                }
+            }
+#endif
+        }
+    }
+
+    /*
+     * Set the more data data flag if we have more data to send and we
+     * have not been asked to terminate
+     */
+    if (nextpkthdr || ((cur_offset + cur_txlen) < pktlen)) {
+        /* Get next event time */
+        next_event_time = ble_ll_conn_get_next_sched_time(connsm);
+
+        /* XXX: TODO: need to check this with phy update procedure. There are
+           limitations if we have started update */
+
+        /*
+         * Dont bother to set the MD bit if we cannot do the following:
+         *  -> wait IFS, send the current frame.
+         *  -> wait IFS, receive a maximum size frame.
+         *  -> wait IFS, send the next frame.
+         *  -> wait IFS, receive a maximum size frame.
+         *
+         *  For slave:
+         *  -> wait IFS, send current frame.
+         *  -> wait IFS, receive maximum size frame.
+         *  -> wait IFS, send next frame.
+         */
+        if ((cur_offset + cur_txlen) < pktlen) {
+            next_txlen = pktlen - (cur_offset + cur_txlen);
+        } else {
+            if (nextpkthdr->omp_len > connsm->eff_max_tx_octets) {
+                next_txlen = connsm->eff_max_tx_octets;
+            } else {
+                next_txlen = nextpkthdr->omp_len;
+            }
+        }
+
+        /*
+         * XXX: this calculation is based on using the current time
+         * and assuming the transmission will occur an IFS time from
+         * now. This is not the most accurate especially if we have
+         * received a frame and we are replying to it.
+         */
+#if BLE_LL_BT5_PHY_SUPPORTED
+        tx_phy_mode = connsm->phy_data.tx_phy_mode;
+#else
+        tx_phy_mode = BLE_PHY_MODE_1M;
+#endif
+
+        ticks = (BLE_LL_IFS * 3) + connsm->eff_max_rx_time +
+            ble_ll_pdu_tx_time_get(next_txlen, tx_phy_mode) +
+            ble_ll_pdu_tx_time_get(cur_txlen, tx_phy_mode);
+
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+            ticks += (BLE_LL_IFS + connsm->eff_max_rx_time);
+        }
+
+        ticks = os_cputime_usecs_to_ticks(ticks);
+        if ((int32_t)((os_cputime_get32() + ticks) - next_event_time) < 0) {
+            md = 1;
+        }
+     }
+
+    /* If we send an empty PDU we need to initialize the header */
+conn_tx_pdu:
+    if (CONN_F_EMPTY_PDU_TXD(connsm)) {
+        /*
+         * This looks strange, but we dont use the data pointer in the mbuf
+         * when we have an empty pdu.
+         */
+        m = (struct os_mbuf *)&empty_pdu;
+        m->om_data = (uint8_t *)&empty_pdu;
+        m->om_data += BLE_MBUF_MEMBLOCK_OVERHEAD;
+        ble_hdr = &empty_pdu.ble_hdr;
+        ble_hdr->txinfo.flags = 0;
+        ble_hdr->txinfo.offset = 0;
+        ble_hdr->txinfo.pyld_len = 0;
+    }
+
+    /* Set tx seqnum */
+    if (connsm->tx_seqnum) {
+        hdr_byte |= BLE_LL_DATA_HDR_SN_MASK;
+    }
+
+    /* If we have more data, set the bit */
+    if (md) {
+        hdr_byte |= BLE_LL_DATA_HDR_MD_MASK;
+    }
+
+    /* Set NESN (next expected sequence number) bit */
+    if (connsm->next_exp_seqnum) {
+        hdr_byte |= BLE_LL_DATA_HDR_NESN_MASK;
+    }
+
+    /* Set the header byte in the outgoing frame */
+    ble_hdr->txinfo.hdr_byte = hdr_byte;
+
+    /*
+     * If we are a slave, check to see if this transmission will end the
+     * connection event. We will end the connection event if we have
+     * received a valid frame with the more data bit set to 0 and we dont
+     * have more data.
+     *
+     * XXX: for a slave, we dont check to see if we can:
+     *  -> wait IFS, rx frame from master (either big or small).
+     *  -> wait IFS, send empty pdu or next pdu.
+     *
+     *  We could do this. Now, we just keep going and hope that we dont
+     *  overrun next scheduled item.
+     */
+    if ((connsm->csmflags.cfbit.terminate_ind_rxd) ||
+        ((connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) && (md == 0) &&
+         (connsm->cons_rxd_bad_crc == 0) &&
+         ((connsm->last_rxd_hdr_byte & BLE_LL_DATA_HDR_MD_MASK) == 0) &&
+         !ble_ll_ctrl_is_terminate_ind(hdr_byte, m->om_data[0]))) {
+        /* We will end the connection event */
+        end_transition = BLE_PHY_TRANSITION_NONE;
+        txend_func = ble_ll_conn_wait_txend;
+    } else {
+        /* Wait for a response here */
+        end_transition = BLE_PHY_TRANSITION_TX_RX;
+        txend_func = NULL;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    llid = ble_hdr->txinfo.hdr_byte & BLE_LL_DATA_HDR_LLID_MASK;
+    if (llid == BLE_LL_LLID_CTRL) {
+        is_ctrl = 1;
+        opcode = m->om_data[0];
+    } else {
+        is_ctrl = 0;
+        opcode = 0;
+    }
+
+    if (is_ctrl && (opcode == BLE_LL_CTRL_START_ENC_RSP)) {
+        /*
+         * Both master and slave send the START_ENC_RSP encrypted and receive
+         * encrypted
+         */
+        CONN_F_ENCRYPTED(connsm) = 1;
+        connsm->enc_data.tx_encrypted = 1;
+        ble_phy_encrypt_enable(connsm->enc_data.tx_pkt_cntr,
+                               connsm->enc_data.iv,
+                               connsm->enc_data.enc_block.cipher_text,
+                               CONN_IS_MASTER(connsm));
+    } else if (is_ctrl && (opcode == BLE_LL_CTRL_START_ENC_REQ)) {
+        /*
+         * Only the slave sends this and it gets sent unencrypted but
+         * we receive encrypted
+         */
+        CONN_F_ENCRYPTED(connsm) = 0;
+        connsm->enc_data.enc_state = CONN_ENC_S_START_ENC_RSP_WAIT;
+        connsm->enc_data.tx_encrypted = 0;
+        ble_phy_encrypt_disable();
+        if (txend_func == NULL) {
+            txend_func = ble_ll_conn_start_rx_encrypt;
+        } else {
+            txend_func = ble_ll_conn_txend_encrypt;
+        }
+    } else if (is_ctrl && (opcode == BLE_LL_CTRL_PAUSE_ENC_RSP)) {
+        /*
+         * The slave sends the PAUSE_ENC_RSP encrypted. The master sends
+         * it unencrypted (note that link was already set unencrypted).
+         */
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            CONN_F_ENCRYPTED(connsm) = 1;
+            connsm->enc_data.tx_encrypted = 1;
+            ble_phy_encrypt_enable(connsm->enc_data.tx_pkt_cntr,
+                                   connsm->enc_data.iv,
+                                   connsm->enc_data.enc_block.cipher_text,
+                                   CONN_IS_MASTER(connsm));
+            if (txend_func == NULL) {
+                txend_func = ble_ll_conn_start_rx_unencrypt;
+            } else {
+                txend_func = ble_ll_conn_rxend_unencrypt;
+            }
+        } else {
+            CONN_F_ENCRYPTED(connsm) = 0;
+            connsm->enc_data.enc_state = CONN_ENC_S_PAUSED;
+            connsm->enc_data.tx_encrypted = 0;
+            ble_phy_encrypt_disable();
+        }
+    } else {
+        /* If encrypted set packet counter */
+        if (CONN_F_ENCRYPTED(connsm)) {
+            connsm->enc_data.tx_encrypted = 1;
+            ble_phy_encrypt_set_pkt_cntr(connsm->enc_data.tx_pkt_cntr,
+                                         CONN_IS_MASTER(connsm));
+            if (txend_func == NULL) {
+                txend_func = ble_ll_conn_continue_rx_encrypt;
+            }
+        }
+    }
+#endif
+
+    /* Set transmit end callback */
+    ble_phy_set_txend_cb(txend_func, connsm);
+    rc = ble_phy_tx(ble_ll_tx_mbuf_pducb, m, end_transition);
+    if (!rc) {
+        /* Log transmit on connection state */
+        cur_txlen = ble_hdr->txinfo.pyld_len;
+        ble_ll_trace_u32x2(BLE_LL_TRACE_ID_CONN_TX, cur_txlen,
+                           ble_hdr->txinfo.offset);
+
+        /* Set last transmitted MD bit */
+        CONN_F_LAST_TXD_MD(connsm) = md;
+
+        /* Increment packets transmitted */
+        if (CONN_F_EMPTY_PDU_TXD(connsm)) {
+            if (connsm->csmflags.cfbit.terminate_ind_rxd) {
+                connsm->csmflags.cfbit.terminate_ind_rxd_acked = 1;
+            }
+            STATS_INC(ble_ll_conn_stats, tx_empty_pdus);
+        } else if ((hdr_byte & BLE_LL_DATA_HDR_LLID_MASK) == BLE_LL_LLID_CTRL) {
+            STATS_INC(ble_ll_conn_stats, tx_ctrl_pdus);
+            STATS_INCN(ble_ll_conn_stats, tx_ctrl_bytes, cur_txlen);
+        } else {
+            STATS_INC(ble_ll_conn_stats, tx_l2cap_pdus);
+            STATS_INCN(ble_ll_conn_stats, tx_l2cap_bytes, cur_txlen);
+        }
+    }
+    return rc;
+}
+
+/**
+ * Schedule callback for start of connection event.
+ *
+ * Context: Interrupt
+ *
+ * @param sch
+ *
+ * @return int 0: scheduled item is still running. 1: schedule item is done.
+ */
+static int
+ble_ll_conn_event_start_cb(struct ble_ll_sched_item *sch)
+{
+    int rc;
+    uint32_t usecs;
+    uint32_t start;
+    struct ble_ll_conn_sm *connsm;
+
+    /* XXX: note that we can extend end time here if we want. Look at this */
+
+    /* Set current connection state machine */
+    connsm = (struct ble_ll_conn_sm *)sch->cb_arg;
+    g_ble_ll_conn_cur_sm = connsm;
+    BLE_LL_ASSERT(connsm);
+    if (connsm->conn_state == BLE_LL_CONN_STATE_IDLE) {
+        /* That should not happen. If it does it means connection
+         * is already closed
+         */
+        STATS_INC(ble_ll_conn_stats, sched_start_in_idle);
+        BLE_LL_ASSERT(0);
+        ble_ll_conn_current_sm_over(connsm);
+        return BLE_LL_SCHED_STATE_DONE;
+    }
+
+    /* Log connection event start */
+    ble_ll_trace_u32(BLE_LL_TRACE_ID_CONN_EV_START, connsm->conn_handle);
+
+    /* Disable whitelisting as connections do not use it */
+    ble_ll_whitelist_disable();
+
+    /* Set LL state */
+    ble_ll_state_set(BLE_LL_STATE_CONNECTION);
+
+    /* Set channel */
+    ble_phy_setchan(connsm->data_chan_index, connsm->access_addr,
+                    connsm->crcinit);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    ble_phy_resolv_list_disable();
+#endif
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    ble_phy_mode_set(connsm->phy_data.tx_phy_mode, connsm->phy_data.rx_phy_mode);
+#endif
+
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        /* Set start time of transmission */
+        start = sch->start_time + g_ble_ll_sched_offset_ticks;
+        rc = ble_phy_tx_set_start_time(start, sch->remainder);
+        if (!rc) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+            if (CONN_F_ENCRYPTED(connsm)) {
+                ble_phy_encrypt_enable(connsm->enc_data.tx_pkt_cntr,
+                                       connsm->enc_data.iv,
+                                       connsm->enc_data.enc_block.cipher_text,
+                                       1);
+            } else {
+                ble_phy_encrypt_disable();
+            }
+#endif
+            rc = ble_ll_conn_tx_pdu(connsm);
+            if (!rc) {
+                rc = BLE_LL_SCHED_STATE_RUNNING;
+            } else {
+                /* Inform LL task of connection event end */
+                rc = BLE_LL_SCHED_STATE_DONE;
+            }
+        } else {
+            STATS_INC(ble_ll_conn_stats, conn_ev_late);
+            rc = BLE_LL_SCHED_STATE_DONE;
+        }
+    } else {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        if (CONN_F_ENCRYPTED(connsm)) {
+            ble_phy_encrypt_enable(connsm->enc_data.rx_pkt_cntr,
+                                   connsm->enc_data.iv,
+                                   connsm->enc_data.enc_block.cipher_text,
+                                   1);
+        } else {
+            ble_phy_encrypt_disable();
+        }
+#endif
+
+        /* XXX: what is this really for the slave? */
+        start = sch->start_time + g_ble_ll_sched_offset_ticks;
+        rc = ble_phy_rx_set_start_time(start, sch->remainder);
+        if (rc) {
+            /* End the connection event as we have no more buffers */
+            STATS_INC(ble_ll_conn_stats, slave_ce_failures);
+            rc = BLE_LL_SCHED_STATE_DONE;
+        } else {
+            /*
+             * Set flag that tells slave to set last anchor point if a packet
+             * has been received.
+             */
+            connsm->csmflags.cfbit.slave_set_last_anchor = 1;
+
+            /*
+             * Set the wait for response time. The anchor point is when we
+             * expect the master to start transmitting. Worst-case, we expect
+             * to hear a reply within the anchor point plus:
+             *  -> current tx window size
+             *  -> current window widening amount (includes +/- 16 usec jitter)
+             *  -> Amount of time it takes to detect packet start.
+             *  -> Some extra time (16 usec) to insure timing is OK
+             */
+
+            /*
+             * For the 32 kHz crystal, the amount of usecs we have to wait
+             * is not from the anchor point; we have to account for the time
+             * from when the receiver is enabled until the anchor point. The
+             * time we start before the anchor point is this:
+             *   -> current window widening.
+             *   -> up to one 32 kHz tick since we discard remainder.
+             *   -> Up to one tick since the usecs to ticks calc can be off
+             *   by up to one tick.
+             * NOTES:
+             * 1) the 61 we add is for the two ticks mentioned above.
+             * 2) The address rx time and jitter is accounted for in the
+             * phy function
+             */
+            usecs = connsm->slave_cur_tx_win_usecs + 61 +
+                (2 * connsm->slave_cur_window_widening);
+            ble_phy_wfr_enable(BLE_PHY_WFR_ENABLE_RX, 0, usecs);
+            /* Set next wakeup time to connection event end time */
+            rc = BLE_LL_SCHED_STATE_RUNNING;
+        }
+    }
+
+    if (rc == BLE_LL_SCHED_STATE_DONE) {
+        ble_ll_event_send(&connsm->conn_ev_end);
+        ble_phy_disable();
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        g_ble_ll_conn_cur_sm = NULL;
+    }
+
+    /* Set time that we last serviced the schedule */
+    connsm->last_scheduled = os_cputime_get32();
+    return rc;
+}
+
+/**
+ * Called to determine if the device is allowed to send the next pdu in the
+ * connection event. This will always return 'true' if we are a slave. If we
+ * are a master, we must be able to send the next fragment and get a minimum
+ * sized response from the slave.
+ *
+ * Context: Interrupt context (rx end isr).
+ *
+ * @param connsm
+ * @param begtime   Time at which IFS before pdu transmission starts
+ *
+ * @return int 0: not allowed to send 1: allowed to send
+ */
+static int
+ble_ll_conn_can_send_next_pdu(struct ble_ll_conn_sm *connsm, uint32_t begtime,
+                              uint32_t add_usecs)
+{
+    int rc;
+    uint8_t rem_bytes;
+    uint32_t ticks;
+    uint32_t usecs;
+    uint32_t next_sched_time;
+    struct os_mbuf *txpdu;
+    struct os_mbuf_pkthdr *pkthdr;
+    struct ble_mbuf_hdr *txhdr;
+    uint32_t allowed_usecs;
+    int tx_phy_mode;
+
+#if BLE_LL_BT5_PHY_SUPPORTED
+    tx_phy_mode = connsm->phy_data.tx_phy_mode;
+#else
+    tx_phy_mode = BLE_PHY_MODE_1M;
+#endif
+
+    rc = 1;
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        /* Get next scheduled item time */
+        next_sched_time = ble_ll_conn_get_next_sched_time(connsm);
+
+        txpdu = connsm->cur_tx_pdu;
+        if (!txpdu) {
+            pkthdr = STAILQ_FIRST(&connsm->conn_txq);
+            if (pkthdr) {
+                txpdu = OS_MBUF_PKTHDR_TO_MBUF(pkthdr);
+            }
+        } else {
+            pkthdr = OS_MBUF_PKTHDR(txpdu);
+        }
+
+        /* XXX: TODO: need to check this with phy update procedure. There are
+           limitations if we have started update */
+        if (txpdu) {
+            txhdr = BLE_MBUF_HDR_PTR(txpdu);
+            rem_bytes = pkthdr->omp_len - txhdr->txinfo.offset;
+            if (rem_bytes > connsm->eff_max_tx_octets) {
+                rem_bytes = connsm->eff_max_tx_octets;
+            }
+            usecs = ble_ll_pdu_tx_time_get(rem_bytes, tx_phy_mode);
+        } else {
+            /* We will send empty pdu (just a LL header) */
+            usecs = ble_ll_pdu_tx_time_get(0, tx_phy_mode);
+        }
+        usecs += (BLE_LL_IFS * 2) + connsm->eff_max_rx_time;
+
+        ticks = (uint32_t)(next_sched_time - begtime);
+        allowed_usecs = os_cputime_ticks_to_usecs(ticks);
+        if ((usecs + add_usecs) >= allowed_usecs) {
+            rc = 0;
+        }
+    }
+
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+/**
+ * Callback for the Authenticated payload timer. This function is called
+ * when the authenticated payload timer expires. When the authenticated
+ * payload timeout expires, we should
+ *  -> Send the authenticated payload timeout event.
+ *  -> Start the LE ping procedure.
+ *  -> Restart the timer.
+ *
+ * @param arg
+ */
+void
+ble_ll_conn_auth_pyld_timer_cb(struct ble_npl_event *ev)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev);
+    ble_ll_auth_pyld_tmo_event_send(connsm);
+    ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_LE_PING);
+    ble_ll_conn_auth_pyld_timer_start(connsm);
+}
+
+void
+ble_ll_conn_rd_features_timer_cb(struct ble_npl_event *ev)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = (struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev);
+
+    if (!connsm->csmflags.cfbit.pending_hci_rd_features ||
+                                        !connsm->csmflags.cfbit.rxd_features) {
+        return;
+    }
+
+    ble_ll_hci_ev_rd_rem_used_feat(connsm, BLE_ERR_SUCCESS);
+    connsm->csmflags.cfbit.pending_hci_rd_features = 0;
+}
+
+/**
+ * Start (or restart) the authenticated payload timer
+ *
+ * @param connsm
+ */
+void
+ble_ll_conn_auth_pyld_timer_start(struct ble_ll_conn_sm *connsm)
+{
+    int32_t tmo;
+
+    /* Timeout in is in 10 msec units */
+    tmo = (int32_t)BLE_LL_CONN_AUTH_PYLD_OS_TMO(connsm->auth_pyld_tmo);
+    ble_npl_callout_reset(&connsm->auth_pyld_timer, tmo);
+}
+#endif
+
+static void
+ble_ll_conn_master_common_init(struct ble_ll_conn_sm *connsm)
+{
+
+    /* Set master role */
+    connsm->conn_role = BLE_LL_CONN_ROLE_MASTER;
+
+    /* Set default ce parameters */
+
+    /*
+     * XXX: for now, we need twice the transmit window as our calculations
+     * for the transmit window offset could be off.
+     */
+    connsm->tx_win_size = BLE_LL_CONN_TX_WIN_MIN + 1;
+    connsm->tx_win_off = 0;
+    connsm->master_sca = MYNEWT_VAL(BLE_LL_MASTER_SCA);
+
+    /* Hop increment is a random value between 5 and 16. */
+    connsm->hop_inc = (rand() % 12) + 5;
+
+    /* Set channel map to map requested by host */
+    connsm->num_used_chans = g_ble_ll_conn_params.num_used_chans;
+    memcpy(connsm->chanmap, g_ble_ll_conn_params.master_chan_map,
+           BLE_LL_CONN_CHMAP_LEN);
+
+    /*  Calculate random access address and crc initialization value */
+    connsm->access_addr = ble_ll_utils_calc_access_addr();
+    connsm->crcinit = rand() & 0xffffff;
+
+    /* Set initial schedule callback */
+    connsm->conn_sch.sched_cb = ble_ll_conn_event_start_cb;
+}
+/**
+ * Called when a create connection command has been received. This initializes
+ * a connection state machine in the master role.
+ *
+ * NOTE: Must be called before the state machine is started
+ *
+ * @param connsm
+ * @param hcc
+ */
+void
+ble_ll_conn_master_init(struct ble_ll_conn_sm *connsm,
+                        struct hci_create_conn *hcc)
+{
+
+    ble_ll_conn_master_common_init(connsm);
+
+    /* Set slave latency and supervision timeout */
+    connsm->slave_latency = hcc->conn_latency;
+    connsm->supervision_tmo = hcc->supervision_timeout;
+
+    /* Set own address type and peer address if needed */
+    connsm->own_addr_type = hcc->own_addr_type;
+    if (hcc->filter_policy == 0) {
+        memcpy(&connsm->peer_addr, &hcc->peer_addr, BLE_DEV_ADDR_LEN);
+        connsm->peer_addr_type = hcc->peer_addr_type;
+    }
+
+    /* XXX: for now, just make connection interval equal to max */
+    connsm->conn_itvl = hcc->conn_itvl_max;
+
+    /* Check the min/max CE lengths are less than connection interval */
+    if (hcc->min_ce_len > (connsm->conn_itvl * 2)) {
+        connsm->min_ce_len = connsm->conn_itvl * 2;
+    } else {
+        connsm->min_ce_len = hcc->min_ce_len;
+    }
+
+    if (hcc->max_ce_len > (connsm->conn_itvl * 2)) {
+        connsm->max_ce_len = connsm->conn_itvl * 2;
+    } else {
+        connsm->max_ce_len = hcc->max_ce_len;
+    }
+}
+
+static void
+ble_ll_update_max_tx_octets_phy_mode(struct ble_ll_conn_sm *connsm)
+{
+    uint32_t usecs;
+
+    usecs = connsm->eff_max_tx_time;
+
+    connsm->max_tx_octets_phy_mode[BLE_PHY_MODE_1M] =
+            ble_ll_pdu_max_tx_octets_get(usecs, BLE_PHY_MODE_1M);
+    connsm->max_tx_octets_phy_mode[BLE_PHY_MODE_2M] =
+            ble_ll_pdu_max_tx_octets_get(usecs, BLE_PHY_MODE_2M);
+    connsm->max_tx_octets_phy_mode[BLE_PHY_MODE_CODED_125KBPS] =
+            ble_ll_pdu_max_tx_octets_get(usecs, BLE_PHY_MODE_CODED_125KBPS);
+    connsm->max_tx_octets_phy_mode[BLE_PHY_MODE_CODED_500KBPS] =
+            ble_ll_pdu_max_tx_octets_get(usecs, BLE_PHY_MODE_CODED_500KBPS);
+}
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+
+static void
+ble_ll_conn_set_phy(struct ble_ll_conn_sm *connsm, int tx_phy, int rx_phy)
+{
+
+    struct ble_ll_conn_phy_data *phy_data = &connsm->phy_data;
+
+    phy_data->rx_phy_mode = ble_ll_phy_to_phy_mode(rx_phy,
+                                                   BLE_HCI_LE_PHY_CODED_ANY);
+    phy_data->cur_rx_phy = rx_phy;
+
+    phy_data->tx_phy_mode = ble_ll_phy_to_phy_mode(tx_phy,
+                                                   BLE_HCI_LE_PHY_CODED_ANY);
+    phy_data->cur_tx_phy = tx_phy;
+
+}
+
+static void
+ble_ll_conn_init_phy(struct ble_ll_conn_sm *connsm, int phy)
+{
+    struct ble_ll_conn_global_params *conngp;
+
+    /* Always initialize symmetric PHY - controller can change this later */
+    ble_ll_conn_set_phy(connsm, phy, phy);
+
+    /* Update data length management to match initial PHY */
+    conngp = &g_ble_ll_conn_params;
+    connsm->max_tx_octets = conngp->conn_init_max_tx_octets;
+    connsm->max_rx_octets = conngp->supp_max_rx_octets;
+    if (phy == BLE_PHY_CODED) {
+        connsm->max_tx_time = conngp->conn_init_max_tx_time_coded;
+        connsm->max_rx_time = BLE_LL_CONN_SUPP_TIME_MAX_CODED;
+        connsm->rem_max_tx_time = BLE_LL_CONN_SUPP_TIME_MIN_CODED;
+        connsm->rem_max_rx_time = BLE_LL_CONN_SUPP_TIME_MIN_CODED;
+        /* Assume peer does support coded */
+        connsm->remote_features[0] |= (BLE_LL_FEAT_LE_CODED_PHY >> 8);
+    } else {
+        connsm->max_tx_time = conngp->conn_init_max_tx_time_uncoded;
+        connsm->max_rx_time = BLE_LL_CONN_SUPP_TIME_MAX_UNCODED;
+        connsm->rem_max_tx_time = BLE_LL_CONN_SUPP_TIME_MIN_UNCODED;
+        connsm->rem_max_rx_time = BLE_LL_CONN_SUPP_TIME_MIN_UNCODED;
+    }
+    connsm->eff_max_tx_time = connsm->rem_max_tx_time;
+    connsm->eff_max_rx_time = connsm->rem_max_rx_time;
+    connsm->rem_max_tx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+    connsm->rem_max_rx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+    connsm->eff_max_tx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+    connsm->eff_max_rx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+
+    ble_ll_update_max_tx_octets_phy_mode(connsm);
+}
+
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+
+void
+ble_ll_conn_ext_master_init(struct ble_ll_conn_sm *connsm,
+                        struct hci_ext_create_conn *hcc)
+{
+
+    ble_ll_conn_master_common_init(connsm);
+
+    /* Set own address type and peer address if needed */
+    connsm->own_addr_type = hcc->own_addr_type;
+    if (hcc->filter_policy == 0) {
+        memcpy(&connsm->peer_addr, &hcc->peer_addr, BLE_DEV_ADDR_LEN);
+        connsm->peer_addr_type = hcc->peer_addr_type;
+    }
+
+    connsm->initial_params = *hcc;
+}
+
+void
+ble_ll_conn_ext_set_params(struct ble_ll_conn_sm *connsm,
+                           struct hci_ext_conn_params *hcc_params, int phy)
+{
+    /* Set slave latency and supervision timeout */
+    connsm->slave_latency = hcc_params->conn_latency;
+    connsm->supervision_tmo = hcc_params->supervision_timeout;
+
+    /* XXX: for now, just make connection interval equal to max */
+    connsm->conn_itvl = hcc_params->conn_itvl_max;
+
+
+    /* Check the min/max CE lengths are less than connection interval */
+    if (hcc_params->min_ce_len > (connsm->conn_itvl * 2)) {
+        connsm->min_ce_len = connsm->conn_itvl * 2;
+    } else {
+        connsm->min_ce_len = hcc_params->min_ce_len;
+    }
+
+    if (hcc_params->max_ce_len > (connsm->conn_itvl * 2)) {
+        connsm->max_ce_len = connsm->conn_itvl * 2;
+    } else {
+        connsm->max_ce_len = hcc_params->max_ce_len;
+    }
+
+    ble_ll_conn_calc_itvl_ticks(connsm);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    ble_ll_conn_init_phy(connsm, phy);
+#endif
+}
+
+
+#endif
+
+static void
+ble_ll_conn_set_csa(struct ble_ll_conn_sm *connsm, bool chsel)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    if (chsel) {
+        CONN_F_CSA2_SUPP(connsm) = 1;
+        connsm->channel_id = ((connsm->access_addr & 0xffff0000) >> 16) ^
+                              (connsm->access_addr & 0x0000ffff);
+
+        /* calculate the next data channel */
+        connsm->data_chan_index = ble_ll_conn_calc_dci(connsm, 0);
+        return;
+    }
+#endif
+
+    connsm->last_unmapped_chan = 0;
+
+    /* calculate the next data channel */
+    connsm->data_chan_index = ble_ll_conn_calc_dci(connsm, 1);
+}
+
+/**
+ * Create a new connection state machine. This is done once per
+ * connection when the HCI command "create connection" is issued to the
+ * controller or when a slave receives a connect request.
+ *
+ * Context: Link Layer task
+ *
+ * @param connsm
+ */
+void
+ble_ll_conn_sm_new(struct ble_ll_conn_sm *connsm)
+{
+    struct ble_ll_conn_global_params *conn_params;
+
+    /* Reset following elements */
+    connsm->csmflags.conn_flags = 0;
+    connsm->event_cntr = 0;
+    connsm->conn_state = BLE_LL_CONN_STATE_IDLE;
+    connsm->disconnect_reason = 0;
+    connsm->rxd_disconnect_reason = 0;
+    connsm->conn_features = BLE_LL_CONN_INITIAL_FEATURES;
+    memset(connsm->remote_features, 0, sizeof(connsm->remote_features));
+    connsm->vers_nr = 0;
+    connsm->comp_id = 0;
+    connsm->sub_vers_nr = 0;
+    connsm->reject_reason = BLE_ERR_SUCCESS;
+    connsm->conn_rssi = BLE_LL_CONN_UNKNOWN_RSSI;
+    connsm->rpa_index = -1;
+    connsm->inita_identity_used = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    connsm->sync_transfer_sync_timeout = g_ble_ll_conn_sync_transfer_params.sync_timeout_us;
+    connsm->sync_transfer_mode = g_ble_ll_conn_sync_transfer_params.mode;
+    connsm->sync_transfer_skip = g_ble_ll_conn_sync_transfer_params.max_skip;
+#endif
+
+    /* XXX: TODO set these based on PHY that started connection */
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    connsm->phy_data.cur_tx_phy = BLE_PHY_1M;
+    connsm->phy_data.cur_rx_phy = BLE_PHY_1M;
+    connsm->phy_data.tx_phy_mode = BLE_PHY_MODE_1M;
+    connsm->phy_data.rx_phy_mode = BLE_PHY_MODE_1M;
+    connsm->phy_data.req_pref_tx_phys_mask = 0;
+    connsm->phy_data.req_pref_rx_phys_mask = 0;
+    connsm->phy_data.host_pref_tx_phys_mask = g_ble_ll_data.ll_pref_tx_phys;
+    connsm->phy_data.host_pref_rx_phys_mask = g_ble_ll_data.ll_pref_rx_phys;
+    connsm->phy_data.phy_options = 0;
+    connsm->phy_tx_transition = 0;
+#endif
+
+    /* Reset current control procedure */
+    connsm->cur_ctrl_proc = BLE_LL_CTRL_PROC_IDLE;
+    connsm->pending_ctrl_procs = 0;
+
+    /*
+     * Set handle in connection update procedure to 0. If the handle
+     * is non-zero it means that the host initiated the connection
+     * parameter update request and the rest of the parameters are valid.
+     */
+    connsm->conn_param_req.handle = 0;
+
+    /* Connection end event */
+    ble_npl_event_init(&connsm->conn_ev_end, ble_ll_conn_event_end, connsm);
+
+    /* Initialize transmit queue and ack/flow control elements */
+    STAILQ_INIT(&connsm->conn_txq);
+    connsm->cur_tx_pdu = NULL;
+    connsm->tx_seqnum = 0;
+    connsm->next_exp_seqnum = 0;
+    connsm->cons_rxd_bad_crc = 0;
+    connsm->last_rxd_sn = 1;
+    connsm->completed_pkts = 0;
+
+    /* initialize data length mgmt */
+    conn_params = &g_ble_ll_conn_params;
+    connsm->max_tx_octets = conn_params->conn_init_max_tx_octets;
+    connsm->max_rx_octets = conn_params->supp_max_rx_octets;
+    connsm->max_tx_time = conn_params->conn_init_max_tx_time;
+    connsm->max_rx_time = conn_params->supp_max_rx_time;
+    connsm->rem_max_tx_time = BLE_LL_CONN_SUPP_TIME_MIN;
+    connsm->rem_max_rx_time = BLE_LL_CONN_SUPP_TIME_MIN;
+    connsm->eff_max_tx_time = BLE_LL_CONN_SUPP_TIME_MIN;
+    connsm->eff_max_rx_time = BLE_LL_CONN_SUPP_TIME_MIN;
+    connsm->rem_max_tx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+    connsm->rem_max_rx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+    connsm->eff_max_tx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+    connsm->eff_max_rx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    connsm->host_req_max_tx_time = 0;
+#endif
+
+    ble_ll_update_max_tx_octets_phy_mode(connsm);
+
+    /* Reset encryption data */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    memset(&connsm->enc_data, 0, sizeof(struct ble_ll_conn_enc_data));
+    connsm->enc_data.enc_state = CONN_ENC_S_UNENCRYPTED;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+    connsm->auth_pyld_tmo = BLE_LL_CONN_DEF_AUTH_PYLD_TMO;
+    CONN_F_LE_PING_SUPP(connsm) = 1;
+    ble_npl_callout_init(&connsm->auth_pyld_timer,
+                    &g_ble_ll_data.ll_evq,
+                    ble_ll_conn_auth_pyld_timer_cb,
+                    connsm);
+#endif
+
+    ble_ll_conn_calc_itvl_ticks(connsm);
+
+    /* Add to list of active connections */
+    SLIST_INSERT_HEAD(&g_ble_ll_conn_active_list, connsm, act_sle);
+}
+
+void
+ble_ll_conn_update_eff_data_len(struct ble_ll_conn_sm *connsm)
+{
+    int send_event;
+    uint16_t eff_time;
+    uint16_t eff_bytes;
+
+    /* Assume no event sent */
+    send_event = 0;
+
+    /* See if effective times have changed */
+    eff_time = min(connsm->rem_max_tx_time, connsm->max_rx_time);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    if (connsm->phy_data.cur_rx_phy == BLE_PHY_CODED) {
+        eff_time = max(eff_time, BLE_LL_CONN_SUPP_TIME_MIN_CODED);
+    }
+#endif
+    if (eff_time != connsm->eff_max_rx_time) {
+        connsm->eff_max_rx_time = eff_time;
+        send_event = 1;
+    }
+    eff_time = min(connsm->rem_max_rx_time, connsm->max_tx_time);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    if (connsm->phy_data.cur_tx_phy == BLE_PHY_CODED) {
+        eff_time = max(eff_time, BLE_LL_CONN_SUPP_TIME_MIN_CODED);
+    }
+#endif
+    if (eff_time != connsm->eff_max_tx_time) {
+        connsm->eff_max_tx_time = eff_time;
+        send_event = 1;
+
+        ble_ll_update_max_tx_octets_phy_mode(connsm);
+    }
+    eff_bytes = min(connsm->rem_max_tx_octets, connsm->max_rx_octets);
+    if (eff_bytes != connsm->eff_max_rx_octets) {
+        connsm->eff_max_rx_octets = eff_bytes;
+        send_event = 1;
+    }
+    eff_bytes = min(connsm->rem_max_rx_octets, connsm->max_tx_octets);
+    if (eff_bytes != connsm->eff_max_tx_octets) {
+        connsm->eff_max_tx_octets = eff_bytes;
+        send_event = 1;
+    }
+
+    if (send_event) {
+        ble_ll_hci_ev_datalen_chg(connsm);
+    }
+}
+
+/**
+ * Called when a connection is terminated
+ *
+ * Context: Link Layer task.
+ *
+ * @param connsm
+ * @param ble_err
+ */
+void
+ble_ll_conn_end(struct ble_ll_conn_sm *connsm, uint8_t ble_err)
+{
+    struct os_mbuf *m;
+    struct os_mbuf_pkthdr *pkthdr;
+    os_sr_t sr;
+
+    /* Remove scheduler events just in case */
+    ble_ll_sched_rmv_elem(&connsm->conn_sch);
+
+    /* In case of the supervision timeout we shall make sure
+     * that there is no ongoing connection event. It could happen
+     * because we scheduled connection event before checking connection timeout.
+     * If connection event managed to start, let us drop it.
+     */
+    OS_ENTER_CRITICAL(sr);
+    if (g_ble_ll_conn_cur_sm == connsm) {
+        ble_ll_conn_halt();
+        STATS_INC(ble_ll_conn_stats, conn_event_while_tmo);
+    }
+    OS_EXIT_CRITICAL(sr);
+
+    /* Stop any control procedures that might be running */
+    ble_npl_callout_stop(&connsm->ctrl_proc_rsp_timer);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+    ble_npl_callout_stop(&connsm->auth_pyld_timer);
+#endif
+
+    /* Remove from the active connection list */
+    SLIST_REMOVE(&g_ble_ll_conn_active_list, connsm, ble_ll_conn_sm, act_sle);
+
+    /* Free the current transmit pdu if there is one. */
+    if (connsm->cur_tx_pdu) {
+        os_mbuf_free_chain(connsm->cur_tx_pdu);
+        connsm->cur_tx_pdu = NULL;
+    }
+
+    /* Free all packets on transmit queue */
+    while (1) {
+        /* Get mbuf pointer from packet header pointer */
+        pkthdr = STAILQ_FIRST(&connsm->conn_txq);
+        if (!pkthdr) {
+            break;
+        }
+        STAILQ_REMOVE_HEAD(&connsm->conn_txq, omp_next);
+
+        m = (struct os_mbuf *)((uint8_t *)pkthdr - sizeof(struct os_mbuf));
+        os_mbuf_free_chain(m);
+    }
+
+    /* Make sure events off queue */
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &connsm->conn_ev_end);
+
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+    /* Remove from occupied periods */
+    OS_ENTER_CRITICAL(sr);
+    BLE_LL_ASSERT(g_ble_ll_sched_data.sch_num_occ_periods > 0);
+    BLE_LL_ASSERT(g_ble_ll_sched_data.sch_occ_period_mask & connsm->period_occ_mask);
+    --g_ble_ll_sched_data.sch_num_occ_periods;
+    g_ble_ll_sched_data.sch_occ_period_mask &= ~connsm->period_occ_mask;
+    OS_EXIT_CRITICAL(sr);
+#endif
+
+    /* Connection state machine is now idle */
+    connsm->conn_state = BLE_LL_CONN_STATE_IDLE;
+
+    /*
+     * If we have features and there's pending HCI command, send an event before
+     * disconnection event so it does make sense to host.
+     */
+    if (connsm->csmflags.cfbit.pending_hci_rd_features &&
+                                        connsm->csmflags.cfbit.rxd_features) {
+        ble_ll_hci_ev_rd_rem_used_feat(connsm, BLE_ERR_SUCCESS);
+        connsm->csmflags.cfbit.pending_hci_rd_features = 0;
+    }
+
+    /*
+     * If there is still pending read features request HCI command, send an
+     * event to complete it.
+     */
+    if (connsm->csmflags.cfbit.pending_hci_rd_features) {
+        ble_ll_hci_ev_rd_rem_used_feat(connsm, ble_err);
+        connsm->csmflags.cfbit.pending_hci_rd_features = 0;
+    }
+
+    /*
+     * We need to send a disconnection complete event. Connection Complete for
+     * canceling connection creation is sent from LE Create Connection Cancel
+     * Command handler.
+     *
+     * If the ble error is "success" it means that the reset command was
+     * received and we should not send an event.
+     */
+    if (ble_err && (ble_err != BLE_ERR_UNK_CONN_ID ||
+                                connsm->csmflags.cfbit.terminate_ind_rxd)) {
+        ble_ll_disconn_comp_event_send(connsm, ble_err);
+    }
+
+    /* Put connection state machine back on free list */
+    STAILQ_INSERT_TAIL(&g_ble_ll_conn_free_list, connsm, free_stqe);
+
+    /* Log connection end */
+    ble_ll_trace_u32x3(BLE_LL_TRACE_ID_CONN_END, connsm->conn_handle,
+                       connsm->event_cntr, (uint32_t)ble_err);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+void
+ble_ll_conn_get_anchor(struct ble_ll_conn_sm *connsm, uint16_t conn_event,
+                       uint32_t *anchor, uint8_t *anchor_usecs)
+{
+    uint32_t ticks;
+    uint32_t itvl;
+
+    itvl = (connsm->conn_itvl * BLE_LL_CONN_ITVL_USECS);
+
+    if ((int16_t)(conn_event - connsm->event_cntr) < 0) {
+        itvl *= connsm->event_cntr - conn_event;
+        ticks = os_cputime_usecs_to_ticks(itvl);
+        *anchor = connsm->anchor_point - ticks;
+    } else {
+        itvl *= conn_event - connsm->event_cntr;
+        ticks = os_cputime_usecs_to_ticks(itvl);
+        *anchor = connsm->anchor_point + ticks;
+    }
+
+    *anchor_usecs = connsm->anchor_point_usecs;
+    *anchor_usecs += (itvl - os_cputime_ticks_to_usecs(ticks));
+    if (*anchor_usecs >= 31) {
+        (*anchor)++;
+        *anchor_usecs -= 31;
+    }
+}
+#endif
+
+/**
+ * Called to move to the next connection event.
+ *
+ * Context: Link Layer task.
+ *
+ * @param connsm
+ *
+ * @return int
+ */
+static int
+ble_ll_conn_next_event(struct ble_ll_conn_sm *connsm)
+{
+    uint16_t latency;
+    uint32_t itvl;
+    uint32_t cur_ww;
+    uint32_t max_ww;
+    struct ble_ll_conn_upd_req *upd;
+    uint32_t ticks;
+    uint32_t usecs;
+
+    /* XXX: deal with connection request procedure here as well */
+    ble_ll_conn_chk_csm_flags(connsm);
+
+    /* If unable to start terminate procedure, start it now */
+    if (connsm->disconnect_reason && !CONN_F_TERMINATE_STARTED(connsm)) {
+        ble_ll_ctrl_terminate_start(connsm);
+    }
+
+    if (CONN_F_TERMINATE_STARTED(connsm) && (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE)) {
+        /* Some of the devices waits whole connection interval to ACK our
+         * TERMINATE_IND sent as a Slave. Since we are here it means we are still waiting for ACK.
+         * Make sure we catch it in next connection event.
+         */
+        connsm->slave_latency = 0;
+    }
+
+    /*
+     * XXX: TODO Probably want to add checks to see if we need to start
+     * a control procedure here as an instant may have prevented us from
+     * starting one.
+     */
+
+    /*
+     * XXX TODO: I think this is technically incorrect. We can allow slave
+     * latency if we are doing one of these updates as long as we
+     * know that the master has received the ACK to the PDU that set
+     * the instant
+     */
+    /* Set event counter to the next connection event that we will tx/rx in */
+    itvl = connsm->conn_itvl * BLE_LL_CONN_ITVL_USECS;
+    latency = 1;
+    if (connsm->csmflags.cfbit.allow_slave_latency      &&
+        !connsm->csmflags.cfbit.conn_update_sched       &&
+        !CONN_F_PHY_UPDATE_SCHED(connsm)                &&
+        !connsm->csmflags.cfbit.chanmap_update_scheduled) {
+        if (connsm->csmflags.cfbit.pkt_rxd) {
+            latency += connsm->slave_latency;
+            itvl = itvl * latency;
+        }
+    }
+    connsm->event_cntr += latency;
+
+    /* Set next connection event start time */
+    /* We can use pre-calculated values for one interval if latency is 1. */
+    if (latency == 1) {
+        connsm->anchor_point += connsm->conn_itvl_ticks;
+        connsm->anchor_point_usecs += connsm->conn_itvl_usecs;
+    } else {
+        uint32_t ticks;
+        ticks = os_cputime_usecs_to_ticks(itvl);
+        connsm->anchor_point += ticks;
+        connsm->anchor_point_usecs += (itvl - os_cputime_ticks_to_usecs(ticks));
+    }
+    if (connsm->anchor_point_usecs >= 31) {
+        ++connsm->anchor_point;
+        connsm->anchor_point_usecs -= 31;
+    }
+
+    /*
+     * If a connection update has been scheduled and the event counter
+     * is now equal to the instant, we need to adjust the start of the
+     * connection by the the transmit window offset. We also copy in the
+     * update parameters as they now should take effect.
+     */
+    if (connsm->csmflags.cfbit.conn_update_sched &&
+        (connsm->event_cntr == connsm->conn_update_req.instant)) {
+
+        /* Set flag so we send connection update event */
+        upd = &connsm->conn_update_req;
+        if ((connsm->conn_role == BLE_LL_CONN_ROLE_MASTER)  ||
+            ((connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) &&
+             IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ)) ||
+            (connsm->conn_itvl != upd->interval)            ||
+            (connsm->slave_latency != upd->latency)         ||
+            (connsm->supervision_tmo != upd->timeout)) {
+            connsm->csmflags.cfbit.host_expects_upd_event = 1;
+        }
+
+        connsm->supervision_tmo = upd->timeout;
+        connsm->slave_latency = upd->latency;
+        connsm->tx_win_size = upd->winsize;
+        connsm->slave_cur_tx_win_usecs =
+            connsm->tx_win_size * BLE_LL_CONN_TX_WIN_USECS;
+        connsm->tx_win_off = upd->winoffset;
+        connsm->conn_itvl = upd->interval;
+        ble_ll_conn_calc_itvl_ticks(connsm);
+        if (upd->winoffset != 0) {
+            usecs = upd->winoffset * BLE_LL_CONN_ITVL_USECS;
+            ticks = os_cputime_usecs_to_ticks(usecs);
+            connsm->anchor_point += ticks;
+            usecs = usecs - os_cputime_ticks_to_usecs(ticks);
+            connsm->anchor_point_usecs += usecs;
+            if (connsm->anchor_point_usecs >= 31) {
+                ++connsm->anchor_point;
+                connsm->anchor_point_usecs -= 31;
+            }
+        }
+
+        /* Reset the starting point of the connection supervision timeout */
+        connsm->last_rxd_pdu_cputime = connsm->anchor_point;
+
+        /* Reset update scheduled flag */
+        connsm->csmflags.cfbit.conn_update_sched = 0;
+    }
+
+    /*
+     * If there is a channel map request pending and we have reached the
+     * instant, change to new channel map. Note there is a special case here.
+     * If we received a channel map update with an instant equal to the event
+     * counter, when we get here the event counter has already been
+     * incremented by 1. That is why we do a signed comparison and change to
+     * new channel map once the event counter equals or has passed channel
+     * map update instant.
+     */
+    if (connsm->csmflags.cfbit.chanmap_update_scheduled &&
+        ((int16_t)(connsm->chanmap_instant - connsm->event_cntr) <= 0)) {
+
+        /* XXX: there is a chance that the control packet is still on
+         * the queue of the master. This means that we never successfully
+         * transmitted update request. Would end up killing connection
+           on slave side. Could ignore it or see if still enqueued. */
+        connsm->num_used_chans =
+            ble_ll_utils_calc_num_used_chans(connsm->req_chanmap);
+        memcpy(connsm->chanmap, connsm->req_chanmap, BLE_LL_CONN_CHMAP_LEN);
+
+        connsm->csmflags.cfbit.chanmap_update_scheduled = 0;
+
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_CHAN_MAP_UPD);
+
+        /* XXX: host could have resent channel map command. Need to
+           check to make sure we dont have to restart! */
+    }
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    if (CONN_F_PHY_UPDATE_SCHED(connsm) &&
+        (connsm->event_cntr == connsm->phy_instant)) {
+
+        /* Set cur phy to new phy */
+        if (connsm->phy_data.new_tx_phy) {
+            connsm->phy_data.cur_tx_phy = connsm->phy_data.new_tx_phy;
+            connsm->phy_data.tx_phy_mode =
+                                ble_ll_phy_to_phy_mode(connsm->phy_data.cur_tx_phy,
+                                                   connsm->phy_data.phy_options);
+        }
+
+        if (connsm->phy_data.new_rx_phy) {
+            connsm->phy_data.cur_rx_phy = connsm->phy_data.new_rx_phy;
+            connsm->phy_data.rx_phy_mode =
+                                ble_ll_phy_to_phy_mode(connsm->phy_data.cur_rx_phy,
+                                                   connsm->phy_data.phy_options);
+        }
+
+        /* Clear flags and set flag to send event at next instant */
+        CONN_F_PHY_UPDATE_SCHED(connsm) = 0;
+        CONN_F_PHY_UPDATE_EVENT(connsm) = 1;
+
+        ble_ll_ctrl_phy_update_proc_complete(connsm);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+        /* Recalculate effective connection parameters */
+        ble_ll_conn_update_eff_data_len(connsm);
+
+        /*
+         * If PHY in either direction was changed to coded, we assume that peer
+         * does support LE Coded PHY even if features were not exchanged yet.
+         * This means that MaxRxTime can be updated to supported max and we need
+         * initiate DLE to notify peer about the change.
+         */
+        if (((connsm->phy_data.cur_tx_phy == BLE_PHY_CODED) ||
+             (connsm->phy_data.cur_rx_phy == BLE_PHY_CODED)) &&
+            !(connsm->remote_features[0] & (BLE_LL_FEAT_LE_CODED_PHY >> 8))) {
+            connsm->remote_features[0] |= (BLE_LL_FEAT_LE_CODED_PHY >> 8);
+            connsm->max_rx_time = BLE_LL_CONN_SUPP_TIME_MAX_CODED;
+            ble_ll_ctrl_initiate_dle(connsm);
+        }
+#endif
+    }
+#endif
+
+    /* Calculate data channel index of next connection event */
+    connsm->data_chan_index = ble_ll_conn_calc_dci(connsm, latency);
+
+    /*
+     * If we are trying to terminate connection, check if next wake time is
+     * passed the termination timeout. If so, no need to continue with
+     * connection as we will time out anyway.
+     */
+    if (CONN_F_TERMINATE_STARTED(connsm)) {
+        if ((int32_t)(connsm->terminate_timeout - connsm->anchor_point) <= 0) {
+            return -1;
+        }
+    }
+
+    /*
+     * Calculate ce end time. For a slave, we need to add window widening and
+     * the transmit window if we still have one.
+     */
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+    itvl = g_ble_ll_sched_data.sch_ticks_per_period;
+#else
+    itvl = MYNEWT_VAL(BLE_LL_CONN_INIT_SLOTS) * BLE_LL_SCHED_32KHZ_TICKS_PER_SLOT;
+#endif
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+
+        cur_ww = ble_ll_utils_calc_window_widening(connsm->anchor_point,
+                                                   connsm->last_anchor_point,
+                                                   connsm->master_sca);
+        max_ww = (connsm->conn_itvl * (BLE_LL_CONN_ITVL_USECS/2)) - BLE_LL_IFS;
+        if (cur_ww >= max_ww) {
+            return -1;
+        }
+        cur_ww += BLE_LL_JITTER_USECS;
+        connsm->slave_cur_window_widening = cur_ww;
+        itvl += os_cputime_usecs_to_ticks(cur_ww + connsm->slave_cur_tx_win_usecs);
+    }
+    itvl -= g_ble_ll_sched_offset_ticks;
+    connsm->ce_end_time = connsm->anchor_point + itvl;
+
+    return 0;
+}
+
+/**
+ * Called when a connection has been created. This function will
+ *  -> Set the connection state to created.
+ *  -> Start the connection supervision timer
+ *  -> Set the Link Layer state to connection.
+ *  -> Send a connection complete event.
+ *
+ *  See Section 4.5.2 Vol 6 Part B
+ *
+ *  Context: Link Layer
+ *
+ * @param connsm
+ *
+ * @ return 0: connection NOT created. 1: connection created
+ */
+static int
+ble_ll_conn_created(struct ble_ll_conn_sm *connsm, struct ble_mbuf_hdr *rxhdr)
+{
+    int rc;
+    uint8_t *evbuf;
+    uint32_t endtime;
+    uint32_t usecs;
+
+    /* XXX: TODO this assumes we received in 1M phy */
+
+    /* Set state to created */
+    connsm->conn_state = BLE_LL_CONN_STATE_CREATED;
+
+    /* Clear packet received flag */
+    connsm->csmflags.cfbit.pkt_rxd = 0;
+
+    /* Consider time created the last scheduled time */
+    connsm->last_scheduled = os_cputime_get32();
+
+    /*
+     * Set the last rxd pdu time since this is where we want to start the
+     * supervision timer from.
+     */
+    connsm->last_rxd_pdu_cputime = connsm->last_scheduled;
+
+    /*
+     * Set first connection event time. If slave the endtime is the receive end
+     * time of the connect request. The actual connection starts 1.25 msecs plus
+     * the transmit window offset from the end of the connection request.
+     */
+    rc = 1;
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+        /*
+         * With a 32.768 kHz crystal we dont care about the remaining usecs
+         * when setting last anchor point. The only thing last anchor is used
+         * for is to calculate window widening. The effect of this is
+         * negligible.
+         */
+        connsm->last_anchor_point = rxhdr->beg_cputime;
+
+        usecs = rxhdr->rem_usecs + 1250 +
+                (connsm->tx_win_off * BLE_LL_CONN_TX_WIN_USECS) +
+                ble_ll_pdu_tx_time_get(BLE_CONNECT_REQ_LEN,
+                                       rxhdr->rxinfo.phy_mode);
+
+        if (rxhdr->rxinfo.channel < BLE_PHY_NUM_DATA_CHANS) {
+            switch (rxhdr->rxinfo.phy) {
+            case BLE_PHY_1M:
+            case BLE_PHY_2M:
+                usecs += 1250;
+                break;
+            case BLE_PHY_CODED:
+                usecs += 2500;
+                break;
+            default:
+                BLE_LL_ASSERT(0);
+                break;
+            }
+        }
+
+        /* Anchor point is cputime. */
+        endtime = os_cputime_usecs_to_ticks(usecs);
+        connsm->anchor_point = rxhdr->beg_cputime + endtime;
+        connsm->anchor_point_usecs = usecs - os_cputime_ticks_to_usecs(endtime);
+        if (connsm->anchor_point_usecs == 31) {
+            ++connsm->anchor_point;
+            connsm->anchor_point_usecs = 0;
+        }
+
+        connsm->slave_cur_tx_win_usecs =
+            connsm->tx_win_size * BLE_LL_CONN_TX_WIN_USECS;
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+        connsm->ce_end_time = connsm->anchor_point +
+            g_ble_ll_sched_data.sch_ticks_per_period +
+            os_cputime_usecs_to_ticks(connsm->slave_cur_tx_win_usecs) + 1;
+
+#else
+        connsm->ce_end_time = connsm->anchor_point +
+            (MYNEWT_VAL(BLE_LL_CONN_INIT_SLOTS) * BLE_LL_SCHED_32KHZ_TICKS_PER_SLOT)
+            + os_cputime_usecs_to_ticks(connsm->slave_cur_tx_win_usecs) + 1;
+#endif
+        connsm->slave_cur_window_widening = BLE_LL_JITTER_USECS;
+
+        /* Start the scheduler for the first connection event */
+        while (ble_ll_sched_slave_new(connsm)) {
+            if (ble_ll_conn_next_event(connsm)) {
+                STATS_INC(ble_ll_conn_stats, cant_set_sched);
+                rc = 0;
+                break;
+            }
+        }
+    }
+
+    /* Send connection complete event to inform host of connection */
+    if (rc) {
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+        /*
+         * If we have default phy preferences and they are different than
+         * the current PHY's in use, start update procedure.
+         */
+        /*
+         * XXX: should we attempt to start this without knowing if
+         * the other side can support it?
+         */
+        if (!ble_ll_conn_chk_phy_upd_start(connsm)) {
+            CONN_F_CTRLR_PHY_UPDATE(connsm) = 1;
+        }
+#endif
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            ble_ll_adv_send_conn_comp_ev(connsm, rxhdr);
+        } else {
+            evbuf = ble_ll_init_get_conn_comp_ev();
+            ble_ll_conn_comp_event_send(connsm, BLE_ERR_SUCCESS, evbuf, NULL);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+            ble_ll_hci_ev_le_csa(connsm);
+#endif
+
+            /*
+             * Initiate features exchange
+             *
+             * XXX we do this only as a master as it was observed that sending
+             * LL_SLAVE_FEATURE_REQ after connection breaks some recent iPhone
+             * models; for slave just assume master will initiate features xchg
+             * if it has some additional features to use.
+             */
+            ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG);
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Called upon end of connection event
+ *
+ * Context: Link-layer task
+ *
+ * @param void *arg Pointer to connection state machine
+ *
+ */
+static void
+ble_ll_conn_event_end(struct ble_npl_event *ev)
+{
+    uint8_t ble_err;
+    uint32_t tmo;
+    struct ble_ll_conn_sm *connsm;
+
+    ble_ll_rfmgmt_release();
+
+    /* Better be a connection state machine! */
+    connsm = (struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev);
+    BLE_LL_ASSERT(connsm);
+    if (connsm->conn_state == BLE_LL_CONN_STATE_IDLE) {
+        /* That should not happen. If it does it means connection
+         * is already closed.
+         * Make sure LL state machine is in idle
+         */
+        STATS_INC(ble_ll_conn_stats, sched_end_in_idle);
+        BLE_LL_ASSERT(0);
+
+        /* Just in case */
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+
+        ble_ll_scan_chk_resume();
+        return;
+    }
+
+    /* Log event end */
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_CONN_EV_END, connsm->conn_handle,
+                       connsm->event_cntr);
+
+    ble_ll_scan_chk_resume();
+
+    /* If we have transmitted the terminate IND successfully, we are done */
+    if ((connsm->csmflags.cfbit.terminate_ind_txd) ||
+                    (connsm->csmflags.cfbit.terminate_ind_rxd &&
+                     connsm->csmflags.cfbit.terminate_ind_rxd_acked)) {
+        if (connsm->csmflags.cfbit.terminate_ind_txd) {
+            ble_err = BLE_ERR_CONN_TERM_LOCAL;
+        } else {
+            /* Make sure the disconnect reason is valid! */
+            ble_err = connsm->rxd_disconnect_reason;
+            if (ble_err == 0) {
+                ble_err = BLE_ERR_REM_USER_CONN_TERM;
+            }
+        }
+        ble_ll_conn_end(connsm, ble_err);
+        return;
+    }
+
+    /* Remove any connection end events that might be enqueued */
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &connsm->conn_ev_end);
+
+    /*
+     * If we have received a packet, we can set the current transmit window
+     * usecs to 0 since we dont need to listen in the transmit window.
+     */
+    if (connsm->csmflags.cfbit.pkt_rxd) {
+        connsm->slave_cur_tx_win_usecs = 0;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+    /*
+     * If we are encrypted and have passed the authenticated payload timeout
+     * we need to send an event to tell the host. Unfortunately, I think we
+     * need one of these per connection and we have to set this timer
+     * fairly accurately. So we need to another event in the connection.
+     * This sucks.
+     *
+     * The way this works is that whenever the timer expires it just gets reset
+     * and we send the autheticated payload timeout event. Note that this timer
+     * should run even when encryption is paused.
+     * XXX: what should be here? Was there code here that got deleted?
+     */
+#endif
+
+    /* Move to next connection event */
+    if (ble_ll_conn_next_event(connsm)) {
+        ble_ll_conn_end(connsm, BLE_ERR_CONN_TERM_LOCAL);
+        return;
+    }
+
+    /* Reset "per connection event" variables */
+    connsm->cons_rxd_bad_crc = 0;
+    connsm->csmflags.cfbit.pkt_rxd = 0;
+
+    /* See if we need to start any control procedures */
+    ble_ll_ctrl_chk_proc_start(connsm);
+
+    /* Set initial schedule callback */
+    connsm->conn_sch.sched_cb = ble_ll_conn_event_start_cb;
+
+    /* XXX: I think all this fine for when we do connection updates, but
+       we may want to force the first event to be scheduled. Not sure */
+    /* Schedule the next connection event */
+    while (ble_ll_sched_conn_reschedule(connsm)) {
+        if (ble_ll_conn_next_event(connsm)) {
+            ble_ll_conn_end(connsm, BLE_ERR_CONN_TERM_LOCAL);
+            return;
+        }
+    }
+
+    /*
+     * This is definitely not perfect but hopefully will be fine in regards to
+     * the specification. We check the supervision timer at connection event
+     * end. If the next connection event is going to start past the supervision
+     * timeout we end the connection here. I guess this goes against the spec
+     * in two ways:
+     * 1) We are actually causing a supervision timeout before the time
+     * specified. However, this is really a moot point because the supervision
+     * timeout would have expired before we could possibly receive a packet.
+     * 2) We may end the supervision timeout a bit later than specified as
+     * we only check this at event end and a bad CRC could cause us to continue
+     * the connection event longer than the supervision timeout. Given that two
+     * bad CRC's consecutively ends the connection event, I dont regard this as
+     * a big deal but it could cause a slightly longer supervision timeout.
+     */
+    if (connsm->conn_state == BLE_LL_CONN_STATE_CREATED) {
+        tmo = (uint32_t)connsm->conn_itvl * BLE_LL_CONN_ITVL_USECS * 6UL;
+        ble_err = BLE_ERR_CONN_ESTABLISHMENT;
+    } else {
+        tmo = connsm->supervision_tmo * BLE_HCI_CONN_SPVN_TMO_UNITS * 1000UL;
+        ble_err = BLE_ERR_CONN_SPVN_TMO;
+    }
+    /* XXX: Convert to ticks to usecs calculation instead??? */
+    tmo = os_cputime_usecs_to_ticks(tmo);
+    if ((int32_t)(connsm->anchor_point - connsm->last_rxd_pdu_cputime) >= tmo) {
+        ble_ll_conn_end(connsm, ble_err);
+        return;
+    }
+
+    /* If we have completed packets, send an event */
+    ble_ll_conn_num_comp_pkts_event_send(connsm);
+
+    /* If we have features and there's pending HCI command, send an event */
+    if (connsm->csmflags.cfbit.pending_hci_rd_features &&
+                                        connsm->csmflags.cfbit.rxd_features) {
+        ble_ll_hci_ev_rd_rem_used_feat(connsm, BLE_ERR_SUCCESS);
+        connsm->csmflags.cfbit.pending_hci_rd_features = 0;
+    }
+}
+
+/**
+ * Update the connection request PDU with the address type and address of
+ * advertiser we are going to send connect request to.
+ *
+ * @param m
+ * @param adva
+ * @param addr_type     Address type of ADVA from received advertisement.
+ * @param inita
+ * @param inita_type     Address type of INITA from received advertisement.
+
+ * @param txoffset      The tx window offset for this connection
+ */
+static void
+ble_ll_conn_connect_ind_prepare(struct ble_ll_conn_sm *connsm,
+                                struct ble_ll_scan_pdu_data *pdu_data,
+                                uint8_t adva_type, uint8_t *adva,
+                                uint8_t inita_type, uint8_t *inita,
+                                int rpa_index, uint8_t channel)
+{
+    uint8_t hdr;
+    uint8_t *addr;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    int is_rpa;
+    struct ble_ll_resolv_entry *rl;
+#endif
+
+    hdr = BLE_ADV_PDU_TYPE_CONNECT_IND;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+    /* We need CSA2 bit only for legacy connect */
+    if (channel >= BLE_PHY_NUM_DATA_CHANS) {
+        hdr |= BLE_ADV_PDU_HDR_CHSEL;
+    }
+#endif
+
+    if (adva_type) {
+        /* Set random address */
+        hdr |= BLE_ADV_PDU_HDR_RXADD_MASK;
+    }
+
+    if (inita) {
+        memcpy(pdu_data->inita, inita, BLE_DEV_ADDR_LEN);
+        if (inita_type) {
+            hdr |= BLE_ADV_PDU_HDR_TXADD_RAND;
+        }
+    } else {
+        /* Get pointer to our device address */
+        connsm = g_ble_ll_conn_create_sm;
+        if ((connsm->own_addr_type & 1) == 0) {
+            addr = g_dev_addr;
+        } else {
+            hdr |= BLE_ADV_PDU_HDR_TXADD_RAND;
+            addr = g_random_addr;
+        }
+
+    /* XXX: do this ahead of time? Calculate the local rpa I mean */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        if (connsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+            rl = NULL;
+            is_rpa = ble_ll_is_rpa(adva, adva_type);
+            if (is_rpa) {
+                if (rpa_index >= 0) {
+                    rl = &g_ble_ll_resolv_list[rpa_index];
+                }
+            } else {
+                /* we look for RL entry to generate local RPA regardless if
+                 * resolving is enabled or not (as this is is for local RPA
+                 * not peer RPA)
+                 */
+                 rl = ble_ll_resolv_list_find(adva, adva_type);
+            }
+
+            /*
+             * If peer in on resolving list, we use RPA generated with Local IRK
+             * from resolving list entry. In other case, we need to use our identity
+             * address (see  Core 5.0, Vol 6, Part B, section 6.4).
+             */
+            if (rl && rl->rl_has_local) {
+                hdr |= BLE_ADV_PDU_HDR_TXADD_RAND;
+                ble_ll_resolv_get_priv_addr(rl, 1, pdu_data->inita);
+                addr = NULL;
+            }
+        }
+#endif
+
+        if (addr) {
+            memcpy(pdu_data->inita, addr, BLE_DEV_ADDR_LEN);
+            /* Identity address used */
+            connsm->inita_identity_used = 1;
+        }
+    }
+
+    memcpy(pdu_data->adva, adva, BLE_DEV_ADDR_LEN);
+
+    pdu_data->hdr_byte = hdr;
+}
+
+/* Returns true if the address matches the connection peer address having in
+ * mind privacy mode
+ */
+static int
+ble_ll_conn_is_peer_adv(uint8_t addr_type, uint8_t *adva, int index)
+{
+    int rc;
+    uint8_t *peer_addr = NULL;
+    struct ble_ll_conn_sm *connsm;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    struct ble_ll_resolv_entry *rl;
+#endif
+
+    /* XXX: Deal with different types of random addresses here! */
+    connsm = g_ble_ll_conn_create_sm;
+    if (!connsm) {
+        return 0;
+    }
+
+    switch (connsm->peer_addr_type) {
+    /* Fall-through intentional */
+    case BLE_HCI_CONN_PEER_ADDR_PUBLIC:
+    case BLE_HCI_CONN_PEER_ADDR_RANDOM:
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        if (ble_ll_addr_is_id(adva, addr_type)) {
+                /* Peer uses its identity address. Let's verify privacy mode.
+                 *
+                 * Note: Core Spec 5.0 Vol 6, Part B
+                 * If the Host has added the peer device to the resolving list
+                 * with an all-zero peer IRK, the Controller shall only accept
+                 * the peer's identity address.
+                 */
+            if (ble_ll_resolv_enabled()) {
+                rl = ble_ll_resolv_list_find(adva, addr_type);
+                if (rl && (rl->rl_priv_mode == BLE_HCI_PRIVACY_NETWORK) &&
+                    rl->rl_has_peer) {
+                    return 0;
+                }
+            }
+        }
+
+        /* Check if peer uses RPA. If so and it match, use it as controller
+         * supports privacy mode
+         */
+        if ((index >= 0) &&
+                (g_ble_ll_resolv_list[index].rl_addr_type == connsm->peer_addr_type)) {
+            peer_addr = g_ble_ll_resolv_list[index].rl_identity_addr;
+        }
+#endif
+        /*
+         * If we are here it means we don't know the device, lets
+         * check if type is what we are looking for and later
+         * if address matches
+         */
+        if ((connsm->peer_addr_type == addr_type) && !peer_addr) {
+            peer_addr = adva;
+        }
+
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    case BLE_HCI_CONN_PEER_ADDR_PUBLIC_IDENT:
+        if ((index < 0) ||
+            (g_ble_ll_resolv_list[index].rl_addr_type != 0)) {
+            return 0;
+        }
+        peer_addr = g_ble_ll_resolv_list[index].rl_identity_addr;
+        break;
+    case BLE_HCI_CONN_PEER_ADDR_RANDOM_IDENT:
+        if ((index < 0) ||
+            (g_ble_ll_resolv_list[index].rl_addr_type != 1)) {
+            return 0;
+        }
+        peer_addr = g_ble_ll_resolv_list[index].rl_identity_addr;
+        break;
+#endif
+    default:
+        peer_addr = NULL;
+        break;
+    }
+
+    rc = 0;
+    if (peer_addr) {
+        if (!memcmp(peer_addr, connsm->peer_addr, BLE_DEV_ADDR_LEN)) {
+            rc = 1;
+        }
+    }
+
+    return rc;
+}
+
+static void
+ble_ll_conn_connect_ind_txend_to_standby(void *arg)
+{
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+}
+
+static void
+ble_ll_conn_connect_ind_txend_to_init(void *arg)
+{
+    ble_ll_state_set(BLE_LL_STATE_INITIATING);
+}
+
+static uint8_t
+ble_ll_conn_connect_ind_tx_pducb(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_conn_sm *connsm;
+    struct ble_ll_scan_pdu_data *pdu_data;
+
+    connsm = pducb_arg;
+    /*
+     * pdu_data was prepared just before starting TX and is expected to be
+     * still valid here
+     */
+    pdu_data = ble_ll_scan_get_pdu_data();
+
+    memcpy(dptr, pdu_data->inita, BLE_DEV_ADDR_LEN);
+    memcpy(dptr + BLE_DEV_ADDR_LEN, pdu_data->adva, BLE_DEV_ADDR_LEN);
+
+    dptr += 2 * BLE_DEV_ADDR_LEN;
+
+    put_le32(dptr, connsm->access_addr);
+    dptr[4] = (uint8_t)connsm->crcinit;
+    dptr[5] = (uint8_t)(connsm->crcinit >> 8);
+    dptr[6] = (uint8_t)(connsm->crcinit >> 16);
+    dptr[7] = connsm->tx_win_size;
+    put_le16(dptr + 8, connsm->tx_win_off);
+    put_le16(dptr + 10, connsm->conn_itvl);
+    put_le16(dptr + 12, connsm->slave_latency);
+    put_le16(dptr + 14, connsm->supervision_tmo);
+    memcpy(dptr + 16, &connsm->chanmap, BLE_LL_CONN_CHMAP_LEN);
+    dptr[21] = connsm->hop_inc | (connsm->master_sca << 5);
+
+    *hdr_byte = pdu_data->hdr_byte;
+
+    return 34;
+}
+
+/**
+ * Send a connection requestion to an advertiser
+ *
+ * Context: Interrupt
+ *
+ * @param addr_type Address type of advertiser
+ * @param adva Address of advertiser
+ */
+int
+ble_ll_conn_connect_ind_send(struct ble_ll_conn_sm *connsm, uint8_t end_trans)
+{
+    int rc;
+
+    if (end_trans == BLE_PHY_TRANSITION_NONE) {
+        ble_phy_set_txend_cb(ble_ll_conn_connect_ind_txend_to_standby, NULL);
+    } else {
+        ble_phy_set_txend_cb(ble_ll_conn_connect_ind_txend_to_init, NULL);
+    }
+
+    rc = ble_phy_tx(ble_ll_conn_connect_ind_tx_pducb, connsm, end_trans);
+
+    return rc;
+}
+
+/**
+ * Called when a schedule item overlaps the currently running connection
+ * event. This generally should not happen, but if it does we stop the
+ * current connection event to let the schedule item run.
+ *
+ * NOTE: the phy has been disabled as well as the wfr timer before this is
+ * called.
+ */
+void
+ble_ll_conn_event_halt(void)
+{
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    if (g_ble_ll_conn_cur_sm) {
+        g_ble_ll_conn_cur_sm->csmflags.cfbit.pkt_rxd = 0;
+        ble_ll_event_send(&g_ble_ll_conn_cur_sm->conn_ev_end);
+        g_ble_ll_conn_cur_sm = NULL;
+    }
+}
+
+/**
+ * Process a received PDU while in the initiating state.
+ *
+ * Context: Link Layer task.
+ *
+ * @param pdu_type
+ * @param rxbuf
+ * @param ble_hdr
+ */
+void
+ble_ll_init_rx_pkt_in(uint8_t pdu_type, uint8_t *rxbuf,
+                      struct ble_mbuf_hdr *ble_hdr)
+{
+    uint8_t addr_type;
+    uint8_t *addr;
+    uint8_t *adv_addr;
+    uint8_t *inita;
+    uint8_t inita_type;
+    struct ble_ll_conn_sm *connsm;
+    int ext_adv_mode = -1;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_aux_data *aux_data = NULL;
+
+     if (ble_hdr->rxinfo.user_data) {
+         /* aux_data just a local helper, no need to ref
+          * as ble_hdr->rxinfo.user_data is unref in the end of this function
+          */
+         aux_data = ble_hdr->rxinfo.user_data;
+     }
+#endif
+
+    /* Get the connection state machine we are trying to create */
+    connsm = g_ble_ll_conn_create_sm;
+    if (!connsm) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if (aux_data) {
+            ble_ll_scan_aux_data_unref(ble_hdr->rxinfo.user_data);
+            ble_hdr->rxinfo.user_data = NULL;
+        }
+#endif
+        return;
+    }
+
+    if (!BLE_MBUF_HDR_CRC_OK(ble_hdr)) {
+        goto scan_continue;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (BLE_MBUF_HDR_AUX_INVALID(ble_hdr)) {
+        goto scan_continue;
+    }
+
+    if (pdu_type == BLE_ADV_PDU_TYPE_ADV_EXT_IND) {
+        if (BLE_MBUF_HDR_WAIT_AUX(ble_hdr)) {
+            /* Just continue scanning. We are waiting for AUX */
+            if (!ble_ll_sched_aux_scan(ble_hdr, connsm->scansm, aux_data)) {
+                /* ref for aux ptr in the scheduler */
+                ble_ll_scan_aux_data_unref(ble_hdr->rxinfo.user_data);
+                ble_hdr->rxinfo.user_data = NULL;
+                ble_ll_scan_chk_resume();
+                return;
+            }
+            goto scan_continue;
+        }
+    }
+
+    if (CONN_F_AUX_CONN_REQ(connsm)) {
+        if (pdu_type != BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP) {
+            /* Wait for connection response, in this point of time aux is NULL */
+            BLE_LL_ASSERT(ble_hdr->rxinfo.user_data == NULL);
+            return;
+        }
+    }
+#endif
+
+    /* If we have sent a connect request, we need to enter CONNECTION state */
+    if (connsm && CONN_F_CONN_REQ_TXD(connsm)) {
+        /* Set address of advertiser to which we are connecting. */
+
+        if (ble_ll_scan_adv_decode_addr(pdu_type, rxbuf, ble_hdr,
+                                        &adv_addr, &addr_type,
+                                        &inita, &inita_type, &ext_adv_mode)) {
+            /* Something got wrong, keep trying to connect */
+            goto scan_continue;
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        /*
+         * Did we resolve this address? If so, set correct peer address
+         * and peer address type.
+         */
+        if (connsm->rpa_index >= 0) {
+            addr_type = g_ble_ll_resolv_list[connsm->rpa_index].rl_addr_type + 2;
+            addr = g_ble_ll_resolv_list[connsm->rpa_index].rl_identity_addr;
+        } else {
+            addr = adv_addr;
+        }
+#else
+        addr = adv_addr;
+#endif
+
+        if (connsm->rpa_index >= 0) {
+            connsm->peer_addr_type = addr_type;
+            memcpy(connsm->peer_addr, addr, BLE_DEV_ADDR_LEN);
+
+            ble_ll_scan_set_peer_rpa(adv_addr);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+            /* Update resolving list with current peer RPA */
+            ble_ll_resolv_set_peer_rpa(connsm->rpa_index, rxbuf + BLE_LL_PDU_HDR_LEN);
+            if (ble_ll_is_rpa(inita, inita_type)) {
+                ble_ll_resolv_set_local_rpa(connsm->rpa_index, inita);
+            }
+
+#endif
+        } else if (ble_ll_scan_whitelist_enabled()) {
+            /* if WL is used we need to store peer addr also if it was not
+             * resolved
+             */
+            connsm->peer_addr_type = addr_type;
+            memcpy(connsm->peer_addr, addr, BLE_DEV_ADDR_LEN);
+        }
+
+        /* Connection has been created. Stop scanning */
+        g_ble_ll_conn_create_sm = NULL;
+        ble_ll_scan_sm_stop(0);
+
+        /* For AUX Connect CSA2 is mandatory. Otherwise we need to check bit
+         * mask
+         */
+        if (ble_hdr->rxinfo.channel < BLE_PHY_NUM_DATA_CHANS) {
+            ble_ll_conn_set_csa(connsm, 1);
+        } else {
+            ble_ll_conn_set_csa(connsm, rxbuf[0] & BLE_ADV_PDU_HDR_CHSEL_MASK);
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+        /* Lets take last used phy */
+        ble_ll_conn_init_phy(connsm, ble_hdr->rxinfo.phy);
+#endif
+        if (aux_data) {
+            ble_ll_scan_aux_data_unref(ble_hdr->rxinfo.user_data);
+            ble_hdr->rxinfo.user_data = NULL;
+        }
+#endif
+        ble_ll_conn_created(connsm, NULL);
+        return;
+    }
+
+scan_continue:
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* Drop last reference and keep continue to connect */
+    if (aux_data) {
+        ble_ll_scan_aux_data_unref(ble_hdr->rxinfo.user_data);
+        ble_hdr->rxinfo.user_data = NULL;
+    }
+#endif
+    ble_ll_scan_chk_resume();
+}
+
+/**
+ * Called when a receive PDU has started and we are in the initiating state.
+ *
+ * Context: Interrupt
+ *
+ * @param pdu_type
+ * @param ble_hdr
+ *
+ * @return int
+ *  0: we will not attempt to reply to this frame
+ *  1: we may send a response to this frame.
+ */
+int
+ble_ll_init_rx_isr_start(uint8_t pdu_type, struct ble_mbuf_hdr *ble_hdr)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    connsm = g_ble_ll_conn_create_sm;
+    if (!connsm) {
+        return 0;
+    }
+
+    if ((pdu_type == BLE_ADV_PDU_TYPE_ADV_IND) ||
+        (pdu_type == BLE_ADV_PDU_TYPE_ADV_DIRECT_IND ||
+         pdu_type == BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP)) {
+        return 1;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (pdu_type == BLE_ADV_PDU_TYPE_ADV_EXT_IND &&
+                                                connsm->scansm->ext_scanning) {
+        if (connsm->scansm->cur_aux_data) {
+            STATS_INC(ble_ll_stats, aux_received);
+        }
+
+        ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_EXT_ADV;
+        return 1;
+    }
+#endif
+
+    return 0;
+}
+
+/**
+ * Called when a receive PDU has ended and we are in the initiating state.
+ *
+ * Context: Interrupt
+ *
+ * @param rxpdu
+ * @param crcok
+ * @param ble_hdr
+ *
+ * @return int
+ *       < 0: Disable the phy after reception.
+ *      == 0: Success. Do not disable the PHY.
+ *       > 0: Do not disable PHY as that has already been done.
+ */
+int
+ble_ll_init_rx_isr_end(uint8_t *rxbuf, uint8_t crcok,
+                       struct ble_mbuf_hdr *ble_hdr)
+{
+    int rc;
+    int resolved;
+    int chk_wl;
+    int index;
+    uint8_t pdu_type;
+    uint8_t adv_addr_type;
+    uint8_t peer_addr_type;
+    uint8_t *adv_addr = NULL;
+    uint8_t *peer;
+    uint8_t *init_addr = NULL;
+    uint8_t init_addr_type;
+    uint8_t pyld_len;
+    uint8_t inita_is_rpa;
+    uint8_t conn_req_end_trans;
+    struct os_mbuf *rxpdu;
+    struct ble_ll_conn_sm *connsm;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    struct ble_ll_resolv_entry *rl;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_scan_sm *scansm;
+    uint8_t phy;
+#endif
+    int ext_adv_mode = -1;
+
+    /* Get connection state machine to use if connection to be established */
+    connsm = g_ble_ll_conn_create_sm;
+    /* This could happen if connection init was cancelled while isr end was
+     * already pending
+     */
+    if (!connsm) {
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        return -1;
+    }
+
+    rc = -1;
+    pdu_type = rxbuf[0] & BLE_ADV_PDU_HDR_TYPE_MASK;
+    pyld_len = rxbuf[1];
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    scansm = connsm->scansm;
+    if (scansm->cur_aux_data) {
+        ble_hdr->rxinfo.user_data = scansm->cur_aux_data;
+        scansm->cur_aux_data = NULL;
+    }
+#endif
+
+    if (!crcok) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        /* Invalid packet - make sure we do not wait for AUX_CONNECT_RSP */
+        ble_ll_conn_reset_pending_aux_conn_rsp();
+#endif
+
+        /* Ignore this packet */
+        goto init_rx_isr_exit;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* If we sent AUX_CONNECT_REQ, we only expect AUX_CONNECT_RSP here */
+    if (CONN_F_AUX_CONN_REQ(connsm)) {
+        if (pdu_type != BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP) {
+            STATS_INC(ble_ll_stats, aux_conn_rsp_err);
+            CONN_F_CONN_REQ_TXD(connsm) = 0;
+            CONN_F_AUX_CONN_REQ(connsm) = 0;
+            ble_ll_sched_rmv_elem(&connsm->conn_sch);
+        }
+        goto init_rx_isr_exit;
+    }
+#endif
+
+    inita_is_rpa = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (pdu_type == BLE_ADV_PDU_TYPE_ADV_EXT_IND) {
+        if (!scansm->ext_scanning) {
+            goto init_rx_isr_exit;
+        }
+
+        rc = ble_ll_scan_update_aux_data(ble_hdr, rxbuf, NULL);
+        if (rc < 0) {
+            /* No memory or broken packet */
+            ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_AUX_INVALID;
+            goto init_rx_isr_exit;
+        }
+    }
+#endif
+
+    /* Lets get addresses from advertising report*/
+    if (ble_ll_scan_adv_decode_addr(pdu_type, rxbuf, ble_hdr,
+                                    &adv_addr, &adv_addr_type,
+                                    &init_addr, &init_addr_type,
+                                    &ext_adv_mode)) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_AUX_INVALID;
+#endif
+        goto init_rx_isr_exit;
+    }
+
+    switch (pdu_type) {
+    case BLE_ADV_PDU_TYPE_ADV_IND:
+        break;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    case BLE_ADV_PDU_TYPE_ADV_EXT_IND:
+        rc = -1;
+
+        /* If this is not connectable adv mode, lets skip it */
+        if (!(ext_adv_mode & BLE_LL_EXT_ADV_MODE_CONN)) {
+            goto init_rx_isr_exit;
+        }
+
+        if (!adv_addr) {
+            ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_AUX_PTR_WAIT;
+            goto init_rx_isr_exit;
+        }
+
+        if (!init_addr) {
+            break;
+        }
+        /* if there is direct address lets fall down and check it.*/
+        // no break
+#endif
+    case BLE_ADV_PDU_TYPE_ADV_DIRECT_IND:
+        inita_is_rpa = (uint8_t)ble_ll_is_rpa(init_addr, init_addr_type);
+        if (!inita_is_rpa) {
+
+            /* Resolving will be done later. Check if identity InitA matches */
+            if (!ble_ll_is_our_devaddr(init_addr, init_addr_type)) {
+                goto init_rx_isr_exit;
+            }
+        }
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        else {
+            /* If privacy is off - reject RPA InitA*/
+            goto init_rx_isr_exit;
+        }
+#endif
+
+        break;
+    default:
+        goto init_rx_isr_exit;
+    }
+
+    /* Should we send a connect request? */
+    index = -1;
+    peer = adv_addr;
+    peer_addr_type = adv_addr_type;
+
+    resolved = 0;
+    chk_wl = ble_ll_scan_whitelist_enabled();
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (ble_ll_is_rpa(adv_addr, adv_addr_type) && ble_ll_resolv_enabled()) {
+        index = ble_hw_resolv_list_match();
+        if (index >= 0) {
+            rl = &g_ble_ll_resolv_list[index];
+
+            ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_RESOLVED;
+            connsm->rpa_index = index;
+            peer = rl->rl_identity_addr;
+            peer_addr_type = rl->rl_addr_type;
+            resolved = 1;
+
+            /* Assure privacy */
+            if ((rl->rl_priv_mode == BLE_HCI_PRIVACY_NETWORK) && init_addr &&
+                !inita_is_rpa && rl->rl_has_local) {
+                goto init_rx_isr_exit;
+            }
+
+            /*
+             * If the InitA is a RPA, we must see if it resolves based on the
+             * identity address of the resolved ADVA.
+             */
+            if (init_addr && inita_is_rpa) {
+                if (!ble_ll_resolv_rpa(init_addr,
+                                       g_ble_ll_resolv_list[index].rl_local_irk)) {
+                    goto init_rx_isr_exit;
+                }
+
+                /* Core Specification Vol 6, Part B, Section 6.4:
+                 * "The Link Layer should not set the InitA field to the same
+                 * value as the TargetA field in the received advertising PDU."
+                 *
+                 * We update the received PDU directly here, so ble_ll_init_rx_pkt_in
+                 * can process it as is.
+                 */
+                memcpy(init_addr, rl->rl_local_rpa, BLE_DEV_ADDR_LEN);
+            }
+
+        } else {
+            if (chk_wl) {
+                goto init_rx_isr_exit;
+            }
+
+            /* Could not resolved InitA */
+            if (init_addr && inita_is_rpa) {
+                goto init_rx_isr_exit;
+            }
+        }
+    } else if (init_addr) {
+
+        /* If resolving is off and InitA is RPA we reject advertising */
+        if (inita_is_rpa && !ble_ll_resolv_enabled()) {
+            goto init_rx_isr_exit;
+        }
+
+        /* Let's see if we have IRK with that peer.*/
+        rl = ble_ll_resolv_list_find(adv_addr, adv_addr_type);
+
+        /* Lets make sure privacy mode is correct together with InitA in case it
+         * is identity address
+         */
+        if (rl && !inita_is_rpa &&
+           (rl->rl_priv_mode == BLE_HCI_PRIVACY_NETWORK) &&
+           rl->rl_has_local) {
+            goto init_rx_isr_exit;
+        }
+
+        /*
+         * If the InitA is a RPA, we must see if it resolves based on the
+         * identity address of the resolved ADVA.
+         */
+        if (inita_is_rpa) {
+            if (!rl || !ble_ll_resolv_rpa(init_addr, rl->rl_local_irk)) {
+                goto init_rx_isr_exit;
+            }
+
+            /* Core Specification Vol 6, Part B, Section 6.4:
+             * "The Link Layer should not set the InitA field to the same
+             * value as the TargetA field in the received advertising PDU."
+             *
+             * We update the received PDU directly here, so ble_ll_init_rx_pkt_in
+             * can process it as is.
+             */
+            memcpy(init_addr, rl->rl_local_rpa, BLE_DEV_ADDR_LEN);
+        }
+    }
+#endif
+
+    /* Check filter policy */
+    if (chk_wl) {
+        if (!ble_ll_whitelist_match(peer, peer_addr_type, resolved)) {
+            goto init_rx_isr_exit;
+        }
+    } else {
+        /* Must match the connection address */
+        if (!ble_ll_conn_is_peer_adv(adv_addr_type, adv_addr, index)) {
+            goto init_rx_isr_exit;
+        }
+    }
+    ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_DEVMATCH;
+
+    /* For CONNECT_IND we don't go into RX state */
+    conn_req_end_trans = BLE_PHY_TRANSITION_NONE;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* Check if we should send AUX_CONNECT_REQ and wait for AUX_CONNECT_RSP */
+    if (ble_hdr->rxinfo.channel < BLE_PHY_NUM_DATA_CHANS) {
+        conn_req_end_trans = BLE_PHY_TRANSITION_TX_RX;
+    }
+
+    if (connsm->scansm->ext_scanning) {
+            phy = ble_hdr->rxinfo.phy;
+
+            /* Update connection state machine with appropriate parameters for
+             * certain PHY
+             */
+            ble_ll_conn_ext_set_params(connsm,
+                                       &connsm->initial_params.params[phy - 1],
+                                       phy);
+
+    }
+#endif
+
+    /* Schedule new connection */
+    if (ble_ll_sched_master_new(connsm, ble_hdr, pyld_len)) {
+        STATS_INC(ble_ll_conn_stats, cant_set_sched);
+        goto init_rx_isr_exit;
+    }
+
+    /* Prepare data for connect request */
+    ble_ll_conn_connect_ind_prepare(connsm,
+                                    ble_ll_scan_get_pdu_data(),
+                                    adv_addr_type, adv_addr,
+                                    init_addr_type, init_addr,
+                                    index, ble_hdr->rxinfo.channel);
+
+    /* Setup to transmit the connect request */
+    rc = ble_ll_conn_connect_ind_send(connsm, conn_req_end_trans);
+    if (rc) {
+        ble_ll_sched_rmv_elem(&connsm->conn_sch);
+        goto init_rx_isr_exit;
+    }
+
+    if (init_addr && !inita_is_rpa) {
+        connsm->inita_identity_used = 1;
+    }
+
+    CONN_F_CONN_REQ_TXD(connsm) = 1;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (ble_hdr->rxinfo.channel < BLE_PHY_NUM_DATA_CHANS) {
+        /* Lets wait for AUX_CONNECT_RSP */
+        CONN_F_AUX_CONN_REQ(connsm) = 1;
+        /* Keep aux data until we get scan response */
+        scansm->cur_aux_data = ble_hdr->rxinfo.user_data;
+        ble_hdr->rxinfo.user_data = NULL;
+        STATS_INC(ble_ll_stats, aux_conn_req_tx);
+    }
+#endif
+
+    STATS_INC(ble_ll_conn_stats, conn_req_txd);
+
+init_rx_isr_exit:
+
+    /*
+     * We have to restart receive if we cant hand up pdu. We return 0 so that
+     * the phy does not get disabled.
+     */
+    rxpdu = ble_ll_rxpdu_alloc(pyld_len + BLE_LL_PDU_HDR_LEN);
+    if (rxpdu == NULL) {
+        /*
+         * XXX: possible allocate the PDU when we start initiating?
+         * I cannot say I like this solution, but if we cannot allocate a PDU
+         * to hand up to the LL, we need to remove the connection we just
+         * scheduled since the connection state machine will not get processed
+         * by link layer properly. For now, just remove it from the scheduler
+         */
+        if (CONN_F_CONN_REQ_TXD(connsm) == 1) {
+            CONN_F_CONN_REQ_TXD(connsm) = 0;
+            CONN_F_AUX_CONN_REQ(connsm) = 0;
+            ble_ll_sched_rmv_elem(&connsm->conn_sch);
+        }
+        ble_phy_restart_rx();
+        rc = 0;
+    } else {
+        ble_phy_rxpdu_copy(rxbuf, rxpdu);
+        ble_ll_rx_pdu_in(rxpdu);
+    }
+
+    if (rc) {
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    }
+
+    return rc;
+}
+
+/**
+ * Function called when a timeout has occurred for a connection. There are
+ * two types of timeouts: a connection supervision timeout and control
+ * procedure timeout.
+ *
+ * Context: Link Layer task
+ *
+ * @param connsm
+ * @param ble_err
+ */
+void
+ble_ll_conn_timeout(struct ble_ll_conn_sm *connsm, uint8_t ble_err)
+{
+    int was_current;
+    os_sr_t sr;
+
+    was_current = 0;
+    OS_ENTER_CRITICAL(sr);
+    if (g_ble_ll_conn_cur_sm == connsm) {
+        ble_ll_conn_current_sm_over(NULL);
+        was_current = 1;
+    }
+    OS_EXIT_CRITICAL(sr);
+
+    /* Check if we need to resume scanning */
+    if (was_current) {
+        ble_ll_scan_chk_resume();
+    }
+
+    ble_ll_conn_end(connsm, ble_err);
+}
+
+/**
+ * Called when a data channel PDU has started that matches the access
+ * address of the current connection. Note that the CRC of the PDU has not
+ * been checked yet.
+ *
+ * Context: Interrupt
+ *
+ * @param rxhdr
+ */
+int
+ble_ll_conn_rx_isr_start(struct ble_mbuf_hdr *rxhdr, uint32_t aa)
+{
+    struct ble_ll_conn_sm *connsm;
+
+    /*
+     * Disable wait for response timer since we receive a response. We dont
+     * care if this is the response we were waiting for or not; the code
+     * called at receive end will deal with ending the connection event
+     * if needed
+     */
+    connsm = g_ble_ll_conn_cur_sm;
+    if (connsm) {
+        /* Double check access address. Better match connection state machine */
+        if (aa != connsm->access_addr) {
+            STATS_INC(ble_ll_conn_stats, rx_data_pdu_bad_aa);
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+            ble_ll_event_send(&connsm->conn_ev_end);
+            g_ble_ll_conn_cur_sm = NULL;
+            return -1;
+        }
+
+        /* Set connection handle in mbuf header */
+        rxhdr->rxinfo.handle = connsm->conn_handle;
+
+        /* Set flag denoting we have received a packet in connection event */
+        connsm->csmflags.cfbit.pkt_rxd = 1;
+
+        /* Connection is established */
+        connsm->conn_state = BLE_LL_CONN_STATE_ESTABLISHED;
+
+        /* Set anchor point (and last) if 1st rxd frame in connection event */
+        if (connsm->csmflags.cfbit.slave_set_last_anchor) {
+            connsm->csmflags.cfbit.slave_set_last_anchor = 0;
+            connsm->last_anchor_point = rxhdr->beg_cputime;
+            connsm->anchor_point = connsm->last_anchor_point;
+            connsm->anchor_point_usecs = rxhdr->rem_usecs;
+        }
+    }
+    return 1;
+}
+
+/**
+ * Called from the Link Layer task when a data PDU has been received
+ *
+ * Context: Link layer task
+ *
+ * @param rxpdu Pointer to received pdu
+ * @param rxpdu Pointer to ble mbuf header of received pdu
+ */
+void
+ble_ll_conn_rx_data_pdu(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr)
+{
+    uint8_t hdr_byte;
+    uint8_t rxd_sn;
+    uint8_t *rxbuf;
+    uint8_t llid;
+    uint16_t acl_len;
+    uint16_t acl_hdr;
+    struct ble_ll_conn_sm *connsm;
+
+    if (BLE_MBUF_HDR_CRC_OK(hdr)) {
+        /* XXX: there is a chance that the connection was thrown away and
+           re-used before processing packets here. Fix this. */
+        /* We better have a connection state machine */
+        connsm = ble_ll_conn_find_active_conn(hdr->rxinfo.handle);
+        if (connsm) {
+            /* Check state machine */
+            ble_ll_conn_chk_csm_flags(connsm);
+
+            /* Validate rx data pdu */
+            rxbuf = rxpdu->om_data;
+            hdr_byte = rxbuf[0];
+            acl_len = rxbuf[1];
+            llid = hdr_byte & BLE_LL_DATA_HDR_LLID_MASK;
+
+            /*
+             * Check that the LLID and payload length are reasonable.
+             * Empty payload is only allowed for LLID == 01b.
+             *  */
+            if ((llid == 0) ||
+                ((acl_len == 0) && (llid != BLE_LL_LLID_DATA_FRAG))) {
+                STATS_INC(ble_ll_conn_stats, rx_bad_llid);
+                goto conn_rx_data_pdu_end;
+            }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+            /* Check if PDU is allowed when encryption is started. If not,
+             * terminate connection.
+             *
+             * Reference: Core 5.0, Vol 6, Part B, 5.1.3.1
+             */
+            if ((connsm->enc_data.enc_state > CONN_ENC_S_PAUSE_ENC_RSP_WAIT) &&
+                    !ble_ll_ctrl_enc_allowed_pdu_rx(rxpdu)) {
+                ble_ll_conn_timeout(connsm, BLE_ERR_CONN_TERM_MIC);
+                goto conn_rx_data_pdu_end;
+            }
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+            /*
+             * Reset authenticated payload timeout if valid MIC. NOTE: we dont
+             * check the MIC failure bit as that would have terminated the
+             * connection
+             */
+            if ((connsm->enc_data.enc_state == CONN_ENC_S_ENCRYPTED) &&
+                CONN_F_LE_PING_SUPP(connsm) && (acl_len != 0)) {
+                ble_ll_conn_auth_pyld_timer_start(connsm);
+            }
+#endif
+
+            /* Update RSSI */
+            connsm->conn_rssi = hdr->rxinfo.rssi;
+
+            /*
+             * If we are a slave, we can only start to use slave latency
+             * once we have received a NESN of 1 from the master
+             */
+            if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+                if (hdr_byte & BLE_LL_DATA_HDR_NESN_MASK) {
+                    connsm->csmflags.cfbit.allow_slave_latency = 1;
+                }
+            }
+
+            /*
+             * Discard the received PDU if the sequence number is the same
+             * as the last received sequence number
+             */
+            rxd_sn = hdr_byte & BLE_LL_DATA_HDR_SN_MASK;
+            if (rxd_sn != connsm->last_rxd_sn) {
+                /* Update last rxd sn */
+                connsm->last_rxd_sn = rxd_sn;
+
+                /* No need to do anything if empty pdu */
+                if ((llid == BLE_LL_LLID_DATA_FRAG) && (acl_len == 0)) {
+                    goto conn_rx_data_pdu_end;
+                }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+                /*
+                 * XXX: should we check to see if we are in a state where we
+                 * might expect to get an encrypted PDU?
+                 */
+                if (BLE_MBUF_HDR_MIC_FAILURE(hdr)) {
+                    STATS_INC(ble_ll_conn_stats, mic_failures);
+                    ble_ll_conn_timeout(connsm, BLE_ERR_CONN_TERM_MIC);
+                    goto conn_rx_data_pdu_end;
+                }
+#endif
+
+                if (llid == BLE_LL_LLID_CTRL) {
+                    /* Process control frame */
+                    STATS_INC(ble_ll_conn_stats, rx_ctrl_pdus);
+                    if (ble_ll_ctrl_rx_pdu(connsm, rxpdu)) {
+                        STATS_INC(ble_ll_conn_stats, rx_malformed_ctrl_pdus);
+                    }
+                } else {
+                    /* Count # of received l2cap frames and byes */
+                    STATS_INC(ble_ll_conn_stats, rx_l2cap_pdus);
+                    STATS_INCN(ble_ll_conn_stats, rx_l2cap_bytes, acl_len);
+
+                    /* NOTE: there should be at least two bytes available */
+                    BLE_LL_ASSERT(OS_MBUF_LEADINGSPACE(rxpdu) >= 2);
+                    os_mbuf_prepend(rxpdu, 2);
+                    rxbuf = rxpdu->om_data;
+
+                    acl_hdr = (llid << 12) | connsm->conn_handle;
+                    put_le16(rxbuf, acl_hdr);
+                    put_le16(rxbuf + 2, acl_len);
+                    ble_hci_trans_ll_acl_tx(rxpdu);
+                }
+
+                /* NOTE: we dont free the mbuf since we handed it off! */
+                return;
+            } else {
+                STATS_INC(ble_ll_conn_stats, data_pdu_rx_dup);
+            }
+        } else {
+            STATS_INC(ble_ll_conn_stats, no_conn_sm);
+        }
+    }
+
+    /* Free buffer */
+conn_rx_data_pdu_end:
+    os_mbuf_free_chain(rxpdu);
+}
+
+/**
+ * Called when a packet has been received while in the connection state.
+ *
+ * Context: Interrupt
+ *
+ * @param rxpdu
+ * @param crcok
+ *
+ * @return int
+ *       < 0: Disable the phy after reception.
+ *      == 0: Success. Do not disable the PHY.
+ *       > 0: Do not disable PHY as that has already been done.
+ */
+int
+ble_ll_conn_rx_isr_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr)
+{
+    int rc;
+    int is_ctrl;
+    uint8_t hdr_byte;
+    uint8_t hdr_sn;
+    uint8_t hdr_nesn;
+    uint8_t conn_sn;
+    uint8_t conn_nesn;
+    uint8_t reply;
+    uint8_t rem_bytes;
+    uint8_t opcode = 0;
+    uint8_t rx_pyld_len;
+    uint32_t begtime;
+    uint32_t add_usecs;
+    struct os_mbuf *txpdu;
+    struct ble_ll_conn_sm *connsm;
+    struct os_mbuf *rxpdu;
+    struct ble_mbuf_hdr *txhdr;
+    int rx_phy_mode;
+
+    /* Retrieve the header and payload length */
+    hdr_byte = rxbuf[0];
+    rx_pyld_len = rxbuf[1];
+
+    /*
+     * We need to attempt to allocate a buffer here. The reason we do this
+     * now is that we should not ack the packet if we have no receive
+     * buffers available. We want to free up our transmit PDU if it was
+     * acked, but we should not ack the received frame if we cant hand it up.
+     * NOTE: we hand up empty pdu's to the LL task!
+     */
+    rxpdu = ble_ll_rxpdu_alloc(rx_pyld_len + BLE_LL_PDU_HDR_LEN);
+
+    /*
+     * We should have a current connection state machine. If we dont, we just
+     * hand the packet to the higher layer to count it.
+     */
+    rc = -1;
+    connsm = g_ble_ll_conn_cur_sm;
+    if (!connsm) {
+        STATS_INC(ble_ll_conn_stats, rx_data_pdu_no_conn);
+        goto conn_exit;
+    }
+
+    /*
+     * Calculate the end time of the received PDU. NOTE: this looks strange
+     * but for the 32768 crystal we add the time it takes to send the packet
+     * to the 'additional usecs' field to save some calculations.
+     */
+    begtime = rxhdr->beg_cputime;
+#if BLE_LL_BT5_PHY_SUPPORTED
+    rx_phy_mode = connsm->phy_data.rx_phy_mode;
+#else
+    rx_phy_mode = BLE_PHY_MODE_1M;
+#endif
+    add_usecs = rxhdr->rem_usecs +
+            ble_ll_pdu_tx_time_get(rx_pyld_len, rx_phy_mode);
+
+    /*
+     * Check the packet CRC. A connection event can continue even if the
+     * received PDU does not pass the CRC check. If we receive two consecutive
+     * CRC errors we end the conection event.
+     */
+    if (!BLE_MBUF_HDR_CRC_OK(rxhdr)) {
+        /*
+         * Increment # of consecutively received CRC errors. If more than
+         * one we will end the connection event.
+         */
+        ++connsm->cons_rxd_bad_crc;
+        if (connsm->cons_rxd_bad_crc >= 2) {
+            reply = 0;
+        } else {
+            if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+                reply = CONN_F_LAST_TXD_MD(connsm);
+            } else {
+                /* A slave always responds with a packet */
+                reply = 1;
+            }
+        }
+    } else {
+        /* Reset consecutively received bad crcs (since this one was good!) */
+        connsm->cons_rxd_bad_crc = 0;
+
+        /* Set last valid received pdu time (resets supervision timer) */
+        connsm->last_rxd_pdu_cputime = begtime +
+                                        os_cputime_usecs_to_ticks(add_usecs);
+
+        /*
+         * Check for valid LLID before proceeding. We have seen some weird
+         * things with the PHY where the CRC is OK but we dont have a valid
+         * LLID. This should really never happen but if it does we will just
+         * bail. An error stat will get incremented at the LL.
+         */
+        if ((hdr_byte & BLE_LL_DATA_HDR_LLID_MASK) == 0) {
+            goto conn_exit;
+        }
+
+        /* Set last received header byte */
+        connsm->last_rxd_hdr_byte = hdr_byte;
+
+        is_ctrl = 0;
+        if ((hdr_byte & BLE_LL_DATA_HDR_LLID_MASK) == BLE_LL_LLID_CTRL) {
+            is_ctrl = 1;
+            opcode = rxbuf[2];
+        }
+
+        /*
+         * If SN bit from header does not match NESN in connection, this is
+         * a resent PDU and should be ignored.
+         */
+        hdr_sn = hdr_byte & BLE_LL_DATA_HDR_SN_MASK;
+        conn_nesn = connsm->next_exp_seqnum;
+        if (rxpdu && ((hdr_sn && conn_nesn) || (!hdr_sn && !conn_nesn))) {
+            connsm->next_exp_seqnum ^= 1;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+            if (CONN_F_ENCRYPTED(connsm) && !ble_ll_conn_is_empty_pdu(rxbuf)) {
+                ++connsm->enc_data.rx_pkt_cntr;
+            }
+#endif
+        }
+
+        ble_ll_trace_u32x2(BLE_LL_TRACE_ID_CONN_RX, connsm->tx_seqnum,
+                           !!(hdr_byte & BLE_LL_DATA_HDR_NESN_MASK));
+
+        /*
+         * Check NESN bit from header. If same as tx seq num, the transmission
+         * is acknowledged. Otherwise we need to resend this PDU.
+         */
+        if (CONN_F_EMPTY_PDU_TXD(connsm) || connsm->cur_tx_pdu) {
+            hdr_nesn = hdr_byte & BLE_LL_DATA_HDR_NESN_MASK;
+            conn_sn = connsm->tx_seqnum;
+            if ((hdr_nesn && conn_sn) || (!hdr_nesn && !conn_sn)) {
+                /* We did not get an ACK. Must retry the PDU */
+                STATS_INC(ble_ll_conn_stats, data_pdu_txf);
+            } else {
+                /* Transmit success */
+                connsm->tx_seqnum ^= 1;
+                STATS_INC(ble_ll_conn_stats, data_pdu_txg);
+
+                /* If we transmitted the empty pdu, clear flag */
+                if (CONN_F_EMPTY_PDU_TXD(connsm)) {
+                    CONN_F_EMPTY_PDU_TXD(connsm) = 0;
+                    goto chk_rx_terminate_ind;
+                }
+
+                /*
+                 * Determine if we should remove packet from queue or if there
+                 * are more fragments to send.
+                 */
+                txpdu = connsm->cur_tx_pdu;
+                if (txpdu) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+                    if (connsm->enc_data.tx_encrypted) {
+                        ++connsm->enc_data.tx_pkt_cntr;
+                    }
+#endif
+                    txhdr = BLE_MBUF_HDR_PTR(txpdu);
+                    if ((txhdr->txinfo.hdr_byte & BLE_LL_DATA_HDR_LLID_MASK)
+                        == BLE_LL_LLID_CTRL) {
+                        connsm->cur_tx_pdu = NULL;
+                        /* Note: the mbuf is freed by this call */
+                        rc = ble_ll_ctrl_tx_done(txpdu, connsm);
+                        if (rc) {
+                            /* Means we transmitted a TERMINATE_IND */
+                            goto conn_exit;
+                        } else {
+                            goto chk_rx_terminate_ind;
+                        }
+                    }
+
+                    /* Increment offset based on number of bytes sent */
+                    txhdr->txinfo.offset += txhdr->txinfo.pyld_len;
+                    if (txhdr->txinfo.offset >= OS_MBUF_PKTLEN(txpdu)) {
+                        /* If l2cap pdu, increment # of completed packets */
+                        if (txhdr->txinfo.pyld_len != 0) {
+#if (BLETEST_THROUGHPUT_TEST == 1)
+                            bletest_completed_pkt(connsm->conn_handle);
+#endif
+                            ++connsm->completed_pkts;
+                            if (connsm->completed_pkts > 2) {
+                                ble_npl_eventq_put(&g_ble_ll_data.ll_evq,
+                                                   &g_ble_ll_data.ll_comp_pkt_ev);
+                            }
+                        }
+                        os_mbuf_free_chain(txpdu);
+                        connsm->cur_tx_pdu = NULL;
+                    } else {
+                        rem_bytes = OS_MBUF_PKTLEN(txpdu) - txhdr->txinfo.offset;
+                        /* Adjust payload for max TX time and octets */
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+                        if (is_ctrl &&
+                            (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) &&
+                            (opcode == BLE_LL_CTRL_PHY_UPDATE_IND)) {
+                            connsm->phy_tx_transition =
+                                    ble_ll_ctrl_phy_tx_transition_get(rxbuf[3]);
+                        }
+#endif
+
+                        rem_bytes = ble_ll_conn_adjust_pyld_len(connsm, rem_bytes);
+                        txhdr->txinfo.pyld_len = rem_bytes;
+                    }
+                }
+            }
+        }
+
+        /* Should we continue connection event? */
+        /* If this is a TERMINATE_IND, we have to reply */
+chk_rx_terminate_ind:
+        /* If we received a terminate IND, we must set some flags */
+        if (is_ctrl && (opcode == BLE_LL_CTRL_TERMINATE_IND)
+                    && (rx_pyld_len == (1 + BLE_LL_CTRL_TERMINATE_IND_LEN))) {
+            connsm->csmflags.cfbit.terminate_ind_rxd = 1;
+            connsm->rxd_disconnect_reason = rxbuf[3];
+        }
+
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+            reply = CONN_F_LAST_TXD_MD(connsm) || (hdr_byte & BLE_LL_DATA_HDR_MD_MASK);
+        } else {
+            /* A slave always replies */
+            reply = 1;
+        }
+    }
+
+    /* If reply flag set, send data pdu and continue connection event */
+    rc = -1;
+    if (rx_pyld_len && CONN_F_ENCRYPTED(connsm)) {
+        rx_pyld_len += BLE_LL_DATA_MIC_LEN;
+    }
+    if (reply && ble_ll_conn_can_send_next_pdu(connsm, begtime, add_usecs)) {
+        rc = ble_ll_conn_tx_pdu(connsm);
+    }
+
+conn_exit:
+    /* Copy the received pdu and hand it up */
+    if (rxpdu) {
+        ble_phy_rxpdu_copy(rxbuf, rxpdu);
+        ble_ll_rx_pdu_in(rxpdu);
+    }
+
+    /* Send link layer a connection end event if over */
+    if (rc) {
+        ble_ll_conn_current_sm_over(connsm);
+    }
+
+    return rc;
+}
+
+/**
+ * Called to adjust payload length to fit into max effective octets and TX time
+ * on current PHY.
+ */
+/**
+ * Called to enqueue a packet on the transmit queue of a connection. Should
+ * only be called by the controller.
+ *
+ * Context: Link Layer
+ *
+ *
+ * @param connsm
+ * @param om
+ */
+void
+ble_ll_conn_enqueue_pkt(struct ble_ll_conn_sm *connsm, struct os_mbuf *om,
+                        uint8_t hdr_byte, uint8_t length)
+{
+    os_sr_t sr;
+    struct os_mbuf_pkthdr *pkthdr;
+    struct ble_mbuf_hdr *ble_hdr;
+    int lifo;
+
+    /* Set mbuf length and packet length if a control PDU */
+    if (hdr_byte == BLE_LL_LLID_CTRL) {
+        om->om_len = length;
+        OS_MBUF_PKTHDR(om)->omp_len = length;
+    }
+
+    /* Set BLE transmit header */
+    ble_hdr = BLE_MBUF_HDR_PTR(om);
+    ble_hdr->txinfo.flags = 0;
+    ble_hdr->txinfo.offset = 0;
+    ble_hdr->txinfo.hdr_byte = hdr_byte;
+
+    /*
+     * Initial payload length is calculate when packet is dequeued, there's no
+     * need to do this now.
+     */
+
+    lifo = 0;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    if (connsm->enc_data.enc_state > CONN_ENC_S_ENCRYPTED) {
+        uint8_t llid;
+
+        /*
+         * If this is one of the following types we need to insert it at
+         * head of queue.
+         */
+        llid = ble_hdr->txinfo.hdr_byte & BLE_LL_DATA_HDR_LLID_MASK;
+        if (llid == BLE_LL_LLID_CTRL) {
+            switch (om->om_data[0]) {
+            case BLE_LL_CTRL_TERMINATE_IND:
+            case BLE_LL_CTRL_REJECT_IND:
+            case BLE_LL_CTRL_REJECT_IND_EXT:
+            case BLE_LL_CTRL_START_ENC_REQ:
+            case BLE_LL_CTRL_START_ENC_RSP:
+                lifo = 1;
+                break;
+            case BLE_LL_CTRL_PAUSE_ENC_RSP:
+                if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+                    lifo = 1;
+                }
+                break;
+            case BLE_LL_CTRL_ENC_REQ:
+            case BLE_LL_CTRL_ENC_RSP:
+                /* If encryption has been paused, we don't want to send any packets from the
+                 * TX queue, as they would go unencrypted.
+                 */
+                if (connsm->enc_data.enc_state == CONN_ENC_S_PAUSED) {
+                    lifo = 1;
+                }
+                break;
+            default:
+                break;
+            }
+        }
+    }
+#endif
+
+    /* Add to transmit queue for the connection */
+    pkthdr = OS_MBUF_PKTHDR(om);
+    OS_ENTER_CRITICAL(sr);
+    if (lifo) {
+        STAILQ_INSERT_HEAD(&connsm->conn_txq, pkthdr, omp_next);
+    } else {
+        STAILQ_INSERT_TAIL(&connsm->conn_txq, pkthdr, omp_next);
+    }
+    OS_EXIT_CRITICAL(sr);
+}
+
+/**
+ * Data packet from host.
+ *
+ * Context: Link Layer task
+ *
+ * @param om
+ * @param handle
+ * @param length
+ *
+ * @return int
+ */
+void
+ble_ll_conn_tx_pkt_in(struct os_mbuf *om, uint16_t handle, uint16_t length)
+{
+    uint8_t hdr_byte;
+    uint16_t conn_handle;
+    uint16_t pb;
+    struct ble_ll_conn_sm *connsm;
+
+    /* See if we have an active matching connection handle */
+    conn_handle = handle & 0x0FFF;
+    connsm = ble_ll_conn_find_active_conn(conn_handle);
+    if (connsm) {
+        /* Construct LL header in buffer (NOTE: pb already checked) */
+        pb = handle & 0x3000;
+        if (pb == 0) {
+            hdr_byte = BLE_LL_LLID_DATA_START;
+        } else {
+            hdr_byte = BLE_LL_LLID_DATA_FRAG;
+        }
+
+        /* Add to total l2cap pdus enqueue */
+        STATS_INC(ble_ll_conn_stats, l2cap_enqueued);
+
+        /* Clear flags field in BLE header */
+        ble_ll_conn_enqueue_pkt(connsm, om, hdr_byte, length);
+    } else {
+        /* No connection found! */
+        STATS_INC(ble_ll_conn_stats, handle_not_found);
+        os_mbuf_free_chain(om);
+    }
+}
+
+/**
+ * Called to set the global channel mask that we use for all connections.
+ *
+ * @param num_used_chans
+ * @param chanmap
+ */
+void
+ble_ll_conn_set_global_chanmap(uint8_t num_used_chans, const uint8_t *chanmap)
+{
+    struct ble_ll_conn_sm *connsm;
+    struct ble_ll_conn_global_params *conn_params;
+
+    /* Do nothing if same channel map */
+    conn_params = &g_ble_ll_conn_params;
+    if (!memcmp(conn_params->master_chan_map, chanmap, BLE_LL_CONN_CHMAP_LEN)) {
+        return;
+    }
+
+    /* Change channel map and cause channel map update procedure to start */
+    conn_params->num_used_chans = num_used_chans;
+    memcpy(conn_params->master_chan_map, chanmap, BLE_LL_CONN_CHMAP_LEN);
+
+    /* Perform channel map update */
+    SLIST_FOREACH(connsm, &g_ble_ll_conn_active_list, act_sle) {
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+            ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_CHAN_MAP_UPD);
+        }
+    }
+}
+
+/**
+ * Called when a device has received a connect request while advertising and
+ * the connect request has passed the advertising filter policy and is for
+ * us. This will start a connection in the slave role assuming that we dont
+ * already have a connection with this device and that the connect request
+ * parameters are valid.
+ *
+ * Context: Link Layer
+ *
+ * @param rxbuf Pointer to received Connect Request PDU
+ *
+ * @return 0: connection not started; 1 connecton started
+ */
+int
+ble_ll_conn_slave_start(uint8_t *rxbuf, uint8_t pat, struct ble_mbuf_hdr *rxhdr,
+                        bool force_csa2)
+{
+    int rc;
+    uint32_t temp;
+    uint32_t crcinit;
+    uint8_t *inita;
+    uint8_t *dptr;
+    struct ble_ll_conn_sm *connsm;
+
+    /* Ignore the connection request if we are already connected*/
+    inita = rxbuf + BLE_LL_PDU_HDR_LEN;
+    SLIST_FOREACH(connsm, &g_ble_ll_conn_active_list, act_sle) {
+        if (!memcmp(&connsm->peer_addr, inita, BLE_DEV_ADDR_LEN)) {
+            if (rxbuf[0] & BLE_ADV_PDU_HDR_TXADD_MASK) {
+                if (connsm->peer_addr_type & 1) {
+                    return 0;
+                }
+            } else {
+                if ((connsm->peer_addr_type & 1) == 0) {
+                    return 0;
+                }
+            }
+        }
+    }
+
+    /* Allocate a connection. If none available, dont do anything */
+    connsm = ble_ll_conn_sm_get();
+    if (connsm == NULL) {
+        return 0;
+    }
+
+    /* Set the pointer at the start of the connection data */
+    dptr = rxbuf + BLE_LL_CONN_REQ_ADVA_OFF + BLE_DEV_ADDR_LEN;
+
+    /* Set connection state machine information */
+    connsm->access_addr = get_le32(dptr);
+    crcinit = dptr[6];
+    crcinit = (crcinit << 8) | dptr[5];
+    crcinit = (crcinit << 8) | dptr[4];
+    connsm->crcinit = crcinit;
+    connsm->tx_win_size = dptr[7];
+    connsm->tx_win_off = get_le16(dptr + 8);
+    connsm->conn_itvl = get_le16(dptr + 10);
+    connsm->slave_latency = get_le16(dptr + 12);
+    connsm->supervision_tmo = get_le16(dptr + 14);
+    memcpy(&connsm->chanmap, dptr + 16, BLE_LL_CONN_CHMAP_LEN);
+    connsm->hop_inc = dptr[21] & 0x1F;
+    connsm->master_sca = dptr[21] >> 5;
+
+    /* Error check parameters */
+    if ((connsm->tx_win_off > connsm->conn_itvl) ||
+        (connsm->conn_itvl < BLE_HCI_CONN_ITVL_MIN) ||
+        (connsm->conn_itvl > BLE_HCI_CONN_ITVL_MAX) ||
+        (connsm->tx_win_size < BLE_LL_CONN_TX_WIN_MIN) ||
+        (connsm->slave_latency > BLE_LL_CONN_SLAVE_LATENCY_MAX)) {
+        goto err_slave_start;
+    }
+
+    /* Slave latency cannot cause a supervision timeout */
+    temp = (connsm->slave_latency + 1) * (connsm->conn_itvl * 2) *
+            BLE_LL_CONN_ITVL_USECS;
+    if ((connsm->supervision_tmo * 10000) <= temp ) {
+        goto err_slave_start;
+    }
+
+    /*
+     * The transmit window must be less than or equal to the lesser of 10
+     * msecs or the connection interval minus 1.25 msecs.
+     */
+    temp = connsm->conn_itvl - 1;
+    if (temp > 8) {
+        temp = 8;
+    }
+    if (connsm->tx_win_size > temp) {
+        goto err_slave_start;
+    }
+
+    /* Set the address of device that we are connecting with */
+    memcpy(&connsm->peer_addr, inita, BLE_DEV_ADDR_LEN);
+    connsm->peer_addr_type = pat;
+
+    /* Calculate number of used channels; make sure it meets min requirement */
+    connsm->num_used_chans = ble_ll_utils_calc_num_used_chans(connsm->chanmap);
+    if (connsm->num_used_chans < 2) {
+        goto err_slave_start;
+    }
+
+    /* Start the connection state machine */
+    connsm->conn_role = BLE_LL_CONN_ROLE_SLAVE;
+    ble_ll_conn_sm_new(connsm);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    /* Use the same PHY as we received CONNECT_REQ on */
+    ble_ll_conn_init_phy(connsm, rxhdr->rxinfo.phy);
+#endif
+
+    ble_ll_conn_set_csa(connsm,
+                        force_csa2 || (rxbuf[0] & BLE_ADV_PDU_HDR_CHSEL_MASK));
+
+    /* Set initial schedule callback */
+    connsm->conn_sch.sched_cb = ble_ll_conn_event_start_cb;
+    rc = ble_ll_conn_created(connsm, rxhdr);
+    if (!rc) {
+        SLIST_REMOVE(&g_ble_ll_conn_active_list, connsm, ble_ll_conn_sm, act_sle);
+        STAILQ_INSERT_TAIL(&g_ble_ll_conn_free_list, connsm, free_stqe);
+    }
+    return rc;
+
+err_slave_start:
+    STAILQ_INSERT_TAIL(&g_ble_ll_conn_free_list, connsm, free_stqe);
+    STATS_INC(ble_ll_conn_stats, slave_rxd_bad_conn_req_params);
+    return 0;
+}
+
+#define MAX_TIME_UNCODED(_maxbytes) \
+        ble_ll_pdu_tx_time_get(_maxbytes + BLE_LL_DATA_MIC_LEN, \
+                               BLE_PHY_MODE_1M);
+#define MAX_TIME_CODED(_maxbytes) \
+        ble_ll_pdu_tx_time_get(_maxbytes + BLE_LL_DATA_MIC_LEN, \
+                               BLE_PHY_MODE_CODED_125KBPS);
+
+/**
+ * Called to reset the connection module. When this function is called the
+ * scheduler has been stopped and the phy has been disabled. The LL should
+ * be in the standby state.
+ *
+ * Context: Link Layer task
+ */
+void
+ble_ll_conn_module_reset(void)
+{
+    uint8_t max_phy_pyld;
+    uint16_t maxbytes;
+    struct ble_ll_conn_sm *connsm;
+    struct ble_ll_conn_global_params *conn_params;
+
+    /* Kill the current one first (if one is running) */
+    if (g_ble_ll_conn_cur_sm) {
+        connsm = g_ble_ll_conn_cur_sm;
+        g_ble_ll_conn_cur_sm = NULL;
+        ble_ll_conn_end(connsm, BLE_ERR_SUCCESS);
+    }
+
+    /* Free the global connection complete event if there is one */
+    if (g_ble_ll_conn_comp_ev) {
+        ble_hci_trans_buf_free(g_ble_ll_conn_comp_ev);
+        g_ble_ll_conn_comp_ev = NULL;
+    }
+
+    /* Reset connection we are attempting to create */
+    g_ble_ll_conn_create_sm = NULL;
+
+    /* Now go through and end all the connections */
+    while (1) {
+        connsm = SLIST_FIRST(&g_ble_ll_conn_active_list);
+        if (!connsm) {
+            break;
+        }
+        ble_ll_conn_end(connsm, BLE_ERR_SUCCESS);
+    }
+
+    /* Get the maximum supported PHY PDU size from the PHY */
+    max_phy_pyld = ble_phy_max_data_pdu_pyld();
+
+    /* Configure the global LL parameters */
+    conn_params = &g_ble_ll_conn_params;
+
+    maxbytes = min(MYNEWT_VAL(BLE_LL_SUPP_MAX_RX_BYTES), max_phy_pyld);
+    conn_params->supp_max_rx_octets = maxbytes;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    conn_params->supp_max_rx_time = MAX_TIME_CODED(maxbytes);
+#else
+    conn_params->supp_max_rx_time = MAX_TIME_UNCODED(maxbytes);
+#endif
+
+    maxbytes = min(MYNEWT_VAL(BLE_LL_SUPP_MAX_TX_BYTES), max_phy_pyld);
+    conn_params->supp_max_tx_octets = maxbytes;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    conn_params->supp_max_tx_time = MAX_TIME_CODED(maxbytes);
+#else
+    conn_params->supp_max_tx_time = MAX_TIME_UNCODED(maxbytes);
+#endif
+
+    maxbytes = min(MYNEWT_VAL(BLE_LL_CONN_INIT_MAX_TX_BYTES), max_phy_pyld);
+    conn_params->conn_init_max_tx_octets = maxbytes;
+    conn_params->conn_init_max_tx_time = MAX_TIME_UNCODED(maxbytes);
+    conn_params->conn_init_max_tx_time_uncoded = MAX_TIME_UNCODED(maxbytes);
+    conn_params->conn_init_max_tx_time_coded = MAX_TIME_CODED(maxbytes);
+
+    conn_params->sugg_tx_octets = BLE_LL_CONN_SUPP_BYTES_MIN;
+    conn_params->sugg_tx_time = BLE_LL_CONN_SUPP_TIME_MIN;
+
+    /* Mask in all channels by default */
+    conn_params->num_used_chans = BLE_PHY_NUM_DATA_CHANS;
+    memset(conn_params->master_chan_map, 0xff, BLE_LL_CONN_CHMAP_LEN - 1);
+    conn_params->master_chan_map[4] = 0x1f;
+
+    /* Reset statistics */
+    STATS_RESET(ble_ll_conn_stats);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    /* reset default sync transfer params */
+    g_ble_ll_conn_sync_transfer_params.max_skip = 0;
+    g_ble_ll_conn_sync_transfer_params.mode = 0;
+    g_ble_ll_conn_sync_transfer_params.sync_timeout_us = 0;
+#endif
+}
+
+/* Initialize the connection module */
+void
+ble_ll_conn_module_init(void)
+{
+    int rc;
+    uint16_t i;
+    struct ble_ll_conn_sm *connsm;
+
+    /* Initialize list of active conections */
+    SLIST_INIT(&g_ble_ll_conn_active_list);
+    STAILQ_INIT(&g_ble_ll_conn_free_list);
+
+    /*
+     * Take all the connections off the free memory pool and add them to
+     * the free connection list, assigning handles in linear order. Note:
+     * the specification allows a handle of zero; we just avoid using it.
+     */
+    connsm = &g_ble_ll_conn_sm[0];
+    for (i = 0; i < MYNEWT_VAL(BLE_MAX_CONNECTIONS); ++i) {
+
+        memset(connsm, 0, sizeof(struct ble_ll_conn_sm));
+        connsm->conn_handle = i + 1;
+        STAILQ_INSERT_TAIL(&g_ble_ll_conn_free_list, connsm, free_stqe);
+
+        /* Initialize fixed schedule elements */
+        connsm->conn_sch.sched_type = BLE_LL_SCHED_TYPE_CONN;
+        connsm->conn_sch.cb_arg = connsm;
+        ++connsm;
+    }
+
+    /* Register connection statistics */
+    rc = stats_init_and_reg(STATS_HDR(ble_ll_conn_stats),
+                            STATS_SIZE_INIT_PARMS(ble_ll_conn_stats, STATS_SIZE_32),
+                            STATS_NAME_INIT_PARMS(ble_ll_conn_stats),
+                            "ble_ll_conn");
+    BLE_LL_ASSERT(rc == 0);
+
+    /* Call reset to finish reset of initialization */
+    ble_ll_conn_module_reset();
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn_hci.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn_hci.c
new file mode 100644
index 000000000..19ceebf50
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn_hci.c
@@ -0,0 +1,1898 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <string.h>
+#include <assert.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_utils.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_conn.h"
+#include "../include/controller/ble_ll_ctrl.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "ble_ll_conn_priv.h"
+
+/*
+ * Used to limit the rate at which we send the number of completed packets
+ * event to the host. This is the os time at which we can send an event.
+ */
+static ble_npl_time_t g_ble_ll_last_num_comp_pkt_evt;
+extern uint8_t *g_ble_ll_conn_comp_ev;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static const uint8_t ble_ll_valid_conn_phy_mask = (BLE_HCI_LE_PHY_1M_PREF_MASK
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+                                | BLE_HCI_LE_PHY_2M_PREF_MASK
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+                                | BLE_HCI_LE_PHY_CODED_PREF_MASK
+#endif
+                              );
+static const uint8_t ble_ll_conn_required_phy_mask = (BLE_HCI_LE_PHY_1M_PREF_MASK
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+                            | BLE_HCI_LE_PHY_CODED_PREF_MASK
+#endif
+                            );
+#endif
+
+/**
+ * Allocate an event to send a connection complete event when initiating
+ *
+ * @return int 0: success -1: failure
+ */
+static int
+ble_ll_init_alloc_conn_comp_ev(void)
+{
+    int rc;
+    uint8_t *evbuf;
+
+    rc = 0;
+    evbuf = g_ble_ll_conn_comp_ev;
+    if (evbuf == NULL) {
+        evbuf = ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (!evbuf) {
+            rc = -1;
+        } else {
+            g_ble_ll_conn_comp_ev = evbuf;
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Called to check that the connection parameters are within range
+ *
+ * @param itvl_min
+ * @param itvl_max
+ * @param latency
+ * @param spvn_tmo
+ *
+ * @return int BLE_ERR_INV_HCI_CMD_PARMS if invalid parameters, 0 otherwise
+ */
+int
+ble_ll_conn_hci_chk_conn_params(uint16_t itvl_min, uint16_t itvl_max,
+                                uint16_t latency, uint16_t spvn_tmo)
+{
+    uint32_t spvn_tmo_usecs;
+    uint32_t min_spvn_tmo_usecs;
+
+    if ((itvl_min > itvl_max) ||
+        (itvl_min < BLE_HCI_CONN_ITVL_MIN) ||
+        (itvl_max > BLE_HCI_CONN_ITVL_MAX) ||
+        (latency > BLE_HCI_CONN_LATENCY_MAX) ||
+        (spvn_tmo < BLE_HCI_CONN_SPVN_TIMEOUT_MIN) ||
+        (spvn_tmo > BLE_HCI_CONN_SPVN_TIMEOUT_MAX)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /*
+    * Supervision timeout (in msecs) must be more than:
+    *  (1 + connLatency) * connIntervalMax * 1.25 msecs * 2.
+    */
+    spvn_tmo_usecs = spvn_tmo;
+    spvn_tmo_usecs *= (BLE_HCI_CONN_SPVN_TMO_UNITS * 1000);
+    min_spvn_tmo_usecs = (uint32_t)itvl_max * 2 * BLE_LL_CONN_ITVL_USECS;
+    min_spvn_tmo_usecs *= (1 + latency);
+    if (spvn_tmo_usecs <= min_spvn_tmo_usecs) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Send a connection complete event
+ *
+ * @param status The BLE error code associated with the event
+ */
+void
+ble_ll_conn_comp_event_send(struct ble_ll_conn_sm *connsm, uint8_t status,
+                            uint8_t *evbuf, struct ble_ll_adv_sm *advsm)
+{
+    struct ble_hci_ev_le_subev_enh_conn_complete *enh_ev;
+    struct ble_hci_ev_le_subev_conn_complete *ev;
+    struct ble_hci_ev *hci_ev = (void *) evbuf;
+    uint8_t *rpa;
+
+    BLE_LL_ASSERT(evbuf);
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_ENH_CONN_COMPLETE)) {
+        hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+        hci_ev->length = sizeof(*enh_ev);
+        enh_ev = (void *) hci_ev->data;
+
+        memset(enh_ev, 0, sizeof(*enh_ev));
+
+        enh_ev->subev_code = BLE_HCI_LE_SUBEV_ENH_CONN_COMPLETE;
+        enh_ev->status = status;
+
+        if (connsm) {
+            enh_ev->conn_handle = htole16(connsm->conn_handle);
+            enh_ev->role = connsm->conn_role - 1;
+            enh_ev->peer_addr_type = connsm->peer_addr_type;
+            memcpy(enh_ev->peer_addr, connsm->peer_addr, BLE_DEV_ADDR_LEN);
+
+            if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+                if (connsm->inita_identity_used) {
+                    /* We used identity address in CONNECT_IND which can be just
+                     * fine if
+                     * a) it was direct advertising we replied to and remote uses
+                     *    its identity address in device privacy mode or IRK is all
+                     *    zeros.
+                     * b) peer uses RPA and this is first time we connect to him
+                     */
+                    rpa = NULL;
+                } else  if (connsm->own_addr_type > BLE_HCI_ADV_OWN_ADDR_RANDOM) {
+                    rpa = ble_ll_scan_get_local_rpa();
+                } else {
+                    rpa = NULL;
+                }
+            } else {
+                rpa = ble_ll_adv_get_local_rpa(advsm);
+            }
+
+            if (rpa) {
+                memcpy(enh_ev->local_rpa, rpa, BLE_DEV_ADDR_LEN);
+            }
+
+            /* We need to adjust peer type if device connected using RPA
+             * and was resolved since RPA needs to be added to HCI event.
+             */
+             if (connsm->peer_addr_type < BLE_HCI_CONN_PEER_ADDR_PUBLIC_IDENT
+                     && (connsm->rpa_index > -1)) {
+                 enh_ev->peer_addr_type += 2;
+             }
+
+             if (enh_ev->peer_addr_type > BLE_HCI_CONN_PEER_ADDR_RANDOM) {
+                 if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+                     rpa = ble_ll_scan_get_peer_rpa();
+                 } else {
+                     rpa = ble_ll_adv_get_peer_rpa(advsm);
+                 }
+                 memcpy(enh_ev->peer_rpa, rpa, BLE_DEV_ADDR_LEN);
+             }
+
+            enh_ev->conn_itvl = htole16(connsm->conn_itvl);
+            enh_ev->conn_latency = htole16(connsm->slave_latency);
+            enh_ev->supervision_timeout = htole16(connsm->supervision_tmo);
+            enh_ev->mca = connsm->master_sca;
+        }
+
+        ble_ll_hci_event_send(hci_ev);
+        return;
+    }
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_CONN_COMPLETE)) {
+        hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+        hci_ev->length = sizeof(*ev);
+        ev = (void *) hci_ev->data;
+
+        memset(ev, 0, sizeof(*ev));
+
+        ev->subev_code = BLE_HCI_LE_SUBEV_CONN_COMPLETE;
+        ev->status = status;
+
+        if (connsm) {
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->role = connsm->conn_role - 1;
+            ev->peer_addr_type = connsm->peer_addr_type;
+
+            if (ev->peer_addr_type > BLE_HCI_CONN_PEER_ADDR_RANDOM) {
+                ev->peer_addr_type -= 2;
+            }
+            memcpy(ev->peer_addr, connsm->peer_addr, BLE_DEV_ADDR_LEN);
+            ev->conn_itvl = htole16(connsm->conn_itvl);
+            ev->conn_latency = htole16(connsm->slave_latency);
+            ev->supervision_timeout = htole16(connsm->supervision_tmo);
+            ev->mca = connsm->master_sca;
+        }
+
+        ble_ll_hci_event_send(hci_ev);
+        return;
+    }
+
+    ble_hci_trans_buf_free(evbuf);
+}
+
+/**
+ * Called to create and send the number of completed packets event to the
+ * host.
+ */
+void
+ble_ll_conn_num_comp_pkts_event_send(struct ble_ll_conn_sm *connsm)
+{
+    /** The maximum number of handles that will fit in an event buffer. */
+    static const int max_handles =
+            (BLE_LL_MAX_EVT_LEN - sizeof(struct ble_hci_ev_num_comp_pkts) - 1) / 4;
+    struct ble_hci_ev_num_comp_pkts *ev;
+    struct ble_hci_ev *hci_ev;
+    int event_sent;
+
+    if (connsm == NULL) {
+        goto skip_conn;
+    }
+
+    /*
+     * At some periodic rate, make sure we go through all active connections
+     * and send the number of completed packet events. We do this mainly
+     * because the spec says we must update the host even though no packets
+     * have completed but there are data packets in the controller buffers
+     * (i.e. enqueued in a connection state machine).
+     */
+    if ((ble_npl_stime_t)(ble_npl_time_get() - g_ble_ll_last_num_comp_pkt_evt) <
+        ble_npl_time_ms_to_ticks32(MYNEWT_VAL(BLE_LL_NUM_COMP_PKT_ITVL_MS))) {
+        /*
+         * If this connection has completed packets, send an event right away.
+         * We do this to increase throughput but we dont want to search the
+         * entire active list every time.
+         */
+        if (connsm->completed_pkts) {
+            hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+            if (hci_ev) {
+                hci_ev->opcode = BLE_HCI_EVCODE_NUM_COMP_PKTS;
+                hci_ev->length = sizeof(*ev);
+                ev = (void *)hci_ev->data;
+
+                ev->count = 1;
+                ev->completed[0].handle = htole16(connsm->conn_handle);
+                ev->completed[0].packets = htole16(connsm->completed_pkts);
+                hci_ev->length += sizeof(ev->completed[0]);
+
+                connsm->completed_pkts = 0;
+
+                ble_ll_hci_event_send(hci_ev);
+            }
+        }
+        return;
+    }
+
+    /* Iterate through all the active, created connections */
+skip_conn:
+    hci_ev = NULL;
+    ev = NULL;
+
+    event_sent = 0;
+    SLIST_FOREACH(connsm, &g_ble_ll_conn_active_list, act_sle) {
+        /*
+         * Only look at connections that we have sent a connection complete
+         * event and that either has packets enqueued or has completed packets.
+         */
+        if ((connsm->conn_state != BLE_LL_CONN_STATE_IDLE) &&
+            (connsm->completed_pkts || !STAILQ_EMPTY(&connsm->conn_txq))) {
+            /* If no buffer, get one, If cant get one, leave. */
+            if (!hci_ev) {
+                hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+                if (!hci_ev) {
+                    break;
+                }
+
+                hci_ev->opcode = BLE_HCI_EVCODE_NUM_COMP_PKTS;
+                hci_ev->length = sizeof(*ev);
+                ev = (void *)hci_ev->data;
+
+                ev->count = 0;
+            }
+
+            /* Add handle and complete packets */
+            ev->completed[ev->count].handle = htole16(connsm->conn_handle);
+            ev->completed[ev->count].packets = htole16(connsm->completed_pkts);
+            hci_ev->length += sizeof(ev->completed[ev->count]);
+            ev->count++;
+
+            connsm->completed_pkts = 0;
+
+            /* Send now if the buffer is full. */
+            if (ev->count == max_handles) {
+                ble_ll_hci_event_send(hci_ev);
+                hci_ev = NULL;
+                event_sent = 1;
+            }
+        }
+    }
+
+    /* Send event if there is an event to send */
+    if (hci_ev) {
+        ble_ll_hci_event_send(hci_ev);
+        event_sent = 1;
+    }
+
+    if (event_sent) {
+        g_ble_ll_last_num_comp_pkt_evt = ble_npl_time_get();
+    }
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+/**
+ * Send a authenticated payload timeout event
+ *
+ * NOTE: we currently only send this event when we have a reason to send it;
+ * not when it fails.
+ *
+ * @param reason The BLE error code to send as a disconnect reason
+ */
+void
+ble_ll_auth_pyld_tmo_event_send(struct ble_ll_conn_sm *connsm)
+{
+    struct ble_hci_ev_auth_pyld_tmo *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_event_enabled(BLE_HCI_EVCODE_AUTH_PYLD_TMO)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_AUTH_PYLD_TMO;
+            hci_ev->length = sizeof(*ev);
+
+            ev = (void *) hci_ev->data;
+            ev->conn_handle = htole16(connsm->conn_handle);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+#endif
+
+/**
+ * Send a disconnection complete event.
+ *
+ * NOTE: we currently only send this event when we have a reason to send it;
+ * not when it fails.
+ *
+ * @param reason The BLE error code to send as a disconnect reason
+ */
+void
+ble_ll_disconn_comp_event_send(struct ble_ll_conn_sm *connsm, uint8_t reason)
+{
+    struct ble_hci_ev_disconn_cmp *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_event_enabled(BLE_HCI_EVCODE_DISCONN_CMP)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_DISCONN_CMP;
+            hci_ev->length = sizeof(*ev);
+
+            ev = (void *) hci_ev->data;
+
+            ev->status = BLE_ERR_SUCCESS;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->reason = reason;
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+static int
+ble_ll_conn_hci_chk_scan_params(uint16_t itvl, uint16_t window)
+{
+    /* Check interval and window */
+    if ((itvl < BLE_HCI_SCAN_ITVL_MIN) ||
+        (itvl > BLE_HCI_SCAN_ITVL_MAX) ||
+        (window < BLE_HCI_SCAN_WINDOW_MIN) ||
+        (window > BLE_HCI_SCAN_WINDOW_MAX) ||
+        (itvl < window)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return 0;
+}
+
+/**
+ * Process the HCI command to create a connection.
+ *
+ * Context: Link Layer task (HCI command processing)
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_create(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_create_conn_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_conn_sm *connsm;
+    struct hci_create_conn hcc = { 0 };
+    int rc;
+
+    if (len < sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* If we are already creating a connection we should leave */
+    if (g_ble_ll_conn_create_sm) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* If already enabled, we return an error */
+    if (ble_ll_scan_enabled()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Retrieve command data */
+    hcc.scan_itvl = le16toh(cmd->scan_itvl);
+    hcc.scan_window = le16toh(cmd->scan_window);
+
+    rc = ble_ll_conn_hci_chk_scan_params(hcc.scan_itvl, hcc.scan_window);
+    if (rc) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check filter policy */
+    hcc.filter_policy = cmd->filter_policy;
+    if (hcc.filter_policy > BLE_HCI_INITIATOR_FILT_POLICY_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Get peer address type and address only if no whitelist used */
+    if (hcc.filter_policy == 0) {
+        hcc.peer_addr_type = cmd->peer_addr_type;
+        if (hcc.peer_addr_type > BLE_HCI_CONN_PEER_ADDR_MAX) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        memcpy(&hcc.peer_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+    }
+
+    /* Get own address type (used in connection request) */
+    hcc.own_addr_type = cmd->own_addr_type;
+    if (hcc.own_addr_type > BLE_HCI_ADV_OWN_ADDR_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check connection interval, latency and supervision timeoout */
+    hcc.conn_itvl_min = le16toh(cmd->min_conn_itvl);
+    hcc.conn_itvl_max = le16toh(cmd->max_conn_itvl);
+    hcc.conn_latency = le16toh(cmd->conn_latency);
+    hcc.supervision_timeout = le16toh(cmd->tmo);
+    rc = ble_ll_conn_hci_chk_conn_params(hcc.conn_itvl_min,
+                                         hcc.conn_itvl_max,
+                                         hcc.conn_latency,
+                                         hcc.supervision_timeout);
+    if (rc) {
+        return rc;
+    }
+
+    /* Min/max connection event lengths */
+    hcc.min_ce_len = le16toh(cmd->min_ce);
+    hcc.max_ce_len = le16toh(cmd->max_ce);
+    if (hcc.min_ce_len > hcc.max_ce_len) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Make sure we can allocate an event to send the connection complete */
+    if (ble_ll_init_alloc_conn_comp_ev()) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    /* Make sure we can accept a connection! */
+    connsm = ble_ll_conn_sm_get();
+    if (connsm == NULL) {
+        return BLE_ERR_CONN_LIMIT;
+    }
+
+    /* Initialize state machine in master role and start state machine */
+    ble_ll_conn_master_init(connsm, &hcc);
+    ble_ll_conn_sm_new(connsm);
+    /* CSA will be selected when advertising is received */
+
+    /* Start scanning */
+    rc = ble_ll_scan_initiator_start(&hcc, &connsm->scansm);
+    if (rc) {
+        SLIST_REMOVE(&g_ble_ll_conn_active_list,connsm,ble_ll_conn_sm,act_sle);
+        STAILQ_INSERT_TAIL(&g_ble_ll_conn_free_list, connsm, free_stqe);
+    } else {
+        /* Set the connection state machine we are trying to create. */
+        g_ble_ll_conn_create_sm = connsm;
+    }
+
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_conn_hcc_params_set_fallback(struct hci_ext_create_conn *hcc,
+                                    const struct hci_ext_conn_params *fallback)
+{
+    BLE_LL_ASSERT(fallback);
+
+    if (!(hcc->init_phy_mask & BLE_PHY_MASK_1M)) {
+        hcc->params[0] = *fallback;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    if (!(hcc->init_phy_mask & BLE_PHY_MASK_2M)) {
+        hcc->params[1] = *fallback;
+    }
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    if (!(hcc->init_phy_mask & BLE_PHY_MASK_CODED)) {
+        hcc->params[2] = *fallback;
+    }
+#endif
+}
+
+int
+ble_ll_ext_conn_create(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_ext_create_conn_cp *cmd = (const void *) cmdbuf;
+    const struct conn_params *params = cmd->conn_params;
+    const struct hci_ext_conn_params *fallback_params = NULL;
+    struct hci_ext_create_conn hcc = { 0 };
+    struct ble_ll_conn_sm *connsm;
+    int rc;
+
+    /* validate length */
+    if (len < sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    len -= sizeof(*cmd);
+
+    /* If we are already creating a connection we should leave */
+    if (g_ble_ll_conn_create_sm) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* If already enabled, we return an error */
+    if (ble_ll_scan_enabled()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    hcc.filter_policy = cmd->filter_policy;
+    if (hcc.filter_policy > BLE_HCI_INITIATOR_FILT_POLICY_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    hcc.own_addr_type = cmd->own_addr_type;
+    if (hcc.own_addr_type > BLE_HCI_ADV_OWN_ADDR_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Validate peer address type only if no whitelist used */
+    if (hcc.filter_policy == 0) {
+        hcc.peer_addr_type = cmd->peer_addr_type;
+
+        if (hcc.peer_addr_type > BLE_HCI_CONN_PEER_ADDR_MAX) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        memcpy(hcc.peer_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+    }
+
+    hcc.init_phy_mask = cmd->init_phy_mask;
+    if (hcc.init_phy_mask & ~ble_ll_valid_conn_phy_mask) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (!(hcc.init_phy_mask & ble_ll_conn_required_phy_mask)) {
+        /* At least one of those need to be set */
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (hcc.init_phy_mask & BLE_PHY_MASK_1M) {
+        if (len < sizeof(*params)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+        len -= sizeof(*params);
+
+        hcc.params[0].scan_itvl = le16toh(params->scan_itvl);
+        hcc.params[0].scan_window = le16toh(params->scan_window);
+
+        rc = ble_ll_conn_hci_chk_scan_params(hcc.params[0].scan_itvl,
+                                             hcc.params[0].scan_window);
+        if (rc) {
+            return rc;
+        }
+
+        hcc.params[0].conn_itvl_min = le16toh(params->conn_min_itvl);
+        hcc.params[0].conn_itvl_max = le16toh(params->conn_min_itvl);
+        hcc.params[0].conn_latency = le16toh(params->conn_latency);
+        hcc.params[0].supervision_timeout = le16toh(params->supervision_timeout);
+
+        rc = ble_ll_conn_hci_chk_conn_params(hcc.params[0].conn_itvl_min,
+                                             hcc.params[0].conn_itvl_max,
+                                             hcc.params[0].conn_latency,
+                                             hcc.params[0].supervision_timeout);
+        if (rc) {
+            return rc;
+        }
+
+        /* Min/max connection event lengths */
+        hcc.params[0].min_ce_len = le16toh(params->min_ce);
+        hcc.params[0].max_ce_len = le16toh(params->max_ce);
+        if (hcc.params[0].min_ce_len > hcc.params[0].max_ce_len) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        fallback_params = &hcc.params[0];
+        params++;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    if (hcc.init_phy_mask & BLE_PHY_MASK_2M) {
+        if (len < sizeof(*params)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+        len -= sizeof(*params);
+
+        hcc.params[1].conn_itvl_min = le16toh(params->conn_min_itvl);
+        hcc.params[1].conn_itvl_max = le16toh(params->conn_min_itvl);
+        hcc.params[1].conn_latency = le16toh(params->conn_latency);
+        hcc.params[1].supervision_timeout = le16toh(params->supervision_timeout);
+
+        rc = ble_ll_conn_hci_chk_conn_params(hcc.params[1].conn_itvl_min,
+                                             hcc.params[1].conn_itvl_max,
+                                             hcc.params[1].conn_latency,
+                                             hcc.params[1].supervision_timeout);
+        if (rc) {
+            return rc;
+        }
+
+        /* Min/max connection event lengths */
+        hcc.params[1].min_ce_len = le16toh(params->min_ce);
+        hcc.params[1].max_ce_len = le16toh(params->max_ce);
+        if (hcc.params[1].min_ce_len > hcc.params[1].max_ce_len) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        params++;
+    }
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    if (hcc.init_phy_mask & BLE_PHY_MASK_CODED) {
+        if (len < sizeof(*params)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+        len -= sizeof(*params);
+
+        hcc.params[2].scan_itvl = le16toh(params->scan_itvl);
+        hcc.params[2].scan_window = le16toh(params->scan_window);
+
+        rc = ble_ll_conn_hci_chk_scan_params(hcc.params[2].scan_itvl,
+                                             hcc.params[2].scan_window);
+        if (rc) {
+            return rc;
+        }
+
+        hcc.params[2].conn_itvl_min = le16toh(params->conn_min_itvl);
+        hcc.params[2].conn_itvl_max = le16toh(params->conn_min_itvl);
+        hcc.params[2].conn_latency = le16toh(params->conn_latency);
+        hcc.params[2].supervision_timeout = le16toh(params->supervision_timeout);
+
+        rc = ble_ll_conn_hci_chk_conn_params(hcc.params[2].conn_itvl_min,
+                                             hcc.params[2].conn_itvl_max,
+                                             hcc.params[2].conn_latency,
+                                             hcc.params[2].supervision_timeout);
+        if (rc) {
+            return rc;
+        }
+
+        /* Min/max connection event lengths */
+        hcc.params[2].min_ce_len = le16toh(params->min_ce);
+        hcc.params[2].max_ce_len = le16toh(params->max_ce);
+        if (hcc.params[2].min_ce_len > hcc.params[2].max_ce_len) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (!fallback_params) {
+            fallback_params = &hcc.params[2];
+        }
+        params++;
+    }
+#endif
+
+    /* Make sure we can allocate an event to send the connection complete */
+    if (ble_ll_init_alloc_conn_comp_ev()) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    /* Make sure we can accept a connection! */
+    connsm = ble_ll_conn_sm_get();
+    if (connsm == NULL) {
+        return BLE_ERR_CONN_LIMIT;
+    }
+
+    ble_ll_conn_hcc_params_set_fallback(&hcc, fallback_params);
+
+    /* Initialize state machine in master role and start state machine */
+    ble_ll_conn_ext_master_init(connsm, &hcc);
+    ble_ll_conn_sm_new(connsm);
+
+    /* CSA will be selected when advertising is received */
+
+    /* Start scanning */
+    rc = ble_ll_scan_ext_initiator_start(&hcc, &connsm->scansm);
+    if (rc) {
+        SLIST_REMOVE(&g_ble_ll_conn_active_list,connsm,ble_ll_conn_sm,act_sle);
+        STAILQ_INSERT_TAIL(&g_ble_ll_conn_free_list, connsm, free_stqe);
+    } else {
+        /* Set the connection state machine we are trying to create. */
+        g_ble_ll_conn_create_sm = connsm;
+    }
+
+    return rc;
+}
+#endif
+
+static int
+ble_ll_conn_process_conn_params(const struct ble_hci_le_rem_conn_param_rr_cp *cmd,
+                                struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+    struct hci_conn_update *hcu;
+
+    /* Retrieve command data */
+    hcu = &connsm->conn_param_req;
+    hcu->handle = connsm->conn_handle;
+
+    BLE_LL_ASSERT(connsm->conn_handle == le16toh(cmd->conn_handle));
+
+    hcu->conn_itvl_min = le16toh(cmd->conn_itvl_min);
+    hcu->conn_itvl_max = le16toh(cmd->conn_itvl_max);
+    hcu->conn_latency = le16toh(cmd->conn_latency);
+    hcu->supervision_timeout = le16toh(cmd->supervision_timeout);
+    hcu->min_ce_len = le16toh(cmd->min_ce);
+    hcu->max_ce_len = le16toh(cmd->max_ce);
+
+    /* Check that parameter values are in range */
+    rc = ble_ll_conn_hci_chk_conn_params(hcu->conn_itvl_min,
+                                         hcu->conn_itvl_max,
+                                         hcu->conn_latency,
+                                         hcu->supervision_timeout);
+
+    /* Check valid min/max ce length */
+    if (rc || (hcu->min_ce_len > hcu->max_ce_len)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+    return rc;
+}
+
+/**
+ * Called when the host issues the read remote features command
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_read_rem_features(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_rd_rem_feat_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_conn_sm *connsm;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* If no connection handle exit with error */
+    connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+    if (!connsm) {
+        return BLE_ERR_UNK_CONN_ID;
+    }
+
+    /* If already pending exit with error */
+    if (connsm->csmflags.cfbit.pending_hci_rd_features) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /*
+     * Start control procedure if we did not receive peer's features and did not
+     * start procedure already.
+     */
+    if (!connsm->csmflags.cfbit.rxd_features &&
+                !IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG)) {
+        if ((connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) &&
+            !(ble_ll_read_supp_features() & BLE_LL_FEAT_SLAVE_INIT)) {
+                return BLE_ERR_CMD_DISALLOWED;
+        }
+
+        ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG);
+    }
+
+    connsm->csmflags.cfbit.pending_hci_rd_features = 1;
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Called to process a connection update command.
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_update(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_conn_update_cp *cmd = (const void *) cmdbuf;
+    int rc;
+    uint8_t ctrl_proc;
+    uint16_t handle;
+    struct ble_ll_conn_sm *connsm;
+    struct hci_conn_update *hcu;
+
+    /*
+     * XXX: must deal with slave not supporting this feature and using
+     * conn update! Right now, we only check if WE support the connection
+     * parameters request procedure. We dont check if the remote does.
+     * We should also be able to deal with sending the parameter request,
+     * getting an UNKOWN_RSP ctrl pdu and resorting to use normal
+     * connection update procedure.
+     */
+
+    /* If no connection handle exit with error */
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        return BLE_ERR_UNK_CONN_ID;
+    }
+
+    /* Better not have this procedure ongoing! */
+    if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ) ||
+        IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_CONN_UPDATE)) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* See if this feature is supported on both sides */
+    if ((connsm->conn_features & BLE_LL_FEAT_CONN_PARM_REQ) == 0) {
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            return BLE_ERR_UNSUPP_REM_FEATURE;
+        }
+        ctrl_proc = BLE_LL_CTRL_PROC_CONN_UPDATE;
+    } else {
+        ctrl_proc = BLE_LL_CTRL_PROC_CONN_PARAM_REQ;
+    }
+
+    /*
+     * If we are a slave and the master has initiated the procedure already
+     * we should deny the slave request for now. If we are a master and the
+     * slave has initiated the procedure, we need to send a reject to the
+     * slave.
+     */
+    if (connsm->csmflags.cfbit.awaiting_host_reply) {
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            return BLE_ERR_LMP_COLLISION;
+        } else {
+            connsm->csmflags.cfbit.awaiting_host_reply = 0;
+
+            /* XXX: If this fails no reject ind will be sent! */
+            ble_ll_ctrl_reject_ind_send(connsm, connsm->host_reply_opcode,
+                                        BLE_ERR_LMP_COLLISION);
+        }
+    }
+
+    /*
+     * If we are a slave and the master has initiated the channel map
+     * update procedure we should deny the slave request for now.
+     */
+    if (connsm->csmflags.cfbit.chanmap_update_scheduled) {
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            return BLE_ERR_DIFF_TRANS_COLL;
+        }
+    }
+
+    /* Retrieve command data */
+    hcu = &connsm->conn_param_req;
+    hcu->conn_itvl_min = le16toh(cmd->conn_itvl_min);
+    hcu->conn_itvl_max = le16toh(cmd->conn_itvl_max);
+    hcu->conn_latency = le16toh(cmd->conn_latency);
+    hcu->supervision_timeout = le16toh(cmd->supervision_timeout);
+    hcu->min_ce_len = le16toh(cmd->min_ce_len);
+    hcu->max_ce_len = le16toh(cmd->max_ce_len);
+    if (hcu->min_ce_len > hcu->max_ce_len) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check that parameter values are in range */
+    rc = ble_ll_conn_hci_chk_conn_params(hcu->conn_itvl_min,
+                                         hcu->conn_itvl_max,
+                                         hcu->conn_latency,
+                                         hcu->supervision_timeout);
+    if (!rc) {
+        hcu->handle = handle;
+
+        /* Start the control procedure */
+        ble_ll_ctrl_proc_start(connsm, ctrl_proc);
+    }
+
+    return rc;
+}
+
+int
+ble_ll_conn_hci_param_rr(const uint8_t *cmdbuf, uint8_t len,
+                         uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_rem_conn_param_rr_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_rem_conn_param_rr_rp *rsp = (void *) rspbuf;
+    int rc;
+    uint8_t *dptr;
+    uint8_t rsp_opcode;
+    uint16_t handle;
+    struct os_mbuf *om;
+    struct ble_ll_conn_sm *connsm;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->conn_handle);
+
+    /* See if we support this feature */
+    if ((ble_ll_read_supp_features() & BLE_LL_FEAT_CONN_PARM_REQ) == 0) {
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        goto done;
+    }
+
+    /* If we dont have a handle we cant do anything */
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        goto done;
+    }
+
+    /* Make sure connection parameters are valid */
+    rc = ble_ll_conn_process_conn_params(cmd, connsm);
+
+    /* The connection should be awaiting a reply. If not, just discard */
+    if (connsm->csmflags.cfbit.awaiting_host_reply) {
+        /* Get a control packet buffer */
+        if (rc == BLE_ERR_SUCCESS) {
+            om = os_msys_get_pkthdr(BLE_LL_CTRL_MAX_PDU_LEN,
+                                    sizeof(struct ble_mbuf_hdr));
+            if (om) {
+                dptr = om->om_data;
+                rsp_opcode = ble_ll_ctrl_conn_param_reply(connsm, dptr,
+                                                          &connsm->conn_cp);
+                dptr[0] = rsp_opcode;
+                len = g_ble_ll_ctrl_pkt_lengths[rsp_opcode] + 1;
+                ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL, len);
+            }
+        } else {
+            /* XXX: check return code and deal */
+            ble_ll_ctrl_reject_ind_send(connsm, connsm->host_reply_opcode,
+                                        BLE_ERR_CONN_PARMS);
+        }
+        connsm->csmflags.cfbit.awaiting_host_reply = 0;
+
+        /* XXX: if we cant get a buffer, what do we do? We need to remember
+         * reason if it was a negative reply. We also would need to have
+         * some state to tell us this happened
+         */
+    }
+
+done:
+    rsp->conn_handle = htole16(handle);
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+int
+ble_ll_conn_hci_param_nrr(const uint8_t *cmdbuf, uint8_t len,
+                          uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_rem_conn_params_nrr_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_rem_conn_params_nrr_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    uint16_t handle;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->conn_handle);
+
+    /* See if we support this feature */
+    if ((ble_ll_read_supp_features() & BLE_LL_FEAT_CONN_PARM_REQ) == 0) {
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        goto done;
+    }
+
+    /* If we dont have a handle we cant do anything */
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        goto done;
+    }
+
+    rc = BLE_ERR_SUCCESS;
+
+    /* The connection should be awaiting a reply. If not, just discard */
+    if (connsm->csmflags.cfbit.awaiting_host_reply) {
+        /* XXX: check return code and deal */
+        ble_ll_ctrl_reject_ind_send(connsm, connsm->host_reply_opcode,
+                                    cmd->reason);
+        connsm->csmflags.cfbit.awaiting_host_reply = 0;
+
+        /* XXX: if we cant get a buffer, what do we do? We need to remember
+         * reason if it was a negative reply. We also would need to have
+         * some state to tell us this happened
+         */
+    }
+
+done:
+    rsp->conn_handle = htole16(handle);
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+/* this is called from same context after cmd complete is send so it is
+ * safe to use g_ble_ll_conn_comp_ev
+ */
+static void
+ble_ll_conn_hci_cancel_conn_complete_event(void)
+{
+    BLE_LL_ASSERT(g_ble_ll_conn_comp_ev);
+
+    ble_ll_conn_comp_event_send(NULL, BLE_ERR_UNK_CONN_ID,
+                                g_ble_ll_conn_comp_ev, NULL);
+    g_ble_ll_conn_comp_ev = NULL;
+}
+
+/**
+ * Called when HCI command to cancel a create connection command has been
+ * received.
+ *
+ * Context: Link Layer (HCI command parser)
+ *
+ * @return int
+ */
+int
+ble_ll_conn_create_cancel(ble_ll_hci_post_cmd_complete_cb *post_cmd_cb)
+{
+    int rc;
+    struct ble_ll_conn_sm *connsm;
+    os_sr_t sr;
+
+    /*
+     * If we receive this command and we have not got a connection
+     * create command, we have to return disallowed. The spec does not say
+     * what happens if the connection has already been established. We
+     * return disallowed as well
+     */
+    OS_ENTER_CRITICAL(sr);
+    connsm = g_ble_ll_conn_create_sm;
+    if (connsm && (connsm->conn_state == BLE_LL_CONN_STATE_IDLE)) {
+        /* stop scanning and end the connection event */
+        g_ble_ll_conn_create_sm = NULL;
+        ble_ll_scan_sm_stop(1);
+        ble_ll_conn_end(connsm, BLE_ERR_UNK_CONN_ID);
+
+        *post_cmd_cb = ble_ll_conn_hci_cancel_conn_complete_event;
+
+        rc = BLE_ERR_SUCCESS;
+    } else {
+        /* If we are not attempting to create a connection*/
+        rc = BLE_ERR_CMD_DISALLOWED;
+    }
+    OS_EXIT_CRITICAL(sr);
+
+    return rc;
+}
+
+/**
+ * Called to process a HCI disconnect command
+ *
+ * Context: Link Layer task (HCI command parser).
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_disconnect_cmd(const uint8_t *cmdbuf, uint8_t len)
+{
+    int rc;
+    uint16_t handle;
+    struct ble_ll_conn_sm *connsm;
+    const struct ble_hci_lc_disconnect_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof (*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check for valid parameters */
+    handle = le16toh(cmd->conn_handle);
+
+    rc = BLE_ERR_INV_HCI_CMD_PARMS;
+    if (handle <= BLE_LL_CONN_MAX_CONN_HANDLE) {
+        /* Make sure reason is valid */
+        switch (cmd->reason) {
+        case BLE_ERR_AUTH_FAIL:
+        case BLE_ERR_REM_USER_CONN_TERM:
+        case BLE_ERR_RD_CONN_TERM_RESRCS:
+        case BLE_ERR_RD_CONN_TERM_PWROFF:
+        case BLE_ERR_UNSUPP_REM_FEATURE:
+        case BLE_ERR_UNIT_KEY_PAIRING:
+        case BLE_ERR_CONN_PARMS:
+            connsm = ble_ll_conn_find_active_conn(handle);
+            if (connsm) {
+                /* Do not allow command if we are in process of disconnecting */
+                if (connsm->disconnect_reason) {
+                    rc = BLE_ERR_CMD_DISALLOWED;
+                } else {
+                    /* This control procedure better not be pending! */
+                    BLE_LL_ASSERT(CONN_F_TERMINATE_STARTED(connsm) == 0);
+
+                    /* Record the disconnect reason */
+                    connsm->disconnect_reason = cmd->reason;
+
+                    /* Start this control procedure */
+                    ble_ll_ctrl_terminate_start(connsm);
+
+                    rc = BLE_ERR_SUCCESS;
+                }
+            } else {
+                rc = BLE_ERR_UNK_CONN_ID;
+            }
+            break;
+        default:
+            break;
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Called to process a HCI disconnect command
+ *
+ * Context: Link Layer task (HCI command parser).
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_rd_rem_ver_cmd(const uint8_t *cmdbuf, uint8_t len)
+{
+    struct ble_ll_conn_sm *connsm;
+    const struct ble_hci_rd_rem_ver_info_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check for valid parameters */
+    connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+    if (!connsm) {
+        return BLE_ERR_UNK_CONN_ID;
+    }
+
+    /* Return error if in progress */
+    if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_VERSION_XCHG)) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /*
+     * Start this control procedure. If we have already done this control
+     * procedure we set the pending bit so that the host gets an event because
+     * it is obviously expecting one (or would not have sent the command).
+     * NOTE: we cant just send the event here. That would cause the event to
+     * be queued before the command status.
+     */
+    if (!connsm->csmflags.cfbit.version_ind_sent) {
+        ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_VERSION_XCHG);
+    } else {
+        connsm->pending_ctrl_procs |= (1 << BLE_LL_CTRL_PROC_VERSION_XCHG);
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Called to read the RSSI for a given connection handle
+ *
+ * @param cmdbuf
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_rd_rssi(const uint8_t *cmdbuf, uint8_t len, uint8_t *rspbuf, uint8_t *rsplen)
+{
+
+    const struct ble_hci_rd_rssi_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_rd_rssi_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    rsp->handle = cmd->handle;
+
+    connsm = ble_ll_conn_find_active_conn(le16toh(cmd->handle));
+    if (!connsm) {
+        rsp->rssi = 127;
+        rc = BLE_ERR_UNK_CONN_ID;
+    } else {
+        rsp->rssi = connsm->conn_rssi;
+        rc = BLE_ERR_SUCCESS;
+    }
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+/**
+ * Called to read the current channel map of a connection
+ *
+ * @param cmdbuf
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_rd_chan_map(const uint8_t *cmdbuf, uint8_t len,
+                            uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_rd_chan_map_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_rd_chan_map_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    uint16_t handle;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        memset(rsp->chan_map, 0, sizeof(rsp->chan_map));
+    } else {
+        if (connsm->csmflags.cfbit.chanmap_update_scheduled) {
+            memcpy(rsp->chan_map, connsm->req_chanmap, BLE_LL_CONN_CHMAP_LEN);
+        } else {
+            memcpy(rsp->chan_map, connsm->chanmap, BLE_LL_CONN_CHMAP_LEN);
+        }
+        rc = BLE_ERR_SUCCESS;
+    }
+
+    rsp->conn_handle = htole16(handle);
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+/**
+ * Called when the host issues the LE command "set host channel classification"
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_set_chan_class(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_host_chan_class_cp *cmd = (const void *) cmdbuf;
+    uint8_t num_used_chans;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /*
+     * The HCI command states that the host is allowed to mask in just one
+     * channel but the Link Layer needs minimum two channels to operate. So
+     * I will not allow this command if there are less than 2 channels masked.
+     */
+    num_used_chans = ble_ll_utils_calc_num_used_chans(cmd->chan_map);
+    if ((num_used_chans < 2) || ((cmd->chan_map[4] & 0xe0) != 0)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Set the host channel mask */
+    ble_ll_conn_set_global_chanmap(num_used_chans, cmd->chan_map);
+    return BLE_ERR_SUCCESS;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
+int
+ble_ll_conn_hci_set_data_len(const uint8_t *cmdbuf, uint8_t len,
+                             uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_set_data_len_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_set_data_len_rp *rsp = (void *) rspbuf;
+    int rc;
+    uint16_t handle;
+    uint16_t txoctets;
+    uint16_t txtime;
+    struct ble_ll_conn_sm *connsm;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Find connection */
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        goto done;
+    }
+
+    txoctets = le16toh(cmd->tx_octets);
+    txtime = le16toh(cmd->tx_time);
+
+    /* Make sure it is valid */
+    if (!ble_ll_chk_txrx_octets(txoctets) ||
+        !ble_ll_chk_txrx_time(txtime)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    /*
+     * Keep original value requested by host since we may want to recalculate
+     * MaxTxTime after PHY changes between coded and uncoded.
+     */
+    connsm->host_req_max_tx_time = txtime;
+
+    /* If peer does not support coded, we cannot use value larger than 2120us */
+    if (!(connsm->remote_features[0] & (BLE_LL_FEAT_LE_CODED_PHY >> 8))) {
+        txtime = min(txtime, BLE_LL_CONN_SUPP_TIME_MAX_UNCODED);
+    }
+#endif
+
+    rc = BLE_ERR_SUCCESS;
+    if (connsm->max_tx_time != txtime ||
+        connsm->max_tx_octets != txoctets) {
+
+        connsm->max_tx_time = txtime;
+        connsm->max_tx_octets = txoctets;
+
+        ble_ll_ctrl_initiate_dle(connsm);
+    }
+
+done:
+    rsp->conn_handle = htole16(handle);
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/**
+ * LE start encrypt command
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_le_start_encrypt(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_start_encrypt_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_conn_sm *connsm;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+    } else if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+        rc = BLE_ERR_UNSPECIFIED;
+    } else if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_ENCRYPT) {
+        /*
+         * The specification does not say what to do here but the host should
+         * not be telling us to start encryption while we are in the process
+         * of honoring a previous start encrypt.
+         */
+        rc = BLE_ERR_CMD_DISALLOWED;
+    } else {
+        /* Start the control procedure */
+        connsm->enc_data.host_rand_num = le64toh(cmd->rand);
+        connsm->enc_data.enc_div = le16toh(cmd->div);
+        swap_buf(connsm->enc_data.enc_block.key, cmd->ltk, 16);
+        ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
+        rc = BLE_ERR_SUCCESS;
+    }
+
+    return rc;
+}
+
+/**
+ * Called to process the LE long term key reply.
+ *
+ * Context: Link Layer Task.
+ *
+ * @param cmdbuf
+ * @param rspbuf
+ * @param ocf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_le_ltk_reply(const uint8_t *cmdbuf, uint8_t len,
+                             uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_lt_key_req_reply_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_lt_key_req_reply_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    uint16_t handle;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Find connection handle */
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        goto ltk_key_cmd_complete;
+    }
+
+    /* Should never get this if we are a master! */
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        rc = BLE_ERR_UNSPECIFIED;
+        goto ltk_key_cmd_complete;
+    }
+
+    /* The connection should be awaiting a reply. If not, just discard */
+    if (connsm->enc_data.enc_state != CONN_ENC_S_LTK_REQ_WAIT) {
+        rc = BLE_ERR_CMD_DISALLOWED;
+        goto ltk_key_cmd_complete;
+    }
+
+    swap_buf(connsm->enc_data.enc_block.key, cmd->ltk, 16);
+    ble_ll_calc_session_key(connsm);
+    ble_ll_ctrl_start_enc_send(connsm);
+    rc = BLE_ERR_SUCCESS;
+
+ltk_key_cmd_complete:
+    rsp->conn_handle = htole16(handle);
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+/**
+ * Called to process the LE long term key negative reply.
+ *
+ * Context: Link Layer Task.
+ *
+ * @param cmdbuf
+ * @param rspbuf
+ * @param ocf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_le_ltk_neg_reply(const uint8_t *cmdbuf, uint8_t len,
+                                 uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_lt_key_req_neg_reply_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_lt_key_req_neg_reply_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    uint16_t handle;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Find connection handle */
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        goto ltk_key_cmd_complete;
+    }
+
+    /* Should never get this if we are a master! */
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        rc = BLE_ERR_UNSPECIFIED;
+        goto ltk_key_cmd_complete;
+    }
+
+    /* The connection should be awaiting a reply. If not, just discard */
+    if (connsm->enc_data.enc_state != CONN_ENC_S_LTK_REQ_WAIT) {
+        rc = BLE_ERR_CMD_DISALLOWED;
+        goto ltk_key_cmd_complete;
+    }
+
+    /* We received a negative reply! Send REJECT_IND */
+    ble_ll_ctrl_reject_ind_send(connsm, BLE_LL_CTRL_ENC_REQ,
+                                BLE_ERR_PINKEY_MISSING);
+    connsm->enc_data.enc_state = CONN_ENC_S_LTK_NEG_REPLY;
+
+    rc = BLE_ERR_SUCCESS;
+
+ltk_key_cmd_complete:
+    rsp->conn_handle = htole16(handle);
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+/**
+ * Read authenticated payload timeout (OGF=3, OCF==0x007B)
+ *
+ * @param cmdbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_rd_auth_pyld_tmo(const uint8_t *cmdbuf, uint8_t len,
+                                 uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_cb_rd_auth_pyld_tmo_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_cb_rd_auth_pyld_tmo_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    uint16_t handle;
+    int rc;
+
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        rsp->tmo = 0;
+    } else {
+        rc = BLE_ERR_SUCCESS;
+        rsp->tmo = htole16(connsm->auth_pyld_tmo);
+    }
+
+    rsp->conn_handle = htole16(handle);
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+/**
+ * Write authenticated payload timeout (OGF=3, OCF=00x7C)
+ *
+ * @param cmdbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_wr_auth_pyld_tmo(const uint8_t *cmdbuf, uint8_t len,
+                                 uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_cb_wr_auth_pyld_tmo_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_cb_wr_auth_pyld_tmo_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    uint32_t min_tmo;
+    uint16_t handle;
+    uint16_t tmo;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    rc = BLE_ERR_SUCCESS;
+
+    handle = le16toh(cmd->conn_handle);
+
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+    } else {
+        /*
+         * The timeout is in units of 10 msecs. We need to make sure that the
+         * timeout is greater than or equal to connItvl * (1 + slaveLatency)
+         */
+        tmo = le16toh(cmd->tmo);
+        min_tmo = (uint32_t)connsm->conn_itvl * BLE_LL_CONN_ITVL_USECS;
+        min_tmo *= (connsm->slave_latency + 1);
+        min_tmo /= 10000;
+
+        if (tmo < min_tmo) {
+            rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        } else {
+            connsm->auth_pyld_tmo = tmo;
+            if (ble_npl_callout_is_active(&connsm->auth_pyld_timer)) {
+                ble_ll_conn_auth_pyld_timer_start(connsm);
+            }
+        }
+    }
+
+    rsp->conn_handle = htole16(handle);
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+#endif
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+/**
+ * Read current phy for connection (OGF=8, OCF==0x0030)
+ *
+ * @param cmdbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_le_rd_phy(const uint8_t *cmdbuf, uint8_t len,
+                          uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_rd_phy_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_rd_phy_rp *rsp = (void *) rspbuf;
+    int rc;
+    uint16_t handle;
+    struct ble_ll_conn_sm *connsm;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rsp->tx_phy = 0;
+        rsp->rx_phy = 0;
+        rc = BLE_ERR_UNK_CONN_ID;
+    } else {
+        rsp->tx_phy = connsm->phy_data.cur_tx_phy;
+        rsp->rx_phy = connsm->phy_data.cur_rx_phy;
+        rc = BLE_ERR_SUCCESS;
+    }
+
+    rsp->conn_handle = htole16(handle);
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+/**
+ * Set PHY preferences for connection
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_conn_hci_le_set_phy(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_phy_cp *cmd = (const void *) cmdbuf;
+    int rc;
+    uint16_t phy_options;
+    uint8_t tx_phys;
+    uint8_t rx_phys;
+    uint16_t handle;
+    struct ble_ll_conn_sm *connsm;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->conn_handle);
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        return BLE_ERR_UNK_CONN_ID;
+    }
+
+    /*
+     * If host has requested a PHY update and we are not finished do
+     * not allow another one
+     */
+    if (CONN_F_HOST_PHY_UPDATE(connsm)) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    phy_options = le16toh(cmd->phy_options);
+    if (phy_options > BLE_HCI_LE_PHY_CODED_S8_PREF) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check valid parameters */
+    rc = ble_ll_hci_chk_phy_masks(cmd->all_phys, cmd->tx_phys, cmd->rx_phys,
+                                  &tx_phys, &rx_phys);
+    if (rc) {
+        goto phy_cmd_param_err;
+    }
+
+    connsm->phy_data.phy_options = phy_options & 0x03;
+    connsm->phy_data.host_pref_tx_phys_mask = tx_phys,
+    connsm->phy_data.host_pref_rx_phys_mask = rx_phys;
+
+    /*
+     * The host preferences override the default phy preferences. Currently,
+     * the only reason the controller will initiate a procedure on its own
+     * is due to the fact that the host set default preferences. So if there
+     * is a pending control procedure and it has not yet started, we do not
+     * need to perform the default controller procedure.
+     */
+    if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE)) {
+        if (connsm->cur_ctrl_proc != BLE_LL_CTRL_PROC_PHY_UPDATE) {
+            CONN_F_CTRLR_PHY_UPDATE(connsm) = 0;
+        }
+        CONN_F_HOST_PHY_UPDATE(connsm) = 1;
+    } else {
+        /*
+         * We could be doing a peer-initiated PHY update procedure. If this
+         * is the case the requested phy preferences will not both be 0. If
+         * we are not done with a peer-initiated procedure we just set the
+         * pending bit but do not start the control procedure.
+         */
+        if (CONN_F_PEER_PHY_UPDATE(connsm)) {
+            connsm->pending_ctrl_procs |= (1 << BLE_LL_CTRL_PROC_PHY_UPDATE);
+            CONN_F_HOST_PHY_UPDATE(connsm) = 1;
+        } else {
+            /* Check if we should start phy update procedure */
+            if (!ble_ll_conn_chk_phy_upd_start(connsm)) {
+                CONN_F_HOST_PHY_UPDATE(connsm) = 1;
+            } else {
+                /*
+                 * Set flag to send a PHY update complete event. We set flag
+                 * even if we do not do an update procedure since we have to
+                 * inform the host even if we decide not to change anything.
+                 */
+                CONN_F_PHY_UPDATE_EVENT(connsm) = 1;
+            }
+        }
+    }
+
+phy_cmd_param_err:
+    return rc;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+int
+ble_ll_set_sync_transfer_params(const uint8_t *cmdbuf, uint8_t len,
+                                uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_periodic_adv_sync_transfer_params_cp *cmd = (const void *)cmdbuf;
+    struct ble_hci_le_periodic_adv_sync_transfer_params_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    uint16_t sync_timeout;
+    uint16_t skip;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    if (cmd->mode > 0x02) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    skip = le16toh(cmd->skip);
+    if (skip > 0x01f3) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    sync_timeout = le16toh(cmd->sync_timeout);
+    if ((sync_timeout < 0x000a) || (sync_timeout > 0x4000)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    /* we don't support any CTE yet */
+    if (cmd->sync_cte_type) {
+        rc = BLE_ERR_UNSUPPORTED;
+        goto done;
+    }
+
+    connsm = ble_ll_conn_find_active_conn(le16toh(cmd->conn_handle));
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        goto done;
+    }
+
+    /* timeout in 10ms units */
+    connsm->sync_transfer_sync_timeout = sync_timeout * 10000;
+    connsm->sync_transfer_mode = cmd->mode;
+    connsm->sync_transfer_skip = skip;
+
+    rc = BLE_ERR_SUCCESS;
+
+done:
+    rsp->conn_handle = cmd->conn_handle;
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+int
+ble_ll_set_default_sync_transfer_params(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_default_periodic_sync_transfer_params_cp *cmd = (const void *)cmdbuf;
+    uint16_t sync_timeout;
+    uint16_t skip;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->mode > 0x02) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    skip = le16toh(cmd->skip);
+    if (skip > 0x01f3) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    sync_timeout = le16toh(cmd->sync_timeout);
+    if ((sync_timeout < 0x000a) || (sync_timeout > 0x4000)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* we don't support any CTE yet */
+    if (cmd->sync_cte_type) {
+        return BLE_ERR_UNSUPPORTED;
+    }
+
+    /* timeout in 10ms units */
+    g_ble_ll_conn_sync_transfer_params.sync_timeout_us = sync_timeout * 10000;
+    g_ble_ll_conn_sync_transfer_params.mode = cmd->mode;
+    g_ble_ll_conn_sync_transfer_params.max_skip = skip;
+
+    return BLE_ERR_SUCCESS;
+}
+#endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn_priv.h
new file mode 100644
index 000000000..e4ade10f9
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_conn_priv.h
@@ -0,0 +1,226 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_LL_CONN_PRIV_
+#define H_BLE_LL_CONN_PRIV_
+
+#include "../include/controller/ble_ll_conn.h"
+#include "../include/controller/ble_ll_hci.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Definitions for min/max RX/TX time/bytes values allowed for connections.
+ * Source: Core 5.0 specification, Vol 6, Part B, section 4.5.10
+ */
+#define BLE_LL_CONN_SUPP_TIME_MIN           (328)   /* usecs */
+#define BLE_LL_CONN_SUPP_TIME_MAX           (17040) /* usecs */
+#define BLE_LL_CONN_SUPP_TIME_MIN_UNCODED   (328)   /* usecs */
+#define BLE_LL_CONN_SUPP_TIME_MAX_UNCODED   (2120)  /* usecs */
+#define BLE_LL_CONN_SUPP_TIME_MIN_CODED     (2704)  /* usecs */
+#define BLE_LL_CONN_SUPP_TIME_MAX_CODED     (17040) /* usecs */
+#define BLE_LL_CONN_SUPP_BYTES_MIN          (27)    /* bytes */
+#define BLE_LL_CONN_SUPP_BYTES_MAX          (251)   /* bytes */
+
+/* Connection event timing */
+#define BLE_LL_CONN_INITIAL_OFFSET          (1250)
+#define BLE_LL_CONN_ITVL_USECS              (1250)
+#define BLE_LL_CONN_TX_WIN_USECS            (1250)
+#define BLE_LL_CONN_TX_OFF_USECS            (1250)
+#define BLE_LL_CONN_CE_USECS                (625)
+#define BLE_LL_CONN_TX_WIN_MIN              (1)         /* in tx win units */
+#define BLE_LL_CONN_SLAVE_LATENCY_MAX       (499)
+
+/* Connection handle range */
+#define BLE_LL_CONN_MAX_CONN_HANDLE         (0x0EFF)
+
+/* Offset (in bytes) of advertising address in connect request */
+#define BLE_LL_CONN_REQ_ADVA_OFF    (BLE_LL_PDU_HDR_LEN + BLE_DEV_ADDR_LEN)
+
+/* Default authenticated payload timeout (30 seconds; in 10 msecs increments) */
+#define BLE_LL_CONN_DEF_AUTH_PYLD_TMO       (3000)
+#define BLE_LL_CONN_AUTH_PYLD_OS_TMO(x)     ble_npl_time_ms_to_ticks32((x) * 10)
+
+/* Global Link Layer connection parameters */
+struct ble_ll_conn_global_params
+{
+    uint8_t master_chan_map[BLE_LL_CONN_CHMAP_LEN];
+    uint8_t num_used_chans;
+    uint8_t supp_max_tx_octets;
+    uint8_t supp_max_rx_octets;
+    uint8_t conn_init_max_tx_octets;
+    uint8_t sugg_tx_octets;
+    uint16_t sugg_tx_time;
+    uint16_t conn_init_max_tx_time;
+    uint16_t conn_init_max_tx_time_uncoded;
+    uint16_t conn_init_max_tx_time_coded;
+    uint16_t supp_max_tx_time;
+    uint16_t supp_max_rx_time;
+};
+extern struct ble_ll_conn_global_params g_ble_ll_conn_params;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+struct ble_ll_conn_sync_transfer_params
+{
+    uint32_t sync_timeout_us;
+    uint16_t max_skip;
+    uint8_t  mode;
+};
+extern struct ble_ll_conn_sync_transfer_params g_ble_ll_conn_sync_transfer_params;
+#endif
+
+/* Some data structures used by other LL routines */
+SLIST_HEAD(ble_ll_conn_active_list, ble_ll_conn_sm);
+STAILQ_HEAD(ble_ll_conn_free_list, ble_ll_conn_sm);
+extern struct ble_ll_conn_active_list g_ble_ll_conn_active_list;
+extern struct ble_ll_conn_free_list g_ble_ll_conn_free_list;
+
+/* Pointer to connection state machine we are trying to create */
+extern struct ble_ll_conn_sm *g_ble_ll_conn_create_sm;
+
+/* Generic interface */
+struct ble_ll_len_req;
+struct ble_mbuf_hdr;
+struct ble_ll_adv_sm;
+
+struct hci_create_conn
+{
+    uint16_t scan_itvl;
+    uint16_t scan_window;
+    uint8_t filter_policy;
+    uint8_t peer_addr_type;
+    uint8_t peer_addr[BLE_DEV_ADDR_LEN];
+    uint8_t own_addr_type;
+    uint16_t conn_itvl_min;
+    uint16_t conn_itvl_max;
+    uint16_t conn_latency;
+    uint16_t supervision_timeout;
+    uint16_t min_ce_len;
+    uint16_t max_ce_len;
+};
+
+void ble_ll_conn_sm_new(struct ble_ll_conn_sm *connsm);
+void ble_ll_conn_end(struct ble_ll_conn_sm *connsm, uint8_t ble_err);
+void ble_ll_conn_enqueue_pkt(struct ble_ll_conn_sm *connsm, struct os_mbuf *om,
+                             uint8_t hdr_byte, uint8_t length);
+struct ble_ll_conn_sm *ble_ll_conn_sm_get(void);
+void ble_ll_conn_master_init(struct ble_ll_conn_sm *connsm,
+                             struct hci_create_conn *hcc);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+void ble_ll_conn_ext_master_init(struct ble_ll_conn_sm *connsm,
+                                 struct hci_ext_create_conn *hcc);
+
+void ble_ll_conn_ext_set_params(struct ble_ll_conn_sm *connsm,
+                                struct hci_ext_conn_params *hcc_params,
+                                int phy);
+#endif
+
+struct ble_ll_conn_sm *ble_ll_conn_find_active_conn(uint16_t handle);
+void ble_ll_conn_update_eff_data_len(struct ble_ll_conn_sm *connsm);
+
+/* Advertising interface */
+int ble_ll_conn_slave_start(uint8_t *rxbuf, uint8_t pat,
+                            struct ble_mbuf_hdr *rxhdr, bool force_csa2);
+
+/* Link Layer interface */
+void ble_ll_conn_module_init(void);
+void ble_ll_conn_set_global_chanmap(uint8_t num_used_chans, const uint8_t *chanmap);
+void ble_ll_conn_module_reset(void);
+void ble_ll_conn_tx_pkt_in(struct os_mbuf *om, uint16_t handle, uint16_t len);
+int ble_ll_conn_rx_isr_start(struct ble_mbuf_hdr *rxhdr, uint32_t aa);
+int ble_ll_conn_rx_isr_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr);
+void ble_ll_conn_rx_data_pdu(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr);
+void ble_ll_init_rx_pkt_in(uint8_t pdu_type, uint8_t *rxbuf,
+                           struct ble_mbuf_hdr *ble_hdr);
+int ble_ll_init_rx_isr_start(uint8_t pdu_type, struct ble_mbuf_hdr *ble_hdr);
+int ble_ll_init_rx_isr_end(uint8_t *rxbuf, uint8_t crcok,
+                           struct ble_mbuf_hdr *ble_hdr);
+void ble_ll_conn_wfr_timer_exp(void);
+void ble_ll_conn_init_wfr_timer_exp(void);
+int ble_ll_conn_is_lru(struct ble_ll_conn_sm *s1, struct ble_ll_conn_sm *s2);
+uint32_t ble_ll_conn_get_ce_end_time(void);
+void ble_ll_conn_event_halt(void);
+void ble_ll_conn_reset_pending_aux_conn_rsp(void);
+bool ble_ll_conn_init_pending_aux_conn_rsp(void);
+/* HCI */
+void ble_ll_disconn_comp_event_send(struct ble_ll_conn_sm *connsm,
+                                    uint8_t reason);
+void ble_ll_auth_pyld_tmo_event_send(struct ble_ll_conn_sm *connsm);
+int ble_ll_conn_hci_disconnect_cmd(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_hci_rd_rem_ver_cmd(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_create(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_hci_update(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_hci_set_chan_class(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_hci_param_rr(const uint8_t *cmdbuf, uint8_t len,
+                             uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_conn_hci_param_nrr(const uint8_t *cmdbuf, uint8_t len,
+                             uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_conn_create_cancel(ble_ll_hci_post_cmd_complete_cb *post_cmd_cb);
+void ble_ll_conn_num_comp_pkts_event_send(struct ble_ll_conn_sm *connsm);
+void ble_ll_conn_comp_event_send(struct ble_ll_conn_sm *connsm, uint8_t status,
+                                 uint8_t *evbuf, struct ble_ll_adv_sm *advsm);
+void ble_ll_conn_timeout(struct ble_ll_conn_sm *connsm, uint8_t ble_err);
+int ble_ll_conn_hci_chk_conn_params(uint16_t itvl_min, uint16_t itvl_max,
+                                    uint16_t latency, uint16_t spvn_tmo);
+int ble_ll_conn_hci_read_rem_features(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_hci_rd_rssi(const uint8_t *cmdbuf, uint8_t len, uint8_t *rspbuf,
+                            uint8_t *rsplen);
+int ble_ll_conn_hci_rd_chan_map(const uint8_t *cmdbuf, uint8_t len,
+                                uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_conn_hci_set_data_len(const uint8_t *cmdbuf, uint8_t len,
+                                 uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_conn_hci_le_start_encrypt(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_hci_le_ltk_reply(const uint8_t *cmdbuf, uint8_t len,
+                                 uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_conn_hci_le_ltk_neg_reply(const uint8_t *cmdbuf, uint8_t len,
+                                     uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_conn_hci_wr_auth_pyld_tmo(const uint8_t *cmdbuf, uint8_t len,
+                                     uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_conn_hci_rd_auth_pyld_tmo(const uint8_t *cmdbuf, uint8_t len,
+                                     uint8_t *rspbuf, uint8_t *rsplen);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+void ble_ll_conn_auth_pyld_timer_start(struct ble_ll_conn_sm *connsm);
+#else
+#define ble_ll_conn_auth_pyld_timer_start(x)
+#endif
+
+int ble_ll_hci_cmd_rx(uint8_t *cmd, void *arg);
+int ble_ll_hci_acl_rx(struct os_mbuf *om, void *arg);
+
+int ble_ll_conn_hci_le_rd_phy(const uint8_t *cmdbuf, uint8_t len,
+                              uint8_t *rsp, uint8_t *rsplen);
+int ble_ll_conn_hci_le_set_phy(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_conn_chk_phy_upd_start(struct ble_ll_conn_sm *connsm);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+int ble_ll_ext_conn_create(const uint8_t *cmdbuf, uint8_t cmdlen);
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+int ble_ll_set_sync_transfer_params(const uint8_t *cmdbuf, uint8_t len,
+                                    uint8_t *rspbuf, uint8_t *rsplen);
+int ble_ll_set_default_sync_transfer_params(const uint8_t *cmdbuf, uint8_t len);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_LL_CONN_PRIV_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_ctrl.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_ctrl.c
new file mode 100644
index 000000000..1d5ed929b
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_ctrl.c
@@ -0,0 +1,2747 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+ 
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_ctrl.h"
+#include "../include/controller/ble_ll_trace.h"
+#include "../include/controller/ble_hw.h"
+#include "../include/controller/ble_ll_sync.h"
+#include "ble_ll_conn_priv.h"
+
+/* To use spec sample data for testing */
+#undef BLE_LL_ENCRYPT_USE_TEST_DATA
+
+/*
+ * For console debug to show session key calculation. NOTE: if you define
+ * this the stack requirements for the LL task go up considerably. The
+ * default stack will not be enough and must be increased.
+ */
+#undef BLE_LL_ENCRYPT_DEBUG
+#ifdef BLE_LL_ENCRYPT_DEBUG
+#include "console/console.h"
+#endif
+
+/*
+ * XXX:
+ *  1) Do I need to keep track of which procedures have already been done?
+ *     Do I need to worry about repeating procedures?
+ *  2) Should we create pool of control pdu's?. Dont need more
+ *  than the # of connections and can probably deal with quite a few less
+ *  if we have lots of connections.
+ *  3) What about procedures that have been completed but try to restart?
+ *  4) NOTE: there is a supported features procedure. However, in the case
+ *  of data length extension, if the receiving device does not understand
+ *  the pdu or it does not support data length extension, the LL_UNKNOWN_RSP
+ *  pdu is sent. That needs to be processed...
+ *  5) We are supposed to remember when we do the data length update proc if
+ *  the device sent us an unknown rsp. We should not send it another len req.
+ *  Implement this how? Through remote supported features?
+ *  8) How to count control pdus sent. DO we count enqueued + sent, or only
+ *  sent (actually attempted to tx). Do we count failures? How?
+ */
+
+/*
+ * XXX: I definitely have an issue with control procedures and connection
+ * param request procedure and connection update procedure. This was
+ * noted when receiving an unknown response. Right now, I am getting confused
+ * with connection parameter request and updates regarding which procedures
+ * are running. So I need to go look through all the code and see where I
+ * used the request procedure and the update procedure and make sure I am doing
+ * the correct thing.
+ */
+
+/*
+ * This array contains the length of the CtrData field in LL control PDU's.
+ * Note that there is a one byte opcode which precedes this field in the LL
+ * control PDU, so total data channel payload length for the control pdu is
+ * one greater.
+ */
+const uint8_t g_ble_ll_ctrl_pkt_lengths[BLE_LL_CTRL_OPCODES] =
+{
+    BLE_LL_CTRL_CONN_UPD_REQ_LEN,
+    BLE_LL_CTRL_CHAN_MAP_LEN,
+    BLE_LL_CTRL_TERMINATE_IND_LEN,
+    BLE_LL_CTRL_ENC_REQ_LEN,
+    BLE_LL_CTRL_ENC_RSP_LEN,
+    BLE_LL_CTRL_START_ENC_REQ_LEN,
+    BLE_LL_CTRL_START_ENC_RSP_LEN,
+    BLE_LL_CTRL_UNK_RSP_LEN,
+    BLE_LL_CTRL_FEATURE_LEN,
+    BLE_LL_CTRL_FEATURE_LEN,
+    BLE_LL_CTRL_PAUSE_ENC_REQ_LEN,
+    BLE_LL_CTRL_PAUSE_ENC_RSP_LEN,
+    BLE_LL_CTRL_VERSION_IND_LEN,
+    BLE_LL_CTRL_REJ_IND_LEN,
+    BLE_LL_CTRL_SLAVE_FEATURE_REQ_LEN,
+    BLE_LL_CTRL_CONN_PARAMS_LEN,
+    BLE_LL_CTRL_CONN_PARAMS_LEN,
+    BLE_LL_CTRL_REJECT_IND_EXT_LEN,
+    BLE_LL_CTRL_PING_LEN,
+    BLE_LL_CTRL_PING_LEN,
+    BLE_LL_CTRL_LENGTH_REQ_LEN,
+    BLE_LL_CTRL_LENGTH_REQ_LEN,
+    BLE_LL_CTRL_PHY_REQ_LEN,
+    BLE_LL_CTRL_PHY_RSP_LEN,
+    BLE_LL_CTRL_PHY_UPD_IND_LEN,
+    BLE_LL_CTRL_MIN_USED_CHAN_LEN,
+    BLE_LL_CTRL_CTE_REQ_LEN,
+    BLE_LL_CTRL_CTE_RSP_LEN,
+    BLE_LL_CTRL_PERIODIC_SYNC_IND_LEN,
+    BLE_LL_CTRL_CLOCK_ACCURACY_REQ_LEN,
+    BLE_LL_CTRL_CLOCK_ACCURACY_RSP_LEN,
+};
+
+/**
+ * Called to determine if a LL control procedure with an instant has
+ * been initiated.
+ *
+ * If the function returns a 0 it means no conflicting procedure has
+ * been initiated. Otherwise it returns the appropriate BLE error code to
+ * send.
+ *
+ * @param connsm Pointer to connection state machine.
+ * @param req_ctrl_proc The procedure that the peer is trying to initiate
+ *
+ * @return uint8_t
+ */
+uint8_t
+ble_ll_ctrl_proc_with_instant_initiated(struct ble_ll_conn_sm *connsm,
+                                        uint8_t req_ctrl_proc)
+{
+    uint8_t err;
+
+    switch (connsm->cur_ctrl_proc) {
+    case BLE_LL_CTRL_PROC_PHY_UPDATE:
+    case BLE_LL_CTRL_PROC_CONN_UPDATE:
+    case BLE_LL_CTRL_PROC_CONN_PARAM_REQ:
+    case BLE_LL_CTRL_PROC_CHAN_MAP_UPD:
+        if (req_ctrl_proc == connsm->cur_ctrl_proc) {
+            err = BLE_ERR_LMP_COLLISION;
+        } else if ((connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_CONN_UPDATE) &&
+                   (req_ctrl_proc == BLE_LL_CTRL_PROC_CONN_PARAM_REQ)) {
+            err = BLE_ERR_LMP_COLLISION;
+        } else {
+            err = BLE_ERR_DIFF_TRANS_COLL;
+        }
+        break;
+    default:
+        err = 0;
+    }
+
+    return err;
+}
+
+/**
+ * Create a LL_REJECT_EXT_IND pdu.
+ *
+ * @param rej_opcode Opcode to be rejected.
+ * @param err: error response
+ * @param ctrdata: Pointer to where CtrData starts in pdu
+ */
+void
+ble_ll_ctrl_rej_ext_ind_make(uint8_t rej_opcode, uint8_t err, uint8_t *ctrdata)
+{
+    ctrdata[0] = rej_opcode;
+    ctrdata[1] = err;
+}
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+/**
+ * Called to cancel a phy update procedure.
+ *
+ * @param connsm
+ * @param ble_err
+ */
+void
+ble_ll_ctrl_phy_update_cancel(struct ble_ll_conn_sm *connsm, uint8_t ble_err)
+{
+    /* cancel any pending phy update procedures */
+    CLR_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE);
+
+    /* Check if the host wants an event */
+    if (CONN_F_HOST_PHY_UPDATE(connsm)) {
+        ble_ll_hci_ev_phy_update(connsm, ble_err);
+        CONN_F_HOST_PHY_UPDATE(connsm) = 0;
+    }
+
+    /* Clear any bits for phy updates that might be in progress */
+    CONN_F_CTRLR_PHY_UPDATE(connsm) = 0;
+}
+#endif
+
+static int
+ble_ll_ctrl_len_proc(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    int rc;
+    struct ble_ll_len_req ctrl_req;
+
+    /* Extract parameters and check if valid */
+    ctrl_req.max_rx_bytes = get_le16(dptr);
+    ctrl_req.max_rx_time = get_le16(dptr + 2);
+    ctrl_req.max_tx_bytes = get_le16(dptr + 4);
+    ctrl_req.max_tx_time = get_le16(dptr + 6);
+
+    if ((ctrl_req.max_rx_bytes < BLE_LL_CONN_SUPP_BYTES_MIN) ||
+        (ctrl_req.max_rx_time < BLE_LL_CONN_SUPP_TIME_MIN) ||
+        (ctrl_req.max_tx_bytes < BLE_LL_CONN_SUPP_BYTES_MIN) ||
+        (ctrl_req.max_tx_time < BLE_LL_CONN_SUPP_TIME_MIN)) {
+        rc = 1;
+    } else {
+        /* Update parameters */
+        connsm->rem_max_rx_time = ctrl_req.max_rx_time;
+        connsm->rem_max_tx_time = ctrl_req.max_tx_time;
+        connsm->rem_max_rx_octets = ctrl_req.max_rx_bytes;
+        connsm->rem_max_tx_octets = ctrl_req.max_tx_bytes;
+
+        /* Recalculate effective connection parameters */
+        ble_ll_conn_update_eff_data_len(connsm);
+        rc = 0;
+    }
+
+    return rc;
+}
+
+/**
+ * Process a received LL_PING_RSP control pdu.
+ *
+ * NOTE: we dont have to reset the callout since this packet will have had a
+ * valid MIC and that will restart the authenticated payload timer
+ *
+ * @param connsm
+ */
+static void
+ble_ll_ctrl_rx_ping_rsp(struct ble_ll_conn_sm *connsm)
+{
+    /* Stop the control procedure */
+    ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_LE_PING);
+}
+
+/**
+ * Called when we receive either a connection parameter request or response.
+ *
+ * @param connsm
+ * @param dptr
+ * @param rspbuf
+ * @param opcode
+ *
+ * @return int
+ */
+static int
+ble_ll_ctrl_conn_param_pdu_proc(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                                uint8_t *rspbuf, uint8_t opcode)
+{
+    int rc;
+    int indicate;
+    uint8_t rsp_opcode;
+    uint8_t ble_err;
+    struct ble_ll_conn_params *req;
+    struct hci_conn_update *hcu;
+
+    /* Extract parameters and check if valid */
+    req = &connsm->conn_cp;
+    req->interval_min = get_le16(dptr);
+    req->interval_max = get_le16(dptr + 2);
+    req->latency = get_le16(dptr + 4);
+    req->timeout = get_le16(dptr + 6);
+    req->pref_periodicity = dptr[8];
+    req->ref_conn_event_cnt  = get_le16(dptr + 9);
+    req->offset0 = get_le16(dptr + 11);
+    req->offset1 = get_le16(dptr + 13);
+    req->offset2 = get_le16(dptr + 15);
+    req->offset3 = get_le16(dptr + 17);
+    req->offset4 = get_le16(dptr + 19);
+    req->offset5 = get_le16(dptr + 21);
+
+    /* Check if parameters are valid */
+    ble_err = BLE_ERR_SUCCESS;
+    rc = ble_ll_conn_hci_chk_conn_params(req->interval_min,
+                                         req->interval_max,
+                                         req->latency,
+                                         req->timeout);
+    if (rc) {
+        ble_err = BLE_ERR_INV_LMP_LL_PARM;
+        goto conn_param_pdu_exit;
+    }
+
+    /*
+     * Check if there is a requested change to either the interval, timeout
+     * or latency. If not, this may just be an anchor point change and we do
+     * not have to notify the host.
+     *  XXX: what if we dont like the parameters? When do we check that out?
+     */
+    indicate = 1;
+    if (opcode == BLE_LL_CTRL_CONN_PARM_REQ) {
+        if ((connsm->conn_itvl >= req->interval_min) &&
+            (connsm->conn_itvl <= req->interval_max) &&
+            (connsm->supervision_tmo == req->timeout) &&
+            (connsm->slave_latency == req->latency)) {
+            indicate = 0;
+            goto conn_parm_req_do_indicate;
+        }
+    }
+
+    /*
+     * A change has been requested. Is it within the values specified by
+     * the host? Note that for a master we will not be processing a
+     * connect param request from a slave if we are currently trying to
+     * update the connection parameters. This means that the previous
+     * check is all we need for a master (when receiving a request).
+     */
+    if ((connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) ||
+        (opcode == BLE_LL_CTRL_CONN_PARM_RSP)) {
+        /*
+         * Not sure what to do about the slave. It is possible that the
+         * current connection parameters are not the same ones as the local host
+         * has provided? Not sure what to do here. Do we need to remember what
+         * host sent us? For now, I will assume that we need to remember what
+         * the host sent us and check it out.
+         */
+        hcu = &connsm->conn_param_req;
+        if (hcu->handle != 0) {
+            if (!((req->interval_min < hcu->conn_itvl_min) ||
+                  (req->interval_min > hcu->conn_itvl_max) ||
+                  (req->interval_max < hcu->conn_itvl_min) ||
+                  (req->interval_max > hcu->conn_itvl_max) ||
+                  (req->latency != hcu->conn_latency) ||
+                  (req->timeout != hcu->supervision_timeout))) {
+                indicate = 0;
+            }
+        }
+    }
+
+conn_parm_req_do_indicate:
+    /*
+     * XXX: are the connection update parameters acceptable? If not, we will
+     * need to know before we indicate to the host that they are acceptable.
+     */
+    if (indicate) {
+        /* If Host masked out Remote Connection Parameter Request Event, we need to
+         * send Reject back to the remote device
+         */
+        if (!ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_REM_CONN_PARM_REQ)){
+            ble_err = BLE_ERR_UNSUPP_REM_FEATURE;
+            goto conn_param_pdu_exit;
+        }
+
+        /*
+         * Send event to host. At this point we leave and wait to get
+         * an answer.
+         */
+        ble_ll_hci_ev_rem_conn_parm_req(connsm, req);
+        connsm->host_reply_opcode = opcode;
+        connsm->csmflags.cfbit.awaiting_host_reply = 1;
+        rsp_opcode = 255;
+    } else {
+        /* Create reply to connection request */
+        rsp_opcode = ble_ll_ctrl_conn_param_reply(connsm, rspbuf, req);
+    }
+
+conn_param_pdu_exit:
+    if (ble_err) {
+        rsp_opcode = BLE_LL_CTRL_REJECT_IND_EXT;
+        rspbuf[1] = opcode;
+        rspbuf[2] = ble_err;
+    }
+    return rsp_opcode;
+}
+
+/**
+ * Called to make a connection update request LL control PDU
+ *
+ * Context: Link Layer
+ *
+ * @param connsm
+ * @param rsp
+ */
+static void
+ble_ll_ctrl_conn_upd_make(struct ble_ll_conn_sm *connsm, uint8_t *pyld,
+                          struct ble_ll_conn_params *cp)
+{
+    uint16_t instant;
+    uint32_t dt;
+    uint32_t num_old_ce;
+    uint32_t new_itvl_usecs;
+    uint32_t old_itvl_usecs;
+    struct hci_conn_update *hcu;
+    struct ble_ll_conn_upd_req *req;
+
+    /*
+     * Set instant. We set the instant to the current event counter plus
+     * the amount of slave latency as the slave may not be listening
+     * at every connection interval and we are not sure when the connect
+     * request will actually get sent. We add one more event plus the
+     * minimum as per the spec of 6 connection events.
+     */
+    instant = connsm->event_cntr + connsm->slave_latency + 6 + 1;
+
+    /*
+     * XXX: This should change in the future, but for now we will just
+     * start the new instant at the same anchor using win offset 0.
+     */
+    /* Copy parameters in connection update structure */
+    hcu = &connsm->conn_param_req;
+    req = &connsm->conn_update_req;
+    if (cp) {
+        /* XXX: so we need to make the new anchor point some time away
+         * from txwinoffset by some amount of msecs. Not sure how to do
+           that here. We dont need to, but we should. */
+        /* Calculate offset from requested offsets (if any) */
+        if (cp->offset0 != 0xFFFF) {
+            new_itvl_usecs = cp->interval_max * BLE_LL_CONN_ITVL_USECS;
+            old_itvl_usecs = connsm->conn_itvl * BLE_LL_CONN_ITVL_USECS;
+            if ((int16_t)(cp->ref_conn_event_cnt - instant) >= 0) {
+                num_old_ce = cp->ref_conn_event_cnt - instant;
+                dt = old_itvl_usecs * num_old_ce;
+                dt += (cp->offset0 * BLE_LL_CONN_ITVL_USECS);
+                dt = dt % new_itvl_usecs;
+            } else {
+                num_old_ce = instant - cp->ref_conn_event_cnt;
+                dt = old_itvl_usecs * num_old_ce;
+                dt -= (cp->offset0 * BLE_LL_CONN_ITVL_USECS);
+                dt = dt % new_itvl_usecs;
+                dt = new_itvl_usecs - dt;
+            }
+            req->winoffset = dt / BLE_LL_CONN_TX_WIN_USECS;
+        } else {
+            req->winoffset = 0;
+        }
+        req->interval = cp->interval_max;
+        req->timeout = cp->timeout;
+        req->latency = cp->latency;
+        req->winsize = 1;
+    } else {
+        req->interval = hcu->conn_itvl_max;
+        req->timeout = hcu->supervision_timeout;
+        req->latency = hcu->conn_latency;
+        req->winoffset = 0;
+        req->winsize = connsm->tx_win_size;
+    }
+    req->instant = instant;
+
+    /* XXX: make sure this works for the connection parameter request proc. */
+    pyld[0] = req->winsize;
+    put_le16(pyld + 1, req->winoffset);
+    put_le16(pyld + 3, req->interval);
+    put_le16(pyld + 5, req->latency);
+    put_le16(pyld + 7, req->timeout);
+    put_le16(pyld + 9, instant);
+
+    /* Set flag in state machine to denote we have scheduled an update */
+    connsm->csmflags.cfbit.conn_update_sched = 1;
+}
+
+/**
+ * Called to process and UNKNOWN_RSP LL control packet.
+ *
+ * Context: Link Layer Task
+ *
+ * @param dptr
+ */
+static int
+ble_ll_ctrl_proc_unk_rsp(struct ble_ll_conn_sm *connsm, uint8_t *dptr, uint8_t *rspdata)
+{
+    uint8_t ctrl_proc;
+    uint8_t opcode;
+
+    /* Get opcode of unknown LL control frame */
+    opcode = dptr[0];
+
+    /* Convert opcode to control procedure id */
+    switch (opcode) {
+    case BLE_LL_CTRL_LENGTH_REQ:
+        ctrl_proc = BLE_LL_CTRL_PROC_DATA_LEN_UPD;
+        BLE_LL_CONN_CLEAR_FEATURE(connsm, BLE_LL_FEAT_DATA_LEN_EXT);
+        break;
+    case BLE_LL_CTRL_CONN_UPDATE_IND:
+        ctrl_proc = BLE_LL_CTRL_PROC_CONN_UPDATE;
+        break;
+    case BLE_LL_CTRL_SLAVE_FEATURE_REQ:
+        ctrl_proc = BLE_LL_CTRL_PROC_FEATURE_XCHG;
+        BLE_LL_CONN_CLEAR_FEATURE(connsm, BLE_LL_FEAT_SLAVE_INIT);
+        break;
+    case BLE_LL_CTRL_CONN_PARM_REQ:
+        BLE_LL_CONN_CLEAR_FEATURE(connsm, BLE_LL_FEAT_CONN_PARM_REQ);
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+            ble_ll_ctrl_conn_upd_make(connsm, rspdata, NULL);
+            connsm->reject_reason = BLE_ERR_SUCCESS;
+            return BLE_LL_CTRL_CONN_UPDATE_IND;
+        }
+        /* note: fall-through intentional */
+    case BLE_LL_CTRL_CONN_PARM_RSP:
+        ctrl_proc = BLE_LL_CTRL_PROC_CONN_PARAM_REQ;
+        break;
+    case BLE_LL_CTRL_PING_REQ:
+        /* LL can authenticate remote device even if remote device does not
+         * support LE Ping feature.
+         */
+        ctrl_proc = BLE_LL_CTRL_PROC_LE_PING;
+        BLE_LL_CONN_CLEAR_FEATURE(connsm, BLE_LL_FEAT_LE_PING);
+        break;
+#if (BLE_LL_BT5_PHY_SUPPORTED ==1)
+    case BLE_LL_CTRL_PHY_REQ:
+        ble_ll_ctrl_phy_update_cancel(connsm, BLE_ERR_UNSUPP_REM_FEATURE);
+        ctrl_proc = BLE_LL_CTRL_PROC_PHY_UPDATE;
+        break;
+#endif
+    default:
+        ctrl_proc = BLE_LL_CTRL_PROC_NUM;
+        break;
+    }
+
+    /* If we are running this one currently, stop it */
+    if (connsm->cur_ctrl_proc == ctrl_proc) {
+        /* Stop the control procedure */
+        ble_ll_ctrl_proc_stop(connsm, ctrl_proc);
+        if (ctrl_proc == BLE_LL_CTRL_PROC_CONN_PARAM_REQ) {
+            ble_ll_hci_ev_conn_update(connsm, BLE_ERR_UNSUPP_REM_FEATURE);
+        } else if (ctrl_proc == BLE_LL_CTRL_PROC_FEATURE_XCHG) {
+            if (connsm->csmflags.cfbit.pending_hci_rd_features) {
+                ble_ll_hci_ev_rd_rem_used_feat(connsm,
+                                                   BLE_ERR_UNSUPP_REM_FEATURE);
+            }
+            connsm->csmflags.cfbit.pending_hci_rd_features = 0;
+        }
+    }
+
+    return BLE_ERR_MAX;
+}
+
+/**
+ * Callback when LL control procedure times out (for a given connection). If
+ * this is called, it means that we need to end the connection because it
+ * has not responded to a LL control request.
+ *
+ * Context: Link Layer
+ *
+ * @param arg Pointer to connection state machine.
+ */
+static void
+ble_ll_ctrl_proc_rsp_timer_cb(struct ble_npl_event *ev)
+{
+    /* Control procedure has timed out. Kill the connection */
+    ble_ll_conn_timeout((struct ble_ll_conn_sm *)ble_npl_event_get_arg(ev),
+                        BLE_ERR_LMP_LL_RSP_TMO);
+}
+
+static void
+ble_ll_ctrl_start_rsp_timer(struct ble_ll_conn_sm *connsm)
+{
+    ble_npl_callout_init(&connsm->ctrl_proc_rsp_timer,
+                    &g_ble_ll_data.ll_evq,
+                    ble_ll_ctrl_proc_rsp_timer_cb,
+                    connsm);
+
+    /* Re-start timer. Control procedure timeout is 40 seconds */
+    ble_npl_callout_reset(&connsm->ctrl_proc_rsp_timer,
+                     ble_npl_time_ms_to_ticks32(BLE_LL_CTRL_PROC_TIMEOUT_MS));
+}
+
+/**
+ * Convert a phy mask to a numeric phy value.
+ *
+ * NOTE: only one bit should be set here and there should be at least one.
+ * If this function returns a 0 it is an error!
+ *
+ * @param phy_mask Bitmask of phy
+ *
+ * @return uint8_t The numeric value associated with the phy mask
+ *
+ * BLE_HCI_LE_PHY_1M                    (1)
+ * BLE_HCI_LE_PHY_2M                    (2)
+ * BLE_HCI_LE_PHY_CODED                 (3)
+ */
+uint8_t
+ble_ll_ctrl_phy_from_phy_mask(uint8_t phy_mask)
+{
+    uint8_t phy;
+
+    /*
+     * NOTE: wipe out unsupported PHYs. There should not be an unsupported
+     * in this mask if the other side is working correctly.
+     */
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    phy_mask &= ~BLE_HCI_LE_PHY_2M_PREF_MASK;
+#endif
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    phy_mask &= ~BLE_HCI_LE_PHY_CODED_PREF_MASK;
+#endif
+
+    if (phy_mask & BLE_PHY_MASK_1M) {
+        phy = BLE_PHY_1M;
+        phy_mask &= ~BLE_PHY_MASK_1M;
+    } else if (phy_mask & BLE_PHY_MASK_2M) {
+        phy = BLE_PHY_2M;
+        phy_mask &= ~BLE_PHY_MASK_2M;
+    } else if (phy_mask & BLE_PHY_MASK_CODED) {
+        phy = BLE_PHY_CODED;
+        phy_mask &= ~BLE_PHY_MASK_CODED;
+    } else {
+        phy = 0;
+    }
+
+    if (phy_mask != 0) {
+        phy = 0;
+    }
+
+    return phy;
+}
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+uint8_t
+ble_ll_ctrl_phy_tx_transition_get(uint8_t phy_mask)
+{
+    /*
+     * Evaluate PHYs in transition starting from the one with longest TX time
+     * so we select the one that allows shortest payload to be sent. This is
+     * to make sure we do not violate timing restriction on new PHY.
+     */
+    if (phy_mask & BLE_PHY_MASK_CODED) {
+        return BLE_PHY_CODED;
+    } else if (phy_mask & BLE_PHY_MASK_1M) {
+        return BLE_PHY_1M;
+    } else if (phy_mask & BLE_PHY_MASK_2M) {
+        return BLE_PHY_2M;
+    }
+
+    return 0;
+}
+
+void
+ble_ll_ctrl_phy_update_proc_complete(struct ble_ll_conn_sm *connsm)
+{
+    int chk_proc_stop;
+    int chk_host_phy;
+
+    chk_proc_stop = 1;
+    chk_host_phy = 1;
+
+    connsm->phy_tx_transition = 0;
+
+    if (CONN_F_PEER_PHY_UPDATE(connsm)) {
+        CONN_F_PEER_PHY_UPDATE(connsm) = 0;
+    } else if (CONN_F_CTRLR_PHY_UPDATE(connsm)) {
+        CONN_F_CTRLR_PHY_UPDATE(connsm) = 0;
+    } else {
+        /* Must be a host-initiated update */
+        CONN_F_HOST_PHY_UPDATE(connsm) = 0;
+        chk_host_phy = 0;
+        if (CONN_F_PHY_UPDATE_EVENT(connsm) == 0) {
+            ble_ll_hci_ev_phy_update(connsm, BLE_ERR_SUCCESS);
+        }
+    }
+
+    /* Must check if we need to start host procedure */
+    if (chk_host_phy) {
+        if (CONN_F_HOST_PHY_UPDATE(connsm)) {
+            if (ble_ll_conn_chk_phy_upd_start(connsm)) {
+                CONN_F_HOST_PHY_UPDATE(connsm) = 0;
+            } else {
+                chk_proc_stop = 0;
+            }
+        }
+    }
+
+    if (chk_proc_stop) {
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE);
+    }
+}
+
+/**
+ *
+ *  There is probably a better way for the controller to choose which PHY use.
+ *  There are no BER metrics and RSSI does not give you S/N so for now we will
+ *  choose this heirarchy:
+ *     -> if 2Mbps available, use it.
+ *     -> If 1Mbps available, use it.
+ *     -> otherwise use coded phy.
+ *
+ * @param prefs The mask of preferred phys
+ * @return uint8_t The phy to use (not a mask)
+ */
+static uint8_t
+ble_ll_ctrl_find_new_phy(uint8_t phy_mask_prefs)
+{
+    uint8_t new_phy;
+
+    new_phy = phy_mask_prefs;
+    if (new_phy) {
+        if (new_phy & BLE_PHY_MASK_2M) {
+            new_phy = BLE_PHY_2M;
+        } else if (new_phy & BLE_PHY_MASK_1M) {
+            new_phy = BLE_PHY_1M;
+        } else {
+            new_phy = BLE_PHY_CODED;
+        }
+    }
+
+    return new_phy;
+}
+
+/**
+ * Create a LL_PHY_UPDATE_IND pdu
+ *
+ * @param connsm Pointer to connection state machine
+ * @param dptr Pointer to PHY_REQ or PHY_RSP data.
+ * @param ctrdata: Pointer to where CtrData of UPDATE_IND pdu starts
+ * @param slave_req flag denoting if slave requested this. 0: no 1:yes
+ */
+static void
+ble_ll_ctrl_phy_update_ind_make(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                                uint8_t *ctrdata, int slave_req)
+{
+    uint8_t m_to_s;
+    uint8_t s_to_m;
+    uint8_t tx_phys;
+    uint8_t rx_phys;
+    uint16_t instant;
+    uint8_t is_slave_sym = 0;
+
+    /* Get preferences from PDU */
+    tx_phys = dptr[0];
+    rx_phys = dptr[1];
+
+    /* If we are master, check if slave requested symmetric PHY */
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        is_slave_sym = tx_phys == rx_phys;
+        is_slave_sym &= __builtin_popcount(tx_phys) == 1;
+    }
+
+    /* Get m_to_s and s_to_m masks */
+    if (slave_req) {
+        m_to_s = connsm->phy_data.host_pref_tx_phys_mask & rx_phys;
+        s_to_m = connsm->phy_data.host_pref_rx_phys_mask & tx_phys;
+    } else {
+        m_to_s = connsm->phy_data.req_pref_tx_phys_mask & rx_phys;
+        s_to_m = connsm->phy_data.req_pref_rx_phys_mask & tx_phys;
+    }
+
+    if (is_slave_sym) {
+        /*
+         * If either s_to_m or m_to_s is 0, it means for at least one direction
+         * requested PHY is not our preferred one so make sure we keep current
+         * PHY in both directions
+         *
+         * Core 5.2, Vol 6, PartB, 5.1.10
+         *     If the slave specified a single PHY in both the TX_PHYS and
+         *     RX_PHYS fields and both fields are the same, the master shall
+         *     either select the PHY specified by the slave for both directions
+         *     or shall leave both directions unchanged.
+         */
+        if ((s_to_m == 0) || (m_to_s == 0)) {
+            s_to_m = 0;
+            m_to_s = 0;
+        } else {
+            BLE_LL_ASSERT(s_to_m == m_to_s);
+        }
+    }
+
+    /* Calculate new PHYs to use */
+    m_to_s = ble_ll_ctrl_find_new_phy(m_to_s);
+    s_to_m = ble_ll_ctrl_find_new_phy(s_to_m);
+
+    /* Make sure we do not indicate PHY change if the same as current one */
+    if (m_to_s == connsm->phy_data.cur_tx_phy) {
+        m_to_s = 0;
+    }
+    if (s_to_m == connsm->phy_data.cur_rx_phy) {
+        s_to_m = 0;
+    }
+
+    /* At this point, m_to_s and s_to_m are not masks; they are numeric */
+
+    /*
+     * If not changing we still send update ind. Check if hosts expects
+     * the event and if so send it. Stop control procedure if it is the
+     * one running.
+     */
+    if ((m_to_s == 0) && (s_to_m == 0)) {
+        if (CONN_F_PEER_PHY_UPDATE(connsm)) {
+            CONN_F_PEER_PHY_UPDATE(connsm) = 0;
+        } else if (CONN_F_CTRLR_PHY_UPDATE(connsm)) {
+            CONN_F_CTRLR_PHY_UPDATE(connsm) = 0;
+            ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE);
+        } else {
+            ble_ll_hci_ev_phy_update(connsm, BLE_ERR_SUCCESS);
+            CONN_F_HOST_PHY_UPDATE(connsm) = 0;
+            ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE);
+        }
+        instant = 0;
+    } else {
+        /* Determine instant we will use. 6 more is minimum */
+        instant = connsm->event_cntr + connsm->slave_latency + 6 + 1;
+        connsm->phy_instant = instant;
+        CONN_F_PHY_UPDATE_SCHED(connsm) = 1;
+
+        /* Set new phys to use when instant occurs */
+        connsm->phy_data.new_tx_phy = m_to_s;
+        connsm->phy_data.new_rx_phy = s_to_m;
+
+        /* Convert m_to_s and s_to_m to masks */
+        if (m_to_s) {
+            m_to_s = 1 << (m_to_s - 1);
+        }
+
+        if (s_to_m) {
+            s_to_m = 1 << (s_to_m - 1);
+        }
+    }
+
+    ctrdata[0] = m_to_s;
+    ctrdata[1] = s_to_m;
+    put_le16(ctrdata + 2, instant);
+}
+
+/**
+ * Create a LL_PHY_REQ or LL_PHY_RSP pdu
+ *
+ * @param connsm Pointer to connection state machine
+ * @param ctrdata: Pointer to where CtrData starts in pdu
+ */
+static void
+ble_ll_ctrl_phy_req_rsp_make(struct ble_ll_conn_sm *connsm, uint8_t *ctrdata)
+{
+    /* If no preference we use current phy */
+    if (connsm->phy_data.host_pref_tx_phys_mask == 0) {
+        ctrdata[0] = CONN_CUR_TX_PHY_MASK(connsm);
+    } else {
+        ctrdata[0] = connsm->phy_data.host_pref_tx_phys_mask;
+    }
+    if (connsm->phy_data.host_pref_rx_phys_mask == 0) {
+        ctrdata[1] = CONN_CUR_RX_PHY_MASK(connsm);
+    } else {
+        ctrdata[1] = connsm->phy_data.host_pref_rx_phys_mask;
+    }
+}
+
+static uint8_t
+ble_ll_ctrl_rx_phy_req(struct ble_ll_conn_sm *connsm, uint8_t *req,
+                       uint8_t *rsp)
+{
+    uint8_t rsp_opcode;
+    uint8_t err;
+
+    /*
+     * XXX: TODO if we have an instant in progress we should end connection.
+     * At least it seems that is the case. Need to figure out more from
+     * the spec here.
+     */
+
+    /* Check if we have already initiated a procedure with an instant */
+    err = ble_ll_ctrl_proc_with_instant_initiated(connsm,
+                                                  BLE_LL_CTRL_PROC_PHY_UPDATE);
+
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        if (err) {
+            ble_ll_ctrl_rej_ext_ind_make(BLE_LL_CTRL_PHY_REQ, err, rsp);
+            rsp_opcode = BLE_LL_CTRL_REJECT_IND_EXT;
+        } else {
+            /*
+             * NOTE: do not change order of these two lines as the call to
+             * make the LL_PHY_UPDATE_IND pdu might clear the flag.
+             */
+            CONN_F_PEER_PHY_UPDATE(connsm) = 1;
+            ble_ll_ctrl_phy_update_ind_make(connsm, req, rsp, 1);
+            rsp_opcode = BLE_LL_CTRL_PHY_UPDATE_IND;
+        }
+    } else {
+        /* XXX: deal with other control procedures that we need to stop */
+        if (err) {
+            if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_PHY_UPDATE) {
+                ble_npl_callout_stop(&connsm->ctrl_proc_rsp_timer);
+                connsm->cur_ctrl_proc = BLE_LL_CTRL_PROC_IDLE;
+            }
+
+            /* If there is a PHY update procedure pending cancel it */
+            ble_ll_ctrl_phy_update_cancel(connsm, err);
+
+            /* XXX: ? Should not be any phy update events */
+            CONN_F_PHY_UPDATE_EVENT(connsm) = 0;
+        }
+
+        /* XXX: TODO: if we started another procedure with an instant
+         * why are we doing this? Need to look into this.*/
+
+        /* Respond to master's phy update procedure */
+        CONN_F_PEER_PHY_UPDATE(connsm) = 1;
+        ble_ll_ctrl_phy_req_rsp_make(connsm, rsp);
+        rsp_opcode = BLE_LL_CTRL_PHY_RSP;
+
+        connsm->phy_tx_transition = ble_ll_ctrl_phy_tx_transition_get(req[1] | rsp[0]);
+
+        /* Start response timer */
+        connsm->cur_ctrl_proc = BLE_LL_CTRL_PROC_PHY_UPDATE;
+        ble_ll_ctrl_start_rsp_timer(connsm);
+    }
+    return rsp_opcode;
+}
+
+/**
+ * Process a received LL_PHY_RSP pdu
+ *
+ * @param connsm
+ * @param dptr Pointer to LL_PHY_RSP ctrdata
+ * @param rsp Pointer to CtrData of PHY_UPDATE_IND.
+ *
+ * @return uint8_t
+ */
+static uint8_t
+ble_ll_ctrl_rx_phy_rsp(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                       uint8_t *rsp)
+{
+    uint8_t rsp_opcode;
+
+    rsp_opcode = BLE_ERR_MAX;
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_PHY_UPDATE) {
+            ble_ll_ctrl_phy_update_ind_make(connsm, dptr, rsp, 0);
+            ble_npl_callout_stop(&connsm->ctrl_proc_rsp_timer);
+            rsp_opcode = BLE_LL_CTRL_PHY_UPDATE_IND;
+        }
+
+        /*
+         * If not in the process of doing this control procedure something
+         * is wrong. End connection? Assert?
+         *
+         * XXX: TODO count some stat?
+         */
+    } else {
+        rsp_opcode = BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    /* NOTE: slave should never receive one of these */
+
+    return rsp_opcode;
+}
+
+/**
+ * Called when a LL_PHY_UPDATE_IND pdu is received
+ *
+ * NOTE: slave is the only device that should receive this.
+ *
+ * @param connsm
+ * @param dptr
+ *
+ * @return uint8_t
+ */
+static uint8_t
+ble_ll_ctrl_rx_phy_update_ind(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    int no_change;
+    uint8_t new_m_to_s_mask;
+    uint8_t new_s_to_m_mask;
+    uint8_t new_tx_phy;
+    uint8_t new_rx_phy;
+    uint16_t instant;
+    uint16_t delta;
+
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        return BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    /*
+     * Reception stops the procedure response timer but does not
+     * complete the procedure
+     */
+    if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_PHY_UPDATE) {
+        ble_npl_callout_stop(&connsm->ctrl_proc_rsp_timer);
+    }
+
+    /*
+     * XXX: Should we check to see if we are expecting to receive one
+     * of these, and if not, kill connection? Meaning we better be
+     * doing either a PEER, CTRLR, or HOST phy update.
+     */
+    /* get the new phy masks and see if we need to change */
+    new_m_to_s_mask = dptr[0];
+    new_s_to_m_mask = dptr[1];
+    instant = get_le16(dptr + 2);
+
+    if ((new_m_to_s_mask == 0) && (new_s_to_m_mask == 0)) {
+        /* No change in phy */
+        no_change = 1;
+    } else {
+        no_change = 0;
+        /*
+         * NOTE: from the slaves perspective, the m to s phy is the one
+         * that the slave will receive on; s to m is the one it will
+         * transmit on
+         */
+        new_rx_phy = ble_ll_ctrl_phy_from_phy_mask(new_m_to_s_mask);
+        new_tx_phy = ble_ll_ctrl_phy_from_phy_mask(new_s_to_m_mask);
+
+        if ((new_tx_phy == 0) && (new_rx_phy == 0)) {
+            /* XXX: this is an error! What to do??? */
+            no_change = 1;
+        }
+
+        if ((new_tx_phy == connsm->phy_data.cur_tx_phy) &&
+            (new_rx_phy == connsm->phy_data.cur_rx_phy)) {
+            no_change = 1;
+        }
+    }
+
+    if (!no_change) {
+        /* If instant is in the past, we have to end the connection */
+        delta = (instant - connsm->event_cntr) & 0xFFFF;
+        if (delta >= 32767) {
+            ble_ll_conn_timeout(connsm, BLE_ERR_INSTANT_PASSED);
+        } else {
+            connsm->phy_data.new_tx_phy = new_tx_phy;
+            connsm->phy_data.new_rx_phy = new_rx_phy;
+            connsm->phy_instant = instant;
+            CONN_F_PHY_UPDATE_SCHED(connsm) = 1;
+        }
+        return BLE_ERR_MAX;
+    }
+
+    ble_ll_ctrl_phy_update_proc_complete(connsm);
+
+    return BLE_ERR_MAX;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+/**
+ * Called when a BLE_LL_CTRL_PERIODIC_SYNC_IND PDU is received
+ *
+ * @param connsm
+ * @param dptr
+ *
+ * @return uint8_t
+ */
+static uint8_t
+ble_ll_ctrl_rx_periodic_sync_ind(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    if (connsm->sync_transfer_mode) {
+        ble_ll_sync_periodic_ind(connsm, dptr, connsm->sync_transfer_mode == 1,
+                                 connsm->sync_transfer_skip,
+                                 connsm->sync_transfer_sync_timeout);
+    }
+
+    return BLE_ERR_MAX;
+}
+#endif
+
+/**
+ * Create a link layer length request or length response PDU.
+ *
+ * NOTE: this function does not set the LL data pdu header nor does it
+ * set the opcode in the buffer.
+ *
+ * @param connsm
+ * @param dptr: Pointer to where control pdu payload starts
+ */
+static void
+ble_ll_ctrl_datalen_upd_make(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    put_le16(dptr + 1, connsm->max_rx_octets);
+    put_le16(dptr + 3, connsm->max_rx_time);
+    put_le16(dptr + 5, connsm->max_tx_octets);
+    put_le16(dptr + 7, connsm->max_tx_time);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+void
+ble_ll_calc_session_key(struct ble_ll_conn_sm *connsm)
+{
+#ifdef BLE_LL_ENCRYPT_DEBUG
+    int cnt;
+#endif
+
+    /* XXX: possibly have some way out of this if this locks up */
+    while (1) {
+        if (!ble_hw_encrypt_block(&connsm->enc_data.enc_block)) {
+            break;
+        }
+    }
+
+#ifdef BLE_LL_ENCRYPT_DEBUG
+    console_printf("Calculating Session Key for handle=%u",
+                   connsm->conn_handle);
+
+    console_printf("\nLTK:");
+    for (cnt = 0; cnt < 16; ++cnt) {
+        console_printf("%02x", connsm->enc_data.enc_block.key[cnt]);
+    }
+    console_printf("\nSKD:");
+    for (cnt = 0; cnt < 16; ++cnt) {
+        console_printf("%02x", connsm->enc_data.enc_block.plain_text[cnt]);
+    }
+    console_printf("\nSession Key:");
+    for (cnt = 0; cnt < 16; ++cnt) {
+        console_printf("%02x", connsm->enc_data.enc_block.cipher_text[cnt]);
+    }
+    console_printf("\nIV:");
+    for (cnt = 0; cnt < 8; ++ cnt) {
+        console_printf("%02x", connsm->enc_data.iv[cnt]);
+    }
+    console_printf("\n");
+#endif
+}
+
+/**
+ * Called to determine if this is a control PDU we are allowed to send. This
+ * is called when a link is being encrypted, as only certain control PDU's
+ * area lowed to be sent.
+ *
+ * XXX: the current code may actually allow some control pdu's to be sent
+ * in states where they shouldnt. I dont expect those states to occur so I
+ * dont try to check for them but we could do more... for example there are
+ * different PDUs allowed for master/slave and TX/RX
+ *
+ * @param llid
+ * @param opcode
+ * @param len
+ *
+ * @return int
+ */
+static int
+ble_ll_ctrl_enc_allowed_pdu(uint8_t llid, uint8_t len, uint8_t opcode)
+{
+    int allowed;
+
+    allowed = 0;
+
+    switch (llid) {
+    case BLE_LL_LLID_CTRL:
+        switch (opcode) {
+        case BLE_LL_CTRL_REJECT_IND:
+        case BLE_LL_CTRL_REJECT_IND_EXT:
+        case BLE_LL_CTRL_START_ENC_RSP:
+        case BLE_LL_CTRL_START_ENC_REQ:
+        case BLE_LL_CTRL_ENC_REQ:
+        case BLE_LL_CTRL_ENC_RSP:
+        case BLE_LL_CTRL_PAUSE_ENC_REQ:
+        case BLE_LL_CTRL_PAUSE_ENC_RSP:
+        case BLE_LL_CTRL_TERMINATE_IND:
+            allowed = 1;
+            break;
+        }
+        break;
+    case BLE_LL_LLID_DATA_FRAG:
+        if (len == 0) {
+            /* Empty PDUs are allowed */
+            allowed = 1;
+        }
+        break;
+    }
+
+    return allowed;
+}
+
+int
+ble_ll_ctrl_enc_allowed_pdu_rx(struct os_mbuf *rxpdu)
+{
+    uint8_t llid;
+    uint8_t len;
+    uint8_t opcode;
+
+    llid = rxpdu->om_data[0] & BLE_LL_DATA_HDR_LLID_MASK;
+    len = rxpdu->om_data[1];
+    if (llid == BLE_LL_LLID_CTRL) {
+        opcode = rxpdu->om_data[2];
+    } else {
+        opcode = 0;
+    }
+
+    return ble_ll_ctrl_enc_allowed_pdu(llid, len, opcode);
+}
+
+int
+ble_ll_ctrl_enc_allowed_pdu_tx(struct os_mbuf_pkthdr *pkthdr)
+{
+    struct os_mbuf *m;
+    struct ble_mbuf_hdr *ble_hdr;
+    uint8_t llid;
+    uint8_t len;
+    uint8_t opcode;
+
+    m = OS_MBUF_PKTHDR_TO_MBUF(pkthdr);
+    ble_hdr = BLE_MBUF_HDR_PTR(m);
+
+    llid = ble_hdr->txinfo.hdr_byte & BLE_LL_DATA_HDR_LLID_MASK;
+    len = ble_hdr->txinfo.pyld_len;
+    if (llid == BLE_LL_LLID_CTRL) {
+        opcode = m->om_data[0];
+    } else {
+        opcode = 0;
+    }
+
+    return ble_ll_ctrl_enc_allowed_pdu(llid, len, opcode);
+}
+
+int
+ble_ll_ctrl_is_start_enc_rsp(struct os_mbuf *txpdu)
+{
+    int is_start_enc_rsp;
+    uint8_t opcode;
+    uint8_t llid;
+    struct ble_mbuf_hdr *ble_hdr;
+
+    is_start_enc_rsp = 0;
+    ble_hdr = BLE_MBUF_HDR_PTR(txpdu);
+
+    llid = ble_hdr->txinfo.hdr_byte & BLE_LL_DATA_HDR_LLID_MASK;
+    if (llid == BLE_LL_LLID_CTRL) {
+        opcode = txpdu->om_data[0];
+        if (opcode == BLE_LL_CTRL_START_ENC_RSP) {
+            is_start_enc_rsp = 1;
+        }
+    }
+
+    return is_start_enc_rsp;
+}
+
+/**
+ * Called to create and send a LL_START_ENC_REQ
+ *
+ * @param connsm
+ * @param err
+ *
+ * @return int
+ */
+int
+ble_ll_ctrl_start_enc_send(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+    struct os_mbuf *om;
+
+    om = os_msys_get_pkthdr(BLE_LL_CTRL_MAX_PDU_LEN,
+                            sizeof(struct ble_mbuf_hdr));
+    if (om) {
+        om->om_data[0] = BLE_LL_CTRL_START_ENC_REQ;
+        ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL, 1);
+
+        /* Wait for LL_START_ENC_RSP. If there is already procedure in progress,
+         * LL response timer is already running.
+         */
+        if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_IDLE) {
+            connsm->cur_ctrl_proc = BLE_LL_CTRL_PROC_ENCRYPT;
+            ble_ll_ctrl_start_rsp_timer(connsm);
+        }
+
+        rc = 0;
+    } else {
+        rc = -1;
+    }
+    return rc;
+}
+
+/**
+ * Create a link layer control "encrypt request" PDU.
+ *
+ * The LL_ENC_REQ PDU format is:
+ *      Rand    (8)
+ *      EDIV    (2)
+ *      SKDm    (8)
+ *      IVm     (4)
+ *
+ * The random number and encrypted diversifier come from the host command.
+ * Controller generates master portion of SDK and IV.
+ *
+ * NOTE: this function does not set the LL data pdu header nor does it
+ * set the opcode in the buffer.
+ *
+ * @param connsm
+ * @param dptr: Pointer to where control pdu payload starts
+ */
+static void
+ble_ll_ctrl_enc_req_make(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    put_le64(dptr, connsm->enc_data.host_rand_num);
+    put_le16(dptr + 8, connsm->enc_data.enc_div);
+
+#ifdef BLE_LL_ENCRYPT_USE_TEST_DATA
+    /* IV stored LSB to MSB, IVm is LSB, IVs is MSB */
+    put_le64(dptr + 10, g_bletest_SKDm);
+    swap_buf(connsm->enc_data.enc_block.plain_text + 8, dptr + 10, 8);
+    put_le32(dptr + 18, g_bletest_IVm);
+    memcpy(connsm->enc_data.iv, dptr + 18, 4);
+    return;
+#endif
+
+    ble_ll_rand_data_get(connsm->enc_data.enc_block.plain_text + 8, 8);
+    swap_buf(dptr + 10, connsm->enc_data.enc_block.plain_text + 8, 8);
+    ble_ll_rand_data_get(connsm->enc_data.iv, 4);
+    memcpy(dptr + 18, connsm->enc_data.iv, 4);
+}
+
+/**
+ * Called when LL_ENC_RSP is received by the master.
+ *
+ * Context: Link Layer Task.
+ *
+ * Format of the LL_ENC_RSP is:
+ *      SKDs (8)
+ *      IVs  (4)
+ *
+ *  The master now has the long term key (from the start encrypt command)
+ *  and the SKD (stored in the plain text encryption block). From this the
+ *  sessionKey is generated.
+ *
+ * @param connsm
+ * @param dptr
+ */
+static void
+ble_ll_ctrl_rx_enc_rsp(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    /* Calculate session key now that we have received the ENC_RSP */
+    if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_ENCRYPT) {
+        /* In case we were already encrypted we need to reset packet counters */
+        connsm->enc_data.rx_pkt_cntr = 0;
+        connsm->enc_data.tx_pkt_cntr = 0;
+        connsm->enc_data.tx_encrypted = 0;
+
+        swap_buf(connsm->enc_data.enc_block.plain_text, dptr, 8);
+        memcpy(connsm->enc_data.iv + 4, dptr + 8, 4);
+        ble_ll_calc_session_key(connsm);
+        connsm->enc_data.enc_state = CONN_ENC_S_START_ENC_REQ_WAIT;
+    }
+}
+
+/**
+ * Called when we have received a LL control encryption request PDU. This
+ * should only be received by a slave.
+ *
+ * The LL_ENC_REQ PDU format is:
+ *      Rand    (8)
+ *      EDIV    (2)
+ *      SKDm    (8)
+ *      IVm     (4)
+ *
+ * This function returns the response opcode. Typically this will be ENC_RSP
+ * but it could be a reject ind. Note that the caller of this function
+ * will send the REJECT_IND_EXT if supported by remote.
+ *
+ * NOTE: if this is received by a master we will silently discard the PDU
+ * (denoted by return BLE_ERR_MAX).
+ *
+ * @param connsm
+ * @param dptr      Pointer to start of encrypt request data.
+ * @param rspbuf
+ */
+static uint8_t
+ble_ll_ctrl_rx_enc_req(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                       uint8_t *rspdata)
+{
+    if (connsm->conn_role != BLE_LL_CONN_ROLE_SLAVE) {
+        return BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    connsm->enc_data.enc_state = CONN_ENC_S_LTK_REQ_WAIT;
+
+    /* In case we were already encrypted we need to reset packet counters */
+    connsm->enc_data.rx_pkt_cntr = 0;
+    connsm->enc_data.tx_pkt_cntr = 0;
+    connsm->enc_data.tx_encrypted = 0;
+
+    /* Extract information from request */
+    connsm->enc_data.host_rand_num = get_le64(dptr);
+    connsm->enc_data.enc_div = get_le16(dptr + 8);
+
+#if BLE_LL_ENCRYPT_USE_TEST_DATA
+    swap_buf(connsm->enc_data.enc_block.plain_text + 8, dptr + 10, 8);
+    memcpy(connsm->enc_data.iv, dptr + 18, 4);
+
+    put_le64(rspdata, g_bletest_SKDs);
+    swap_buf(connsm->enc_data.enc_block.plain_text, rspdata, 8);
+    put_le32(rspdata + 8, g_bletest_IVs);
+    memcpy(connsm->enc_data.iv + 4, rspdata + 8, 4);
+    return BLE_LL_CTRL_ENC_RSP;
+#endif
+
+    swap_buf(connsm->enc_data.enc_block.plain_text + 8, dptr + 10, 8);
+    memcpy(connsm->enc_data.iv, dptr + 18, 4);
+
+    /* Create the ENC_RSP. Concatenate our SKD and IV */
+    ble_ll_rand_data_get(connsm->enc_data.enc_block.plain_text, 8);
+    swap_buf(rspdata, connsm->enc_data.enc_block.plain_text, 8);
+    ble_ll_rand_data_get(connsm->enc_data.iv + 4, 4);
+    memcpy(rspdata + 8, connsm->enc_data.iv + 4, 4);
+
+    return BLE_LL_CTRL_ENC_RSP;
+}
+
+static uint8_t
+ble_ll_ctrl_rx_start_enc_req(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+
+    /* Only master should receive start enc request */
+    rc = BLE_ERR_MAX;
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        /* We only want to send a START_ENC_RSP if we havent yet */
+        if (connsm->enc_data.enc_state == CONN_ENC_S_START_ENC_REQ_WAIT) {
+            connsm->enc_data.enc_state = CONN_ENC_S_START_ENC_RSP_WAIT;
+            rc = BLE_LL_CTRL_START_ENC_RSP;
+        }
+    } else {
+        rc = BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+    return rc;
+}
+
+static uint8_t
+ble_ll_ctrl_rx_pause_enc_req(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+
+    /*
+     * The spec does not say what to do here, but if we receive a pause
+     * encryption request and we are not encrypted, what do we do? We
+     * ignore it...
+     */
+    rc = BLE_ERR_MAX;
+    if ((connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) &&
+        (connsm->enc_data.enc_state == CONN_ENC_S_ENCRYPTED)) {
+        rc = BLE_LL_CTRL_PAUSE_ENC_RSP;
+    } else {
+        rc = BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    return rc;
+}
+
+/**
+ * Called when a LL control pdu with opcode PAUSE_ENC_RSP is received.
+ *
+ *
+ * @param connsm
+ *
+ * @return uint8_t
+ */
+static uint8_t
+ble_ll_ctrl_rx_pause_enc_rsp(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        rc = BLE_LL_CTRL_PAUSE_ENC_RSP;
+    } else if (connsm->enc_data.enc_state == CONN_ENC_S_PAUSE_ENC_RSP_WAIT) {
+        /* Master sends back unencrypted LL_PAUSE_ENC_RSP.
+         * From this moment encryption is paused.
+         */
+        rc = BLE_ERR_MAX;
+        connsm->enc_data.enc_state = CONN_ENC_S_PAUSED;
+    } else {
+        rc = BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    return rc;
+}
+
+/**
+ * Called when we have received a LL_CTRL_START_ENC_RSP.
+ *
+ * Context: Link-layer task
+ *
+ * @param connsm
+ *
+ * @return uint8_t
+ */
+static uint8_t
+ble_ll_ctrl_rx_start_enc_rsp(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+
+    /* Not in proper state. Discard */
+    if (connsm->enc_data.enc_state != CONN_ENC_S_START_ENC_RSP_WAIT) {
+        return BLE_ERR_MAX;
+    }
+
+    /* If master, we are done. Stop control procedure and sent event to host */
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
+
+        /* We are encrypted */
+        connsm->enc_data.enc_state = CONN_ENC_S_ENCRYPTED;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+        ble_ll_conn_auth_pyld_timer_start(connsm);
+#endif
+        rc = BLE_ERR_MAX;
+    } else {
+        /* Procedure has completed but slave needs to send START_ENC_RSP */
+        rc = BLE_LL_CTRL_START_ENC_RSP;
+
+        /* Stop timer if it was started when sending START_ENC_REQ */
+        if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_ENCRYPT) {
+            ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
+        }
+    }
+
+    /*
+     * XXX: for now, a Slave sends this event when it receivest the
+     * START_ENC_RSP from the master. It might be technically incorrect
+     * to send it before we transmit our own START_ENC_RSP.
+     */
+    ble_ll_hci_ev_encrypt_chg(connsm, BLE_ERR_SUCCESS);
+
+    return rc;
+}
+
+#endif
+
+/**
+ * Called to make a connection parameter request or response control pdu.
+ *
+ * @param connsm
+ * @param dptr Pointer to start of data. NOTE: the opcode is not part
+ *             of the data.
+ */
+static void
+ble_ll_ctrl_conn_param_pdu_make(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                                struct ble_ll_conn_params *req)
+{
+    uint16_t offset;
+    struct hci_conn_update *hcu;
+
+    /* If we were passed in a request, we use the parameters from the request */
+    if (req) {
+        put_le16(dptr, req->interval_min);
+        put_le16(dptr + 2, req->interval_max);
+        put_le16(dptr + 4, req->latency);
+        put_le16(dptr + 6, req->timeout);
+    } else {
+        hcu = &connsm->conn_param_req;
+        /* The host should have provided the parameters! */
+        BLE_LL_ASSERT(hcu->handle != 0);
+        put_le16(dptr, hcu->conn_itvl_min);
+        put_le16(dptr + 2, hcu->conn_itvl_max);
+        put_le16(dptr + 4, hcu->conn_latency);
+        put_le16(dptr + 6, hcu->supervision_timeout);
+    }
+
+    /* XXX: NOTE: if interval min and interval max are != to each
+     * other this value should be set to non-zero. I think this
+     * applies only when an offset field is set. See section 5.1.7.1 pg 103
+     * Vol 6 Part B.
+     */
+    /* XXX: for now, set periodicity to 0 */
+    dptr[8] = 0;
+
+    /* XXX: deal with reference event count. what to put here? */
+    put_le16(dptr + 9, connsm->event_cntr);
+
+    /* XXX: For now, dont use offsets */
+    offset = 0xFFFF;
+    put_le16(dptr + 11, offset);
+    put_le16(dptr + 13, offset);
+    put_le16(dptr + 15, offset);
+    put_le16(dptr + 17, offset);
+    put_le16(dptr + 19, offset);
+    put_le16(dptr + 21, offset);
+}
+
+static void
+ble_ll_ctrl_version_ind_make(struct ble_ll_conn_sm *connsm, uint8_t *pyld)
+{
+    /* Set flag to denote we have sent/received this */
+    connsm->csmflags.cfbit.version_ind_sent = 1;
+
+    /* Fill out response */
+    pyld[0] = BLE_HCI_VER_BCS;
+    put_le16(pyld + 1, MYNEWT_VAL(BLE_LL_MFRG_ID));
+    put_le16(pyld + 3, BLE_LL_SUB_VERS_NR);
+}
+
+/**
+ * Called to make a LL control channel map request PDU.
+ *
+ * @param connsm    Pointer to connection state machine
+ * @param pyld      Pointer to payload of LL control PDU
+ */
+static void
+ble_ll_ctrl_chanmap_req_make(struct ble_ll_conn_sm *connsm, uint8_t *pyld)
+{
+    /* Copy channel map that host desires into request */
+    memcpy(pyld, g_ble_ll_conn_params.master_chan_map, BLE_LL_CONN_CHMAP_LEN);
+    memcpy(connsm->req_chanmap, pyld, BLE_LL_CONN_CHMAP_LEN);
+
+    /* Place instant into request */
+    connsm->chanmap_instant = connsm->event_cntr + connsm->slave_latency + 6 + 1;
+    put_le16(pyld + BLE_LL_CONN_CHMAP_LEN, connsm->chanmap_instant);
+
+    /* Set scheduled flag */
+    connsm->csmflags.cfbit.chanmap_update_scheduled = 1;
+}
+
+/**
+ * Called to respond to a LL control PDU connection parameter request or
+ * response.
+ *
+ * @param connsm
+ * @param rsp
+ * @param req
+ *
+ * @return uint8_t
+ */
+uint8_t
+ble_ll_ctrl_conn_param_reply(struct ble_ll_conn_sm *connsm, uint8_t *rsp,
+                             struct ble_ll_conn_params *req)
+{
+    uint8_t rsp_opcode;
+
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+        /* Create a connection parameter response */
+        ble_ll_ctrl_conn_param_pdu_make(connsm, rsp + 1, req);
+        rsp_opcode = BLE_LL_CTRL_CONN_PARM_RSP;
+    } else {
+        /* Create a connection update pdu */
+        ble_ll_ctrl_conn_upd_make(connsm, rsp + 1, req);
+        rsp_opcode = BLE_LL_CTRL_CONN_UPDATE_IND;
+    }
+
+    return rsp_opcode;
+}
+
+/**
+ * Called when we have received a LL_REJECT_IND or LL_REJECT_IND_EXT link
+ * layer control Data Channel pdu.
+ *
+ * @param connsm
+ * @param dptr
+ * @param opcode
+ */
+static int
+ble_ll_ctrl_rx_reject_ind(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                          uint8_t opcode, uint8_t *rspdata)
+{
+    uint8_t ble_error;
+    uint8_t rsp_opcode = BLE_ERR_MAX;
+
+    /* Get error out of received PDU */
+    if (opcode == BLE_LL_CTRL_REJECT_IND) {
+        ble_error = dptr[0];
+    } else {
+        ble_error = dptr[1];
+    }
+
+    /* XXX: should I check to make sure the rejected opcode is sane
+       if we receive ind ext? */
+    switch (connsm->cur_ctrl_proc) {
+    case BLE_LL_CTRL_PROC_CONN_PARAM_REQ:
+        if (opcode == BLE_LL_CTRL_REJECT_IND_EXT) {
+            /* As a master we should send connection update indication in this point */
+            if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+                rsp_opcode = BLE_LL_CTRL_CONN_UPDATE_IND;
+                ble_ll_ctrl_conn_upd_make(connsm, rspdata, NULL);
+                connsm->reject_reason = BLE_ERR_SUCCESS;
+            } else {
+                ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ);
+                ble_ll_hci_ev_conn_update(connsm, ble_error);
+            }
+        }
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    case BLE_LL_CTRL_PROC_ENCRYPT:
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
+        ble_ll_hci_ev_encrypt_chg(connsm, ble_error);
+        connsm->enc_data.enc_state = CONN_ENC_S_UNENCRYPTED;
+        break;
+#endif
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    case BLE_LL_CTRL_PROC_PHY_UPDATE:
+        ble_ll_ctrl_phy_update_cancel(connsm, ble_error);
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_PHY_UPDATE);
+        break;
+#endif
+    case BLE_LL_CTRL_PROC_DATA_LEN_UPD:
+        /* That should not happen according to Bluetooth 5.0 Vol6 Part B, 5.1.9
+         * However we need this workaround as there are devices on the market
+         * which do send LL_REJECT on LL_LENGTH_REQ when collision happens
+         */
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD);
+        break;
+    default:
+        break;
+    }
+
+    return rsp_opcode;
+}
+
+/**
+ * Called when we receive a connection update event
+ *
+ * @param connsm
+ * @param dptr
+ *
+ * @return int
+ */
+static int
+ble_ll_ctrl_rx_conn_update(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    uint8_t rsp_opcode;
+    uint16_t conn_events;
+    struct ble_ll_conn_upd_req *reqdata;
+
+    /* Only a slave should receive this */
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        return BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    /* Retrieve parameters */
+    reqdata = &connsm->conn_update_req;
+    reqdata->winsize = dptr[0];
+    reqdata->winoffset = get_le16(dptr + 1);
+    reqdata->interval = get_le16(dptr + 3);
+    reqdata->latency = get_le16(dptr + 5);
+    reqdata->timeout = get_le16(dptr + 7);
+    reqdata->instant = get_le16(dptr + 9);
+
+    /* XXX: validate them at some point. If they dont check out, we
+       return the unknown response */
+    rsp_opcode = BLE_ERR_MAX;
+
+    /* If instant is in the past, we have to end the connection */
+    conn_events = (reqdata->instant - connsm->event_cntr) & 0xFFFF;
+    if (conn_events >= 32767) {
+        ble_ll_conn_timeout(connsm, BLE_ERR_INSTANT_PASSED);
+    } else {
+        connsm->csmflags.cfbit.conn_update_sched = 1;
+
+        /*
+         * Errata says that receiving a connection update when the event
+         * counter is equal to the instant means wesimply ignore the window
+         * offset and window size. Anchor point has already been set based on
+         * first packet received in connection event. Given that we increment
+         * the event counter BEFORE checking to see if the instant is equal to
+         * the event counter what we do here is increment the instant and set
+         * the window offset and size to 0.
+         */
+        if (conn_events == 0) {
+            reqdata->winoffset = 0;
+            reqdata->winsize = 0;
+            reqdata->instant += 1;
+        }
+    }
+
+    return rsp_opcode;
+}
+
+void
+ble_ll_ctrl_initiate_dle(struct ble_ll_conn_sm *connsm)
+{
+    if (!(connsm->conn_features & BLE_LL_FEAT_DATA_LEN_EXT)) {
+        return;
+    }
+
+    /*
+     * Section 4.5.10 Vol 6 PART B. If the max tx/rx time or octets
+     * exceeds the minimum, data length procedure needs to occur
+     */
+    if ((connsm->max_tx_octets <= BLE_LL_CONN_SUPP_BYTES_MIN) &&
+        (connsm->max_rx_octets <= BLE_LL_CONN_SUPP_BYTES_MIN) &&
+        (connsm->max_tx_time <= BLE_LL_CONN_SUPP_TIME_MIN) &&
+        (connsm->max_rx_time <= BLE_LL_CONN_SUPP_TIME_MIN)) {
+        return;
+    }
+
+    ble_ll_ctrl_proc_start(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD);
+}
+
+static void
+ble_ll_ctrl_update_features(struct ble_ll_conn_sm *connsm, uint8_t *feat)
+{
+    connsm->conn_features = feat[0];
+    memcpy(connsm->remote_features, feat + 1, 7);
+
+    /* If we received peer's features for the 1st time, we should try DLE */
+    if (!connsm->csmflags.cfbit.rxd_features) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+        /*
+         * If connection was established on uncoded PHY, by default we use
+         * MaxTxTime and MaxRxTime applicable for that PHY since we are not
+         * allowed to indicate longer supported time if peer does not support
+         * LE Coded PHY. However, once we know that peer does support it we can
+         * update those values to ones applicable for coded PHY.
+         */
+        if (connsm->remote_features[0] & (BLE_LL_FEAT_LE_CODED_PHY >> 8)) {
+            if (connsm->host_req_max_tx_time) {
+                connsm->max_tx_time = max(connsm->max_tx_time,
+                                          connsm->host_req_max_tx_time);
+            } else {
+                connsm->max_tx_time = g_ble_ll_conn_params.conn_init_max_tx_time_coded;
+            }
+            connsm->max_rx_time = BLE_LL_CONN_SUPP_TIME_MAX_CODED;
+        }
+#endif
+
+        connsm->csmflags.cfbit.pending_initiate_dle = 1;
+        connsm->csmflags.cfbit.rxd_features = 1;
+    }
+}
+
+/**
+ * Called when we receive a feature request or a slave initiated feature
+ * request.
+ *
+ *
+ * @param connsm
+ * @param dptr
+ * @param rspbuf
+ * @param opcode
+ * @param new_features
+ *
+ * @return int
+ */
+static int
+ble_ll_ctrl_rx_feature_req(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                           uint8_t *rspbuf, uint8_t opcode)
+{
+    uint8_t rsp_opcode;
+    uint64_t our_feat;
+
+    /*
+     * Only accept slave feature requests if we are a master and feature
+     * requests if we are a slave.
+     */
+    if (opcode ==  BLE_LL_CTRL_SLAVE_FEATURE_REQ) {
+        if (connsm->conn_role != BLE_LL_CONN_ROLE_MASTER) {
+            return BLE_LL_CTRL_UNKNOWN_RSP;
+        }
+    } else {
+        /* XXX: not sure this is correct but do it anyway */
+        if (connsm->conn_role != BLE_LL_CONN_ROLE_SLAVE) {
+            return BLE_LL_CTRL_UNKNOWN_RSP;
+        }
+    }
+
+    our_feat = ble_ll_read_supp_features();
+
+    rsp_opcode = BLE_LL_CTRL_FEATURE_RSP;
+
+    ble_ll_ctrl_update_features(connsm, dptr);
+
+    /*
+     * 1st octet of features should be common features of local and remote
+     * controller - we call this 'connection features'
+     * remaining octets are features of controller which sends PDU, in this case
+     * it's our controller
+     *
+     * See: Vol 6, Part B, section 2.4.2.10
+     */
+    connsm->conn_features &= our_feat;
+
+    put_le64(rspbuf + 1, our_feat);
+    rspbuf[1] = connsm->conn_features;
+
+    return rsp_opcode;
+}
+
+/**
+ * Called when we receive a feature response
+ *
+ * @param connsm
+ * @param dptr
+ * @param new_features
+ *
+ */
+static void
+ble_ll_ctrl_rx_feature_rsp(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    ble_ll_ctrl_update_features(connsm, dptr);
+
+    /* Stop the control procedure */
+    if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG)) {
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_FEATURE_XCHG);
+    }
+
+    /* Send event to host if pending features read */
+    if (connsm->csmflags.cfbit.pending_hci_rd_features) {
+        ble_ll_hci_ev_rd_rem_used_feat(connsm, BLE_ERR_SUCCESS);
+        connsm->csmflags.cfbit.pending_hci_rd_features = 0;
+    }
+}
+
+/**
+ *
+ *
+ * Context: Link Layer task
+ *
+ * @param connsm
+ * @param dptr
+ * @param rspbuf
+ *
+ * @return int
+ */
+static int
+ble_ll_ctrl_rx_conn_param_req(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                              uint8_t *rspbuf)
+{
+    uint8_t rsp_opcode;
+
+    /*
+     * This is not in the specification per se but it simplifies the
+     * implementation. If we get a connection parameter request and we
+     * are awaiting a reply from the host, simply ignore the request. This
+     * might not be a good idea if the parameters are different, but oh
+     * well. This is not expected to happen anyway. A return of BLE_ERR_MAX
+     * means that we will simply discard the connection parameter request
+     */
+    if (connsm->csmflags.cfbit.awaiting_host_reply) {
+        return BLE_ERR_MAX;
+    }
+
+    /* XXX: remember to deal with this on the master: if the slave has
+     * initiated a procedure we may have received its connection parameter
+     * update request and have signaled the host with an event. If that
+     * is the case, we will need to drop the host command when we get it
+       and also clear any applicable states. */
+
+    /* XXX: Read 5.3 again. There are multiple control procedures that might
+     * be pending (a connection update) that will cause collisions and the
+       behavior below. */
+    /*
+     * Check for procedure collision (Vol 6 PartB 5.3). If we are a slave
+     * and we receive a request we "consider the slave initiated
+     * procedure as complete". This means send a connection update complete
+     * event (with error).
+     *
+     * If a master, we send reject with a
+     * transaction collision error code.
+     */
+    if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ)) {
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ);
+            ble_ll_hci_ev_conn_update(connsm, BLE_ERR_LMP_COLLISION);
+        } else {
+            /* The master sends reject ind ext w/error code 0x23 */
+            rsp_opcode = BLE_LL_CTRL_REJECT_IND_EXT;
+            rspbuf[1] = BLE_LL_CTRL_CONN_PARM_REQ;
+            rspbuf[2] = BLE_ERR_LMP_COLLISION;
+            return rsp_opcode;
+        }
+    }
+
+    /*
+     * If we are a master and we currently performing a channel map
+     * update procedure we need to return an error
+     */
+    if ((connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) &&
+        (connsm->csmflags.cfbit.chanmap_update_scheduled)) {
+        rsp_opcode = BLE_LL_CTRL_REJECT_IND_EXT;
+        rspbuf[1] = BLE_LL_CTRL_CONN_PARM_REQ;
+        rspbuf[2] = BLE_ERR_DIFF_TRANS_COLL;
+        return rsp_opcode;
+    }
+
+    /* Process the received connection parameter request */
+    rsp_opcode = ble_ll_ctrl_conn_param_pdu_proc(connsm, dptr, rspbuf,
+                                                 BLE_LL_CTRL_CONN_PARM_REQ);
+    return rsp_opcode;
+}
+
+static int
+ble_ll_ctrl_rx_conn_param_rsp(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                              uint8_t *rspbuf)
+{
+    uint8_t rsp_opcode;
+
+    /* A slave should never receive this response */
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+        return BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    /*
+     * This case should never happen! It means that the slave initiated a
+     * procedure and the master initiated one as well. If we do get in this
+     * state just clear the awaiting reply. The slave will hopefully stop its
+     * procedure when we reply.
+     */
+    if (connsm->csmflags.cfbit.awaiting_host_reply) {
+        connsm->csmflags.cfbit.awaiting_host_reply = 0;
+    }
+
+    /* If we receive a response and no procedure is pending, just leave */
+    if (!IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_CONN_PARAM_REQ)) {
+        return BLE_ERR_MAX;
+    }
+
+    /* Process the received connection parameter response */
+    rsp_opcode = ble_ll_ctrl_conn_param_pdu_proc(connsm, dptr, rspbuf,
+                                                 BLE_LL_CTRL_CONN_PARM_RSP);
+    return rsp_opcode;
+}
+
+/**
+ * Called to process the LL control PDU VERSION_IND
+ *
+ * Context: Link Layer task
+ *
+ * @param connsm
+ * @param dptr
+ * @param rspbuf
+ *
+ * @return int
+ */
+static int
+ble_ll_ctrl_rx_version_ind(struct ble_ll_conn_sm *connsm, uint8_t *dptr,
+                           uint8_t *rspbuf)
+{
+    uint8_t rsp_opcode;
+
+    /* Process the packet */
+    connsm->vers_nr = dptr[0];
+    connsm->comp_id = get_le16(dptr + 1);
+    connsm->sub_vers_nr = get_le16(dptr + 3);
+    connsm->csmflags.cfbit.rxd_version_ind = 1;
+
+    rsp_opcode = BLE_ERR_MAX;
+    if (!connsm->csmflags.cfbit.version_ind_sent) {
+        rsp_opcode = BLE_LL_CTRL_VERSION_IND;
+        ble_ll_ctrl_version_ind_make(connsm, rspbuf);
+    }
+
+    /* Stop the control procedure */
+    if (IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_VERSION_XCHG)) {
+        ble_ll_hci_ev_rd_rem_ver(connsm, BLE_ERR_SUCCESS);
+        ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_VERSION_XCHG);
+    }
+    return rsp_opcode;
+}
+
+/**
+ * Called to process a received channel map request control pdu.
+ *
+ * Context: Link Layer task
+ *
+ * @param connsm
+ * @param dptr
+ */
+static int
+ble_ll_ctrl_rx_chanmap_req(struct ble_ll_conn_sm *connsm, uint8_t *dptr)
+{
+    uint16_t instant;
+    uint16_t conn_events;
+
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+        return BLE_LL_CTRL_UNKNOWN_RSP;
+    }
+
+    /* If instant is in the past, we have to end the connection */
+    instant = get_le16(dptr + BLE_LL_CONN_CHMAP_LEN);
+    conn_events = (instant - connsm->event_cntr) & 0xFFFF;
+    if (conn_events >= 32767) {
+        ble_ll_conn_timeout(connsm, BLE_ERR_INSTANT_PASSED);
+    } else {
+        connsm->chanmap_instant = instant;
+        memcpy(connsm->req_chanmap, dptr, BLE_LL_CONN_CHMAP_LEN);
+        connsm->csmflags.cfbit.chanmap_update_scheduled = 1;
+    }
+
+    return BLE_ERR_MAX;
+}
+
+/**
+ * Initiate LL control procedure.
+ *
+ * This function is called to obtain a mbuf to send a LL control PDU. The data
+ * channel PDU header is not part of the mbuf data; it is part of the BLE
+ * header (which is part of the mbuf).
+ *
+ * Context: LL task.
+ *
+ * @param connsm
+ * @param ctrl_proc
+ */
+static struct os_mbuf *
+ble_ll_ctrl_proc_init(struct ble_ll_conn_sm *connsm, int ctrl_proc)
+{
+    uint8_t len;
+    uint8_t opcode;
+    uint8_t *dptr;
+    uint8_t *ctrdata;
+    struct os_mbuf *om;
+
+    /* Get an mbuf for the control pdu */
+    om = os_msys_get_pkthdr(BLE_LL_CTRL_MAX_PDU_LEN, sizeof(struct ble_mbuf_hdr));
+
+    if (om) {
+        /* The control data starts after the opcode (1 byte) */
+        dptr = om->om_data;
+        ctrdata = dptr + 1;
+
+        switch (ctrl_proc) {
+        case BLE_LL_CTRL_PROC_CONN_UPDATE:
+            opcode = BLE_LL_CTRL_CONN_UPDATE_IND;
+            ble_ll_ctrl_conn_upd_make(connsm, ctrdata, NULL);
+            break;
+        case BLE_LL_CTRL_PROC_CHAN_MAP_UPD:
+            opcode = BLE_LL_CTRL_CHANNEL_MAP_REQ;
+            ble_ll_ctrl_chanmap_req_make(connsm, ctrdata);
+            break;
+        case BLE_LL_CTRL_PROC_FEATURE_XCHG:
+            if (connsm->conn_role == BLE_LL_CONN_ROLE_MASTER) {
+                opcode = BLE_LL_CTRL_FEATURE_REQ;
+            } else {
+                opcode = BLE_LL_CTRL_SLAVE_FEATURE_REQ;
+            }
+            put_le64(ctrdata, ble_ll_read_supp_features());
+            break;
+        case BLE_LL_CTRL_PROC_VERSION_XCHG:
+            opcode = BLE_LL_CTRL_VERSION_IND;
+            ble_ll_ctrl_version_ind_make(connsm, ctrdata);
+            break;
+        case BLE_LL_CTRL_PROC_TERMINATE:
+            opcode = BLE_LL_CTRL_TERMINATE_IND;
+            ctrdata[0] = connsm->disconnect_reason;
+            break;
+        case BLE_LL_CTRL_PROC_CONN_PARAM_REQ:
+            opcode = BLE_LL_CTRL_CONN_PARM_REQ;
+            ble_ll_ctrl_conn_param_pdu_make(connsm, ctrdata, NULL);
+            break;
+        case BLE_LL_CTRL_PROC_LE_PING:
+            opcode = BLE_LL_CTRL_PING_REQ;
+            break;
+        case BLE_LL_CTRL_PROC_DATA_LEN_UPD:
+            opcode = BLE_LL_CTRL_LENGTH_REQ;
+            ble_ll_ctrl_datalen_upd_make(connsm, dptr);
+            break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        /* XXX: deal with already encrypted connection.*/
+        case BLE_LL_CTRL_PROC_ENCRYPT:
+            /* If we are already encrypted we do pause procedure */
+            if (connsm->enc_data.enc_state == CONN_ENC_S_ENCRYPTED) {
+                opcode = BLE_LL_CTRL_PAUSE_ENC_REQ;
+            } else {
+                opcode = BLE_LL_CTRL_ENC_REQ;
+                ble_ll_ctrl_enc_req_make(connsm, ctrdata);
+            }
+            break;
+#endif
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+        case BLE_LL_CTRL_PROC_PHY_UPDATE:
+            opcode = BLE_LL_CTRL_PHY_REQ;
+            ble_ll_ctrl_phy_req_rsp_make(connsm, ctrdata);
+            break;
+#endif
+        default:
+            BLE_LL_ASSERT(0);
+            break;
+        }
+
+        /* Set llid, length and opcode */
+        dptr[0] = opcode;
+        len = g_ble_ll_ctrl_pkt_lengths[opcode] + 1;
+
+        /* Add packet to transmit queue of connection */
+        ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL, len);
+    }
+
+    return om;
+}
+
+/**
+ * Called to determine if the pdu is a TERMINATE_IND
+ *
+ * @param hdr
+ * @param opcode
+ *
+ * @return int
+ */
+int
+ble_ll_ctrl_is_terminate_ind(uint8_t hdr, uint8_t opcode)
+{
+    int rc;
+
+    rc = 0;
+    if ((hdr & BLE_LL_DATA_HDR_LLID_MASK) == BLE_LL_LLID_CTRL) {
+        if (opcode == BLE_LL_CTRL_TERMINATE_IND) {
+            rc = 1;
+        }
+    }
+    return rc;
+}
+
+/**
+ * Stops the LL control procedure indicated by 'ctrl_proc'.
+ *
+ * Context: Link Layer task
+ *
+ * @param connsm
+ * @param ctrl_proc
+ */
+void
+ble_ll_ctrl_proc_stop(struct ble_ll_conn_sm *connsm, int ctrl_proc)
+{
+    if (connsm->cur_ctrl_proc == ctrl_proc) {
+        ble_npl_callout_stop(&connsm->ctrl_proc_rsp_timer);
+        connsm->cur_ctrl_proc = BLE_LL_CTRL_PROC_IDLE;
+    }
+    CLR_PENDING_CTRL_PROC(connsm, ctrl_proc);
+
+    /* If there are others, start them */
+    ble_ll_ctrl_chk_proc_start(connsm);
+}
+
+/**
+ * Called to start the terminate procedure.
+ *
+ * Context: Link Layer task.
+ *
+ * @param connsm
+ */
+void
+ble_ll_ctrl_terminate_start(struct ble_ll_conn_sm *connsm)
+{
+    int ctrl_proc;
+    uint32_t usecs;
+    struct os_mbuf *om;
+
+    BLE_LL_ASSERT(connsm->disconnect_reason != 0);
+
+    ctrl_proc = BLE_LL_CTRL_PROC_TERMINATE;
+    om = ble_ll_ctrl_proc_init(connsm, ctrl_proc);
+    if (om) {
+        CONN_F_TERMINATE_STARTED(connsm) = 1;
+
+        /* Set terminate "timeout" */
+        usecs = connsm->supervision_tmo * BLE_HCI_CONN_SPVN_TMO_UNITS * 1000;
+        connsm->terminate_timeout = os_cputime_get32() +
+            os_cputime_usecs_to_ticks(usecs);
+    }
+}
+
+/**
+ * Called to start a LL control procedure except for the terminate procedure. We
+ * always set the control procedure pending bit even if the control procedure
+ * has been initiated.
+ *
+ * Context: Link Layer task.
+ *
+ * @param connsm Pointer to connection state machine.
+ */
+void
+ble_ll_ctrl_proc_start(struct ble_ll_conn_sm *connsm, int ctrl_proc)
+{
+    struct os_mbuf *om;
+
+    BLE_LL_ASSERT(ctrl_proc != BLE_LL_CTRL_PROC_TERMINATE);
+
+    om = NULL;
+    if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_IDLE) {
+        /* Initiate the control procedure. */
+        om = ble_ll_ctrl_proc_init(connsm, ctrl_proc);
+        if (om) {
+            /* Set the current control procedure */
+            connsm->cur_ctrl_proc = ctrl_proc;
+
+            /* Initialize the procedure response timeout */
+            if (ctrl_proc != BLE_LL_CTRL_PROC_CHAN_MAP_UPD) {
+                ble_ll_ctrl_start_rsp_timer(connsm);
+            }
+        }
+    }
+
+    /* Set bitmask denoting control procedure is pending */
+    connsm->pending_ctrl_procs |= (1 << ctrl_proc);
+}
+
+/**
+ * Called to determine if we need to start a LL control procedure for the given
+ * connection.
+ *
+ * Context: Link Layer
+ *
+ * @param connsm Pointer to connection state machine.
+ */
+void
+ble_ll_ctrl_chk_proc_start(struct ble_ll_conn_sm *connsm)
+{
+    int i;
+
+    /* XXX: TODO new rules! Cannot start certain control procedures if other
+     * ones are peer initiated. We need to wait. Deal with this.
+     */
+
+    /*
+     * If we are terminating, dont start any new procedures but start
+     * terminate if needed
+     */
+    if (connsm->disconnect_reason) {
+        if (!CONN_F_TERMINATE_STARTED(connsm)) {
+            /*
+             * If the terminate procedure has not started it means we were not
+             * able to start it right away (no control pdu was available).
+             * Start it now. No need to start any other procedures.
+             */
+            ble_ll_ctrl_terminate_start(connsm);
+        }
+        return;
+    }
+
+    /* If there is a running procedure or no pending, do nothing */
+    if ((connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_IDLE) &&
+        (connsm->pending_ctrl_procs != 0)) {
+        /*
+         * The specification says there is no priority to control procedures
+         * so just start from the first one for now.
+         */
+        for (i = 0; i < BLE_LL_CTRL_PROC_NUM; ++i) {
+            if (IS_PENDING_CTRL_PROC(connsm, i)) {
+                /*
+                 * The version exchange is a special case. If we have already
+                 * received the information dont start it.
+                 */
+                if ((i == BLE_LL_CTRL_PROC_VERSION_XCHG) &&
+                    (connsm->csmflags.cfbit.rxd_version_ind)) {
+                    ble_ll_hci_ev_rd_rem_ver(connsm, BLE_ERR_SUCCESS);
+                    CLR_PENDING_CTRL_PROC(connsm, i);
+                } else {
+                    ble_ll_ctrl_proc_start(connsm, i);
+                    break;
+                }
+            }
+        }
+    }
+}
+
+/**
+ * Called when the Link Layer receives a LL control PDU.
+ *
+ * NOTE: this function uses the received PDU for the response in some cases. If
+ * the received PDU is not used it needs to be freed here.
+ *
+ * XXX: may want to check, for both master and slave, whether the control
+ * pdu should be received by that role. Might make for less code...
+ * Context: Link Layer
+ *
+ * @param om
+ * @param connsm
+ */
+int
+ble_ll_ctrl_rx_pdu(struct ble_ll_conn_sm *connsm, struct os_mbuf *om)
+{
+    uint32_t features;
+    uint32_t feature;
+    uint8_t len;
+    uint8_t opcode;
+    uint8_t rsp_opcode;
+    uint8_t *dptr;
+    uint8_t *rspbuf;
+    uint8_t *rspdata;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    int restart_encryption;
+#endif
+    int rc = 0;
+
+    /* XXX: where do we validate length received and packet header length?
+     * do this in LL task when received. Someplace!!! What I mean
+     * is we should validate the over the air length with the mbuf length.
+       Should the PHY do that???? */
+
+    /*
+     * dptr points to om_data pointer. The first byte of om_data is the
+     * first byte of the Data Channel PDU header. Get length from header and
+     * opcode from LL control PDU.
+     */
+    dptr = om->om_data;
+    len = dptr[1];
+    opcode = dptr[2];
+
+    /*
+     * rspbuf points to first byte of response. The response buffer does not
+     * contain the Data Channel PDU. Thus, the first byte of rspbuf is the
+     * LL control PDU payload (the opcode of the control PDU). rspdata
+     * points to CtrData in the control PDU.
+     */
+    rspbuf = dptr;
+    rspdata = rspbuf + 1;
+
+    /* Move data pointer to start of control data (2 byte PDU hdr + opcode) */
+    dptr += (BLE_LL_PDU_HDR_LEN + 1);
+
+    /*
+     * Subtract the opcode from the length. Note that if the length was zero,
+     * which would be an error, we will fail the check against the length
+     * of the control packet.
+     */
+    --len;
+
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_CTRL_RX, opcode, len);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    restart_encryption = 0;
+#endif
+
+    /* If opcode comes from reserved value or CtrlData fields is invalid
+     * we shall respond with LL_UNKNOWN_RSP
+     */
+    if ((opcode >= BLE_LL_CTRL_OPCODES) ||
+        (len != g_ble_ll_ctrl_pkt_lengths[opcode])) {
+        rc = -1;
+        rsp_opcode = BLE_LL_CTRL_UNKNOWN_RSP;
+        goto ll_ctrl_send_rsp;
+    }
+
+    /* Check if the feature is supported. */
+    switch (opcode) {
+    case BLE_LL_CTRL_LENGTH_REQ:
+        feature = BLE_LL_FEAT_DATA_LEN_EXT;
+        break;
+    case BLE_LL_CTRL_SLAVE_FEATURE_REQ:
+        feature = BLE_LL_FEAT_SLAVE_INIT;
+        break;
+    case BLE_LL_CTRL_CONN_PARM_REQ:
+    case BLE_LL_CTRL_CONN_PARM_RSP:
+        feature = BLE_LL_FEAT_CONN_PARM_REQ;
+        break;
+    case BLE_LL_CTRL_ENC_REQ:
+    case BLE_LL_CTRL_START_ENC_REQ:
+    case BLE_LL_CTRL_PAUSE_ENC_REQ:
+        feature = BLE_LL_FEAT_LE_ENCRYPTION;
+        break;
+    case BLE_LL_CTRL_PING_REQ:
+        feature = BLE_LL_FEAT_LE_PING;
+        break;
+    case BLE_LL_CTRL_PHY_REQ:
+        feature = BLE_LL_FEAT_LE_2M_PHY | BLE_LL_FEAT_LE_CODED_PHY;
+        break;
+    case BLE_LL_CTRL_MIN_USED_CHAN_IND:
+        feature = BLE_LL_FEAT_MIN_USED_CHAN;
+        break;
+    case BLE_LL_CTRL_PERIODIC_SYNC_IND:
+        feature = BLE_LL_FEAT_SYNC_TRANS_RECV;
+        break;
+    default:
+        feature = 0;
+        break;
+    }
+
+    if (feature) {
+        features = ble_ll_read_supp_features();
+        if ((features & feature) == 0) {
+            if (opcode == BLE_LL_CTRL_ENC_REQ) {
+                if (connsm->conn_features & BLE_LL_FEAT_EXTENDED_REJ) {
+                    rsp_opcode = BLE_LL_CTRL_REJECT_IND_EXT;
+                    rspbuf[1] = opcode;
+                    rspbuf[2] = BLE_ERR_UNSUPP_REM_FEATURE;
+
+                } else {
+                    rsp_opcode = BLE_LL_CTRL_REJECT_IND;
+                    rspbuf[1] = BLE_ERR_UNSUPP_REM_FEATURE;
+                }
+            } else {
+                /* Construct unknown rsp pdu */
+                rsp_opcode = BLE_LL_CTRL_UNKNOWN_RSP;
+            }
+            goto ll_ctrl_send_rsp;
+        }
+    }
+
+    /* Process opcode */
+    rsp_opcode = BLE_ERR_MAX;
+    switch (opcode) {
+    case BLE_LL_CTRL_CONN_UPDATE_IND:
+        rsp_opcode = ble_ll_ctrl_rx_conn_update(connsm, dptr);
+        break;
+    case BLE_LL_CTRL_CHANNEL_MAP_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_chanmap_req(connsm, dptr);
+        break;
+    case BLE_LL_CTRL_LENGTH_REQ:
+        /* Extract parameters and check if valid */
+        if (ble_ll_ctrl_len_proc(connsm, dptr)) {
+            rc  = -1;
+            rsp_opcode = BLE_LL_CTRL_UNKNOWN_RSP;
+            goto ll_ctrl_send_rsp;
+        }
+
+        /*
+         * If we have not started this procedure ourselves and it is
+         * pending, no need to perform it.
+         */
+        if ((connsm->cur_ctrl_proc != BLE_LL_CTRL_PROC_DATA_LEN_UPD) &&
+            IS_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD)) {
+            CLR_PENDING_CTRL_PROC(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD);
+        }
+
+        /* Send a response */
+        rsp_opcode = BLE_LL_CTRL_LENGTH_RSP;
+        ble_ll_ctrl_datalen_upd_make(connsm, rspbuf);
+        break;
+    case BLE_LL_CTRL_LENGTH_RSP:
+        /* According to specification, process this only if we asked for it. */
+        if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_DATA_LEN_UPD) {
+            /*
+             * Process the received data. If received data is invalid, we'll
+             * reply with LL_UNKNOWN_RSP as per spec, but we still need to stop
+             * control procedure to avoid timeout.
+             */
+            if (ble_ll_ctrl_len_proc(connsm, dptr)) {
+                rc = -1;
+                rsp_opcode = BLE_LL_CTRL_UNKNOWN_RSP;
+            }
+
+            /* Stop the control procedure */
+            ble_ll_ctrl_proc_stop(connsm, BLE_LL_CTRL_PROC_DATA_LEN_UPD);
+        }
+        break;
+    case BLE_LL_CTRL_UNKNOWN_RSP:
+        rsp_opcode = ble_ll_ctrl_proc_unk_rsp(connsm, dptr, rspdata);
+        break;
+    case BLE_LL_CTRL_FEATURE_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_feature_req(connsm, dptr, rspbuf, opcode);
+        break;
+    /* XXX: check to see if ctrl procedure was running? Do we care? */
+    case BLE_LL_CTRL_FEATURE_RSP:
+        ble_ll_ctrl_rx_feature_rsp(connsm, dptr);
+        break;
+    case BLE_LL_CTRL_VERSION_IND:
+        rsp_opcode = ble_ll_ctrl_rx_version_ind(connsm, dptr, rspdata);
+        break;
+    case BLE_LL_CTRL_SLAVE_FEATURE_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_feature_req(connsm, dptr, rspbuf, opcode);
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    case BLE_LL_CTRL_ENC_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_enc_req(connsm, dptr, rspdata);
+        break;
+    case BLE_LL_CTRL_ENC_RSP:
+        ble_ll_ctrl_rx_enc_rsp(connsm, dptr);
+        break;
+    case BLE_LL_CTRL_START_ENC_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_start_enc_req(connsm);
+        break;
+    case BLE_LL_CTRL_START_ENC_RSP:
+        rsp_opcode = ble_ll_ctrl_rx_start_enc_rsp(connsm);
+        break;
+    case BLE_LL_CTRL_PAUSE_ENC_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_pause_enc_req(connsm);
+        break;
+    case BLE_LL_CTRL_PAUSE_ENC_RSP:
+        rsp_opcode = ble_ll_ctrl_rx_pause_enc_rsp(connsm);
+        if (rsp_opcode == BLE_LL_CTRL_PAUSE_ENC_RSP) {
+            restart_encryption = 1;
+        }
+        break;
+#endif
+    case BLE_LL_CTRL_PING_REQ:
+        rsp_opcode = BLE_LL_CTRL_PING_RSP;
+        break;
+    case BLE_LL_CTRL_PING_RSP:
+        ble_ll_ctrl_rx_ping_rsp(connsm);
+        break;
+    case BLE_LL_CTRL_CONN_PARM_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_conn_param_req(connsm, dptr, rspbuf);
+        break;
+    case BLE_LL_CTRL_CONN_PARM_RSP:
+        rsp_opcode = ble_ll_ctrl_rx_conn_param_rsp(connsm, dptr, rspbuf);
+        break;
+    /* Fall-through intentional... */
+    case BLE_LL_CTRL_REJECT_IND:
+    case BLE_LL_CTRL_REJECT_IND_EXT:
+        /* Sometimes reject triggers sending other LL CTRL msg */
+        rsp_opcode = ble_ll_ctrl_rx_reject_ind(connsm, dptr, opcode, rspdata);
+        break;
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    case BLE_LL_CTRL_PHY_REQ:
+        rsp_opcode = ble_ll_ctrl_rx_phy_req(connsm, dptr, rspdata);
+        break;
+    case BLE_LL_CTRL_PHY_RSP:
+        rsp_opcode = ble_ll_ctrl_rx_phy_rsp(connsm, dptr, rspdata);
+        break;
+    case BLE_LL_CTRL_PHY_UPDATE_IND:
+        rsp_opcode = ble_ll_ctrl_rx_phy_update_ind(connsm, dptr);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    case BLE_LL_CTRL_PERIODIC_SYNC_IND:
+        rsp_opcode = ble_ll_ctrl_rx_periodic_sync_ind(connsm, dptr);
+        break;
+#endif
+    default:
+        /* Nothing to do here */
+        break;
+    }
+
+    /* Free mbuf or send response */
+ll_ctrl_send_rsp:
+    if (rsp_opcode == BLE_ERR_MAX) {
+        os_mbuf_free_chain(om);
+    } else {
+        /*
+         * Write the response opcode into the buffer. If this is an unknown
+         * response, put opcode of unknown pdu into buffer.
+         */
+        rspbuf[0] = rsp_opcode;
+        if (rsp_opcode == BLE_LL_CTRL_UNKNOWN_RSP) {
+            rspbuf[1] = opcode;
+        }
+        len = g_ble_ll_ctrl_pkt_lengths[rsp_opcode] + 1;
+        ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL, len);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        if (restart_encryption) {
+            /* XXX: what happens if this fails? Meaning we cant allocate
+               mbuf? */
+            ble_ll_ctrl_proc_init(connsm, BLE_LL_CTRL_PROC_ENCRYPT);
+        }
+#endif
+    }
+
+    if (connsm->csmflags.cfbit.pending_initiate_dle) {
+        connsm->csmflags.cfbit.pending_initiate_dle = 0;
+        ble_ll_ctrl_initiate_dle(connsm);
+    }
+
+    return rc;
+}
+
+/**
+ * Called to create and send a REJECT_IND_EXT control PDU or a REJECT_IND
+ *
+ * @param connsm
+ * @param rej_opcode
+ * @param err
+ *
+ * @return int
+ */
+int
+ble_ll_ctrl_reject_ind_send(struct ble_ll_conn_sm *connsm, uint8_t rej_opcode,
+                            uint8_t err)
+{
+    int rc;
+    uint8_t len;
+    uint8_t opcode;
+    uint8_t *rspbuf;
+    struct os_mbuf *om;
+
+    om = os_msys_get_pkthdr(BLE_LL_CTRL_MAX_PDU_LEN,
+                            sizeof(struct ble_mbuf_hdr));
+    if (om) {
+        rspbuf = om->om_data;
+        opcode = BLE_LL_CTRL_REJECT_IND_EXT;
+        if (rej_opcode == BLE_LL_CTRL_ENC_REQ) {
+            if ((connsm->conn_features & BLE_LL_FEAT_EXTENDED_REJ) == 0) {
+                opcode = BLE_LL_CTRL_REJECT_IND;
+            }
+        }
+        rspbuf[0] = opcode;
+        if (opcode == BLE_LL_CTRL_REJECT_IND) {
+            rspbuf[1] = err;
+            len = BLE_LL_CTRL_REJ_IND_LEN + 1;
+        } else {
+            rspbuf[1] = rej_opcode;
+            rspbuf[2] = err;
+            len = BLE_LL_CTRL_REJECT_IND_EXT_LEN + 1;
+        }
+        ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL, len);
+        rc = 0;
+    } else {
+        rc = 1;
+    }
+    return rc;
+}
+
+/**
+ * Called when a Link Layer Control pdu has been transmitted successfully.
+ * This is called when we have a received a PDU during the ISR.
+ *
+ * Context: ISR
+ *
+ * @param txpdu
+ *
+ * @return int
+ */
+int
+ble_ll_ctrl_tx_done(struct os_mbuf *txpdu, struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+    uint8_t opcode;
+
+    rc = 0;
+    opcode = txpdu->om_data[0];
+    switch (opcode) {
+    case BLE_LL_CTRL_TERMINATE_IND:
+        connsm->csmflags.cfbit.terminate_ind_txd = 1;
+        rc = -1;
+        break;
+    case BLE_LL_CTRL_REJECT_IND_EXT:
+        if (connsm->cur_ctrl_proc == BLE_LL_CTRL_PROC_CONN_PARAM_REQ) {
+            /* If rejecting opcode is BLE_LL_CTRL_PROC_CONN_PARAM_REQ and
+             * reason is LMP collision that means we are master on the link and
+             * peer wanted to start procedure which we already started.
+             * Let's wait for response and do not close procedure. */
+            if (txpdu->om_data[1] == BLE_LL_CTRL_CONN_PARM_REQ &&
+                            txpdu->om_data[2] != BLE_ERR_LMP_COLLISION) {
+                connsm->reject_reason = txpdu->om_data[2];
+                connsm->csmflags.cfbit.host_expects_upd_event = 1;
+            }
+        }
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        if (connsm->enc_data.enc_state > CONN_ENC_S_ENCRYPTED) {
+            connsm->enc_data.enc_state = CONN_ENC_S_UNENCRYPTED;
+        }
+#endif
+        break;
+    case BLE_LL_CTRL_REJECT_IND:
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        connsm->enc_data.enc_state = CONN_ENC_S_UNENCRYPTED;
+#endif
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    case BLE_LL_CTRL_PAUSE_ENC_REQ:
+        /* note: fall-through intentional */
+    case BLE_LL_CTRL_ENC_REQ:
+        connsm->enc_data.enc_state = CONN_ENC_S_ENC_RSP_WAIT;
+        break;
+    case BLE_LL_CTRL_ENC_RSP:
+        connsm->csmflags.cfbit.send_ltk_req = 1;
+        break;
+    case BLE_LL_CTRL_START_ENC_RSP:
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            connsm->enc_data.enc_state = CONN_ENC_S_ENCRYPTED;
+            if (CONN_F_LE_PING_SUPP(connsm)) {
+                ble_ll_conn_auth_pyld_timer_start(connsm);
+            }
+        }
+        break;
+    case BLE_LL_CTRL_PAUSE_ENC_RSP:
+        if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+            connsm->enc_data.enc_state = CONN_ENC_S_PAUSE_ENC_RSP_WAIT;
+        }
+        break;
+#endif
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    case BLE_LL_CTRL_PHY_REQ:
+        connsm->phy_tx_transition =
+                    ble_ll_ctrl_phy_tx_transition_get(connsm->phy_data.req_pref_tx_phys_mask);
+        break;
+    case BLE_LL_CTRL_PHY_UPDATE_IND:
+        connsm->phy_tx_transition =
+                    ble_ll_ctrl_phy_tx_transition_get(txpdu->om_data[2]);
+        break;
+#endif
+    default:
+        break;
+    }
+
+    os_mbuf_free_chain(txpdu);
+    return rc;
+}
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_dtm.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_dtm.c
new file mode 100644
index 000000000..baf8c2570
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_dtm.c
@@ -0,0 +1,728 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+
+#include <assert.h>
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/porting/nimble/include/stats/stats.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_phy.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+#include "ble_ll_dtm_priv.h"
+
+STATS_SECT_START(ble_ll_dtm_stats)
+    STATS_SECT_ENTRY(rx_count)
+    STATS_SECT_ENTRY(tx_failed)
+    STATS_SECT_ENTRY(rx_failed)
+STATS_SECT_END
+STATS_SECT_DECL(ble_ll_dtm_stats) ble_ll_dtm_stats;
+
+STATS_NAME_START(ble_ll_dtm_stats)
+    STATS_NAME(ble_ll_dtm_stats, rx_count)
+    STATS_NAME(ble_ll_dtm_stats, tx_failed)
+    STATS_NAME(ble_ll_dtm_stats, rx_failed)
+STATS_NAME_END(ble_phy_stats)
+
+struct dtm_ctx {
+    uint8_t payload_packet;
+    uint8_t itvl_rem_usec;
+    uint16_t num_of_packets;
+    uint32_t itvl_ticks;
+#if MYNEWT_VAL(BLE_LL_DTM_EXTENSIONS)
+    uint16_t num_of_packets_max;
+#endif
+    int active;
+    uint8_t rf_channel;
+    uint8_t phy_mode;
+    struct os_mbuf *om;
+    struct ble_npl_event evt;
+    struct ble_ll_sched_item sch;
+    uint32_t pdu_start_ticks;
+    uint8_t pdu_start_usecs;
+};
+
+static struct dtm_ctx g_ble_ll_dtm_ctx;
+
+static const uint8_t g_ble_ll_dtm_prbs9_data[] =
+{
+    0xff, 0xc1, 0xfb, 0xe8, 0x4c, 0x90, 0x72, 0x8b,
+    0xe7, 0xb3, 0x51, 0x89, 0x63, 0xab, 0x23, 0x23,
+    0x02, 0x84, 0x18, 0x72, 0xaa, 0x61, 0x2f, 0x3b,
+    0x51, 0xa8, 0xe5, 0x37, 0x49, 0xfb, 0xc9, 0xca,
+    0x0c, 0x18, 0x53, 0x2c, 0xfd, 0x45, 0xe3, 0x9a,
+    0xe6, 0xf1, 0x5d, 0xb0, 0xb6, 0x1b, 0xb4, 0xbe,
+    0x2a, 0x50, 0xea, 0xe9, 0x0e, 0x9c, 0x4b, 0x5e,
+    0x57, 0x24, 0xcc, 0xa1, 0xb7, 0x59, 0xb8, 0x87,
+    0xff, 0xe0, 0x7d, 0x74, 0x26, 0x48, 0xb9, 0xc5,
+    0xf3, 0xd9, 0xa8, 0xc4, 0xb1, 0xd5, 0x91, 0x11,
+    0x01, 0x42, 0x0c, 0x39, 0xd5, 0xb0, 0x97, 0x9d,
+    0x28, 0xd4, 0xf2, 0x9b, 0xa4, 0xfd, 0x64, 0x65,
+    0x06, 0x8c, 0x29, 0x96, 0xfe, 0xa2, 0x71, 0x4d,
+    0xf3, 0xf8, 0x2e, 0x58, 0xdb, 0x0d, 0x5a, 0x5f,
+    0x15, 0x28, 0xf5, 0x74, 0x07, 0xce, 0x25, 0xaf,
+    0x2b, 0x12, 0xe6, 0xd0, 0xdb, 0x2c, 0xdc, 0xc3,
+    0x7f, 0xf0, 0x3e, 0x3a, 0x13, 0xa4, 0xdc, 0xe2,
+    0xf9, 0x6c, 0x54, 0xe2, 0xd8, 0xea, 0xc8, 0x88,
+    0x00, 0x21, 0x86, 0x9c, 0x6a, 0xd8, 0xcb, 0x4e,
+    0x14, 0x6a, 0xf9, 0x4d, 0xd2, 0x7e, 0xb2, 0x32,
+    0x03, 0xc6, 0x14, 0x4b, 0x7f, 0xd1, 0xb8, 0xa6,
+    0x79, 0x7c, 0x17, 0xac, 0xed, 0x06, 0xad, 0xaf,
+    0x0a, 0x94, 0x7a, 0xba, 0x03, 0xe7, 0x92, 0xd7,
+    0x15, 0x09, 0x73, 0xe8, 0x6d, 0x16, 0xee, 0xe1,
+    0x3f, 0x78, 0x1f, 0x9d, 0x09, 0x52, 0x6e, 0xf1,
+    0x7c, 0x36, 0x2a, 0x71, 0x6c, 0x75, 0x64, 0x44,
+    0x80, 0x10, 0x43, 0x4e, 0x35, 0xec, 0x65, 0x27,
+    0x0a, 0xb5, 0xfc, 0x26, 0x69, 0x3f, 0x59, 0x99,
+    0x01, 0x63, 0x8a, 0xa5, 0xbf, 0x68, 0x5c, 0xd3,
+    0x3c, 0xbe, 0x0b, 0xd6, 0x76, 0x83, 0xd6, 0x57,
+    0x05, 0x4a, 0x3d, 0xdd, 0x81, 0x73, 0xc9, 0xeb,
+    0x8a, 0x84, 0x39, 0xf4, 0x36, 0x0b, 0xf7
+};
+
+static const uint8_t g_ble_ll_dtm_prbs15_data[] =
+{
+    0xff, 0x7f, 0xf0, 0x3e, 0x3a, 0x13, 0xa4, 0xdc,
+    0xe2, 0xf9, 0x6c, 0x54, 0xe2, 0xd8, 0xea, 0xc8,
+    0x88, 0x00, 0x21, 0x86, 0x9c, 0x6a, 0xd8, 0xcb,
+    0x4e, 0x14, 0x6a, 0xf9, 0x4d, 0xd2, 0x7e, 0xb2,
+    0x32, 0x03, 0xc6, 0x14, 0x4b, 0x7f, 0xd1, 0xb8,
+    0xa6, 0x79, 0x7c, 0x17, 0xac, 0xed, 0x06, 0xad,
+    0xaf, 0x0a, 0x94, 0x7a, 0xba, 0x03, 0xe7, 0x92,
+    0xd7, 0x15, 0x09, 0x73, 0xe8, 0x6d, 0x16, 0xee,
+    0xe1, 0x3f, 0x78, 0x1f, 0x9d, 0x09, 0x52, 0x6e,
+    0xf1, 0x7c, 0x36, 0x2a, 0x71, 0x6c, 0x75, 0x64,
+    0x44, 0x80, 0x10, 0x43, 0x4e, 0x35, 0xec, 0x65,
+    0x27, 0x0a, 0xb5, 0xfc, 0x26, 0x69, 0x3f, 0x59,
+    0x99, 0x01, 0x63, 0x8a, 0xa5, 0xbf, 0x68, 0x5c,
+    0xd3, 0x3c, 0xbe, 0x0b, 0xd6, 0x76, 0x83, 0xd6,
+    0x57, 0x05, 0x4a, 0x3d, 0xdd, 0x81, 0x73, 0xc9,
+    0xeb, 0x8a, 0x84, 0x39, 0xf4, 0x36, 0x0b, 0xf7,
+    0xf0, 0x1f, 0xbc, 0x8f, 0xce, 0x04, 0x29, 0xb7,
+    0x78, 0x3e, 0x1b, 0x95, 0x38, 0xb6, 0x3a, 0x32,
+    0x22, 0x40, 0x88, 0x21, 0xa7, 0x1a, 0xf6, 0xb2,
+    0x13, 0x85, 0x5a, 0x7e, 0x93, 0xb4, 0x9f, 0xac,
+    0xcc, 0x80, 0x31, 0xc5, 0xd2, 0x5f, 0x34, 0xae,
+    0x69, 0x1e, 0xdf, 0x05, 0x6b, 0xbb, 0x41, 0xeb,
+    0xab, 0x02, 0xa5, 0x9e, 0xee, 0xc0, 0xb9, 0xe4,
+    0x75, 0x45, 0xc2, 0x1c, 0x7a, 0x9b, 0x85, 0x7b,
+    0xf8, 0x0f, 0xde, 0x47, 0x67, 0x82, 0x94, 0x5b,
+    0x3c, 0x9f, 0x8d, 0x4a, 0x1c, 0x5b, 0x1d, 0x19,
+    0x11, 0x20, 0xc4, 0x90, 0x53, 0x0d, 0x7b, 0xd9,
+    0x89, 0x42, 0x2d, 0xbf, 0x49, 0xda, 0x4f, 0x56,
+    0x66, 0xc0, 0x98, 0x62, 0xe9, 0x2f, 0x1a, 0xd7,
+    0x34, 0x8f, 0xef, 0x82, 0xb5, 0xdd, 0xa0, 0xf5,
+    0x55, 0x81, 0x52, 0x4f, 0x77, 0xe0, 0x5c, 0xf2,
+    0xba, 0x22, 0x61, 0x0e, 0xbd, 0xcd, 0xc2
+};
+
+static const uint8_t channel_rf_to_index[] = {
+        37,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 38, 11 ,12, 13, 14, 15,
+        16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+        34, 35, 36, 39
+};
+
+#define BLE_DTM_SYNC_WORD          (0x71764129)
+#define BLE_DTM_CRC                (0x555555)
+
+static void ble_ll_dtm_ctx_free(struct dtm_ctx * ctx);
+
+static void
+ble_ll_dtm_set_next(struct dtm_ctx *ctx)
+{
+    struct ble_ll_sched_item *sch = &ctx->sch;
+
+    ctx->pdu_start_ticks += ctx->itvl_ticks;
+    ctx->pdu_start_usecs += ctx->itvl_rem_usec;
+    if (ctx->pdu_start_usecs >= 31) {
+       ctx->pdu_start_ticks++;
+       ctx->pdu_start_usecs -= 31;
+    }
+
+    sch->start_time = ctx->pdu_start_ticks;
+    sch->remainder = ctx->pdu_start_usecs;
+
+    sch->start_time -= g_ble_ll_sched_offset_ticks;
+}
+
+static void
+ble_ll_dtm_ev_tx_resched_cb(struct ble_npl_event *evt) {
+    /* It is called in LL context */
+    struct dtm_ctx *ctx = ble_npl_event_get_arg(evt);
+    int rc;
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    if (!ctx->active || !ctx->om) {
+        OS_EXIT_CRITICAL(sr);
+        return;
+    }
+    OS_EXIT_CRITICAL(sr);
+
+#if MYNEWT_VAL(BLE_LL_DTM_EXTENSIONS)
+    if (g_ble_ll_dtm_ctx.num_of_packets_max &&
+        (g_ble_ll_dtm_ctx.num_of_packets == g_ble_ll_dtm_ctx.num_of_packets_max)) {
+        /*
+         * XXX do not send more packets, but also do not stop DTM - it shall be
+         * stopped as usual by HCI command since there is no standard way to
+         * signal end of test to host.
+         */
+        return;
+    }
+#endif
+
+    ble_ll_dtm_set_next(ctx);
+    rc = ble_ll_sched_dtm(&ctx->sch);
+    BLE_LL_ASSERT(rc == 0);
+}
+
+static int ble_ll_dtm_rx_start(void);
+
+static void
+ble_ll_dtm_ev_rx_restart_cb(struct ble_npl_event *evt) {
+    if (ble_ll_dtm_rx_start() != 0) {
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &g_ble_ll_dtm_ctx.evt);
+        STATS_INC(ble_ll_dtm_stats, rx_failed);
+    }
+}
+
+static void
+ble_ll_dtm_tx_done(void *arg)
+{
+    struct dtm_ctx *ctx;
+
+    ctx = arg;
+    if (!ctx->active) {
+        return;
+    }
+
+    g_ble_ll_dtm_ctx.num_of_packets++;
+
+    /* Reschedule event in LL context */
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &ctx->evt);
+
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+}
+
+static int
+ble_ll_dtm_tx_sched_cb(struct ble_ll_sched_item *sch)
+{
+    struct dtm_ctx *ctx = sch->cb_arg;
+    int rc;
+
+    if (!ctx->active) {
+        return BLE_LL_SCHED_STATE_DONE;
+    }
+
+    rc = ble_phy_setchan(channel_rf_to_index[ctx->rf_channel],
+                                            BLE_DTM_SYNC_WORD, BLE_DTM_CRC);
+    if (rc != 0) {
+        BLE_LL_ASSERT(0);
+        return BLE_LL_SCHED_STATE_DONE;
+    }
+
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) || MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY))
+    ble_phy_mode_set(ctx->phy_mode, ctx->phy_mode);
+#endif
+    ble_phy_set_txend_cb(ble_ll_dtm_tx_done, ctx);
+    ble_phy_txpwr_set(0);
+
+    sch->start_time += g_ble_ll_sched_offset_ticks;
+
+    rc = ble_phy_tx_set_start_time(sch->start_time, sch->remainder);
+    if (rc) {
+        goto resched;
+    }
+
+    rc = ble_phy_tx(ble_ll_tx_mbuf_pducb, ctx->om, BLE_PHY_TRANSITION_NONE);
+    if (rc) {
+        goto resched;
+    }
+
+    ble_ll_state_set(BLE_LL_STATE_DTM);
+
+    return BLE_LL_SCHED_STATE_DONE;
+
+resched:
+    /* Reschedule from LL task if late for this PDU */
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &ctx->evt);
+
+    STATS_INC(ble_ll_dtm_stats, tx_failed);
+
+    return BLE_LL_SCHED_STATE_DONE;
+}
+
+static void
+ble_ll_dtm_calculate_itvl(struct dtm_ctx *ctx, uint8_t len,
+                          uint16_t cmd_interval, int phy_mode)
+{
+    uint32_t l;
+    uint32_t itvl_usec;
+    uint32_t itvl_ticks;
+
+    /* Calculate interval as per spec Bluetooth 5.0 Vol 6. Part F, 4.1.6 */
+    l = ble_ll_pdu_tx_time_get(len + BLE_LL_PDU_HDR_LEN, phy_mode);
+    itvl_usec = ((l + 249 + 624) / 625) * 625;
+
+#if MYNEWT_VAL(BLE_LL_DTM_EXTENSIONS)
+    if (cmd_interval > itvl_usec) {
+        itvl_usec = cmd_interval;
+    }
+#endif
+
+    itvl_ticks = os_cputime_usecs_to_ticks(itvl_usec);
+    ctx->itvl_rem_usec = (itvl_usec - os_cputime_ticks_to_usecs(itvl_ticks));
+    if (ctx->itvl_rem_usec == 31) {
+        ctx->itvl_rem_usec = 0;
+        ++itvl_ticks;
+    }
+    ctx->itvl_ticks = itvl_ticks;
+}
+
+static int
+ble_ll_dtm_tx_create_ctx(uint8_t packet_payload, uint8_t len,
+                         uint8_t rf_channel, uint8_t phy_mode,
+                         uint16_t cmd_interval, uint16_t cmd_pkt_count)
+{
+    int rc = 0;
+    uint8_t byte_pattern;
+    struct ble_mbuf_hdr *ble_hdr;
+    struct os_mbuf *m;
+    struct dtm_ctx *ctx = &g_ble_ll_dtm_ctx;
+    struct ble_ll_sched_item *sch = &ctx->sch;
+
+    /* MSYS is big enough to get continues memory */
+    m = os_msys_get_pkthdr(len, sizeof(struct ble_mbuf_hdr));
+    ctx->om = m;
+    BLE_LL_ASSERT(g_ble_ll_dtm_ctx.om);
+
+    ctx->phy_mode = phy_mode;
+    ctx->rf_channel = rf_channel;
+    ctx->num_of_packets = 0;
+#if MYNEWT_VAL(BLE_LL_DTM_EXTENSIONS)
+    ctx->num_of_packets_max = cmd_pkt_count;
+#endif
+
+    /* Set BLE transmit header */
+    ble_hdr = BLE_MBUF_HDR_PTR(m);
+    ble_hdr->txinfo.flags = 0;
+    ble_hdr->txinfo.offset = 0;
+    ble_hdr->txinfo.pyld_len = len;
+    ble_hdr->txinfo.hdr_byte = packet_payload;
+
+    switch(packet_payload) {
+    case 0x00:
+        if (os_mbuf_copyinto(m, 0, &g_ble_ll_dtm_prbs9_data, len)) {
+            return 1;
+        }
+        goto schedule;
+    case 0x01:
+        byte_pattern = 0x0F;
+        break;
+    case 0x02:
+        byte_pattern = 0x55;
+        break;
+    case 0x03:
+        if (os_mbuf_copyinto(m, 0, &g_ble_ll_dtm_prbs15_data, len)) {
+            return 1;
+        }
+        goto schedule;
+    case 0x04:
+        byte_pattern = 0xFF;
+        break;
+    case 0x05:
+        byte_pattern = 0x00;
+        break;
+    case 0x06:
+        byte_pattern = 0xF0;
+        break;
+    case 0x07:
+        byte_pattern = 0xAA;
+        break;
+    default:
+        return 1;
+    }
+
+    for (rc = 0; rc < len; rc++) {
+        if (os_mbuf_copyinto(m, rc, &byte_pattern, 1)) {
+            return 1;
+        }
+    }
+
+schedule:
+    ble_phy_enable_dtm();
+
+    sch->sched_cb = ble_ll_dtm_tx_sched_cb;
+    sch->cb_arg = ctx;
+    sch->sched_type = BLE_LL_SCHED_TYPE_DTM;
+
+    /* Prepare os_event */
+    ble_npl_event_init(&ctx->evt, ble_ll_dtm_ev_tx_resched_cb, ctx);
+
+    ble_ll_dtm_calculate_itvl(ctx, len, cmd_interval, phy_mode);
+
+    ctx->pdu_start_ticks = ble_ll_rfmgmt_enable_now();
+    ctx->pdu_start_usecs = 0;
+    ble_ll_dtm_set_next(ctx);
+
+    /* Set some start point for TX packets */
+    rc = ble_ll_sched_dtm(sch);
+    BLE_LL_ASSERT(rc == 0);
+
+    g_ble_ll_dtm_ctx.active = 1;
+    return 0;
+}
+
+static int
+ble_ll_dtm_rx_start(void)
+{
+    os_sr_t sr;
+    int rc;
+
+    rc = ble_phy_setchan(channel_rf_to_index[g_ble_ll_dtm_ctx.rf_channel],
+                         BLE_DTM_SYNC_WORD, BLE_DTM_CRC);
+    if (rc) {
+        return rc;
+    }
+
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY) || MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY))
+    ble_phy_mode_set(g_ble_ll_dtm_ctx.phy_mode, g_ble_ll_dtm_ctx.phy_mode);
+#endif
+
+    OS_ENTER_CRITICAL(sr);
+    rc = ble_phy_rx_set_start_time(os_cputime_get32(), 0);
+    OS_EXIT_CRITICAL(sr);
+    if (rc && rc != BLE_PHY_ERR_RX_LATE) {
+        return rc;
+    }
+
+    ble_ll_state_set(BLE_LL_STATE_DTM);
+
+    return 0;
+}
+
+static int
+ble_ll_dtm_rx_sched_cb(struct ble_ll_sched_item *sch)
+{
+    if (ble_ll_dtm_rx_start() != 0) {
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &g_ble_ll_dtm_ctx.evt);
+        STATS_INC(ble_ll_dtm_stats, rx_failed);
+    }
+
+    return BLE_LL_SCHED_STATE_DONE;
+}
+
+static int
+ble_ll_dtm_rx_create_ctx(uint8_t rf_channel, uint8_t phy_mode)
+{
+    struct ble_ll_sched_item *sch = &g_ble_ll_dtm_ctx.sch;
+    int rc;
+
+    g_ble_ll_dtm_ctx.phy_mode = phy_mode;
+    g_ble_ll_dtm_ctx.rf_channel = rf_channel;
+
+    STATS_CLEAR(ble_ll_dtm_stats, rx_count);
+
+    ble_npl_event_init(&g_ble_ll_dtm_ctx.evt, ble_ll_dtm_ev_rx_restart_cb,
+                       NULL);
+
+    sch->sched_cb = ble_ll_dtm_rx_sched_cb;
+    sch->cb_arg = &g_ble_ll_dtm_ctx;
+    sch->sched_type = BLE_LL_SCHED_TYPE_DTM;
+    sch->start_time =  ble_ll_rfmgmt_enable_now();
+
+    rc = ble_ll_sched_dtm(sch);
+    BLE_LL_ASSERT(rc == 0);
+
+    ble_phy_enable_dtm();
+
+    g_ble_ll_dtm_ctx.active = 1;
+    return 0;
+}
+
+static void
+ble_ll_dtm_ctx_free(struct dtm_ctx * ctx)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    if (!ctx->active) {
+        OS_EXIT_CRITICAL(sr);
+        return;
+    }
+
+    ble_ll_sched_rmv_elem(&ctx->sch);
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &g_ble_ll_dtm_ctx.evt);
+
+    ble_phy_disable();
+    ble_phy_disable_dtm();
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    ble_ll_rfmgmt_release();
+
+    os_mbuf_free_chain(ctx->om);
+    memset(ctx, 0, sizeof(*ctx));
+    OS_EXIT_CRITICAL(sr);
+}
+
+static int
+ble_ll_dtm_tx_test(uint8_t tx_chan, uint8_t len, uint8_t packet_payload,
+                   uint8_t hci_phy, uint16_t interval, uint16_t pkt_count)
+{
+    uint8_t phy_mode;
+
+    if (g_ble_ll_dtm_ctx.active) {
+        return BLE_ERR_CTLR_BUSY;
+    }
+
+    switch (hci_phy) {
+    case BLE_HCI_LE_PHY_1M:
+        phy_mode = BLE_PHY_MODE_1M;
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    case BLE_HCI_LE_PHY_2M:
+        phy_mode = BLE_PHY_MODE_2M;
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case BLE_HCI_LE_PHY_CODED_S8:
+        phy_mode = BLE_PHY_MODE_CODED_125KBPS;
+        break;
+    case BLE_HCI_LE_PHY_CODED_S2:
+        phy_mode = BLE_PHY_MODE_CODED_500KBPS;
+        break;
+#endif
+    default:
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (tx_chan > 0x27 || packet_payload > 0x07) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (ble_ll_dtm_tx_create_ctx(packet_payload, len, tx_chan, phy_mode,
+                                 interval, pkt_count)) {
+        return BLE_ERR_UNSPECIFIED;
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+#if MYNEWT_VAL(BLE_LL_DTM_EXTENSIONS)
+static int
+ble_ll_hci_dtm_tx_test_ext(const uint8_t *cmdbuf)
+{
+    const struct ble_hci_le_tx_test_ext_cp *cmd = (const void *) cmdbuf;
+
+    return ble_ll_dtm_tx_test(cmd->tx_chan, cmd->test_data_len, cmd->payload,
+                              BLE_HCI_LE_PHY_1M, le16toh(cmd->interval),
+                              le16toh(cmd->pkt_count));
+}
+
+static int
+ble_ll_hci_dtm_tx_test_v2_ext(const uint8_t *cmdbuf)
+{
+    const struct ble_hci_le_tx_test_v2_ext_cp *cmd = (const void *) cmdbuf;
+
+    return ble_ll_dtm_tx_test(cmd->tx_chan, cmd->test_data_len, cmd->payload,
+                              cmd->phy, le16toh(cmd->interval),
+                              le16toh(cmd->pkt_count));
+}
+#endif
+
+int
+ble_ll_hci_dtm_tx_test(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_tx_test_cp *cmd = (const void *) cmdbuf;
+
+#if MYNEWT_VAL(BLE_LL_DTM_EXTENSIONS)
+    if (len == sizeof(struct ble_hci_le_tx_test_ext_cp)) {
+        return ble_ll_hci_dtm_tx_test_ext(cmdbuf);
+    }
+#endif
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_dtm_tx_test(cmd->tx_chan, cmd->test_data_len, cmd->payload,
+                              BLE_HCI_LE_PHY_1M, 0, 0);
+}
+
+int
+ble_ll_hci_dtm_tx_test_v2(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_tx_test_v2_cp *cmd = (const void *) cmdbuf;
+
+#if MYNEWT_VAL(BLE_LL_DTM_EXTENSIONS)
+    if (len == sizeof(struct ble_hci_le_tx_test_v2_ext_cp)) {
+        return ble_ll_hci_dtm_tx_test_v2_ext(cmdbuf);
+    }
+#endif
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_dtm_tx_test(cmd->tx_chan, cmd->test_data_len, cmd->payload,
+                              cmd->phy, 0, 0);
+}
+
+static int
+ble_ll_dtm_rx_test(uint8_t rx_chan, uint8_t hci_phy)
+{
+    uint8_t phy_mode;
+
+    if (g_ble_ll_dtm_ctx.active) {
+        return BLE_ERR_CTLR_BUSY;
+    }
+
+    switch (hci_phy) {
+    case BLE_HCI_LE_PHY_1M:
+        phy_mode = BLE_PHY_MODE_1M;
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    case BLE_HCI_LE_PHY_2M:
+        phy_mode = BLE_PHY_MODE_2M;
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case BLE_HCI_LE_PHY_CODED:
+        phy_mode = BLE_PHY_MODE_CODED_500KBPS;
+        break;
+#endif
+    default:
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (rx_chan > 0x27) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (ble_ll_dtm_rx_create_ctx(rx_chan, phy_mode)) {
+        return BLE_ERR_UNSPECIFIED;
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+int ble_ll_hci_dtm_rx_test(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_rx_test_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_dtm_rx_test(cmd->rx_chan, BLE_HCI_LE_PHY_1M);
+}
+
+int ble_ll_hci_dtm_rx_test_v2(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_rx_test_v2_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* TODO ignoring modulation index */
+
+    return ble_ll_dtm_rx_test(cmd->rx_chan, cmd->phy);
+}
+
+int ble_ll_dtm_end_test(uint8_t *rsp, uint8_t *rsplen)
+{
+    put_le16(rsp, g_ble_ll_dtm_ctx. num_of_packets);
+    *rsplen = 2;
+
+    ble_ll_dtm_ctx_free(&g_ble_ll_dtm_ctx);
+    return BLE_ERR_SUCCESS;
+}
+
+int ble_ll_dtm_rx_isr_start(struct ble_mbuf_hdr *rxhdr, uint32_t aa)
+{
+    return 0;
+}
+
+void
+ble_ll_dtm_rx_pkt_in(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr)
+{
+    if (BLE_MBUF_HDR_CRC_OK(hdr)) {
+        /* XXX Compare data. */
+        g_ble_ll_dtm_ctx.num_of_packets++;
+        STATS_INC(ble_ll_dtm_stats, rx_count);
+    }
+
+    if (ble_ll_dtm_rx_start() != 0) {
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &g_ble_ll_dtm_ctx.evt);
+        STATS_INC(ble_ll_dtm_stats, rx_failed);
+    }
+}
+
+int
+ble_ll_dtm_rx_isr_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr)
+{
+    struct os_mbuf *rxpdu;
+
+    if (!g_ble_ll_dtm_ctx.active) {
+        return -1;
+    }
+
+    rxpdu = ble_ll_rxpdu_alloc(rxbuf[1] + BLE_LL_PDU_HDR_LEN);
+
+    /* Copy the received pdu and hand it up */
+    if (rxpdu) {
+        ble_phy_rxpdu_copy(rxbuf, rxpdu);
+        ble_ll_rx_pdu_in(rxpdu);
+    }
+
+    return 0;
+}
+
+void
+ble_ll_dtm_wfr_timer_exp(void)
+{
+    /* Should not be needed */
+    BLE_LL_ASSERT(0);
+}
+
+
+void
+ble_ll_dtm_reset(void)
+{
+    ble_ll_dtm_ctx_free(&g_ble_ll_dtm_ctx);
+}
+
+void
+ble_ll_dtm_init(void)
+{
+    int rc;
+
+    rc = stats_init_and_reg(STATS_HDR(ble_ll_dtm_stats),
+                            STATS_SIZE_INIT_PARMS(ble_ll_dtm_stats, STATS_SIZE_32),
+                            STATS_NAME_INIT_PARMS(ble_ll_dtm_stats),
+                            "ble_ll_dtm");
+    SYSINIT_PANIC_ASSERT(rc == 0);
+}
+#endif
+#endif
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_id_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_dtm_priv.h
similarity index 53%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_id_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_dtm_priv.h
index 85260ec48..e04af07be 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_id_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_dtm_priv.h
@@ -17,29 +17,24 @@
  * under the License.
  */
 
-#ifndef H_BLE_HS_ID_PRIV_
-#define H_BLE_HS_ID_PRIV_
+#ifndef H_BLE_LL_TEST_PRIV_
+#define H_BLE_LL_TEST_PRIV_
 
-#include <inttypes.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void ble_hs_id_set_pub(const uint8_t *pub_addr);
-int ble_hs_id_addr(uint8_t id_addr_type, const uint8_t **out_id_addr,
-                   int *out_is_nrpa);
-int ble_hs_id_use_addr(uint8_t addr_type);
-void ble_hs_id_reset(void);
-void ble_hs_id_rnd_reset(void);
-
-#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
-bool ble_hs_is_rpa(uint8_t *addr, uint8_t addr_type);
-int ble_hs_id_set_pseudo_rnd(const uint8_t *);
-int ble_hs_id_set_nrpa_rnd(void);
-#endif
-#ifdef __cplusplus
-}
-#endif
+#include <stdint.h>
+#include <stdbool.h>
+#include "nimble/ble.h"
 
+int ble_ll_hci_dtm_tx_test(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_hci_dtm_tx_test_v2(const uint8_t *cmdbuf, uint8_t len);
+
+int ble_ll_hci_dtm_rx_test(const uint8_t *cmdbuf, uint8_t len);
+int ble_ll_hci_dtm_rx_test_v2(const uint8_t *cmdbuf, uint8_t len);
+
+int ble_ll_dtm_end_test(uint8_t *rsp, uint8_t *rsplen);
+
+int ble_ll_dtm_rx_isr_start(struct ble_mbuf_hdr *rxhdr, uint32_t aa);
+int ble_ll_dtm_rx_isr_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr);
+void ble_ll_dtm_rx_pkt_in(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr);
+void ble_ll_dtm_wfr_timer_exp(void);
+void ble_ll_dtm_reset(void);
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_hci.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_hci.c
new file mode 100644
index 000000000..d83af2c01
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_hci.c
@@ -0,0 +1,1519 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */ 
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "../include/controller/ble_hw.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_whitelist.h"
+#include "../include/controller/ble_ll_resolv.h"
+#include "../include/controller/ble_ll_sync.h"
+#include "ble_ll_priv.h"
+#include "ble_ll_conn_priv.h"
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+#include "ble_ll_dtm_priv.h"
+#endif
+
+static void ble_ll_hci_cmd_proc(struct ble_npl_event *ev);
+
+/* OS event to enqueue command */
+static struct ble_npl_event g_ble_ll_hci_cmd_ev;
+
+/* LE event mask */
+static uint64_t g_ble_ll_hci_le_event_mask;
+static uint64_t g_ble_ll_hci_event_mask;
+static uint64_t g_ble_ll_hci_event_mask2;
+
+static int16_t rx_path_pwr_compensation;
+static int16_t tx_path_pwr_compensation;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static enum {
+    ADV_MODE_ANY,
+    ADV_MODE_LEGACY,
+    ADV_MODE_EXT,
+} hci_adv_mode;
+
+bool ble_ll_hci_adv_mode_ext(void)
+{
+    return hci_adv_mode == ADV_MODE_EXT;
+}
+#else
+bool
+ble_ll_hci_adv_mode_ext(void)
+{
+    return false;
+}
+#endif
+
+/**
+ * ll hci get num cmd pkts
+ *
+ * Returns the number of command packets that the host is allowed to send
+ * to the controller.
+ *
+ * @return uint8_t
+ */
+static uint8_t
+ble_ll_hci_get_num_cmd_pkts(void)
+{
+    return BLE_LL_CFG_NUM_HCI_CMD_PKTS;
+}
+
+/**
+ * Send an event to the host.
+ *
+ * @param evbuf Pointer to event buffer to send
+ *
+ * @return int 0: success; -1 otherwise.
+ */
+int
+ble_ll_hci_event_send(struct ble_hci_ev *hci_ev)
+{
+    int rc;
+
+    BLE_LL_DEBUG_GPIO(HCI_EV, 1);
+
+    BLE_LL_ASSERT(sizeof(*hci_ev) + hci_ev->length <= BLE_LL_MAX_EVT_LEN);
+
+    /* Count number of events sent */
+    STATS_INC(ble_ll_stats, hci_events_sent);
+
+    /* Send the event to the host */
+    rc = ble_hci_trans_ll_evt_tx((uint8_t *)hci_ev);
+
+    BLE_LL_DEBUG_GPIO(HCI_EV, 0);
+
+    return rc;
+}
+
+/**
+ * Created and sends a command complete event with the no-op opcode to the
+ * host.
+ */
+void
+ble_ll_hci_send_noop(void)
+{
+    struct ble_hci_ev_command_complete_nop *ev;
+    struct ble_hci_ev *hci_ev;
+
+    hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+    if (hci_ev) {
+        /* Create a command complete event with a NO-OP opcode */
+        hci_ev->opcode = BLE_HCI_EVCODE_COMMAND_COMPLETE;
+
+        hci_ev->length = sizeof(*ev);
+        ev = (void *)hci_ev->data;
+
+        ev->num_packets = ble_ll_hci_get_num_cmd_pkts();
+        ev->opcode = BLE_HCI_OPCODE_NOP;
+
+        ble_ll_hci_event_send(hci_ev);
+    }
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/**
+ * LE encrypt command
+ *
+ * @param cmdbuf
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+static int
+ble_ll_hci_le_encrypt(const uint8_t *cmdbuf, uint8_t len, uint8_t *rspbuf,
+                      uint8_t *rsplen)
+{
+    const struct ble_hci_le_encrypt_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_encrypt_rp *rsp = (void *)rspbuf;
+    struct ble_encryption_block ecb;
+    int rc;
+
+    /* Call the link layer to encrypt the data */
+    swap_buf(ecb.key, cmd->key, BLE_ENC_BLOCK_SIZE);
+    swap_buf(ecb.plain_text, cmd->data, BLE_ENC_BLOCK_SIZE);
+    rc = ble_hw_encrypt_block(&ecb);
+    if (!rc) {
+        swap_buf(rsp->data, ecb.cipher_text, BLE_ENC_BLOCK_SIZE);
+        *rsplen = sizeof(*rsp);
+        rc = BLE_ERR_SUCCESS;
+    } else {
+        rc = BLE_ERR_CTLR_BUSY;
+    }
+
+    return rc;
+}
+#endif
+
+/**
+ * LE rand command
+ *
+ * @param cmdbuf
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+static int
+ble_ll_hci_le_rand(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rand_rp *rsp = (void *) rspbuf;
+
+    ble_ll_rand_data_get((uint8_t *)&rsp->random_number,
+                         sizeof(rsp->random_number));
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Read local version
+ *
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+static int
+ble_ll_hci_rd_local_version(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_ip_rd_local_ver_rp *rsp = (void *) rspbuf;
+
+    rsp->hci_ver = BLE_HCI_VER_BCS;
+    rsp->hci_rev = 0;
+    rsp->lmp_ver = BLE_LMP_VER_BCS;
+    rsp->manufacturer = htole16(MYNEWT_VAL(BLE_LL_MFRG_ID));
+    rsp->lmp_subver = 0;
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Read local supported features
+ *
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+static int
+ble_ll_hci_rd_local_supp_feat(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_ip_rd_loc_supp_feat_rp *rsp = (void *) rspbuf;
+
+    /*
+     * The only two bits we set here currently are (5th byte):
+     *      BR/EDR not supported        (bit 5)
+     *      LE supported (controller)   (bit 6)
+     */
+    rsp->features = htole64(0x0000006000000000);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Read local supported commands
+ *
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+static int
+ble_ll_hci_rd_local_supp_cmd(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_ip_rd_loc_supp_cmd_rp *rsp = (void *) rspbuf;
+
+    memset(rsp->commands, 0, sizeof(rsp->commands));
+    memcpy(rsp->commands, g_ble_ll_supp_cmds, sizeof(g_ble_ll_supp_cmds));
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Called to read the public device address of the device
+ *
+ *
+ * @param rspbuf
+ * @param rsplen
+ *
+ * @return int
+ */
+static int
+ble_ll_hci_rd_bd_addr(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_ip_rd_bd_addr_rp *rsp = (void *) rspbuf;
+
+    memcpy(rsp->addr, g_dev_addr, BLE_DEV_ADDR_LEN);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * ll hci set le event mask
+ *
+ * Called when the LL controller receives a set LE event mask command.
+ *
+ * Context: Link Layer task (HCI command parser)
+ *
+ * @param cmdbuf Pointer to command buf.
+ *
+ * @return int BLE_ERR_SUCCESS. Does not return any errors.
+ */
+static int
+ble_ll_hci_set_le_event_mask(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_event_mask_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    g_ble_ll_hci_le_event_mask = le64toh(cmd->event_mask);
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * HCI read buffer size command. Returns the ACL data packet length and
+ * num data packets.
+ *
+ * @param rspbuf Pointer to response buffer
+ * @param rsplen Length of response buffer
+ *
+ * @return int BLE error code
+ */
+static int
+ble_ll_hci_le_read_bufsize(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_buf_size_rp *rp = (void *) rspbuf;
+
+    rp->data_len = htole16(g_ble_ll_data.ll_acl_pkt_size);
+    rp->data_packets = g_ble_ll_data.ll_num_acl_pkts;
+
+    *rsplen = sizeof(*rp);
+    return BLE_ERR_SUCCESS;
+}
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+/**
+ * Checks the preferred phy masks for validity and places the preferred masks
+ * in the input phy masks
+
+ * @return int BLE_ERR_SUCCESS or BLE_ERR_INV_HCI_CMD_PARMS or BLE_ERR_UNSUPPORTED
+ */
+int
+ble_ll_hci_chk_phy_masks(uint8_t all_phys, uint8_t tx_phys, uint8_t rx_phys,
+                         uint8_t *txphy, uint8_t *rxphy)
+{
+    /* Check for RFU */
+    if ((tx_phys & ~BLE_HCI_LE_PHY_PREF_MASK_ALL) ||
+                    (rx_phys & ~BLE_HCI_LE_PHY_PREF_MASK_ALL)) {
+        return BLE_ERR_UNSUPPORTED;
+    }
+
+    if ((!(all_phys & BLE_HCI_LE_PHY_NO_TX_PREF_MASK) && (tx_phys == 0)) ||
+        (!(all_phys & BLE_HCI_LE_PHY_NO_RX_PREF_MASK) && (rx_phys == 0))) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* If phy not supported, return error */
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    if((tx_phys & BLE_HCI_LE_PHY_2M_PREF_MASK) ||
+                    (rx_phys & BLE_HCI_LE_PHY_2M_PREF_MASK)) {
+        return BLE_ERR_UNSUPPORTED;
+    }
+#endif
+#if !MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    if ((tx_phys & BLE_HCI_LE_PHY_CODED_PREF_MASK) ||
+                    (rx_phys & BLE_HCI_LE_PHY_CODED_PREF_MASK)) {
+        return BLE_ERR_UNSUPPORTED;
+    }
+#endif
+    /* Set the default PHY preferences */
+    if (all_phys & BLE_HCI_LE_PHY_NO_TX_PREF_MASK) {
+        tx_phys = BLE_HCI_LE_PHY_PREF_MASK_ALL;
+    }
+    *txphy = tx_phys;
+
+    if (all_phys & BLE_HCI_LE_PHY_NO_RX_PREF_MASK) {
+        rx_phys = BLE_HCI_LE_PHY_PREF_MASK_ALL;
+    }
+    *rxphy = rx_phys;
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Set PHY preferences for connection
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+static int
+ble_ll_hci_le_set_def_phy(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_default_phy_cp *cmd = (const void *) cmdbuf;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    rc = ble_ll_hci_chk_phy_masks(cmd->all_phys, cmd->tx_phys, cmd->rx_phys,
+                                  &g_ble_ll_data.ll_pref_tx_phys,
+                                  &g_ble_ll_data.ll_pref_rx_phys);
+    return rc;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
+/**
+ * HCI write suggested default data length command.
+ *
+ * This command is used by the host to change the initial max tx octets/time
+ * for all connections. Note that if the controller does not support the
+ * requested times no error is returned; the controller simply ignores the
+ * request (but remembers what the host requested for the read suggested
+ * default data length command). The spec allows for the controller to
+ * disregard the host.
+ *
+ * @param rspbuf Pointer to response buffer
+ * @param rsplen Length of response buffer
+ *
+ * @return int BLE error code
+ */
+static int
+ble_ll_hci_le_wr_sugg_data_len(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_wr_sugg_def_data_len_cp *cmd = (const void*) cmdbuf;
+    uint16_t tx_oct;
+    uint16_t tx_time;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Get suggested octets and time */
+    tx_oct = le16toh(cmd->max_tx_octets);
+    tx_time = le16toh(cmd->max_tx_time);
+
+    /* If valid, write into suggested and change connection initial times */
+    if (ble_ll_chk_txrx_octets(tx_oct) && ble_ll_chk_txrx_time(tx_time)) {
+        g_ble_ll_conn_params.sugg_tx_octets = (uint8_t)tx_oct;
+        g_ble_ll_conn_params.sugg_tx_time = tx_time;
+
+        /*
+         * We can disregard host suggestion, but we are a nice controller so
+         * let's use host suggestion, unless they exceed max supported values
+         * in which case we just use our max.
+         */
+        g_ble_ll_conn_params.conn_init_max_tx_octets =
+                        min(tx_oct, g_ble_ll_conn_params.supp_max_tx_octets);
+        g_ble_ll_conn_params.conn_init_max_tx_time =
+                        min(tx_time, g_ble_ll_conn_params.supp_max_tx_time);
+
+        /*
+         * Use the same for coded and uncoded defaults. These are used when PHY
+         * parameters are initialized and we want to use values overridden by
+         * host. Make sure we do not exceed max supported time on uncoded.
+         */
+        g_ble_ll_conn_params.conn_init_max_tx_time_uncoded =
+                                min(BLE_LL_CONN_SUPP_TIME_MAX_UNCODED,
+                                    g_ble_ll_conn_params.conn_init_max_tx_time);
+        g_ble_ll_conn_params.conn_init_max_tx_time_coded =
+                                g_ble_ll_conn_params.conn_init_max_tx_time;
+
+        rc = BLE_ERR_SUCCESS;
+    } else {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return rc;
+}
+
+/**
+ * HCI read suggested default data length command. Returns the controllers
+ * initial max tx octet/time.
+ *
+ * @param rspbuf Pointer to response buffer
+ * @param rsplen Length of response buffer
+ *
+ * @return int BLE error code
+ */
+static int
+ble_ll_hci_le_rd_sugg_data_len(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_sugg_def_data_len_rp *rsp = (void *) rspbuf;
+
+    /* Place the data packet length and number of packets in the buffer */
+    rsp->max_tx_octets = htole16(g_ble_ll_conn_params.sugg_tx_octets);
+    rsp->max_tx_time = htole16(g_ble_ll_conn_params.sugg_tx_time);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * HCI read maximum data length command. Returns the controllers max supported
+ * rx/tx octets/times.
+ *
+ * @param rspbuf Pointer to response buffer
+ * @param rsplen Length of response buffer
+ *
+ * @return int BLE error code
+ */
+static int
+ble_ll_hci_le_rd_max_data_len(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_max_data_len_rp *rsp = (void *)rspbuf;
+
+    /* Place the data packet length and number of packets in the buffer */
+    rsp->max_tx_octests = htole16(g_ble_ll_conn_params.supp_max_tx_octets);
+    rsp->max_tx_time = htole16(g_ble_ll_conn_params.supp_max_tx_time);
+    rsp->max_rx_octests = htole16(g_ble_ll_conn_params.supp_max_rx_octets);
+    rsp->max_rx_time = htole16(g_ble_ll_conn_params.supp_max_rx_time);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+#endif
+
+/**
+ * HCI read local supported features command. Returns the features
+ * supported by the controller.
+ *
+ * @param rspbuf Pointer to response buffer
+ * @param rsplen Length of response buffer
+ *
+ * @return int BLE error code
+ */
+static int
+ble_ll_hci_le_read_local_features(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_loc_supp_feat_rp *rsp = (void *) rspbuf;
+
+    rsp->features = htole64(ble_ll_read_supp_features());
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * HCI read local supported states command. Returns the states
+ * supported by the controller.
+ *
+ * @param rspbuf Pointer to response buffer
+ * @param rsplen Length of response buffer
+ *
+ * @return int BLE error code
+ */
+static int
+ble_ll_hci_le_read_supp_states(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_supp_states_rp *rsp = (void *) rspbuf;
+
+    /* Add list of supported states. */
+    rsp->states = htole64(ble_ll_read_supp_states());
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+
+/**
+ * Checks to see if a LE event has been disabled by the host.
+ *
+ * @param subev Sub-event code of the LE Meta event. Note that this can
+ * be a value from 1 to 64, inclusive.
+ *
+ * @return uint8_t 0: event is not enabled; otherwise event is enabled.
+ */
+bool
+ble_ll_hci_is_le_event_enabled(unsigned int subev)
+{
+    /* The LE meta event must be enabled for any LE event to be enabled */
+    if (g_ble_ll_hci_event_mask & (1ull << (BLE_HCI_EVCODE_LE_META - 1))) {
+        return g_ble_ll_hci_le_event_mask & (1ull << (subev - 1));
+    }
+
+    return false;
+}
+
+/**
+ * Checks to see if an event has been disabled by the host.
+ *
+ * NOTE: there are two "pages" of event masks; the first page is for event
+ * codes between 0 and 63 and the second page is for event codes 64 and
+ * greater.
+ *
+ * @param evcode This is the event code for the event.
+ *
+ * @return uint8_t 0: event is not enabled; otherwise event is enabled.
+ */
+bool
+ble_ll_hci_is_event_enabled(unsigned int evcode)
+{
+    if (evcode >= 64) {
+        return g_ble_ll_hci_event_mask2 & (1ull << (evcode - 64));
+    }
+
+    return g_ble_ll_hci_event_mask & (1ull << (evcode - 1));
+}
+
+/**
+ * Called to determine if the reply to the command should be a command complete
+ * event or a command status event.
+ *
+ * @param ocf
+ *
+ * @return int 0: return command complete; 1: return command status event
+ */
+static int
+ble_ll_hci_le_cmd_send_cmd_status(uint16_t ocf)
+{
+    int rc;
+
+    switch (ocf) {
+    case BLE_HCI_OCF_LE_RD_REM_FEAT:
+    case BLE_HCI_OCF_LE_CREATE_CONN:
+    case BLE_HCI_OCF_LE_EXT_CREATE_CONN:
+    case BLE_HCI_OCF_LE_CONN_UPDATE:
+    case BLE_HCI_OCF_LE_START_ENCRYPT:
+    case BLE_HCI_OCF_LE_RD_P256_PUBKEY:
+    case BLE_HCI_OCF_LE_GEN_DHKEY:
+    case BLE_HCI_OCF_LE_SET_PHY:
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_CREATE_SYNC:
+        rc = 1;
+        break;
+    default:
+        rc = 0;
+        break;
+    }
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+/** HCI LE read maximum advertising data length command. Returns the controllers
+* max supported advertising data length;
+*
+* @param rspbuf Pointer to response buffer
+* @param rsplen Length of response buffer
+*
+* @return int BLE error code
+*/
+static int
+ble_ll_adv_rd_max_adv_data_len(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_max_adv_data_len_rp *rsp = (void *) rspbuf;
+
+    rsp->max_adv_data_len = htole16(BLE_ADV_DATA_MAX_LEN);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * HCI LE read number of supported advertising sets
+ *
+ * @param rspbuf Pointer to response buffer
+ * @param rsplen Length of response buffer
+ *
+ * @return int BLE error code
+ */
+static int
+ble_ll_adv_rd_sup_adv_sets(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_num_of_adv_sets_rp *rsp = (void *)rspbuf;
+
+    rsp->num_sets = BLE_ADV_INSTANCES;
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+static bool
+ble_ll_is_valid_adv_mode(uint8_t ocf)
+{
+    /*
+     * If, since the last power-on or reset, the Host has ever issued a legacy
+     * advertising command and then issues an extended advertising command, or
+     * has ever issued an extended advertising command and then issues a legacy
+     * advertising command, the Controller shall return the error code Command
+     * Disallowed (0x0C).
+    */
+
+    switch(ocf) {
+    case BLE_HCI_OCF_LE_CREATE_CONN:
+    case BLE_HCI_OCF_LE_SET_ADV_PARAMS:
+    case BLE_HCI_OCF_LE_SET_ADV_ENABLE:
+    case BLE_HCI_OCF_LE_SET_ADV_DATA:
+    case BLE_HCI_OCF_LE_SET_SCAN_PARAMS:
+    case BLE_HCI_OCF_LE_SET_SCAN_ENABLE:
+    case BLE_HCI_OCF_LE_SET_SCAN_RSP_DATA:
+    case BLE_HCI_OCF_LE_RD_ADV_CHAN_TXPWR:
+        if (hci_adv_mode == ADV_MODE_EXT) {
+            return false;
+        }
+
+        hci_adv_mode = ADV_MODE_LEGACY;
+        break;
+    case BLE_HCI_OCF_LE_EXT_CREATE_CONN:
+    case BLE_HCI_OCF_LE_SET_EXT_ADV_DATA:
+    case BLE_HCI_OCF_LE_SET_EXT_ADV_ENABLE:
+    case BLE_HCI_OCF_LE_SET_EXT_ADV_PARAM:
+    case BLE_HCI_OCF_LE_SET_EXT_SCAN_ENABLE:
+    case BLE_HCI_OCF_LE_SET_EXT_SCAN_PARAM:
+    case BLE_HCI_OCF_LE_SET_EXT_SCAN_RSP_DATA:
+    case BLE_HCI_OCF_LE_RD_MAX_ADV_DATA_LEN:
+    case BLE_HCI_OCF_LE_RD_NUM_OF_ADV_SETS:
+    case BLE_HCI_OCF_LE_REMOVE_ADV_SET:
+    case BLE_HCI_OCF_LE_CLEAR_ADV_SETS:
+    case BLE_HCI_OCF_LE_SET_PERIODIC_ADV_PARAMS:
+    case BLE_HCI_OCF_LE_SET_PERIODIC_ADV_DATA:
+    case BLE_HCI_OCF_LE_SET_PERIODIC_ADV_ENABLE:
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_CREATE_SYNC:
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL:
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_TERM_SYNC:
+    case BLE_HCI_OCF_LE_ADD_DEV_TO_PERIODIC_ADV_LIST:
+    case BLE_HCI_OCF_LE_REM_DEV_FROM_PERIODIC_ADV_LIST:
+    case BLE_HCI_OCF_LE_CLEAR_PERIODIC_ADV_LIST:
+    case BLE_HCI_OCF_LE_RD_PERIODIC_ADV_LIST_SIZE:
+#if MYNEWT_VAL(BLE_VERSION) >= 51
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_RECEIVE_ENABLE:
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_SYNC_TRANSFER:
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_SET_INFO_TRANSFER:
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_SYNC_TRANSFER_PARAMS:
+    case BLE_HCI_OCF_LE_SET_DEFAULT_SYNC_TRANSFER_PARAMS:
+#endif
+        if (hci_adv_mode == ADV_MODE_LEGACY) {
+            return false;
+        }
+
+        hci_adv_mode = ADV_MODE_EXT;
+        break;
+    default:
+        break;
+    }
+
+    return true;
+}
+#endif
+
+static int
+ble_ll_read_tx_power(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_transmit_power_rp *rsp = (void *) rspbuf;
+
+    rsp->min_tx_power = ble_phy_txpower_round(-127);
+    rsp->max_tx_power = ble_phy_txpower_round(126);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+static int
+ble_ll_read_rf_path_compensation(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_rf_path_compensation_rp *rsp = (void *) rspbuf;
+
+    rsp->rx_path_compensation = htole16(rx_path_pwr_compensation);
+    rsp->tx_path_compensation = htole16(tx_path_pwr_compensation);
+
+    *rsplen = sizeof(*rsp);;
+    return BLE_ERR_SUCCESS;
+}
+
+static int
+ble_ll_write_rf_path_compensation(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_wr_rf_path_compensation_cp *cmd = (const void *)cmdbuf;
+    int16_t rx;
+    int16_t tx;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    tx = le16toh(cmd->tx_path_compensation);
+    rx = le16toh(cmd->rx_path_compensation);
+
+    if ((tx < -1280) || (tx > 1280) || (rx < -1280) || (rx > 1280)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    tx_path_pwr_compensation = tx;
+    rx_path_pwr_compensation = rx;
+
+    ble_phy_set_rx_pwr_compensation(rx_path_pwr_compensation / 10);
+
+    return BLE_ERR_SUCCESS;
+}
+
+int8_t
+ble_ll_get_tx_pwr_compensation(void)
+{
+    return tx_path_pwr_compensation / 10;
+}
+
+/**
+ * Process a LE command sent from the host to the controller. The HCI command
+ * has a 3 byte command header followed by data. The header is:
+ *  -> opcode (2 bytes)
+ *  -> Length of parameters (1 byte; does include command header bytes).
+ *
+ * @param cmdbuf Pointer to command buffer. Points to start of command header.
+ * @param ocf    Opcode command field.
+ * @param *rsplen Pointer to length of response
+ *
+ * @return int  This function returns a BLE error code. If a command status
+ *              event should be returned as opposed to command complete,
+ *              256 gets added to the return value.
+ */
+static int
+ble_ll_hci_le_cmd_proc(const uint8_t *cmdbuf, uint8_t len, uint16_t ocf,
+                       uint8_t *rspbuf, uint8_t *rsplen,
+                       ble_ll_hci_post_cmd_complete_cb *cb)
+{
+    int rc;
+
+    /* Assume error; if all pass rc gets set to 0 */
+    rc = BLE_ERR_INV_HCI_CMD_PARMS;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (!ble_ll_is_valid_adv_mode(ocf)) {
+        rc = BLE_ERR_CMD_DISALLOWED;
+
+        /*
+         * This code is here because we add 256 to the return code to denote
+         * that the reply to this command should be command status (as opposed to
+         * command complete).
+         *
+         * For unknown HCI command let us return always command status as per
+         * specification Bluetooth 5, Vol. 2, Chapter 4.4
+         */
+        if (ble_ll_hci_le_cmd_send_cmd_status(ocf)) {
+            rc += (BLE_ERR_MAX + 1);
+        }
+
+        return rc;
+    }
+#endif
+
+    switch (ocf) {
+    case BLE_HCI_OCF_LE_SET_EVENT_MASK:
+        rc = ble_ll_hci_set_le_event_mask(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_RD_BUF_SIZE:
+        if (len == 0) {
+            rc = ble_ll_hci_le_read_bufsize(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_RD_LOC_SUPP_FEAT:
+        if (len == 0) {
+            rc = ble_ll_hci_le_read_local_features(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_SET_RAND_ADDR:
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        rc = ble_ll_set_random_addr(cmdbuf, len, hci_adv_mode == ADV_MODE_EXT);
+#else
+        rc = ble_ll_set_random_addr(cmdbuf, len, false);
+#endif
+        break;
+    case BLE_HCI_OCF_LE_SET_ADV_PARAMS:
+        rc = ble_ll_adv_set_adv_params(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_RD_ADV_CHAN_TXPWR:
+        if (len == 0) {
+            rc = ble_ll_adv_read_txpwr(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_SET_ADV_DATA:
+        rc = ble_ll_hci_set_adv_data(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_SCAN_RSP_DATA:
+        rc = ble_ll_hci_set_scan_rsp_data(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_ADV_ENABLE:
+        rc = ble_ll_hci_adv_set_enable(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_SCAN_PARAMS:
+        rc = ble_ll_scan_set_scan_params(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_SCAN_ENABLE:
+        rc = ble_ll_hci_scan_set_enable(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_CREATE_CONN:
+        rc = ble_ll_conn_create(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_CREATE_CONN_CANCEL:
+        if (len == 0) {
+            rc = ble_ll_conn_create_cancel(cb);
+        }
+        break;
+    case BLE_HCI_OCF_LE_RD_WHITE_LIST_SIZE:
+        if (len == 0) {
+            rc = ble_ll_whitelist_read_size(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_CLEAR_WHITE_LIST:
+        if (len == 0) {
+            rc = ble_ll_whitelist_clear();
+        }
+        break;
+    case BLE_HCI_OCF_LE_ADD_WHITE_LIST:
+        rc = ble_ll_whitelist_add(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_RMV_WHITE_LIST:
+        rc = ble_ll_whitelist_rmv(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_CONN_UPDATE:
+        rc = ble_ll_conn_hci_update(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_HOST_CHAN_CLASS:
+        rc = ble_ll_conn_hci_set_chan_class(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_RD_CHAN_MAP:
+        rc = ble_ll_conn_hci_rd_chan_map(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_RD_REM_FEAT:
+        rc = ble_ll_conn_hci_read_rem_features(cmdbuf, len);
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    case BLE_HCI_OCF_LE_ENCRYPT:
+        rc = ble_ll_hci_le_encrypt(cmdbuf, len, rspbuf, rsplen);
+        break;
+#endif
+    case BLE_HCI_OCF_LE_RAND:
+        if (len == 0) {
+            rc = ble_ll_hci_le_rand(rspbuf, rsplen);
+        }
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    case BLE_HCI_OCF_LE_START_ENCRYPT:
+        rc = ble_ll_conn_hci_le_start_encrypt(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_LT_KEY_REQ_REPLY:
+        rc = ble_ll_conn_hci_le_ltk_reply(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_LT_KEY_REQ_NEG_REPLY:
+        rc = ble_ll_conn_hci_le_ltk_neg_reply(cmdbuf, len, rspbuf, rsplen);
+        break;
+#endif
+    case BLE_HCI_OCF_LE_RD_SUPP_STATES :
+        if (len == 0) {
+            rc = ble_ll_hci_le_read_supp_states(rspbuf, rsplen);
+        }
+        break;
+#if MYNEWT_VAL(BLE_LL_DTM)
+    case BLE_HCI_OCF_LE_TX_TEST:
+        rc = ble_ll_hci_dtm_tx_test(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_RX_TEST:
+        rc = ble_ll_hci_dtm_rx_test(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_TEST_END:
+        if (len == 0) {
+            rc = ble_ll_dtm_end_test(rspbuf, rsplen);
+        }
+        break;
+#endif
+    case BLE_HCI_OCF_LE_REM_CONN_PARAM_RR:
+        rc = ble_ll_conn_hci_param_rr(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_REM_CONN_PARAM_NRR:
+        rc = ble_ll_conn_hci_param_nrr(cmdbuf, len, rspbuf, rsplen);
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
+    case BLE_HCI_OCF_LE_SET_DATA_LEN:
+        rc = ble_ll_conn_hci_set_data_len(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_RD_SUGG_DEF_DATA_LEN:
+        if (len == 0) {
+            rc = ble_ll_hci_le_rd_sugg_data_len(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_WR_SUGG_DEF_DATA_LEN:
+        rc = ble_ll_hci_le_wr_sugg_data_len(cmdbuf, len);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    case BLE_HCI_OCF_LE_ADD_RESOLV_LIST:
+        rc = ble_ll_resolv_list_add(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_RMV_RESOLV_LIST:
+        rc = ble_ll_resolv_list_rmv(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_CLR_RESOLV_LIST:
+        if (len == 0) {
+            rc = ble_ll_resolv_list_clr();
+        }
+        break;
+    case BLE_HCI_OCF_LE_RD_RESOLV_LIST_SIZE:
+        if (len == 0) {
+            rc = ble_ll_resolv_list_read_size(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_RD_PEER_RESOLV_ADDR:
+        rc = ble_ll_resolv_peer_addr_rd(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_RD_LOCAL_RESOLV_ADDR:
+        rc = ble_ll_resolv_local_addr_rd(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_SET_ADDR_RES_EN:
+        rc = ble_ll_resolv_enable_cmd(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_RPA_TMO:
+        rc = ble_ll_resolv_set_rpa_tmo(cmdbuf, len);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
+    case BLE_HCI_OCF_LE_RD_MAX_DATA_LEN:
+        if (len == 0) {
+            rc = ble_ll_hci_le_rd_max_data_len(rspbuf, rsplen);
+        }
+        break;
+#endif
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    case BLE_HCI_OCF_LE_RD_PHY:
+        rc = ble_ll_conn_hci_le_rd_phy(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_SET_DEFAULT_PHY:
+        rc = ble_ll_hci_le_set_def_phy(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_PHY:
+        rc = ble_ll_conn_hci_le_set_phy(cmdbuf, len);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_DTM)
+    case BLE_HCI_OCF_LE_RX_TEST_V2:
+        rc = ble_ll_hci_dtm_rx_test_v2(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_TX_TEST_V2:
+        rc = ble_ll_hci_dtm_tx_test_v2(cmdbuf, len);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    case BLE_HCI_OCF_LE_SET_ADV_SET_RND_ADDR:
+        rc = ble_ll_adv_hci_set_random_addr(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_EXT_ADV_PARAM:
+        rc = ble_ll_adv_ext_set_param(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_SET_EXT_ADV_DATA:
+        rc = ble_ll_adv_ext_set_adv_data(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_EXT_SCAN_RSP_DATA:
+        rc = ble_ll_adv_ext_set_scan_rsp(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_EXT_ADV_ENABLE:
+        rc =  ble_ll_adv_ext_set_enable(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_RD_MAX_ADV_DATA_LEN:
+        if (len == 0) {
+            rc = ble_ll_adv_rd_max_adv_data_len(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_RD_NUM_OF_ADV_SETS:
+        if (len == 0) {
+            rc = ble_ll_adv_rd_sup_adv_sets(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_LE_REMOVE_ADV_SET:
+        rc =  ble_ll_adv_remove(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_CLEAR_ADV_SETS:
+        if (len == 0) {
+            rc =  ble_ll_adv_clear_all();
+        }
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    case BLE_HCI_OCF_LE_SET_PERIODIC_ADV_PARAMS:
+        rc = ble_ll_adv_periodic_set_param(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_PERIODIC_ADV_DATA:
+        rc = ble_ll_adv_periodic_set_data(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_PERIODIC_ADV_ENABLE:
+        rc = ble_ll_adv_periodic_enable(cmdbuf, len);
+        break;
+#endif
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    case BLE_HCI_OCF_LE_SET_EXT_SCAN_PARAM:
+        rc = ble_ll_set_ext_scan_params(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_SET_EXT_SCAN_ENABLE:
+        rc = ble_ll_hci_ext_scan_set_enable(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_EXT_CREATE_CONN:
+        rc = ble_ll_ext_conn_create(cmdbuf, len);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_CREATE_SYNC:
+        rc = ble_ll_sync_create(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_CREATE_SYNC_CANCEL:
+        if (len == 0) {
+            rc = ble_ll_sync_cancel(cb);
+        }
+        break;
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_TERM_SYNC:
+        rc = ble_ll_sync_terminate(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_ADD_DEV_TO_PERIODIC_ADV_LIST:
+        rc = ble_ll_sync_list_add(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_REM_DEV_FROM_PERIODIC_ADV_LIST:
+        rc = ble_ll_sync_list_remove(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_LE_CLEAR_PERIODIC_ADV_LIST:
+        if (len == 0) {
+            rc = ble_ll_sync_list_clear();
+        }
+        break;
+    case BLE_HCI_OCF_LE_RD_PERIODIC_ADV_LIST_SIZE:
+        if (len == 0) {
+            rc = ble_ll_sync_list_size(rspbuf, rsplen);
+        }
+        break;
+#if MYNEWT_VAL(BLE_VERSION) >= 51
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_RECEIVE_ENABLE:
+        rc = ble_ll_sync_receive_enable(cmdbuf, len);
+        break;
+#endif
+#endif
+    case BLE_HCI_OCF_LE_RD_TRANSMIT_POWER:
+        rc = ble_ll_read_tx_power(rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_RD_RF_PATH_COMPENSATION:
+        rc = ble_ll_read_rf_path_compensation(rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_WR_RF_PATH_COMPENSATION:
+        rc = ble_ll_write_rf_path_compensation(cmdbuf, len);
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    case BLE_HCI_OCF_LE_SET_PRIVACY_MODE:
+        rc = ble_ll_resolve_set_priv_mode(cmdbuf, len);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_SYNC_TRANSFER:
+        rc = ble_ll_sync_transfer(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_SET_INFO_TRANSFER:
+        rc = ble_ll_adv_periodic_set_info_transfer(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_PERIODIC_ADV_SYNC_TRANSFER_PARAMS:
+        rc = ble_ll_set_sync_transfer_params(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_LE_SET_DEFAULT_SYNC_TRANSFER_PARAMS:
+        rc = ble_ll_set_default_sync_transfer_params(cmdbuf, len);
+        break;
+#endif
+#if MYNEWT_VAL(BLE_VERSION) >= 52
+    case BLE_HCI_OCF_LE_SET_HOST_FEAT:
+        rc = ble_ll_set_host_feat(cmdbuf, len);
+        break;
+#endif
+    default:
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        break;
+    }
+
+    /*
+     * This code is here because we add 256 to the return code to denote
+     * that the reply to this command should be command status (as opposed to
+     * command complete).
+     *
+     * For unknown HCI command let us return always command status as per
+     * specification Bluetooth 5, Vol. 2, Chapter 4.4
+     */
+    if (ble_ll_hci_le_cmd_send_cmd_status(ocf) || rc == BLE_ERR_UNKNOWN_HCI_CMD) {
+        rc += (BLE_ERR_MAX + 1);
+    }
+
+    return rc;
+}
+
+/**
+ * Process a link control command sent from the host to the controller. The HCI
+ * command has a 3 byte command header followed by data. The header is:
+ *  -> opcode (2 bytes)
+ *  -> Length of parameters (1 byte; does include command header bytes).
+ *
+ * @param cmdbuf Pointer to command buffer. Points to start of command header.
+ * @param ocf    Opcode command field.
+ *
+ * @return int  This function returns a BLE error code. If a command status
+ *              event should be returned as opposed to command complete,
+ *              256 gets added to the return value.
+ */
+static int
+ble_ll_hci_link_ctrl_cmd_proc(const uint8_t *cmdbuf, uint8_t len, uint16_t ocf)
+{
+    int rc;
+
+    switch (ocf) {
+    case BLE_HCI_OCF_DISCONNECT_CMD:
+        rc = ble_ll_conn_hci_disconnect_cmd(cmdbuf, len);
+        /* Send command status instead of command complete */
+        rc += (BLE_ERR_MAX + 1);
+        break;
+
+    case BLE_HCI_OCF_RD_REM_VER_INFO:
+        rc = ble_ll_conn_hci_rd_rem_ver_cmd(cmdbuf, len);
+        /* Send command status instead of command complete */
+        rc += (BLE_ERR_MAX + 1);
+        break;
+
+    default:
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        break;
+    }
+
+    return rc;
+}
+
+static int
+ble_ll_hci_cb_set_event_mask(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_cb_set_event_mask_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof (*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    g_ble_ll_hci_event_mask = le64toh(cmd->event_mask);
+
+    return BLE_ERR_SUCCESS;
+}
+
+static int
+ble_ll_hci_cb_set_event_mask2(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_cb_set_event_mask2_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof (*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    g_ble_ll_hci_event_mask2 = le64toh(cmd->event_mask2);
+
+    return BLE_ERR_SUCCESS;
+}
+
+static int
+ble_ll_hci_ctlr_bb_cmd_proc(const uint8_t *cmdbuf, uint8_t len, uint16_t ocf,
+                            uint8_t *rspbuf, uint8_t *rsplen)
+{
+    int rc;
+
+    /* Assume error; if all pass rc gets set to 0 */
+    rc = BLE_ERR_INV_HCI_CMD_PARMS;
+
+    switch (ocf) {
+    case BLE_HCI_OCF_CB_SET_EVENT_MASK:
+        rc = ble_ll_hci_cb_set_event_mask(cmdbuf, len);
+        break;
+    case BLE_HCI_OCF_CB_RESET:
+        if (len == 0) {
+            rc = ble_ll_reset();
+        }
+        break;
+    case BLE_HCI_OCF_CB_SET_EVENT_MASK2:
+        rc = ble_ll_hci_cb_set_event_mask2(cmdbuf, len);
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_PING)
+    case BLE_HCI_OCF_CB_RD_AUTH_PYLD_TMO:
+        rc = ble_ll_conn_hci_rd_auth_pyld_tmo(cmdbuf, len, rspbuf, rsplen);
+        break;
+    case BLE_HCI_OCF_CB_WR_AUTH_PYLD_TMO:
+        rc = ble_ll_conn_hci_wr_auth_pyld_tmo(cmdbuf, len, rspbuf, rsplen);
+        break;
+#endif
+    default:
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        break;
+    }
+
+    return rc;
+}
+
+static int
+ble_ll_hci_info_params_cmd_proc(const uint8_t *cmdbuf, uint8_t len,
+                                uint16_t ocf, uint8_t *rspbuf, uint8_t *rsplen)
+{
+    int rc;
+
+    /* Assume error; if all pass rc gets set to 0 */
+    rc = BLE_ERR_INV_HCI_CMD_PARMS;
+
+    switch (ocf) {
+    case BLE_HCI_OCF_IP_RD_LOCAL_VER:
+        if (len == 0) {
+            rc = ble_ll_hci_rd_local_version(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_IP_RD_LOC_SUPP_CMD:
+        if (len == 0) {
+            rc = ble_ll_hci_rd_local_supp_cmd(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_IP_RD_LOC_SUPP_FEAT:
+        if (len == 0) {
+            rc = ble_ll_hci_rd_local_supp_feat(rspbuf, rsplen);
+        }
+        break;
+    case BLE_HCI_OCF_IP_RD_BD_ADDR:
+        if (len == 0) {
+            rc = ble_ll_hci_rd_bd_addr(rspbuf, rsplen);
+        }
+        break;
+    default:
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        break;
+    }
+
+    return rc;
+}
+
+static int
+ble_ll_hci_status_params_cmd_proc(const uint8_t *cmdbuf, uint8_t len,
+                                  uint16_t ocf, uint8_t *rspbuf,
+                                  uint8_t *rsplen)
+{
+    int rc;
+
+    switch (ocf) {
+    case BLE_HCI_OCF_RD_RSSI:
+        rc = ble_ll_conn_hci_rd_rssi(cmdbuf, len, rspbuf, rsplen);
+        break;
+    default:
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        break;
+    }
+
+    return rc;
+}
+
+/**
+ * Called to process an HCI command from the host.
+ *
+ * @param ev Pointer to os event containing a pointer to command buffer
+ */
+static void
+ble_ll_hci_cmd_proc(struct ble_npl_event *ev)
+{
+    int rc;
+    uint8_t ogf;
+    uint8_t rsplen;
+    struct ble_hci_cmd *cmd;
+    uint16_t opcode;
+    uint16_t ocf;
+    ble_ll_hci_post_cmd_complete_cb post_cb = NULL;
+    struct ble_hci_ev *hci_ev;
+    struct ble_hci_ev_command_status *cmd_status;
+    struct ble_hci_ev_command_complete *cmd_complete;
+    uint8_t *rspbuf;
+
+    BLE_LL_DEBUG_GPIO(HCI_CMD, 1);
+
+    /* The command buffer is the event argument */
+    cmd = ble_npl_event_get_arg(ev);
+    BLE_LL_ASSERT(cmd != NULL);
+
+    /* Get the opcode from the command buffer */
+    opcode = le16toh(cmd->opcode);
+    ocf = BLE_HCI_OCF(opcode);
+    ogf = BLE_HCI_OGF(opcode);
+
+    /*
+     * The command response pointer points into the same buffer as the
+     * command data itself. That is fine, as each command reads all the data
+     * before crafting a response.
+     * Also reuse cmd buffer for complete event
+     */
+    hci_ev = (struct ble_hci_ev *) cmd;
+    rspbuf = hci_ev->data + sizeof(*cmd_complete);
+
+    /* Assume response length is zero */
+    rsplen = 0;
+
+    switch (ogf) {
+    case BLE_HCI_OGF_LINK_CTRL:
+        rc = ble_ll_hci_link_ctrl_cmd_proc(cmd->data, cmd->length, ocf);
+        break;
+    case BLE_HCI_OGF_CTLR_BASEBAND:
+        rc = ble_ll_hci_ctlr_bb_cmd_proc(cmd->data, cmd->length, ocf, rspbuf, &rsplen);
+        break;
+    case BLE_HCI_OGF_INFO_PARAMS:
+        rc = ble_ll_hci_info_params_cmd_proc(cmd->data, cmd->length, ocf, rspbuf, &rsplen);
+        break;
+    case BLE_HCI_OGF_STATUS_PARAMS:
+        rc = ble_ll_hci_status_params_cmd_proc(cmd->data, cmd->length, ocf, rspbuf, &rsplen);
+        break;
+    case BLE_HCI_OGF_LE:
+        rc = ble_ll_hci_le_cmd_proc(cmd->data, cmd->length, ocf, rspbuf, &rsplen, &post_cb);
+        break;
+    default:
+        /* XXX: Need to support other OGF. For now, return unsupported */
+        rc = BLE_ERR_UNKNOWN_HCI_CMD;
+        break;
+    }
+
+    /* If no response is generated, we free the buffers */
+    BLE_LL_ASSERT(rc >= 0);
+    if (rc <= BLE_ERR_MAX) {
+        /* Create a command complete event with status from command */
+        hci_ev->opcode = BLE_HCI_EVCODE_COMMAND_COMPLETE;
+        hci_ev->length = sizeof(*cmd_complete) + rsplen;
+
+        cmd_complete = (void *) hci_ev->data;
+        cmd_complete->num_packets = ble_ll_hci_get_num_cmd_pkts();
+        cmd_complete->opcode = htole16(opcode);
+        cmd_complete->status = (uint8_t) rc;
+    } else {
+        /* Create a command status event */
+        rc -= (BLE_ERR_MAX + 1);
+
+        hci_ev->opcode = BLE_HCI_EVCODE_COMMAND_STATUS;
+        hci_ev->length = sizeof(*cmd_status);
+
+        cmd_status = (void *) hci_ev->data;
+        cmd_status->status = (uint8_t)rc;
+        cmd_status->num_packets = ble_ll_hci_get_num_cmd_pkts();
+        cmd_status->opcode = htole16(opcode);
+    }
+
+    /* Count commands and those in error */
+    if (rc) {
+        STATS_INC(ble_ll_stats, hci_cmd_errs);
+    } else {
+        STATS_INC(ble_ll_stats, hci_cmds);
+    }
+
+    /* Send the event (events cannot be masked) */
+    ble_ll_hci_event_send(hci_ev);
+
+    /* Call post callback if set by command handler */
+    if (post_cb) {
+        post_cb();
+    }
+
+    BLE_LL_DEBUG_GPIO(HCI_CMD, 0);
+}
+
+/**
+ * Sends an HCI command to the controller.  On success, the supplied buffer is
+ * relinquished to the controller task.  On failure, the caller must free the
+ * buffer.
+ *
+ * @param cmd                   A flat buffer containing the HCI command to
+ *                                  send.
+ *
+ * @return                      0 on success;
+ *                              BLE_ERR_MEM_CAPACITY on HCI buffer exhaustion.
+ */
+int
+ble_ll_hci_cmd_rx(uint8_t *cmd, void *arg)
+{
+    struct ble_npl_event *ev;
+
+    /* Get an event structure off the queue */
+    ev = &g_ble_ll_hci_cmd_ev;
+    if (ble_npl_event_is_queued(ev)) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    /* Fill out the event and post to Link Layer */
+    ble_npl_event_set_arg(ev, cmd);
+    ble_npl_eventq_put(&g_ble_ll_data.ll_evq, ev);
+
+    return 0;
+}
+
+/* Send ACL data from host to contoller */
+int
+ble_ll_hci_acl_rx(struct os_mbuf *om, void *arg)
+{
+    ble_ll_acl_data_in(om);
+    return 0;
+}
+
+/**
+ * Initalize the LL HCI.
+ *
+ * NOTE: This function is called by the HCI RESET command so if any code
+ * is added here it must be OK to be executed when the reset command is used.
+ */
+void
+ble_ll_hci_init(void)
+{
+    BLE_LL_DEBUG_GPIO_INIT(HCI_CMD);
+    BLE_LL_DEBUG_GPIO_INIT(HCI_EV);
+
+    /* Set event callback for command processing */
+    ble_npl_event_init(&g_ble_ll_hci_cmd_ev, ble_ll_hci_cmd_proc, NULL);
+
+    /* Set defaults for LE events: Vol 2 Part E 7.8.1 */
+    g_ble_ll_hci_le_event_mask = 0x1f;
+
+    /* Set defaults for controller/baseband events: Vol 2 Part E 7.3.1 */
+    g_ble_ll_hci_event_mask = 0x1fffffffffff;
+
+
+    /* Set page 2 to 0 */
+    g_ble_ll_hci_event_mask2 = 0;
+
+    /* reset RF path compensation values */
+    rx_path_pwr_compensation = 0;
+    tx_path_pwr_compensation = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* after reset both legacy and extended advertising commands are allowed */
+    hci_adv_mode = ADV_MODE_ANY;
+#endif
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_hci_ev.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_hci_ev.c
new file mode 100644
index 000000000..b78b919ef
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_hci_ev.c
@@ -0,0 +1,526 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+ 
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_ctrl.h"
+#include "ble_ll_conn_priv.h"
+
+#if (BLETEST_CONCURRENT_CONN_TEST == 1)
+extern void bletest_ltk_req_reply(uint16_t handle);
+#endif
+
+/**
+ * Send a data length change event for a connection to the host.
+ *
+ * @param connsm Pointer to connection state machine
+ */
+void
+ble_ll_hci_ev_datalen_chg(struct ble_ll_conn_sm *connsm)
+{
+    struct ble_hci_ev_le_subev_data_len_chg *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_DATA_LEN_CHG)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_DATA_LEN_CHG;
+            ev->conn_handle = htole16(connsm->conn_handle);
+
+            ev->max_tx_octets = htole16(connsm->eff_max_tx_octets);
+            ev->max_tx_time = htole16(connsm->eff_max_tx_time);
+            ev->max_rx_octets = htole16(connsm->eff_max_rx_octets);
+            ev->max_rx_time = htole16(connsm->eff_max_rx_time);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+/**
+ * Send a connection parameter request event for a connection to the host.
+ *
+ * @param connsm Pointer to connection state machine
+ */
+void
+ble_ll_hci_ev_rem_conn_parm_req(struct ble_ll_conn_sm *connsm,
+                                struct ble_ll_conn_params *cp)
+{
+    struct ble_hci_ev_le_subev_rem_conn_param_req *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_REM_CONN_PARM_REQ)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_REM_CONN_PARM_REQ;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->min_interval = htole16(cp->interval_min);
+            ev->max_interval = htole16(cp->interval_max);
+            ev->latency = htole16(cp->latency);
+            ev->timeout = htole16(cp->timeout);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+/**
+ * Send a connection update event.
+ *
+ * @param connsm Pointer to connection state machine
+ * @param status The error code.
+ */
+void
+ble_ll_hci_ev_conn_update(struct ble_ll_conn_sm *connsm, uint8_t status)
+{
+    struct ble_hci_ev_le_subev_conn_upd_complete *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_CONN_UPD_COMPLETE)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_CONN_UPD_COMPLETE;
+            ev->status = status;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->conn_itvl = htole16(connsm->conn_itvl);
+            ev->conn_latency = htole16(connsm->slave_latency);
+            ev->supervision_timeout = htole16(connsm->supervision_tmo);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+void
+ble_ll_hci_ev_encrypt_chg(struct ble_ll_conn_sm *connsm, uint8_t status)
+{
+    struct ble_hci_ev_enc_key_refresh *ev_key_refresh;
+    struct ble_hci_ev_enrypt_chg *ev_enc_chf;
+    struct ble_hci_ev *hci_ev;
+
+    if (CONN_F_ENC_CHANGE_SENT(connsm) == 0) {
+        if (ble_ll_hci_is_event_enabled(BLE_HCI_EVCODE_ENCRYPT_CHG)) {
+            hci_ev = (void *)ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+            if (hci_ev) {
+                hci_ev->opcode = BLE_HCI_EVCODE_ENCRYPT_CHG;
+                hci_ev->length = sizeof(*ev_enc_chf);
+                ev_enc_chf = (void *) hci_ev->data;
+
+                ev_enc_chf->status = status;
+                ev_enc_chf->connection_handle = htole16(connsm->conn_handle);
+                ev_enc_chf->enabled = (status == BLE_ERR_SUCCESS) ? 0x01 : 0x00;
+
+                ble_ll_hci_event_send(hci_ev);
+            }
+        }
+
+        CONN_F_ENC_CHANGE_SENT(connsm) = 1;
+        return;
+    }
+
+    if (ble_ll_hci_is_event_enabled(BLE_HCI_EVCODE_ENC_KEY_REFRESH)) {
+        hci_ev = (void *)ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_ENC_KEY_REFRESH;
+            hci_ev->length = sizeof(*ev_key_refresh);
+            ev_key_refresh = (void *) hci_ev->data;
+
+            ev_key_refresh->status = status;
+            ev_key_refresh->conn_handle = htole16(connsm->conn_handle);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+/**
+ * Send a long term key request event for a connection to the host.
+ *
+ * @param connsm Pointer to connection state machine
+ */
+int
+ble_ll_hci_ev_ltk_req(struct ble_ll_conn_sm *connsm)
+{
+    struct ble_hci_ev_le_subev_lt_key_req *ev;
+    struct ble_hci_ev *hci_ev;
+    int rc;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_LT_KEY_REQ)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_LT_KEY_REQ;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->rand = htole64(connsm->enc_data.host_rand_num);
+            ev->div = htole16(connsm->enc_data.enc_div);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+        rc = 0;
+    } else {
+        rc = -1;
+    }
+
+#if (BLETEST_CONCURRENT_CONN_TEST == 1)
+    if (rc == 0) {
+        bletest_ltk_req_reply(connsm->conn_handle);
+    }
+#endif
+    return rc;
+}
+#endif
+
+void
+ble_ll_hci_ev_rd_rem_used_feat(struct ble_ll_conn_sm *connsm, uint8_t status)
+{
+    struct ble_hci_ev_le_subev_rd_rem_used_feat *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_RD_REM_USED_FEAT)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_RD_REM_USED_FEAT;
+            ev->status = status;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->features[0] = connsm->conn_features;
+            memcpy(ev->features + 1, connsm->remote_features, 7);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+void
+ble_ll_hci_ev_rd_rem_ver(struct ble_ll_conn_sm *connsm, uint8_t status)
+{
+    struct ble_hci_ev_rd_rem_ver_info_cmp *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_event_enabled(BLE_HCI_EVCODE_RD_REM_VER_INFO_CMP)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_RD_REM_VER_INFO_CMP;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->status = status;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->version = connsm->vers_nr;
+            ev->manufacturer = htole16(connsm->comp_id);
+            ev->subversion = htole16(connsm->sub_vers_nr);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+/**
+ * Send a HW error to the host.
+ *
+ * @param hw_err
+ *
+ * @return int 0: event masked or event sent, -1 otherwise
+ */
+int
+ble_ll_hci_ev_hw_err(uint8_t hw_err)
+{
+    struct ble_hci_ev_hw_error *ev;
+    struct ble_hci_ev *hci_ev;
+    int rc;
+
+    rc = 0;
+    if (ble_ll_hci_is_event_enabled(BLE_HCI_EVCODE_HW_ERROR)) {
+        hci_ev = (void *)ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_HW_ERROR;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->hw_code = hw_err;
+
+            ble_ll_hci_event_send(hci_ev);
+        } else {
+            rc = -1;
+        }
+    }
+    return rc;
+}
+
+void
+ble_ll_hci_ev_databuf_overflow(void)
+{
+    struct ble_hci_ev_data_buf_overflow *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_event_enabled(BLE_HCI_EVCODE_DATA_BUF_OVERFLOW)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_DATA_BUF_OVERFLOW;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->link_type = BLE_HCI_EVENT_ACL_BUF_OVERFLOW;
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+/**
+ * Send a LE Channel Selection Algorithm event.
+ *
+ * @param connsm Pointer to connection state machine
+ */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+void
+ble_ll_hci_ev_le_csa(struct ble_ll_conn_sm *connsm)
+{
+    struct ble_hci_ev_le_subev_chan_sel_alg *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_CHAN_SEL_ALG)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_CHAN_SEL_ALG;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->csa = connsm->csmflags.cfbit.csa2_supp ? 0x01 : 0x00;
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+#endif
+
+/**
+ * Sends the LE Scan Request Received event
+ *
+ */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+void
+ble_ll_hci_ev_send_scan_req_recv(uint8_t adv_handle, const uint8_t *peer,
+                                 uint8_t peer_addr_type)
+{
+    struct ble_hci_ev_le_subev_scan_req_rcvd *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_SCAN_REQ_RCVD)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_SCAN_REQ_RCVD;
+            ev->adv_handle = adv_handle;
+            ev->peer_addr_type = peer_addr_type;
+            memcpy(ev->peer_addr, peer, BLE_DEV_ADDR_LEN);
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+#endif
+
+/**
+ * Sends the  LE Scan Timeout Event
+ *
+ */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+void
+ble_ll_hci_ev_send_scan_timeout(void)
+{
+    struct ble_hci_ev_le_subev_scan_timeout *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_SCAN_TIMEOUT)) {
+        hci_ev = (void *)ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_SCAN_TIMEOUT;
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+#endif
+
+/**
+ * Sends the LE Advertising Set Terminated event
+ *
+ */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+void
+ble_ll_hci_ev_send_adv_set_terminated(uint8_t status, uint8_t adv_handle,
+                                      uint16_t conn_handle, uint8_t events)
+{
+    struct ble_hci_ev_le_subev_adv_set_terminated *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_ADV_SET_TERMINATED)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_ADV_SET_TERMINATED;
+            ev->status = status;
+            ev->adv_handle = adv_handle;
+            ev->conn_handle = htole16(conn_handle);
+            ev->num_events = events;
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+#endif
+
+/**
+ * Send a PHY update complete event
+ *
+ * @param connsm Pointer to connection state machine
+ * @param status error status of event
+ */
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+int
+ble_ll_hci_ev_phy_update(struct ble_ll_conn_sm *connsm, uint8_t status)
+{
+    struct ble_hci_ev_le_subev_phy_update_complete *ev;
+    struct ble_hci_ev *hci_ev;
+    int rc;
+
+    rc = 0;
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_PHY_UPDATE_COMPLETE)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_PHY_UPDATE_COMPLETE;
+            ev->status = status;
+            ev->conn_handle = htole16(connsm->conn_handle);
+            ev->tx_phy = connsm->phy_data.cur_tx_phy;
+            ev->rx_phy = connsm->phy_data.cur_rx_phy;
+
+            ble_ll_hci_event_send(hci_ev);
+        } else {
+            rc = BLE_ERR_MEM_CAPACITY;
+        }
+    }
+    return rc;
+}
+#endif
+
+void
+ble_ll_hci_ev_send_vendor_err(const char *file, uint32_t line)
+{
+    struct ble_hci_ev_vendor_debug *ev;
+    struct ble_hci_ev *hci_ev;
+    unsigned int str_len;
+    bool skip = true;
+    uint8_t digit;
+    int max_len;
+    int i;
+
+    /* 6 is for line number ":00000" , we assume files have no more than 64k of
+     * lines
+     */
+    max_len = BLE_HCI_MAX_DATA_LEN - sizeof(*ev) - 6;
+
+    hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+    if (hci_ev) {
+        hci_ev->opcode = BLE_HCI_EVCODE_VENDOR_DEBUG;
+        hci_ev->length = sizeof(*ev);
+        ev = (void *) hci_ev->data;
+
+        /* Debug id for future use */
+        ev->id = 0x00;
+
+        /* snprintf would be nicer but this is heavy on flash
+         * len = snprintf((char *) ev->data, max_len, "%s:%u", file, line);
+         * if (len < 0) {
+         *     len = 0;
+         * } else if (len > max_len) {
+         *     len = max_len;
+         * }
+         *
+         *  hci_ev->length += len;
+         */
+        str_len = strlen(file);
+        if (str_len > max_len) {
+            str_len = max_len;
+        }
+
+        memcpy(ev->data, file, str_len);
+        ev->data[str_len++] = ':';
+
+        for (i = 100000; i >= 10; i /= 10) {
+            digit = (line % i) / (i/10);
+
+            if (!digit && skip) {
+                continue;
+            }
+
+            skip = false;
+            ev->data[str_len++] = '0' + digit;
+        }
+
+        hci_ev->length += str_len;
+
+        ble_ll_hci_event_send(hci_ev);
+    }
+}
+
+#endif
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_priv.h
similarity index 54%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_priv.h
index 86157da0f..900950ef6 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_priv.h
@@ -17,30 +17,35 @@
  * under the License.
  */
 
-#ifndef H_BLE_HS_PVCY_PRIV_
-#define H_BLE_HS_PVCY_PRIV_
-
-#include <inttypes.h>
+#ifndef H_BLE_LL_PRIV_
+#define H_BLE_LL_PRIV_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-extern const uint8_t ble_hs_pvcy_default_irk[16];
+#ifdef MYNEWT
 
-int ble_hs_pvcy_set_our_irk(const uint8_t *irk);
-int ble_hs_pvcy_our_irk(const uint8_t **out_irk);
-int ble_hs_pvcy_remove_entry(uint8_t addr_type, const uint8_t *addr);
-int ble_hs_pvcy_add_entry(const uint8_t *addr, uint8_t addrtype,
-                          const uint8_t *irk);
-int ble_hs_pvcy_ensure_started(void);
-int ble_hs_pvcy_set_mode(const ble_addr_t *addr, uint8_t priv_mode);
-#if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
-bool ble_hs_pvcy_enabled(void);
+#include "syscfg/syscfg.h"
+#include "hal/hal_gpio.h"
+
+#define BLE_LL_DEBUG_GPIO_INIT(_name)                                       \
+    if (MYNEWT_VAL(BLE_LL_DEBUG_GPIO_ ## _name) >= 0) {                     \
+        hal_gpio_init_out(MYNEWT_VAL(BLE_LL_DEBUG_GPIO_ ## _name), 0);      \
+    }
+
+#define BLE_LL_DEBUG_GPIO(_name, _val)                                      \
+    if (MYNEWT_VAL(BLE_LL_DEBUG_GPIO_ ## _name) >= 0) {                     \
+        hal_gpio_write(MYNEWT_VAL(BLE_LL_DEBUG_GPIO_ ## _name), !!(_val));  \
+    }
+
+#else
+#define BLE_LL_DEBUG_GPIO_INIT(_name)       (void)(0)
+#define BLE_LL_DEBUG_GPIO(_name, _val)      (void)(0)
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif
+#endif /* H_BLE_LL_PRIV_ */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_rand.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_rand.c
new file mode 100644
index 000000000..dd89e04b0
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_rand.c
@@ -0,0 +1,188 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "../include/controller/ble_hw.h"
+#include "../include/controller/ble_ll.h"
+#if MYNEWT_VAL(TRNG)
+#include "trng/trng.h"
+#endif
+
+#if MYNEWT_VAL(TRNG)
+static struct trng_dev *g_trng;
+#else
+/* This is a simple circular buffer for holding N samples of random data */
+struct ble_ll_rnum_data
+{
+    uint8_t *rnd_in;
+    uint8_t *rnd_out;
+    volatile uint8_t rnd_size;
+};
+
+struct ble_ll_rnum_data g_ble_ll_rnum_data;
+uint8_t g_ble_ll_rnum_buf[MYNEWT_VAL(BLE_LL_RNG_BUFSIZE)];
+
+#define IS_RNUM_BUF_END(x)  \
+    (x == &g_ble_ll_rnum_buf[MYNEWT_VAL(BLE_LL_RNG_BUFSIZE) - 1])
+
+void
+ble_ll_rand_sample(uint8_t rnum)
+{
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+    if (g_ble_ll_rnum_data.rnd_size < MYNEWT_VAL(BLE_LL_RNG_BUFSIZE)) {
+        ++g_ble_ll_rnum_data.rnd_size;
+        g_ble_ll_rnum_data.rnd_in[0] = rnum;
+        if (IS_RNUM_BUF_END(g_ble_ll_rnum_data.rnd_in)) {
+            g_ble_ll_rnum_data.rnd_in = g_ble_ll_rnum_buf;
+        } else {
+            ++g_ble_ll_rnum_data.rnd_in;
+        }
+    } else {
+        /* Stop generating random numbers as we are full */
+        ble_hw_rng_stop();
+    }
+    OS_EXIT_CRITICAL(sr);
+}
+#endif
+
+/* Get 'len' bytes of random data */
+int
+ble_ll_rand_data_get(uint8_t *buf, uint8_t len)
+{
+#if MYNEWT_VAL(TRNG)
+    size_t num;
+
+    while (len) {
+        num = trng_read(g_trng, buf, len);
+        buf += num;
+        len -= num;
+    }
+#else
+    uint8_t rnums;
+    os_sr_t sr;
+
+    while (len != 0) {
+        OS_ENTER_CRITICAL(sr);
+        rnums = g_ble_ll_rnum_data.rnd_size;
+        if (rnums > len) {
+            rnums = len;
+        }
+        len -= rnums;
+        g_ble_ll_rnum_data.rnd_size -= rnums;
+        while (rnums) {
+            buf[0] = g_ble_ll_rnum_data.rnd_out[0];
+            if (IS_RNUM_BUF_END(g_ble_ll_rnum_data.rnd_out)) {
+                g_ble_ll_rnum_data.rnd_out = g_ble_ll_rnum_buf;
+            } else {
+                ++g_ble_ll_rnum_data.rnd_out;
+            }
+            ++buf;
+            --rnums;
+        }
+        OS_EXIT_CRITICAL(sr);
+
+        /* Make sure rng is started! */
+        ble_hw_rng_start();
+
+        /* Wait till bytes are in buffer. */
+        if (len) {
+            while ((g_ble_ll_rnum_data.rnd_size < len) &&
+                   (g_ble_ll_rnum_data.rnd_size < MYNEWT_VAL(BLE_LL_RNG_BUFSIZE))) {
+                /* Spin here */
+            }
+        }
+    }
+#endif
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Called to obtain a "prand" as defined in core V4.2 Vol 6 Part B 1.3.2.2
+ *
+ * @param prand
+ */
+void
+ble_ll_rand_prand_get(uint8_t *prand)
+{
+    uint16_t sum;
+
+    while (1) {
+        /* Get 24 bits of random data */
+        ble_ll_rand_data_get(prand, 3);
+
+        /* Prand cannot be all zeros or 1's. */
+        sum = prand[0] + prand[1] + prand[2];
+        if ((sum != 0) && (sum != (3 * 0xff))) {
+            break;
+        }
+    }
+
+    /* Upper two bits must be 01 */
+    prand[2] &= ~0xc0;
+    prand[2] |= 0x40;
+}
+
+/**
+ * Start the generation of random numbers
+ *
+ * @return int
+ */
+int
+ble_ll_rand_start(void)
+{
+#if MYNEWT_VAL(TRNG)
+    /* Nothing to do - this is handled by driver */
+#else
+    /* Start the generation of numbers if we are not full */
+    if (g_ble_ll_rnum_data.rnd_size < MYNEWT_VAL(BLE_LL_RNG_BUFSIZE)) {
+        ble_hw_rng_start();
+    }
+#endif
+    return 0;
+}
+
+/**
+ * Initialize LL random number generation. Should be called only once on
+ * initialization.
+ *
+ * @return int
+ */
+int
+ble_ll_rand_init(void)
+{
+#if MYNEWT_VAL(TRNG)
+    g_trng = (struct trng_dev *) os_dev_open("trng", OS_TIMEOUT_NEVER, NULL);
+#else
+    g_ble_ll_rnum_data.rnd_in = g_ble_ll_rnum_buf;
+    g_ble_ll_rnum_data.rnd_out = g_ble_ll_rnum_buf;
+    ble_hw_rng_init(ble_ll_rand_sample, 1);
+#endif
+    return 0;
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_resolv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_resolv.c
new file mode 100644
index 000000000..231ecad23
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_resolv.c
@@ -0,0 +1,755 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_resolv.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_sync.h"
+#include "../include/controller/ble_hw.h"
+#include "ble_ll_conn_priv.h"
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+struct ble_ll_resolv_data
+{
+    uint8_t addr_res_enabled;
+    uint8_t rl_size;
+    uint8_t rl_cnt_hw;
+    uint8_t rl_cnt;
+    ble_npl_time_t rpa_tmo;
+    struct ble_npl_callout rpa_timer;
+};
+struct ble_ll_resolv_data g_ble_ll_resolv_data;
+
+__attribute__((aligned(4)))
+struct ble_ll_resolv_entry g_ble_ll_resolv_list[MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE)];
+
+static int
+ble_ll_is_controller_busy(void)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    if (ble_ll_sync_enabled()) {
+        return 1;
+    }
+#endif
+
+    return ble_ll_adv_enabled() || ble_ll_scan_enabled() ||
+           g_ble_ll_conn_create_sm;
+}
+/**
+ * Called to determine if a change is allowed to the resolving list at this
+ * time. We are not allowed to modify the resolving list if address translation
+ * is enabled and we are either scanning, advertising, or attempting to create
+ * a connection.
+ *
+ * @return int 0: not allowed. 1: allowed.
+ */
+static int
+ble_ll_resolv_list_chg_allowed(void)
+{
+    int rc;
+
+    if (g_ble_ll_resolv_data.addr_res_enabled &&
+       ble_ll_is_controller_busy()) {
+        rc = 0;
+    } else {
+        rc = 1;
+    }
+    return rc;
+}
+
+
+/**
+ * Called to generate a resolvable private address in rl structure
+ *
+ * @param rl
+ * @param local
+ */
+static void
+ble_ll_resolv_gen_priv_addr(struct ble_ll_resolv_entry *rl, int local)
+{
+    uint8_t *irk;
+    uint8_t *prand;
+    struct ble_encryption_block ecb;
+    uint8_t *addr;
+
+    BLE_LL_ASSERT(rl != NULL);
+
+    if (local) {
+        addr = rl->rl_local_rpa;
+        irk = rl->rl_local_irk;
+    } else {
+        addr = rl->rl_peer_rpa;
+        irk = rl->rl_peer_irk;
+    }
+
+    /* Get prand */
+    prand = addr + 3;
+    ble_ll_rand_prand_get(prand);
+
+    /* Calculate hash, hash = ah(local IRK, prand) */
+    memcpy(ecb.key, irk, 16);
+    memset(ecb.plain_text, 0, 13);
+    ecb.plain_text[13] = prand[2];
+    ecb.plain_text[14] = prand[1];
+    ecb.plain_text[15] = prand[0];
+
+    /* Calculate hash */
+    ble_hw_encrypt_block(&ecb);
+
+    addr[0] = ecb.cipher_text[15];
+    addr[1] = ecb.cipher_text[14];
+    addr[2] = ecb.cipher_text[13];
+}
+
+/**
+ * Called when the Resolvable private address timer expires. This timer
+ * is used to regenerate local and peers RPA's in the resolving list.
+ */
+static void
+ble_ll_resolv_rpa_timer_cb(struct ble_npl_event *ev)
+{
+    int i;
+    os_sr_t sr;
+    struct ble_ll_resolv_entry *rl;
+
+    rl = &g_ble_ll_resolv_list[0];
+    for (i = 0; i < g_ble_ll_resolv_data.rl_cnt; ++i) {
+        if (rl->rl_has_local) {
+            OS_ENTER_CRITICAL(sr);
+            ble_ll_resolv_gen_priv_addr(rl, 1);
+            OS_EXIT_CRITICAL(sr);
+        }
+
+        if (rl->rl_has_peer) {
+            OS_ENTER_CRITICAL(sr);
+            ble_ll_resolv_gen_priv_addr(rl, 0);
+            OS_EXIT_CRITICAL(sr);
+        }
+        ++rl;
+    }
+
+    ble_npl_callout_reset(&g_ble_ll_resolv_data.rpa_timer,
+                          g_ble_ll_resolv_data.rpa_tmo);
+
+    ble_ll_adv_rpa_timeout();
+}
+
+/**
+ * Called to determine if the IRK is all zero.
+ *
+ * @param irk
+ *
+ * @return int 0: IRK is zero . 1: IRK has non-zero value.
+ */
+static int
+ble_ll_resolv_irk_nonzero(const uint8_t *irk)
+{
+    int i;
+    int rc;
+
+    rc = 0;
+    for (i = 0; i < 16; ++i) {
+        if (*irk != 0) {
+            rc = 1;
+            break;
+        }
+        ++irk;
+    }
+
+    return rc;
+}
+
+/**
+ * Clear the resolving list
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_ll_resolv_list_clr(void)
+{
+    /* Check proper state */
+    if (!ble_ll_resolv_list_chg_allowed()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Sets total on list to 0. Clears HW resolve list */
+    g_ble_ll_resolv_data.rl_cnt_hw = 0;
+    g_ble_ll_resolv_data.rl_cnt = 0;
+    ble_hw_resolv_list_clear();
+
+    /* stop RPA timer when clearing RL */
+    ble_npl_callout_stop(&g_ble_ll_resolv_data.rpa_timer);
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Read the size of the resolving list. This is the total number of resolving
+ * list entries allowed by the controller.
+ *
+ * @param rspbuf Pointer to response buffer
+ *
+ * @return int 0: success.
+ */
+int
+ble_ll_resolv_list_read_size(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_resolv_list_size_rp *rsp = (void *) rspbuf;
+
+    rsp->size = g_ble_ll_resolv_data.rl_size;
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Used to determine if the device is on the resolving list.
+ *
+ * @param addr
+ * @param addr_type Public address (0) or random address (1)
+ *
+ * @return int 0: device is not on resolving list; otherwise the return value
+ * is the 'position' of the device in the resolving list (the index of the
+ * element plus 1).
+ */
+static int
+ble_ll_is_on_resolv_list(const uint8_t *addr, uint8_t addr_type)
+{
+    int i;
+    struct ble_ll_resolv_entry *rl;
+
+    rl = &g_ble_ll_resolv_list[0];
+    for (i = 0; i < g_ble_ll_resolv_data.rl_cnt; ++i) {
+        if ((rl->rl_addr_type == addr_type) &&
+            (!memcmp(&rl->rl_identity_addr[0], addr, BLE_DEV_ADDR_LEN))) {
+            return i + 1;
+        }
+        ++rl;
+    }
+
+    return 0;
+}
+
+/**
+ * Used to determine if the device is on the resolving list.
+ *
+ * @param addr
+ * @param addr_type Public address (0) or random address (1)
+ *
+ * @return Pointer to resolving list entry or NULL if no entry found.
+ */
+struct ble_ll_resolv_entry *
+ble_ll_resolv_list_find(const uint8_t *addr, uint8_t addr_type)
+{
+    int i;
+    struct ble_ll_resolv_entry *rl;
+
+    rl = &g_ble_ll_resolv_list[0];
+    for (i = 0; i < g_ble_ll_resolv_data.rl_cnt; ++i) {
+        if ((rl->rl_addr_type == addr_type) &&
+            (!memcmp(&rl->rl_identity_addr[0], addr, BLE_DEV_ADDR_LEN))) {
+            return rl;
+        }
+        ++rl;
+    }
+
+    return NULL;
+}
+
+/**
+ * Add a device to the resolving list
+ *
+ * @return int
+ */
+int
+ble_ll_resolv_list_add(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_add_resolv_list_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_resolv_entry *rl;
+    int rc = BLE_ERR_SUCCESS;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Must be in proper state */
+    if (!ble_ll_resolv_list_chg_allowed()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Check if we have any open entries */
+    if (g_ble_ll_resolv_data.rl_cnt >= g_ble_ll_resolv_data.rl_size) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    /* spec is not clear on how to handle this but make sure host is aware
+     * that new keys are not used in that case
+     */
+    if (ble_ll_is_on_resolv_list(cmd->peer_id_addr, cmd->peer_addr_type)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* we keep this sorted in a way that entries with peer_irk are first */
+    if (ble_ll_resolv_irk_nonzero(cmd->peer_irk)) {
+        memmove(&g_ble_ll_resolv_list[g_ble_ll_resolv_data.rl_cnt_hw + 1],
+                &g_ble_ll_resolv_list[g_ble_ll_resolv_data.rl_cnt_hw],
+                (g_ble_ll_resolv_data.rl_cnt - g_ble_ll_resolv_data.rl_cnt_hw) *
+                sizeof(g_ble_ll_resolv_list[0]));
+        rl = &g_ble_ll_resolv_list[g_ble_ll_resolv_data.rl_cnt_hw];
+    } else {
+        rl = &g_ble_ll_resolv_list[g_ble_ll_resolv_data.rl_cnt];
+    }
+
+    memset (rl, 0, sizeof(*rl));
+    rl->rl_addr_type = cmd->peer_addr_type;
+    memcpy(rl->rl_identity_addr, cmd->peer_id_addr, BLE_DEV_ADDR_LEN);
+
+    if (ble_ll_resolv_irk_nonzero(cmd->peer_irk)) {
+        swap_buf(rl->rl_peer_irk, cmd->peer_irk, 16);
+        rl->rl_has_peer = 1;
+
+        /* generate peer RPA now, those will be updated by timer when
+         * resolution is enabled
+         */
+        ble_ll_resolv_gen_priv_addr(rl, 0);
+    }
+
+    if (ble_ll_resolv_irk_nonzero(cmd->local_irk)) {
+        swap_buf(rl->rl_local_irk, cmd->local_irk, 16);
+        rl->rl_has_local = 1;
+
+        /* generate local RPA now, those will be updated by timer when
+         * resolution is enabled
+         */
+        ble_ll_resolv_gen_priv_addr(rl, 1);
+    }
+
+    /* By default use privacy network mode */
+    rl->rl_priv_mode = BLE_HCI_PRIVACY_NETWORK;
+
+    /* Add peers IRKs to HW resolving list. Should always succeed since we
+     * already checked if there is room for it.
+     */
+    if (rl->rl_has_peer) {
+        rc = ble_hw_resolv_list_add(rl->rl_peer_irk);
+        BLE_LL_ASSERT(rc == BLE_ERR_SUCCESS);
+        g_ble_ll_resolv_data.rl_cnt_hw++;
+    }
+
+    g_ble_ll_resolv_data.rl_cnt++;
+
+    /* start RPA timer if this was first element added to RL */
+    if (g_ble_ll_resolv_data.rl_cnt == 1) {
+        ble_npl_callout_reset(&g_ble_ll_resolv_data.rpa_timer,
+                              g_ble_ll_resolv_data.rpa_tmo);
+    }
+
+    return rc;
+}
+
+/**
+ * Remove a device from the resolving list
+ *
+ * @param cmdbuf
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_ll_resolv_list_rmv(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_rmv_resolve_list_cp *cmd = (const void *) cmdbuf;
+    int position;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Must be in proper state */
+    if (!ble_ll_resolv_list_chg_allowed()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Remove from IRK records */
+    position = ble_ll_is_on_resolv_list(cmd->peer_id_addr, cmd->peer_addr_type);
+    if (position) {
+        BLE_LL_ASSERT(position <= g_ble_ll_resolv_data.rl_cnt);
+
+        memmove(&g_ble_ll_resolv_list[position - 1],
+                &g_ble_ll_resolv_list[position],
+                (g_ble_ll_resolv_data.rl_cnt - position) *
+                sizeof(g_ble_ll_resolv_list[0]));
+        g_ble_ll_resolv_data.rl_cnt--;
+
+        /* Remove from HW list */
+        if (position <= g_ble_ll_resolv_data.rl_cnt_hw) {
+            ble_hw_resolv_list_rmv(position - 1);
+            g_ble_ll_resolv_data.rl_cnt_hw--;
+        }
+
+        /* stop RPA timer if list is empty */
+        if (g_ble_ll_resolv_data.rl_cnt == 0) {
+            ble_npl_callout_stop(&g_ble_ll_resolv_data.rpa_timer);
+        }
+
+        return BLE_ERR_SUCCESS;
+    }
+
+    return BLE_ERR_UNK_CONN_ID;
+}
+
+/**
+ * Called to enable or disable address resolution in the controller
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_resolv_enable_cmd(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_addr_res_en_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (ble_ll_is_controller_busy()) {
+        return  BLE_ERR_CMD_DISALLOWED;
+
+    }
+
+    if (cmd->enable > 1) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    g_ble_ll_resolv_data.addr_res_enabled = cmd->enable;
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_resolv_peer_addr_rd(const uint8_t *cmdbuf, uint8_t len,
+                           uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_rd_peer_recolv_addr_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_rd_peer_recolv_addr_rp *rsp = (void *) rspbuf;
+    struct ble_ll_resolv_entry *rl;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    rl = ble_ll_resolv_list_find(cmd->peer_id_addr, cmd->peer_addr_type);
+    if (rl) {
+        memcpy(rsp->rpa, rl->rl_peer_rpa, BLE_DEV_ADDR_LEN);
+        rc = BLE_ERR_SUCCESS;
+    } else {
+        memset(rsp->rpa, 0, BLE_DEV_ADDR_LEN);
+        rc = BLE_ERR_UNK_CONN_ID;
+    }
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+int
+ble_ll_resolv_local_addr_rd(const uint8_t *cmdbuf, uint8_t len,
+                            uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_rd_local_recolv_addr_cp *cmd = (const void *) cmdbuf;
+    struct ble_hci_le_rd_local_recolv_addr_rp *rsp = (void *) rspbuf;
+    struct ble_ll_resolv_entry *rl;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    rl = ble_ll_resolv_list_find(cmd->peer_id_addr, cmd->peer_addr_type);
+    if (rl) {
+        memcpy(rsp->rpa, rl->rl_local_rpa, BLE_DEV_ADDR_LEN);
+        rc = BLE_ERR_SUCCESS;
+    } else {
+        memset(rsp->rpa, 0, BLE_DEV_ADDR_LEN);
+        rc = BLE_ERR_UNK_CONN_ID;
+    }
+
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+
+/**
+ * Set the resolvable private address timeout.
+ *
+ * @param cmdbuf
+ *
+ * @return int
+ */
+int
+ble_ll_resolv_set_rpa_tmo(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_rpa_tmo_cp *cmd = (const void *)cmdbuf;
+    uint16_t tmo_secs;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    tmo_secs = le16toh(cmd->rpa_timeout);
+    if (!((tmo_secs > 0) && (tmo_secs <= 0xA1B8))) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    g_ble_ll_resolv_data.rpa_tmo = ble_npl_time_ms_to_ticks32(tmo_secs * 1000);
+
+    /* restart timer if there is something on RL */
+    if (g_ble_ll_resolv_data.rl_cnt) {
+        ble_npl_callout_reset(&g_ble_ll_resolv_data.rpa_timer,
+                              g_ble_ll_resolv_data.rpa_tmo);
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_resolve_set_priv_mode(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_privacy_mode_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_resolv_entry *rl;
+
+    if (ble_ll_is_controller_busy()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    rl = ble_ll_resolv_list_find(cmd->peer_id_addr, cmd->peer_id_addr_type);
+    if (!rl) {
+        return BLE_ERR_UNK_CONN_ID;
+    }
+
+    if (cmd->mode > BLE_HCI_PRIVACY_DEVICE) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    rl->rl_priv_mode = cmd->mode;
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Returns the Resolvable Private address timeout, in os ticks
+ *
+ *
+ * @return uint32_t
+ */
+uint32_t
+ble_ll_resolv_get_rpa_tmo(void)
+{
+    return g_ble_ll_resolv_data.rpa_tmo;
+}
+
+void
+ble_ll_resolv_get_priv_addr(struct ble_ll_resolv_entry *rl, int local,
+                            uint8_t *addr)
+{
+    os_sr_t sr;
+
+    BLE_LL_ASSERT(rl != NULL);
+    BLE_LL_ASSERT(addr != NULL);
+
+    OS_ENTER_CRITICAL(sr);
+    if (local) {
+        BLE_LL_ASSERT(rl->rl_has_local);
+        memcpy(addr, rl->rl_local_rpa, BLE_DEV_ADDR_LEN);
+    } else {
+        BLE_LL_ASSERT(rl->rl_has_peer);
+        memcpy(addr, rl->rl_peer_rpa, BLE_DEV_ADDR_LEN);
+    }
+
+    OS_EXIT_CRITICAL(sr);
+}
+
+void
+ble_ll_resolv_set_peer_rpa(int index, uint8_t *rpa)
+{
+    os_sr_t sr;
+    struct ble_ll_resolv_entry *rl;
+
+    OS_ENTER_CRITICAL(sr);
+    rl = &g_ble_ll_resolv_list[index];
+    memcpy(rl->rl_peer_rpa, rpa, BLE_DEV_ADDR_LEN);
+    OS_EXIT_CRITICAL(sr);
+}
+
+void
+ble_ll_resolv_set_local_rpa(int index, uint8_t *rpa)
+{
+    os_sr_t sr;
+    struct ble_ll_resolv_entry *rl;
+
+    OS_ENTER_CRITICAL(sr);
+    rl = &g_ble_ll_resolv_list[index];
+    memcpy(rl->rl_local_rpa, rpa, BLE_DEV_ADDR_LEN);
+    OS_EXIT_CRITICAL(sr);
+}
+
+/**
+ * Generate a resolvable private address.
+ *
+ * @param addr
+ * @param addr_type
+ * @param rpa
+ *
+ * @return int
+ */
+int
+ble_ll_resolv_gen_rpa(uint8_t *addr, uint8_t addr_type, uint8_t *rpa, int local)
+{
+    struct ble_ll_resolv_entry *rl;
+
+    rl = ble_ll_resolv_list_find(addr, addr_type);
+    if (rl) {
+        if ((local && rl->rl_has_local) || (!local && rl->rl_has_peer)) {
+            ble_ll_resolv_get_priv_addr(rl, local, rpa);
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Resolve a Resolvable Private Address
+ *
+ * @param rpa
+ * @param index
+ *
+ * @return int
+ */
+int
+ble_ll_resolv_rpa(const uint8_t *rpa, const uint8_t *irk)
+{
+    int rc;
+    const uint32_t *irk32;
+    uint32_t *key32;
+    uint32_t *pt32;
+    struct ble_encryption_block ecb;
+
+    irk32 = (const uint32_t *)irk;
+    key32 = (uint32_t *)&ecb.key[0];
+
+    key32[0] = irk32[0];
+    key32[1] = irk32[1];
+    key32[2] = irk32[2];
+    key32[3] = irk32[3];
+
+    pt32 = (uint32_t *)&ecb.plain_text[0];
+    pt32[0] = 0;
+    pt32[1] = 0;
+    pt32[2] = 0;
+    pt32[3] = 0;
+
+    ecb.plain_text[15] = rpa[3];
+    ecb.plain_text[14] = rpa[4];
+    ecb.plain_text[13] = rpa[5];
+
+    ble_hw_encrypt_block(&ecb);
+    if ((ecb.cipher_text[15] == rpa[0]) && (ecb.cipher_text[14] == rpa[1]) &&
+        (ecb.cipher_text[13] == rpa[2])) {
+        rc = 1;
+    } else {
+        rc = 0;
+    }
+
+    return rc;
+}
+
+int
+ble_ll_resolv_peer_rpa_any(const uint8_t *rpa)
+{
+    int i;
+
+    for (i = 0; i < g_ble_ll_resolv_data.rl_cnt_hw; i++) {
+        if (ble_ll_resolv_rpa(rpa, g_ble_ll_resolv_list[i].rl_peer_irk)) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+/**
+ * Returns whether or not address resolution is enabled.
+ *
+ * @return uint8_t
+ */
+uint8_t
+ble_ll_resolv_enabled(void)
+{
+    return g_ble_ll_resolv_data.addr_res_enabled;
+}
+
+/**
+ * Called to reset private address resolution module.
+ */
+void
+ble_ll_resolv_list_reset(void)
+{
+    g_ble_ll_resolv_data.addr_res_enabled = 0;
+    ble_npl_callout_stop(&g_ble_ll_resolv_data.rpa_timer);
+    ble_ll_resolv_list_clr();
+    ble_ll_resolv_init();
+}
+
+void
+ble_ll_resolv_init(void)
+{
+    uint8_t hw_size;
+
+    /* Default is 15 minutes */
+    g_ble_ll_resolv_data.rpa_tmo = ble_npl_time_ms_to_ticks32(15 * 60 * 1000);
+
+    hw_size = ble_hw_resolv_list_size();
+    if (hw_size > MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE)) {
+        hw_size = MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE);
+    }
+    g_ble_ll_resolv_data.rl_size = hw_size;
+
+    ble_npl_callout_init(&g_ble_ll_resolv_data.rpa_timer,
+                         &g_ble_ll_data.ll_evq,
+                         ble_ll_resolv_rpa_timer_cb,
+                         NULL);
+}
+
+#endif  /* if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY) */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_rfmgmt.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_rfmgmt.c
new file mode 100644
index 000000000..444019cc0
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_rfmgmt.c
@@ -0,0 +1,348 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <stddef.h>
+#include <assert.h>
+#include <stddef.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os_cputime.h"
+#include "../include/controller/ble_phy.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+
+#if MYNEWT_VAL(BLE_LL_RFMGMT_ENABLE_TIME) > 0
+
+enum ble_ll_rfmgmt_state {
+    RFMGMT_STATE_OFF = 0,
+    RFMGMT_STATE_ENABLING = 1,
+    RFMGMT_STATE_ENABLED = 2,
+};
+
+struct ble_ll_rfmgmt_data {
+    enum ble_ll_rfmgmt_state state;
+    uint16_t ticks_to_enabled;
+
+    struct hal_timer timer;
+    bool timer_scheduled;
+    uint32_t timer_scheduled_at;
+
+    bool enable_scan;
+    bool enable_sched;
+    uint32_t enable_scan_at;
+    uint32_t enable_sched_at;
+
+    uint32_t enabled_at;
+
+    struct ble_npl_event release_ev;
+};
+
+static struct ble_ll_rfmgmt_data g_ble_ll_rfmgmt_data;
+
+static void
+ble_ll_rfmgmt_enable(void)
+{
+    OS_ASSERT_CRITICAL();
+
+    if (g_ble_ll_rfmgmt_data.state == RFMGMT_STATE_OFF) {
+        g_ble_ll_rfmgmt_data.state = RFMGMT_STATE_ENABLING;
+        g_ble_ll_rfmgmt_data.enabled_at = os_cputime_get32();
+        ble_phy_rfclk_enable();
+    }
+}
+
+static void
+ble_ll_rfmgmt_disable(void)
+{
+    OS_ASSERT_CRITICAL();
+
+    if (g_ble_ll_rfmgmt_data.state != RFMGMT_STATE_OFF) {
+        ble_phy_rfclk_disable();
+        g_ble_ll_rfmgmt_data.state = RFMGMT_STATE_OFF;
+    }
+}
+
+static void
+ble_ll_rfmgmt_timer_reschedule(void)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+    uint32_t enable_at;
+
+    /* Figure out when we need to enable RF */
+    if (rfmgmt->enable_scan && rfmgmt->enable_sched) {
+        if (CPUTIME_LT(rfmgmt->enable_scan_at, rfmgmt->enable_sched_at)) {
+            enable_at = rfmgmt->enable_scan_at;
+        } else {
+            enable_at = rfmgmt->enable_sched_at;
+        }
+    } else if (rfmgmt->enable_scan) {
+        enable_at = rfmgmt->enable_scan_at;
+    } else if (rfmgmt->enable_sched) {
+        enable_at = rfmgmt->enable_sched_at;
+    } else {
+        rfmgmt->timer_scheduled = false;
+        os_cputime_timer_stop(&rfmgmt->timer);
+        return;
+    }
+
+    if (rfmgmt->timer_scheduled) {
+        /*
+         * If there is timer already scheduled at the same time we do not need
+         * to do anything. Otherwise we need to stop timer and schedule it again
+         * regardless if it's earlier or later to make sure it fires at the time
+         * something expects it.
+         */
+
+        if (rfmgmt->timer_scheduled_at == enable_at) {
+            return;
+        }
+
+        rfmgmt->timer_scheduled = false;
+        os_cputime_timer_stop(&rfmgmt->timer);
+    }
+
+    /*
+     * In case timer was requested to be enabled before current time, just make
+     * sure it's enabled and assume caller can deal with this. This will happen
+     * if something is scheduled "now" since "enable_at" is in the past, but in
+     * such case it's absolutely harmless since we already have clock enabled
+     * and this will do nothing.
+     */
+    if (CPUTIME_LEQ(enable_at, os_cputime_get32())) {
+        ble_ll_rfmgmt_enable();
+        return;
+    }
+
+    rfmgmt->timer_scheduled = true;
+    rfmgmt->timer_scheduled_at = enable_at;
+    os_cputime_timer_start(&rfmgmt->timer, enable_at);
+}
+
+static void
+ble_ll_rfmgmt_timer_exp(void *arg)
+{
+    g_ble_ll_rfmgmt_data.timer_scheduled = false;
+    ble_ll_rfmgmt_enable();
+}
+
+static void
+ble_ll_rfmgmt_release_ev(struct ble_npl_event *ev)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+    uint32_t now;
+    bool can_disable;
+    uint8_t lls;
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+
+    now = os_cputime_get32();
+
+    can_disable = true;
+    lls = ble_ll_state_get();
+
+    if (rfmgmt->enable_scan && CPUTIME_GEQ(now, rfmgmt->enable_scan_at)) {
+        /* Blocked by scan */
+        can_disable = false;
+    } else if (rfmgmt->enable_sched && CPUTIME_GEQ(now, rfmgmt->enable_sched_at)) {
+        /* Blocked by scheduler item */
+        can_disable = false;
+    } else if (lls != BLE_LL_STATE_STANDBY) {
+        /* Blocked by LL state */
+        can_disable = false;
+    }
+
+    if (can_disable) {
+        ble_ll_rfmgmt_disable();
+    }
+
+    OS_EXIT_CRITICAL(sr);
+}
+
+static uint32_t
+ble_ll_rfmgmt_ticks_to_enabled(void)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+    uint32_t rem_ticks;
+    uint32_t now;
+
+    switch (rfmgmt->state) {
+    case RFMGMT_STATE_OFF:
+        rem_ticks = rfmgmt->ticks_to_enabled;
+        break;
+    case RFMGMT_STATE_ENABLING:
+        now = os_cputime_get32();
+        if (CPUTIME_LT(now, rfmgmt->enabled_at + rfmgmt->ticks_to_enabled)) {
+            rem_ticks = rfmgmt->enabled_at + rfmgmt->ticks_to_enabled - now;
+            break;
+        }
+        rfmgmt->state = RFMGMT_STATE_ENABLED;
+        /* no break */
+    case RFMGMT_STATE_ENABLED:
+        rem_ticks = 0;
+        break;
+    default:
+        BLE_LL_ASSERT(0);
+        rem_ticks = 0;
+        break;
+    }
+
+    return rem_ticks;
+}
+
+void
+ble_ll_rfmgmt_init(void)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+
+    rfmgmt->state = RFMGMT_STATE_OFF;
+
+    rfmgmt->ticks_to_enabled =
+            ble_ll_usecs_to_ticks_round_up(MYNEWT_VAL(BLE_LL_RFMGMT_ENABLE_TIME));
+
+    rfmgmt->timer_scheduled = false;
+    os_cputime_timer_init(&rfmgmt->timer, ble_ll_rfmgmt_timer_exp, NULL);
+
+    ble_npl_event_init(&rfmgmt->release_ev, ble_ll_rfmgmt_release_ev, NULL);
+}
+
+void
+ble_ll_rfmgmt_reset(void)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+
+    rfmgmt->timer_scheduled = false;
+    rfmgmt->timer_scheduled_at = 0;
+    os_cputime_timer_stop(&rfmgmt->timer);
+
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &rfmgmt->release_ev);
+
+    ble_ll_rfmgmt_disable();
+
+    rfmgmt->enable_scan = false;
+    rfmgmt->enable_scan_at = 0;
+    rfmgmt->enable_sched = false;
+    rfmgmt->enable_sched_at = 0;
+
+    rfmgmt->enabled_at = 0;
+}
+
+void
+ble_ll_rfmgmt_scan_changed(bool enabled, uint32_t next_window)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+
+    rfmgmt->enable_scan = enabled;
+    rfmgmt->enable_scan_at = next_window - rfmgmt->ticks_to_enabled;
+
+    ble_ll_rfmgmt_timer_reschedule();
+
+    OS_EXIT_CRITICAL(sr);
+}
+
+void
+ble_ll_rfmgmt_sched_changed(struct ble_ll_sched_item *first)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+
+    rfmgmt->enable_sched = (first != NULL);
+    if (first) {
+        rfmgmt->enable_sched_at = first->start_time - rfmgmt->ticks_to_enabled;
+    }
+
+    ble_ll_rfmgmt_timer_reschedule();
+
+    OS_EXIT_CRITICAL(sr);
+}
+
+void
+ble_ll_rfmgmt_release(void)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &rfmgmt->release_ev);
+
+    if (g_ble_ll_rfmgmt_data.state != RFMGMT_STATE_OFF) {
+        ble_npl_eventq_put(&g_ble_ll_data.ll_evq, &rfmgmt->release_ev);
+    }
+
+    OS_EXIT_CRITICAL(sr);
+}
+
+uint32_t
+ble_ll_rfmgmt_enable_now(void)
+{
+    struct ble_ll_rfmgmt_data *rfmgmt = &g_ble_ll_rfmgmt_data;
+    uint32_t enabled_at;
+    os_sr_t sr;
+
+    OS_ENTER_CRITICAL(sr);
+
+    ble_ll_rfmgmt_enable();
+
+    if (rfmgmt->state == RFMGMT_STATE_ENABLED) {
+        enabled_at = os_cputime_get32();
+    } else {
+        enabled_at = rfmgmt->enabled_at + rfmgmt->ticks_to_enabled + 1;
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    return enabled_at;
+}
+
+bool
+ble_ll_rfmgmt_is_enabled(void)
+{
+    bool ret;
+
+    OS_ASSERT_CRITICAL();
+
+    ret = ble_ll_rfmgmt_ticks_to_enabled() == 0;
+
+    return ret;
+}
+
+#else
+
+void
+ble_ll_rfmgmt_init(void)
+{
+    static bool enabled = false;
+
+    if (!enabled) {
+        ble_phy_rfclk_enable();
+    }
+
+    enabled = true;
+}
+
+#endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_scan.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_scan.c
new file mode 100644
index 000000000..03a683a76
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_scan.c
@@ -0,0 +1,3981 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/os/os_cputime.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "../include/controller/ble_phy.h"
+#include "../include/controller/ble_hw.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_whitelist.h"
+#include "../include/controller/ble_ll_resolv.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+#include "../include/controller/ble_ll_trace.h"
+#include "../include/controller/ble_ll_sync.h"
+#include "ble_ll_conn_priv.h"
+
+/*
+ * XXX:
+ * 1) I think I can guarantee that we dont process things out of order if
+ * I send an event when a scan request is sent. The scan_rsp_pending flag
+ * code might be made simpler.
+ *
+ * 2) Interleave sending scan requests to different advertisers? I guess I need
+ * a list of advertisers to which I sent a scan request and have yet to
+ * receive a scan response from? Implement this.
+ */
+
+/* Dont allow more than 255 of these entries */
+#if MYNEWT_VAL(BLE_LL_NUM_SCAN_RSP_ADVS) > 255
+    #error "Cannot have more than 255 scan response entries!"
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+#define SCAN_VALID_PHY_MASK     (BLE_HCI_LE_PHY_1M_PREF_MASK | BLE_HCI_LE_PHY_CODED_PREF_MASK)
+#else
+#define SCAN_VALID_PHY_MASK     (BLE_HCI_LE_PHY_1M_PREF_MASK)
+#endif
+
+/* The scanning parameters set by host */
+static struct ble_ll_scan_params g_ble_ll_scan_params[BLE_LL_SCAN_PHY_NUMBER];
+
+/* The scanning state machine global object */
+static struct ble_ll_scan_sm g_ble_ll_scan_sm;
+
+struct ble_ll_ext_adv_hdr
+{
+    uint8_t mode;
+    uint8_t hdr_len;
+    uint8_t hdr[0];
+};
+
+struct ble_ll_scan_addr_data {
+    bool adva_present;
+    uint8_t adva_type;
+    uint8_t *adva;
+    uint8_t targeta_type;
+    uint8_t *targeta;
+    uint8_t adv_addr_type;
+    uint8_t *adv_addr;
+    struct ble_ll_resolv_entry *rl;
+};
+
+/*
+ * Structure used to store advertisers. This is used to limit sending scan
+ * requests to the same advertiser and also to filter duplicate events sent
+ * to the host.
+ */
+struct ble_ll_scan_advertisers
+{
+    uint16_t            sc_adv_flags;
+    uint16_t            adi;
+    struct ble_dev_addr adv_addr;
+};
+
+#define BLE_LL_SC_ADV_F_RANDOM_ADDR     (0x01)
+#define BLE_LL_SC_ADV_F_SCAN_RSP_RXD    (0x02)
+#define BLE_LL_SC_ADV_F_DIRECT_RPT_SENT (0x04)
+#define BLE_LL_SC_ADV_F_ADV_RPT_SENT    (0x08)
+#define BLE_LL_SC_ADV_F_SCAN_RSP_SENT   (0x10)
+
+/* Contains list of advertisers that we have heard scan responses from */
+static uint8_t g_ble_ll_scan_num_rsp_advs;
+struct ble_ll_scan_advertisers
+g_ble_ll_scan_rsp_advs[MYNEWT_VAL(BLE_LL_NUM_SCAN_RSP_ADVS)];
+
+/* Duplicates filtering data */
+#define BLE_LL_SCAN_ENTRY_TYPE_LEGACY(addr_type) \
+    ((addr_type) & 1)
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define BLE_LL_SCAN_ENTRY_TYPE_EXT(addr_type, has_aux, is_anon, adi) \
+    (((adi >> 8) & 0xF0) | (1 << 3) | (is_anon << 2) | (has_aux << 1) | ((addr_type) & 1))
+#endif
+
+#define BLE_LL_SCAN_DUP_F_ADV_REPORT_SENT       (0x01)
+#define BLE_LL_SCAN_DUP_F_DIR_ADV_REPORT_SENT   (0x02)
+#define BLE_LL_SCAN_DUP_F_SCAN_RSP_SENT         (0x04)
+
+struct ble_ll_scan_dup_entry {
+    uint8_t type;       /* entry type, see BLE_LL_SCAN_ENTRY_TYPE_* */
+    uint8_t addr[6];
+    uint8_t flags;      /* use BLE_LL_SCAN_DUP_F_xxx */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    uint16_t adi;
+#endif
+    TAILQ_ENTRY(ble_ll_scan_dup_entry) link;
+};
+
+static os_membuf_t g_scan_dup_mem[ OS_MEMPOOL_SIZE(
+                                   MYNEWT_VAL(BLE_LL_NUM_SCAN_DUP_ADVS),
+                                   sizeof(struct ble_ll_scan_dup_entry)) ];
+static struct os_mempool g_scan_dup_pool;
+static TAILQ_HEAD(ble_ll_scan_dup_list, ble_ll_scan_dup_entry) g_scan_dup_list;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#if MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT) != 0
+static os_membuf_t ext_scan_aux_mem[ OS_MEMPOOL_SIZE(
+                    MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT),
+                    sizeof (struct ble_ll_aux_data))
+];
+#else
+#define ext_scan_aux_mem NULL
+#endif
+
+static struct os_mempool ext_scan_aux_pool;
+
+static int ble_ll_scan_start(struct ble_ll_scan_sm *scansm,
+                             struct ble_ll_sched_item *sch);
+
+static void
+ble_ll_aux_scan_drop_event_cb(struct ble_npl_event *ev)
+{
+    struct ble_ll_aux_data *aux_data = ble_npl_event_get_arg(ev);
+
+    ble_ll_scan_end_adv_evt(aux_data);
+    ble_ll_scan_aux_data_unref(aux_data);
+}
+
+static void
+ble_ll_aux_scan_drop(struct ble_ll_aux_data *aux_data)
+{
+    BLE_LL_ASSERT(aux_data);
+
+    STATS_INC(ble_ll_stats, aux_scan_drop);
+
+    ble_npl_event_init(&aux_data->ev, ble_ll_aux_scan_drop_event_cb, aux_data);
+    ble_ll_event_send(&aux_data->ev);
+}
+
+static int
+ble_ll_aux_scan_cb(struct ble_ll_sched_item *sch)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    uint8_t lls = ble_ll_state_get();
+    uint32_t wfr_usec;
+
+    STATS_INC(ble_ll_stats, aux_sched_cb);
+
+    /* Drop the scheduled item if scan was disable or there is aux or scan
+     * response pending
+     */
+    if (!scansm->scan_enabled || scansm->cur_aux_data ||
+            scansm->scan_rsp_pending) {
+        ble_ll_aux_scan_drop(sch->cb_arg);
+        sch->cb_arg = NULL;
+        goto done;
+    }
+
+    /* Check if there is no aux connect sent. If so drop the sched item */
+    if (lls == BLE_LL_STATE_INITIATING && ble_ll_conn_init_pending_aux_conn_rsp()) {
+        ble_ll_aux_scan_drop(sch->cb_arg);
+        sch->cb_arg = NULL;
+        goto done;
+    }
+
+    /* This function is called only when scanner is running. This can happen
+     *  in 3 states:
+     * BLE_LL_STATE_SCANNING
+     * BLE_LL_STATE_INITIATING
+     * BLE_LL_STATE_STANDBY
+     */
+    if (lls != BLE_LL_STATE_STANDBY) {
+        ble_phy_disable();
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    }
+
+    /* When doing RX for AUX pkt, cur_aux_data keeps valid aux data */
+    scansm->cur_aux_data = sch->cb_arg;
+    sch->cb_arg = NULL;
+    BLE_LL_ASSERT(scansm->cur_aux_data != NULL);
+    scansm->cur_aux_data->scanning = 1;
+
+    if (ble_ll_scan_start(scansm, sch)) {
+        ble_ll_scan_interrupted(scansm);
+        goto done;
+    }
+
+    STATS_INC(ble_ll_stats, aux_fired_for_read);
+
+    wfr_usec = scansm->cur_aux_data->offset_units ? 300 : 30;
+    ble_phy_wfr_enable(BLE_PHY_WFR_ENABLE_RX, 0, wfr_usec);
+
+done:
+
+    return BLE_LL_SCHED_STATE_DONE;
+}
+
+static int
+ble_ll_scan_ext_adv_init(struct ble_ll_aux_data **aux_data)
+{
+    struct ble_ll_aux_data *e;
+
+    e = os_memblock_get(&ext_scan_aux_pool);
+    if (!e) {
+        return -1;
+    }
+
+    memset(e, 0, sizeof(*e));
+    e->sch.sched_cb = ble_ll_aux_scan_cb;
+    e->sch.sched_type = BLE_LL_SCHED_TYPE_AUX_SCAN;
+    e->ref_cnt = 1;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    e->rpa_index = -1;
+#endif
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_AUX_REF, (uint32_t)e, e->ref_cnt);
+
+    *aux_data = e;
+    STATS_INC(ble_ll_stats, aux_allocated);
+
+    return 0;
+}
+#endif
+
+static inline uint32_t
+ble_ll_scan_time_hci_to_ticks(uint16_t value)
+{
+    return os_cputime_usecs_to_ticks(value * BLE_HCI_SCAN_ITVL);
+}
+
+/* See Vol 6 Part B Section 4.4.3.2. Active scanning backoff */
+static void
+ble_ll_scan_req_backoff(struct ble_ll_scan_sm *scansm, int success)
+{
+    BLE_LL_ASSERT(scansm->backoff_count == 0);
+    BLE_LL_ASSERT(scansm->scan_rsp_pending == 0);
+
+    if (success) {
+        scansm->scan_rsp_cons_fails = 0;
+        ++scansm->scan_rsp_cons_ok;
+        if (scansm->scan_rsp_cons_ok == 2) {
+            scansm->scan_rsp_cons_ok = 0;
+            if (scansm->upper_limit > 1) {
+                scansm->upper_limit >>= 1;
+            }
+        }
+        STATS_INC(ble_ll_stats, scan_req_txg);
+    } else {
+        scansm->scan_rsp_cons_ok = 0;
+        ++scansm->scan_rsp_cons_fails;
+        if (scansm->scan_rsp_cons_fails == 2) {
+            scansm->scan_rsp_cons_fails = 0;
+            if (scansm->upper_limit < 256) {
+                scansm->upper_limit <<= 1;
+            }
+        }
+        STATS_INC(ble_ll_stats, scan_req_txf);
+    }
+
+    scansm->backoff_count = rand() & (scansm->upper_limit - 1);
+    ++scansm->backoff_count;
+    BLE_LL_ASSERT(scansm->backoff_count <= 256);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+static void
+ble_ll_scan_refresh_nrpa(struct ble_ll_scan_sm *scansm)
+{
+    ble_npl_time_t now;
+
+    now = ble_npl_time_get();
+    if ((ble_npl_stime_t)(now - scansm->scan_nrpa_timer) >= 0) {
+        /* Generate new NRPA */
+        ble_ll_rand_data_get(scansm->scan_nrpa, BLE_DEV_ADDR_LEN);
+        scansm->scan_nrpa[5] &= ~0xc0;
+
+        /* We'll use the same timeout as for RPA rotation */
+        scansm->scan_nrpa_timer = now + ble_ll_resolv_get_rpa_tmo();
+    }
+}
+#endif
+
+static void
+ble_ll_scan_req_pdu_prepare(struct ble_ll_scan_sm *scansm,
+                            const uint8_t *adv_addr, uint8_t adv_addr_type,
+                            struct ble_ll_resolv_entry *rl)
+{
+    uint8_t hdr_byte;
+    struct ble_ll_scan_pdu_data *pdu_data;
+    uint8_t *scana;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    uint8_t rpa[BLE_DEV_ADDR_LEN];
+#endif
+
+    pdu_data = &scansm->pdu_data;
+
+    /* Construct first PDU header byte */
+    hdr_byte = BLE_ADV_PDU_TYPE_SCAN_REQ;
+    if (adv_addr_type) {
+        hdr_byte |= BLE_ADV_PDU_HDR_RXADD_RAND;
+    }
+
+    /* Determine ScanA */
+    if (scansm->own_addr_type & 0x01) {
+        hdr_byte |= BLE_ADV_PDU_HDR_TXADD_RAND;
+        scana = g_random_addr;
+    } else {
+        scana = g_dev_addr;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (scansm->own_addr_type & 0x02) {
+        /*
+         * If device is on RL and we have local IRK, we use RPA generated using
+         * that IRK as ScanA. Otherwise we use NRPA as ScanA to prevent our
+         * device from being tracked when doing an active scan (Core 5.1, Vol 6,
+         * Part B, section 6.3)
+         */
+        if (rl && rl->rl_has_local) {
+            ble_ll_resolv_get_priv_addr(rl, 1, rpa);
+            scana = rpa;
+        } else {
+            ble_ll_scan_refresh_nrpa(scansm);
+            scana = scansm->scan_nrpa;
+        }
+
+        hdr_byte |= BLE_ADV_PDU_HDR_TXADD_RAND;
+    }
+#endif
+
+    /* Save scan request data */
+    pdu_data->hdr_byte = hdr_byte;
+    memcpy(pdu_data->scana, scana, BLE_DEV_ADDR_LEN);
+    memcpy(pdu_data->adva, adv_addr, BLE_DEV_ADDR_LEN);
+}
+
+static uint8_t
+ble_ll_scan_req_tx_pdu_cb(uint8_t *dptr, void *pducb_arg, uint8_t *hdr_byte)
+{
+    struct ble_ll_scan_sm *scansm = pducb_arg;
+    struct ble_ll_scan_pdu_data *pdu_data = &scansm->pdu_data;
+
+    memcpy(dptr, pdu_data->scana, BLE_DEV_ADDR_LEN);
+    memcpy(dptr + BLE_DEV_ADDR_LEN, pdu_data->adva, BLE_DEV_ADDR_LEN);
+
+    *hdr_byte = pdu_data->hdr_byte;
+
+    return BLE_DEV_ADDR_LEN * 2;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+/* if copy_from is provided new report is initialized with that instead of
+ * defaults
+ */
+static struct ble_hci_ev *
+ble_ll_scan_get_ext_adv_report(struct ext_adv_report *copy_from)
+{
+    struct ble_hci_ev_le_subev_ext_adv_rpt *ev;
+    struct ext_adv_report *report;
+    struct ble_hci_ev *hci_ev;
+
+    hci_ev = ( void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
+    if (!hci_ev) {
+        return NULL;
+    }
+
+    hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+    hci_ev->length = sizeof(*ev) + sizeof(*report);
+    ev = (void *) hci_ev->data;
+
+    memset(ev, 0, sizeof(*ev));
+    ev->subev_code = BLE_HCI_LE_SUBEV_EXT_ADV_RPT;
+    /* We support only one report per event now */
+    ev->num_reports = 1;
+
+    report = ev->reports;
+
+    if (copy_from) {
+        memcpy(report, copy_from, sizeof(*report));
+        report->data_len = 0;
+    } else {
+        memset(report, 0, sizeof(*report));
+
+        report->pri_phy = BLE_PHY_1M;
+        /* Init SID with "Not available" which is 0xFF */
+        report->sid = 0xFF;
+        /* Init TX Power with "Not available" which is 127 */
+        report->tx_power = 127;
+        /* Init RSSI with "Not available" which is 127 */
+        report->rssi = 127;
+        /* Init address type with "anonymous" which is 0xFF */
+        report->addr_type = 0xFF;
+    }
+
+    return hci_ev;
+}
+
+static void
+ble_ll_scan_send_truncated(struct ble_ll_aux_data *aux_data)
+{
+    struct ble_hci_ev_le_subev_ext_adv_rpt *ev;
+    struct ext_adv_report *report;
+    struct ble_hci_ev *hci_ev;
+
+    if (!ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_EXT_ADV_RPT)) {
+        return;
+    }
+
+    BLE_LL_ASSERT(aux_data);
+
+    /* No need to send if we did not send any report or sent truncated already */
+    if (!(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_ANY) ||
+        (aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED)) {
+        return;
+    }
+
+    BLE_LL_ASSERT(aux_data->evt);
+    hci_ev = aux_data->evt;
+    aux_data->evt = NULL;
+
+    hci_ev->length = sizeof(*ev) + sizeof(*report);
+
+    ev = (void *) hci_ev->data;
+    report = ev->reports;
+
+    report->data_len = 0;
+
+    report->evt_type = aux_data->evt_type;
+    report->evt_type |= BLE_HCI_ADV_DATA_STATUS_TRUNCATED;
+
+    if (aux_data->flags & BLE_LL_AUX_HAS_ADVA) {
+        memcpy(report->addr, aux_data->adva, 6);
+        report->addr_type = aux_data->adva_type;
+    }
+
+    if (aux_data->flags & BLE_LL_AUX_HAS_TARGETA) {
+        memcpy(report->dir_addr, aux_data->targeta, 6);
+        report->dir_addr_type = aux_data->targeta_type;
+    }
+
+    report->sid = aux_data->adi >> 12;
+    ble_ll_hci_event_send(hci_ev);
+
+    aux_data->flags_ll |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+    aux_data->flags_ll |= BLE_LL_AUX_FLAG_HCI_SENT_ANY;
+    aux_data->flags_ll |= BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED;
+}
+
+static int
+ble_ll_scan_get_adi(struct ble_ll_aux_data *aux_data, uint16_t *adi)
+{
+    if (!aux_data || !(aux_data->flags & BLE_LL_AUX_HAS_ADI)) {
+        return -1;
+    }
+
+    *adi = aux_data->adi;
+
+    return 0;
+}
+
+void
+ble_ll_scan_end_adv_evt(struct ble_ll_aux_data *aux_data)
+{
+    /* Make sure we send report with 'truncated' data state if needed */
+    ble_ll_scan_send_truncated(aux_data);
+}
+#endif
+
+static void
+ble_ll_scan_clean_cur_aux_data(void)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+
+    /* If scanner was reading aux ptr, we need to clean it up */
+    if (scansm->cur_aux_data) {
+        ble_ll_scan_end_adv_evt(scansm->cur_aux_data);
+        ble_ll_scan_aux_data_unref(scansm->cur_aux_data);
+        scansm->cur_aux_data = NULL;
+    }
+#endif
+}
+
+void
+ble_ll_scan_halt(void)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+
+    ble_ll_scan_clean_cur_aux_data();
+
+    /* Update backoff if we failed to receive scan response */
+    if (scansm->scan_rsp_pending) {
+        scansm->scan_rsp_pending = 0;
+        ble_ll_scan_req_backoff(scansm, 0);
+    }
+}
+
+/**
+ * Checks to see if we have received a scan response from this advertiser.
+ *
+ * @param adv_addr Address of advertiser
+ * @param txadd TxAdd bit (0: public; random otherwise)
+ *
+ * @return int 0: have not received a scan response; 1 otherwise.
+ */
+static int
+ble_ll_scan_have_rxd_scan_rsp(uint8_t *addr, uint8_t txadd,
+                              uint8_t ext_adv, uint16_t adi)
+{
+    uint8_t num_advs;
+    struct ble_ll_scan_advertisers *adv;
+
+    /* Do we have an address match? Must match address type */
+    adv = &g_ble_ll_scan_rsp_advs[0];
+    num_advs = g_ble_ll_scan_num_rsp_advs;
+    while (num_advs) {
+        if (!memcmp(&adv->adv_addr, addr, BLE_DEV_ADDR_LEN)) {
+            /* Address type must match */
+            if (txadd) {
+                if (adv->sc_adv_flags & BLE_LL_SC_ADV_F_RANDOM_ADDR) {
+                    if (ext_adv) {
+                        if (adi == adv->adi) {
+                            return 1;
+                        }
+                        goto next;
+                    }
+                    return 1;
+                }
+            } else {
+                if ((adv->sc_adv_flags & BLE_LL_SC_ADV_F_RANDOM_ADDR) == 0) {
+                    if (ext_adv) {
+                        if (adi == adv->adi) {
+                            return 1;
+                        }
+                        goto next;
+                    }
+                    return 1;
+                }
+            }
+        }
+next:
+        ++adv;
+        --num_advs;
+    }
+
+    return 0;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_scan_add_scan_rsp_adv(uint8_t *addr, uint8_t txadd,
+                             uint8_t ext_adv, uint16_t adi)
+{
+    uint8_t num_advs;
+    struct ble_ll_scan_advertisers *adv;
+
+    /* XXX: for now, if we dont have room, just leave */
+    num_advs = g_ble_ll_scan_num_rsp_advs;
+    if (num_advs == MYNEWT_VAL(BLE_LL_NUM_SCAN_RSP_ADVS)) {
+        return;
+    }
+
+    /* Check if address is already on the list */
+    if (ble_ll_scan_have_rxd_scan_rsp(addr, txadd, ext_adv, adi)) {
+        return;
+    }
+
+    /* Add the advertiser to the array */
+    adv = &g_ble_ll_scan_rsp_advs[num_advs];
+    memcpy(&adv->adv_addr, addr, BLE_DEV_ADDR_LEN);
+    adv->sc_adv_flags = BLE_LL_SC_ADV_F_SCAN_RSP_RXD;
+    if (txadd) {
+        adv->sc_adv_flags |= BLE_LL_SC_ADV_F_RANDOM_ADDR;
+    }
+    adv->adi = adi;
+    ++g_ble_ll_scan_num_rsp_advs;
+
+    return;
+}
+
+static int
+ble_ll_hci_send_legacy_ext_adv_report(uint8_t evtype,
+                                      const uint8_t *addr, uint8_t addr_type,
+                                      uint8_t rssi,
+                                      uint8_t adv_data_len,
+                                      struct os_mbuf *adv_data,
+                                      const uint8_t *inita, uint8_t inita_type)
+{
+    struct ble_hci_ev_le_subev_ext_adv_rpt *ev;
+    struct ext_adv_report *report;
+    struct ble_hci_ev *hci_ev;
+
+    if (!ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_EXT_ADV_RPT)) {
+        return -1;
+    }
+
+    /* Drop packet if adv data doesn't fit  */
+    if ((sizeof(*ev) + sizeof(ev->reports[0]) + adv_data_len) > BLE_HCI_MAX_DATA_LEN) {
+        STATS_INC(ble_ll_stats, adv_evt_dropped);
+        return -1;
+    }
+
+    hci_ev = ble_ll_scan_get_ext_adv_report(NULL);
+    if (!hci_ev) {
+        return -1;
+    }
+
+    ev = (void *) hci_ev->data;
+    report = ev->reports;
+
+    switch (evtype) {
+    case BLE_HCI_ADV_RPT_EVTYPE_ADV_IND:
+        report->evt_type = BLE_HCI_LEGACY_ADV_EVTYPE_ADV_IND;
+        break;
+    case BLE_HCI_ADV_RPT_EVTYPE_DIR_IND:
+        report->evt_type = BLE_HCI_LEGACY_ADV_EVTYPE_ADV_DIRECT_IND;
+        break;
+    case BLE_HCI_ADV_RPT_EVTYPE_NONCONN_IND:
+        report->evt_type = BLE_HCI_LEGACY_ADV_EVTYPE_ADV_NONCON_IND;
+        break;
+    case BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP:
+        report->evt_type = BLE_HCI_LEGACY_ADV_EVTYPE_SCAN_RSP_ADV_IND;
+         break;
+    case BLE_HCI_ADV_RPT_EVTYPE_SCAN_IND:
+        report->evt_type = BLE_HCI_LEGACY_ADV_EVTYPE_ADV_SCAN_IND;
+        break;
+    default:
+        BLE_LL_ASSERT(0);
+        ble_hci_trans_buf_free((uint8_t *) hci_ev);
+        return -1;
+    }
+
+    report->addr_type = addr_type;
+    memcpy(report->addr, addr, BLE_DEV_ADDR_LEN);
+    report->pri_phy = BLE_PHY_1M;
+    report->sid = 0xFF;
+    report->tx_power = 127;
+    report->rssi = rssi;
+
+    if (inita) {
+        report->dir_addr_type = inita_type;
+        memcpy(report->dir_addr, inita, BLE_DEV_ADDR_LEN);
+    }
+
+    if (adv_data_len) {
+        hci_ev->length += adv_data_len;
+        report->data_len = adv_data_len;
+        os_mbuf_copydata(adv_data, 0, adv_data_len, report->data);
+    }
+
+    return ble_ll_hci_event_send(hci_ev);
+}
+#endif
+
+static int
+ble_ll_hci_send_adv_report(uint8_t evtype,
+                           const uint8_t *addr, uint8_t addr_type, int8_t rssi,
+                           uint8_t adv_data_len, struct os_mbuf *adv_data)
+{
+    struct ble_hci_ev_le_subev_adv_rpt *ev;
+    struct ble_hci_ev *hci_ev;
+    int8_t *ev_rssi;
+
+    if (!ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_ADV_RPT)) {
+        return -1;
+    }
+
+    /* Drop packet if adv data doesn't fit, note extra 1 is for RSSI   */
+    if ((sizeof(*ev) + sizeof(ev->reports[0]) + adv_data_len + 1) > BLE_HCI_MAX_DATA_LEN) {
+        STATS_INC(ble_ll_stats, adv_evt_dropped);
+        return -1;
+    }
+
+    hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
+    if (!hci_ev) {
+        return -1;
+    }
+
+    hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+    hci_ev->length = sizeof(*ev) + sizeof(ev->reports[0]) + adv_data_len + 1;
+    ev = (void *) hci_ev->data;
+
+    ev->subev_code = BLE_HCI_LE_SUBEV_ADV_RPT;
+    ev->num_reports = 1;
+
+    ev->reports[0].type = evtype;
+    ev->reports[0].addr_type = addr_type;
+    memcpy(ev->reports[0].addr, addr, BLE_DEV_ADDR_LEN);
+    ev->reports[0].data_len = adv_data_len;
+    os_mbuf_copydata(adv_data, 0, adv_data_len, ev->reports[0].data);
+
+    /* RSSI is after adv data... */
+    ev_rssi = (int8_t *) (hci_ev->data + sizeof(*ev) + sizeof(ev->reports[0]) + adv_data_len);
+    *ev_rssi = rssi;
+
+    return ble_ll_hci_event_send(hci_ev);
+}
+
+static int
+ble_ll_hci_send_dir_adv_report(const uint8_t *addr, uint8_t addr_type,
+                               const uint8_t *inita, uint8_t inita_type,
+                               int8_t rssi)
+{
+    struct ble_hci_ev_le_subev_direct_adv_rpt *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (!ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_DIRECT_ADV_RPT)) {
+        return -1;
+    }
+
+    hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
+    if (!hci_ev) {
+        return -1;
+    }
+
+    hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+    hci_ev->length = sizeof(*ev) + sizeof(*(ev->reports));
+    ev = (void *) hci_ev->data;
+
+    ev->subev_code = BLE_HCI_LE_SUBEV_DIRECT_ADV_RPT;
+    ev->num_reports = 1;
+
+    ev->reports[0].type = BLE_HCI_ADV_RPT_EVTYPE_DIR_IND;
+    ev->reports[0].addr_type = addr_type;
+    memcpy(ev->reports[0].addr, addr, BLE_DEV_ADDR_LEN);
+    ev->reports[0].dir_addr_type = inita_type;
+    memcpy(ev->reports[0].dir_addr, inita, BLE_DEV_ADDR_LEN);
+    ev->reports[0].rssi = rssi;
+
+    return ble_ll_hci_event_send(hci_ev);
+}
+
+static int
+ble_ll_scan_dup_update_legacy(uint8_t addr_type, const uint8_t *addr,
+                              uint8_t subev, uint8_t evtype)
+{
+    struct ble_ll_scan_dup_entry *e;
+    uint8_t type;
+
+    type = BLE_LL_SCAN_ENTRY_TYPE_LEGACY(addr_type);
+
+    /*
+     * We assume ble_ll_scan_dup_check() was called before which either matched
+     * some entry or allocated new one and placed in on the top of queue.
+     */
+
+    e = TAILQ_FIRST(&g_scan_dup_list);
+    BLE_LL_ASSERT(e && e->type == type && !memcmp(e->addr, addr, 6));
+
+    if (subev == BLE_HCI_LE_SUBEV_DIRECT_ADV_RPT) {
+        e->flags |= BLE_LL_SCAN_DUP_F_DIR_ADV_REPORT_SENT;
+    } else {
+        if (evtype == BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP) {
+            e->flags |= BLE_LL_SCAN_DUP_F_SCAN_RSP_SENT;
+        } else {
+            e->flags |= BLE_LL_SCAN_DUP_F_ADV_REPORT_SENT;
+        }
+    }
+
+    return 0;
+}
+
+/**
+ * Send an advertising report to the host.
+ *
+ * NOTE: while we are allowed to send multiple devices in one report, we
+ * will just send for one for now.
+ *
+ * @param pdu_type
+ * @param txadd
+ * @param rxbuf
+ * @param hdr
+ * @param scansm
+ */
+static void
+ble_ll_scan_send_adv_report(uint8_t pdu_type,
+                            const uint8_t *adva, uint8_t adva_type,
+                            const uint8_t *inita, uint8_t inita_type,
+                            struct os_mbuf *om,
+                            struct ble_mbuf_hdr *hdr,
+                            struct ble_ll_scan_sm *scansm)
+{
+    uint8_t subev = BLE_HCI_LE_SUBEV_ADV_RPT;
+    uint8_t adv_data_len;
+    uint8_t evtype;
+    int rc;
+
+    if (pdu_type == BLE_ADV_PDU_TYPE_ADV_DIRECT_IND) {
+        if (ble_ll_is_rpa(inita, inita_type)) {
+            /* For resolvable we send separate subevent */
+            subev = BLE_HCI_LE_SUBEV_DIRECT_ADV_RPT;
+        }
+
+        evtype = BLE_HCI_ADV_RPT_EVTYPE_DIR_IND;
+        adv_data_len = 0;
+    } else {
+        if (pdu_type == BLE_ADV_PDU_TYPE_ADV_IND) {
+            evtype = BLE_HCI_ADV_RPT_EVTYPE_ADV_IND;
+        } else if (pdu_type == BLE_ADV_PDU_TYPE_ADV_SCAN_IND) {
+            evtype = BLE_HCI_ADV_RPT_EVTYPE_SCAN_IND;
+        } else if (pdu_type == BLE_ADV_PDU_TYPE_ADV_NONCONN_IND) {
+            evtype = BLE_HCI_ADV_RPT_EVTYPE_NONCONN_IND;
+        } else {
+            evtype = BLE_HCI_ADV_RPT_EVTYPE_SCAN_RSP;
+        }
+        adv_data_len = om->om_data[1] - BLE_DEV_ADDR_LEN;
+        os_mbuf_adj(om, BLE_LL_PDU_HDR_LEN + BLE_DEV_ADDR_LEN);
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /* If RPA has been used, make sure we use correct address types
+     * in the advertising report.
+     */
+    if (BLE_MBUF_HDR_RESOLVED(hdr)) {
+        adva_type += 2;
+    }
+    if (BLE_MBUF_HDR_TARGETA_RESOLVED(hdr)) {
+        inita_type += 2;
+    }
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (scansm->ext_scanning) {
+        rc = ble_ll_hci_send_legacy_ext_adv_report(evtype,
+                                                   adva, adva_type,
+                                                   hdr->rxinfo.rssi,
+                                                   adv_data_len, om,
+                                                   inita, inita_type);
+        goto done;
+    }
+#endif
+
+    if (subev == BLE_HCI_LE_SUBEV_DIRECT_ADV_RPT) {
+        rc = ble_ll_hci_send_dir_adv_report(adva, adva_type, inita, inita_type,
+                                            hdr->rxinfo.rssi);
+        goto done;
+    }
+
+    rc = ble_ll_hci_send_adv_report(evtype, adva, adva_type, hdr->rxinfo.rssi,
+                                    adv_data_len, om);
+done:
+    if (!rc && scansm->scan_filt_dups) {
+        ble_ll_scan_dup_update_legacy(adva_type, adva, subev, evtype);
+    }
+}
+
+static void
+ble_ll_get_chan_to_scan(struct ble_ll_scan_sm *scansm, uint8_t *chan,
+                        int *phy)
+{
+    struct ble_ll_scan_params *scanp = scansm->scanp;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_aux_data *aux_data = scansm->cur_aux_data;
+
+    if (!scansm->ext_scanning || !aux_data || !aux_data->scanning) {
+        *chan = scanp->scan_chan;
+        *phy = scanp->phy;
+        return;
+    }
+
+    *chan = aux_data->chan;
+    *phy = aux_data->aux_phy;
+#else
+    *chan = scanp->scan_chan;
+    *phy = scanp->phy;
+#endif
+}
+/**
+ * Called to enable the receiver for scanning.
+ *
+ * Context: Link Layer task
+ *
+ * @param sch
+ *
+ * @return int
+ */
+static int
+ble_ll_scan_start(struct ble_ll_scan_sm *scansm, struct ble_ll_sched_item *sch)
+{
+    int rc;
+    struct ble_ll_scan_params *scanp = scansm->scanp;
+    uint8_t scan_chan;
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    uint8_t phy_mode;
+#endif
+    int phy;
+
+    BLE_LL_ASSERT(scansm->scan_rsp_pending == 0);
+
+    ble_ll_get_chan_to_scan(scansm, &scan_chan, &phy);
+
+    /* XXX: right now scheduled item is only present if we schedule for aux
+     *      scan just make sanity check that we have proper combination of
+     *      sch and resulting scan_chan
+     */
+    BLE_LL_ASSERT(!sch || scan_chan < BLE_PHY_ADV_CHAN_START);
+    BLE_LL_ASSERT(sch || scan_chan >= BLE_PHY_ADV_CHAN_START);
+
+    /* Set channel */
+    rc = ble_phy_setchan(scan_chan, BLE_ACCESS_ADDR_ADV, BLE_LL_CRCINIT_ADV);
+    BLE_LL_ASSERT(rc == 0);
+
+    /*
+     * Set transmit end callback to NULL in case we transmit a scan request.
+     * There is a callback for the connect request.
+     */
+    ble_phy_set_txend_cb(NULL, NULL);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    ble_phy_encrypt_disable();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (ble_ll_resolv_enabled()) {
+        ble_phy_resolv_list_enable();
+    } else {
+        ble_phy_resolv_list_disable();
+    }
+#endif
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    phy_mode = ble_ll_phy_to_phy_mode(phy, BLE_HCI_LE_PHY_CODED_ANY);
+    ble_phy_mode_set(phy_mode, phy_mode);
+#endif
+
+    /* XXX: probably need to make sure hfxo is running too */
+    /* XXX: can make this better; want to just start asap. */
+    if (sch) {
+        rc = ble_phy_rx_set_start_time(sch->start_time +
+                                       g_ble_ll_sched_offset_ticks,
+                                       sch->remainder);
+    } else {
+        rc = ble_phy_rx_set_start_time(os_cputime_get32() +
+                                       g_ble_ll_sched_offset_ticks, 0);
+    }
+    if (!rc || rc == BLE_PHY_ERR_RX_LATE) {
+        /* If we are late here, it is still OK because we keep scanning.
+         * Clear error
+         */
+        rc = 0;
+
+        /* Enable/disable whitelisting */
+        if (scanp->scan_filt_policy & 1) {
+            ble_ll_whitelist_enable();
+        } else {
+            ble_ll_whitelist_disable();
+        }
+
+        /* Set link layer state to scanning */
+        if (scanp->scan_type == BLE_SCAN_TYPE_INITIATE) {
+            ble_ll_state_set(BLE_LL_STATE_INITIATING);
+        } else {
+            ble_ll_state_set(BLE_LL_STATE_SCANNING);
+        }
+    }
+
+    return rc;
+}
+
+static uint8_t
+ble_ll_scan_get_next_adv_prim_chan(uint8_t chan)
+{
+    ++chan;
+    if (chan == BLE_PHY_NUM_CHANS) {
+        chan = BLE_PHY_ADV_CHAN_START;
+    }
+
+    return chan;
+}
+
+static uint32_t
+ble_ll_scan_move_window_to(struct ble_ll_scan_params *scanp, uint32_t time)
+{
+    uint32_t end_time;
+
+    /*
+     * Move window until given tick is before or inside window and move to next
+     * channel for each skipped interval.
+     */
+
+    end_time = scanp->timing.start_time + scanp->timing.window;
+    while (CPUTIME_GEQ(time, end_time)) {
+        scanp->timing.start_time += scanp->timing.interval;
+        scanp->scan_chan = ble_ll_scan_get_next_adv_prim_chan(scanp->scan_chan);
+        end_time = scanp->timing.start_time + scanp->timing.window;
+    }
+
+    return scanp->timing.start_time;
+}
+
+static bool
+ble_ll_scan_is_inside_window(struct ble_ll_scan_params *scanp, uint32_t time)
+{
+    uint32_t start_time;
+
+    /* Make sure we are checking against closest window */
+    start_time = ble_ll_scan_move_window_to(scanp, time);
+
+    if (scanp->timing.window == scanp->timing.interval) {
+        /* always inside window in continuous scan */
+        return true;
+    }
+
+    return CPUTIME_GEQ(time, start_time) &&
+           CPUTIME_LT(time, start_time + scanp->timing.window);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_scan_aux_data_free(struct ble_ll_aux_data *aux_data)
+{
+    if (aux_data) {
+        if (aux_data->evt) {
+            ble_hci_trans_buf_free((uint8_t *)aux_data->evt);
+            aux_data->evt = NULL;
+        }
+        os_memblock_put(&ext_scan_aux_pool, aux_data);
+        STATS_INC(ble_ll_stats, aux_freed);
+    }
+}
+
+struct ble_ll_aux_data *
+ble_ll_scan_aux_data_ref(struct ble_ll_aux_data *aux_data)
+{
+    os_sr_t sr;
+
+    BLE_LL_ASSERT(aux_data);
+
+    OS_ENTER_CRITICAL(sr);
+    aux_data->ref_cnt++;
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_AUX_REF, (uint32_t) aux_data, aux_data->ref_cnt);
+
+    OS_EXIT_CRITICAL(sr);
+
+    return aux_data;
+}
+
+void
+ble_ll_scan_aux_data_unref(struct ble_ll_aux_data *aux_data)
+{
+    os_sr_t sr;
+
+    BLE_LL_ASSERT(aux_data);
+
+    OS_ENTER_CRITICAL(sr);
+    aux_data->ref_cnt--;
+    ble_ll_trace_u32x2(BLE_LL_TRACE_ID_AUX_UNREF, (uint32_t) aux_data, aux_data->ref_cnt);
+
+    if (aux_data->ref_cnt == 0) {
+        /*
+         * Some validation to make sure that we completed scan properly:
+         * - we either did not send any report or sent completed/truncated
+         * - we only sent one of completed/truncated
+         * - in case of error, we wither did not send anything or sent truncated
+         */
+        BLE_LL_ASSERT(!(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_ANY) ||
+                      ((aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_ANY) &&
+                       (aux_data->flags_ll & (BLE_LL_AUX_FLAG_HCI_SENT_COMPLETED | BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED))));
+        BLE_LL_ASSERT(!(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_COMPLETED) || !(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED));
+        BLE_LL_ASSERT(!(aux_data->flags_ll & BLE_LL_AUX_FLAG_SCAN_ERROR) ||
+                      !(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_ANY) ||
+                      (aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED));
+
+        ble_ll_scan_aux_data_free(aux_data);
+    }
+
+    OS_EXIT_CRITICAL(sr);
+}
+
+static void
+ble_ll_scan_sched_remove(struct ble_ll_sched_item *sch)
+{
+    ble_ll_scan_end_adv_evt(sch->cb_arg);
+    ble_ll_scan_aux_data_unref(sch->cb_arg);
+    sch->cb_arg = NULL;
+}
+#endif
+/**
+ * Stop the scanning state machine
+ */
+void
+ble_ll_scan_sm_stop(int chk_disable)
+{
+    os_sr_t sr;
+    uint8_t lls;
+    struct ble_ll_scan_sm *scansm;
+
+    /* Stop the scanning timer  */
+    scansm = &g_ble_ll_scan_sm;
+    os_cputime_timer_stop(&scansm->scan_timer);
+
+    OS_ENTER_CRITICAL(sr);
+
+    /* Disable scanning state machine */
+    scansm->scan_enabled = 0;
+    scansm->restart_timer_needed = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (scansm->ext_scanning) {
+        ble_ll_scan_clean_cur_aux_data();
+        ble_ll_sched_rmv_elem_type(BLE_LL_SCHED_TYPE_AUX_SCAN, ble_ll_scan_sched_remove);
+        scansm->ext_scanning = 0;
+    }
+#endif
+
+    /* Update backoff if we failed to receive scan response */
+    if (scansm->scan_rsp_pending) {
+        scansm->scan_rsp_pending = 0;
+        ble_ll_scan_req_backoff(scansm, 0);
+    }
+    OS_EXIT_CRITICAL(sr);
+
+    /* Count # of times stopped */
+    STATS_INC(ble_ll_stats, scan_stops);
+
+    /* Only set state if we are currently in a scan window */
+    if (chk_disable) {
+        OS_ENTER_CRITICAL(sr);
+        lls = ble_ll_state_get();
+
+        if ((lls == BLE_LL_STATE_SCANNING) ||
+                        (lls == BLE_LL_STATE_INITIATING && chk_disable == 1)) {
+            /* Disable phy */
+            ble_phy_disable();
+
+            /* Set LL state to standby */
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        }
+        OS_EXIT_CRITICAL(sr);
+    }
+
+    /* No need for RF anymore */
+    OS_ENTER_CRITICAL(sr);
+    ble_ll_rfmgmt_scan_changed(false, 0);
+    ble_ll_rfmgmt_release();
+    OS_EXIT_CRITICAL(sr);
+}
+
+static int
+ble_ll_scan_sm_start(struct ble_ll_scan_sm *scansm)
+{
+    struct ble_ll_scan_params *scanp;
+    struct ble_ll_scan_params *scanp_next;
+
+    if (!ble_ll_is_valid_own_addr_type(scansm->own_addr_type, g_random_addr)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    BLE_LL_ASSERT(scansm->scanp);
+    scanp = scansm->scanp;
+    scanp_next = scansm->scanp_next;
+
+    /* Count # of times started */
+    STATS_INC(ble_ll_stats, scan_starts);
+
+    /* Set flag telling us that scanning is enabled */
+    scansm->scan_enabled = 1;
+
+    /* Set first advertising channel */
+    scanp->scan_chan = BLE_PHY_ADV_CHAN_START;
+    if (scanp_next) {
+        scanp_next->scan_chan = BLE_PHY_ADV_CHAN_START;
+    }
+
+    /* Reset scan request backoff parameters to default */
+    scansm->upper_limit = 1;
+    scansm->backoff_count = 1;
+    scansm->scan_rsp_pending = 0;
+
+    /* Forget filtered advertisers from previous scan. */
+    g_ble_ll_scan_num_rsp_advs = 0;
+
+    os_mempool_clear(&g_scan_dup_pool);
+    TAILQ_INIT(&g_scan_dup_list);
+
+    /*
+     * First scan window can start when RF is enabled. Add 1 tick since we are
+     * most likely not aligned with ticks so RF may be effectively enabled 1
+     * tick later.
+     */
+    scanp->timing.start_time = ble_ll_rfmgmt_enable_now();
+    ble_ll_rfmgmt_scan_changed(true, scanp->timing.start_time);
+
+    if (scanp_next) {
+        /* Schedule start time right after first phy */
+        scanp_next->timing.start_time = scanp->timing.start_time +
+                                        scanp->timing.window;
+    }
+
+    /* Start scan at 1st window */
+    os_cputime_timer_start(&scansm->scan_timer, scanp->timing.start_time);
+
+    return BLE_ERR_SUCCESS;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_aux_scan_rsp_failed(struct ble_ll_scan_sm *scansm)
+{
+    if (!scansm->cur_aux_data) {
+        return;
+    }
+
+    STATS_INC(ble_ll_stats, aux_scan_rsp_err);
+    ble_ll_scan_interrupted(scansm);
+}
+#endif
+
+static void
+ble_ll_scan_interrupted_event_cb(struct ble_npl_event *ev)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_aux_data *aux_data;
+#endif
+
+    if (!scansm->scan_enabled) {
+        return;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    aux_data = ble_npl_event_get_arg(ev);
+
+    if (aux_data) {
+        if (scansm->scan_rsp_pending) {
+            STATS_INC(ble_ll_stats, aux_scan_rsp_err);
+        }
+        ble_ll_scan_end_adv_evt(aux_data);
+        ble_ll_scan_aux_data_unref(aux_data);
+        ble_npl_event_set_arg(ev, NULL);
+        STATS_INC(ble_ll_stats, aux_missed_adv);
+    }
+#endif
+
+    /*
+    * If we timed out waiting for a response, the scan response pending
+    * flag should be set. Deal with scan backoff. Put device back into rx.
+    */
+
+    if (scansm->scan_rsp_pending) {
+        scansm->scan_rsp_pending = 0;
+        ble_ll_scan_req_backoff(scansm, 0);
+    }
+
+    ble_ll_scan_chk_resume();
+}
+
+/**
+ * Called to process the scanning OS event which was posted to the LL task
+ *
+ * Context: Link Layer task.
+ *
+ * @param arg
+ */
+static void
+ble_ll_scan_event_proc(struct ble_npl_event *ev)
+{
+    struct ble_ll_scan_sm *scansm;
+    os_sr_t sr;
+    bool start_scan;
+    bool inside_window;
+    struct ble_ll_scan_params *scanp;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    bool inside_window_next;
+    struct ble_ll_scan_params *scanp_next;
+#endif
+    uint32_t next_proc_time;
+    uint32_t now;
+    /*
+     * Get the scanning state machine. If not enabled (this is possible), just
+     * leave and do nothing (just make sure timer is stopped).
+     */
+    scansm = (struct ble_ll_scan_sm *)ble_npl_event_get_arg(ev);
+    scanp = scansm->scanp;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    scanp_next = scansm->scanp_next;
+#endif
+
+    OS_ENTER_CRITICAL(sr);
+    if (!scansm->scan_enabled) {
+        os_cputime_timer_stop(&scansm->scan_timer);
+        ble_ll_rfmgmt_scan_changed(false, 0);
+        ble_ll_rfmgmt_release();
+        OS_EXIT_CRITICAL(sr);
+        return;
+    }
+
+    if (scansm->cur_aux_data || scansm->scan_rsp_pending) {
+        /* Aux scan in progress. Wait */
+        STATS_INC(ble_ll_stats, scan_timer_stopped);
+        scansm->restart_timer_needed = 1;
+        OS_EXIT_CRITICAL(sr);
+        return;
+    }
+
+    now = os_cputime_get32();
+
+    inside_window = ble_ll_scan_is_inside_window(scanp, now);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* Update also next PHY if configured */
+    if (scanp_next) {
+        inside_window_next = ble_ll_scan_is_inside_window(scanp_next, now);
+
+        /*
+         * Switch PHY if current PHY is outside window and next PHY is either
+         * inside window or has next window earlier than current PHY.
+         */
+        if (!inside_window &&
+            ((inside_window_next || CPUTIME_LEQ(scanp_next->timing.start_time,
+                                                scanp->timing.start_time)))) {
+            scansm->scanp = scanp_next;
+            scansm->scanp_next = scanp;
+            scanp = scansm->scanp;
+            scanp_next = scansm->scanp_next;
+            inside_window = inside_window_next;
+        }
+    }
+#endif
+
+    /*
+     * At this point scanp and scanp_next point to current or closest scan
+     * window on both PHYs (scanp is the closer one). Make sure RF is enabled
+     * on time.
+     */
+    ble_ll_rfmgmt_scan_changed(true, scanp->timing.start_time);
+
+    /*
+     * If we are inside window, next scan proc should happen at the end of
+     * current window to either disable scan or switch to next PHY.
+     * If we are outside window, next scan proc should happen at the time of
+     * closest scan window.
+     */
+    if (inside_window) {
+        next_proc_time = scanp->timing.start_time + scanp->timing.window;
+    } else {
+        next_proc_time = scanp->timing.start_time;
+    }
+
+    /*
+     * If we are not in the standby state it means that the scheduled
+     * scanning event was overlapped in the schedule. In this case all we do
+     * is post the scan schedule end event.
+     */
+    start_scan = inside_window;
+    switch (ble_ll_state_get()) {
+    case BLE_LL_STATE_ADV:
+    case BLE_LL_STATE_CONNECTION:
+    case BLE_LL_STATE_SYNC:
+         start_scan = false;
+         break;
+    case BLE_LL_STATE_INITIATING:
+        /* Must disable PHY since we will move to a new channel */
+        ble_phy_disable();
+        if (!inside_window) {
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        }
+        /* PHY is disabled - make sure we do not wait for AUX_CONNECT_RSP */
+        ble_ll_conn_reset_pending_aux_conn_rsp();
+        break;
+    case BLE_LL_STATE_SCANNING:
+        /* Must disable PHY since we will move to a new channel */
+        ble_phy_disable();
+        if (!inside_window) {
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        }
+        break;
+    case BLE_LL_STATE_STANDBY:
+        break;
+    default:
+        BLE_LL_ASSERT(0);
+        break;
+    }
+
+    if (start_scan) {
+        ble_ll_scan_start(scansm, NULL);
+    } else {
+        ble_ll_rfmgmt_release();
+    }
+
+    OS_EXIT_CRITICAL(sr);
+    os_cputime_timer_start(&scansm->scan_timer, next_proc_time);
+}
+
+/**
+ * ble ll scan rx pdu start
+ *
+ * Called when a PDU reception has started and the Link Layer is in the
+ * scanning state.
+ *
+ * Context: Interrupt
+ *
+ * @param pdu_type
+ * @param rxflags
+ *
+ * @return int
+ *  0: we will not attempt to reply to this frame
+ *  1: we may send a response to this frame.
+ */
+int
+ble_ll_scan_rx_isr_start(uint8_t pdu_type, uint16_t *rxflags)
+{
+    int rc;
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_scan_params *scanp;
+
+    rc = 0;
+    scansm = &g_ble_ll_scan_sm;
+    scanp = scansm->scanp;
+
+    switch (scanp->scan_type) {
+    case BLE_SCAN_TYPE_ACTIVE:
+        /* If adv ind or scan ind, we may send scan request */
+        if ((pdu_type == BLE_ADV_PDU_TYPE_ADV_IND) ||
+            (pdu_type == BLE_ADV_PDU_TYPE_ADV_SCAN_IND)) {
+            rc = 1;
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if ((pdu_type == BLE_ADV_PDU_TYPE_ADV_EXT_IND && scansm->ext_scanning)) {
+            *rxflags |= BLE_MBUF_HDR_F_EXT_ADV;
+            rc = 1;
+        }
+#endif
+
+        if (scansm->cur_aux_data && !scansm->scan_rsp_pending ) {
+            STATS_INC(ble_ll_stats, aux_received);
+        }
+
+        /*
+         * If this is the first PDU after we sent the scan response (as
+         * denoted by the scan rsp pending flag), we set a bit in the ble
+         * header so the link layer can check to see if the scan request
+         * was successful. We do it this way to let the Link Layer do the
+         * work for successful scan requests. If failed, we do the work here.
+         */
+        if (scansm->scan_rsp_pending) {
+            scansm->scan_rsp_pending = 0;
+
+            if (pdu_type == BLE_ADV_PDU_TYPE_SCAN_RSP) {
+                *rxflags |= BLE_MBUF_HDR_F_SCAN_RSP_RXD;
+            } else if (pdu_type == BLE_ADV_PDU_TYPE_AUX_SCAN_RSP) {
+                *rxflags |= BLE_MBUF_HDR_F_SCAN_RSP_RXD;
+            } else {
+                ble_ll_scan_req_backoff(scansm, 0);
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+                ble_ll_aux_scan_rsp_failed(scansm);
+#endif
+            }
+        }
+        break;
+    case BLE_SCAN_TYPE_PASSIVE:
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if ((pdu_type == BLE_ADV_PDU_TYPE_ADV_EXT_IND && scansm->ext_scanning)) {
+            *rxflags |= BLE_MBUF_HDR_F_EXT_ADV;
+        }
+        break;
+#endif
+    default:
+        break;
+    }
+
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static uint8_t
+ble_ll_ext_adv_phy_mode_to_local_phy(uint8_t adv_phy_mode)
+{
+    switch (adv_phy_mode) {
+    case 0x00:
+        return BLE_PHY_1M;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+     case 0x01:
+        return BLE_PHY_2M;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case 0x02:
+        return BLE_PHY_CODED;
+#endif
+    }
+
+    return 0;
+}
+
+static int
+ble_ll_ext_scan_parse_aux_ptr(struct ble_ll_aux_data *aux_data, uint8_t *buf)
+{
+    uint32_t aux_ptr_field = get_le32(buf) & 0x00FFFFFF;
+
+    aux_data->chan = (aux_ptr_field) & 0x3F;
+    if (aux_data->chan >= BLE_PHY_NUM_DATA_CHANS) {
+        return -1;
+    }
+
+    /* TODO use CA aux_ptr_field >> 6 */
+
+    aux_data->offset = 30 * ((aux_ptr_field >> 8) & 0x1FFF);
+
+    if ((aux_ptr_field >> 7) & 0x01) {
+            aux_data->offset *= 10;
+            aux_data->offset_units = 1;
+    }
+
+    if (aux_data->offset < BLE_LL_MAFS) {
+        return -1;
+    }
+
+    aux_data->aux_phy =
+            ble_ll_ext_adv_phy_mode_to_local_phy((aux_ptr_field >> 21) & 0x07);
+    if (aux_data->aux_phy == 0) {
+        return -1;
+    }
+
+    return 0;
+}
+
+static void
+ble_ll_ext_scan_parse_adv_info(struct ext_adv_report *report, const uint8_t *buf)
+{
+    uint16_t adv_info = get_le16(buf);
+
+    /* TODO Use DID */
+
+    report->sid = (adv_info >> 12);
+}
+
+/**
+ * ble_ll_scan_update_aux_data
+ *
+ * Update aux_data stored in ble_hdr.rxinfo.user_data. If no aux_data is present
+ * (i.e. processing ADV_EXT_IND) this will try to allocate new aux_data.
+ *
+ * Context: Interrupt
+ *
+ * @param ble_hdr
+ * @param rxbuf
+ *
+ * @return int
+ *  1: do not scan for next AUX (no AuxPtr or malformed data)
+ *  0: scan for next AUX (valid AuxPtr found)
+ * -1: error
+ */
+int
+ble_ll_scan_update_aux_data(struct ble_mbuf_hdr *ble_hdr, uint8_t *rxbuf,
+                            bool *adva_present)
+{
+    uint8_t pdu_hdr;
+    uint8_t pdu_len;
+    uint8_t adv_mode;
+    uint8_t eh_len;
+    uint8_t eh_flags;
+    uint8_t *eh;
+    struct ble_ll_aux_data *aux_data;
+    bool is_aux;
+
+    aux_data = ble_hdr->rxinfo.user_data;
+    /* aux_data is initially not set only for ADV_EXT_IND */
+    is_aux = aux_data;
+
+    pdu_hdr = rxbuf[0];
+    pdu_len = rxbuf[1];
+
+    /* PDU without at least Extended Header Length is invalid */
+    if (pdu_len == 0) {
+        return -1;
+    }
+
+    adv_mode = rxbuf[2] >> 6;
+    eh_len = rxbuf[2] & 0x3f;
+    eh_flags = rxbuf[3];
+    eh = &rxbuf[4];
+
+    /*
+     * PDU without Extended Header is valid in case of last AUX_CHAIN_IND in
+     * chain so aux_data has to be set and advertising mode has to be 00b,
+     * otherwise it's an invalid PDU.
+     */
+    if (eh_len == 0) {
+        if (!aux_data || adv_mode) {
+            return -1;
+        }
+        aux_data->flags_isr |= BLE_LL_AUX_FLAG_SCAN_COMPLETE;
+        return 1;
+    }
+
+    /*
+     * If aux_data is not set, this is ADV_EXT_IND which starts new extended
+     * advertising event.
+     */
+    if (!aux_data) {
+        if (ble_ll_scan_ext_adv_init(&aux_data)) {
+            return -1;
+        }
+
+        aux_data->aux_primary_phy = ble_hdr->rxinfo.phy;
+    } else {
+        if (aux_data->flags_isr & BLE_LL_AUX_FLAG_AUX_ADV_RECEIVED) {
+            aux_data->flags_isr |= BLE_LL_AUX_FLAG_AUX_CHAIN_RECEIVED;
+        } else {
+            aux_data->flags_isr |= BLE_LL_AUX_FLAG_AUX_ADV_RECEIVED;
+        }
+    }
+
+    /* Now parse extended header... */
+
+    if (eh_flags & (1 << BLE_LL_EXT_ADV_ADVA_BIT)) {
+        aux_data->flags |= BLE_LL_AUX_HAS_ADVA;
+        memcpy(aux_data->adva, eh, 6);
+        aux_data->adva_type = !!(pdu_hdr & BLE_ADV_PDU_HDR_TXADD_MASK);
+        eh += BLE_LL_EXT_ADV_ADVA_SIZE;
+
+        if (adva_present) {
+            *adva_present = true;
+        }
+    } else if (adva_present) {
+        *adva_present = false;
+    }
+
+    if (eh_flags & (1 << BLE_LL_EXT_ADV_TARGETA_BIT)) {
+        aux_data->flags |= BLE_LL_AUX_HAS_TARGETA;
+        memcpy(aux_data->targeta, eh, 6);
+        aux_data->targeta_type = !!(pdu_hdr & BLE_ADV_PDU_HDR_RXADD_MASK);
+        eh += BLE_LL_EXT_ADV_TARGETA_SIZE;
+    }
+
+
+    if (eh_flags & (1 << BLE_LL_EXT_ADV_CTE_INFO_BIT)) {
+        eh += 1;
+    }
+
+    if (eh_flags & (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT)) {
+        aux_data->flags |= BLE_LL_AUX_HAS_ADI;
+        if (is_aux) {
+            if (get_le16(eh) != aux_data->adi) {
+                aux_data->flags_isr |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+                STATS_INC(ble_ll_stats, aux_chain_err);
+            }
+        } else {
+            aux_data->adi = get_le16(eh);
+        }
+        eh += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+    }
+
+    if (eh_flags & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT)) {
+        if (ble_ll_ext_scan_parse_aux_ptr(aux_data, eh)) {
+            aux_data->flags_isr |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+        }
+    } else if (!(adv_mode & BLE_LL_EXT_ADV_MODE_SCAN)) {
+        /* No AuxPtr for scannable PDU is ignored since we can still scan it */
+        aux_data->flags_isr |= BLE_LL_AUX_FLAG_SCAN_COMPLETE;
+    }
+
+    ble_hdr->rxinfo.user_data = aux_data;
+
+    /* Do not scan for next AUX if either no AuxPtr or malformed data found */
+    return !(eh_flags & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT)) ||
+           (aux_data->flags_isr & BLE_LL_AUX_FLAG_SCAN_ERROR);
+}
+
+/**
+ * Called when a receive ADV_EXT PDU has ended.
+ *
+ * Context: Interrupt
+ *
+ * @return int
+ *       < 0  Error
+ *      >= 0: Success (number of bytes left in PDU)
+ *
+ */
+static int
+ble_ll_scan_parse_ext_hdr(struct os_mbuf *om,
+                          const uint8_t *adva, uint8_t adva_type,
+                          const uint8_t *inita, uint8_t inita_type,
+                          struct ble_mbuf_hdr *ble_hdr,
+                          struct ext_adv_report *report)
+{
+    uint8_t pdu_len;
+    uint8_t ext_hdr_len;
+    uint8_t ext_hdr_flags;
+    uint8_t *ext_hdr;
+    uint8_t *rxbuf = om->om_data;
+    int i = 1;
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_aux_data *aux_data = ble_hdr->rxinfo.user_data;
+
+    BLE_LL_ASSERT(report);
+
+    scansm = &g_ble_ll_scan_sm;
+
+    if (!scansm->ext_scanning) {
+       /* Ignore ext adv if host does not want it*/
+       return -1;
+    }
+
+    pdu_len = rxbuf[1];
+    if (pdu_len == 0) {
+        return -1;
+    }
+
+    report->evt_type = rxbuf[2] >> 6;
+    if ( report->evt_type > BLE_LL_EXT_ADV_MODE_SCAN) {
+        return -1;
+    }
+
+    if (BLE_MBUF_HDR_SCAN_RSP_RXD(ble_hdr)) {
+        report->evt_type |= BLE_HCI_ADV_SCAN_RSP_MASK;
+    }
+
+    ext_hdr_len = rxbuf[2] & 0x3F;
+    os_mbuf_adj(om, 3);
+
+    ext_hdr_flags = rxbuf[3];
+    ext_hdr = &rxbuf[4];
+
+    if (ext_hdr_len) {
+        i = 0;
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_ADVA_BIT)) {
+            i += BLE_LL_EXT_ADV_ADVA_SIZE;
+        }
+
+        if (adva) {
+            memcpy(report->addr, adva, 6);
+            report->addr_type = adva_type;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_TARGETA_BIT)) {
+            i += BLE_LL_EXT_ADV_TARGETA_SIZE;
+        }
+
+        if (inita) {
+           memcpy(report->dir_addr, inita, 6);
+           report->dir_addr_type = inita_type;
+           report->evt_type |= BLE_HCI_ADV_DIRECT_MASK;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_CTE_INFO_BIT)) {
+            /* Just skip it for now*/
+            i += 1;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT)) {
+            ble_ll_ext_scan_parse_adv_info(report, (ext_hdr + i));
+            i += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+        } else if (report->evt_type & BLE_HCI_ADV_SCAN_RSP_MASK) {
+            report->sid = (aux_data->adi >> 12);
+        }
+
+        /* In this point of time we don't want to care about aux ptr */
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT)) {
+            i += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_SYNC_INFO_BIT)) {
+            report->periodic_itvl = get_le16(ext_hdr + i + 2);
+            i += BLE_LL_EXT_ADV_SYNC_INFO_SIZE;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_TX_POWER_BIT)) {
+            report->tx_power = *(ext_hdr + i);
+            i += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+        }
+
+        /* TODO Handle ACAD if needed */
+    }
+
+    /* In the event we need information on primary and secondary PHY used during
+     * advertising.
+     */
+    if (!aux_data) {
+        report->pri_phy = ble_hdr->rxinfo.phy;
+        goto done;
+    }
+
+    report->sec_phy = aux_data->aux_phy;
+    report->pri_phy = aux_data->aux_primary_phy;
+
+    if (ext_hdr_len) {
+        /* Adjust mbuf to contain advertising data only */
+        os_mbuf_adj(om, ext_hdr_len);
+    }
+
+    /* Let us first keep update event type in aux data.
+     * Note that in aux chain and aux scan response packets
+     * we do miss original event type, which we need for advertising report.
+     */
+    aux_data->evt_type |= report->evt_type;
+    report->evt_type = aux_data->evt_type;
+
+done:
+    return pdu_len - ext_hdr_len - 1;
+}
+
+static int
+ble_ll_scan_get_addr_from_ext_adv(uint8_t *rxbuf, struct ble_mbuf_hdr *ble_hdr,
+                                  uint8_t **addr, uint8_t *addr_type,
+                                  uint8_t **inita, uint8_t *inita_type,
+                                  int *ext_mode)
+{
+    uint8_t pdu_len;
+    uint8_t ext_hdr_len;
+    uint8_t ext_hdr_flags;
+    uint8_t *ext_hdr;
+    bool has_adva = false;
+    bool has_inita = false;
+    int i;
+    struct ble_ll_aux_data *aux_data = ble_hdr->rxinfo.user_data;
+
+    *addr = NULL;
+    *inita = NULL;
+
+    pdu_len = rxbuf[1];
+    if (pdu_len == 0) {
+        return -1;
+    }
+
+    *ext_mode = rxbuf[2] >> 6;
+    if (*ext_mode > BLE_LL_EXT_ADV_MODE_SCAN) {
+        return -1;
+    }
+
+    ext_hdr_len = rxbuf[2] & 0x3F;
+    if (ext_hdr_len == 0) {
+        goto done;
+    }
+
+    ext_hdr_flags = rxbuf[3];
+    ext_hdr = &rxbuf[4];
+
+    i = 0;
+    if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_ADVA_BIT)) {
+        if (ext_hdr_len < BLE_LL_EXT_ADV_ADVA_SIZE) {
+            return -1;
+        }
+
+        *addr = ext_hdr + i;
+        *addr_type =
+                ble_ll_get_addr_type(rxbuf[0] & BLE_ADV_PDU_HDR_TXADD_MASK);
+        i += BLE_LL_EXT_ADV_ADVA_SIZE;
+
+        has_adva = true;
+    }
+
+    if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_TARGETA_BIT)) {
+        *inita = ext_hdr + i;
+        *inita_type =
+                ble_ll_get_addr_type(rxbuf[0] & BLE_ADV_PDU_HDR_RXADD_MASK);
+        i += BLE_LL_EXT_ADV_TARGETA_SIZE;
+
+        has_inita = true;
+    }
+
+done:
+    /* Check if we had address already. If yes, replace it with new one */
+
+    if (aux_data) {
+        /* If address has been provided, we do have it already in aux_data.*/
+        if (aux_data->flags & BLE_LL_AUX_HAS_ADVA) {
+            if (!has_adva) {
+                *addr = aux_data->adva;
+                *addr_type = aux_data->adva_type;
+            } else {
+                memcpy(aux_data->adva, *addr, 6);
+                aux_data->adva_type = *addr_type;
+            }
+        }
+
+        if (aux_data->flags & BLE_LL_AUX_HAS_TARGETA) {
+            if (!has_inita) {
+                *inita = aux_data->targeta;
+                *inita_type = aux_data->targeta_type;
+            } else {
+                memcpy(aux_data->targeta, *inita, 6);
+                aux_data->targeta_type = *inita_type;
+            }
+        }
+    }
+
+    return 0;
+}
+#endif
+
+int
+ble_ll_scan_adv_decode_addr(uint8_t pdu_type, uint8_t *rxbuf,
+                            struct ble_mbuf_hdr *ble_hdr,
+                            uint8_t **addr, uint8_t *addr_type,
+                            uint8_t **inita, uint8_t *inita_type,
+                            int *ext_mode)
+{
+    /*
+     * XXX this should be only used for legacy advertising, but need to refactor
+     *     code in ble_ll_init first so it does not call this for ext
+     */
+
+    if (pdu_type != BLE_ADV_PDU_TYPE_ADV_EXT_IND &&
+        pdu_type != BLE_ADV_PDU_TYPE_AUX_CONNECT_RSP) {
+        /* Legacy advertising */
+        *addr_type = ble_ll_get_addr_type(rxbuf[0] & BLE_ADV_PDU_HDR_TXADD_MASK);
+        *addr = rxbuf + BLE_LL_PDU_HDR_LEN;
+
+        if (pdu_type != BLE_ADV_PDU_TYPE_ADV_DIRECT_IND) {
+            *inita = NULL;
+            *inita_type = 0;
+            return 0;
+        }
+
+        *inita = rxbuf + BLE_LL_PDU_HDR_LEN + BLE_DEV_ADDR_LEN;
+        *inita_type = ble_ll_get_addr_type(rxbuf[0] & BLE_ADV_PDU_HDR_RXADD_MASK);
+
+        return 0;
+    }
+
+    /* Extended advertising */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    return ble_ll_scan_get_addr_from_ext_adv(rxbuf, ble_hdr, addr, addr_type,
+                                          inita, inita_type, ext_mode);
+#else
+    return -1;
+#endif
+
+    return 0;
+}
+
+static void
+ble_ll_scan_get_addr_data_from_legacy(uint8_t pdu_type, uint8_t *rxbuf,
+                                     struct ble_ll_scan_addr_data *addrd)
+{
+    BLE_LL_ASSERT(pdu_type < BLE_ADV_PDU_TYPE_ADV_EXT_IND);
+
+    addrd->adva_present = true;
+
+    addrd->adva = rxbuf + BLE_LL_PDU_HDR_LEN;
+    addrd->adva_type = ble_ll_get_addr_type(rxbuf[0] & BLE_ADV_PDU_HDR_TXADD_MASK);
+
+    if (pdu_type == BLE_ADV_PDU_TYPE_ADV_DIRECT_IND) {
+        addrd->targeta = rxbuf + BLE_LL_PDU_HDR_LEN + BLE_DEV_ADDR_LEN;
+        addrd->targeta_type = ble_ll_get_addr_type(rxbuf[0] & BLE_ADV_PDU_HDR_RXADD_MASK);
+    } else {
+        addrd->targeta = NULL;
+        addrd->targeta_type = 0;
+    }
+}
+
+/*
+ * Matches incoming PDU using scan filter policy and whitelist, if applicable.
+ * This will also resolve addresses and update flags/fields in header and
+ * addr_data as needed.
+ *
+ * @return  0 = no match
+ *          1 = match
+ *          2 = match, but do not scan
+ */
+static int
+ble_ll_scan_rx_filter(struct ble_mbuf_hdr *hdr, struct ble_ll_scan_addr_data *addrd)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    struct ble_ll_scan_params *scanp = scansm->scanp;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_aux_data *aux_data = hdr->rxinfo.user_data;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+    struct ble_ll_resolv_entry *rl = NULL;
+#endif
+    bool scan_req_allowed = true;
+    int resolved = 0;
+
+    /* Use AdvA as initial advertiser address, we may try to resolve it later */
+    addrd->adv_addr = addrd->adva;
+    addrd->adv_addr_type = addrd->adva_type;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /* By default, assume AdvA is not resolved */
+    rxinfo->rpa_index = -1;
+
+    switch (ble_ll_addr_subtype(addrd->adva, addrd->adva_type)) {
+    case BLE_LL_ADDR_SUBTYPE_RPA:
+        /*
+         * Only resolve if packet actually contained AdvA.
+         * In extended advertising PDUs we may use RL index from a PDU that
+         * already had AdvA (e.g. ADV_EXT_IND in case of AUX_ADV_IND without
+         * AdvA). In legacy advertising PDUs we always need to resolve AdvA.
+         */
+        if (addrd->adva_present) {
+            rxinfo->rpa_index = ble_hw_resolv_list_match();
+        } else {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+            BLE_LL_ASSERT(aux_data);
+            rxinfo->rpa_index = aux_data->rpa_index;
+#else
+            BLE_LL_ASSERT(false);
+            rxinfo->rpa_index = -1;
+#endif
+        }
+
+        if (rxinfo->rpa_index < 0) {
+            break;
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        if (aux_data) {
+            aux_data->rpa_index = rxinfo->rpa_index;
+        }
+#endif
+
+        /* Use resolved identity address as advertiser address */
+        rl = &g_ble_ll_resolv_list[rxinfo->rpa_index];
+        addrd->adv_addr = rl->rl_identity_addr;
+        addrd->adv_addr_type = rl->rl_addr_type;
+        addrd->rl = rl;
+
+        rxinfo->flags |= BLE_MBUF_HDR_F_RESOLVED;
+        resolved = 1;
+        break;
+    case BLE_LL_ADDR_SUBTYPE_IDENTITY:
+        /*
+         * If AdvA is an identity address, we need to check if that device was
+         * added to RL in order to use proper privacy mode.
+         */
+        rl = ble_ll_resolv_list_find(addrd->adva, addrd->adva_type);
+        if (!rl) {
+            break;
+        }
+
+        addrd->rl = rl;
+
+        /* Ignore device if using network privacy mode and it has IRK */
+        if ((rl->rl_priv_mode == BLE_HCI_PRIVACY_NETWORK) && rl->rl_has_peer) {
+            return 0;
+        }
+        break;
+    default:
+        /* NRPA goes through filtering policy directly */
+        break;
+    }
+
+    if (addrd->targeta) {
+        switch (ble_ll_addr_subtype(addrd->targeta, addrd->targeta_type)) {
+        case BLE_LL_ADDR_SUBTYPE_RPA:
+            /* Check if TargetA can be resolved using the same RL entry as AdvA */
+            if (rl && ble_ll_resolv_rpa(addrd->targeta, rl->rl_local_irk)) {
+                rxinfo->flags |= BLE_MBUF_HDR_F_TARGETA_RESOLVED;
+                break;
+            }
+
+            /* Check if scan filter policy allows unresolved RPAs to be processed */
+            if (!(scanp->scan_filt_policy & 0x02)) {
+                return 0;
+            }
+
+            /*
+             * We will notify host as requited by scan policy, but make sure we
+             * do not send scan request since we do not know if this is directed
+             * to us.
+             */
+            scan_req_allowed = false;
+            break;
+        case BLE_LL_ADDR_SUBTYPE_IDENTITY:
+            /* We shall ignore identity in TargetA if we are using RPA */
+            if ((scanp->own_addr_type & 0x02) && rl && rl->rl_has_local) {
+                return 0;
+            }
+            /* Ignore if not directed to us */
+            if (!ble_ll_is_our_devaddr(addrd->targeta, addrd->targeta_type)) {
+                return 0;
+            }
+            break;
+        default:
+            /* NRPA goes through filtering policy directly */
+            break;
+        }
+    }
+#else
+    /* Ignore if not directed to us */
+    if (addrd->targeta &&
+        !ble_ll_is_our_devaddr(addrd->targeta, addrd->targeta_type)) {
+        return 0;
+    }
+#endif
+
+    /* Check on WL if required by scan filter policy */
+    if (scanp->scan_filt_policy & 0x01) {
+        if (!ble_ll_whitelist_match(addrd->adv_addr, addrd->adv_addr_type, resolved)) {
+            return 0;
+        }
+    }
+
+    return scan_req_allowed ? 1 : 2;
+}
+
+static int
+ble_ll_scan_rx_isr_on_legacy(uint8_t pdu_type, uint8_t *rxbuf,
+                             struct ble_mbuf_hdr *hdr,
+                             struct ble_ll_scan_addr_data *addrd)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    struct ble_ll_scan_params *scanp = scansm->scanp;
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+    uint8_t sreq_adva_type;
+    uint8_t *sreq_adva;
+    int rc;
+
+    ble_ll_scan_get_addr_data_from_legacy(pdu_type, rxbuf, addrd);
+
+    if (pdu_type == BLE_ADV_PDU_TYPE_SCAN_RSP) {
+        if (!BLE_MBUF_HDR_SCAN_RSP_RXD(hdr)) {
+            /*
+             * We were not expecting scan response so just ignore and do not
+             * update backoff.
+             */
+            return -1;
+        }
+
+        sreq_adva_type = !!(scansm->pdu_data.hdr_byte & BLE_ADV_PDU_HDR_RXADD_MASK);
+        sreq_adva = scansm->pdu_data.adva;
+
+        /*
+         * Ignore scan response if AdvA does not match AdvA in request and also
+         * update backoff as if there was no scan response.
+         */
+        if ((addrd->adva_type != sreq_adva_type) ||
+            memcmp(addrd->adva, sreq_adva, BLE_DEV_ADDR_LEN)) {
+            ble_ll_scan_req_backoff(scansm, 0);
+            return -1;
+        }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        /*
+         * We are not pushing this one through filters so need to update
+         * rpa_index here as otherwise pkt_in won't be able to determine
+         * advertiser address properly.
+         */
+        rxinfo->rpa_index = ble_hw_resolv_list_match();
+        if (rxinfo->rpa_index >= 0) {
+            rxinfo->flags |= BLE_MBUF_HDR_F_RESOLVED;
+        }
+#endif
+
+        rxinfo->flags |= BLE_MBUF_HDR_F_DEVMATCH;
+
+        return 0;
+    }
+
+    rc = ble_ll_scan_rx_filter(hdr, addrd);
+    if (!rc) {
+        return 0;
+    }
+
+    rxinfo->flags |= BLE_MBUF_HDR_F_DEVMATCH;
+
+    if (rc == 2) {
+        /* Scan request forbidden by filter policy */
+        return 0;
+    }
+
+    return (scanp->scan_type == BLE_SCAN_TYPE_ACTIVE) &&
+           ((pdu_type == BLE_ADV_PDU_TYPE_ADV_IND) ||
+            (pdu_type == BLE_ADV_PDU_TYPE_ADV_SCAN_IND));
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static int
+ble_ll_scan_rx_isr_on_aux(uint8_t pdu_type, uint8_t *rxbuf,
+                          struct ble_mbuf_hdr *hdr,
+                          struct ble_ll_scan_addr_data *addrd)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    struct ble_ll_scan_params *scanp = scansm->scanp;
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+    struct ble_ll_aux_data *aux_data;
+    int rc;
+
+    if (!scansm->ext_scanning) {
+        return -1;
+    }
+
+    rc = ble_ll_scan_update_aux_data(hdr, rxbuf, &addrd->adva_present);
+    if (rc < 0) {
+        rxinfo->flags |= BLE_MBUF_HDR_F_AUX_INVALID;
+        return -1;
+    } else if (rc == 0) {
+        rxinfo->flags |= BLE_MBUF_HDR_F_AUX_PTR_WAIT;
+    }
+
+    /* Now we can update aux_data from header since it may have just been created */
+    aux_data = rxinfo->user_data;
+
+    /*
+     * Restore proper header flags if filtering was already done successfully on
+     * some previous PDU in an event.
+     */
+    if (aux_data->flags & BLE_LL_AUX_IS_MATCHED) {
+        rxinfo->flags |= BLE_MBUF_HDR_F_DEVMATCH;
+        rxinfo->rpa_index = aux_data->rpa_index;
+        if (rxinfo->rpa_index >= 0) {
+            rxinfo->flags |= BLE_MBUF_HDR_F_RESOLVED;
+        }
+        if (aux_data->flags & BLE_LL_AUX_IS_TARGETA_RESOLVED) {
+            rxinfo->flags |= BLE_MBUF_HDR_F_TARGETA_RESOLVED;
+        }
+        goto done;
+    }
+
+    if (aux_data->flags & BLE_LL_AUX_HAS_ADVA) {
+        addrd->adva = aux_data->adva;
+        addrd->adva_type = aux_data->adva_type;
+    } else {
+        /* Accept this PDU and wait for AdvA in aux */
+        rxinfo->flags |= BLE_MBUF_HDR_F_DEVMATCH;
+        return 0;
+    }
+    if (aux_data->flags & BLE_LL_AUX_HAS_TARGETA) {
+        addrd->targeta = aux_data->targeta;
+        addrd->targeta_type = aux_data->targeta_type;
+    } else {
+        addrd->targeta = NULL;
+    }
+
+    rc = ble_ll_scan_rx_filter(hdr, addrd);
+    if (!rc) {
+        return 0;
+    }
+
+    rxinfo->flags |= BLE_MBUF_HDR_F_DEVMATCH;
+
+    /*
+     * Once we matched device, there's no need to go through filtering on every
+     * other PDU in an event so just store info required to restore state for
+     * subsequent PDUs in aux_data.
+     */
+    aux_data->flags |= BLE_LL_AUX_IS_MATCHED;
+    if (rxinfo->flags & BLE_MBUF_HDR_F_TARGETA_RESOLVED) {
+        aux_data->flags |= BLE_LL_AUX_IS_TARGETA_RESOLVED;
+        /* AdvA state is already stored in rpa_index */
+    }
+
+    if (rc == 2) {
+        /* Scan request forbidden by filter policy */
+        return 0;
+    }
+
+done:
+    return (scanp->scan_type == BLE_SCAN_TYPE_ACTIVE) &&
+           ((rxbuf[2] >> 6) == BLE_LL_EXT_ADV_MODE_SCAN);
+}
+#endif
+
+static bool
+ble_ll_scan_send_scan_req(uint8_t pdu_type, uint8_t *rxbuf,
+                          struct ble_mbuf_hdr *hdr,
+                          struct ble_ll_scan_addr_data *addrd)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_ll_aux_data *aux_data = rxinfo->user_data;
+    uint8_t phy_mode;
+#endif
+    bool is_ext_adv = false;
+    uint16_t adi = 0;
+    int rc;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (pdu_type == BLE_ADV_PDU_TYPE_ADV_EXT_IND) {
+        if (ble_ll_scan_get_adi(aux_data, &adi) < 0) {
+            return false;
+        }
+        is_ext_adv = true;
+    }
+#endif
+
+    /* Check if we already scanned this device successfully */
+    if (ble_ll_scan_have_rxd_scan_rsp(addrd->adv_addr, addrd->adv_addr_type,
+                                      is_ext_adv, adi)) {
+        return false;
+    }
+
+    /* Better not be a scan response pending */
+    BLE_LL_ASSERT(scansm->scan_rsp_pending == 0);
+
+    /* We want to send a request. See if backoff allows us */
+    if (scansm->backoff_count > 0) {
+        if (--scansm->backoff_count != 0) {
+            return false;
+        }
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    phy_mode = ble_ll_phy_to_phy_mode(rxinfo->phy, BLE_HCI_LE_PHY_CODED_ANY);
+    if (ble_ll_sched_scan_req_over_aux_ptr(rxinfo->channel, phy_mode)) {
+        return false;
+    }
+#endif
+
+    /* Use original AdvA in scan request (Core 5.1, Vol 6, Part B, section 6.3) */
+    ble_ll_scan_req_pdu_prepare(scansm, addrd->adva, addrd->adva_type, addrd->rl);
+
+    rc = ble_phy_tx(ble_ll_scan_req_tx_pdu_cb, scansm, BLE_PHY_TRANSITION_TX_RX);
+    if (rc) {
+        return false;
+    }
+
+    scansm->scan_rsp_pending = 1;
+    rxinfo->flags |= BLE_MBUF_HDR_F_SCAN_REQ_TXD;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (rxinfo->channel <  BLE_PHY_NUM_DATA_CHANS) {
+        /* Keep aux_data for expected scan response */
+        scansm->cur_aux_data = ble_ll_scan_aux_data_ref(aux_data);
+        STATS_INC(ble_ll_stats, aux_scan_req_tx);
+    }
+#endif
+
+    return true;
+}
+
+/**
+ * Called when a receive PDU has ended.
+ *
+ * Context: Interrupt
+ *
+ * @param rxpdu
+ *
+ * @return int
+ *       < 0: Disable the phy after reception.
+ *      == 0: Success. Do not disable the PHY.
+ *       > 0: Do not disable PHY as that has already been done.
+ */
+int
+ble_ll_scan_rx_isr_end(struct os_mbuf *rxpdu, uint8_t crcok)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    struct ble_mbuf_hdr *hdr = BLE_MBUF_HDR_PTR(rxpdu);
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+    uint8_t *rxbuf;
+    uint8_t pdu_type;
+    struct ble_ll_scan_addr_data addrd;
+    int rc;
+
+    /*
+     * If buffer for incoming PDU was not allocated we need to force scan to be
+     * restarted since LL will not be notified. Keep PHY enabled.
+     */
+    if (rxpdu == NULL) {
+        ble_ll_scan_interrupted(scansm);
+        return 0;
+    }
+
+    rxbuf = rxpdu->om_data;
+    pdu_type = rxbuf[0] & BLE_ADV_PDU_HDR_TYPE_MASK;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /*
+     * In case aux was expected, copy aux_data for LL to use. Make sure this was
+     * indeed an aux as otherwise there's no need to process it and just pass to
+     * LL immediately.
+     */
+    if (scansm->cur_aux_data) {
+        rxinfo->user_data = scansm->cur_aux_data;
+        scansm->cur_aux_data = NULL;
+        if (pdu_type != BLE_ADV_PDU_TYPE_ADV_EXT_IND) {
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+            return -1;
+        }
+    }
+#endif
+
+    if (!crcok) {
+        goto scan_rx_isr_ignore;
+    }
+
+    /*
+     * Addresses will be always set in handlers, no need to initialize them. We
+     * only need to initialize rl which may not be always set, depending on how
+     * filtering goes.
+     */
+    addrd.rl = NULL;
+
+    switch (pdu_type) {
+    case BLE_ADV_PDU_TYPE_ADV_IND:
+    case BLE_ADV_PDU_TYPE_ADV_DIRECT_IND:
+    case BLE_ADV_PDU_TYPE_ADV_NONCONN_IND:
+    case BLE_ADV_PDU_TYPE_SCAN_RSP:
+    case BLE_ADV_PDU_TYPE_ADV_SCAN_IND:
+        rc = ble_ll_scan_rx_isr_on_legacy(pdu_type, rxbuf, hdr, &addrd);
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    case BLE_ADV_PDU_TYPE_ADV_EXT_IND:
+        rc = ble_ll_scan_rx_isr_on_aux(pdu_type, rxbuf, hdr, &addrd);
+        break;
+#endif
+    default:
+        /* This is not something we would like to process here */
+        rc = -1;
+        break;
+    }
+
+    if (rc == -1) {
+        goto scan_rx_isr_ignore;
+    } else if (rc == 1) {
+        if (ble_ll_scan_send_scan_req(pdu_type, rxbuf, hdr, &addrd)) {
+            /* Keep PHY active and LL in scanning state */
+            return 0;
+        }
+    }
+
+    /* We are done with this PDU so go to standby and let LL resume if needed */
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    return -1;
+
+scan_rx_isr_ignore:
+    rxinfo->flags |= BLE_MBUF_HDR_F_IGNORED;
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+    return -1;
+}
+
+/**
+ * Called to resume scanning. This is called after an advertising event or
+ * connection event has ended. It is also called if we receive a packet while
+ * in the initiating or scanning state.
+ *
+ * If periodic advertising is enabled this is also called on sync event end
+ * or sync packet received if chaining
+ *
+ * Context: Link Layer task
+ */
+void
+ble_ll_scan_chk_resume(void)
+{
+    os_sr_t sr;
+    struct ble_ll_scan_sm *scansm;
+    uint32_t now;
+
+    scansm = &g_ble_ll_scan_sm;
+    if (scansm->scan_enabled) {
+        OS_ENTER_CRITICAL(sr);
+        if (scansm->restart_timer_needed) {
+            scansm->restart_timer_needed = 0;
+            ble_ll_event_send(&scansm->scan_sched_ev);
+            STATS_INC(ble_ll_stats, scan_timer_restarted);
+            OS_EXIT_CRITICAL(sr);
+            return;
+        }
+
+        now = os_cputime_get32();
+        if (ble_ll_state_get() == BLE_LL_STATE_STANDBY &&
+            ble_ll_scan_is_inside_window(scansm->scanp, now)) {
+            /* Turn on the receiver and set state */
+            ble_ll_scan_start(scansm, NULL);
+        }
+        OS_EXIT_CRITICAL(sr);
+    }
+}
+
+/**
+ * Scan timer callback; means that the scan window timeout has been reached
+ * and we should perform the appropriate actions.
+ *
+ * Context: Interrupt (cputimer)
+ *
+ * @param arg Pointer to scan state machine.
+ */
+void
+ble_ll_scan_timer_cb(void *arg)
+{
+    struct ble_ll_scan_sm *scansm;
+
+    scansm = (struct ble_ll_scan_sm *)arg;
+    ble_ll_event_send(&scansm->scan_sched_ev);
+}
+
+void
+ble_ll_scan_interrupted(struct ble_ll_scan_sm *scansm)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    ble_npl_event_set_arg(&scansm->scan_interrupted_ev, scansm->cur_aux_data);
+    scansm->cur_aux_data = NULL;
+#endif
+
+    ble_ll_event_send(&scansm->scan_interrupted_ev);
+}
+
+/**
+ * Called when the wait for response timer expires while in the scanning
+ * state.
+ *
+ * Context: Interrupt.
+ */
+void
+ble_ll_scan_wfr_timer_exp(void)
+{
+    struct ble_ll_scan_sm *scansm;
+    uint8_t chan;
+    int phy;
+    int rc;
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    uint8_t phy_mode;
+#endif
+    uint32_t now;
+
+    scansm = &g_ble_ll_scan_sm;
+
+    /* Update backoff if we failed to receive scan response */
+    if (scansm->scan_rsp_pending) {
+        scansm->scan_rsp_pending = 0;
+        ble_ll_scan_req_backoff(scansm, 0);
+    }
+
+    if (scansm->cur_aux_data) {
+        /* We actually care about interrupted scan only for EXT ADV because only
+         * then we might consider to send truncated event to the host.
+         */
+        ble_ll_scan_interrupted(scansm);
+
+        /* Need to disable phy since we are going to move to BLE_LL_STATE_STANDBY
+         * or we will need to change channel to primary one
+         */
+        ble_phy_disable();
+
+        now = os_cputime_get32();
+        if (!ble_ll_scan_is_inside_window(scansm->scanp, now)) {
+            /* Outside the window scan */
+            ble_ll_state_set(BLE_LL_STATE_STANDBY);
+            return;
+        }
+
+        ble_ll_get_chan_to_scan(scansm, &chan, &phy);
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+        phy_mode = ble_ll_phy_to_phy_mode(phy, BLE_HCI_LE_PHY_CODED_ANY);
+        ble_phy_mode_set(phy_mode, phy_mode);
+#endif
+        rc = ble_phy_setchan(chan, BLE_ACCESS_ADDR_ADV, BLE_LL_CRCINIT_ADV);
+        BLE_LL_ASSERT(rc == 0);
+    }
+
+
+    ble_phy_restart_rx();
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+/*
+ * Send extended advertising report
+ *
+ * @return -1 on error (data truncated or other error)
+ *          0 on success (data status is "completed")
+ *          1 on success (data status is not "completed")
+ */
+static int
+ble_ll_hci_send_ext_adv_report(uint8_t ptype, uint8_t *adva, uint8_t adva_type,
+                               uint8_t *inita, uint8_t inita_type,
+                               struct os_mbuf *om,
+                               struct ble_mbuf_hdr *hdr)
+{
+    struct ble_ll_aux_data *aux_data = hdr->rxinfo.user_data;
+    struct ble_hci_ev_le_subev_ext_adv_rpt *ev;
+    struct ext_adv_report *report;
+    struct ble_hci_ev *hci_ev;
+    struct ble_hci_ev *hci_ev_next;
+    int offset;
+    int datalen;
+    int rc;
+    bool need_event;
+    bool is_scannable_aux;
+    uint8_t max_data_len;
+
+    if (!ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_EXT_ADV_RPT)) {
+        rc = -1;
+        goto done;
+    }
+
+    /*
+     * We keep one allocated event in aux_data to be able to truncate chain
+     * properly in case of error. If there is no event in aux_data it means this
+     * is the first event for this chain.
+     */
+    if (aux_data && aux_data->evt) {
+        hci_ev = aux_data->evt;
+        aux_data->evt = NULL;
+
+        hci_ev->length = sizeof(*ev) + sizeof(*report);
+    } else {
+        hci_ev = ble_ll_scan_get_ext_adv_report(NULL);
+        if (!hci_ev) {
+            rc = -1;
+            goto done;
+        }
+    }
+
+    ev = (void *) hci_ev->data;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /* If RPA has been used, make sure we use correct address types
+     * in the advertising report.
+     */
+    if (BLE_MBUF_HDR_RESOLVED(hdr)) {
+        adva_type += 2;
+    }
+    if (BLE_MBUF_HDR_TARGETA_RESOLVED(hdr)) {
+        inita_type += 2;
+    }
+#endif
+
+    datalen = ble_ll_scan_parse_ext_hdr(om, adva, adva_type, inita, inita_type,
+                                        hdr, ev->reports);
+    if (datalen < 0) {
+        rc = -1;
+
+        /* Need to send truncated event if we already sent some reports */
+        if (aux_data && (aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_ANY)) {
+            BLE_LL_ASSERT(!(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_COMPLETED));
+            BLE_LL_ASSERT(!(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED));
+
+            aux_data->flags_ll |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+            aux_data->flags_ll |= BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED;
+
+            report = ev->reports;
+            report->data_len = 0;
+            report->evt_type |= BLE_HCI_ADV_DATA_STATUS_TRUNCATED;
+
+            ble_ll_hci_event_send(hci_ev);
+            goto done;
+        }
+
+        ble_hci_trans_buf_free((uint8_t *)hci_ev);
+        goto done;
+    }
+
+    is_scannable_aux = aux_data &&
+                       (aux_data->evt_type & BLE_HCI_ADV_SCAN_MASK) &&
+                       !(aux_data->evt_type & BLE_HCI_ADV_SCAN_RSP_MASK);
+
+    max_data_len = BLE_LL_MAX_EVT_LEN - sizeof(*hci_ev) - sizeof(*ev) - sizeof(*report);
+    offset = 0;
+
+    do {
+        hci_ev_next = NULL;
+
+        ev = (void *) hci_ev->data;
+        report = ev->reports;
+
+        report->data_len = min(max_data_len, datalen - offset);
+
+        /* adjust event length */
+        hci_ev->length += report->data_len;
+        report->rssi = hdr->rxinfo.rssi;
+
+        os_mbuf_copydata(om, offset, report->data_len, report->data);
+        offset += report->data_len;
+
+        /*
+         * We need another event if either there are still some data left to
+         * send in current PDU or scan is not completed. The only exception is
+         * when this is a scannable event which is not a scan response.
+         */
+        need_event = ((offset < datalen) || (aux_data && !(aux_data->flags_ll & BLE_LL_AUX_FLAG_SCAN_COMPLETE))) && !is_scannable_aux;
+
+        if (need_event) {
+            /*
+             * We will need another event so let's try to allocate one now. If
+             * we cannot do this, need to mark event as truncated.
+             */
+            hci_ev_next = ble_ll_scan_get_ext_adv_report(report);
+
+            if (hci_ev_next) {
+                report->evt_type |= BLE_HCI_ADV_DATA_STATUS_INCOMPLETE;
+                rc = 1;
+            } else {
+                report->evt_type |= BLE_HCI_ADV_DATA_STATUS_TRUNCATED;
+                rc = -1;
+            }
+        } else if (aux_data && (aux_data->flags_ll & BLE_LL_AUX_FLAG_SCAN_ERROR)) {
+            report->evt_type |= BLE_HCI_ADV_DATA_STATUS_TRUNCATED;
+            rc = -1;
+        } else {
+            rc = 0;
+        }
+
+        if ((rc == -1) && aux_data) {
+            aux_data->flags_ll |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+
+            if (!(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_ANY)) {
+                ble_hci_trans_buf_free((uint8_t *)hci_ev);
+                goto  done;
+            }
+
+            aux_data->flags_ll |= BLE_LL_AUX_FLAG_HCI_SENT_TRUNCATED;
+        } else if (!is_scannable_aux) {
+            /*
+             * We do not set 'sent' flags for scannable AUX since we only care
+             * about scan response that will come next.
+             */
+            aux_data->flags_ll |= BLE_LL_AUX_FLAG_HCI_SENT_ANY;
+            if (rc == 0) {
+                aux_data->flags_ll |= BLE_LL_AUX_FLAG_HCI_SENT_COMPLETED;
+            }
+        }
+
+        ble_ll_hci_event_send(hci_ev);
+
+        hci_ev = hci_ev_next;
+    } while ((offset < datalen) && hci_ev);
+
+    BLE_LL_ASSERT(offset <= datalen);
+
+    if (aux_data) {
+        /* Store any event left for later use */
+        aux_data->evt = hci_ev;
+    } else {
+        /* If it is empty beacon, evt shall be NULL */
+        BLE_LL_ASSERT(!hci_ev);
+    }
+
+done:
+    if (!aux_data) {
+        return rc;
+    }
+
+    if (rc == 0) {
+        if (aux_data->evt_type & BLE_HCI_ADV_SCAN_RSP_MASK) {
+            /* Complete scan response can be added to duplicates list */
+            ble_ll_scan_add_scan_rsp_adv(aux_data->adva, aux_data->adva_type,
+                                         1, aux_data->adi);
+        } else if (is_scannable_aux) {
+            /*
+             * Scannable AUX is marked as incomplete because we do not want to
+             * add this to duplicates list now, this should happen only after
+             * we receive complete scan response. The drawback here is that we
+             * will keep receiving reports for scannable PDUs until complete
+             * scan response is received.
+             *
+             * XXX ^^ extend duplicates list to fix
+             */
+            rc = 1;
+        }
+    } else if (rc < 0) {
+        aux_data->flags_ll |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+    }
+
+    return rc;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+static void
+ble_ll_scan_check_periodic_sync(const struct os_mbuf *om, struct ble_mbuf_hdr *rxhdr,
+                          uint8_t *adva, uint8_t adva_type, int rpa_index)
+{
+    uint8_t pdu_len;
+    uint8_t ext_hdr_len;
+    uint8_t ext_hdr_flags;
+    uint8_t *ext_hdr;
+    uint8_t *rxbuf = om->om_data;
+    uint8_t sid;
+    int i;
+
+    pdu_len = rxbuf[1];
+    if (pdu_len == 0) {
+        return;
+    }
+
+    ext_hdr_len = rxbuf[2] & 0x3F;
+
+    if (ext_hdr_len) {
+        ext_hdr_flags = rxbuf[3];
+        ext_hdr = &rxbuf[4];
+        i = 0;
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_ADVA_BIT)) {
+            i += BLE_LL_EXT_ADV_ADVA_SIZE;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_TARGETA_BIT)) {
+            i += BLE_LL_EXT_ADV_TARGETA_SIZE;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_CTE_INFO_BIT)) {
+            i += 1;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT)) {
+            sid = (get_le16(ext_hdr + i) >> 12);
+            i += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+        } else {
+            /* ADI is mandatory */
+            return;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT)) {
+            i += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_SYNC_INFO_BIT)) {
+            ble_ll_sync_info_event(adva, adva_type, rpa_index, sid, rxhdr,
+                                   ext_hdr + i);
+        }
+    }
+}
+#endif
+
+static inline void
+ble_ll_scan_dup_move_to_head(struct ble_ll_scan_dup_entry *e)
+{
+    if (e != TAILQ_FIRST(&g_scan_dup_list)) {
+        TAILQ_REMOVE(&g_scan_dup_list, e, link);
+        TAILQ_INSERT_HEAD(&g_scan_dup_list, e, link);
+    }
+}
+
+static inline struct ble_ll_scan_dup_entry *
+ble_ll_scan_dup_new(void)
+{
+    struct ble_ll_scan_dup_entry *e;
+
+    e = os_memblock_get(&g_scan_dup_pool);
+    if (!e) {
+        e = TAILQ_LAST(&g_scan_dup_list, ble_ll_scan_dup_list);
+        TAILQ_REMOVE(&g_scan_dup_list, e, link);
+    }
+
+    memset(e, 0, sizeof(*e));
+
+    return e;
+}
+
+static int
+ble_ll_scan_dup_check_legacy(uint8_t addr_type, uint8_t *addr, uint8_t pdu_type)
+{
+    struct ble_ll_scan_dup_entry *e;
+    uint8_t type;
+    int rc;
+
+    type = BLE_LL_SCAN_ENTRY_TYPE_LEGACY(addr_type);
+
+    TAILQ_FOREACH(e, &g_scan_dup_list, link) {
+        if ((e->type == type) && !memcmp(e->addr, addr, 6)) {
+            break;
+        }
+    }
+
+    if (e) {
+        if (pdu_type == BLE_ADV_PDU_TYPE_ADV_DIRECT_IND) {
+            rc = e->flags & BLE_LL_SCAN_DUP_F_DIR_ADV_REPORT_SENT;
+        } else if (pdu_type == BLE_ADV_PDU_TYPE_SCAN_RSP) {
+            rc = e->flags & BLE_LL_SCAN_DUP_F_SCAN_RSP_SENT;
+        } else {
+            rc = e->flags & BLE_LL_SCAN_DUP_F_ADV_REPORT_SENT;
+        }
+
+        ble_ll_scan_dup_move_to_head(e);
+    } else {
+        rc = 0;
+
+        e = ble_ll_scan_dup_new();
+        e->flags = 0;
+        e->type = type;
+        memcpy(e->addr, addr, 6);
+
+        TAILQ_INSERT_HEAD(&g_scan_dup_list, e, link);
+    }
+
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static int
+ble_ll_scan_dup_check_ext(uint8_t addr_type, uint8_t *addr,
+                          struct ble_ll_aux_data *aux_data)
+{
+    struct ble_ll_scan_dup_entry *e;
+    bool has_aux;
+    bool is_anon;
+    uint16_t adi;
+    uint8_t type;
+    int rc;
+
+    has_aux = aux_data != NULL;
+    is_anon = addr == NULL;
+    adi = has_aux ? aux_data->adi : 0;
+
+    type = BLE_LL_SCAN_ENTRY_TYPE_EXT(addr_type, has_aux, is_anon, adi);
+
+    TAILQ_FOREACH(e, &g_scan_dup_list, link) {
+        if ((e->type == type) &&
+            (is_anon || !memcmp(e->addr, addr, BLE_DEV_ADDR_LEN))) {
+            break;
+        }
+    }
+
+    if (e) {
+        if (e->adi != adi) {
+            rc = 0;
+
+            e->flags = 0;
+            e->adi = adi;
+        } else {
+            rc = e->flags & BLE_LL_SCAN_DUP_F_ADV_REPORT_SENT;
+        }
+
+        ble_ll_scan_dup_move_to_head(e);
+    } else {
+        rc = 0;
+
+        e = ble_ll_scan_dup_new();
+        e->flags = 0;
+        e->type = type;
+        e->adi = adi;
+        if (!is_anon) {
+            memcpy(e->addr, addr, 6);
+        }
+
+        TAILQ_INSERT_HEAD(&g_scan_dup_list, e, link);
+    }
+
+    return rc;
+}
+
+static int
+ble_ll_scan_dup_update_ext(uint8_t addr_type, uint8_t *addr,
+                           struct ble_ll_aux_data *aux_data)
+{
+    struct ble_ll_scan_dup_entry *e;
+    bool has_aux;
+    bool is_anon;
+    uint16_t adi;
+    uint8_t type;
+
+    has_aux = aux_data != NULL;
+    is_anon = addr == NULL;
+    adi = has_aux ? aux_data->adi : 0;
+
+    type = BLE_LL_SCAN_ENTRY_TYPE_EXT(addr_type, has_aux, is_anon, adi);
+
+    /*
+     * We assume ble_ll_scan_dup_check() was called before which either matched
+     * some entry or allocated new one and placed in on the top of queue.
+     */
+
+    e = TAILQ_FIRST(&g_scan_dup_list);
+    BLE_LL_ASSERT(e && e->type == type && (is_anon || !memcmp(e->addr, addr, 6)));
+
+    e->flags |= BLE_LL_SCAN_DUP_F_ADV_REPORT_SENT;
+
+    return 0;
+}
+#endif
+
+static void
+ble_ll_scan_rx_pkt_in_restore_addr_data(struct ble_mbuf_hdr *hdr,
+                                        struct ble_ll_scan_addr_data *addrd)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+    struct ble_ll_resolv_entry *rl;
+#endif
+
+    addrd->adv_addr = addrd->adva;
+    addrd->adv_addr_type = addrd->adva_type;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (rxinfo->rpa_index >= 0) {
+        rl = &g_ble_ll_resolv_list[rxinfo->rpa_index];
+        addrd->adv_addr = rl->rl_identity_addr;
+        addrd->adv_addr_type = rl->rl_addr_type;
+        addrd->rl = rl;
+    }
+    if (hdr->rxinfo.flags & BLE_MBUF_HDR_F_TARGETA_RESOLVED) {
+        addrd->targeta = ble_ll_get_our_devaddr(scansm->own_addr_type & 1);
+        addrd->targeta_type = scansm->own_addr_type & 1;
+    }
+#endif
+}
+
+static void
+ble_ll_scan_rx_pkt_in_on_legacy(uint8_t pdu_type, struct os_mbuf *om,
+                                struct ble_mbuf_hdr *hdr,
+                                struct ble_ll_scan_addr_data *addrd)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+    uint8_t *rxbuf = om->om_data;
+    bool send_hci_report;
+
+
+    if (!BLE_MBUF_HDR_DEVMATCH(hdr) ||
+        !BLE_MBUF_HDR_CRC_OK(hdr) ||
+        BLE_MBUF_HDR_IGNORED(hdr)) {
+        return;
+    }
+
+    ble_ll_scan_get_addr_data_from_legacy(pdu_type, rxbuf, addrd);
+    ble_ll_scan_rx_pkt_in_restore_addr_data(hdr, addrd);
+
+    send_hci_report = !scansm->scan_filt_dups ||
+                      !ble_ll_scan_dup_check_legacy(addrd->adv_addr_type,
+                                                    addrd->adv_addr,
+                                                    pdu_type);
+    if (send_hci_report) {
+        /* Sending advertising report will also update scan_dup list */
+        ble_ll_scan_send_adv_report(pdu_type,
+                                    addrd->adv_addr, addrd->adv_addr_type,
+                                    addrd->targeta, addrd->targeta_type,
+                                    om, hdr, scansm);
+    }
+
+    if (BLE_MBUF_HDR_SCAN_RSP_RXD(hdr)) {
+        ble_ll_scan_req_backoff(scansm, 1);
+    }
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_scan_rx_pkt_in_on_aux(uint8_t pdu_type, struct os_mbuf *om,
+                             struct ble_mbuf_hdr *hdr,
+                             struct ble_ll_scan_addr_data *addrd)
+{
+    struct ble_ll_scan_sm *scansm = &g_ble_ll_scan_sm;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    uint8_t *rxbuf = om->om_data;
+#endif
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+    struct ble_ll_aux_data *aux_data = rxinfo->user_data;
+    bool send_hci_report;
+    int rc;
+
+    if (!scansm->ext_scanning) {
+        goto scan_continue;
+    }
+
+    if (aux_data) {
+        aux_data->flags_ll |= aux_data->flags_isr;
+    }
+
+    /*
+     * For every new extended advertising event scanned, rx_isr_end will either
+     * allocate new aux_data or set 'invalid' flag. This means if no 'invalid'
+     * flag is set, aux_data is always valid.
+     */
+
+    /* Drop on scan error or if we received not what we expected to receive */
+    if (!BLE_MBUF_HDR_CRC_OK(hdr) ||
+        BLE_MBUF_HDR_IGNORED(hdr) ||
+        BLE_MBUF_HDR_AUX_INVALID(hdr) ||
+        (aux_data->flags_ll & BLE_LL_AUX_FLAG_SCAN_ERROR) ||
+        (pdu_type != BLE_ADV_PDU_TYPE_ADV_EXT_IND)) {
+        if (aux_data) {
+            ble_ll_scan_end_adv_evt(aux_data);
+            ble_ll_scan_aux_data_unref(aux_data);
+            rxinfo->user_data = NULL;
+        }
+        return;
+    }
+
+    BLE_LL_ASSERT(aux_data);
+
+    if (aux_data->flags & BLE_LL_AUX_HAS_ADVA) {
+        addrd->adva = aux_data->adva;
+        addrd->adva_type = aux_data->adva_type;
+    } else {
+        addrd->adva = NULL;
+        addrd->adva_type = 0;
+    }
+    if (aux_data->flags & BLE_LL_AUX_HAS_TARGETA) {
+        addrd->targeta = aux_data->targeta;
+        addrd->targeta_type = aux_data->targeta_type;
+    } else {
+        addrd->targeta = NULL;
+        addrd->targeta_type = 0;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    /*
+     * Periodic scan uses own filter list so we need to let it do own filtering
+     * regardless of scanner filtering. Just make sure we already have AdvA.
+     */
+    if (ble_ll_sync_enabled() &&
+        ((rxbuf[2] >> 6) == BLE_LL_EXT_ADV_MODE_NON_CONN) && addrd->adva &&
+        !(aux_data->flags_ll & BLE_LL_AUX_FLAG_AUX_CHAIN_RECEIVED)) {
+        ble_ll_scan_check_periodic_sync(om, hdr, addrd->adva, addrd->adva_type,
+                                        rxinfo->rpa_index);
+    }
+#endif
+
+    /* Ignore if device was not matched by either whitelist or scan policy */
+    if (!BLE_MBUF_HDR_DEVMATCH(hdr)) {
+        goto scan_continue;
+    }
+
+    ble_ll_scan_rx_pkt_in_restore_addr_data(hdr, addrd);
+
+    /*
+     * If there is AuxPtr in this PDU, we should first try to schedule scan for
+     * subsequent aux.
+     */
+    if (BLE_MBUF_HDR_WAIT_AUX(hdr)) {
+        if (ble_ll_sched_aux_scan(hdr, scansm, aux_data)) {
+            rxinfo->flags &= ~BLE_MBUF_HDR_F_AUX_PTR_WAIT;
+            aux_data->flags_ll |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+
+            /* Silently ignore if no HCI event was sent to host */
+            if (!(aux_data->flags_ll & BLE_LL_AUX_FLAG_HCI_SENT_ANY)) {
+                goto scan_continue;
+            }
+        }
+
+        /* Ignore if this was just ADV_EXT_IND with AuxPtr, will process aux */
+        if (!(aux_data->flags_ll & BLE_LL_AUX_FLAG_AUX_ADV_RECEIVED)) {
+            goto scan_continue;
+        }
+
+        STATS_INC(ble_ll_stats, aux_chain_cnt);
+    }
+
+    send_hci_report = !scansm->scan_filt_dups ||
+                      !ble_ll_scan_dup_check_ext(addrd->adv_addr_type,
+                                                 addrd->adv_addr, aux_data);
+    if (send_hci_report) {
+        rc = ble_ll_hci_send_ext_adv_report(pdu_type,
+                                            addrd->adv_addr, addrd->adv_addr_type,
+                                            addrd->targeta, addrd->targeta_type,
+                                            om, hdr);
+        if ((rc < 0) && BLE_MBUF_HDR_WAIT_AUX(hdr)) {
+            /* Data were truncated so stop scanning for subsequent auxes */
+            aux_data->flags_ll |= BLE_LL_AUX_FLAG_SCAN_ERROR;
+
+            if (ble_ll_sched_rmv_elem(&aux_data->sch) == 0) {
+                ble_ll_scan_aux_data_unref(aux_data->sch.cb_arg);
+                aux_data->sch.cb_arg = NULL;
+            }
+        } else if ((rc == 0) && scansm->scan_filt_dups) {
+            /* Complete data were send so we can update scan_dup list */
+            ble_ll_scan_dup_update_ext(addrd->adv_addr_type, addrd->adv_addr,
+                                       aux_data);
+        }
+    }
+
+    if (BLE_MBUF_HDR_SCAN_RSP_RXD(hdr)) {
+        /*
+         * For now assume success if we just received direct scan response,
+         * don't care about complete aux chain.
+         */
+        ble_ll_scan_req_backoff(scansm, 1);
+    }
+
+scan_continue:
+    ble_ll_scan_aux_data_unref(rxinfo->user_data);
+    rxinfo->user_data = NULL;
+}
+#endif
+
+/**
+ * Process a received PDU while in the scanning state.
+ *
+ * Context: Link Layer task.
+ *
+ * @param pdu_type
+ * @param rxbuf
+ */
+void
+ble_ll_scan_rx_pkt_in(uint8_t ptype, struct os_mbuf *om, struct ble_mbuf_hdr *hdr)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    struct ble_mbuf_hdr_rxinfo *rxinfo = &hdr->rxinfo;
+    struct ble_ll_aux_data *aux_data = rxinfo->user_data;
+#endif
+    struct ble_ll_scan_addr_data addrd;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (aux_data || (ptype == BLE_ADV_PDU_TYPE_ADV_EXT_IND)) {
+        ble_ll_scan_rx_pkt_in_on_aux(ptype, om, hdr, &addrd);
+        ble_ll_scan_chk_resume();
+        return;
+    }
+#endif
+
+    ble_ll_scan_rx_pkt_in_on_legacy(ptype, om, hdr, &addrd);
+    ble_ll_scan_chk_resume();
+}
+
+int
+ble_ll_scan_set_scan_params(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_scan_params_cp *cmd = (const void *)cmdbuf;
+    uint16_t scan_itvl;
+    uint16_t scan_window;
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_scan_params *scanp;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* If already enabled, we return an error */
+    scansm = &g_ble_ll_scan_sm;
+    if (scansm->scan_enabled) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Get the scan interval and window */
+    scan_itvl = le16toh(cmd->scan_itvl);
+    scan_window = le16toh(cmd->scan_window);
+
+    /* Check scan type */
+    if ((cmd->scan_type != BLE_HCI_SCAN_TYPE_PASSIVE) &&
+        (cmd->scan_type != BLE_HCI_SCAN_TYPE_ACTIVE)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check interval and window */
+    if ((scan_itvl < BLE_HCI_SCAN_ITVL_MIN) ||
+        (scan_itvl > BLE_HCI_SCAN_ITVL_MAX) ||
+        (scan_window < BLE_HCI_SCAN_WINDOW_MIN) ||
+        (scan_window > BLE_HCI_SCAN_WINDOW_MAX) ||
+        (scan_itvl < scan_window)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check own addr type */
+    if (cmd->own_addr_type > BLE_HCI_ADV_OWN_ADDR_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check scanner filter policy */
+    if (cmd->filter_policy > BLE_HCI_SCAN_FILT_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Store scan parameters */
+    scanp = &g_ble_ll_scan_params[PHY_UNCODED];
+    scanp->configured = 1;
+    scanp->scan_type = cmd->scan_type;
+    scanp->timing.interval = ble_ll_scan_time_hci_to_ticks(scan_itvl);
+    scanp->timing.window = ble_ll_scan_time_hci_to_ticks(scan_window);
+    scanp->scan_filt_policy = cmd->filter_policy;
+    scanp->own_addr_type = cmd->own_addr_type;
+
+#if (BLE_LL_SCAN_PHY_NUMBER == 2)
+    g_ble_ll_scan_params[PHY_CODED].configured = 0;
+#endif
+
+    return 0;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static int
+ble_ll_check_scan_params(uint8_t type, uint16_t itvl, uint16_t window)
+{
+    /* Check scan type */
+    if ((type != BLE_HCI_SCAN_TYPE_PASSIVE) &&
+        (type != BLE_HCI_SCAN_TYPE_ACTIVE)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Check interval and window */
+    if ((itvl < BLE_HCI_SCAN_ITVL_MIN) ||
+        (itvl > BLE_HCI_SCAN_ITVL_MAX) ||
+        (window < BLE_HCI_SCAN_WINDOW_MIN) ||
+        (window > BLE_HCI_SCAN_WINDOW_MAX) ||
+        (itvl < window)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return 0;
+}
+
+int
+ble_ll_set_ext_scan_params(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_ext_scan_params_cp *cmd = (const void *) cmdbuf;
+    const struct scan_params *params = cmd->scans;
+
+    struct ble_ll_scan_params new_params[BLE_LL_SCAN_PHY_NUMBER] = { };
+    struct ble_ll_scan_params *uncoded = &new_params[PHY_UNCODED];
+    struct ble_ll_scan_params *coded = &new_params[PHY_CODED];
+    uint16_t interval;
+    uint16_t window;
+    int rc;
+
+    if (len <= sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    len -= sizeof(*cmd);
+
+    /* If already enabled, we return an error */
+    if (g_ble_ll_scan_sm.scan_enabled) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Check own addr type */
+    if (cmd->own_addr_type > BLE_HCI_ADV_OWN_ADDR_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    coded->own_addr_type = cmd->own_addr_type;
+    uncoded->own_addr_type = cmd->own_addr_type;
+
+    /* Check scanner filter policy */
+    if (cmd->filter_policy > BLE_HCI_SCAN_FILT_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    coded->scan_filt_policy = cmd->filter_policy;
+    uncoded->scan_filt_policy = cmd->filter_policy;
+
+    /* Check if no reserved bits in PHYS are set and that at least one valid PHY
+     * is set.
+     */
+    if (!(cmd->phys & SCAN_VALID_PHY_MASK) ||
+        (cmd->phys & ~SCAN_VALID_PHY_MASK)) {
+         return BLE_ERR_INV_HCI_CMD_PARMS;
+     }
+
+    if (cmd->phys & BLE_HCI_LE_PHY_1M_PREF_MASK) {
+        if (len < sizeof(*params)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        interval = le16toh(params->itvl);
+        window = le16toh(params->window);
+
+        rc = ble_ll_check_scan_params(params->type, interval, window);
+        if (rc) {
+            return rc;
+        }
+
+        uncoded->scan_type = params->type;
+        uncoded->timing.interval = ble_ll_scan_time_hci_to_ticks(interval);
+        uncoded->timing.window = ble_ll_scan_time_hci_to_ticks(window);
+
+        /* That means user wants to use this PHY for scanning */
+        uncoded->configured = 1;
+        params++;
+        len -= sizeof(*params);
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    if (cmd->phys & BLE_HCI_LE_PHY_CODED_PREF_MASK) {
+        if (len < sizeof(*params)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        interval = le16toh(params->itvl);
+        window = le16toh(params->window);
+
+        rc = ble_ll_check_scan_params(params->type, interval, window);
+        if (rc) {
+            return rc;
+        }
+
+        coded->scan_type = params->type;
+        coded->timing.interval = ble_ll_scan_time_hci_to_ticks(interval);
+        coded->timing.window = ble_ll_scan_time_hci_to_ticks(window);
+
+        /* That means user wants to use this PHY for scanning */
+        coded->configured = 1;
+    }
+#endif
+
+    /* if any of PHYs is configured for continuous scan we alter interval to
+     * fit other PHY
+     */
+    if (coded->configured && uncoded->configured) {
+        if (coded->timing.interval == coded->timing.window) {
+            coded->timing.interval += uncoded->timing.window;
+        }
+
+        if (uncoded->timing.interval == uncoded->timing.window) {
+            uncoded->timing.window += coded->timing.window;
+        }
+    }
+
+    memcpy(g_ble_ll_scan_params, new_params, sizeof(new_params));
+
+    return 0;
+}
+
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+static void
+ble_ll_scan_duration_period_timers_restart(struct ble_ll_scan_sm *scansm)
+{
+    uint32_t now;
+
+    now = os_cputime_get32();
+
+    os_cputime_timer_stop(&scansm->duration_timer);
+    os_cputime_timer_stop(&scansm->period_timer);
+
+    if (scansm->duration_ticks) {
+        os_cputime_timer_start(&scansm->duration_timer,
+                                                now + scansm->duration_ticks);
+
+        if (scansm->period_ticks) {
+            os_cputime_timer_start(&scansm->period_timer,
+                                                    now + scansm->period_ticks);
+        }
+    }
+}
+
+static void
+ble_ll_scan_duration_timer_cb(void *arg)
+{
+    struct ble_ll_scan_sm *scansm;
+
+    scansm = (struct ble_ll_scan_sm *)arg;
+
+    ble_ll_scan_sm_stop(2);
+
+    /* if period is set both timers get started from period cb */
+    if (!scansm->period_ticks) {
+        ble_ll_hci_ev_send_scan_timeout();
+    }
+}
+
+static void
+ble_ll_scan_period_timer_cb(void *arg)
+{
+    struct ble_ll_scan_sm *scansm = arg;
+
+    ble_ll_scan_sm_start(scansm);
+
+    /* always start timer regardless of ble_ll_scan_sm_start result
+     * if it failed will restart in next period
+     */
+    ble_ll_scan_duration_period_timers_restart(scansm);
+}
+#endif
+
+/**
+ * ble ll scan set enable
+ *
+ * HCI scan set enable command processing function
+ *
+ *  Context: Link Layer task (HCI Command parser).
+ *
+ * @return int BLE error code.
+ */
+static int
+ble_ll_scan_set_enable(uint8_t enable, uint8_t filter_dups, uint16_t period,
+                       uint16_t dur, bool ext)
+{
+    int rc;
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_scan_params *scanp;
+    struct ble_ll_scan_params *scanp_phy;
+    int i;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    uint32_t period_ticks = 0;
+    uint32_t dur_ticks = 0;
+#endif
+
+    /* Check for valid parameters */
+    if ((filter_dups > 1) || (enable > 1)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    scansm = &g_ble_ll_scan_sm;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* we can do that here since value will never change until reset */
+    scansm->ext_scanning = ext;
+
+    if (ext) {
+        /* Period parameter is ignored when the Duration parameter is zero */
+        if (!dur) {
+            period = 0;
+        }
+
+        /* period is in 1.28 sec units
+         * TODO support full range, would require os_cputime milliseconds API
+         */
+        if (period > 3355) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+        period_ticks = os_cputime_usecs_to_ticks(period * 1280000);
+
+        /* duration is in 10ms units */
+        dur_ticks = os_cputime_usecs_to_ticks(dur * 10000);
+
+        if (dur_ticks && period_ticks && (dur_ticks >= period_ticks)) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+    }
+#endif
+
+    /* disable*/
+    if (!enable) {
+        if (scansm->scan_enabled) {
+            ble_ll_scan_sm_stop(1);
+        }
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        os_cputime_timer_stop(&scansm->duration_timer);
+        os_cputime_timer_stop(&scansm->period_timer);
+#endif
+
+        return BLE_ERR_SUCCESS;
+    }
+
+    /* if already enable we just need to update parameters */
+    if (scansm->scan_enabled) {
+        /* Controller does not allow initiating and scanning.*/
+        for (i = 0; i < BLE_LL_SCAN_PHY_NUMBER; i++) {
+            scanp_phy = &scansm->scanp_phys[i];
+            if (scanp_phy->configured &&
+                                scanp_phy->scan_type == BLE_SCAN_TYPE_INITIATE) {
+                return BLE_ERR_CMD_DISALLOWED;
+            }
+        }
+
+#if MYNEWT_VAL(BLE_LL_NUM_SCAN_DUP_ADVS)
+        /* update filter policy */
+        scansm->scan_filt_dups = filter_dups;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        /* restart timers according to new settings */
+        scansm->duration_ticks = dur_ticks;
+        scansm->period_ticks = period_ticks;
+        ble_ll_scan_duration_period_timers_restart(scansm);
+#endif
+
+        return BLE_ERR_SUCCESS;
+    }
+
+    /* we can store those upfront regardless of start scan result since scan is
+     * disabled now
+     */
+
+#if MYNEWT_VAL(BLE_LL_NUM_SCAN_DUP_ADVS)
+    scansm->scan_filt_dups = filter_dups;
+#endif
+    scansm->scanp = NULL;
+    scansm->scanp_next = NULL;
+
+    for (i = 0; i < BLE_LL_SCAN_PHY_NUMBER; i++) {
+        scanp_phy = &scansm->scanp_phys[i];
+        scanp = &g_ble_ll_scan_params[i];
+
+        if (!scanp->configured) {
+            continue;
+        }
+
+        scanp_phy->configured = scanp->configured;
+        scanp_phy->scan_type = scanp->scan_type;
+        scanp_phy->timing = scanp->timing;
+        scanp_phy->scan_filt_policy = scanp->scan_filt_policy;
+        scanp_phy->own_addr_type = scanp->own_addr_type;
+
+        if (!scansm->scanp) {
+            scansm->scanp = scanp_phy;
+            /* Take own_addr_type from the first configured PHY.
+             * Note: All configured PHYs shall have the same own_addr_type
+             */
+            scansm->own_addr_type = scanp_phy->own_addr_type;
+        } else {
+            scansm->scanp_next = scanp_phy;
+        }
+    }
+
+    /* spec is not really clear if we should use defaults in this case
+     * or just disallow starting scan without explicit configuration
+     * For now be nice to host and just use values based on LE Set Scan
+     * Parameters defaults.
+     */
+    if (!scansm->scanp) {
+        scansm->scanp = &scansm->scanp_phys[PHY_UNCODED];
+        scansm->own_addr_type = BLE_ADDR_PUBLIC;
+
+        scanp_phy = scansm->scanp;
+        scanp_phy->configured = 1;
+        scanp_phy->scan_type = BLE_SCAN_TYPE_PASSIVE;
+        scanp_phy->timing.interval =
+                        ble_ll_scan_time_hci_to_ticks(BLE_HCI_SCAN_ITVL_DEF);
+        scanp_phy->timing.window =
+                        ble_ll_scan_time_hci_to_ticks(BLE_HCI_SCAN_WINDOW_DEF);
+        scanp_phy->scan_filt_policy = BLE_HCI_SCAN_FILT_NO_WL;
+        scanp_phy->own_addr_type = BLE_ADDR_PUBLIC;
+    }
+
+    rc = ble_ll_scan_sm_start(scansm);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    if (rc == BLE_ERR_SUCCESS) {
+        scansm->duration_ticks = dur_ticks;
+        scansm->period_ticks = period_ticks;
+        ble_ll_scan_duration_period_timers_restart(scansm);
+    }
+#endif
+
+    return rc;
+}
+
+int ble_ll_hci_scan_set_enable(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_scan_enable_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_scan_set_enable(cmd->enable, cmd->filter_duplicates, 0, 0,
+                                  false);
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+int ble_ll_hci_ext_scan_set_enable(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_set_ext_scan_enable_cp *cmd = (const void *) cmdbuf;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    return ble_ll_scan_set_enable(cmd->enable, cmd->filter_dup,
+                                  le16toh(cmd->period), le16toh(cmd->duration),
+                                  true);
+}
+#endif
+
+/**
+ * Checks if controller can change the whitelist. If scanning is enabled and
+ * using the whitelist the controller is not allowed to change the whitelist.
+ *
+ * @return int 0: not allowed to change whitelist; 1: change allowed.
+ */
+int
+ble_ll_scan_can_chg_whitelist(void)
+{
+    int rc;
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_scan_params *scanp;
+
+    scansm = &g_ble_ll_scan_sm;
+    scanp = scansm->scanp;
+    if (scansm->scan_enabled && (scanp->scan_filt_policy & 1)) {
+        rc = 0;
+    } else {
+        rc = 1;
+    }
+
+    return rc;
+}
+
+int
+ble_ll_scan_initiator_start(struct hci_create_conn *hcc,
+                            struct ble_ll_scan_sm **sm)
+{
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_scan_params *scanp;
+    int rc;
+
+    scansm = &g_ble_ll_scan_sm;
+    scansm->own_addr_type = hcc->own_addr_type;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    scansm->ext_scanning = 0;
+#endif
+    scansm->scanp = &scansm->scanp_phys[PHY_UNCODED];
+    scansm->scanp_next = NULL;
+
+    scanp = scansm->scanp;
+    scanp->scan_filt_policy = hcc->filter_policy;
+    scanp->timing.interval = ble_ll_scan_time_hci_to_ticks(hcc->scan_itvl);
+    scanp->timing.window = ble_ll_scan_time_hci_to_ticks(hcc->scan_window);
+    scanp->scan_type = BLE_SCAN_TYPE_INITIATE;
+
+    rc = ble_ll_scan_sm_start(scansm);
+    if (sm == NULL) {
+        return rc;
+    }
+
+    if (rc == BLE_ERR_SUCCESS) {
+        *sm = scansm;
+    } else {
+        *sm = NULL;
+    }
+
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+int
+ble_ll_scan_ext_initiator_start(struct hci_ext_create_conn *hcc,
+                                struct ble_ll_scan_sm **sm)
+{
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_scan_params *scanp_uncoded;
+    struct ble_ll_scan_params *scanp_coded;
+    struct hci_ext_conn_params *params;
+    int rc;
+
+    scansm = &g_ble_ll_scan_sm;
+    scansm->own_addr_type = hcc->own_addr_type;
+    scansm->scanp = NULL;
+    scansm->scanp_next = NULL;
+    scansm->ext_scanning = 1;
+
+    if (hcc->init_phy_mask & BLE_PHY_MASK_1M) {
+        params = &hcc->params[0];
+        scanp_uncoded = &scansm->scanp_phys[PHY_UNCODED];
+
+        scanp_uncoded->timing.interval = ble_ll_scan_time_hci_to_ticks(params->scan_itvl);
+        scanp_uncoded->timing.window = ble_ll_scan_time_hci_to_ticks(params->scan_window);
+        scanp_uncoded->scan_type = BLE_SCAN_TYPE_INITIATE;
+        scanp_uncoded->scan_filt_policy = hcc->filter_policy;
+        scansm->scanp = scanp_uncoded;
+    }
+
+    if (hcc->init_phy_mask & BLE_PHY_MASK_CODED) {
+        params = &hcc->params[2];
+        scanp_coded = &scansm->scanp_phys[PHY_CODED];
+
+        scanp_coded->timing.interval = ble_ll_scan_time_hci_to_ticks(params->scan_itvl);
+        scanp_coded->timing.window = ble_ll_scan_time_hci_to_ticks(params->scan_window);
+        scanp_coded->scan_type = BLE_SCAN_TYPE_INITIATE;
+        scanp_coded->scan_filt_policy = hcc->filter_policy;
+        if (scansm->scanp) {
+            scansm->scanp_next = scanp_coded;
+        } else {
+            scansm->scanp = scanp_coded;
+        }
+    }
+
+    /* if any of PHYs is configured for continuous scan we alter interval to
+     * fit other PHY
+     */
+    if (scansm->scanp && scansm->scanp_next && scanp_coded->configured &&
+        scanp_uncoded->configured) {
+        if (scanp_coded->timing.interval == scanp_coded->timing.window) {
+            scanp_coded->timing.interval += scanp_uncoded->timing.window;
+        }
+
+        if (scanp_uncoded->timing.interval == scanp_uncoded->timing.window) {
+            scanp_uncoded->timing.interval += scanp_coded->timing.window;
+        }
+    }
+
+    rc = ble_ll_scan_sm_start(scansm);
+    if (sm == NULL) {
+        return rc;
+    }
+
+    if (rc == BLE_ERR_SUCCESS) {
+        *sm = scansm;
+    } else {
+        *sm = NULL;
+    }
+
+    return rc;
+}
+#endif
+
+/**
+ * Checks to see if the scanner is enabled.
+ *
+ * @return int 0: not enabled; enabled otherwise
+ */
+int
+ble_ll_scan_enabled(void)
+{
+    return (int)g_ble_ll_scan_sm.scan_enabled;
+}
+
+/**
+ * Returns the peer resolvable private address of last device connecting to us
+ *
+ * @return uint8_t*
+ */
+uint8_t *
+ble_ll_scan_get_peer_rpa(void)
+{
+    struct ble_ll_scan_sm *scansm;
+
+    /* XXX: should this go into IRK list or connection? */
+    scansm = &g_ble_ll_scan_sm;
+    return scansm->scan_peer_rpa;
+}
+
+/**
+ * Returns the local resolvable private address currently being using by
+ * the scanner/initiator
+ *
+ * @return uint8_t*
+ */
+uint8_t *
+ble_ll_scan_get_local_rpa(void)
+{
+    return g_ble_ll_scan_sm.pdu_data.scana;
+}
+
+/**
+ * Set the Resolvable Private Address in the scanning (or initiating) state
+ * machine.
+ *
+ * XXX: should this go into IRK list or connection?
+ *
+ * @param rpa
+ */
+void
+ble_ll_scan_set_peer_rpa(uint8_t *rpa)
+{
+    struct ble_ll_scan_sm *scansm;
+
+    scansm = &g_ble_ll_scan_sm;
+    memcpy(scansm->scan_peer_rpa, rpa, BLE_DEV_ADDR_LEN);
+}
+
+struct ble_ll_scan_pdu_data *
+ble_ll_scan_get_pdu_data(void)
+{
+    return &g_ble_ll_scan_sm.pdu_data;
+}
+
+/* Returns true if whitelist is enabled for scanning */
+int
+ble_ll_scan_whitelist_enabled(void)
+{
+    return g_ble_ll_scan_sm.scanp->scan_filt_policy & 1;
+}
+
+static void
+ble_ll_scan_common_init(void)
+{
+    struct ble_ll_scan_sm *scansm;
+    struct ble_ll_scan_params *scanp;
+    int i;
+
+    /* Clear state machine in case re-initialized */
+    scansm = &g_ble_ll_scan_sm;
+    memset(scansm, 0, sizeof(struct ble_ll_scan_sm));
+
+    /* Clear scan parameters in case re-initialized */
+    memset(g_ble_ll_scan_params, 0, sizeof(g_ble_ll_scan_params));
+
+    /* Initialize scanning window end event */
+    ble_npl_event_init(&scansm->scan_sched_ev, ble_ll_scan_event_proc, scansm);
+
+    for (i = 0; i < BLE_LL_SCAN_PHY_NUMBER; i++) {
+        /* Set all non-zero default parameters */
+        scanp = &g_ble_ll_scan_params[i];
+        scanp->timing.interval =
+                        ble_ll_scan_time_hci_to_ticks(BLE_HCI_SCAN_ITVL_DEF);
+        scanp->timing.window =
+                        ble_ll_scan_time_hci_to_ticks(BLE_HCI_SCAN_WINDOW_DEF);
+    }
+
+    scansm->scanp_phys[PHY_UNCODED].phy = BLE_PHY_1M;
+#if (BLE_LL_SCAN_PHY_NUMBER == 2)
+    scansm->scanp_phys[PHY_CODED].phy = BLE_PHY_CODED;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /* Make sure we'll generate new NRPA if necessary */
+    scansm->scan_nrpa_timer = ble_npl_time_get();
+#endif
+
+    /* Initialize scanning timer */
+    os_cputime_timer_init(&scansm->scan_timer, ble_ll_scan_timer_cb, scansm);
+
+    /* Initialize extended scan timers */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    os_cputime_timer_init(&scansm->duration_timer,
+                                        ble_ll_scan_duration_timer_cb, scansm);
+    os_cputime_timer_init(&scansm->period_timer, ble_ll_scan_period_timer_cb,
+                                                                        scansm);
+#endif
+
+    ble_npl_event_init(&scansm->scan_interrupted_ev, ble_ll_scan_interrupted_event_cb, NULL);
+}
+
+/**
+ * Called when the controller receives the reset command. Resets the
+ * scanning state machine to its initial state.
+ *
+ * @return int
+ */
+void
+ble_ll_scan_reset(void)
+{
+    struct ble_ll_scan_sm *scansm;
+
+    scansm = &g_ble_ll_scan_sm;
+
+    /* If enabled, stop it. */
+    if (scansm->scan_enabled) {
+        ble_ll_scan_sm_stop(0);
+    }
+
+    /* stop extended scan timers */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    os_cputime_timer_stop(&scansm->duration_timer);
+    os_cputime_timer_stop(&scansm->period_timer);
+#endif
+
+    /* Reset duplicate advertisers and those from which we rxd a response */
+    g_ble_ll_scan_num_rsp_advs = 0;
+    memset(&g_ble_ll_scan_rsp_advs[0], 0, sizeof(g_ble_ll_scan_rsp_advs));
+
+    os_mempool_clear(&g_scan_dup_pool);
+    TAILQ_INIT(&g_scan_dup_list);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    /* clear memory pool for AUX scan results */
+    os_mempool_clear(&ext_scan_aux_pool);
+#endif
+
+    /* Call the common init function again */
+    ble_ll_scan_common_init();
+}
+
+/**
+ * ble ll scan init
+ *
+ * Initialize a scanner. Must be called before scanning can be started.
+ * Expected to be called with a un-initialized scanning state machine.
+ */
+void
+ble_ll_scan_init(void)
+{
+    os_error_t err;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    err = os_mempool_init(&ext_scan_aux_pool,
+                          MYNEWT_VAL(BLE_LL_EXT_ADV_AUX_PTR_CNT),
+                          sizeof (struct ble_ll_aux_data),
+                          ext_scan_aux_mem,
+                          "ble_ll_aux_scan_pool");
+    BLE_LL_ASSERT(err == 0);
+#endif
+
+    err = os_mempool_init(&g_scan_dup_pool,
+                          MYNEWT_VAL(BLE_LL_NUM_SCAN_DUP_ADVS),
+                          sizeof(struct ble_ll_scan_dup_entry),
+                          g_scan_dup_mem,
+                          "ble_ll_scan_dup_pool");
+    BLE_LL_ASSERT(err == 0);
+
+    TAILQ_INIT(&g_scan_dup_list);
+
+    ble_ll_scan_common_init();
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_sched.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_sched.c
new file mode 100644
index 000000000..77c107f82
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_sched.c
@@ -0,0 +1,1838 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+ 
+#include <stdint.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/os/os_cputime.h"
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF51)
+#include "nimble/nimble/drivers/nrf51/include/ble/xcvr.h"
+#elif defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+#include "nimble/nimble/drivers/nrf52/include/ble/xcvr.h"
+#endif
+
+#include "../include/controller/ble_phy.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+#include "../include/controller/ble_ll_trace.h"
+#include "../include/controller/ble_ll_sync.h"
+#include "ble_ll_priv.h"
+#include "ble_ll_conn_priv.h"
+
+/* XXX: this is temporary. Not sure what I want to do here */
+struct hal_timer g_ble_ll_sched_timer;
+
+uint8_t g_ble_ll_sched_offset_ticks;
+
+#define BLE_LL_SCHED_ADV_WORST_CASE_USECS       \
+    (BLE_LL_SCHED_MAX_ADV_PDU_USECS + BLE_LL_IFS + BLE_LL_SCHED_ADV_MAX_USECS \
+     + XCVR_TX_SCHED_DELAY_USECS)
+
+#if (BLE_LL_SCHED_DEBUG == 1)
+int32_t g_ble_ll_sched_max_late;
+int32_t g_ble_ll_sched_max_early;
+#endif
+
+/* XXX: TODO:
+ *  1) Add some accounting to the schedule code to see how late we are
+ *  (min/max?)
+ *
+ *  2) Need to determine how we really want to handle the case when we execute
+ *  a schedule item but there is a current event. We could:
+ *      -> Reschedule the schedule item and let current event finish
+ *      -> Kill the current event and run the scheduled item.
+ *      -> Disable schedule timer while in an event; could cause us to be late.
+ *      -> Wait for current event to finish hoping it does before schedule item.
+ */
+
+/* Queue for timers */
+TAILQ_HEAD(ll_sched_qhead, ble_ll_sched_item) g_ble_ll_sched_q;
+
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+struct ble_ll_sched_obj g_ble_ll_sched_data;
+#endif
+
+/**
+ * Checks if two events in the schedule will overlap in time. NOTE: consecutive
+ * schedule items can end and start at the same time.
+ *
+ * @param s1
+ * @param s2
+ *
+ * @return int 0: dont overlap 1:overlap
+ */
+static int
+ble_ll_sched_is_overlap(struct ble_ll_sched_item *s1,
+                        struct ble_ll_sched_item *s2)
+{
+    int rc;
+
+    rc = 1;
+    if ((int32_t)(s1->start_time - s2->start_time) < 0) {
+        /* Make sure this event does not overlap current event */
+        if ((int32_t)(s1->end_time - s2->start_time) <= 0) {
+            rc = 0;
+        }
+    } else {
+        /* Check for overlap */
+        if ((int32_t)(s1->start_time - s2->end_time) >= 0) {
+            rc = 0;
+        }
+    }
+
+    return rc;
+}
+
+/*
+ * Determines if the schedule item overlaps the currently running schedule
+ * item. We only care about connection schedule items
+ */
+static int
+ble_ll_sched_overlaps_current(struct ble_ll_sched_item *sch)
+{
+    int rc;
+    uint32_t ce_end_time;
+
+    rc = 0;
+    if (ble_ll_state_get() == BLE_LL_STATE_CONNECTION) {
+        ce_end_time = ble_ll_conn_get_ce_end_time();
+        if ((int32_t)(ce_end_time - sch->start_time) > 0) {
+            rc = 1;
+        }
+    }
+    return rc;
+}
+
+static int
+ble_ll_sched_conn_overlap(struct ble_ll_sched_item *entry)
+{
+    int rc;
+    struct ble_ll_conn_sm *connsm;
+
+    /* Should only be advertising or a connection here */
+    if (entry->sched_type == BLE_LL_SCHED_TYPE_CONN) {
+        connsm = (struct ble_ll_conn_sm *)entry->cb_arg;
+        entry->enqueued = 0;
+        TAILQ_REMOVE(&g_ble_ll_sched_q, entry, link);
+        ble_ll_event_send(&connsm->conn_ev_end);
+        rc = 0;
+    } else {
+        rc = -1;
+    }
+
+    return rc;
+}
+
+static struct ble_ll_sched_item *
+ble_ll_sched_insert_if_empty(struct ble_ll_sched_item *sch)
+{
+    struct ble_ll_sched_item *entry;
+
+    entry = TAILQ_FIRST(&g_ble_ll_sched_q);
+    if (!entry) {
+        TAILQ_INSERT_HEAD(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 1;
+    }
+    return entry;
+}
+
+int
+ble_ll_sched_conn_reschedule(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+    os_sr_t sr;
+    uint32_t usecs;
+    struct ble_ll_sched_item *sch;
+    struct ble_ll_sched_item *start_overlap;
+    struct ble_ll_sched_item *end_overlap;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_conn_sm *tmp;
+
+    /* Get schedule element from connection */
+    sch = &connsm->conn_sch;
+
+    /* Set schedule start and end times */
+    sch->start_time = connsm->anchor_point - g_ble_ll_sched_offset_ticks;
+    if (connsm->conn_role == BLE_LL_CONN_ROLE_SLAVE) {
+        usecs = connsm->slave_cur_window_widening;
+        sch->start_time -= (os_cputime_usecs_to_ticks(usecs) + 1);
+        sch->remainder = 0;
+    } else {
+        sch->remainder = connsm->anchor_point_usecs;
+    }
+    sch->end_time = connsm->ce_end_time;
+
+    /* Better be past current time or we just leave */
+    if ((int32_t)(sch->start_time - os_cputime_get32()) < 0) {
+        return -1;
+    }
+
+    /* We have to find a place for this schedule */
+    OS_ENTER_CRITICAL(sr);
+
+    if (ble_ll_sched_overlaps_current(sch)) {
+        OS_EXIT_CRITICAL(sr);
+        return -1;
+    }
+
+    /* Stop timer since we will add an element */
+    os_cputime_timer_stop(&g_ble_ll_sched_timer);
+
+    start_overlap = NULL;
+    end_overlap = NULL;
+    rc = 0;
+    TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+        if (ble_ll_sched_is_overlap(sch, entry)) {
+           if (entry->sched_type == BLE_LL_SCHED_TYPE_CONN &&
+                            !ble_ll_conn_is_lru((struct ble_ll_conn_sm *)sch->cb_arg,
+                                    (struct ble_ll_conn_sm *)entry->cb_arg)) {
+                /* Only insert if this element is older than all that we
+                 * overlap
+                 */
+                start_overlap = NULL;
+                rc = -1;
+                break;
+            }
+
+            if (start_overlap == NULL) {
+                start_overlap = entry;
+                end_overlap = entry;
+            } else {
+                end_overlap = entry;
+            }
+        } else {
+            if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                rc = 0;
+                TAILQ_INSERT_BEFORE(entry, sch, link);
+                break;
+            }
+        }
+    }
+
+    if (!rc) {
+        if (!entry) {
+            TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+        }
+        sch->enqueued = 1;
+    }
+
+    /* Remove first to last scheduled elements */
+    entry = start_overlap;
+    while (entry) {
+        start_overlap = TAILQ_NEXT(entry,link);
+        switch (entry->sched_type) {
+        case BLE_LL_SCHED_TYPE_CONN:
+            tmp = (struct ble_ll_conn_sm *)entry->cb_arg;
+            ble_ll_event_send(&tmp->conn_ev_end);
+            break;
+        case BLE_LL_SCHED_TYPE_ADV:
+            ble_ll_adv_event_rmvd_from_sched((struct ble_ll_adv_sm *)entry->cb_arg);
+            break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+        case BLE_LL_SCHED_TYPE_AUX_SCAN:
+            ble_ll_scan_end_adv_evt((struct ble_ll_aux_data *)entry->cb_arg);
+            break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+        case BLE_LL_SCHED_TYPE_PERIODIC:
+            ble_ll_adv_periodic_rmvd_from_sched((struct ble_ll_adv_sm *)entry->cb_arg);
+            break;
+        case BLE_LL_SCHED_TYPE_SYNC:
+            ble_ll_sync_rmvd_from_sched((struct ble_ll_sync_sm *)entry->cb_arg);
+            break;
+#endif
+#endif
+        default:
+            BLE_LL_ASSERT(0);
+            break;
+        }
+
+        TAILQ_REMOVE(&g_ble_ll_sched_q, entry, link);
+        entry->enqueued = 0;
+
+        if (entry == end_overlap) {
+            break;
+        }
+        entry = start_overlap;
+    }
+
+    entry = TAILQ_FIRST(&g_ble_ll_sched_q);
+    if (entry == sch) {
+        ble_ll_rfmgmt_sched_changed(sch);
+    } else {
+        sch = entry;
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* Restart timer */
+    BLE_LL_ASSERT(sch != NULL);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+
+/**
+ * Called to schedule a connection when the current role is master.
+ *
+ * Context: Interrupt
+ *
+ * @param connsm
+ * @param ble_hdr
+ * @param pyld_len
+ *
+ * @return int
+ */
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+int
+ble_ll_sched_master_new(struct ble_ll_conn_sm *connsm,
+                        struct ble_mbuf_hdr *ble_hdr, uint8_t pyld_len)
+{
+    int rc;
+    os_sr_t sr;
+    uint32_t initial_start;
+    uint32_t earliest_start;
+    uint32_t earliest_end;
+    uint32_t dur;
+    uint32_t itvl_t;
+    uint32_t adv_rxend;
+    int i;
+    uint32_t tpp;
+    uint32_t tse;
+    uint32_t np;
+    uint32_t cp;
+    uint32_t tick_in_period;
+
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *sch;
+
+    /* Better have a connsm */
+    BLE_LL_ASSERT(connsm != NULL);
+
+    /* Get schedule element from connection */
+    rc = -1;
+    sch = &connsm->conn_sch;
+
+    /* XXX:
+     * The calculations for the 32kHz crystal bear alot of explanation. The
+     * earliest possible time that the master can start the connection with a
+     * slave is 1.25 msecs from the end of the connection request. The
+     * connection request is sent an IFS time from the end of the advertising
+     * packet that was received plus the time it takes to send the connection
+     * request. At 1 Mbps, this is 1752 usecs, or 57.41 ticks. Using 57 ticks
+     * makes us off ~13 usecs. Since we dont want to actually calculate the
+     * receive end time tick (this would take too long), we assume the end of
+     * the advertising PDU is 'now' (we call os_cputime_get32). We dont know
+     * how much time it will take to service the ISR but if we are more than the
+     * rx to tx time of the chip we will not be successful transmitting the
+     * connect request. All this means is that we presume that the slave will
+     * receive the connect request later than we expect but no earlier than
+     * 13 usecs before (this is important).
+     *
+     * The code then attempts to schedule the connection at the
+     * earliest time although this may not be possible. When the actual
+     * schedule start time is determined, the master has to determine if this
+     * time is more than a transmit window offset interval (1.25 msecs). The
+     * master has to tell the slave how many transmit window offsets there are
+     * from the earliest possible time to when the actual transmit start will
+     * occur. Later in this function you will see the calculation. The actual
+     * transmission start has to occur within the transmit window. The transmit
+     * window interval is in units of 1.25 msecs and has to be at least 1. To
+     * make things a bit easier (but less power efficient for the slave), we
+     * use a transmit window of 2. We do this because we dont quite know the
+     * exact start of the transmission and if we are too early or too late we
+     * could miss the transmit window. A final note: the actual transmission
+     * start (the anchor point) is sched offset ticks from the schedule start
+     * time. We dont add this to the calculation when calculating the window
+     * offset. The reason we dont do this is we want to insure we transmit
+     * after the window offset we tell the slave. For example, say we think
+     * we are transmitting 1253 usecs from the earliest start. This would cause
+     * us to send a transmit window offset of 1. Since we are actually
+     * transmitting earlier than the slave thinks we could end up transmitting
+     * before the window offset. Transmitting later is fine since we have the
+     * transmit window to do so. Transmitting before is bad, since the slave
+     * wont be listening. We could do better calculation if we wanted to use
+     * a transmit window of 1 as opposed to 2, but for now we dont care.
+     */
+    dur = os_cputime_usecs_to_ticks(g_ble_ll_sched_data.sch_ticks_per_period);
+    adv_rxend = os_cputime_get32();
+    if (ble_hdr->rxinfo.channel >= BLE_PHY_NUM_DATA_CHANS) {
+        /*
+         * We received packet on advertising channel which means this is a legacy
+         * PDU on 1 Mbps - we do as described above.
+         */
+        earliest_start = adv_rxend + 57;
+    } else {
+        /*
+         * The calculations are similar as above.
+         *
+         * We received packet on data channel which means this is AUX_ADV_IND
+         * received on secondary adv channel. We can schedule first packet at
+         * the earliest after "T_IFS + AUX_CONNECT_REQ + transmitWindowDelay".
+         * AUX_CONNECT_REQ and transmitWindowDelay times vary depending on which
+         * PHY we received on.
+         *
+         */
+        if (ble_hdr->rxinfo.phy == BLE_PHY_1M) {
+            // 150 + 352 + 2500 = 3002us = 98.37 ticks
+            earliest_start = adv_rxend + 98;
+        } else if (ble_hdr->rxinfo.phy == BLE_PHY_2M) {
+            // 150 + 180 + 2500 = 2830us = 92.73 ticks
+            earliest_start = adv_rxend + 93;
+        } else if (ble_hdr->rxinfo.phy == BLE_PHY_CODED) {
+            // 150 + 2896 + 3750 = 6796us = 222.69 ticks
+            earliest_start = adv_rxend + 223;
+        } else {
+            BLE_LL_ASSERT(0);
+        }
+    }
+    earliest_start += MYNEWT_VAL(BLE_LL_CONN_INIT_MIN_WIN_OFFSET) *
+                      BLE_LL_SCHED_32KHZ_TICKS_PER_SLOT;
+    itvl_t = connsm->conn_itvl_ticks;
+
+    /* We have to find a place for this schedule */
+    OS_ENTER_CRITICAL(sr);
+
+    /*
+     * Are there any allocated periods? If not, set epoch start to earliest
+     * time
+     */
+    if (g_ble_ll_sched_data.sch_num_occ_periods == 0) {
+        g_ble_ll_sched_data.sch_epoch_start = earliest_start;
+        cp = 0;
+    } else {
+        /*
+         * Earliest start must occur on period boundary.
+         * (tse = ticks since epoch)
+         */
+        tpp = g_ble_ll_sched_data.sch_ticks_per_period;
+        tse = earliest_start - g_ble_ll_sched_data.sch_epoch_start;
+        np = tse / tpp;
+        cp = np % BLE_LL_SCHED_PERIODS;
+        tick_in_period = tse - (np * tpp);
+        if (tick_in_period != 0) {
+            ++cp;
+            if (cp == BLE_LL_SCHED_PERIODS) {
+                cp = 0;
+            }
+            earliest_start += (tpp - tick_in_period);
+        }
+
+        /* Now find first un-occupied period starting from cp */
+        for (i = 0; i < BLE_LL_SCHED_PERIODS; ++i) {
+            if (g_ble_ll_sched_data.sch_occ_period_mask & (1 << cp)) {
+                ++cp;
+                if (cp == BLE_LL_SCHED_PERIODS) {
+                    cp = 0;
+                }
+                earliest_start += tpp;
+            } else {
+                /* not occupied */
+                break;
+            }
+        }
+        /* Should never happen but if it does... */
+        if (i == BLE_LL_SCHED_PERIODS) {
+            OS_EXIT_CRITICAL(sr);
+            return rc;
+        }
+    }
+
+    sch->start_time = earliest_start;
+    initial_start = earliest_start;
+    earliest_end = earliest_start + dur;
+
+    if (!ble_ll_sched_insert_if_empty(sch)) {
+        /* Nothing in schedule. Schedule as soon as possible */
+        rc = 0;
+        connsm->tx_win_off = MYNEWT_VAL(BLE_LL_CONN_INIT_MIN_WIN_OFFSET);
+    } else {
+        os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+            /* Set these because overlap function needs them to be set */
+            sch->start_time = earliest_start;
+            sch->end_time = earliest_end;
+
+            /* We can insert if before entry in list */
+            if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                if ((earliest_start - initial_start) <= itvl_t) {
+                    rc = 0;
+                    TAILQ_INSERT_BEFORE(entry, sch, link);
+                }
+                break;
+            }
+
+            /* Check for overlapping events */
+            if (ble_ll_sched_is_overlap(sch, entry)) {
+                /* Earliest start is end of this event since we overlap */
+                earliest_start = entry->end_time;
+                earliest_end = earliest_start + dur;
+            }
+        }
+
+        /* Must be able to schedule within one connection interval */
+        if (!entry) {
+            if ((earliest_start - initial_start) <= itvl_t) {
+                rc = 0;
+                TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+            }
+        }
+
+        if (!rc) {
+            /* calculate number of window offsets. Each offset is 1.25 ms */
+            sch->enqueued = 1;
+            /*
+             * NOTE: we dont add sched offset ticks as we want to under-estimate
+             * the transmit window slightly since the window size is currently
+             * 2 when using a 32768 crystal.
+             */
+            dur = os_cputime_ticks_to_usecs(earliest_start - initial_start);
+            connsm->tx_win_off = dur / BLE_LL_CONN_TX_OFF_USECS;
+        }
+    }
+
+    if (!rc) {
+        sch->start_time = earliest_start;
+        sch->end_time = earliest_end;
+        /*
+         * Since we have the transmit window to transmit in, we dont need
+         * to set the anchor point usecs; just transmit to the nearest tick.
+         */
+        connsm->anchor_point = earliest_start + g_ble_ll_sched_offset_ticks;
+        connsm->anchor_point_usecs = 0;
+        connsm->ce_end_time = earliest_end;
+        connsm->period_occ_mask = (1 << cp);
+        g_ble_ll_sched_data.sch_occ_period_mask |= connsm->period_occ_mask;
+        ++g_ble_ll_sched_data.sch_num_occ_periods;
+    }
+
+
+    /* Get head of list to restart timer */
+    sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    ble_ll_rfmgmt_sched_changed(sch);
+
+    OS_EXIT_CRITICAL(sr);
+
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+#else
+int
+ble_ll_sched_master_new(struct ble_ll_conn_sm *connsm,
+                        struct ble_mbuf_hdr *ble_hdr, uint8_t pyld_len)
+{
+    int rc;
+    os_sr_t sr;
+    uint8_t req_slots;
+    uint32_t initial_start;
+    uint32_t earliest_start;
+    uint32_t earliest_end;
+    uint32_t dur;
+    uint32_t itvl_t;
+    uint32_t adv_rxend;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *sch;
+
+    /*
+     * XXX: TODO this code assumes the advertisement and connect request were
+     * sent at 1Mbps.
+     */
+
+    /* Get schedule element from connection */
+    rc = -1;
+    sch = &connsm->conn_sch;
+    req_slots = MYNEWT_VAL(BLE_LL_CONN_INIT_SLOTS);
+
+    /* XXX:
+     * The calculations for the 32kHz crystal bear alot of explanation. The
+     * earliest possible time that the master can start the connection with a
+     * slave is 1.25 msecs from the end of the connection request. The
+     * connection request is sent an IFS time from the end of the advertising
+     * packet that was received plus the time it takes to send the connection
+     * request. At 1 Mbps, this is 1752 usecs, or 57.41 ticks. Using 57 ticks
+     * makes us off ~13 usecs. Since we dont want to actually calculate the
+     * receive end time tick (this would take too long), we assume the end of
+     * the advertising PDU is 'now' (we call os_cputime_get32). We dont know
+     * how much time it will take to service the ISR but if we are more than the
+     * rx to tx time of the chip we will not be successful transmitting the
+     * connect request. All this means is that we presume that the slave will
+     * receive the connect request later than we expect but no earlier than
+     * 13 usecs before (this is important).
+     *
+     * The code then attempts to schedule the connection at the
+     * earliest time although this may not be possible. When the actual
+     * schedule start time is determined, the master has to determine if this
+     * time is more than a transmit window offset interval (1.25 msecs). The
+     * master has to tell the slave how many transmit window offsets there are
+     * from the earliest possible time to when the actual transmit start will
+     * occur. Later in this function you will see the calculation. The actual
+     * transmission start has to occur within the transmit window. The transmit
+     * window interval is in units of 1.25 msecs and has to be at least 1. To
+     * make things a bit easier (but less power efficient for the slave), we
+     * use a transmit window of 2. We do this because we dont quite know the
+     * exact start of the transmission and if we are too early or too late we
+     * could miss the transmit window. A final note: the actual transmission
+     * start (the anchor point) is sched offset ticks from the schedule start
+     * time. We dont add this to the calculation when calculating the window
+     * offset. The reason we dont do this is we want to insure we transmit
+     * after the window offset we tell the slave. For example, say we think
+     * we are transmitting 1253 usecs from the earliest start. This would cause
+     * us to send a transmit window offset of 1. Since we are actually
+     * transmitting earlier than the slave thinks we could end up transmitting
+     * before the window offset. Transmitting later is fine since we have the
+     * transmit window to do so. Transmitting before is bad, since the slave
+     * wont be listening. We could do better calculation if we wanted to use
+     * a transmit window of 1 as opposed to 2, but for now we dont care.
+     */
+    dur = req_slots * BLE_LL_SCHED_32KHZ_TICKS_PER_SLOT;
+    adv_rxend = os_cputime_get32();
+    if (ble_hdr->rxinfo.channel >= BLE_PHY_NUM_DATA_CHANS) {
+        /*
+         * We received packet on advertising channel which means this is a legacy
+         * PDU on 1 Mbps - we do as described above.
+         */
+        earliest_start = adv_rxend + 57;
+    } else {
+        /*
+         * The calculations are similar as above.
+         *
+         * We received packet on data channel which means this is AUX_ADV_IND
+         * received on secondary adv channel. We can schedule first packet at
+         * the earliest after "T_IFS + AUX_CONNECT_REQ + transmitWindowDelay".
+         * AUX_CONNECT_REQ and transmitWindowDelay times vary depending on which
+         * PHY we received on.
+         *
+         */
+        if (ble_hdr->rxinfo.phy == BLE_PHY_1M) {
+            // 150 + 352 + 2500 = 3002us = 98.37 ticks
+            earliest_start = adv_rxend + 98;
+        } else if (ble_hdr->rxinfo.phy == BLE_PHY_2M) {
+            // 150 + 180 + 2500 = 2830us = 92.73 ticks
+            earliest_start = adv_rxend + 93;
+        } else if (ble_hdr->rxinfo.phy == BLE_PHY_CODED) {
+            // 150 + 2896 + 3750 = 6796us = 222.69 ticks
+            earliest_start = adv_rxend + 223;
+        } else {
+            BLE_LL_ASSERT(0);
+        }
+    }
+    earliest_start += MYNEWT_VAL(BLE_LL_CONN_INIT_MIN_WIN_OFFSET) *
+                      BLE_LL_SCHED_32KHZ_TICKS_PER_SLOT;
+    earliest_end = earliest_start + dur;
+    itvl_t = connsm->conn_itvl_ticks;
+
+    /* We have to find a place for this schedule */
+    OS_ENTER_CRITICAL(sr);
+
+    /* The schedule item must occur after current running item (if any) */
+    sch->start_time = earliest_start;
+    initial_start = earliest_start;
+
+    if (!ble_ll_sched_insert_if_empty(sch)) {
+        /* Nothing in schedule. Schedule as soon as possible */
+        rc = 0;
+        connsm->tx_win_off = MYNEWT_VAL(BLE_LL_CONN_INIT_MIN_WIN_OFFSET);
+    } else {
+        os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+            /* Set these because overlap function needs them to be set */
+            sch->start_time = earliest_start;
+            sch->end_time = earliest_end;
+
+            /* We can insert if before entry in list */
+            if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                if ((earliest_start - initial_start) <= itvl_t) {
+                    rc = 0;
+                    TAILQ_INSERT_BEFORE(entry, sch, link);
+                }
+                break;
+            }
+
+            /* Check for overlapping events */
+            if (ble_ll_sched_is_overlap(sch, entry)) {
+                /* Earliest start is end of this event since we overlap */
+                earliest_start = entry->end_time;
+                earliest_end = earliest_start + dur;
+            }
+        }
+
+        /* Must be able to schedule within one connection interval */
+        if (!entry) {
+            if ((earliest_start - initial_start) <= itvl_t) {
+                rc = 0;
+                TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+            }
+        }
+
+        if (!rc) {
+            /* calculate number of window offsets. Each offset is 1.25 ms */
+            sch->enqueued = 1;
+            /*
+             * NOTE: we dont add sched offset ticks as we want to under-estimate
+             * the transmit window slightly since the window size is currently
+             * 2 when using a 32768 crystal.
+             */
+            dur = os_cputime_ticks_to_usecs(earliest_start - initial_start);
+            connsm->tx_win_off = dur / BLE_LL_CONN_TX_OFF_USECS;
+        }
+    }
+
+    if (!rc) {
+        sch->start_time = earliest_start;
+        sch->end_time = earliest_end;
+        /*
+         * Since we have the transmit window to transmit in, we dont need
+         * to set the anchor point usecs; just transmit to the nearest tick.
+         */
+        connsm->anchor_point = earliest_start + g_ble_ll_sched_offset_ticks;
+        connsm->anchor_point_usecs = 0;
+        connsm->ce_end_time = earliest_end;
+    }
+
+    /* Get head of list to restart timer */
+    sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    ble_ll_rfmgmt_sched_changed(sch);
+
+    OS_EXIT_CRITICAL(sr);
+
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+#endif
+
+/**
+ * Schedules a slave connection for the first time.
+ *
+ * Context: Link Layer
+ *
+ * @param connsm
+ *
+ * @return int
+ */
+int
+ble_ll_sched_slave_new(struct ble_ll_conn_sm *connsm)
+{
+    int rc;
+    os_sr_t sr;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *next_sch;
+    struct ble_ll_sched_item *sch;
+    int first = 0;
+
+    /* Get schedule element from connection */
+    rc = -1;
+    sch = &connsm->conn_sch;
+
+    /* Set schedule start and end times */
+    /*
+     * XXX: for now, we dont care about anchor point usecs for the slave. It
+     * does not matter if we turn on the receiver up to one tick before w
+     * need to. We also subtract one extra tick since the conversion from
+     * usecs to ticks could be off by up to 1 tick.
+     */
+    sch->start_time = connsm->anchor_point - g_ble_ll_sched_offset_ticks -
+        os_cputime_usecs_to_ticks(connsm->slave_cur_window_widening) - 1;
+    sch->end_time = connsm->ce_end_time;
+    sch->remainder = 0;
+
+    /* We have to find a place for this schedule */
+    OS_ENTER_CRITICAL(sr);
+
+    /* The schedule item must occur after current running item (if any) */
+    if (ble_ll_sched_overlaps_current(sch)) {
+        OS_EXIT_CRITICAL(sr);
+        return rc;
+    }
+
+    entry = ble_ll_sched_insert_if_empty(sch);
+    if (!entry) {
+        /* Nothing in schedule. Schedule as soon as possible */
+        rc = 0;
+        first = 1;
+    } else {
+        os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        while (1) {
+            next_sch = entry->link.tqe_next;
+            /* Insert if event ends before next starts */
+            if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                rc = 0;
+                TAILQ_INSERT_BEFORE(entry, sch, link);
+                break;
+            }
+
+            if (ble_ll_sched_is_overlap(sch, entry)) {
+                /* If we overlap with a connection, we re-schedule */
+                if (ble_ll_sched_conn_overlap(entry)) {
+                    break;
+                }
+            }
+
+            /* Move to next entry */
+            entry = next_sch;
+
+            /* Insert at tail if none left to check */
+            if (!entry) {
+                rc = 0;
+                TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+                break;
+            }
+        }
+
+        if (!rc) {
+            sch->enqueued = 1;
+        }
+
+        next_sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+        if (next_sch == sch) {
+            first = 1;
+        } else {
+            sch = next_sch;
+        }
+    }
+
+    if (first) {
+        ble_ll_rfmgmt_sched_changed(sch);
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+/*
+ * Determines if the schedule item overlaps the currently running schedule
+ * item. This function cares about connection and sync.
+ */
+static int
+ble_ll_sched_sync_overlaps_current(struct ble_ll_sched_item *sch)
+{
+    uint32_t end_time;
+    uint8_t state;
+
+    state = ble_ll_state_get();
+    switch (state) {
+    case BLE_LL_STATE_CONNECTION:
+        end_time = ble_ll_conn_get_ce_end_time();
+        break;
+    case BLE_LL_STATE_SYNC:
+        end_time = ble_ll_sync_get_event_end_time();
+        break;
+    default:
+        return 0;
+    }
+
+    return CPUTIME_GT(end_time, sch->start_time);
+}
+
+int
+ble_ll_sched_sync_reschedule(struct ble_ll_sched_item *sch,
+                             uint32_t anchor_point, uint8_t anchor_point_usecs,
+                             uint32_t window_widening,
+                             int8_t phy_mode)
+{
+    struct ble_ll_sched_item *entry;
+    uint8_t start_time_rem_usecs;
+    uint8_t window_rem_usecs;
+    uint32_t window_ticks;
+    uint32_t start_time;
+    uint32_t end_time;
+    uint32_t dur;
+    int rc = 0;
+    os_sr_t sr;
+
+    window_ticks = os_cputime_usecs_to_ticks(window_widening);
+    window_rem_usecs = window_widening - os_cputime_ticks_to_usecs(window_ticks);
+
+    /* adjust for subtraction */
+    anchor_point_usecs += 31;
+    anchor_point--;
+
+    start_time = anchor_point - window_ticks;
+    start_time_rem_usecs = anchor_point_usecs - window_rem_usecs;
+    if (start_time_rem_usecs >= 31) {
+        start_time++;
+        start_time_rem_usecs -= 31;
+    }
+
+    dur = ble_ll_pdu_tx_time_get(MYNEWT_VAL(BLE_LL_SCHED_SCAN_SYNC_PDU_LEN),
+                                 phy_mode);
+    end_time = start_time + os_cputime_usecs_to_ticks(dur);
+
+    start_time -= g_ble_ll_sched_offset_ticks;
+
+    /* Set schedule start and end times */
+    sch->start_time = start_time;
+    sch->remainder = start_time_rem_usecs;
+    sch->end_time = end_time;
+
+    /* Better be past current time or we just leave */
+    if (CPUTIME_LEQ(sch->start_time, os_cputime_get32())) {
+        return -1;
+    }
+
+    /* We have to find a place for this schedule */
+    OS_ENTER_CRITICAL(sr);
+
+    if (ble_ll_sched_sync_overlaps_current(sch)) {
+        OS_EXIT_CRITICAL(sr);
+        return -1;
+    }
+
+    /* Try to find slot for sync scan. */
+    os_cputime_timer_stop(&g_ble_ll_sched_timer);
+
+    TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+        /* We can insert if before entry in list */
+        if (CPUTIME_LEQ(sch->end_time, entry->start_time)) {
+            TAILQ_INSERT_BEFORE(entry, sch, link);
+            sch->enqueued = 1;
+            break;
+        }
+
+        /* Check for overlapping events. For now drop if it overlaps with
+         * anything. We can make it smarter later on
+         */
+        if (ble_ll_sched_is_overlap(sch, entry)) {
+            rc = -1;
+            break;
+        }
+    }
+
+    if (!entry) {
+        TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 1;
+    }
+
+    entry = TAILQ_FIRST(&g_ble_ll_sched_q);
+    if (entry == sch) {
+        ble_ll_rfmgmt_sched_changed(sch);
+    } else {
+        sch = entry;
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* Restart timer */
+    BLE_LL_ASSERT(sch != NULL);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+
+int
+ble_ll_sched_sync(struct ble_ll_sched_item *sch,
+                  uint32_t beg_cputime, uint32_t rem_usecs,
+                  uint32_t offset, int8_t phy_mode)
+{
+    struct ble_ll_sched_item *entry;
+    uint32_t start_time_rem_usecs;
+    uint32_t off_rem_usecs;
+    uint32_t start_time;
+    uint32_t off_ticks;
+    uint32_t end_time;
+    uint32_t dur;
+    os_sr_t sr;
+    int rc = 0;
+
+    off_ticks = os_cputime_usecs_to_ticks(offset);
+    off_rem_usecs = offset - os_cputime_ticks_to_usecs(off_ticks);
+
+    start_time = beg_cputime + off_ticks;
+    start_time_rem_usecs = rem_usecs + off_rem_usecs;
+    if (start_time_rem_usecs >= 31) {
+        start_time++;
+        start_time_rem_usecs -= 31;
+    }
+
+    dur = ble_ll_pdu_tx_time_get(MYNEWT_VAL(BLE_LL_SCHED_SCAN_SYNC_PDU_LEN),
+                                  phy_mode);
+    end_time = start_time + os_cputime_usecs_to_ticks(dur);
+
+    start_time -= g_ble_ll_sched_offset_ticks;
+
+    sch->start_time = start_time;
+    sch->remainder = start_time_rem_usecs;
+    sch->end_time = end_time;
+
+    OS_ENTER_CRITICAL(sr);
+
+    if (!ble_ll_sched_insert_if_empty(sch)) {
+        /* Nothing in schedule. Schedule as soon as possible
+         * If we are here it means sch has been added to the scheduler */
+        goto done;
+    }
+
+    /* Try to find slot for scan. */
+    os_cputime_timer_stop(&g_ble_ll_sched_timer);
+    TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+        /* We can insert if before entry in list */
+        if (CPUTIME_LEQ(sch->end_time, entry->start_time)) {
+            TAILQ_INSERT_BEFORE(entry, sch, link);
+            sch->enqueued = 1;
+            break;
+        }
+
+        /* Check for overlapping events. For now drop if it overlaps with
+         * anything. We can make it smarter later on
+         */
+        if (ble_ll_sched_is_overlap(sch, entry)) {
+            rc = -1;
+            break;
+        }
+    }
+
+    if (!entry) {
+        TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 1;
+    }
+
+done:
+    entry = TAILQ_FIRST(&g_ble_ll_sched_q);
+    if (entry == sch) {
+        ble_ll_rfmgmt_sched_changed(sch);
+    } else {
+        sch = entry;
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* Restart timer */
+    BLE_LL_ASSERT(sch != NULL);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    STATS_INC(ble_ll_stats, sync_scheduled);
+    return rc;
+}
+#endif
+
+int
+ble_ll_sched_adv_new(struct ble_ll_sched_item *sch, ble_ll_sched_adv_new_cb cb,
+                     void *arg)
+{
+    os_sr_t sr;
+    uint32_t adv_start;
+    uint32_t duration;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *orig;
+
+    /* Get length of schedule item */
+    duration = sch->end_time - sch->start_time;
+    orig = sch;
+
+    OS_ENTER_CRITICAL(sr);
+    entry = ble_ll_sched_insert_if_empty(sch);
+    if (!entry) {
+        adv_start = sch->start_time;
+    } else {
+        /* XXX: no need to stop timer if not first on list. Modify code? */
+        os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+            /* We can insert if before entry in list */
+            if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                TAILQ_INSERT_BEFORE(entry, sch, link);
+                break;
+            }
+
+            /* Check for overlapping events */
+            if (ble_ll_sched_is_overlap(sch, entry)) {
+                /* Earliest start is end of this event since we overlap */
+                sch->start_time = entry->end_time;
+                sch->end_time = sch->start_time + duration;
+            }
+        }
+
+        if (!entry) {
+            TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+        }
+        adv_start = sch->start_time;
+
+        sch->enqueued = 1;
+
+        /* Restart with head of list */
+        sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    }
+
+    if (cb) {
+        cb((struct ble_ll_adv_sm *)orig->cb_arg, adv_start, arg);
+    }
+
+    if (orig == sch) {
+        ble_ll_rfmgmt_sched_changed(sch);
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* Restart timer */
+    BLE_LL_ASSERT(sch != NULL);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return 0;
+}
+
+int
+ble_ll_sched_periodic_adv(struct ble_ll_sched_item *sch, uint32_t *start,
+                          bool after_overlap)
+{
+    int rc = 0;
+    os_sr_t sr;
+    uint32_t adv_start;
+    uint32_t duration;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *orig = sch;
+
+    /* Get length of schedule item */
+    duration = sch->end_time - sch->start_time;
+
+    OS_ENTER_CRITICAL(sr);
+    entry = ble_ll_sched_insert_if_empty(sch);
+    if (!entry) {
+        adv_start = sch->start_time;
+    } else {
+        /* XXX: no need to stop timer if not first on list. Modify code? */
+        os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+            /* We can insert if before entry in list */
+            if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                TAILQ_INSERT_BEFORE(entry, sch, link);
+                break;
+            }
+
+            /* Check for overlapping events */
+            if (ble_ll_sched_is_overlap(sch, entry)) {
+                if (after_overlap) {
+                    /* Earliest start is end of this event since we overlap */
+                    sch->start_time = entry->end_time;
+                    sch->end_time = sch->start_time + duration;
+                } else {
+                    rc = -1;
+                    break;
+                }
+            }
+        }
+
+        if (!entry) {
+            TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+        }
+        adv_start = sch->start_time;
+
+        if (!rc) {
+            sch->enqueued = 1;
+        }
+
+        /* Restart with head of list */
+        sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    }
+
+    if (!rc) {
+        *start = adv_start;
+    }
+
+    if (orig == sch) {
+        ble_ll_rfmgmt_sched_changed(sch);
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* Restart timer */
+    BLE_LL_ASSERT(sch != NULL);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+
+int
+ble_ll_sched_adv_reschedule(struct ble_ll_sched_item *sch, uint32_t *start,
+                            uint32_t max_delay_ticks)
+{
+    int rc;
+    os_sr_t sr;
+    uint32_t orig_start;
+    uint32_t duration;
+    uint32_t rand_ticks;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *next_sch;
+    struct ble_ll_sched_item *before;
+    struct ble_ll_sched_item *start_overlap;
+    struct ble_ll_sched_item *end_overlap;
+
+    /* Get length of schedule item */
+    duration = sch->end_time - sch->start_time;
+
+    /* Add maximum randomization delay to end */
+    rand_ticks = max_delay_ticks;
+    sch->end_time += max_delay_ticks;
+
+    start_overlap = NULL;
+    end_overlap = NULL;
+    before = NULL;
+    rc = 0;
+    OS_ENTER_CRITICAL(sr);
+
+    entry = ble_ll_sched_insert_if_empty(sch);
+    if (entry) {
+        os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        while (1) {
+            next_sch = entry->link.tqe_next;
+            if (ble_ll_sched_is_overlap(sch, entry)) {
+                if (start_overlap == NULL) {
+                    start_overlap = entry;
+                    end_overlap = entry;
+                } else {
+                    end_overlap = entry;
+                }
+            } else {
+                if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                    before = entry;
+                    break;
+                }
+            }
+
+            entry = next_sch;
+            if (entry == NULL) {
+                break;
+            }
+        }
+
+        /*
+         * If there is no overlap, we either insert before the 'before' entry
+         * or we insert at the end if there is no before entry.
+         */
+        if (start_overlap == NULL) {
+            if (before) {
+                TAILQ_INSERT_BEFORE(before, sch, link);
+            } else {
+                TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+            }
+        } else {
+            /*
+             * This item will overlap with others. See if we can fit it in
+             * with original duration.
+             */
+            before = NULL;
+            orig_start = sch->start_time;
+            entry = start_overlap;
+            sch->end_time = sch->start_time + duration;
+            while (1) {
+                next_sch = entry->link.tqe_next;
+                if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+                    rand_ticks = entry->start_time - sch->end_time;
+                    before = entry;
+                    TAILQ_INSERT_BEFORE(before, sch, link);
+                    break;
+                } else {
+                    sch->start_time = entry->end_time;
+                    sch->end_time = sch->start_time + duration;
+                }
+
+                if (entry == end_overlap) {
+                    rand_ticks = (orig_start + max_delay_ticks) - sch->start_time;
+                    if (rand_ticks > max_delay_ticks) {
+                        /* No place for advertisement. */
+                        rc = -1;
+                    } else {
+                        if (next_sch == NULL) {
+                            TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+                        } else {
+                            TAILQ_INSERT_BEFORE(next_sch, sch, link);
+                        }
+                    }
+                    break;
+                }
+                entry = next_sch;
+                BLE_LL_ASSERT(entry != NULL);
+            }
+        }
+    }
+
+    if (!rc) {
+        sch->enqueued = 1;
+        if (rand_ticks) {
+            sch->start_time += rand() % rand_ticks;
+        }
+        sch->end_time = sch->start_time + duration;
+        *start = sch->start_time;
+
+        if (sch == TAILQ_FIRST(&g_ble_ll_sched_q)) {
+            ble_ll_rfmgmt_sched_changed(sch);
+        }
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+
+int
+ble_ll_sched_adv_resched_pdu(struct ble_ll_sched_item *sch)
+{
+    uint8_t lls;
+    os_sr_t sr;
+    struct ble_ll_sched_item *entry;
+
+    OS_ENTER_CRITICAL(sr);
+
+    lls = ble_ll_state_get();
+    if ((lls == BLE_LL_STATE_ADV) || (lls == BLE_LL_STATE_CONNECTION) ||
+            (lls == BLE_LL_STATE_SYNC)) {
+        goto adv_resched_pdu_fail;
+    }
+
+    entry = ble_ll_sched_insert_if_empty(sch);
+    if (entry) {
+        /* If we overlap with the first item, simply re-schedule */
+        if (ble_ll_sched_is_overlap(sch, entry)) {
+            goto adv_resched_pdu_fail;
+        }
+        os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        TAILQ_INSERT_BEFORE(entry, sch, link);
+        sch->enqueued = 1;
+    }
+
+    ble_ll_rfmgmt_sched_changed(TAILQ_FIRST(&g_ble_ll_sched_q));
+
+    OS_EXIT_CRITICAL(sr);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+    return 0;
+
+adv_resched_pdu_fail:
+    OS_EXIT_CRITICAL(sr);
+    return -1;
+}
+
+/**
+ * Remove a schedule element
+ *
+ * @param sched_type
+ *
+ * @return int 0 - removed, 1 - not in the list
+ */
+int
+ble_ll_sched_rmv_elem(struct ble_ll_sched_item *sch)
+{
+    os_sr_t sr;
+    struct ble_ll_sched_item *first;
+    int rc = 1;
+
+    if (!sch) {
+        return rc;
+    }
+
+    OS_ENTER_CRITICAL(sr);
+    if (sch->enqueued) {
+        first = TAILQ_FIRST(&g_ble_ll_sched_q);
+        if (first == sch) {
+            os_cputime_timer_stop(&g_ble_ll_sched_timer);
+        }
+
+        TAILQ_REMOVE(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 0;
+        rc = 0;
+
+        if (first == sch) {
+            first = TAILQ_FIRST(&g_ble_ll_sched_q);
+            if (first) {
+                os_cputime_timer_start(&g_ble_ll_sched_timer, first->start_time);
+            }
+            ble_ll_rfmgmt_sched_changed(first);
+        }
+    }
+    OS_EXIT_CRITICAL(sr);
+
+    return rc;
+}
+
+void
+ble_ll_sched_rmv_elem_type(uint8_t type, sched_remove_cb_func remove_cb)
+{
+    os_sr_t sr;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *first;
+
+    OS_ENTER_CRITICAL(sr);
+    first = TAILQ_FIRST(&g_ble_ll_sched_q);
+
+    if (!first) {
+        OS_EXIT_CRITICAL(sr);
+        return;
+    }
+
+    TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+        if (entry->sched_type == type) {
+            if (first == entry) {
+                os_cputime_timer_stop(&g_ble_ll_sched_timer);
+                first = NULL;
+            }
+
+            TAILQ_REMOVE(&g_ble_ll_sched_q, entry, link);
+            remove_cb(entry);
+            entry->enqueued = 0;
+        }
+    }
+
+    if (!first) {
+        first = TAILQ_FIRST(&g_ble_ll_sched_q);
+        if (first) {
+            os_cputime_timer_start(&g_ble_ll_sched_timer, first->start_time);
+        }
+        ble_ll_rfmgmt_sched_changed(first);
+    }
+
+    OS_EXIT_CRITICAL(sr);
+}
+
+/**
+ * Executes a schedule item by calling the schedule callback function.
+ *
+ * Context: Interrupt
+ *
+ * @param sch Pointer to schedule item
+ *
+ * @return int 0: schedule item is not over; otherwise schedule item is done.
+ */
+static int
+ble_ll_sched_execute_item(struct ble_ll_sched_item *sch)
+{
+    int rc;
+    uint8_t lls;
+
+    lls = ble_ll_state_get();
+
+    ble_ll_trace_u32x3(BLE_LL_TRACE_ID_SCHED, lls, os_cputime_get32(),
+                       sch->start_time);
+
+    if (lls == BLE_LL_STATE_STANDBY) {
+        goto sched;
+    }
+
+    /* If aux scan scheduled and LL is in state when scanner is running
+     * in 3 states:
+     * BLE_LL_STATE_SCANNING
+     * BLE_LL_STATE_INITIATING
+     * BLE_LL_STATE_STANDBY
+     *
+     * Let scanner to decide to disable phy or not.
+     */
+    if (sch->sched_type == BLE_LL_SCHED_TYPE_AUX_SCAN) {
+        if (lls == BLE_LL_STATE_INITIATING || lls == BLE_LL_STATE_SCANNING) {
+            goto sched;
+        }
+    }
+
+    /*
+     * This is either an advertising event or connection event start. If
+     * we are scanning or initiating just stop it.
+     */
+
+    /* We have to disable the PHY no matter what */
+    ble_phy_disable();
+
+    if (lls == BLE_LL_STATE_SCANNING) {
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        ble_ll_scan_halt();
+    } else if (lls == BLE_LL_STATE_INITIATING) {
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        ble_ll_scan_halt();
+        /* PHY is disabled - make sure we do not wait for AUX_CONNECT_RSP */
+        ble_ll_conn_reset_pending_aux_conn_rsp();
+    } else if (lls == BLE_LL_STATE_ADV) {
+        STATS_INC(ble_ll_stats, sched_state_adv_errs);
+        ble_ll_adv_halt();
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+    } else if (lls == BLE_LL_STATE_SYNC) {
+        STATS_INC(ble_ll_stats, sched_state_sync_errs);
+        ble_ll_sync_halt();
+#endif
+    } else {
+        STATS_INC(ble_ll_stats, sched_state_conn_errs);
+        ble_ll_conn_event_halt();
+    }
+
+sched:
+    BLE_LL_DEBUG_GPIO(SCHED_ITEM_CB, 1);
+    BLE_LL_ASSERT(sch->sched_cb);
+    rc = sch->sched_cb(sch);
+    BLE_LL_DEBUG_GPIO(SCHED_ITEM_CB, 0);
+    return rc;
+}
+
+/**
+ * Run the BLE scheduler. Iterate through all items on the schedule queue.
+ *
+ * Context: interrupt (scheduler)
+ *
+ * @return int
+ */
+static void
+ble_ll_sched_run(void *arg)
+{
+    struct ble_ll_sched_item *sch;
+
+    BLE_LL_DEBUG_GPIO(SCHED_RUN, 1);
+
+    /* Look through schedule queue */
+    sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    if (sch) {
+#if (BLE_LL_SCHED_DEBUG == 1)
+        int32_t dt;
+
+        /* Make sure we have passed the start time of the first event */
+        dt = (int32_t)(os_cputime_get32() - sch->start_time);
+        if (dt > g_ble_ll_sched_max_late) {
+            g_ble_ll_sched_max_late = dt;
+        }
+        if (dt < g_ble_ll_sched_max_early) {
+            g_ble_ll_sched_max_early = dt;
+        }
+#endif
+
+        /* Remove schedule item and execute the callback */
+        TAILQ_REMOVE(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 0;
+        ble_ll_sched_execute_item(sch);
+
+        /* Restart if there is an item on the schedule */
+        sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+        if (sch) {
+            os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+        }
+        ble_ll_rfmgmt_sched_changed(sch);
+    }
+
+    BLE_LL_DEBUG_GPIO(SCHED_RUN, 0);
+}
+
+/**
+ * Called to determine when the next scheduled event will occur.
+ *
+ * If there are not scheduled events this function returns 0; otherwise it
+ * returns 1 and *next_event_time is set to the start time of the next event.
+ *
+ * @param next_event_time
+ *
+ * @return int 0: No events are scheduled 1: there is an upcoming event
+ */
+int
+ble_ll_sched_next_time(uint32_t *next_event_time)
+{
+    int rc;
+    os_sr_t sr;
+    struct ble_ll_sched_item *first;
+
+    rc = 0;
+    OS_ENTER_CRITICAL(sr);
+    first = TAILQ_FIRST(&g_ble_ll_sched_q);
+    if (first) {
+        *next_event_time = first->start_time;
+        rc = 1;
+    }
+    OS_EXIT_CRITICAL(sr);
+
+    return rc;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+/**
+ * Called to check if there is place for a planned scan req.
+ *
+ * @param chan
+ * @param phy_mode
+ *
+ * @return int 0: Clear for scan req 1: there is an upcoming event
+ */
+int
+ble_ll_sched_scan_req_over_aux_ptr(uint32_t chan, uint8_t phy_mode)
+{
+    struct ble_ll_sched_item *sch;
+    uint32_t usec_dur;
+    uint32_t now = os_cputime_get32();
+
+    /* Lets calculate roughly how much time we need for scan req and scan rsp */
+    usec_dur = ble_ll_pdu_tx_time_get(BLE_SCAN_REQ_LEN, phy_mode);
+    if (chan >=  BLE_PHY_NUM_DATA_CHANS) {
+        usec_dur += ble_ll_pdu_tx_time_get(BLE_SCAN_RSP_MAX_LEN, phy_mode);
+    } else {
+        usec_dur += ble_ll_pdu_tx_time_get(BLE_SCAN_RSP_MAX_EXT_LEN, phy_mode);
+    }
+
+    sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    while (sch) {
+        /* Let's check if there is no scheduled item which want to start within
+         * given usecs.*/
+        if ((int32_t)(sch->start_time - now + os_cputime_usecs_to_ticks(usec_dur)) > 0) {
+            /* We are fine. Have time for scan req */
+            return 0;
+        }
+
+        /* There is something in the scheduler. If it is not aux ptr we assume
+         * it is more important that scan req
+         */
+        if (sch->sched_type != BLE_LL_SCHED_TYPE_AUX_SCAN) {
+            return 1;
+        }
+
+        ble_ll_scan_end_adv_evt((struct ble_ll_aux_data *)sch->cb_arg);
+        TAILQ_REMOVE(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 0;
+        sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+    }
+    return 0;
+}
+
+/**
+ * Called to schedule a aux scan.
+ *
+ * Context: Interrupt
+ *
+ * @param ble_hdr
+ * @param scansm
+ * @param aux_scan
+ *
+ * @return 0 on success, 1 otherwise
+ */
+int
+ble_ll_sched_aux_scan(struct ble_mbuf_hdr *ble_hdr,
+                      struct ble_ll_scan_sm *scansm,
+                      struct ble_ll_aux_data *aux_scan)
+{
+    int rc = 1;
+    os_sr_t sr;
+    uint32_t off_ticks;
+    uint32_t off_rem_usecs;
+    uint32_t start_time;
+    uint32_t start_time_rem_usecs;
+    uint32_t end_time;
+    uint32_t dur;
+    struct ble_ll_sched_item *entry;
+    struct ble_ll_sched_item *sch;
+    int phy_mode;
+
+    sch = &aux_scan->sch;
+    BLE_LL_ASSERT(sch->cb_arg == NULL);
+
+    off_ticks = os_cputime_usecs_to_ticks(aux_scan->offset);
+    off_rem_usecs = aux_scan->offset - os_cputime_ticks_to_usecs(off_ticks);
+
+    start_time = ble_hdr->beg_cputime + off_ticks;
+    start_time_rem_usecs = ble_hdr->rem_usecs + off_rem_usecs;
+    if (start_time_rem_usecs >= 31) {
+        start_time++;
+        start_time_rem_usecs -= 31;
+    }
+    start_time -= g_ble_ll_sched_offset_ticks;
+
+    /* Let's calculate time we reserve for aux packet. For now we assume to wait
+     * for fixed number of bytes and handle possible interrupting it in
+     * ble_ll_sched_execute_item(). This is because aux packet can be up to
+     * 256bytes and we don't want to block sched that long
+     */
+    phy_mode = ble_ll_phy_to_phy_mode(aux_scan->aux_phy,
+                                      BLE_HCI_LE_PHY_CODED_ANY);
+    dur = ble_ll_pdu_tx_time_get(MYNEWT_VAL(BLE_LL_SCHED_SCAN_AUX_PDU_LEN),
+                                 phy_mode);
+    end_time = start_time + os_cputime_usecs_to_ticks(dur);
+
+    sch->start_time = start_time;
+    sch->remainder = start_time_rem_usecs;
+    sch->end_time = end_time;
+
+    OS_ENTER_CRITICAL(sr);
+
+    if (!ble_ll_sched_insert_if_empty(sch)) {
+        /* Nothing in schedule. Schedule as soon as possible
+         * If we are here it means sch has been added to the scheduler */
+        rc = 0;
+        goto done;
+    }
+
+    /* Try to find slot for aux scan. */
+    os_cputime_timer_stop(&g_ble_ll_sched_timer);
+    TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+        /* We can insert if before entry in list */
+        if ((int32_t)(sch->end_time - entry->start_time) <= 0) {
+            rc = 0;
+            TAILQ_INSERT_BEFORE(entry, sch, link);
+            sch->enqueued = 1;
+            break;
+        }
+
+        /* Check for overlapping events. For now drop if it overlaps with
+         * anything. We can make it smarter later on
+         */
+        if (ble_ll_sched_is_overlap(sch, entry)) {
+            break;
+        }
+    }
+
+    if (!entry) {
+        rc = 0;
+        TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 1;
+    }
+
+done:
+
+    if (rc == 0) {
+        sch->cb_arg = ble_ll_scan_aux_data_ref(aux_scan);
+        STATS_INC(ble_ll_stats, aux_scheduled);
+    }
+
+    /* Get head of list to restart timer */
+    entry = TAILQ_FIRST(&g_ble_ll_sched_q);
+    if (entry == sch) {
+        ble_ll_rfmgmt_sched_changed(sch);
+    } else {
+        sch = entry;
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* Restart timer */
+    BLE_LL_ASSERT(sch != NULL);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+int ble_ll_sched_dtm(struct ble_ll_sched_item *sch)
+{
+    int rc;
+    os_sr_t sr;
+    struct ble_ll_sched_item *entry;
+
+    OS_ENTER_CRITICAL(sr);
+
+    if (!ble_ll_sched_insert_if_empty(sch)) {
+        /* Nothing in schedule. Schedule as soon as possible
+         * If we are here it means sch has been added to the scheduler */
+        rc = 0;
+        goto done;
+    }
+
+    /* Try to find slot for test. */
+    os_cputime_timer_stop(&g_ble_ll_sched_timer);
+    TAILQ_FOREACH(entry, &g_ble_ll_sched_q, link) {
+        /* We can insert if before entry in list */
+        if (sch->end_time <= entry->start_time) {
+            rc = 0;
+            TAILQ_INSERT_BEFORE(entry, sch, link);
+            sch->enqueued = 1;
+            break;
+        }
+
+        /* Check for overlapping events. For now drop if it overlaps with
+         * anything. We can make it smarter later on
+         */
+        if (ble_ll_sched_is_overlap(sch, entry)) {
+            OS_EXIT_CRITICAL(sr);
+            return -1;
+        }
+    }
+
+    if (!entry) {
+        rc = 0;
+        TAILQ_INSERT_TAIL(&g_ble_ll_sched_q, sch, link);
+        sch->enqueued = 1;
+    }
+
+done:
+
+    /* Get head of list to restart timer */
+    sch = TAILQ_FIRST(&g_ble_ll_sched_q);
+
+    ble_ll_rfmgmt_sched_changed(sch);
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* Restart timer */
+    BLE_LL_ASSERT(sch != NULL);
+    os_cputime_timer_start(&g_ble_ll_sched_timer, sch->start_time);
+
+    return rc;
+}
+#endif
+/**
+ * Stop the scheduler
+ *
+ * Context: Link Layer task
+ */
+void
+ble_ll_sched_stop(void)
+{
+    os_cputime_timer_stop(&g_ble_ll_sched_timer);
+}
+
+/**
+ * Initialize the scheduler. Should only be called once and should be called
+ * before any of the scheduler API are called.
+ *
+ * @return int
+ */
+int
+ble_ll_sched_init(void)
+{
+    BLE_LL_DEBUG_GPIO_INIT(SCHED_ITEM_CB);
+    BLE_LL_DEBUG_GPIO_INIT(SCHED_RUN);
+
+    /*
+     * Initialize max early to large negative number. This is used
+     * to determine the worst-case "early" time the schedule was called. Dont
+     * expect this to be less than -3 or -4.
+     */
+#if (BLE_LL_SCHED_DEBUG == 1)
+    g_ble_ll_sched_max_early = -50000;
+#endif
+
+    /*
+     * This is the offset from the start of the scheduled item until the actual
+     * tx/rx should occur, in ticks. We also "round up" to the nearest tick.
+     */
+    g_ble_ll_sched_offset_ticks =
+        (uint8_t) os_cputime_usecs_to_ticks(XCVR_TX_SCHED_DELAY_USECS + 30);
+
+    /* Initialize cputimer for the scheduler */
+    os_cputime_timer_init(&g_ble_ll_sched_timer, ble_ll_sched_run, NULL);
+
+#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
+    memset(&g_ble_ll_sched_data, 0, sizeof(struct ble_ll_sched_obj));
+    g_ble_ll_sched_data.sch_ticks_per_period =
+        os_cputime_usecs_to_ticks(MYNEWT_VAL(BLE_LL_USECS_PER_PERIOD));
+    g_ble_ll_sched_data.sch_ticks_per_epoch = BLE_LL_SCHED_PERIODS *
+        g_ble_ll_sched_data.sch_ticks_per_period;
+#endif
+
+    return 0;
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_supp_cmd.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_supp_cmd.c
new file mode 100644
index 000000000..6ee912fa3
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_supp_cmd.c
@@ -0,0 +1,461 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <string.h>
+
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_hci.h"
+
+/* Octet 0 */
+#define BLE_SUPP_CMD_DISCONNECT             (1 << 5)
+#define BLE_LL_SUPP_CMD_OCTET_0             (BLE_SUPP_CMD_DISCONNECT)
+
+/* Octet 5 */
+#define BLE_SUPP_CMD_SET_EVENT_MASK         (1 << 6)
+#define BLE_LL_SUPP_CMD_OCTET_5             (BLE_SUPP_CMD_SET_EVENT_MASK)
+
+/* Octet 10 */
+#define BLE_SUPP_CMD_RD_TX_PWR              (0 << 2)
+#define BLE_LL_SUPP_CMD_OCTET_10            (BLE_SUPP_CMD_RD_TX_PWR)
+
+/* Octet 14 */
+#define BLE_SUPP_CMD_RD_LOC_VER             (1 << 3)
+#define BLE_SUPP_CMD_RD_LOC_SUPP_FEAT       (1 << 5)
+#define BLE_LL_SUPP_CMD_OCTET_14            \
+(                                           \
+    BLE_SUPP_CMD_RD_LOC_VER         |       \
+    BLE_SUPP_CMD_RD_LOC_SUPP_FEAT           \
+)
+
+/* Octet 15 */
+#define BLE_SUPP_CMD_RD_BD_ADDR             (1 << 1)
+#define BLE_SUPP_CMD_RD_RSSI                (1 << 5)
+
+#define BLE_LL_SUPP_CMD_OCTET_15            \
+(                                           \
+    BLE_SUPP_CMD_RD_BD_ADDR         |       \
+    BLE_SUPP_CMD_RD_RSSI                    \
+)
+
+/* Octet 25 */
+#define BLE_SUPP_CMD_LE_SET_EV_MASK         (1 << 0)
+#define BLE_SUPP_CMD_LE_RD_BUF_SIZE         (1 << 1)
+#define BLE_SUPP_CMD_LE_RD_LOC_FEAT         (1 << 2)
+#define BLE_SUPP_CMD_LE_SET_RAND_ADDR       (1 << 4)
+#define BLE_SUPP_CMD_LE_SET_ADV_PARAMS      (1 << 5)
+#define BLE_SUPP_CMD_LE_SET_ADV_TX_PWR      (1 << 6)
+#define BLE_SUPP_CMD_LE_SET_ADV_DATA        (1 << 7)
+
+#define BLE_LL_SUPP_CMD_OCTET_25            \
+(                                           \
+    BLE_SUPP_CMD_LE_SET_EV_MASK     |       \
+    BLE_SUPP_CMD_LE_RD_BUF_SIZE     |       \
+    BLE_SUPP_CMD_LE_RD_LOC_FEAT     |       \
+    BLE_SUPP_CMD_LE_SET_RAND_ADDR   |       \
+    BLE_SUPP_CMD_LE_SET_ADV_PARAMS  |       \
+    BLE_SUPP_CMD_LE_SET_ADV_TX_PWR  |       \
+    BLE_SUPP_CMD_LE_SET_ADV_DATA            \
+)
+
+/* Octet 26 */
+#define BLE_SUPP_CMD_LE_SET_SCAN_RSP_DATA   (1 << 0)
+#define BLE_SUPP_CMD_LE_SET_ADV_ENABLE      (1 << 1)
+#define BLE_SUPP_CMD_LE_SET_SCAN_PARAMS     (1 << 2)
+#define BLE_SUPP_CMD_LE_SET_SCAN_ENABLE     (1 << 3)
+#define BLE_SUPP_CMD_LE_CREATE_CONN         (1 << 4)
+#define BLE_SUPP_CMD_LE_CREATE_CONN_CANCEL  (1 << 5)
+#define BLE_SUPP_CMD_LE_RD_WHITELIST_SIZE   (1 << 6)
+#define BLE_SUPP_CMD_LE_CLR_WHITELIST       (1 << 7)
+
+#define BLE_LL_SUPP_CMD_OCTET_26            \
+(                                           \
+    BLE_SUPP_CMD_LE_SET_SCAN_RSP_DATA   |   \
+    BLE_SUPP_CMD_LE_SET_ADV_ENABLE      |   \
+    BLE_SUPP_CMD_LE_SET_SCAN_PARAMS     |   \
+    BLE_SUPP_CMD_LE_SET_SCAN_ENABLE     |   \
+    BLE_SUPP_CMD_LE_CREATE_CONN         |   \
+    BLE_SUPP_CMD_LE_CREATE_CONN_CANCEL  |   \
+    BLE_SUPP_CMD_LE_RD_WHITELIST_SIZE   |   \
+    BLE_SUPP_CMD_LE_CLR_WHITELIST           \
+)
+
+/* Octet 27 */
+#define BLE_SUPP_CMD_LE_ADD_DEV_WHITELIST   (1 << 0)
+#define BLE_SUPP_CMD_LE_RMV_DEV_WHITELIST   (1 << 1)
+#define BLE_SUPP_CMD_LE_CONN_UPDATE         (1 << 2)
+#define BLE_SUPP_CMD_LE_SET_HOST_CHAN_CLASS (1 << 3)
+#define BLE_SUPP_CMD_LE_RD_CHAN_MAP         (1 << 4)
+#define BLE_SUPP_CMD_LE_RD_REM_USED_FEAT    (1 << 5)
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+#define BLE_SUPP_CMD_LE_ENCRYPT             (1 << 6)
+#else
+#define BLE_SUPP_CMD_LE_ENCRYPT             (0 << 6)
+#endif
+#define BLE_SUPP_CMD_LE_RAND                (1 << 7)
+
+#define BLE_LL_SUPP_CMD_OCTET_27            \
+(                                           \
+    BLE_SUPP_CMD_LE_ENCRYPT             |   \
+    BLE_SUPP_CMD_LE_RAND                |   \
+    BLE_SUPP_CMD_LE_ADD_DEV_WHITELIST   |   \
+    BLE_SUPP_CMD_LE_RMV_DEV_WHITELIST   |   \
+    BLE_SUPP_CMD_LE_CONN_UPDATE         |   \
+    BLE_SUPP_CMD_LE_SET_HOST_CHAN_CLASS |   \
+    BLE_SUPP_CMD_LE_RD_CHAN_MAP         |   \
+    BLE_SUPP_CMD_LE_RD_REM_USED_FEAT        \
+)
+
+/* Octet 28 */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+#define BLE_SUPP_CMD_LE_START_ENCRYPT       (1 << 0)
+#define BLE_SUPP_CMD_LE_LTK_REQ_REPLY       (1 << 1)
+#define BLE_SUPP_CMD_LE_LTK_REQ_NEG_REPLY   (1 << 2)
+#else
+#define BLE_SUPP_CMD_LE_START_ENCRYPT       (0 << 0)
+#define BLE_SUPP_CMD_LE_LTK_REQ_REPLY       (0 << 1)
+#define BLE_SUPP_CMD_LE_LTK_REQ_NEG_REPLY   (0 << 2)
+#endif
+#define BLE_SUPP_CMD_LE_READ_SUPP_STATES    (1 << 3)
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+#define BLE_SUPP_CMD_LE_RX_TEST             (1 << 4)
+#define BLE_SUPP_CMD_LE_TX_TEST             (1 << 5)
+#define BLE_SUPP_CMD_LE_TEST_END            (1 << 6)
+
+#else
+#define BLE_SUPP_CMD_LE_RX_TEST             (0 << 4)
+#define BLE_SUPP_CMD_LE_TX_TEST             (0 << 5)
+#define BLE_SUPP_CMD_LE_TEST_END            (0 << 6)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_28            \
+(                                           \
+    BLE_SUPP_CMD_LE_START_ENCRYPT       |   \
+    BLE_SUPP_CMD_LE_LTK_REQ_REPLY       |   \
+    BLE_SUPP_CMD_LE_LTK_REQ_NEG_REPLY   |   \
+    BLE_SUPP_CMD_LE_READ_SUPP_STATES    |   \
+    BLE_SUPP_CMD_LE_RX_TEST             |   \
+    BLE_SUPP_CMD_LE_TX_TEST             |   \
+    BLE_SUPP_CMD_LE_TEST_END                \
+)
+
+/* Octet 33 */
+#define BLE_SUPP_CMD_LE_REM_CONN_PRR        (1 << 4)
+#define BLE_SUPP_CMD_LE_REM_CONN_PRNR       (1 << 5)
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
+#define BLE_SUPP_CMD_LE_SET_DATALEN         (1 << 6)
+#define BLE_SUPP_CMD_LE_RD_SUGG_DATALEN     (1 << 7)
+#else
+#define BLE_SUPP_CMD_LE_SET_DATALEN         (0 << 6)
+#define BLE_SUPP_CMD_LE_RD_SUGG_DATALEN     (0 << 7)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_33            \
+(                                           \
+    BLE_SUPP_CMD_LE_REM_CONN_PRR        |   \
+    BLE_SUPP_CMD_LE_REM_CONN_PRNR       |   \
+    BLE_SUPP_CMD_LE_SET_DATALEN         |   \
+    BLE_SUPP_CMD_LE_RD_SUGG_DATALEN         \
+)
+
+/* Octet 34 */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_DATA_LEN_EXT)
+#define BLE_SUPP_CMD_LE_WR_SUGG_DATALEN     (1 << 0)
+#else
+#define BLE_SUPP_CMD_LE_WR_SUGG_DATALEN     (0 << 0)
+#endif
+#define BLE_SUPP_CMD_LE_READ_LOCAL_P256_PK  (0 << 1)
+#define BLE_SUPP_CMD_LE_GENERATE_DH_KEY     (0 << 2)
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+#define BLE_SUPP_CMD_LE_ADD_RESOLV_LIST     (1 << 3)
+#define BLE_SUPP_CMD_LE_REMOVE_RESOLV_LIST  (1 << 4)
+#define BLE_SUPP_CMD_LE_CLEAR_RESOLV_LIST   (1 << 5)
+#define BLE_SUPP_CMD_LE_RD_RESOLV_SIZE      (1 << 6)
+#define BLE_SUPP_CMD_LE_RD_PEER_RESV_ADDR   (1 << 7)
+#else
+#define BLE_SUPP_CMD_LE_ADD_RESOLV_LIST     (0 << 3)
+#define BLE_SUPP_CMD_LE_REMOVE_RESOLV_LIST  (0 << 4)
+#define BLE_SUPP_CMD_LE_CLEAR_RESOLV_LIST   (0 << 5)
+#define BLE_SUPP_CMD_LE_RD_RESOLV_SIZE      (0 << 6)
+#define BLE_SUPP_CMD_LE_RD_PEER_RESV_ADDR   (0 << 7)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_34            \
+(                                           \
+    BLE_SUPP_CMD_LE_WR_SUGG_DATALEN     |   \
+    BLE_SUPP_CMD_LE_READ_LOCAL_P256_PK  |   \
+    BLE_SUPP_CMD_LE_GENERATE_DH_KEY     |   \
+    BLE_SUPP_CMD_LE_ADD_RESOLV_LIST     |   \
+    BLE_SUPP_CMD_LE_REMOVE_RESOLV_LIST  |   \
+    BLE_SUPP_CMD_LE_CLEAR_RESOLV_LIST   |   \
+    BLE_SUPP_CMD_LE_RD_RESOLV_SIZE      |   \
+    BLE_SUPP_CMD_LE_RD_PEER_RESV_ADDR       \
+)
+
+/* Octet 35 */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+#define BLE_SUPP_CMD_LE_RD_LOCAL_RESV_ADDR  (1 << 0)
+#define BLE_SUPP_CMD_LE_SET_ADDR_RES_EN     (1 << 1)
+#define BLE_SUPP_CMD_LE_SET_RESV_ADDR_TMO   (1 << 2)
+#else
+#define BLE_SUPP_CMD_LE_RD_LOCAL_RESV_ADDR  (0 << 0)
+#define BLE_SUPP_CMD_LE_SET_ADDR_RES_EN     (0 << 1)
+#define BLE_SUPP_CMD_LE_SET_RESV_ADDR_TMO   (0 << 2)
+#endif
+#define BLE_SUPP_CMD_LE_RD_MAX_DATALEN      (1 << 3)
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+#define BLE_SUPP_CMD_LE_READ_PHY            (1 << 4)
+#define BLE_SUPP_CMD_LE_SET_DEFAULT_PHY     (1 << 5)
+#define BLE_SUPP_CMD_LE_SET_PHY             (1 << 6)
+#else
+#define BLE_SUPP_CMD_LE_READ_PHY            (0 << 4)
+#define BLE_SUPP_CMD_LE_SET_DEFAULT_PHY     (0 << 5)
+#define BLE_SUPP_CMD_LE_SET_PHY             (0 << 6)
+#endif
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+#define BLE_SUPP_CMD_LE_ENHANCED_RX_TEST    (1 << 7)
+#else
+#define BLE_SUPP_CMD_LE_ENHANCED_RX_TEST    (0 << 7)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_35            \
+(                                           \
+    BLE_SUPP_CMD_LE_RD_LOCAL_RESV_ADDR  |   \
+    BLE_SUPP_CMD_LE_SET_ADDR_RES_EN     |   \
+    BLE_SUPP_CMD_LE_SET_RESV_ADDR_TMO   |   \
+    BLE_SUPP_CMD_LE_RD_MAX_DATALEN      |   \
+    BLE_SUPP_CMD_LE_READ_PHY            |   \
+    BLE_SUPP_CMD_LE_SET_DEFAULT_PHY     |   \
+    BLE_SUPP_CMD_LE_SET_PHY             |   \
+    BLE_SUPP_CMD_LE_ENHANCED_RX_TEST        \
+)
+
+/* Octet 36 */
+#if MYNEWT_VAL(BLE_LL_DTM)
+#define BLE_SUPP_CMD_LE_ENHANCED_TX_TEST    (1 << 0)
+#else
+#define BLE_SUPP_CMD_LE_ENHANCED_TX_TEST    (0 << 0)
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define BLE_SUPP_CMD_LE_SET_ADVS_RAND_ADDR  (1 << 1)
+#define BLE_SUPP_CMD_LE_SET_EXT_ADV_PARAM   (1 << 2)
+#define BLE_SUPP_CMD_LE_SET_EXT_ADV_DATA    (1 << 3)
+#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_RSP    (1 << 4)
+#define BLE_SUPP_CMD_LE_SET_EXT_ADV_ENABLE  (1 << 5)
+#define BLE_SUPP_CMD_LE_RD_MAX_ADV_DATA_LEN (1 << 6)
+#define BLE_SUPP_CMD_LE_RD_NUM_SUPP_ADVS    (1 << 7)
+#else
+#define BLE_SUPP_CMD_LE_SET_ADVS_RAND_ADDR  (0 << 1)
+#define BLE_SUPP_CMD_LE_SET_EXT_ADV_PARAM   (0 << 2)
+#define BLE_SUPP_CMD_LE_SET_EXT_ADV_DATA    (0 << 3)
+#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_RSP    (0 << 4)
+#define BLE_SUPP_CMD_LE_SET_EXT_ADV_ENABLE  (0 << 5)
+#define BLE_SUPP_CMD_LE_RD_MAX_ADV_DATA_LEN (0 << 6)
+#define BLE_SUPP_CMD_LE_RD_NUM_SUPP_ADVS    (0 << 7)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_36            \
+(                                           \
+    BLE_SUPP_CMD_LE_ENHANCED_TX_TEST    |   \
+    BLE_SUPP_CMD_LE_SET_ADVS_RAND_ADDR  |   \
+    BLE_SUPP_CMD_LE_SET_EXT_ADV_PARAM   |   \
+    BLE_SUPP_CMD_LE_SET_EXT_ADV_DATA    |   \
+    BLE_SUPP_CMD_LE_SET_EXT_SCAN_RSP    |   \
+    BLE_SUPP_CMD_LE_SET_EXT_ADV_ENABLE  |   \
+    BLE_SUPP_CMD_LE_RD_MAX_ADV_DATA_LEN |   \
+    BLE_SUPP_CMD_LE_RD_NUM_SUPP_ADVS        \
+)
+
+/* Octet 37 */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define BLE_SUPP_CMD_LE_REMOVE_ADVS         (1 << 0)
+#define BLE_SUPP_CMD_LE_CLEAR_ADVS          (1 << 1)
+#else
+#define BLE_SUPP_CMD_LE_REMOVE_ADVS         (0 << 0)
+#define BLE_SUPP_CMD_LE_CLEAR_ADVS          (0 << 1)
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+#define BLE_SUPP_CMD_LE_SET_PADV_PARAM      (1 << 2)
+#define BLE_SUPP_CMD_LE_SET_PADV_DATA       (1 << 3)
+#define BLE_SUPP_CMD_LE_SET_PADV_ENABLE     (1 << 4)
+#else
+#define BLE_SUPP_CMD_LE_SET_PADV_PARAM      (0 << 2)
+#define BLE_SUPP_CMD_LE_SET_PADV_DATA       (0 << 3)
+#define BLE_SUPP_CMD_LE_SET_PADV_ENABLE     (0 << 4)
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_PARAM  (1 << 5)
+#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_ENABLE (1 << 6)
+#define BLE_SUPP_CMD_LE_EXT_CREATE_CONN     (1 << 7)
+#else
+#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_PARAM  (0 << 5)
+#define BLE_SUPP_CMD_LE_SET_EXT_SCAN_ENABLE (0 << 6)
+#define BLE_SUPP_CMD_LE_EXT_CREATE_CONN     (0 << 7)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_37            \
+(                                           \
+    BLE_SUPP_CMD_LE_REMOVE_ADVS         |   \
+    BLE_SUPP_CMD_LE_CLEAR_ADVS          |   \
+    BLE_SUPP_CMD_LE_SET_PADV_PARAM      |   \
+    BLE_SUPP_CMD_LE_SET_PADV_DATA       |   \
+    BLE_SUPP_CMD_LE_SET_PADV_ENABLE     |   \
+    BLE_SUPP_CMD_LE_SET_EXT_SCAN_PARAM  |   \
+    BLE_SUPP_CMD_LE_SET_EXT_SCAN_ENABLE |   \
+    BLE_SUPP_CMD_LE_EXT_CREATE_CONN         \
+)
+
+/* Octet 38 */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+#define BLE_SUPP_CMD_LE_PADV_CREATE_SYNC    (1 << 0)
+#define BLE_SUPP_CMD_LE_PADV_CREATE_SYNC_C  (1 << 1)
+#define BLE_SUPP_CMD_LE_PADV_TERMINATE_SYNC (1 << 2)
+#define BLE_SUPP_CMD_LE_ADD_PADV_LIST       (1 << 3)
+#define BLE_SUPP_CMD_LE_REMOVE_PADV_LIST    (1 << 4)
+#define BLE_SUPP_CMD_LE_CLEAR_PADV_LIST     (1 << 5)
+#define BLE_SUPP_CMD_LE_RD_PADV_LIST_SIZE   (1 << 6)
+#else
+#define BLE_SUPP_CMD_LE_PADV_CREATE_SYNC    (0 << 0)
+#define BLE_SUPP_CMD_LE_PADV_CREATE_SYNC_C  (0 << 1)
+#define BLE_SUPP_CMD_LE_PADV_TERMINATE_SYNC (0 << 2)
+#define BLE_SUPP_CMD_LE_ADD_PADV_LIST       (0 << 3)
+#define BLE_SUPP_CMD_LE_REMOVE_PADV_LIST    (0 << 4)
+#define BLE_SUPP_CMD_LE_CLEAR_PADV_LIST     (0 << 5)
+#define BLE_SUPP_CMD_LE_RD_PADV_LIST_SIZE   (0 << 6)
+#endif
+#define BLE_SUPP_CMD_LE_RD_TX_POWER         (1 << 7)
+
+#define BLE_LL_SUPP_CMD_OCTET_38            \
+(                                           \
+    BLE_SUPP_CMD_LE_PADV_CREATE_SYNC    |   \
+    BLE_SUPP_CMD_LE_PADV_CREATE_SYNC_C  |   \
+    BLE_SUPP_CMD_LE_PADV_TERMINATE_SYNC |   \
+    BLE_SUPP_CMD_LE_ADD_PADV_LIST       |   \
+    BLE_SUPP_CMD_LE_REMOVE_PADV_LIST    |   \
+    BLE_SUPP_CMD_LE_CLEAR_PADV_LIST     |   \
+    BLE_SUPP_CMD_LE_RD_PADV_LIST_SIZE   |   \
+    BLE_SUPP_CMD_LE_RD_TX_POWER             \
+)
+
+/* Octet 39 */
+#define BLE_SUPP_CMD_LE_RD_RF_PATH_COMP     (1 << 0)
+#define BLE_SUPP_CMD_LE_WR_RF_PATH_COMP     (1 << 1)
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+#define BLE_SUPP_CMD_LE_SET_PRIVACY_MODE    (1 << 2)
+#else
+#define BLE_SUPP_CMD_LE_SET_PRIVACY_MODE    (0 << 2)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_39            \
+(                                           \
+    BLE_SUPP_CMD_LE_RD_RF_PATH_COMP     |   \
+    BLE_SUPP_CMD_LE_WR_RF_PATH_COMP     |   \
+    BLE_SUPP_CMD_LE_SET_PRIVACY_MODE        \
+)
+
+/* Octet 40 */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV) && MYNEWT_VAL(BLE_VERSION) >= 51
+#define BLE_SUPP_CMD_LE_PADV_RECV_ENABLE (1 << 5)
+#else
+#define BLE_SUPP_CMD_LE_PADV_RECV_ENABLE (0 << 5)
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+#define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER (1 << 6)
+#define BLE_SUPP_CMD_LE_PADV_SET_INFO_TRANSFER (1 << 7)
+#else
+#define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER (0 << 6)
+#define BLE_SUPP_CMD_LE_PADV_SET_INFO_TRANSFER (0 << 7)
+#endif
+
+#define BLE_LL_SUPP_CMD_OCTET_40             \
+(                                            \
+    BLE_SUPP_CMD_LE_PADV_RECV_ENABLE       | \
+    BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER     | \
+    BLE_SUPP_CMD_LE_PADV_SET_INFO_TRANSFER   \
+)
+
+/* Octet 41 */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+#define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER_PARAMS (1 << 0)
+#define BLE_SUPP_CMD_LE_PADV_DEFAULT_SYNC_TRANSFER_PARAMS (1 << 1)
+#else
+#define BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER_PARAMS (0 << 0)
+#define BLE_SUPP_CMD_LE_PADV_DEFAULT_SYNC_TRANSFER_PARAMS (0 << 1)
+#endif
+#define BLE_LL_SUPP_CMD_OCTET_41                        \
+(                                                       \
+    BLE_SUPP_CMD_LE_PADV_SYNC_TRANSFER_PARAMS |         \
+    BLE_SUPP_CMD_LE_PADV_DEFAULT_SYNC_TRANSFER_PARAMS   \
+)
+
+/* Defines the array of supported commands */
+const uint8_t g_ble_ll_supp_cmds[BLE_LL_SUPP_CMD_LEN] =
+{
+    BLE_LL_SUPP_CMD_OCTET_0,            /* Octet 0 */
+    0,
+    0,
+    0,
+    0,
+    BLE_LL_SUPP_CMD_OCTET_5,
+    0,
+    0,
+    0,                                  /* Octet 8 */
+    0,
+    BLE_LL_SUPP_CMD_OCTET_10,
+    0,
+    0,
+    0,
+    BLE_LL_SUPP_CMD_OCTET_14,
+    BLE_LL_SUPP_CMD_OCTET_15,
+    0,                                  /* Octet 16 */
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,                                 /* Octet 24 */
+    BLE_LL_SUPP_CMD_OCTET_25,
+    BLE_LL_SUPP_CMD_OCTET_26,
+    BLE_LL_SUPP_CMD_OCTET_27,
+    BLE_LL_SUPP_CMD_OCTET_28,
+    0,
+    0,
+    0,
+    0,                                  /* Octet 32 */
+    BLE_LL_SUPP_CMD_OCTET_33,
+    BLE_LL_SUPP_CMD_OCTET_34,
+    BLE_LL_SUPP_CMD_OCTET_35,
+    BLE_LL_SUPP_CMD_OCTET_36,
+    BLE_LL_SUPP_CMD_OCTET_37,
+    BLE_LL_SUPP_CMD_OCTET_38,
+    BLE_LL_SUPP_CMD_OCTET_39,
+    BLE_LL_SUPP_CMD_OCTET_40,           /* Octet 40 */
+    BLE_LL_SUPP_CMD_OCTET_41,
+};
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_sync.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_sync.c
new file mode 100644
index 000000000..231a4d633
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_sync.c
@@ -0,0 +1,2248 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdbool.h>
+#include <stdint.h>
+#include <assert.h>
+
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_sync.h"
+#include "../include/controller/ble_ll_utils.h"
+#include "../include/controller/ble_ll_sched.h"
+#include "../include/controller/ble_ll_whitelist.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_ll_resolv.h"
+#include "../include/controller/ble_ll_rfmgmt.h"
+
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+
+#include "ble_ll_conn_priv.h"
+
+#include "nimble/porting/nimble/include/stats/stats.h"
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV)
+
+/* defines number of events that can be lost during sync establishment
+ * before failed to be established error is reported
+ */
+#define BLE_LL_SYNC_ESTABLISH_CNT 6
+
+#define BLE_LL_SYNC_CNT MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_CNT)
+#define BLE_LL_SYNC_LIST_CNT MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_LIST_CNT)
+
+#define BLE_LL_SYNC_SM_FLAG_RESERVED        0x0001
+#define BLE_LL_SYNC_SM_FLAG_ESTABLISHING    0x0002
+#define BLE_LL_SYNC_SM_FLAG_ESTABLISHED     0x0004
+#define BLE_LL_SYNC_SM_FLAG_SET_ANCHOR      0x0008
+#define BLE_LL_SYNC_SM_FLAG_OFFSET_300      0x0010
+#define BLE_LL_SYNC_SM_FLAG_SYNC_INFO       0x0020
+#define BLE_LL_SYNC_SM_FLAG_DISABLED        0x0040
+#define BLE_LL_SYNC_SM_FLAG_ADDR_RESOLVED   0x0080
+#define BLE_LL_SYNC_SM_FLAG_HCI_TRUNCATED   0x0100
+
+#define BLE_LL_SYNC_CHMAP_LEN               5
+#define BLE_LL_SYNC_ITVL_USECS              1250
+
+struct ble_ll_sync_sm {
+    uint16_t flags;
+
+    uint8_t adv_sid;
+    uint8_t adv_addr[BLE_DEV_ADDR_LEN];
+    uint8_t adv_addr_type;
+
+    uint8_t sca;
+    uint8_t chanmap[BLE_LL_SYNC_CHMAP_LEN];
+    uint8_t num_used_chans;
+
+    uint8_t chan_index;
+    uint8_t chan_chain;
+
+    uint8_t phy_mode;
+
+    uint8_t sync_pending_cnt;
+
+    uint32_t timeout;
+    uint16_t skip;
+
+    uint16_t itvl;
+    uint8_t  itvl_usecs;
+    uint32_t itvl_ticks;
+
+    uint32_t crcinit; /* only 3 bytes are used */
+    uint32_t access_addr;
+    uint16_t event_cntr;
+    uint16_t channel_id;
+
+    uint32_t window_widening;
+    uint32_t last_anchor_point;
+    uint32_t anchor_point;
+    uint8_t anchor_point_usecs;
+
+    struct ble_ll_sched_item sch;
+
+    struct ble_npl_event sync_ev_end;
+
+    uint8_t *next_report;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    struct ble_ll_conn_sm *transfer_conn;
+    uint8_t *transfer_received_ev;
+    uint16_t transfer_id;
+    uint16_t event_cntr_last_received;
+    uint8_t adv_addr_rpa[6];
+#endif
+};
+
+static struct ble_ll_sync_sm g_ble_ll_sync_sm[BLE_LL_SYNC_CNT];
+
+static struct {
+    uint8_t adv_sid;
+    uint8_t adv_addr[BLE_DEV_ADDR_LEN];
+    uint8_t adv_addr_type;
+} g_ble_ll_sync_adv_list[BLE_LL_SYNC_LIST_CNT];
+
+static struct {
+    uint32_t timeout;
+    uint16_t max_skip;
+    uint16_t options;
+} g_ble_ll_sync_create_params;
+
+/* if this is set HCI LE Sync Create is pending */
+static uint8_t *g_ble_ll_sync_create_comp_ev;
+
+static struct ble_ll_sync_sm *g_ble_ll_sync_sm_current;
+
+static int
+ble_ll_sync_on_list(const uint8_t *addr, uint8_t addr_type, uint8_t sid)
+{
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_sync_adv_list); i++) {
+        if ((g_ble_ll_sync_adv_list[i].adv_sid == sid) &&
+                (g_ble_ll_sync_adv_list[i].adv_addr_type == addr_type) &&
+                !memcmp(g_ble_ll_sync_adv_list[i].adv_addr, addr, BLE_DEV_ADDR_LEN)) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+static int
+ble_ll_sync_list_get_free(void)
+{
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_sync_adv_list); i++) {
+        if (g_ble_ll_sync_adv_list[i].adv_sid == 0xff) {
+            return i;
+        }
+    }
+
+    return -1;
+}
+
+static bool
+ble_ll_sync_list_empty(void) {
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_sync_adv_list); i++) {
+        if (g_ble_ll_sync_adv_list[i].adv_sid != 0xff) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+static uint8_t
+ble_ll_sync_get_handle(struct ble_ll_sync_sm *sm)
+{
+    /* handle number is offset in global array */
+    return sm - g_ble_ll_sync_sm;
+}
+
+static void
+ble_ll_sync_sm_clear(struct ble_ll_sync_sm *sm)
+{
+    if (sm->flags & (BLE_LL_SYNC_SM_FLAG_ESTABLISHING |
+                     BLE_LL_SYNC_SM_FLAG_ESTABLISHED)) {
+        ble_ll_sched_rmv_elem(&sm->sch);
+        ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &sm->sync_ev_end);
+    }
+
+    if (sm->next_report) {
+        ble_hci_trans_buf_free(sm->next_report);
+    }
+
+    if (g_ble_ll_sync_sm_current == sm) {
+        ble_phy_disable();
+        ble_ll_state_set(BLE_LL_STATE_STANDBY);
+        g_ble_ll_sync_sm_current = NULL;
+        ble_ll_scan_chk_resume();
+    }
+
+    ble_ll_rfmgmt_release();
+
+    BLE_LL_ASSERT(sm->sync_ev_end.ev.ev_queued == 0);
+    BLE_LL_ASSERT(sm->sch.enqueued == 0);
+    memset(sm, 0, sizeof(*sm));
+}
+
+static uint8_t
+ble_ll_sync_phy_mode_to_hci(int8_t phy_mode)
+{
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    switch (phy_mode) {
+    case BLE_PHY_MODE_1M:
+        return BLE_HCI_LE_PHY_1M;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    case BLE_PHY_MODE_2M:
+        return BLE_HCI_LE_PHY_2M;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case BLE_PHY_MODE_CODED_125KBPS:
+    case BLE_PHY_MODE_CODED_500KBPS:
+        return BLE_HCI_LE_PHY_CODED;
+#endif
+    default:
+        BLE_LL_ASSERT(false);
+        return BLE_PHY_MODE_1M;
+    }
+#else
+    return BLE_PHY_MODE_1M;
+#endif
+}
+
+static struct ble_ll_sync_sm *
+ble_ll_sync_find(const uint8_t *addr, uint8_t addr_type, uint8_t sid)
+{
+    struct ble_ll_sync_sm *sm;
+    int i;
+
+    for (i = 0; i < BLE_LL_SYNC_CNT; i++) {
+        sm = &g_ble_ll_sync_sm[i];
+
+        if (!sm->flags) {
+            continue;
+        }
+        if ((sm->adv_sid == sid) && (sm->adv_addr_type == addr_type) &&
+                !memcmp(&sm->adv_addr, addr, BLE_DEV_ADDR_LEN)) {
+            return sm;
+        }
+    }
+
+    return NULL;
+}
+
+static uint16_t
+get_max_skip(uint32_t interval_us, uint32_t timeout_us)
+{
+    uint16_t max_skip;
+
+    BLE_LL_ASSERT(interval_us);
+    BLE_LL_ASSERT(timeout_us);
+
+    if (timeout_us <= interval_us) {
+        return 0;
+    }
+
+    /*
+     * Calculate max allowed skip to receive something before timeout. We adjust
+     * current skip value to be no more than max_skip-6 so we have at least few
+     * attempts to receive an event (so we don't timeout immediately after just
+     * one missed event).
+     */
+
+    max_skip = (timeout_us / interval_us) - 1;
+
+    if (max_skip < 6) {
+        return 0;
+    }
+
+    return max_skip - 6;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+static void
+ble_ll_sync_transfer_received(struct ble_ll_sync_sm *sm, uint8_t status)
+{
+    struct ble_hci_ev_le_subev_periodic_adv_sync_transfer *ev;
+    struct ble_hci_ev *hci_ev;
+
+    BLE_LL_ASSERT(sm->transfer_received_ev);
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_TRANSFER)) {
+        hci_ev = (void *) sm->transfer_received_ev;
+
+        hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+        hci_ev->length = sizeof(*ev);
+
+        ev = (void *) hci_ev->data;
+        ev->subev_code = BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_TRANSFER;
+
+        ev->status = status;
+        ev->conn_handle = htole16(sm->transfer_conn->conn_handle);
+        ev->service_data = htole16(sm->transfer_id);
+
+        /* this is ignored by host on error */
+        ev->sync_handle = htole16(ble_ll_sync_get_handle(sm));
+        ev->sid = sm->adv_sid;
+        ev->peer_addr_type = sm->adv_addr_type;
+        if (sm->flags & BLE_LL_SYNC_SM_FLAG_ADDR_RESOLVED) {
+            ev->peer_addr_type += 2;
+        }
+        memcpy(ev->peer_addr, sm->adv_addr, BLE_DEV_ADDR_LEN);
+        ev->phy = ble_ll_sync_phy_mode_to_hci(sm->phy_mode);
+        ev->interval = htole16(sm->itvl);
+        ev->aca = sm->sca;
+
+        ble_ll_hci_event_send(hci_ev);
+    } else {
+        ble_hci_trans_buf_free(sm->transfer_received_ev);
+    }
+
+    sm->transfer_received_ev = NULL;
+    sm->transfer_conn = NULL;
+}
+#endif
+
+static void
+ble_ll_sync_est_event_success(struct ble_ll_sync_sm *sm)
+{
+    struct ble_hci_ev_le_subev_periodic_adv_sync_estab *ev;
+    struct ble_hci_ev *hci_ev;
+
+    BLE_LL_ASSERT(g_ble_ll_sync_create_comp_ev);
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_ESTAB)) {
+        hci_ev = (void *) g_ble_ll_sync_create_comp_ev;
+
+        hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+        hci_ev->length = sizeof(*ev);
+        ev = (void *) hci_ev->data;
+
+        ev->subev_code = BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_ESTAB;
+        ev->status = BLE_ERR_SUCCESS;
+        ev->sync_handle = htole16(ble_ll_sync_get_handle(sm));
+        ev->sid = sm->adv_sid;
+        ev->peer_addr_type = sm->adv_addr_type;
+        if (sm->flags & BLE_LL_SYNC_SM_FLAG_ADDR_RESOLVED) {
+            ev->peer_addr_type += 2;
+        }
+        memcpy(ev->peer_addr, sm->adv_addr, BLE_DEV_ADDR_LEN);
+        ev->phy = ble_ll_sync_phy_mode_to_hci(sm->phy_mode);
+        ev->interval = htole16(sm->itvl);
+        ev->aca = sm->sca;
+
+        ble_ll_hci_event_send(hci_ev);
+    } else {
+        ble_hci_trans_buf_free(g_ble_ll_sync_create_comp_ev);
+    }
+
+    g_ble_ll_sync_create_comp_ev = NULL;
+}
+
+static void
+ble_ll_sync_est_event_failed(uint8_t status)
+{
+    struct ble_hci_ev_le_subev_periodic_adv_sync_estab *ev;
+    struct ble_hci_ev *hci_ev;
+
+    BLE_LL_ASSERT(g_ble_ll_sync_create_comp_ev);
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_ESTAB)) {
+        hci_ev = (void *) g_ble_ll_sync_create_comp_ev;
+
+        hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+        hci_ev->length = sizeof(*ev);
+        ev = (void *) hci_ev->data;
+
+        memset(ev, 0, sizeof(*ev));
+
+        ev->subev_code = BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_ESTAB;
+        ev->status = status;
+
+        ble_ll_hci_event_send(hci_ev);
+    } else {
+        ble_hci_trans_buf_free(g_ble_ll_sync_create_comp_ev);
+    }
+
+    g_ble_ll_sync_create_comp_ev = NULL;
+}
+
+static void
+ble_ll_sync_lost_event(struct ble_ll_sync_sm *sm)
+{
+    struct ble_hci_ev_le_subev_periodic_adv_sync_lost *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_LOST)) {
+        hci_ev = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+        if (hci_ev) {
+            hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+            hci_ev->length = sizeof(*ev);
+            ev = (void *) hci_ev->data;
+
+            ev->subev_code = BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_LOST;
+            ev->sync_handle = htole16(ble_ll_sync_get_handle(sm));
+
+            ble_ll_hci_event_send(hci_ev);
+        }
+    }
+}
+
+static void
+ble_ll_sync_current_sm_over(void)
+{
+    /* Disable the PHY */
+    ble_phy_disable();
+
+    /* Link-layer is in standby state now */
+    ble_ll_state_set(BLE_LL_STATE_STANDBY);
+
+    /* Set current LL sync to NULL */
+    g_ble_ll_sync_sm_current = NULL;
+}
+
+static int
+ble_ll_sync_event_start_cb(struct ble_ll_sched_item *sch)
+{
+    struct ble_ll_sync_sm *sm;
+    uint32_t wfr_usecs;
+    uint32_t start;
+    int rc;
+
+    /* Set current connection state machine */
+    sm = sch->cb_arg;
+    BLE_LL_ASSERT(sm);
+
+    g_ble_ll_sync_sm_current = sm;
+
+    /* Disable whitelisting */
+    ble_ll_whitelist_disable();
+
+    /* Set LL state */
+    ble_ll_state_set(BLE_LL_STATE_SYNC);
+
+    /* Set channel */
+    ble_phy_setchan(sm->chan_index, sm->access_addr, sm->crcinit);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    ble_phy_resolv_list_disable();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    ble_phy_encrypt_disable();
+#endif
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    ble_phy_mode_set(sm->phy_mode, sm->phy_mode);
+#endif
+
+    start = sch->start_time + g_ble_ll_sched_offset_ticks;
+    rc = ble_phy_rx_set_start_time(start, sch->remainder);
+    if (rc && rc != BLE_PHY_ERR_RX_LATE) {
+        STATS_INC(ble_ll_stats, sync_event_failed);
+        rc = BLE_LL_SCHED_STATE_DONE;
+        ble_ll_event_send(&sm->sync_ev_end);
+        ble_ll_sync_current_sm_over();
+    } else {
+        /*
+         * Set flag that tells to set last anchor point if a packet
+         * has been received.
+         */
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_SET_ANCHOR;
+
+        /* Set WFR timer.
+         * If establishing we always adjust with offset unit.
+         * If this is first packet of sync (one that was pointed by from
+         * SyncInfo we don't adjust WFT with window widening.
+         */
+        if (sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING) {
+            wfr_usecs = (sm->flags & BLE_LL_SYNC_SM_FLAG_OFFSET_300) ? 300 : 30;
+            if (!(sm->flags & BLE_LL_SYNC_SM_FLAG_SYNC_INFO)) {
+                wfr_usecs += 2 * sm->window_widening;
+            }
+        } else {
+            wfr_usecs = 2 * sm->window_widening;
+        }
+        ble_phy_wfr_enable(BLE_PHY_WFR_ENABLE_RX, 0, wfr_usecs);
+
+        rc = BLE_LL_SCHED_STATE_RUNNING;
+    }
+
+    sm->flags &= ~BLE_LL_SYNC_SM_FLAG_SYNC_INFO;
+
+    return rc;
+}
+
+/**
+ * Called when a receive PDU has started.
+ *
+ * Context: interrupt
+ *
+ * @return int
+ *   < 0: A frame we dont want to receive.
+ *   = 0: Continue to receive frame. Dont go from rx to tx
+ */
+int
+ble_ll_sync_rx_isr_start(uint8_t pdu_type, struct ble_mbuf_hdr *rxhdr)
+{
+    BLE_LL_ASSERT(g_ble_ll_sync_sm_current);
+
+    /* this also handles chains as those have same PDU type */
+    if (pdu_type != BLE_ADV_PDU_TYPE_AUX_SYNC_IND) {
+        ble_ll_event_send(&g_ble_ll_sync_sm_current->sync_ev_end);
+        ble_ll_sync_current_sm_over();
+        STATS_INC(ble_ll_stats, sched_invalid_pdu);
+        return -1;
+    }
+
+    STATS_INC(ble_ll_stats, sync_received);
+    return 0;
+}
+
+static int
+ble_ll_sync_parse_ext_hdr(struct os_mbuf *om, uint8_t **aux, int8_t *tx_power)
+{
+    uint8_t *rxbuf = om->om_data;
+    uint8_t ext_hdr_flags;
+    uint8_t ext_hdr_len;
+    uint8_t *ext_hdr;
+    uint8_t pdu_len;
+    int i;
+
+    pdu_len = rxbuf[1];
+    if (pdu_len == 0) {
+        return -1;
+    }
+    ext_hdr_len = rxbuf[2] & 0x3F;
+    if (ext_hdr_len > (pdu_len - 1)) {
+        return -1;
+    }
+
+    if (ext_hdr_len) {
+        ext_hdr_flags = rxbuf[3];
+        ext_hdr = &rxbuf[4];
+
+        i = 0;
+
+        /* there should be no AdvA in Sync or chain, skip it */
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_ADVA_BIT)) {
+            i += BLE_LL_EXT_ADV_ADVA_SIZE;
+        }
+
+        /* there should be no TargetA in Sync or chain, skip it */
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_TARGETA_BIT)) {
+            i += BLE_LL_EXT_ADV_TARGETA_SIZE;
+        }
+
+        /* Ignore CTE for now */
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_CTE_INFO_BIT)) {
+            i += 1;
+        }
+
+        /* there should be no ADI in Sync or chain, skip it */
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_DATA_INFO_BIT)) {
+            i += BLE_LL_EXT_ADV_DATA_INFO_SIZE;
+        }
+
+        /* get AuXPTR if present */
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_AUX_PTR_BIT)) {
+            *aux = ext_hdr + i;
+            i += BLE_LL_EXT_ADV_AUX_PTR_SIZE;
+        }
+
+        /* there should be no SyncInfo in Sync or chain, skip it */
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_SYNC_INFO_BIT)) {
+            i += BLE_LL_EXT_ADV_SYNC_INFO_SIZE;
+        }
+
+        if (ext_hdr_flags & (1 << BLE_LL_EXT_ADV_TX_POWER_BIT)) {
+            *tx_power = *(ext_hdr + i);
+            i += BLE_LL_EXT_ADV_TX_POWER_SIZE;
+        }
+
+        /* TODO Handle ACAD if needed */
+
+        /* sanity check */
+        if (i > ext_hdr_len) {
+            return -1;
+        }
+    }
+
+    return pdu_len - ext_hdr_len - 1;
+}
+
+static void
+ble_ll_sync_adjust_ext_hdr(struct os_mbuf *om)
+{
+    uint8_t *rxbuf = om->om_data;
+    uint8_t ext_hdr_len;
+
+    /* this was already verified in ble_ll_sync_parse_ext_hdr() */
+    ext_hdr_len = rxbuf[2] & 0x3F;
+
+    os_mbuf_adj(om, 3 + ext_hdr_len);
+}
+
+static void
+ble_ll_sync_send_truncated_per_adv_rpt(struct ble_ll_sync_sm *sm, uint8_t *evbuf)
+{
+    struct ble_hci_ev_le_subev_periodic_adv_rpt *ev;
+    struct ble_hci_ev *hci_ev;
+
+    if (!ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_PERIODIC_ADV_RPT) ||
+        (sm->flags & BLE_LL_SYNC_SM_FLAG_DISABLED)) {
+        ble_hci_trans_buf_free(evbuf);
+        return;
+    }
+
+    hci_ev = (void *) evbuf;
+
+    hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+    hci_ev->length = sizeof(*ev);
+    ev = (void *) hci_ev->data;
+
+    ev->subev_code = BLE_HCI_LE_SUBEV_PERIODIC_ADV_RPT;
+    ev->sync_handle = htole16(ble_ll_sync_get_handle(sm));
+    ev->tx_power = 127; /* not available */
+    ev->rssi = 127; /* not available */
+    ev->cte_type = 0xff;
+    ev->data_status = BLE_HCI_PERIODIC_DATA_STATUS_TRUNCATED;
+    ev->data_len = 0;
+
+    ble_ll_hci_event_send(hci_ev);
+}
+
+static void
+ble_ll_sync_send_per_adv_rpt(struct ble_ll_sync_sm *sm, struct os_mbuf *rxpdu,
+                             int8_t rssi, int8_t tx_power, int datalen,
+                             uint8_t *aux, bool aux_scheduled)
+{
+    struct ble_hci_ev_le_subev_periodic_adv_rpt *ev;
+    struct ble_hci_ev *hci_ev;
+    struct ble_hci_ev *hci_ev_next = NULL;
+    uint8_t max_data_len;
+    int offset;
+
+    /* use next report buffer if present, this means we are chaining */
+    if (sm->next_report) {
+        hci_ev = (void *) sm->next_report;
+        sm->next_report = NULL;
+    } else {
+        hci_ev = (void * )ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
+        if (!hci_ev) {
+            goto done;
+        }
+    }
+
+    max_data_len = BLE_LL_MAX_EVT_LEN - sizeof(*hci_ev) - sizeof(*ev);
+    offset = 0;
+
+    do {
+        if (hci_ev_next) {
+            hci_ev = hci_ev_next;
+            hci_ev_next = NULL;
+        }
+
+        hci_ev->opcode = BLE_HCI_EVCODE_LE_META;
+        hci_ev->length = sizeof(*ev);
+
+        ev = (void *) hci_ev->data;
+
+        ev->subev_code = BLE_HCI_LE_SUBEV_PERIODIC_ADV_RPT;
+        ev->sync_handle = htole16(ble_ll_sync_get_handle(sm));
+        ev->tx_power = tx_power;
+        ev->rssi = rssi;
+        ev->cte_type = 0xff;
+
+        ev->data_len = min(max_data_len, datalen - offset);
+        /* adjust event length */
+        hci_ev->length += ev->data_len;
+
+        os_mbuf_copydata(rxpdu, offset, ev->data_len, ev->data);
+        offset += ev->data_len;
+
+        /* Need another event for next fragment of this PDU */
+        if (offset < datalen) {
+            hci_ev_next = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
+            if (hci_ev_next) {
+                ev->data_status = BLE_HCI_PERIODIC_DATA_STATUS_INCOMPLETE;
+            } else {
+                ev->data_status = BLE_HCI_PERIODIC_DATA_STATUS_TRUNCATED;
+            }
+        } else {
+            /* last report of this PDU */
+            if (aux) {
+                if (aux_scheduled) {
+                    /* if we scheduled aux, we need buffer for next report */
+                    hci_ev_next = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
+                    if (hci_ev_next) {
+                        ev->data_status = BLE_HCI_PERIODIC_DATA_STATUS_INCOMPLETE;
+                    } else {
+                        ev->data_status = BLE_HCI_PERIODIC_DATA_STATUS_TRUNCATED;
+                    }
+                } else {
+                    ev->data_status = BLE_HCI_PERIODIC_DATA_STATUS_TRUNCATED;
+                }
+            } else {
+                ev->data_status = BLE_HCI_PERIODIC_DATA_STATUS_COMPLETE;
+            }
+        }
+        ble_ll_hci_event_send(hci_ev);
+    } while ((offset < datalen) && hci_ev_next);
+
+done:
+    /* this means that we already truncated data (or didn't sent first at all)
+     * in HCI report but has scheduled for next PDU in chain. In that case mark
+     * it so that we end event properly when next PDU is received.
+     * */
+    if (aux_scheduled && !hci_ev_next) {
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_HCI_TRUNCATED;
+    }
+
+    /* store for chain */
+    sm->next_report = (void *) hci_ev_next;
+}
+
+/**
+ * Called when a receive PDU has ended.
+ *
+ * Context: Interrupt
+ *
+ * @param rxpdu
+ *
+ * @return int
+ *       < 0: Disable the phy after reception.
+ *      == 0: Success. Do not disable the PHY.
+ *       > 0: Do not disable PHY as that has already been done.
+ */
+int
+ble_ll_sync_rx_isr_end(uint8_t *rxbuf, struct ble_mbuf_hdr *rxhdr)
+{
+    struct ble_mbuf_hdr *ble_hdr;
+    struct os_mbuf *rxpdu;
+
+    BLE_LL_ASSERT(g_ble_ll_sync_sm_current);
+
+    /* type was verified in isr_start */
+
+    rxpdu = ble_ll_rxpdu_alloc(rxbuf[1] + BLE_LL_PDU_HDR_LEN);
+    if (rxpdu) {
+        ble_phy_rxpdu_copy(rxbuf, rxpdu);
+
+        ble_hdr = BLE_MBUF_HDR_PTR(rxpdu);
+        ble_hdr->rxinfo.user_data = g_ble_ll_sync_sm_current;
+
+        ble_ll_rx_pdu_in(rxpdu);
+    } else {
+        STATS_INC(ble_ll_stats, sync_rx_buf_err);
+        ble_ll_event_send(&g_ble_ll_sync_sm_current->sync_ev_end);
+    }
+
+    /* PHY is disabled here */
+    ble_ll_sync_current_sm_over();
+
+    return 1;
+}
+
+/**
+ * Called when the wait for response timer expires while in the sync state.
+ *
+ * Context: Interrupt.
+ */
+void
+ble_ll_sync_wfr_timer_exp(void)
+{
+    struct ble_ll_sync_sm *sm = g_ble_ll_sync_sm_current;
+
+    BLE_LL_ASSERT(g_ble_ll_sync_sm_current);
+    STATS_INC(ble_ll_stats, sync_missed_err);
+
+    ble_ll_sync_current_sm_over();
+    ble_ll_event_send(&sm->sync_ev_end);
+}
+
+/**
+ * Called when sync event needs to be halted. This normally should not be called
+ * and is only called when a scheduled item executes but scanning for sync/chain
+ * is stil ongoing
+ * Context: Interrupt
+ */
+void
+ble_ll_sync_halt(void)
+{
+    struct ble_ll_sync_sm *sm = g_ble_ll_sync_sm_current;
+
+    ble_ll_sync_current_sm_over();
+
+    if (sm) {
+        ble_ll_event_send(&sm->sync_ev_end);
+    }
+}
+
+uint32_t
+ble_ll_sync_get_event_end_time(void)
+{
+    uint32_t end_time;
+
+    if (g_ble_ll_sync_sm_current) {
+        end_time = g_ble_ll_sync_sm_current->sch.end_time;
+    } else {
+        end_time = os_cputime_get32();
+    }
+    return end_time;
+}
+
+static uint8_t
+ble_ll_sync_phy_mode_to_aux_phy(uint8_t phy_mode)
+{
+    switch (phy_mode) {
+    case BLE_PHY_MODE_1M:
+        return 0x00;
+    case BLE_PHY_MODE_2M:
+        return 0x01;
+    case BLE_PHY_MODE_CODED_125KBPS:
+    case BLE_PHY_MODE_CODED_500KBPS:
+        return 0x02;
+    default:
+        BLE_LL_ASSERT(false);
+        return 0x00;
+    }
+}
+
+static void
+ble_ll_sync_parse_aux_ptr(const uint8_t *buf, uint8_t *chan, uint32_t *offset,
+                          uint8_t *offset_units, uint8_t *phy)
+{
+    uint32_t aux_ptr_field = get_le32(buf) & 0x00FFFFFF;
+
+    *chan = aux_ptr_field & 0x3F;
+
+    /* TODO use CA aux_ptr_field >> 6 */
+
+    if ((aux_ptr_field >> 7) & 0x01) {
+        *offset = 300 * ((aux_ptr_field >> 8) & 0x1FFF);
+        *offset_units = 1;
+    } else {
+        *offset = 30 * ((aux_ptr_field >> 8) & 0x1FFF);
+        *offset_units = 0;
+    }
+
+    *phy = (aux_ptr_field >> 21) & 0x07;
+}
+
+static int
+ble_ll_sync_chain_start_cb(struct ble_ll_sched_item *sch)
+{
+    struct ble_ll_sync_sm *sm;
+    uint32_t wfr_usecs;
+    uint32_t start;
+    int rc;
+
+    /* Set current connection state machine */
+    sm = sch->cb_arg;
+    g_ble_ll_sync_sm_current = sm;
+    BLE_LL_ASSERT(sm);
+
+    /* Disable whitelisting */
+    ble_ll_whitelist_disable();
+
+    /* Set LL state */
+    ble_ll_state_set(BLE_LL_STATE_SYNC);
+
+    /* Set channel */
+    ble_phy_setchan(sm->chan_chain, sm->access_addr, sm->crcinit);
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    ble_phy_resolv_list_disable();
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    ble_phy_encrypt_disable();
+#endif
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    ble_phy_mode_set(sm->phy_mode, sm->phy_mode);
+#endif
+
+    start = sch->start_time + g_ble_ll_sched_offset_ticks;
+    rc = ble_phy_rx_set_start_time(start, sch->remainder);
+    if (rc && rc != BLE_PHY_ERR_RX_LATE) {
+        STATS_INC(ble_ll_stats, sync_chain_failed);
+        rc = BLE_LL_SCHED_STATE_DONE;
+        ble_ll_event_send(&sm->sync_ev_end);
+        ble_ll_sync_current_sm_over();
+    } else {
+        /*
+         * Clear flag that tells to set last anchor point if a packet
+         * has been received, this is chain and we don't need it.
+         */
+        sm->flags &= ~BLE_LL_SYNC_SM_FLAG_SET_ANCHOR;
+
+        wfr_usecs = (sm->flags & BLE_LL_SYNC_SM_FLAG_OFFSET_300) ? 300 : 30;
+
+        ble_phy_wfr_enable(BLE_PHY_WFR_ENABLE_RX, 0, wfr_usecs);
+        rc = BLE_LL_SCHED_STATE_RUNNING;
+    }
+
+    return rc;
+}
+
+static int
+ble_ll_sync_schedule_chain(struct ble_ll_sync_sm *sm, struct ble_mbuf_hdr *hdr,
+                           const uint8_t *aux)
+{
+    uint8_t offset_units;
+    uint32_t offset;
+    uint8_t chan;
+    uint8_t phy;
+
+    ble_ll_sync_parse_aux_ptr(aux, &chan, &offset, &offset_units, &phy);
+
+    if (chan >= BLE_PHY_NUM_DATA_CHANS) {
+        return -1;
+    }
+
+    if (offset < BLE_LL_MAFS) {
+        return -1;
+    }
+
+    /* chain should use same PHY as master PDU */
+    if (phy != ble_ll_sync_phy_mode_to_aux_phy(sm->phy_mode)) {
+        return -1;
+    }
+
+    if (offset_units) {
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_OFFSET_300;
+    } else {
+        sm->flags &= ~BLE_LL_SYNC_SM_FLAG_OFFSET_300;
+    }
+
+    sm->chan_chain = chan;
+
+    sm->sch.sched_cb = ble_ll_sync_chain_start_cb;
+    sm->sch.cb_arg = sm;
+    sm->sch.sched_type = BLE_LL_SCHED_TYPE_SYNC;
+
+    return ble_ll_sched_sync(&sm->sch, hdr->beg_cputime, hdr->rem_usecs,
+                             offset, sm->phy_mode);
+}
+
+static void
+ble_ll_sync_established(struct ble_ll_sync_sm *sm)
+{
+    BLE_LL_ASSERT(sm->sync_pending_cnt);
+
+    /* mark as established */
+
+    sm->flags |= BLE_LL_SYNC_SM_FLAG_ESTABLISHED;
+    sm->flags &= ~BLE_LL_SYNC_SM_FLAG_ESTABLISHING;
+
+    sm->sync_pending_cnt = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    if (sm->transfer_conn) {
+        ble_ll_sync_transfer_received(sm, BLE_ERR_SUCCESS);
+        return;
+    }
+#endif
+
+    ble_ll_sync_est_event_success(sm);
+}
+
+static void
+ble_ll_sync_check_failed(struct ble_ll_sync_sm *sm)
+{
+    BLE_LL_ASSERT(sm->sync_pending_cnt);
+
+    /* if we can retry on next event */
+    if (--sm->sync_pending_cnt) {
+        return;
+    }
+
+    sm->flags &= ~BLE_LL_SYNC_SM_FLAG_ESTABLISHING;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    if (sm->transfer_conn) {
+        ble_ll_sync_transfer_received(sm, BLE_ERR_CONN_ESTABLISHMENT);
+        return;
+    }
+#endif
+
+    ble_ll_sync_est_event_failed(BLE_ERR_CONN_ESTABLISHMENT);
+}
+
+void
+ble_ll_sync_rx_pkt_in(struct os_mbuf *rxpdu, struct ble_mbuf_hdr *hdr)
+{
+    struct ble_ll_sync_sm *sm = hdr->rxinfo.user_data;
+    bool aux_scheduled = false;
+    int8_t tx_power = 127; /* defaults to not available */
+    uint8_t *aux = NULL;
+    int datalen;
+
+    BLE_LL_ASSERT(sm);
+
+    /* this could happen if sync was cancelled or terminated while pkt_in was
+     * already in LL queue, just drop in that case
+     */
+    if (!sm->flags) {
+        ble_ll_scan_chk_resume();
+        ble_ll_rfmgmt_release();
+        return;
+    }
+
+    /* Set anchor point (and last) if 1st rxd frame in sync event.
+     * According to spec this should be done even if CRC is not valid so we
+     * can store it here
+     */
+    if (sm->flags & BLE_LL_SYNC_SM_FLAG_SET_ANCHOR) {
+        sm->flags &= ~BLE_LL_SYNC_SM_FLAG_SET_ANCHOR;
+
+        sm->anchor_point = hdr->beg_cputime;
+        sm->anchor_point_usecs = hdr->rem_usecs;
+        sm->last_anchor_point = sm->anchor_point;
+    }
+
+    /* CRC error, end event */
+    if (!BLE_MBUF_HDR_CRC_OK(hdr)) {
+        STATS_INC(ble_ll_stats, sync_crc_err);
+        goto end_event;
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    /* save last pa counter */
+    sm->event_cntr_last_received = sm->event_cntr;
+#endif
+
+    /* this means we are chaining but due to low buffers already sent data
+     * truncated report to host (or didn't sent any at all). If this happens
+     * next_buf should be already set to NULL and we just end event.
+     */
+    if (sm->flags & BLE_LL_SYNC_SM_FLAG_HCI_TRUNCATED) {
+        BLE_LL_ASSERT(!sm->next_report);
+        goto end_event;
+    }
+
+    if (ble_ll_hci_is_le_event_enabled(BLE_HCI_LE_SUBEV_PERIODIC_ADV_RPT) &&
+        !(sm->flags & BLE_LL_SYNC_SM_FLAG_DISABLED)) {
+        /* get ext header data */
+        datalen = ble_ll_sync_parse_ext_hdr(rxpdu, &aux, &tx_power);
+        if (datalen < 0) {
+            /* we got bad packet, end event */
+            goto end_event;
+        }
+
+        /* if aux is present, we need to schedule ASAP */
+        if (aux && (ble_ll_sync_schedule_chain(sm, hdr, aux) == 0)) {
+            aux_scheduled = true;
+        }
+
+        /* in case data reporting is enabled we need to send sync established here */
+        if (sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING) {
+            ble_ll_sync_established(sm);
+        }
+
+        /* Adjust rxpdu to contain advertising data only */
+        ble_ll_sync_adjust_ext_hdr(rxpdu);
+
+        /* send reports from this PDU */
+        ble_ll_sync_send_per_adv_rpt(sm, rxpdu, hdr->rxinfo.rssi, tx_power,
+                                     datalen, aux, aux_scheduled);
+    } else {
+        /* we need to establish link even if reporting was disabled */
+        if (sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING) {
+            ble_ll_sync_established(sm);
+        }
+    }
+
+    /* if chain was scheduled we don't end event yet */
+    /* TODO should we check resume only if offset is high? */
+    if (aux_scheduled) {
+        ble_ll_scan_chk_resume();
+        ble_ll_rfmgmt_release();
+        return;
+    }
+
+end_event:
+    ble_ll_event_send(&sm->sync_ev_end);
+    ble_ll_rfmgmt_release();
+}
+
+static int
+ble_ll_sync_next_event(struct ble_ll_sync_sm *sm, uint32_t cur_ww_adjust)
+{
+    uint32_t cur_ww;
+    uint32_t max_ww;
+    uint32_t ticks;
+    uint32_t itvl;
+    uint8_t usecs;
+    uint16_t skip = sm->skip;
+
+    /* don't skip if are establishing sync or we missed last event */
+    if (skip && ((sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING) ||
+                  CPUTIME_LT(sm->last_anchor_point, sm->anchor_point))) {
+        skip = 0;
+    }
+
+    /* Set next event start time, we can use pre-calculated values for one
+     * interval if not skipping
+     */
+    if (skip == 0) {
+        ticks = sm->itvl_ticks;
+        usecs = sm->itvl_usecs;
+    } else {
+        itvl = sm->itvl * BLE_LL_SYNC_ITVL_USECS * (1 + skip);
+        ticks = os_cputime_usecs_to_ticks(itvl);
+        usecs = itvl - os_cputime_ticks_to_usecs(ticks);
+    }
+
+    sm->anchor_point += ticks;
+    sm->anchor_point_usecs += usecs;
+    if (sm->anchor_point_usecs >= 31) {
+        sm->anchor_point++;
+        sm->anchor_point_usecs -= 31;
+    }
+
+    /* Set event counter to the next event */
+    sm->event_cntr += 1 + skip;
+
+    /* Calculate channel index of next event */
+    sm->chan_index = ble_ll_utils_calc_dci_csa2(sm->event_cntr, sm->channel_id,
+                                                sm->num_used_chans, sm->chanmap);
+
+    cur_ww = ble_ll_utils_calc_window_widening(sm->anchor_point,
+                                               sm->last_anchor_point,
+                                               sm->sca);
+
+    cur_ww += cur_ww_adjust;
+
+    max_ww = (sm->itvl * (BLE_LL_SYNC_ITVL_USECS / 2)) - BLE_LL_IFS;
+    if (cur_ww >= max_ww) {
+        return -1;
+    }
+
+    cur_ww += BLE_LL_JITTER_USECS;
+
+    /* if updated anchor is pass last anchor + timeout it means we will not be
+     * able to get it in time and hit sync timeout
+     *
+     * note that this may result in sync timeout being sent before real
+     * timeout but we won't be able to fit in time anyway..
+     *
+     * We don't do that when establishing since we try up to
+     * BLE_LL_SYNC_ESTABLISH_CNT events before failing regardless of timeout
+     */
+    if (!(sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING)) {
+        if (CPUTIME_GT(sm->anchor_point - os_cputime_usecs_to_ticks(cur_ww),
+                       sm->last_anchor_point + sm->timeout )) {
+            return -1;
+        }
+    }
+
+    sm->window_widening = cur_ww;
+
+    return 0;
+}
+
+static void
+ble_ll_sync_event_end(struct ble_npl_event *ev)
+{
+    struct ble_ll_sync_sm *sm;
+
+    /* Better be a connection state machine! */
+    sm = ble_npl_event_get_arg(ev);
+    BLE_LL_ASSERT(sm);
+
+    ble_ll_rfmgmt_release();
+
+    if (sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING) {
+        ble_ll_sync_check_failed(sm);
+    }
+
+    /* Check if we need to resume scanning */
+    ble_ll_scan_chk_resume();
+
+    /* Remove any end events that might be enqueued */
+    ble_npl_eventq_remove(&g_ble_ll_data.ll_evq, &sm->sync_ev_end);
+
+    /* don't schedule next event if sync is not established nor establishing
+     * at this point SM is no longer valid
+     */
+    if (!(sm->flags & (BLE_LL_SYNC_SM_FLAG_ESTABLISHED |
+                       BLE_LL_SYNC_SM_FLAG_ESTABLISHING))) {
+        ble_ll_sync_sm_clear(sm);
+        return;
+    }
+
+    /* if we had prepared buffer for next even it means we were chaining and
+     * must send truncated report to host
+     */
+    if (sm->next_report) {
+        BLE_LL_ASSERT(!(sm->flags & BLE_LL_SYNC_SM_FLAG_HCI_TRUNCATED));
+        ble_ll_sync_send_truncated_per_adv_rpt(sm, sm->next_report);
+        sm->next_report = NULL;
+    }
+
+    /* Event ended so we are no longer chaining */
+    sm->flags &= ~BLE_LL_SYNC_SM_FLAG_HCI_TRUNCATED;
+
+    sm->sch.sched_cb = ble_ll_sync_event_start_cb;
+    sm->sch.cb_arg = sm;
+    sm->sch.sched_type = BLE_LL_SCHED_TYPE_SYNC;
+
+    do {
+        if (ble_ll_sync_next_event(sm, 0) < 0) {
+            if (sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING) {
+                /* don't allow any retry if this failed */
+                sm->sync_pending_cnt = 1;
+                ble_ll_sync_check_failed(sm);
+            } else {
+                ble_ll_sync_lost_event(sm);
+            }
+
+            /* at this point SM is no longer valid */
+            ble_ll_sync_sm_clear(sm);
+            return;
+        }
+    } while (ble_ll_sched_sync_reschedule(&sm->sch, sm->anchor_point,
+                                          sm->anchor_point_usecs,
+                                          sm->window_widening, sm->phy_mode));
+}
+
+void
+ble_ll_sync_info_event(const uint8_t *addr, uint8_t addr_type, int rpa_index,
+                       uint8_t sid, struct ble_mbuf_hdr *rxhdr,
+                       const uint8_t *syncinfo)
+{
+    struct ble_ll_sync_sm *sm = NULL;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+    const uint8_t *rpa = NULL;
+#endif
+    uint16_t max_skip;
+    uint32_t offset;
+    uint32_t usecs;
+    uint16_t itvl;
+    int i;
+
+    /* ignore if not synchronizing */
+    if (!g_ble_ll_sync_create_comp_ev) {
+        return;
+    }
+
+    /* get reserved SM */
+    for (i = 0; i < BLE_LL_SYNC_CNT; i++) {
+        if (g_ble_ll_sync_sm[i].flags & BLE_LL_SYNC_SM_FLAG_RESERVED) {
+            sm = &g_ble_ll_sync_sm[i];
+            break;
+        }
+    }
+
+    /* this means we already got sync info event and pending sync */
+    if (!sm) {
+        return;
+    }
+
+    /* check if resolved */
+    if (rpa_index >= 0) {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+        rpa = addr;
+#endif
+        addr = g_ble_ll_resolv_list[rpa_index].rl_identity_addr;
+        addr_type = g_ble_ll_resolv_list[rpa_index].rl_addr_type;
+    }
+
+    /* check peer */
+    if (g_ble_ll_sync_create_params.options & BLE_HCI_LE_PERIODIC_ADV_CREATE_SYNC_OPT_FILTER) {
+        if (ble_ll_sync_on_list(addr, addr_type, sid) < 0) {
+            return;
+        }
+
+        /* set addr and sid in sm */
+        sm->adv_sid = sid;
+        sm->adv_addr_type = addr_type;
+        memcpy(sm->adv_addr, addr, BLE_DEV_ADDR_LEN);
+    } else {
+        if ((sm->adv_sid != sid) || (sm->adv_addr_type != addr_type) ||
+                memcmp(sm->adv_addr, addr, BLE_DEV_ADDR_LEN)) {
+            return;
+        }
+    }
+
+    /* Sync Packet Offset (13 bits), Offset Units (1 bit), RFU (2 bits) */
+    offset = syncinfo[0];
+    offset |= (uint16_t)(syncinfo[1] & 0x1f) << 8;
+
+    /* ignore if offset is not valid */
+    if (!offset) {
+        return;
+    }
+
+    /* Interval (2 bytes), ignore if invalid */
+    itvl = get_le16(&syncinfo[2]);
+    if (itvl < 6) {
+        return;
+    }
+
+    if (rpa_index >= 0) {
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_ADDR_RESOLVED;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+        memcpy(sm->adv_addr_rpa, rpa, BLE_DEV_ADDR_LEN);
+#endif
+    }
+
+    /* set params from HCI LE Create Periodic Sync */
+    sm->timeout = g_ble_ll_sync_create_params.timeout;
+    sm->skip = g_ble_ll_sync_create_params.max_skip;
+    sm->sync_pending_cnt = BLE_LL_SYNC_ESTABLISH_CNT;
+
+    if (syncinfo[1] & 0x20) {
+        offset *= 300;
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_OFFSET_300;
+    } else {
+        offset *= 30;
+        sm->flags &= ~BLE_LL_SYNC_SM_FLAG_OFFSET_300;
+    }
+
+    /* sync end event */
+    ble_npl_event_init(&sm->sync_ev_end, ble_ll_sync_event_end, sm);
+
+    sm->itvl = itvl;
+
+    /* precalculate interval ticks and usecs */
+    usecs = sm->itvl * BLE_LL_SYNC_ITVL_USECS;
+    sm->itvl_ticks = os_cputime_usecs_to_ticks(usecs);
+    sm->itvl_usecs = (uint8_t)(usecs -
+                               os_cputime_ticks_to_usecs(sm->itvl_ticks));
+    if (sm->itvl_usecs == 31) {
+        sm->itvl_usecs = 0;
+        sm->itvl_ticks++;
+    }
+
+    /* Channels Mask (37 bits) */
+    sm->chanmap[0] = syncinfo[4];
+    sm->chanmap[1] = syncinfo[5];
+    sm->chanmap[2] = syncinfo[6];
+    sm->chanmap[3] = syncinfo[7];
+    sm->chanmap[4] = syncinfo[8] & 0x1f;
+    sm->num_used_chans = ble_ll_utils_calc_num_used_chans(sm->chanmap);
+
+    /* SCA (3 bits) */
+    sm->sca = syncinfo[8] >> 5;
+
+    /* AA (4 bytes) */
+    sm->access_addr = get_le32(&syncinfo[9]);
+    sm->channel_id = ((sm->access_addr & 0xffff0000) >> 16) ^
+                      (sm->access_addr & 0x0000ffff);
+
+    /* CRCInit (3 bytes) */
+    sm->crcinit = syncinfo[15];
+    sm->crcinit = (sm->crcinit << 8) | syncinfo[14];
+    sm->crcinit = (sm->crcinit << 8) | syncinfo[13];
+
+    /* Event Counter (2 bytes) */
+    sm->event_cntr = get_le16(&syncinfo[16]);
+
+    /* adjust skip if pass timeout */
+    max_skip = get_max_skip(sm->itvl * BLE_LL_SYNC_ITVL_USECS, sm->timeout);
+    if (sm->skip > max_skip) {
+        sm->skip = max_skip;
+    }
+
+    /* from now on we only need timeout in ticks */
+    sm->timeout = os_cputime_usecs_to_ticks(sm->timeout);
+
+    sm->phy_mode = rxhdr->rxinfo.phy_mode;
+    sm->window_widening = BLE_LL_JITTER_USECS;
+
+    /* Calculate channel index of first event */
+    sm->chan_index = ble_ll_utils_calc_dci_csa2(sm->event_cntr, sm->channel_id,
+                                                sm->num_used_chans, sm->chanmap);
+
+    sm->sch.sched_cb = ble_ll_sync_event_start_cb;
+    sm->sch.cb_arg = sm;
+    sm->sch.sched_type = BLE_LL_SCHED_TYPE_SYNC;
+
+    if (ble_ll_sched_sync(&sm->sch, rxhdr->beg_cputime, rxhdr->rem_usecs,
+                          offset, sm->phy_mode)) {
+        return;
+    }
+
+    sm->anchor_point = sm->sch.start_time + g_ble_ll_sched_offset_ticks;
+    sm->anchor_point_usecs = sm->sch.remainder;
+    sm->last_anchor_point = sm->anchor_point;
+
+#if MYNEWT_VAL(BLE_VERSION) >= 51
+    if (g_ble_ll_sync_create_params.options & BLE_HCI_LE_PERIODIC_ADV_CREATE_SYNC_OPT_DISABLED) {
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_DISABLED;
+    }
+#endif
+
+    sm->flags &= ~BLE_LL_SYNC_SM_FLAG_RESERVED;
+    sm->flags |= BLE_LL_SYNC_SM_FLAG_ESTABLISHING;
+    sm->flags |= BLE_LL_SYNC_SM_FLAG_SYNC_INFO;
+}
+
+static struct ble_ll_sync_sm *
+ble_ll_sync_reserve(void)
+{
+    struct ble_ll_sync_sm *sm;
+    int i;
+
+    for (i = 0; i < BLE_LL_SYNC_CNT; i++) {
+        sm = &g_ble_ll_sync_sm[i];
+
+        if (!sm->flags) {
+            sm->flags |= BLE_LL_SYNC_SM_FLAG_RESERVED;
+            return sm;
+        }
+    }
+
+    return NULL;
+}
+
+int
+ble_ll_sync_create(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_periodic_adv_create_sync_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_sync_sm *sm;
+    uint16_t timeout;
+    os_sr_t sr;
+
+    if (g_ble_ll_sync_create_comp_ev) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+#if MYNEWT_VAL(BLE_VERSION) >= 51
+    if (cmd->options > BLE_HCI_LE_PERIODIC_ADV_CREATE_SYNC_OPT_DISABLED) {
+#else
+    if (cmd->options > BLE_HCI_LE_PERIODIC_ADV_CREATE_SYNC_OPT_FILTER) {
+#endif
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->skip > 0x01f3) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    timeout = le16toh(cmd->sync_timeout);
+    if (timeout < 0x000a || timeout > 0x4000) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+#if MYNEWT_VAL(BLE_VERSION) >= 51
+    /* we don't support any CTE yet */
+    if (cmd->sync_cte_type) {
+        if (cmd->sync_cte_type > 4) {
+           return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        return BLE_ERR_UNSUPPORTED;
+    }
+#endif
+
+    if (cmd->options & BLE_HCI_LE_PERIODIC_ADV_CREATE_SYNC_OPT_FILTER) {
+        if (ble_ll_sync_list_empty()) {
+            return BLE_ERR_CMD_DISALLOWED;
+        }
+    } else {
+        if (cmd->sid > 0x0f) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        if (cmd->peer_addr_type > BLE_HCI_ADV_PEER_ADDR_MAX) {
+            return BLE_ERR_INV_HCI_CMD_PARMS;
+        }
+
+        OS_ENTER_CRITICAL(sr);
+        sm = ble_ll_sync_find(cmd->peer_addr, cmd->peer_addr_type, cmd->sid);
+        OS_EXIT_CRITICAL(sr);
+
+        if (sm) {
+            return BLE_ERR_ACL_CONN_EXISTS;
+        }
+    }
+
+    /* reserve buffer for sync complete event */
+    g_ble_ll_sync_create_comp_ev = ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+    if (!g_ble_ll_sync_create_comp_ev) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    OS_ENTER_CRITICAL(sr);
+
+    /* reserve 1 SM for created sync */
+    sm = ble_ll_sync_reserve();
+    if (!sm) {
+        ble_hci_trans_buf_free(g_ble_ll_sync_create_comp_ev);
+        g_ble_ll_sync_create_comp_ev = NULL;
+        OS_EXIT_CRITICAL(sr);
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    /* if we don't use list, store expected address in reserved SM */
+    if (!(cmd->options & BLE_HCI_LE_PERIODIC_ADV_CREATE_SYNC_OPT_FILTER)) {
+        sm->adv_sid = cmd->sid;
+        sm->adv_addr_type = cmd->peer_addr_type;
+        memcpy(&sm->adv_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+    }
+
+    g_ble_ll_sync_create_params.timeout = timeout * 10000; /* 10ms units, store in us */;
+    g_ble_ll_sync_create_params.max_skip = cmd->skip;
+    g_ble_ll_sync_create_params.options = cmd->options;
+
+    OS_EXIT_CRITICAL(sr);
+    return BLE_ERR_SUCCESS;
+}
+
+static void
+ble_ll_sync_cancel_complete_event(void)
+{
+    ble_ll_sync_est_event_failed(BLE_ERR_OPERATION_CANCELLED);
+}
+
+int
+ble_ll_sync_cancel(ble_ll_hci_post_cmd_complete_cb *post_cmd_cb)
+{
+    struct ble_ll_sync_sm *sm;
+    os_sr_t sr;
+    int i;
+
+    if (!g_ble_ll_sync_create_comp_ev) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    OS_ENTER_CRITICAL(sr);
+
+    for (i = 0; i < BLE_LL_SYNC_CNT; i++) {
+        sm = &g_ble_ll_sync_sm[i];
+
+        /* cancelled before fist sync info packet */
+        if (sm->flags & BLE_LL_SYNC_SM_FLAG_RESERVED) {
+            memset(sm, 0, sizeof(*sm));
+            break;
+        }
+
+        /* cancelled while pending sync */
+        if (sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHING) {
+            ble_ll_sync_sm_clear(sm);
+            break;
+        }
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    /* g_ble_ll_sync_create_comp_ev will be cleared by this callback */
+    *post_cmd_cb = ble_ll_sync_cancel_complete_event;
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_sync_terminate(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_periodic_adv_term_sync_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_sync_sm *sm;
+    uint16_t handle;
+    os_sr_t sr;
+
+    if (g_ble_ll_sync_create_comp_ev) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->sync_handle);
+    if (handle > 0xeff) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (handle >= BLE_LL_SYNC_CNT) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    sm = &g_ble_ll_sync_sm[handle];
+
+    OS_ENTER_CRITICAL(sr);
+
+    if (!(sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHED)) {
+        OS_EXIT_CRITICAL(sr);
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    ble_ll_sync_sm_clear(sm);
+
+    OS_EXIT_CRITICAL(sr);
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_sync_list_add(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_add_dev_to_periodic_adv_list_cp *cmd = (const void *)cmdbuf;
+    int i;
+
+    if (g_ble_ll_sync_create_comp_ev) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->peer_addr_type > BLE_HCI_ADV_PEER_ADDR_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+    if (cmd->sid > 0x0f) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    i = ble_ll_sync_on_list(cmd->peer_addr, cmd->peer_addr_type, cmd->sid);
+    if (i >= 0) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    i = ble_ll_sync_list_get_free();
+    if (i < 0) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    g_ble_ll_sync_adv_list[i].adv_sid = cmd->sid;
+    g_ble_ll_sync_adv_list[i].adv_addr_type = cmd->peer_addr_type;
+    memcpy(&g_ble_ll_sync_adv_list[i].adv_addr, cmd->peer_addr, BLE_DEV_ADDR_LEN);
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_sync_list_remove(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_rem_dev_from_periodic_adv_list_cp *cmd = (const void *)cmdbuf;
+    int i;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (g_ble_ll_sync_create_comp_ev) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    if (cmd->peer_addr_type > BLE_HCI_ADV_PEER_ADDR_MAX) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->sid > 0x0f) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    i = ble_ll_sync_on_list(cmd->peer_addr, cmd->peer_addr_type, cmd->sid);
+    if (i < 0) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    memset(&g_ble_ll_sync_adv_list[i], 0, sizeof(g_ble_ll_sync_adv_list[i]));
+    g_ble_ll_sync_adv_list[i].adv_sid = 0xff;
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_sync_list_clear(void)
+{
+    int i;
+
+    if (g_ble_ll_sync_create_comp_ev) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_sync_adv_list); i++) {
+        memset(&g_ble_ll_sync_adv_list[i], 0, sizeof(g_ble_ll_sync_adv_list[i]));
+        g_ble_ll_sync_adv_list[i].adv_sid = 0xff;
+    }
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_sync_list_size(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_periodic_adv_list_size_rp *rsp = (void *) rspbuf;
+
+    rsp->list_size = ARRAY_SIZE(g_ble_ll_sync_adv_list);
+
+    *rsplen = sizeof(*rsp);
+    return BLE_ERR_SUCCESS;
+}
+
+#if MYNEWT_VAL(BLE_VERSION) >= 51
+int
+ble_ll_sync_receive_enable(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_periodic_adv_receive_enable_cp *cmd = (const void *)cmdbuf;
+    struct ble_ll_sync_sm *sm;
+    uint16_t handle;
+    os_sr_t sr;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (cmd->enable > 0x01) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    handle = le16toh(cmd->sync_handle);
+    if (handle > 0xeff) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    if (handle >= BLE_LL_SYNC_CNT) {
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    sm = &g_ble_ll_sync_sm[handle];
+
+    OS_ENTER_CRITICAL(sr);
+
+    if (!(sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHED)) {
+        OS_EXIT_CRITICAL(sr);
+        return BLE_ERR_UNK_ADV_INDENT;
+    }
+
+    if (cmd->enable) {
+        sm->flags &= ~BLE_LL_SYNC_SM_FLAG_DISABLED;
+    } else {
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_DISABLED;
+    }
+
+    OS_EXIT_CRITICAL(sr);
+    return BLE_ERR_SUCCESS;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER)
+static struct ble_ll_sync_sm *
+ble_ll_sync_transfer_get(const uint8_t *addr, uint8_t addr_type, uint8_t sid)
+{
+    struct ble_ll_sync_sm *sm;
+    int i;
+
+    for (i = 0; i < BLE_LL_SYNC_CNT; i++) {
+        sm = &g_ble_ll_sync_sm[i];
+
+        if (!sm->flags) {
+            /* allocate event for transfer received event */
+            sm->transfer_received_ev = ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_HI);
+            if (!sm->transfer_received_ev) {
+                break;
+            }
+
+            sm->adv_sid = sid;
+            sm->adv_addr_type = addr_type;
+            memcpy(&sm->adv_addr, addr, BLE_DEV_ADDR_LEN);
+
+            sm->flags |= BLE_LL_SYNC_SM_FLAG_ESTABLISHING;
+            return sm;
+        }
+    }
+
+    return NULL;
+}
+
+void
+ble_ll_sync_periodic_ind(struct ble_ll_conn_sm *connsm,
+                         const uint8_t *sync_ind, bool reports_disabled,
+                         uint16_t max_skip, uint32_t sync_timeout)
+{
+    const uint8_t *syncinfo = sync_ind + 2;
+    uint16_t sync_conn_event_count;
+    uint16_t last_pa_event_count;
+    struct ble_ll_sync_sm *sm;
+    uint16_t conn_event_count;
+    uint8_t sync_anchor_usecs;
+    const uint8_t *rpa = NULL;
+    int last_pa_diff;
+    uint32_t sync_anchor;
+    const uint8_t *addr;
+    uint16_t event_cntr;
+    uint32_t itvl_usecs;
+    uint32_t ww_adjust;
+    uint8_t addr_type;
+    uint8_t phy_mode;
+    uint32_t offset;
+    uint32_t future;
+    uint16_t itvl;
+    int rpa_index;
+    uint8_t sid;
+    uint8_t sca;
+    os_sr_t sr;
+
+    phy_mode = ble_ll_ctrl_phy_from_phy_mask(sync_ind[25]);
+    itvl = get_le16(syncinfo + 2);
+    /* ignore if sync params are not valid */
+    if ((phy_mode == 0) || (itvl < 6)) {
+        return;
+    }
+
+    last_pa_event_count = get_le16(sync_ind + 22);
+    event_cntr = get_le16(syncinfo + 16);
+    itvl_usecs = itvl * BLE_LL_SYNC_ITVL_USECS;
+
+    last_pa_diff = abs((int16_t)(event_cntr - last_pa_event_count));
+    /* check if not 5 seconds apart, if so ignore sync transfer */
+    if ((last_pa_diff * itvl_usecs) > 5000000) {
+        return;
+    }
+
+    sid = (sync_ind[24] & 0x0f);
+    addr_type = (sync_ind[24] & 0x10) ? BLE_ADDR_RANDOM : BLE_ADDR_PUBLIC;
+    addr = sync_ind + 26;
+
+    rpa_index = -1;
+
+    /* check if need to resolve */
+    if (ble_ll_is_rpa(addr, addr_type)) {
+        rpa_index = ble_ll_resolv_peer_rpa_any(addr);
+        if (rpa_index >= 0) {
+            rpa = addr;
+            addr = g_ble_ll_resolv_list[rpa_index].rl_identity_addr;
+            addr_type = g_ble_ll_resolv_list[rpa_index].rl_addr_type;
+        }
+    }
+
+    OS_ENTER_CRITICAL(sr);
+    /* check if already synchronized with this peer */
+    sm = ble_ll_sync_find(addr, addr_type, sid);
+    if (sm) {
+        OS_EXIT_CRITICAL(sr);
+        return;
+    }
+
+    /* ignore if no memory for new sync */
+    sm = ble_ll_sync_transfer_get(addr, addr_type, sid);
+    if (!sm) {
+        OS_EXIT_CRITICAL(sr);
+        return;
+    }
+
+    OS_EXIT_CRITICAL(sr);
+
+    if (rpa_index >= 0) {
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_ADDR_RESOLVED;
+        memcpy(sm->adv_addr_rpa, rpa, BLE_DEV_ADDR_LEN);
+    }
+
+    /* set params from transfer */
+    sm->timeout = os_cputime_usecs_to_ticks(sync_timeout);
+    sm->skip = max_skip;
+    sm->sync_pending_cnt = BLE_LL_SYNC_ESTABLISH_CNT;
+    sm->transfer_id = get_le16(sync_ind); /* first two bytes */
+    sm->transfer_conn = connsm;
+
+    /* Sync Packet Offset (13 bits), Offset Units (1 bit), Offset Adjust (1 bit),
+     * RFU (1 bit)
+     */
+    offset = syncinfo[0];
+    offset |= (uint16_t)(syncinfo[1] & 0x1f) << 8;
+
+    if (syncinfo[1] & 0x20) {
+        if (syncinfo[1] & 0x40) {
+            offset += 0x2000;
+        }
+
+        offset *= 300;
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_OFFSET_300;
+    } else {
+        offset *= 30;
+        sm->flags &= ~BLE_LL_SYNC_SM_FLAG_OFFSET_300;
+    }
+
+    /* sync end event */
+    ble_npl_event_init(&sm->sync_ev_end, ble_ll_sync_event_end, sm);
+
+    sm->itvl = itvl;
+
+    /* precalculate interval ticks and usecs */
+    sm->itvl_ticks = os_cputime_usecs_to_ticks(itvl_usecs);
+    sm->itvl_usecs = (uint8_t)(itvl_usecs -
+                               os_cputime_ticks_to_usecs(sm->itvl_ticks));
+    if (sm->itvl_usecs == 31) {
+        sm->itvl_usecs = 0;
+        sm->itvl_ticks++;
+    }
+
+    /* Channels Mask (37 bits) */
+    sm->chanmap[0] = syncinfo[4];
+    sm->chanmap[1] = syncinfo[5];
+    sm->chanmap[2] = syncinfo[6];
+    sm->chanmap[3] = syncinfo[7];
+    sm->chanmap[4] = syncinfo[8] & 0x1f;
+    sm->num_used_chans = ble_ll_utils_calc_num_used_chans(sm->chanmap);
+
+    /* SCA (3 bits) */
+    sm->sca = syncinfo[8] >> 5;
+
+    /* AA (4 bytes) */
+    sm->access_addr = get_le32(syncinfo + 9);
+    sm->channel_id = ((sm->access_addr & 0xffff0000) >> 16) ^
+                      (sm->access_addr & 0x0000ffff);
+
+    /* CRCInit (3 bytes) */
+    sm->crcinit = syncinfo[13];
+    sm->crcinit |= syncinfo[14] << 8;
+    sm->crcinit |= syncinfo[15] << 16;
+
+    /* Event Counter (2 bytes) */
+    sm->event_cntr = event_cntr;
+
+    /* adjust skip if pass timeout */
+    max_skip = get_max_skip(sm->itvl * BLE_LL_SYNC_ITVL_USECS, sync_timeout);
+    if (sm->skip > max_skip) {
+        sm->skip = max_skip;
+    }
+
+    sm->phy_mode = phy_mode;
+
+    /* Calculate channel index of first event */
+    sm->chan_index = ble_ll_utils_calc_dci_csa2(sm->event_cntr, sm->channel_id,
+                                                sm->num_used_chans, sm->chanmap);
+
+    sm->sch.sched_cb = ble_ll_sync_event_start_cb;
+    sm->sch.cb_arg = sm;
+    sm->sch.sched_type = BLE_LL_SCHED_TYPE_SYNC;
+
+    /* get anchor for specified conn event */
+    conn_event_count = get_le16(sync_ind + 20);
+    ble_ll_conn_get_anchor(connsm, conn_event_count, &sm->anchor_point,
+                           &sm->anchor_point_usecs);
+
+    /* Set last anchor point */
+    sm->last_anchor_point = sm->anchor_point - (last_pa_diff * sm->itvl_ticks);
+
+    /* calculate extra window widening */
+    sync_conn_event_count = get_le16(sync_ind + 32);
+    sca = sync_ind[24] >> 5;
+    ble_ll_conn_get_anchor(connsm, sync_conn_event_count, &sync_anchor,
+                           &sync_anchor_usecs);
+    ww_adjust = ble_ll_utils_calc_window_widening(connsm->anchor_point,
+                                                  sync_anchor, sca);
+
+    /* spin until we get anchor in future */
+    future = os_cputime_get32() + g_ble_ll_sched_offset_ticks;
+    while (CPUTIME_LT(sm->anchor_point, future)) {
+        if (ble_ll_sync_next_event(sm, ww_adjust) < 0) {
+            /* release SM if this failed */
+            ble_ll_sync_transfer_received(sm, BLE_ERR_CONN_ESTABLISHMENT);
+            memset(sm, 0, sizeof(*sm));
+            return;
+        }
+    }
+
+    if (ble_ll_sched_sync(&sm->sch, sm->anchor_point, sm->anchor_point_usecs,
+                          offset, sm->phy_mode)) {
+        /* release SM if this failed */
+        ble_ll_sync_transfer_received(sm, BLE_ERR_CONN_ESTABLISHMENT);
+        memset(sm, 0, sizeof(*sm));
+        return;
+    }
+
+    /* Set new anchor point */
+    sm->anchor_point = sm->sch.start_time + g_ble_ll_sched_offset_ticks;
+    sm->anchor_point_usecs = sm->sch.remainder;
+
+    if (reports_disabled) {
+        sm->flags |= BLE_LL_SYNC_SM_FLAG_DISABLED;
+    }
+}
+
+static void
+ble_ll_sync_put_syncinfo(struct ble_ll_sync_sm *syncsm,
+                         struct ble_ll_conn_sm *connsm, uint8_t *conn_event_cnt,
+                         uint8_t *dptr)
+{
+    uint8_t anchor_usecs;
+    uint16_t conn_cnt;
+    uint32_t offset;
+    uint32_t anchor;
+    uint8_t units;
+
+    anchor = connsm->anchor_point;
+    anchor_usecs = connsm->anchor_point_usecs;
+    conn_cnt = connsm->event_cntr;
+
+    /* get anchor for conn event that is before periodic_adv_event_start_time */
+    while (CPUTIME_GT(anchor, syncsm->anchor_point)) {
+        ble_ll_conn_get_anchor(connsm, --conn_cnt, &anchor, &anchor_usecs);
+    }
+
+    offset = os_cputime_ticks_to_usecs(syncsm->anchor_point - anchor);
+    offset -= anchor_usecs;
+    offset += syncsm->anchor_point_usecs;
+
+    /* connEventCount */
+    put_le16(conn_event_cnt, conn_cnt);
+
+    /* Sync Packet Offset (13 bits), Offset Units (1 bit), Offset Adjust (1 bit),
+     * RFU (1 bit)
+     */
+    if (offset > 245700) {
+        units = 0x20;
+
+        if (offset >= 0x2000) {
+            offset -= 0x2000;
+            units |= 0x40;
+        }
+
+        offset = offset / 300;
+    } else {
+        units = 0x00;
+        offset = offset / 30;
+    }
+
+    dptr[0] = (offset & 0x000000ff);
+    dptr[1] = ((offset >> 8) & 0x0000001f) | units;
+
+    /* Interval (2 bytes) */
+    put_le16(&dptr[2], syncsm->itvl);
+
+    /* Channels Mask (37 bits) */
+    dptr[4] = syncsm->chanmap[0];
+    dptr[5] = syncsm->chanmap[1];
+    dptr[6] = syncsm->chanmap[2];
+    dptr[7] = syncsm->chanmap[3];
+    dptr[8] = syncsm->chanmap[4] & 0x1f;
+
+    /* SCA (3 bits) */
+    dptr[8] |= syncsm->sca << 5;
+
+    /* AA (4 bytes) */
+    put_le32(&dptr[9], syncsm->access_addr);
+
+    /* CRCInit (3 bytes) */
+    dptr[13] = (uint8_t)syncsm->crcinit;
+    dptr[14] = (uint8_t)(syncsm->crcinit >> 8);
+    dptr[15] = (uint8_t)(syncsm->crcinit >> 16);
+
+    /* Event Counter (2 bytes) */
+    put_le16(&dptr[16], syncsm->event_cntr);
+}
+
+static int
+ble_ll_sync_send_sync_ind(struct ble_ll_sync_sm *syncsm,
+                          struct ble_ll_conn_sm *connsm, uint16_t service_data)
+{
+    struct os_mbuf *om;
+    uint8_t *sync_ind;
+
+    om = os_msys_get_pkthdr(BLE_LL_CTRL_MAX_PDU_LEN,
+                            sizeof(struct ble_mbuf_hdr));
+    if (!om) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    om->om_data[0] = BLE_LL_CTRL_PERIODIC_SYNC_IND;
+
+    sync_ind = om->om_data + 1;
+
+    /* ID (service_data), already in LE order */
+    memcpy(sync_ind, &service_data, sizeof(service_data));
+
+    /* fill in syncinfo */
+    ble_ll_sync_put_syncinfo(syncsm, connsm, sync_ind + 20, sync_ind + 2);
+
+    /* lastPaEventCounter */
+    put_le16(sync_ind + 22, syncsm->event_cntr_last_received);
+
+    /* SID, AType, SCA */
+    sync_ind[24] = syncsm->adv_sid;
+
+    if (syncsm->flags & BLE_LL_SYNC_SM_FLAG_ADDR_RESOLVED) {
+        sync_ind[24] |= 1 << 4;
+    } else {
+        sync_ind[24] |= (syncsm->adv_addr_type == BLE_ADDR_RANDOM) << 4 ;
+    }
+
+    sync_ind[24] |= MYNEWT_VAL(BLE_LL_MASTER_SCA) << 5;
+
+    /* PHY */
+    sync_ind[25] = (0x01 << (ble_ll_sync_phy_mode_to_hci(syncsm->phy_mode) - 1));
+
+    /* AdvA */
+    if (syncsm->flags & BLE_LL_SYNC_SM_FLAG_ADDR_RESOLVED) {
+        memcpy(sync_ind + 26, syncsm->adv_addr_rpa, BLE_DEV_ADDR_LEN);
+    } else {
+        memcpy(sync_ind + 26, syncsm->adv_addr, BLE_DEV_ADDR_LEN);
+    }
+
+    /* syncConnEventCount */
+    put_le16(sync_ind + 32, connsm->event_cntr);
+
+    ble_ll_conn_enqueue_pkt(connsm, om, BLE_LL_LLID_CTRL,
+                            BLE_LL_CTRL_PERIODIC_SYNC_IND_LEN + 1);
+
+    return BLE_ERR_SUCCESS;
+}
+
+int
+ble_ll_sync_transfer(const uint8_t *cmdbuf, uint8_t len,
+                     uint8_t *rspbuf, uint8_t *rsplen)
+{
+    const struct ble_hci_le_periodic_adv_sync_transfer_cp *cmd = (const void *)cmdbuf;
+    struct ble_hci_le_periodic_adv_sync_transfer_rp *rsp = (void *) rspbuf;
+    struct ble_ll_conn_sm *connsm;
+    struct ble_ll_sync_sm *sm;
+    uint16_t handle;
+    os_sr_t sr;
+    int rc;
+
+    if (len != sizeof(*cmd)) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    handle = le16toh(cmd->sync_handle);
+    if (handle > 0xeff) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        goto done;
+    }
+
+    if (handle >= BLE_LL_SYNC_CNT) {
+        rc = BLE_ERR_UNK_ADV_INDENT;
+        goto done;
+    }
+
+    sm = &g_ble_ll_sync_sm[handle];
+
+    OS_ENTER_CRITICAL(sr);
+
+    if (!(sm->flags & BLE_LL_SYNC_SM_FLAG_ESTABLISHED)) {
+        rc = BLE_ERR_UNK_ADV_INDENT;
+        OS_EXIT_CRITICAL(sr);
+        goto done;
+    }
+
+    handle = le16toh(cmd->conn_handle);
+    if (handle > 0xeff) {
+        rc = BLE_ERR_INV_HCI_CMD_PARMS;
+        OS_EXIT_CRITICAL(sr);
+        goto done;
+    }
+
+    connsm = ble_ll_conn_find_active_conn(handle);
+    if (!connsm) {
+        rc = BLE_ERR_UNK_CONN_ID;
+        OS_EXIT_CRITICAL(sr);
+        goto done;
+    }
+
+    /* TODO should not need to shift
+     * byte 3 (0 byte is conn_feature) , bit 1
+     *
+     * Allow initiate LL procedure only if remote supports it.
+     */
+    if (!(connsm->remote_features[2] & (BLE_LL_FEAT_SYNC_TRANS_RECV >> (8 * 3)))) {
+        rc = BLE_ERR_UNSUPP_REM_FEATURE;
+        goto done;
+    }
+
+    rc = ble_ll_sync_send_sync_ind(sm, connsm, cmd->service_data);
+
+    OS_EXIT_CRITICAL(sr);
+done:
+    rsp->conn_handle = cmd->conn_handle;
+    *rsplen = sizeof(*rsp);
+    return rc;
+}
+#endif
+
+/*
+ * Called when a sync scan event has been removed from the scheduler
+ * without being run.
+ */
+void
+ble_ll_sync_rmvd_from_sched(struct ble_ll_sync_sm *sm)
+{
+    ble_ll_event_send(&sm->sync_ev_end);
+}
+
+bool
+ble_ll_sync_enabled(void)
+{
+    return g_ble_ll_sync_create_comp_ev != NULL;
+}
+
+/**
+ * Called to reset the sync module. When this function is called the
+ * scheduler has been stopped and the phy has been disabled. The LL should
+ * be in the standby state.
+ */
+void
+ble_ll_sync_reset(void)
+{
+    int i;
+
+    for (i = 0; i < BLE_LL_SYNC_CNT; i++) {
+        ble_ll_sync_sm_clear(&g_ble_ll_sync_sm[i]);
+    }
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_sync_adv_list); i++) {
+        memset(&g_ble_ll_sync_adv_list[i], 0, sizeof(g_ble_ll_sync_adv_list[i]));
+        g_ble_ll_sync_adv_list[i].adv_sid = 0xff;
+    }
+
+    g_ble_ll_sync_create_params.timeout = 0;
+    g_ble_ll_sync_create_params.max_skip = 0;
+    g_ble_ll_sync_create_params.options = 0;
+
+    g_ble_ll_sync_sm_current = NULL;
+
+    if (g_ble_ll_sync_create_comp_ev) {
+        ble_hci_trans_buf_free(g_ble_ll_sync_create_comp_ev);
+        g_ble_ll_sync_create_comp_ev = NULL;
+    }
+}
+
+void
+ble_ll_sync_init(void)
+{
+    int i;
+
+    for (i = 0; i < ARRAY_SIZE(g_ble_ll_sync_adv_list); i++) {
+        g_ble_ll_sync_adv_list[i].adv_sid = 0xff;
+    }
+}
+#endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_trace.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_trace.c
new file mode 100644
index 000000000..c5d2b1d41
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_trace.c
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+#include <stdint.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os_trace_api.h"
+
+#if MYNEWT_VAL(BLE_LL_SYSVIEW)
+
+static os_trace_module_t g_ble_ll_trace_mod;
+uint32_t ble_ll_trace_off;
+
+static void
+ble_ll_trace_module_send_desc(void)
+{
+    os_trace_module_desc(&g_ble_ll_trace_mod, "0 ll_sched lls=%u cputime=%u start_time=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "1 ll_rx_start lls=%u pdu_type=%x");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "2 ll_rx_end pdu_type=%x len=%u flags=%x");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "3 ll_wfr_timer_exp lls=%u xcvr=%u rx_start=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "4 ll_ctrl_rx opcode=%u len=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "5 ll_conn_ev_start conn_handle=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "6 ll_conn_ev_end conn_handle=%u event_cntr=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "7 ll_conn_end conn_handle=%u event_cntr=%u err=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "8 ll_conn_tx len=%u offset=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "9 ll_conn_rx conn_sn=%u pdu_nesn=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "10 ll_adv_txdone inst=%u chanset=%x");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "11 ll_adv_halt inst=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "12 ll_aux_ref aux=%p ref=%u");
+    os_trace_module_desc(&g_ble_ll_trace_mod, "13 ll_aux_unref aux=%p ref=%u");
+}
+
+void
+ble_ll_trace_init(void)
+{
+    ble_ll_trace_off =
+            os_trace_module_register(&g_ble_ll_trace_mod, "ble_ll", 12,
+                                     ble_ll_trace_module_send_desc);
+}
+#endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_utils.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_utils.c
new file mode 100644
index 000000000..3814e58a8
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_utils.c
@@ -0,0 +1,303 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <assert.h>
+#include <stdlib.h>
+#include "nimble/nimble/include/nimble/ble.h"
+#include "../include/controller/ble_ll.h"
+#include "../include/controller/ble_ll_utils.h"
+
+/* 37 bits require 5 bytes */
+#define BLE_LL_CHMAP_LEN (5)
+
+/* Sleep clock accuracy table (in ppm) */
+static const uint16_t g_ble_sca_ppm_tbl[8] = {
+    500, 250, 150, 100, 75, 50, 30, 20
+};
+
+uint32_t
+ble_ll_utils_calc_access_addr(void)
+{
+    uint32_t aa;
+    uint16_t aa_low;
+    uint16_t aa_high;
+    uint32_t temp;
+    uint32_t mask;
+    uint32_t prev_bit;
+    uint8_t bits_diff;
+    uint8_t consecutive;
+    uint8_t transitions;
+    uint8_t ones;
+    int tmp;
+
+    /* Calculate a random access address */
+    aa = 0;
+    while (1) {
+        /* Get two, 16-bit random numbers */
+        aa_low = rand() & 0xFFFF;
+        aa_high = rand() & 0xFFFF;
+
+        /* All four bytes cannot be equal */
+        if (aa_low == aa_high) {
+            continue;
+        }
+
+        /* Upper 6 bits must have 2 transitions */
+        tmp = (int16_t)aa_high >> 10;
+        if (__builtin_popcount(tmp ^ (tmp >> 1)) < 2) {
+            continue;
+        }
+
+        /* Cannot be access address or be 1 bit different */
+        aa = aa_high;
+        aa = (aa << 16) | aa_low;
+        bits_diff = 0;
+        temp = aa ^ BLE_ACCESS_ADDR_ADV;
+        for (mask = 0x00000001; mask != 0; mask <<= 1) {
+            if (mask & temp) {
+                ++bits_diff;
+                if (bits_diff > 1) {
+                    break;
+                }
+            }
+        }
+        if (bits_diff <= 1) {
+            continue;
+        }
+
+        /* Cannot have more than 24 transitions */
+        transitions = 0;
+        consecutive = 1;
+        ones = 0;
+        mask = 0x00000001;
+        while (mask < 0x80000000) {
+            prev_bit = aa & mask;
+            mask <<= 1;
+            if (mask & aa) {
+                if (prev_bit == 0) {
+                    ++transitions;
+                    consecutive = 1;
+                } else {
+                    ++consecutive;
+                }
+            } else {
+                if (prev_bit == 0) {
+                    ++consecutive;
+                } else {
+                    ++transitions;
+                    consecutive = 1;
+                }
+            }
+
+            if (prev_bit) {
+                ones++;
+            }
+
+            /* 8 lsb should have at least three 1 */
+            if (mask == 0x00000100 && ones < 3) {
+                break;
+            }
+
+            /* 16 lsb should have no more than 11 transitions */
+            if (mask == 0x00010000 && transitions > 11) {
+                break;
+            }
+
+            /* This is invalid! */
+            if (consecutive > 6) {
+                /* Make sure we always detect invalid sequence below */
+                mask = 0;
+                break;
+            }
+        }
+
+        /* Invalid sequence found */
+        if (mask != 0x80000000) {
+            continue;
+        }
+
+        /* Cannot be more than 24 transitions */
+        if (transitions > 24) {
+            continue;
+        }
+
+        /* We have a valid access address */
+        break;
+    }
+    return aa;
+}
+
+uint8_t
+ble_ll_utils_remapped_channel(uint8_t remap_index, const uint8_t *chanmap)
+{
+    uint8_t cntr;
+    uint8_t mask;
+    uint8_t usable_chans;
+    uint8_t chan;
+    int i, j;
+
+    /* NOTE: possible to build a map but this would use memory. For now,
+     * we just calculate
+     * Iterate through channel map to find this channel
+     */
+    chan = 0;
+    cntr = 0;
+    for (i = 0; i < BLE_LL_CHMAP_LEN; i++) {
+        usable_chans = chanmap[i];
+        if (usable_chans != 0) {
+            mask = 0x01;
+            for (j = 0; j < 8; j++) {
+                if (usable_chans & mask) {
+                    if (cntr == remap_index) {
+                        return (chan + j);
+                    }
+                    ++cntr;
+                }
+                mask <<= 1;
+            }
+        }
+        chan += 8;
+    }
+
+    /* we should never reach here */
+    BLE_LL_ASSERT(0);
+    return 0;
+}
+
+uint8_t
+ble_ll_utils_calc_num_used_chans(const uint8_t *chmap)
+{
+    int i;
+    int j;
+    uint8_t mask;
+    uint8_t chanbyte;
+    uint8_t used_channels;
+
+    used_channels = 0;
+    for (i = 0; i < BLE_LL_CHMAP_LEN; ++i) {
+        chanbyte = chmap[i];
+        if (chanbyte) {
+            if (chanbyte == 0xff) {
+                used_channels += 8;
+            } else {
+                mask = 0x01;
+                for (j = 0; j < 8; ++j) {
+                    if (chanbyte & mask) {
+                        ++used_channels;
+                    }
+                    mask <<= 1;
+                }
+            }
+        }
+    }
+    return used_channels;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2)
+static uint16_t
+ble_ll_utils_csa2_perm(uint16_t in)
+{
+    uint16_t out = 0;
+    int i;
+
+    for (i = 0; i < 8; i++) {
+        out |= ((in >> i) & 0x00000001) << (7 - i);
+    }
+
+    for (i = 8; i < 16; i++) {
+        out |= ((in >> i) & 0x00000001) << (15 + 8 - i);
+    }
+
+    return out;
+}
+
+static uint16_t
+ble_ll_utils_csa2_prng(uint16_t counter, uint16_t ch_id)
+{
+    uint16_t prn_e;
+
+    prn_e = counter ^ ch_id;
+
+    prn_e = ble_ll_utils_csa2_perm(prn_e);
+    prn_e = (prn_e * 17) + ch_id;
+
+    prn_e = ble_ll_utils_csa2_perm(prn_e);
+    prn_e = (prn_e * 17) + ch_id;
+
+    prn_e = ble_ll_utils_csa2_perm(prn_e);
+    prn_e = (prn_e * 17) + ch_id;
+
+    prn_e = prn_e ^ ch_id;
+
+    return prn_e;
+}
+
+uint8_t
+ble_ll_utils_calc_dci_csa2(uint16_t event_cntr, uint16_t channel_id,
+                           uint8_t num_used_chans, const uint8_t *chanmap)
+{
+    uint16_t channel_unmapped;
+    uint8_t remap_index;
+
+    uint16_t prn_e;
+    uint8_t bitpos;
+
+    prn_e = ble_ll_utils_csa2_prng(event_cntr, channel_id);
+
+    channel_unmapped = prn_e % 37;
+
+    /*
+     * If unmapped channel is the channel index of a used channel it is used
+     * as channel index.
+     */
+    bitpos = 1 << (channel_unmapped & 0x07);
+    if (chanmap[channel_unmapped >> 3] & bitpos) {
+        return channel_unmapped;
+    }
+
+    remap_index = (num_used_chans * prn_e) / 0x10000;
+
+    return ble_ll_utils_remapped_channel(remap_index, chanmap);
+}
+#endif
+
+uint32_t
+ble_ll_utils_calc_window_widening(uint32_t anchor_point,
+                                  uint32_t last_anchor_point,
+                                  uint8_t master_sca)
+{
+    uint32_t total_sca_ppm;
+    uint32_t window_widening;
+    int32_t time_since_last_anchor;
+    uint32_t delta_msec;
+
+    window_widening = 0;
+
+    time_since_last_anchor = (int32_t)(anchor_point - last_anchor_point);
+    if (time_since_last_anchor > 0) {
+        delta_msec = os_cputime_ticks_to_usecs(time_since_last_anchor) / 1000;
+        total_sca_ppm = g_ble_sca_ppm_tbl[master_sca] +
+                                          MYNEWT_VAL(BLE_LL_OUR_SCA);
+        window_widening = (total_sca_ppm * delta_msec) / 1000;
+    }
+
+    return window_widening;
+}
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_whitelist.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_whitelist.c
new file mode 100644
index 000000000..8b9251117
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/src/ble_ll_whitelist.c
@@ -0,0 +1,297 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF51)
+#include "nimble/nimble/drivers/nrf51/include/ble/xcvr.h"
+#elif defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+#include "nimble/nimble/drivers/nrf52/include/ble/xcvr.h"
+#endif
+
+#include "../include/controller/ble_ll_whitelist.h"
+#include "../include/controller/ble_ll_hci.h"
+#include "../include/controller/ble_ll_adv.h"
+#include "../include/controller/ble_ll_scan.h"
+#include "../include/controller/ble_hw.h"
+
+#if (MYNEWT_VAL(BLE_LL_WHITELIST_SIZE) < BLE_HW_WHITE_LIST_SIZE)
+#define BLE_LL_WHITELIST_SIZE       MYNEWT_VAL(BLE_LL_WHITELIST_SIZE)
+#else
+#define BLE_LL_WHITELIST_SIZE       BLE_HW_WHITE_LIST_SIZE
+#endif
+
+struct ble_ll_whitelist_entry
+{
+    uint8_t wl_valid;
+    uint8_t wl_addr_type;
+    uint8_t wl_dev_addr[BLE_DEV_ADDR_LEN];
+};
+
+struct ble_ll_whitelist_entry g_ble_ll_whitelist[BLE_LL_WHITELIST_SIZE];
+
+static int
+ble_ll_whitelist_chg_allowed(void)
+{
+    int rc;
+
+    /*
+     * This command is not allowed if:
+     *  -> advertising uses the whitelist and we are currently advertising.
+     *  -> scanning uses the whitelist and is enabled.
+     *  -> initiating uses whitelist and a LE create connection command is in
+     *     progress
+     */
+    rc = 1;
+    if (!ble_ll_adv_can_chg_whitelist() || !ble_ll_scan_can_chg_whitelist()) {
+        rc = 0;
+    }
+    return rc;
+}
+
+/**
+ * Clear the whitelist.
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_ll_whitelist_clear(void)
+{
+    int i;
+    struct ble_ll_whitelist_entry *wl;
+
+    /* Check proper state */
+    if (!ble_ll_whitelist_chg_allowed()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Set the number of entries to 0 */
+    wl = &g_ble_ll_whitelist[0];
+    for (i = 0; i < BLE_LL_WHITELIST_SIZE; ++i) {
+        wl->wl_valid = 0;
+        ++wl;
+    }
+
+#if (BLE_USES_HW_WHITELIST == 1)
+    ble_hw_whitelist_clear();
+#endif
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Read the size of the whitelist. This is the total number of whitelist
+ * entries allowed by the controller.
+ *
+ * @param rspbuf Pointer to response buffer
+ *
+ * @return int 0: success.
+ */
+int
+ble_ll_whitelist_read_size(uint8_t *rspbuf, uint8_t *rsplen)
+{
+    struct ble_hci_le_rd_white_list_rp *rsp = (void *) rspbuf;
+
+    rsp->size = BLE_LL_WHITELIST_SIZE;
+
+    *rsplen = sizeof(*rsp);
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Searches the whitelist to determine if the address is present in the
+ * whitelist. This is an internal API that only searches the link layer
+ * whitelist and does not care about the hardware whitelist
+ *
+ * @param addr      Device or identity address to check.
+ * @param addr_type Public address (0) or random address (1)
+ *
+ * @return int 0: device is not on whitelist; otherwise the return value
+ * is the 'position' of the device in the whitelist (the index of the element
+ * plus 1).
+ */
+static int
+ble_ll_whitelist_search(const uint8_t *addr, uint8_t addr_type)
+{
+    int i;
+    struct ble_ll_whitelist_entry *wl;
+
+    wl = &g_ble_ll_whitelist[0];
+    for (i = 0; i < BLE_LL_WHITELIST_SIZE; ++i) {
+        if ((wl->wl_valid) && (wl->wl_addr_type == addr_type) &&
+            (!memcmp(&wl->wl_dev_addr[0], addr, BLE_DEV_ADDR_LEN))) {
+            return i + 1;
+        }
+        ++wl;
+    }
+
+    return 0;
+}
+
+/**
+ * Is there a match between the device and a device on the whitelist.
+ *
+ * NOTE: This API uses the HW, if present, to determine if there was a match
+ * between a received address and an address in the whitelist. If the HW does
+ * not support whitelisting this API is the same as the whitelist search API
+ *
+ * @param addr
+ * @param addr_type Public address (0) or random address (1)
+ * @param is_ident  True if addr is an identity address; false otherwise
+ *
+ * @return int
+ */
+int
+ble_ll_whitelist_match(uint8_t *addr, uint8_t addr_type, int is_ident)
+{
+    int rc;
+#if (BLE_USES_HW_WHITELIST == 1)
+    /*
+     * XXX: This should be changed. This is HW specific: some HW may be able
+     * to both resolve a private address and perform a whitelist check. The
+     * current BLE hw cannot support this.
+     */
+    if (is_ident) {
+        rc = ble_ll_whitelist_search(addr, addr_type);
+    } else {
+        rc = ble_hw_whitelist_match();
+    }
+#else
+    rc = ble_ll_whitelist_search(addr, addr_type);
+#endif
+    return rc;
+}
+
+/**
+ * Add a device to the whitelist
+ *
+ * @return int
+ */
+int
+ble_ll_whitelist_add(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_add_whte_list_cp *cmd = (const void *) cmdbuf;
+    struct ble_ll_whitelist_entry *wl;
+    int rc;
+    int i;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Must be in proper state */
+    if (!ble_ll_whitelist_chg_allowed()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    /* Check if we have any open entries */
+    rc = BLE_ERR_SUCCESS;
+    if (!ble_ll_whitelist_search(cmd->addr, cmd->addr_type)) {
+        wl = &g_ble_ll_whitelist[0];
+        for (i = 0; i < BLE_LL_WHITELIST_SIZE; ++i) {
+            if (wl->wl_valid == 0) {
+                memcpy(&wl->wl_dev_addr[0], cmd->addr, BLE_DEV_ADDR_LEN);
+                wl->wl_addr_type = cmd->addr_type;
+                wl->wl_valid = 1;
+                break;
+            }
+            ++wl;
+        }
+
+        if (i == BLE_LL_WHITELIST_SIZE) {
+            rc = BLE_ERR_MEM_CAPACITY;
+        } else {
+#if (BLE_USES_HW_WHITELIST == 1)
+            rc = ble_hw_whitelist_add(cmd->addr, cmd->addr_type);
+#endif
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Remove a device from the whitelist
+ *
+ * @param cmdbuf
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_ll_whitelist_rmv(const uint8_t *cmdbuf, uint8_t len)
+{
+    const struct ble_hci_le_rmv_white_list_cp *cmd = (const void *) cmdbuf;
+    int position;
+
+    if (len != sizeof(*cmd)) {
+        return BLE_ERR_INV_HCI_CMD_PARMS;
+    }
+
+    /* Must be in proper state */
+    if (!ble_ll_whitelist_chg_allowed()) {
+        return BLE_ERR_CMD_DISALLOWED;
+    }
+
+    position = ble_ll_whitelist_search(cmd->addr, cmd->addr_type);
+    if (position) {
+        g_ble_ll_whitelist[position - 1].wl_valid = 0;
+    }
+
+#if (BLE_USES_HW_WHITELIST == 1)
+    ble_hw_whitelist_rmv(cmd->addr, cmd->addr_type);
+#endif
+
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Enable whitelisting.
+ *
+ * Note: This function has no effect if we are not using HW whitelisting
+ */
+void
+ble_ll_whitelist_enable(void)
+{
+#if (BLE_USES_HW_WHITELIST == 1)
+    ble_hw_whitelist_enable();
+#endif
+}
+
+/**
+ * Disable whitelisting.
+ *
+ * Note: This function has no effect if we are not using HW whitelisting
+ */
+void
+ble_ll_whitelist_disable(void)
+{
+#if (BLE_USES_HW_WHITELIST == 1)
+    ble_hw_whitelist_disable();
+#endif
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/syscfg.yml
new file mode 100644
index 000000000..85049cb09
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/controller/syscfg.yml
@@ -0,0 +1,434 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_CONTROLLER:
+        description: >
+            Indicates that NimBLE controller is present. The default value for
+            this setting shall not be overriden.
+        value: 1
+
+    BLE_HW_WHITELIST_ENABLE:
+        description: >
+            Used to enable hardware white list
+        value: 1
+
+    BLE_LL_SYSVIEW:
+        description: >
+            Enable SystemView tracing module for controller.
+        value: 0
+
+    BLE_LL_PRIO:
+        description: 'The priority of the LL task'
+        type: 'task_priority'
+        value: 0
+
+    # Sleep clock accuracy (sca). This is the amount of drift in the system
+    # during when the device is sleeping (in parts per million).
+    #
+    # NOTE: 'the' master sca is an enumerated value based on the sca. Rather
+    # than have a piece of code calculate this value, the developer must set
+    # this value based on the value of the SCA using the following table:
+    #
+    #  SCA between 251 and 500 ppm (inclusive); master sca = 0
+    #  SCA between 151 and 250 ppm (inclusive); master sca = 1
+    #  SCA between 101 and 150 ppm (inclusive); master sca = 2
+    #  SCA between 76 and 100 ppm (inclusive); master sca = 3
+    #  SCA between 51 and 75 ppm (inclusive); master sca = 4
+    #  SCA between 31 and 50 ppm (inclusive); master sca = 5
+    #  SCA between 21 and 30 ppm (inclusive); master sca = 6
+    #  SCA between 0 and 20 ppm (inclusive); master sca = 7
+    #
+    #  For example:
+    #      if your clock drift is 101 ppm, your master should be set to 2.
+    #      if your clock drift is 20, your master sca should be set to 7.
+    #
+    #  The values provided below are merely meant to be an example and should
+    #  be replaced by values appropriate for your platform.
+    BLE_LL_OUR_SCA:
+        description: 'The system clock accuracy of the device.'
+        value: '60'    # in ppm
+
+    BLE_LL_MASTER_SCA:
+        description: 'Enumerated value based on our sca'
+        value: '4'
+
+    BLE_LL_TX_PWR_DBM:
+        description: 'Transmit power level.'
+        value: '0'
+
+    BLE_LL_NUM_COMP_PKT_ITVL_MS:
+        description: >
+            Determines the interval at which the controller will send the
+            number of completed packets event to the host. Rate is in milliseconds.
+        value: 2000
+
+    BLE_LL_MFRG_ID:
+        description: >
+            Manufacturer ID. Should be set to unique ID per manufacturer.
+        value: '0xFFFF'
+
+    # Configuration items for the number of duplicate advertisers and the
+    # number of advertisers from which we have heard a scan response.
+    BLE_LL_NUM_SCAN_DUP_ADVS:
+        description: 'The number of duplicate advertisers stored.'
+        value: '8'
+    BLE_LL_NUM_SCAN_RSP_ADVS:
+        description: >
+            The number of advertisers from which we have heard a scan
+            response. Prevents sending duplicate events to host.
+        value: '8'
+
+    BLE_LL_WHITELIST_SIZE:
+        description: 'Size of the LL whitelist.'
+        value: '8'
+
+    BLE_LL_RESOLV_LIST_SIZE:
+        description: 'Size of the resolving list.'
+        value: '4'
+
+    # Data length management definitions for connections. These define the
+    # maximum size of the PDU's that will be sent and/or received in a
+    # connection.
+    BLE_LL_MAX_PKT_SIZE:
+        description: 'The maximum PDU size that can be sent/received'
+        value: '251'
+    BLE_LL_SUPP_MAX_RX_BYTES:
+        description: 'The maximum supported received PDU size'
+        value: MYNEWT_VAL(BLE_LL_MAX_PKT_SIZE)
+    BLE_LL_SUPP_MAX_TX_BYTES:
+        description: 'The maximum supported transmit PDU size'
+        value: MYNEWT_VAL(BLE_LL_MAX_PKT_SIZE)
+    BLE_LL_CONN_INIT_MAX_TX_BYTES:
+        description: >
+            Used to set the initial maximum transmit PDU size in a
+            connection. If this is set to a value greater than 27,
+            the controller will automatically attempt to do the
+            data length update procedure. The host can always tell
+            the controller to update this value.
+        value: '27'
+
+    # The number of slots that will be allocated to each connection
+    BLE_LL_CONN_INIT_SLOTS:
+        description: >
+            This is the number of "slots" allocated to a connection when scheduling
+            connections. Each slot is 1.25 msecs long. Note that a connection event may
+            last longer than the number of slots allocated here and may also end earlier
+            (depending on when the next scheduled event occurs and how much data needs
+            to be transferred in the connection). However, you will be guaranteed that
+            a connection event will be given this much time, if needed. Consecutively
+            scheduled items will be at least this far apart
+        value: '4'
+
+    BLE_LL_CONN_INIT_MIN_WIN_OFFSET:
+        description: >
+            This is the minimum number of "slots" for WindowOffset value used for
+            CONNECT_IND when creating new connection as a master. Each slot is 1.25
+            msecs long. Increasing this value will delay first connection event after
+            connection is created. However, older TI CC254x controllers cannot change
+            connection parameters later if WindowOffset was set to 0 in CONNECT_IND. To
+            ensure interoperability with such devices set this value to 2 (or more).
+        value: '0'
+
+    # Strict scheduling
+    BLE_LL_STRICT_CONN_SCHEDULING:
+        description: >
+            Forces the scheduler on a central to schedule connections in fixed
+            time intervals called periods. If set to 0, the scheduler is not forced
+            to do this. If set to 1, the scheduler will only schedule connections at
+            period boundaries. See comments in ble_ll_sched.h for more details.
+        value: '0'
+
+    BLE_LL_ADD_STRICT_SCHED_PERIODS:
+        description: >
+            The number of additional periods that will be allocated for strict
+            scheduling. The total # of periods allocated for strict scheduling
+            will be equal to the number of connections plus this number.
+        value: '0'
+
+    BLE_LL_USECS_PER_PERIOD:
+        description: >
+            The number of usecs per period.
+        value: '3250'
+
+    # The number of random bytes to store
+    BLE_LL_RNG_BUFSIZE:
+        description: >
+            The number of random bytes that the link layer will try to
+            always have available for the host to use. Decreasing this
+            value may cause host delays if the host needs lots of random
+            material often.
+        value: '32'
+
+    BLE_LL_RFMGMT_ENABLE_TIME:
+        description: >
+            Time required for radio and/or related components to be fully
+            enabled before any request from LL is sent. This value is used
+            by rfmgmt to enable PHY in advance, before request from LL is
+            made. It depends on radio driver selected and may also depend
+            on hardware used:
+            - nrf51 - time required for XTAL to settle
+            - nrf52 - time required for XTAL to settle
+            Value is specified in microseconds. If set to 0, rfmgmt keeps
+            PHY enabled all the time.
+        value: MYNEWT_VAL(BLE_XTAL_SETTLE_TIME)
+
+    # Configuration for LL supported features.
+    #
+    # There are a total 8 features that the LL can support. These can be found
+    # in v4.2, Vol 6 Part B Section 4.6.
+    #
+    # These feature definitions are used to inform a host or other controller
+    # about the LL features supported by the controller.
+    #
+    # NOTE: 'the' controller always supports extended reject indicate and thus
+    # is not listed here.
+
+
+    BLE_LL_CFG_FEAT_LE_ENCRYPTION:
+        description: >
+            This option enables/disables encryption support in the controller.
+            This option saves both both code and RAM.
+        value: '1'
+
+    BLE_LL_CFG_FEAT_CONN_PARAM_REQ:
+        description: >
+            This option enables/disables the connection parameter request
+            procedure.  This is implemented in the controller but is disabled
+            by default.
+        value: '1'
+
+    BLE_LL_CFG_FEAT_SLAVE_INIT_FEAT_XCHG:
+        description: >
+            This option allows a slave to initiate the feature exchange
+            procedure.  This feature is implemented but currently has no impact
+            on code or ram size
+        value: '1'
+
+    BLE_LL_CFG_FEAT_LE_PING:
+        description: >
+            This option allows a controller to send/receive LE pings.
+            Currently, this feature is not implemented by the controller so
+            turning it on or off has no effect.
+        value: 'MYNEWT_VAL_BLE_LL_CFG_FEAT_LE_ENCRYPTION'
+
+    BLE_LL_CFG_FEAT_DATA_LEN_EXT:
+        description: >
+            This option enables/disables the data length update procedure in
+            the controller. If enabled, the controller is allowed to change the
+            size of tx/rx pdu's used in a connection. This option has only
+            minor impact on code size and non on RAM.
+        value: '1'
+
+    BLE_LL_CFG_FEAT_LL_PRIVACY:
+        description: >
+            This option is used to enable/disable LL privacy.
+        value: '1'
+
+    BLE_LL_CFG_FEAT_LE_CSA2:
+        description: >
+            This option is used to enable/disable support for LE Channel
+            Selection Algorithm #2.
+        value: '0'
+
+    BLE_LL_CFG_FEAT_LE_2M_PHY:
+        description: >
+            This option is used to enable/disable support for the 2Mbps PHY.
+        value: '0'
+
+    BLE_LL_CFG_FEAT_LE_CODED_PHY:
+        description: >
+            This option is used to enable/disable support for the coded PHY.
+        value: '0'
+
+    BLE_LL_CFG_FEAT_LL_EXT_ADV:
+        description: >
+            This option is used to enable/disable support for Extended
+            Advertising Feature. That means extended scanner, advertiser
+            and connect.
+        value: MYNEWT_VAL(BLE_EXT_ADV)
+
+    BLE_LL_CFG_FEAT_LL_PERIODIC_ADV:
+        description: >
+            This option is used to enable/disable support for Periodic
+            Advertising Feature.
+        value: MYNEWT_VAL(BLE_PERIODIC_ADV)
+
+    BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_CNT:
+        description: >
+            This option is used to configure number of supported periodic syncs.
+        value: MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)
+
+    BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_LIST_CNT:
+        description: >
+            Size of Periodic Advertiser sync list.
+        value: MYNEWT_VAL(BLE_MAX_PERIODIC_SYNCS)
+
+    BLE_LL_CFG_FEAT_LL_PERIODIC_ADV_SYNC_TRANSFER:
+        description: >
+            This option is use to enable/disable support for Periodic
+            Advertising Sync Transfer Feature.
+        value: MYNEWT_VAL(BLE_PERIODIC_ADV_SYNC_TRANSFER)
+
+    BLE_LL_EXT_ADV_AUX_PTR_CNT:
+         description: >
+            This option configure a max number of scheduled outstanding auxiliary
+            packets for receive on secondary advertising channel.
+         value: 0
+
+    BLE_PUBLIC_DEV_ADDR:
+        description: >
+            Allows the target or app to override the public device address
+            used by the controller. If all zero, the controller will
+            attempt to retrieve the public device address from its
+            chip specific location. If non-zero, this address will
+            be used.
+        value: "(uint8_t[6]){0x00, 0x00, 0x00, 0x00, 0x00, 0x00}"
+
+    BLE_LL_DTM:
+        description: >
+             Enables HCI Test commands needed for Bluetooth SIG certification
+        value: MYNEWT_VAL(BLE_LL_DIRECT_TEST_MODE)
+    BLE_LL_DTM_EXTENSIONS:
+        description: >
+             Enables non-standard extensions to HCI test commands. Once enabled,
+             HCI_LE_Transmitter_Test accepts extra parameters in addition to
+             those defined in Core specification
+               interval (2 octets)   interval between packets (usecs), overrides
+                                     standard interval
+               pkt_count (2 octets)  number of packets to transmit, controller
+                                     will automatically stop sending packets
+                                     after given number of packets was sent
+             Setting either of these parameters to 0 will configure for default
+             behavior, as per Core specification.
+             If specified interval is shorter then allowed by specification it
+             will be ignored.
+             Extended parameters shall immediately follow standard parameters.
+             Controller can accept both standard and extended version of command
+             depending on specified HCI command length.
+        value: 0
+
+    BLE_LL_VND_EVENT_ON_ASSERT:
+        description: >
+            This options enables controller to send a vendor-specific event on
+            an assertion in controller code. The event contains file name and
+            line number where assertion occured.
+        value: 0
+
+    BLE_LL_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the NimBLE controller.
+        value: 250
+
+    BLE_LL_DEBUG_GPIO_HCI_CMD:
+        description: >
+            GPIO pin number to debug HCI commands flow. Pin is set to high state
+            when HCI command is being processed.
+        value: -1
+    BLE_LL_DEBUG_GPIO_HCI_EV:
+        description: >
+            GPIO pin number to debug HCI events flow. Pin is set to high state
+            when HCI event is being sent.
+        value: -1
+    BLE_LL_DEBUG_GPIO_SCHED_RUN:
+        description: >
+            GPIO pin number to debug scheduler running (on timer). Pin is set
+            to high state while scheduler is running.
+        value: -1
+    BLE_LL_DEBUG_GPIO_SCHED_ITEM_CB:
+        description: >
+            GPIO pin number to debug scheduler item execution times. Pin is set
+            to high state while item is executed.
+        value: -1
+
+# Below settings allow to change scheduler timings. These should be left at
+# default values unless you know what you are doing!
+    BLE_LL_SCHED_AUX_MAFS_DELAY:
+        description: >
+            Additional delay [us] between last ADV_EXT_IND and AUX_ADV_IND PDUs
+            when scheduling extended advertising event. This extends T_MAFS.
+        value: 0
+    BLE_LL_SCHED_AUX_CHAIN_MAFS_DELAY:
+        description: >
+            Additional delay [us] between consecutive AUX_CHAIN_IND PDUs
+            when scheduling extended or periodic advertising event. This extends
+            T_MAFS.
+        value: 0
+    BLE_LL_SCHED_SCAN_AUX_PDU_LEN:
+        description: >
+            This is expected PDU len for AUX_ADV_IND and subsequent
+            AUX_CHAIN_IND. When scheduling scan scheduler will reserve time for
+            receiving this amount of time. Setting this to high value improves
+            reception of large PDUs but results in wasting scheduler space when
+            receiving small PDUs only. On the other hand too low value can
+            result in not being able to scan whole PDU due to being preempted
+            by next scheduled item. By default size matching legacy ADV_IND PDU
+            payload is used: ExtHeader (Flags, AdvA, ADI) + 31 bytes of data.
+        range: 1..257
+        value: 41
+
+    BLE_LL_SCHED_SCAN_SYNC_PDU_LEN:
+        description: >
+            This is expected PDU len for AUX_SYNC_IND and subsequent
+            AUX_CHAIN_IND. When scheduling scan scheduler will reserve time for
+            receiving this amount of time. Setting this to high value improves
+            reception of large PDUs but results in wasting scheduler space when
+            receiving small PDUs only. On the other hand too low value can
+            result in not being able to scan whole PDU due to being preempted
+            by next scheduled item. By default size matching PDU with legacy
+            data size is used: ExtHeader + 31 bytes of data.
+        range: 1..257
+        value: 32
+
+# deprecated settings (to be defunct/removed eventually)
+    BLE_LL_DIRECT_TEST_MODE:
+        description: use BLE_LL_DTM instead
+        value: 0
+        deprecated: 1
+    BLE_XTAL_SETTLE_TIME:
+        description: use BLE_LL_RFMGMT_ENABLE_TIME instead
+        value: 0
+        deprecated: 1
+
+# defunct settings (to be removed eventually)
+    BLE_DEVICE:
+        description: Superseded by BLE_CONTROLLER
+        value: 1
+        defunct: 1
+    BLE_LP_CLOCK:
+        description: Superseded by BLE_CONTROLLER
+        value: 1
+        defunct: 1
+    BLE_NUM_COMP_PKT_RATE:
+        description: Superseded by BLE_LL_NUM_COMP_PKT_ITVL_MS
+        value: '(2 * OS_TICKS_PER_SEC)'
+        defunct: 1
+
+
+syscfg.vals.BLE_LL_CFG_FEAT_LL_EXT_ADV:
+    BLE_LL_CFG_FEAT_LE_CSA2: 1
+    BLE_HW_WHITELIST_ENABLE: 0
+    BLE_LL_EXT_ADV_AUX_PTR_CNT: 5
+
+# Enable vendor event on assert in standalone build to make failed assertions in
+# controller code visible when connected to external host
+syscfg.vals.!BLE_HOST:
+    BLE_LL_VND_EVENT_ON_ASSERT: 1
+
+syscfg.restrictions:
+    - OS_CPUTIME_FREQ == 32768
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_uuid_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/include/ble/xcvr.h
similarity index 55%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_uuid_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/include/ble/xcvr.h
index 3dbcc6b8e..6c1fb7b24 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_uuid_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/include/ble/xcvr.h
@@ -17,29 +17,35 @@
  * under the License.
  */
 
-#ifndef H_BLE_UUID_PRIV_
-#define H_BLE_UUID_PRIV_
+ #if defined(ARDUINO_ARCH_NRF5) && defined(NRF51)
 
-#include "host/ble_uuid.h"
+#ifndef H_BLE_XCVR_
+#define H_BLE_XCVR_
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct os_mbuf;
+/* Transceiver specific defintions */
+/* NOTE: we have to account for the RTC output compare issue */
+#define XCVR_PROC_DELAY_USECS         (230)
 
-int ble_uuid_init_from_att_mbuf(ble_uuid_any_t *uuid, struct os_mbuf *om,
-                                int off, int len);
-int ble_uuid_init_from_att_buf(ble_uuid_any_t *uuid, const void *buf,
-                               size_t len);
+#define XCVR_RX_START_DELAY_USECS     (140)
+#define XCVR_TX_START_DELAY_USECS     (140)
+#define XCVR_TX_SCHED_DELAY_USECS     \
+    (XCVR_TX_START_DELAY_USECS + XCVR_PROC_DELAY_USECS)
+#define XCVR_RX_SCHED_DELAY_USECS     \
+    (XCVR_RX_START_DELAY_USECS + XCVR_PROC_DELAY_USECS)
 
-int ble_uuid_to_any(const ble_uuid_t *uuid, ble_uuid_any_t *uuid_any);
-int ble_uuid_to_mbuf(const ble_uuid_t *uuid, struct os_mbuf *om);
-int ble_uuid_flat(const ble_uuid_t *uuid, void *dst);
-int ble_uuid_length(const ble_uuid_t *uuid);
+/*
+ * Define HW whitelist size. This is the total possible whitelist size;
+ * not necessarily the size that will be used (may be smaller)
+ */
+#define BLE_HW_WHITE_LIST_SIZE        (8)
 
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* H_BLE_XCVR_ */
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/pkg.yml
new file mode 100644
index 000000000..816a56355
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/pkg.yml
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/drivers/nrf51
+pkg.description: BLE driver for nRF51 systems.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.apis: ble_driver
+pkg.deps:
+    - nimble
+    - nimble/controller
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/src/ble_hw.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/src/ble_hw.c
new file mode 100644
index 000000000..3d4966b2d
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/src/ble_hw.c
@@ -0,0 +1,491 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF51)
+
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "../include/ble/xcvr.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nrf.h"
+#include "nimble/nimble/controller/include/controller/ble_hw.h"
+#if MYNEWT
+#include "mcu/cmsis_nvic.h"
+#else
+#include "core_cm0.h"
+#include "nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h"
+#endif
+#include "nimble/porting/nimble/include/os/os_trace_api.h"
+
+/* Total number of resolving list elements */
+#define BLE_HW_RESOLV_LIST_SIZE     (16)
+
+/* We use this to keep track of which entries are set to valid addresses */
+static uint8_t g_ble_hw_whitelist_mask;
+
+/* Random number generator isr callback */
+ble_rng_isr_cb_t g_ble_rng_isr_cb;
+
+/* If LL privacy is enabled, allocate memory for AAR */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+
+/* The NRF51 supports up to 16 IRK entries */
+#if (MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE) < 16)
+#define NRF_IRK_LIST_ENTRIES    (MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE))
+#else
+#define NRF_IRK_LIST_ENTRIES    (16)
+#endif
+
+/* NOTE: each entry is 16 bytes long. */
+uint32_t g_nrf_irk_list[NRF_IRK_LIST_ENTRIES * 4];
+
+/* Current number of IRK entries */
+uint8_t g_nrf_num_irks;
+
+#endif
+
+/* Returns public device address or -1 if not present */
+int
+ble_hw_get_public_addr(ble_addr_t *addr)
+{
+    uint32_t addr_high;
+    uint32_t addr_low;
+
+    /* Does FICR have a public address */
+    if ((NRF_FICR->DEVICEADDRTYPE & 1) != 0) {
+        return -1;
+    }
+
+    /* Copy into device address. We can do this because we know platform */
+    addr_low = NRF_FICR->DEVICEADDR[0];
+    addr_high = NRF_FICR->DEVICEADDR[1];
+    memcpy(addr->val, &addr_low, 4);
+    memcpy(&addr->val[4], &addr_high, 2);
+    addr->type = BLE_ADDR_PUBLIC;
+
+    return 0;
+}
+
+/* Returns random static address or -1 if not present */
+int
+ble_hw_get_static_addr(ble_addr_t *addr)
+{
+    int rc;
+
+    if ((NRF_FICR->DEVICEADDRTYPE & 1) == 1) {
+        memcpy(addr->val, (void *)&NRF_FICR->DEVICEADDR[0], 4);
+        memcpy(&addr->val[4], (void *)&NRF_FICR->DEVICEADDR[1], 2);
+        addr->val[5] |= 0xc0;
+        addr->type = BLE_ADDR_RANDOM;
+        rc = 0;
+    } else {
+        rc = -1;
+    }
+
+    return rc;
+}
+
+/**
+ * Clear the whitelist
+ *
+ * @return int
+ */
+void
+ble_hw_whitelist_clear(void)
+{
+    NRF_RADIO->DACNF = 0;
+    g_ble_hw_whitelist_mask = 0;
+}
+
+/**
+ * Add a device to the hw whitelist
+ *
+ * @param addr
+ * @param addr_type
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_hw_whitelist_add(const uint8_t *addr, uint8_t addr_type)
+{
+    int i;
+    uint32_t mask;
+
+    /* Find first ununsed device address match element */
+    mask = 0x01;
+    for (i = 0; i < BLE_HW_WHITE_LIST_SIZE; ++i) {
+        if ((mask & g_ble_hw_whitelist_mask) == 0) {
+            NRF_RADIO->DAB[i] = get_le32(addr);
+            NRF_RADIO->DAP[i] = get_le16(addr + 4);
+            if (addr_type == BLE_ADDR_RANDOM) {
+                NRF_RADIO->DACNF |= (mask << 8);
+            }
+            g_ble_hw_whitelist_mask |= mask;
+            return BLE_ERR_SUCCESS;
+        }
+        mask <<= 1;
+    }
+
+    return BLE_ERR_MEM_CAPACITY;
+}
+
+/**
+ * Remove a device from the hw whitelist
+ *
+ * @param addr
+ * @param addr_type
+ *
+ */
+void
+ble_hw_whitelist_rmv(const uint8_t *addr, uint8_t addr_type)
+{
+    int i;
+    uint8_t cfg_addr;
+    uint16_t dap;
+    uint16_t txadd;
+    uint32_t dab;
+    uint32_t mask;
+
+    /* Find first ununsed device address match element */
+    dab = get_le32(addr);
+    dap = get_le16(addr + 4);
+    txadd = NRF_RADIO->DACNF >> 8;
+    mask = 0x01;
+    for (i = 0; i < BLE_HW_WHITE_LIST_SIZE; ++i) {
+        if (mask & g_ble_hw_whitelist_mask) {
+            if ((dab == NRF_RADIO->DAB[i]) && (dap == NRF_RADIO->DAP[i])) {
+                cfg_addr = txadd & mask;
+                if (addr_type == BLE_ADDR_RANDOM) {
+                    if (cfg_addr != 0) {
+                        break;
+                    }
+                } else {
+                    if (cfg_addr == 0) {
+                        break;
+                    }
+                }
+            }
+        }
+        mask <<= 1;
+    }
+
+    if (i < BLE_HW_WHITE_LIST_SIZE) {
+        g_ble_hw_whitelist_mask &= ~mask;
+        NRF_RADIO->DACNF &= ~mask;
+    }
+}
+
+/**
+ * Returns the size of the whitelist in HW
+ *
+ * @return int Number of devices allowed in whitelist
+ */
+uint8_t
+ble_hw_whitelist_size(void)
+{
+    return BLE_HW_WHITE_LIST_SIZE;
+}
+
+/**
+ * Enable the whitelisted devices
+ */
+void
+ble_hw_whitelist_enable(void)
+{
+    /* Enable the configured device addresses */
+    NRF_RADIO->DACNF |= g_ble_hw_whitelist_mask;
+}
+
+/**
+ * Disables the whitelisted devices
+ */
+void
+ble_hw_whitelist_disable(void)
+{
+    /* Disable all whitelist devices */
+    NRF_RADIO->DACNF &= 0x0000ff00;
+}
+
+/**
+ * Boolean function which returns true ('1') if there is a match on the
+ * whitelist.
+ *
+ * @return int
+ */
+int
+ble_hw_whitelist_match(void)
+{
+    return (int)NRF_RADIO->EVENTS_DEVMATCH;
+}
+
+/* Encrypt data */
+int
+ble_hw_encrypt_block(struct ble_encryption_block *ecb)
+{
+    int rc;
+    uint32_t end;
+    uint32_t err;
+
+    /* Stop ECB */
+    NRF_ECB->TASKS_STOPECB = 1;
+    /* XXX: does task stop clear these counters? Anyway to do this quicker? */
+    NRF_ECB->EVENTS_ENDECB = 0;
+    NRF_ECB->EVENTS_ERRORECB = 0;
+    NRF_ECB->ECBDATAPTR = (uint32_t)ecb;
+
+    /* Start ECB */
+    NRF_ECB->TASKS_STARTECB = 1;
+
+    /* Wait till error or done */
+    rc = 0;
+    while (1) {
+        end = NRF_ECB->EVENTS_ENDECB;
+        err = NRF_ECB->EVENTS_ERRORECB;
+        if (end || err) {
+            if (err) {
+                rc = -1;
+            }
+            break;
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Random number generator ISR.
+ */
+static void
+ble_rng_isr(void)
+{
+    uint8_t rnum;
+
+    os_trace_isr_enter();
+
+    /* No callback? Clear and disable interrupts */
+    if (g_ble_rng_isr_cb == NULL) {
+        NRF_RNG->INTENCLR = 1;
+        NRF_RNG->EVENTS_VALRDY = 0;
+        (void)NRF_RNG->SHORTS;
+        os_trace_isr_exit();
+        return;
+    }
+
+    /* If there is a value ready grab it */
+    if (NRF_RNG->EVENTS_VALRDY) {
+        NRF_RNG->EVENTS_VALRDY = 0;
+        rnum = (uint8_t)NRF_RNG->VALUE;
+        (*g_ble_rng_isr_cb)(rnum);
+    }
+
+    os_trace_isr_exit();
+}
+
+/**
+ * Initialize the random number generator
+ *
+ * @param cb
+ * @param bias
+ *
+ * @return int
+ */
+int
+ble_hw_rng_init(ble_rng_isr_cb_t cb, int bias)
+{
+    /* Set bias */
+    if (bias) {
+        NRF_RNG->CONFIG = 1;
+    } else {
+        NRF_RNG->CONFIG = 0;
+    }
+
+    /* If we were passed a function pointer we need to enable the interrupt */
+    if (cb != NULL) {
+#ifndef RIOT_VERSION
+        NVIC_SetPriority(RNG_IRQn, (1 << __NVIC_PRIO_BITS) - 1);
+#endif
+#if MYNEWT
+        NVIC_SetVector(RNG_IRQn, (uint32_t)ble_rng_isr);
+#else
+        ble_npl_hw_set_isr(RNG_IRQn, ble_rng_isr);
+#endif
+        NVIC_EnableIRQ(RNG_IRQn);
+        g_ble_rng_isr_cb = cb;
+    }
+
+    return 0;
+}
+
+/**
+ * Start the random number generator
+ *
+ * @return int
+ */
+int
+ble_hw_rng_start(void)
+{
+    os_sr_t sr;
+
+    /* No need for interrupt if there is no callback */
+    OS_ENTER_CRITICAL(sr);
+    NRF_RNG->EVENTS_VALRDY = 0;
+    if (g_ble_rng_isr_cb) {
+        NRF_RNG->INTENSET = 1;
+    }
+    NRF_RNG->TASKS_START = 1;
+    OS_EXIT_CRITICAL(sr);
+
+    return 0;
+}
+
+/**
+ * Stop the random generator
+ *
+ * @return int
+ */
+int
+ble_hw_rng_stop(void)
+{
+    os_sr_t sr;
+
+    /* No need for interrupt if there is no callback */
+    OS_ENTER_CRITICAL(sr);
+    NRF_RNG->INTENCLR = 1;
+    NRF_RNG->TASKS_STOP = 1;
+    NRF_RNG->EVENTS_VALRDY = 0;
+    OS_EXIT_CRITICAL(sr);
+
+    return 0;
+}
+
+/**
+ * Read the random number generator.
+ *
+ * @return uint8_t
+ */
+uint8_t
+ble_hw_rng_read(void)
+{
+    uint8_t rnum;
+
+    /* Wait for a sample */
+    while (NRF_RNG->EVENTS_VALRDY == 0) {
+    }
+
+    NRF_RNG->EVENTS_VALRDY = 0;
+    rnum = (uint8_t)NRF_RNG->VALUE;
+
+    return rnum;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+/**
+ * Clear the resolving list
+ *
+ * @return int
+ */
+void
+ble_hw_resolv_list_clear(void)
+{
+    g_nrf_num_irks = 0;
+}
+
+/**
+ * Add a device to the hw resolving list
+ *
+ * @param irk   Pointer to IRK to add
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_hw_resolv_list_add(uint8_t *irk)
+{
+    uint32_t *nrf_entry;
+
+    /* Find first ununsed device address match element */
+    if (g_nrf_num_irks == NRF_IRK_LIST_ENTRIES) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    /* Copy into irk list */
+    nrf_entry = &g_nrf_irk_list[4 * g_nrf_num_irks];
+    memcpy(nrf_entry, irk, 16);
+
+    /* Add to total */
+    ++g_nrf_num_irks;
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Remove a device from the hw resolving list
+ *
+ * @param index Index of IRK to remove
+ */
+void
+ble_hw_resolv_list_rmv(int index)
+{
+    uint32_t *irk_entry;
+
+    if (index < g_nrf_num_irks) {
+        --g_nrf_num_irks;
+        irk_entry = &g_nrf_irk_list[index];
+        if (g_nrf_num_irks > index) {
+            memmove(irk_entry, irk_entry + 4, 16 * (g_nrf_num_irks - index));
+        }
+    }
+}
+
+/**
+ * Returns the size of the resolving list. NOTE: this returns the maximum
+ * allowable entries in the HW. Configuration options may limit this.
+ *
+ * @return int Number of devices allowed in resolving list
+ */
+uint8_t
+ble_hw_resolv_list_size(void)
+{
+    return BLE_HW_RESOLV_LIST_SIZE;
+}
+
+/**
+ * Called to determine if the address received was resolved.
+ *
+ * @return int  Negative values indicate unresolved address; positive values
+ *              indicate index in resolving list of resolved address.
+ */
+int
+ble_hw_resolv_list_match(void)
+{
+    uint32_t index;
+
+    if (NRF_AAR->EVENTS_END) {
+        if (NRF_AAR->EVENTS_RESOLVED) {
+            index = NRF_AAR->STATUS;
+            return (int)index;
+        }
+    }
+
+    return -1;
+}
+#endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/src/ble_phy.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/src/ble_phy.c
new file mode 100644
index 000000000..3bfed096a
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf51/src/ble_phy.c
@@ -0,0 +1,1527 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+ #if defined(ARDUINO_ARCH_NRF5) && defined(NRF51)
+
+#include <stdint.h>
+#include <string.h>
+#include <assert.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "../include/ble/xcvr.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/controller/include/controller/ble_phy.h"
+#include "nimble/nimble/controller/include/controller/ble_phy_trace.h"
+#include "nimble/nimble/controller/include/controller/ble_ll.h"
+#include "nrf.h"
+
+#if MYNEWT
+#include "mcu/nrf51_clock.h"
+#include "mcu/cmsis_nvic.h"
+#else
+#include "core_cm0.h"
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+#error LE 2M PHY cannot be enabled on nRF51
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+#error LE Coded PHY cannot be enabled on nRF51
+#endif
+
+/* XXX: 4) Make sure RF is higher priority interrupt than schedule */
+
+/*
+ * XXX: Maximum possible transmit time is 1 msec for a 60ppm crystal
+ * and 16ms for a 30ppm crystal! We need to limit PDU size based on
+ * crystal accuracy. Look at this in the spec.
+ */
+
+/* XXX: private header file? */
+extern uint8_t g_nrf_num_irks;
+extern uint32_t g_nrf_irk_list[];
+
+/* To disable all radio interrupts */
+#define NRF_RADIO_IRQ_MASK_ALL  (0x34FF)
+
+/*
+ * We configure the nrf with a 1 byte S0 field, 8 bit length field, and
+ * zero bit S1 field. The preamble is 8 bits long.
+ */
+#define NRF_LFLEN_BITS          (8)
+#define NRF_S0_LEN              (1)
+
+/* Maximum length of frames */
+#define NRF_MAXLEN              (255)
+#define NRF_BALEN               (3)     /* For base address of 3 bytes */
+
+/* Maximum tx power */
+#define NRF_TX_PWR_MAX_DBM      (4)
+#define NRF_TX_PWR_MIN_DBM      (-40)
+
+/* Max. encrypted payload length */
+#define NRF_MAX_ENCRYPTED_PYLD_LEN  (27)
+#define NRF_ENC_HDR_SIZE            (3)
+#define NRF_ENC_BUF_SIZE            \
+    (NRF_MAX_ENCRYPTED_PYLD_LEN + NRF_ENC_HDR_SIZE + BLE_LL_DATA_MIC_LEN)
+
+/* BLE PHY data structure */
+struct ble_phy_obj
+{
+    uint8_t phy_stats_initialized;
+    int8_t  phy_txpwr_dbm;
+    uint8_t phy_chan;
+    uint8_t phy_state;
+    uint8_t phy_transition;
+    uint8_t phy_rx_started;
+    uint8_t phy_encrypted;
+    uint8_t phy_privacy;
+    uint8_t phy_tx_pyld_len;
+    uint8_t *rxdptr;
+    int8_t  rx_pwr_compensation;
+    uint32_t phy_aar_scratch;
+    uint32_t phy_access_address;
+    struct ble_mbuf_hdr rxhdr;
+    void *txend_arg;
+    ble_phy_tx_end_func txend_cb;
+    uint32_t phy_start_cputime;
+};
+struct ble_phy_obj g_ble_phy_data;
+
+/* XXX: if 27 byte packets desired we can make this smaller */
+/* Global transmit/receive buffer */
+static uint32_t g_ble_phy_tx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
+static uint32_t g_ble_phy_rx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/* Make sure word-aligned for faster copies */
+static uint32_t g_ble_phy_enc_buf[(NRF_ENC_BUF_SIZE + 3) / 4];
+#endif
+
+/* RF center frequency for each channel index (offset from 2400 MHz) */
+static const uint8_t g_ble_phy_chan_freq[BLE_PHY_NUM_CHANS] = {
+     4,  6,  8, 10, 12, 14, 16, 18, 20, 22, /* 0-9 */
+    24, 28, 30, 32, 34, 36, 38, 40, 42, 44, /* 10-19 */
+    46, 48, 50, 52, 54, 56, 58, 60, 62, 64, /* 20-29 */
+    66, 68, 70, 72, 74, 76, 78,  2, 26, 80, /* 30-39 */
+};
+
+/* Statistics */
+STATS_SECT_START(ble_phy_stats)
+    STATS_SECT_ENTRY(phy_isrs)
+    STATS_SECT_ENTRY(tx_good)
+    STATS_SECT_ENTRY(tx_fail)
+    STATS_SECT_ENTRY(tx_late)
+    STATS_SECT_ENTRY(tx_bytes)
+    STATS_SECT_ENTRY(rx_starts)
+    STATS_SECT_ENTRY(rx_aborts)
+    STATS_SECT_ENTRY(rx_valid)
+    STATS_SECT_ENTRY(rx_crc_err)
+    STATS_SECT_ENTRY(rx_late)
+    STATS_SECT_ENTRY(radio_state_errs)
+    STATS_SECT_ENTRY(rx_hw_err)
+    STATS_SECT_ENTRY(tx_hw_err)
+STATS_SECT_END
+STATS_SECT_DECL(ble_phy_stats) ble_phy_stats;
+
+STATS_NAME_START(ble_phy_stats)
+    STATS_NAME(ble_phy_stats, phy_isrs)
+    STATS_NAME(ble_phy_stats, tx_good)
+    STATS_NAME(ble_phy_stats, tx_fail)
+    STATS_NAME(ble_phy_stats, tx_late)
+    STATS_NAME(ble_phy_stats, tx_bytes)
+    STATS_NAME(ble_phy_stats, rx_starts)
+    STATS_NAME(ble_phy_stats, rx_aborts)
+    STATS_NAME(ble_phy_stats, rx_valid)
+    STATS_NAME(ble_phy_stats, rx_crc_err)
+    STATS_NAME(ble_phy_stats, rx_late)
+    STATS_NAME(ble_phy_stats, radio_state_errs)
+    STATS_NAME(ble_phy_stats, rx_hw_err)
+    STATS_NAME(ble_phy_stats, tx_hw_err)
+STATS_NAME_END(ble_phy_stats)
+
+/*
+ * NOTE:
+ * Tested the following to see what would happen:
+ *  -> NVIC has radio irq enabled (interrupt # 1, mask 0x2).
+ *  -> Set up nrf to receive. Clear ADDRESS event register.
+ *  -> Enable ADDRESS interrupt on nrf5 by writing to INTENSET.
+ *  -> Enable RX.
+ *  -> Disable interrupts globally using OS_ENTER_CRITICAL().
+ *  -> Wait until a packet is received and the ADDRESS event occurs.
+ *  -> Call ble_phy_disable().
+ *
+ *  At this point I wanted to see the state of the cortex NVIC. The IRQ
+ *  pending bit was TRUE for the radio interrupt (as expected) as we never
+ *  serviced the radio interrupt (interrupts were disabled).
+ *
+ *  What was unexpected was this: without clearing the pending IRQ in the NVIC,
+ *  when radio interrupts were re-enabled (address event bit in INTENSET set to
+ *  1) and the radio ADDRESS event register read 1 (it was never cleared after
+ *  the first address event), the radio did not enter the ISR! I would have
+ *  expected that if the following were true, an interrupt would occur:
+ *      -> NVIC ISER bit set to TRUE
+ *      -> NVIC ISPR bit reads TRUE, meaning interrupt is pending.
+ *      -> Radio peripheral interrupts are enabled for some event (or events).
+ *      -> Corresponding event register(s) in radio peripheral read 1.
+ *
+ *  Not sure what the end result of all this is. We will clear the pending
+ *  bit in the NVIC just to be sure when we disable the PHY.
+ */
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/* Per nordic, the number of bytes needed for scratch is 16 + MAX_PKT_SIZE. */
+#define NRF_ENC_SCRATCH_WORDS   (((NRF_MAX_ENCRYPTED_PYLD_LEN + 16) + 3) / 4)
+
+uint32_t g_nrf_encrypt_scratchpad[NRF_ENC_SCRATCH_WORDS];
+
+struct nrf_ccm_data
+{
+    uint8_t key[16];
+    uint64_t pkt_counter;
+    uint8_t dir_bit;
+    uint8_t iv[8];
+} __attribute__((packed));
+
+struct nrf_ccm_data g_nrf_ccm_data;
+#endif
+
+/**
+ * Copies the data from the phy receive buffer into a mbuf chain.
+ *
+ * @param dptr Pointer to receive buffer
+ * @param rxpdu Pointer to already allocated mbuf chain
+ *
+ * NOTE: the packet header already has the total mbuf length in it. The
+ * lengths of the individual mbufs are not set prior to calling.
+ *
+ */
+void
+ble_phy_rxpdu_copy(uint8_t *dptr, struct os_mbuf *rxpdu)
+{
+    uint32_t rem_len;
+    uint32_t copy_len;
+    uint32_t block_len;
+    uint32_t block_rem_len;
+    void *dst;
+    void *src;
+    struct os_mbuf * om;
+
+    /* Better be aligned */
+    assert(((uint32_t)dptr & 3) == 0);
+
+    block_len = rxpdu->om_omp->omp_databuf_len;
+    rem_len = OS_MBUF_PKTHDR(rxpdu)->omp_len;
+    src = dptr;
+
+    /*
+     * Setup for copying from first mbuf which is shorter due to packet header
+     * and extra leading space
+     */
+    copy_len = block_len - rxpdu->om_pkthdr_len - 4;
+    om = rxpdu;
+    dst = om->om_data;
+
+    while (true) {
+        /*
+         * Always copy blocks of length aligned to word size, only last mbuf
+         * will have remaining non-word size bytes appended.
+         */
+        block_rem_len = copy_len;
+        copy_len = min(copy_len, rem_len);
+        copy_len &= ~3;
+
+        dst = om->om_data;
+        om->om_len = copy_len;
+        rem_len -= copy_len;
+        block_rem_len -= copy_len;
+
+        __asm__ volatile (".syntax unified              \n"
+                          "   mov  r4, %[len]           \n"
+                          "   b    2f                   \n"
+                          "1: ldr  r3, [%[src], %[len]] \n"
+                          "   str  r3, [%[dst], %[len]] \n"
+                          "2: subs %[len], #4           \n"
+                          "   bpl  1b                   \n"
+                          "   adds %[src], %[src], r4   \n"
+                          "   adds %[dst], %[dst], r4   \n"
+                          : [dst] "+l" (dst), [src] "+l" (src),
+                            [len] "+l" (copy_len)
+                          :
+                          : "r3", "r4", "memory"
+                         );
+
+        if ((rem_len < 4) && (block_rem_len >= rem_len)) {
+            break;
+        }
+
+        /* Move to next mbuf */
+        om = SLIST_NEXT(om, om_next);
+        copy_len = block_len;
+    }
+
+    /* Copy remaining bytes, if any, to last mbuf */
+    om->om_len += rem_len;
+    __asm__ volatile (".syntax unified              \n"
+                      "   b    2f                   \n"
+                      "1: ldrb r3, [%[src], %[len]] \n"
+                      "   strb r3, [%[dst], %[len]] \n"
+                      "2: subs %[len], #1           \n"
+                      "   bpl  1b                   \n"
+                      : [len] "+l" (rem_len)
+                      : [dst] "l" (dst), [src] "l" (src)
+                      : "r3", "memory"
+                     );
+
+    /* Copy header */
+    memcpy(BLE_MBUF_HDR_PTR(rxpdu), &g_ble_phy_data.rxhdr,
+           sizeof(struct ble_mbuf_hdr));
+}
+
+/**
+ * Called when we want to wait if the radio is in either the rx or tx
+ * disable states. We want to wait until that state is over before doing
+ * anything to the radio
+ */
+static void
+nrf_wait_disabled(void)
+{
+    uint32_t state;
+
+    /*
+     * RX and TX states have the same values except for 3rd bit (0=RX, 1=TX) so
+     * we use RX symbols only.
+     */
+    state = NRF_RADIO->STATE & 0x07;
+
+    if (state != RADIO_STATE_STATE_Disabled) {
+        /* If PHY is in idle state for whatever reason, disable it now */
+        if (state == RADIO_STATE_STATE_RxIdle) {
+            NRF_RADIO->TASKS_DISABLE = 1;
+            STATS_INC(ble_phy_stats, radio_state_errs);
+        }
+
+        if (state == RADIO_STATE_STATE_RxDisable) {
+            /* This will end within a short time (6 usecs). Just poll */
+            while (NRF_RADIO->STATE == state) {
+                /* If this fails, something is really wrong. Should last
+                 * no more than 6 usecs */
+            }
+        }
+    }
+}
+
+/**
+ *
+ *
+ */
+int
+ble_phy_set_start_time(uint32_t cputime, uint8_t rem_usecs)
+{
+    uint32_t next_cc;
+    uint32_t cur_cc;
+    uint32_t cntr;
+    uint32_t delta;
+
+    /*
+     * XXX: The TXEN time is 140 usecs but there may be additional delays
+     * Need to look at this.
+     */
+
+    /*
+     * With the 32.768 kHz crystal, we may need to adjust the RTC compare
+     * value by 1 tick due to the time it takes for TXEN. The code uses a 5 RTC
+     * tick offset, which is 152.5 usecs. The TXEN time is 140 usecs. This
+     * means that with a remainder of 0, TIMER0 should be set to 12 or 13 (as
+     * TIMER0 counts at 1MHz). A remainder of 19 or more we will need to add
+     * 1 tick. We dont need to add 1 tick per se, but it does give us slightly
+     * more time and thus less of a chance to miss a tick. Another note: we
+     * cant set TIMER0 CC to 0 as the compare wont occur; it must be 1 or more.
+     * This is why we subtract 18 (as opposed to 19) as rem_uses will be >= 1.
+     */
+    if (rem_usecs <= 18) {
+        cputime -= 5;
+        rem_usecs += 12;
+    } else {
+        cputime -= 4;
+        rem_usecs -= 18;
+    }
+
+    /*
+     * Can we set the RTC compare to start TIMER0? We can do it if:
+     *      a) Current compare value is not N+1 or N+2 ticks from current
+     *      counter.
+     *      b) The value we want to set is not at least N+2 from current
+     *      counter.
+     *
+     * NOTE: since the counter can tick 1 while we do these calculations we
+     * need to account for it.
+     */
+    next_cc = cputime & 0xffffff;
+    cur_cc = NRF_RTC0->CC[0];
+    cntr = NRF_RTC0->COUNTER;
+
+    delta = (cur_cc - cntr) & 0xffffff;
+    if ((delta <= 3) && (delta != 0)) {
+        return -1;
+    }
+    delta = (next_cc - cntr) & 0xffffff;
+    if ((delta & 0x800000) || (delta < 3)) {
+        return -1;
+    }
+
+    /* Clear and set TIMER0 to fire off at proper time */
+    NRF_TIMER0->TASKS_CLEAR = 1;
+    NRF_TIMER0->CC[0] = rem_usecs;
+    NRF_TIMER0->EVENTS_COMPARE[0] = 0;
+
+    /* Set RTC compare to start TIMER0 */
+    NRF_RTC0->EVENTS_COMPARE[0] = 0;
+    NRF_RTC0->CC[0] = next_cc;
+    NRF_RTC0->EVTENSET = RTC_EVTENSET_COMPARE0_Msk;
+
+    /* Enable PPI */
+    NRF_PPI->CHENSET = PPI_CHEN_CH31_Msk;
+
+    /* Store the cputime at which we set the RTC */
+    g_ble_phy_data.phy_start_cputime = cputime;
+
+    return 0;
+}
+
+/**
+ * Function is used to set PPI so that we can time out waiting for a reception
+ * to occur. This happens for two reasons: we have sent a packet and we are
+ * waiting for a respons (txrx should be set to ENABLE_TXRX) or we are
+ * starting a connection event and we are a slave and we are waiting for the
+ * master to send us a packet (txrx should be set to ENABLE_RX).
+ *
+ * NOTE: when waiting for a txrx turn-around, wfr_usecs is not used as there
+ * is no additional time to wait; we know when we should receive the address of
+ * the received frame.
+ *
+ * @param txrx Flag denoting if this wfr is a txrx turn-around or not.
+ * @param tx_phy_mode phy mode for last TX (not used on nRF51)
+ * @param wfr_usecs Amount of usecs to wait.
+ */
+void
+ble_phy_wfr_enable(int txrx, uint8_t tx_phy_mode, uint32_t wfr_usecs)
+{
+    uint32_t end_time;
+
+    if (txrx == BLE_PHY_WFR_ENABLE_TXRX) {
+        /*
+         * Timeout occurs an IFS time plus time it takes to receive address
+         * from the transmit end. We add additional time to make sure the
+         * address event comes before the compare. Note that transmit end
+         * is captured in CC[2]. I just made up the 16 usecs I add here.
+         */
+        end_time = NRF_TIMER0->CC[2] + BLE_LL_IFS +
+            ble_phy_mode_pdu_start_off(BLE_PHY_MODE_1M) + 16;
+    } else {
+        /* CC[0] is set to when RXEN occurs. */
+        end_time = NRF_TIMER0->CC[0] + XCVR_RX_START_DELAY_USECS + wfr_usecs +
+            ble_phy_mode_pdu_start_off(BLE_PHY_MODE_1M) + BLE_LL_JITTER_USECS;
+    }
+
+    /* wfr_secs is the time from rxen until timeout */
+    NRF_TIMER0->CC[3] = end_time;
+    NRF_TIMER0->EVENTS_COMPARE[3] = 0;
+
+    /* Enable wait for response PPI */
+    NRF_PPI->CHENSET = (PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk);
+
+    /* Enable the disabled interrupt so we time out on events compare */
+    NRF_RADIO->INTENSET = RADIO_INTENSET_DISABLED_Msk;
+}
+
+/**
+ * Setup transceiver for receive.
+ */
+static void
+ble_phy_rx_xcvr_setup(void)
+{
+    uint8_t *dptr;
+
+    dptr = (uint8_t *)&g_ble_phy_rx_buf[0];
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    if (g_ble_phy_data.phy_encrypted) {
+        dptr += 3;
+        NRF_RADIO->PACKETPTR = (uint32_t)&g_ble_phy_enc_buf[0];
+        NRF_CCM->INPTR = (uint32_t)&g_ble_phy_enc_buf[0];
+        NRF_CCM->OUTPTR = (uint32_t)dptr;
+        NRF_CCM->SCRATCHPTR = (uint32_t)&g_nrf_encrypt_scratchpad[0];
+        NRF_CCM->MODE = CCM_MODE_MODE_Decryption;
+        NRF_CCM->CNFPTR = (uint32_t)&g_nrf_ccm_data;
+        NRF_CCM->SHORTS = 0;
+        NRF_CCM->EVENTS_ERROR = 0;
+        NRF_CCM->EVENTS_ENDCRYPT = 0;
+        NRF_PPI->CHENSET = PPI_CHEN_CH24_Msk | PPI_CHEN_CH25_Msk;
+    } else {
+        NRF_RADIO->PACKETPTR = (uint32_t)dptr;
+    }
+#else
+    NRF_RADIO->PACKETPTR = (uint32_t)dptr;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (g_ble_phy_data.phy_privacy) {
+        dptr += 3;
+        NRF_RADIO->PACKETPTR = (uint32_t)dptr;
+        NRF_RADIO->PCNF0 = (6 << RADIO_PCNF0_LFLEN_Pos) |
+                           (2 << RADIO_PCNF0_S1LEN_Pos) |
+                           (NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
+        NRF_AAR->ENABLE = AAR_ENABLE_ENABLE_Enabled;
+        NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
+        NRF_AAR->SCRATCHPTR = (uint32_t)&g_ble_phy_data.phy_aar_scratch;
+        NRF_AAR->EVENTS_END = 0;
+        NRF_AAR->EVENTS_RESOLVED = 0;
+        NRF_AAR->EVENTS_NOTRESOLVED = 0;
+    } else {
+        if (g_ble_phy_data.phy_encrypted == 0) {
+            NRF_RADIO->PCNF0 = (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) |
+                               (NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
+            /* XXX: do I only need to do this once? Figure out what I can do
+               once. */
+            NRF_AAR->ENABLE = AAR_ENABLE_ENABLE_Disabled;
+        }
+    }
+#endif
+
+    /* Turn off trigger TXEN on output compare match and AAR on bcmatch */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH20_Msk | PPI_CHEN_CH23_Msk;
+
+    /* Reset the rx started flag. Used for the wait for response */
+    g_ble_phy_data.phy_rx_started = 0;
+    g_ble_phy_data.phy_state = BLE_PHY_STATE_RX;
+    g_ble_phy_data.rxdptr = dptr;
+
+    /* I want to know when 1st byte received (after address) */
+    NRF_RADIO->BCC = 8; /* in bits */
+    NRF_RADIO->EVENTS_ADDRESS = 0;
+    NRF_RADIO->EVENTS_DEVMATCH = 0;
+    NRF_RADIO->EVENTS_BCMATCH = 0;
+    NRF_RADIO->EVENTS_RSSIEND = 0;
+    NRF_RADIO->SHORTS = RADIO_SHORTS_END_DISABLE_Msk |
+                        RADIO_SHORTS_READY_START_Msk |
+                        RADIO_SHORTS_DISABLED_TXEN_Msk |
+                        RADIO_SHORTS_ADDRESS_BCSTART_Msk |
+                        RADIO_SHORTS_ADDRESS_RSSISTART_Msk |
+                        RADIO_SHORTS_DISABLED_RSSISTOP_Msk;
+
+    NRF_RADIO->INTENSET = RADIO_INTENSET_ADDRESS_Msk;
+}
+
+/**
+ * Called from interrupt context when the transmit ends
+ *
+ */
+static void
+ble_phy_tx_end_isr(void)
+{
+    uint8_t was_encrypted;
+    uint8_t transition;
+    uint8_t txlen;
+    uint32_t wfr_time;
+
+    /* If this transmission was encrypted we need to remember it */
+    was_encrypted = g_ble_phy_data.phy_encrypted;
+    (void)was_encrypted;
+
+    /* Better be in TX state! */
+    assert(g_ble_phy_data.phy_state == BLE_PHY_STATE_TX);
+
+    /* Clear events and clear interrupt on disabled event */
+    NRF_RADIO->EVENTS_DISABLED = 0;
+    NRF_RADIO->INTENCLR = RADIO_INTENCLR_DISABLED_Msk;
+    NRF_RADIO->EVENTS_END = 0;
+    wfr_time = NRF_RADIO->SHORTS;
+    (void)wfr_time;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    /*
+     * XXX: not sure what to do. We had a HW error during transmission.
+     * For now I just count a stat but continue on like all is good.
+     */
+    if (was_encrypted) {
+        if (NRF_CCM->EVENTS_ERROR) {
+            STATS_INC(ble_phy_stats, tx_hw_err);
+            NRF_CCM->EVENTS_ERROR = 0;
+        }
+    }
+#endif
+
+    /* Call transmit end callback */
+    if (g_ble_phy_data.txend_cb) {
+        g_ble_phy_data.txend_cb(g_ble_phy_data.txend_arg);
+    }
+
+    transition = g_ble_phy_data.phy_transition;
+    if (transition == BLE_PHY_TRANSITION_TX_RX) {
+        /* Packet pointer needs to be reset. */
+        ble_phy_rx_xcvr_setup();
+
+        /*
+         * Enable the wait for response timer. Note that cc #1 on
+         * timer 0 contains the transmit start time
+         */
+        txlen = g_ble_phy_data.phy_tx_pyld_len;
+        if (txlen && was_encrypted) {
+            txlen += BLE_LL_DATA_MIC_LEN;
+        }
+        ble_phy_wfr_enable(BLE_PHY_WFR_ENABLE_TXRX, 0, 0);
+    } else {
+        /*
+         * XXX: not sure we need to stop the timer here all the time. Or that
+         * it should be stopped here.
+         */
+        NRF_TIMER0->TASKS_STOP = 1;
+        NRF_TIMER0->TASKS_SHUTDOWN = 1;
+        NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk |
+                           PPI_CHEN_CH20_Msk | PPI_CHEN_CH31_Msk;
+        assert(transition == BLE_PHY_TRANSITION_NONE);
+    }
+}
+
+static void
+ble_phy_rx_end_isr(void)
+{
+    int rc;
+    uint8_t *dptr;
+    uint8_t crcok;
+    struct ble_mbuf_hdr *ble_hdr;
+
+    /* Clear events and clear interrupt */
+    NRF_RADIO->EVENTS_END = 0;
+    NRF_RADIO->INTENCLR = RADIO_INTENCLR_END_Msk;
+
+    /* Disable automatic RXEN */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH21_Msk;
+
+    /* Set RSSI and CRC status flag in header */
+    ble_hdr = &g_ble_phy_data.rxhdr;
+    assert(NRF_RADIO->EVENTS_RSSIEND != 0);
+    ble_hdr->rxinfo.rssi = (-1 * NRF_RADIO->RSSISAMPLE) +
+                            g_ble_phy_data.rx_pwr_compensation;
+
+    dptr = g_ble_phy_data.rxdptr;
+
+    /* Count PHY crc errors and valid packets */
+    crcok = (uint8_t)NRF_RADIO->CRCSTATUS;
+    if (!crcok) {
+        STATS_INC(ble_phy_stats, rx_crc_err);
+    } else {
+        STATS_INC(ble_phy_stats, rx_valid);
+        ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_CRC_OK;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        if (g_ble_phy_data.phy_encrypted) {
+            /* Only set MIC failure flag if frame is not zero length */
+            if ((dptr[1] != 0) && (NRF_CCM->MICSTATUS == 0)) {
+                ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_MIC_FAILURE;
+            }
+
+            /*
+             * XXX: not sure how to deal with this. This should not
+             * be a MIC failure but we should not hand it up. I guess
+             * this is just some form of rx error and that is how we
+             * handle it? For now, just set CRC error flags
+             */
+            if (NRF_CCM->EVENTS_ERROR) {
+                STATS_INC(ble_phy_stats, rx_hw_err);
+                ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
+            }
+
+            /*
+             * XXX: This is a total hack work-around for now but I dont
+             * know what else to do. If ENDCRYPT is not set and we are
+             * encrypted we need to not trust this frame and drop it.
+             */
+            if (NRF_CCM->EVENTS_ENDCRYPT == 0) {
+                STATS_INC(ble_phy_stats, rx_hw_err);
+                ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
+            }
+        }
+#endif
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION) || MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (g_ble_phy_data.phy_encrypted || g_ble_phy_data.phy_privacy) {
+        /*
+         * XXX: This is a horrible ugly hack to deal with the RAM S1 byte.
+         * This should get fixed as we should not be handing up the header
+         * and length as part of the pdu.
+         */
+        dptr[2] = dptr[1];
+        dptr[1] = dptr[0];
+        ++dptr;
+    }
+#endif
+    rc = ble_ll_rx_end(dptr, ble_hdr);
+    if (rc < 0) {
+        ble_phy_disable();
+    }
+}
+
+static void
+ble_phy_rx_start_isr(void)
+{
+    int rc;
+    uint32_t state;
+    uint32_t usecs;
+    uint32_t ticks;
+    struct ble_mbuf_hdr *ble_hdr;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    uint8_t *dptr;
+
+    dptr = (uint8_t *)&g_ble_phy_rx_buf[0];
+#endif
+
+    /* Clear events and clear interrupt */
+    NRF_RADIO->EVENTS_ADDRESS = 0;
+
+    /* Clear wfr timer channels and DISABLED interrupt */
+    NRF_RADIO->INTENCLR = RADIO_INTENCLR_DISABLED_Msk | RADIO_INTENCLR_ADDRESS_Msk;
+    NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk;
+
+    /* Initialize flags, channel and state in ble header at rx start */
+    ble_hdr = &g_ble_phy_data.rxhdr;
+    ble_hdr->rxinfo.flags = ble_ll_state_get();
+    ble_hdr->rxinfo.channel = g_ble_phy_data.phy_chan;
+    ble_hdr->rxinfo.handle = 0;
+    ble_hdr->rxinfo.phy = BLE_PHY_1M;
+    ble_hdr->rxinfo.phy_mode = BLE_PHY_MODE_1M;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    ble_hdr->rxinfo.user_data = NULL;
+#endif
+
+    /*
+     * Calculate receive start time.
+     *
+     * XXX: possibly use other routine with remainder!
+     */
+    usecs = NRF_TIMER0->CC[1] - ble_phy_mode_pdu_start_off(BLE_PHY_MODE_1M);
+    ticks = os_cputime_usecs_to_ticks(usecs);
+    ble_hdr->rem_usecs = usecs - os_cputime_ticks_to_usecs(ticks);
+    if (ble_hdr->rem_usecs == 31) {
+        ble_hdr->rem_usecs = 0;
+        ++ticks;
+    }
+    ble_hdr->beg_cputime = g_ble_phy_data.phy_start_cputime + ticks;
+
+    /* Wait to get 1st byte of frame */
+    while (1) {
+        state = NRF_RADIO->STATE;
+        if (NRF_RADIO->EVENTS_BCMATCH != 0) {
+            break;
+        }
+
+        /*
+         * If state is disabled, we should have the BCMATCH. If not,
+         * something is wrong!
+         */
+        if (state == RADIO_STATE_STATE_Disabled) {
+            NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+            NRF_RADIO->SHORTS = 0;
+            return;
+        }
+    }
+
+    /* Call Link Layer receive start function */
+    rc = ble_ll_rx_start(g_ble_phy_data.rxdptr, g_ble_phy_data.phy_chan,
+                         &g_ble_phy_data.rxhdr);
+    if (rc >= 0) {
+        /* Set rx started flag and enable rx end ISR */
+        g_ble_phy_data.phy_rx_started = 1;
+        NRF_RADIO->INTENSET = RADIO_INTENSET_END_Msk;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        /* Must start aar if we need to  */
+        if (g_ble_phy_data.phy_privacy) {
+            NRF_RADIO->EVENTS_BCMATCH = 0;
+            NRF_PPI->CHENSET = PPI_CHEN_CH23_Msk;
+            /*
+             * Setup AAR to resolve AdvA and trigger it after complete address
+             * is received, i.e. after PDU header and AdvA is received.
+             *
+             * AdvA starts at 4th octet in receive buffer, after S0, len and S1
+             * fields.
+             *
+             * In case of extended advertising AdvA is located after extended
+             * header (+2 octets).
+             */
+            if (BLE_MBUF_HDR_EXT_ADV(&g_ble_phy_data.rxhdr)) {
+                NRF_AAR->ADDRPTR = (uint32_t)(dptr + 5);
+                NRF_RADIO->BCC = (BLE_DEV_ADDR_LEN + BLE_LL_PDU_HDR_LEN + 2) * 8;
+
+            } else {
+                NRF_AAR->ADDRPTR = (uint32_t)(dptr + 3);
+                NRF_RADIO->BCC = (BLE_DEV_ADDR_LEN + BLE_LL_PDU_HDR_LEN) * 8;
+            }
+        }
+#endif
+    } else {
+        /* Disable PHY */
+        ble_phy_disable();
+        STATS_INC(ble_phy_stats, rx_aborts);
+    }
+
+    /* Count rx starts */
+    STATS_INC(ble_phy_stats, rx_starts);
+}
+
+static void
+ble_phy_isr(void)
+{
+    uint32_t irq_en;
+
+    os_trace_isr_enter();
+
+    /* Read irq register to determine which interrupts are enabled */
+    irq_en = NRF_RADIO->INTENCLR;
+
+    /*
+     * NOTE: order of checking is important! Possible, if things get delayed,
+     * we have both an ADDRESS and DISABLED interrupt in rx state. If we get
+     * an address, we disable the DISABLED interrupt.
+     */
+
+    /* We get this if we have started to receive a frame */
+    if ((irq_en & RADIO_INTENCLR_ADDRESS_Msk) && NRF_RADIO->EVENTS_ADDRESS) {
+        irq_en &= ~RADIO_INTENCLR_DISABLED_Msk;
+        ble_phy_rx_start_isr();
+    }
+
+    /* Check for disabled event. This only happens for transmits now */
+    if ((irq_en & RADIO_INTENCLR_DISABLED_Msk) && NRF_RADIO->EVENTS_DISABLED) {
+        if (g_ble_phy_data.phy_state == BLE_PHY_STATE_RX) {
+            NRF_RADIO->EVENTS_DISABLED = 0;
+            ble_ll_wfr_timer_exp(NULL);
+        } else {
+            ble_phy_tx_end_isr();
+        }
+    }
+
+    /* Receive packet end (we dont enable this for transmit) */
+    if ((irq_en & RADIO_INTENCLR_END_Msk) && NRF_RADIO->EVENTS_END) {
+        ble_phy_rx_end_isr();
+    }
+
+    /* Ensures IRQ is cleared */
+    irq_en = NRF_RADIO->SHORTS;
+
+    /* Count # of interrupts */
+    STATS_INC(ble_phy_stats, phy_isrs);
+
+    os_trace_isr_exit();
+}
+
+/**
+ * ble phy init
+ *
+ * Initialize the PHY.
+ *
+ * @return int 0: success; PHY error code otherwise
+ */
+int
+ble_phy_init(void)
+{
+    int rc;
+
+    /* Set phy channel to an invalid channel so first set channel works */
+    g_ble_phy_data.phy_chan = BLE_PHY_NUM_CHANS;
+
+    g_ble_phy_data.rx_pwr_compensation = 0;
+
+    /* Toggle peripheral power to reset (just in case) */
+    NRF_RADIO->POWER = 0;
+    NRF_RADIO->POWER = 1;
+
+    /* Disable all interrupts */
+    NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+
+    /* Set configuration registers */
+    NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_1Mbit;
+    NRF_RADIO->PCNF0 = (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) |
+                       (NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
+    /* XXX: should maxlen be 251 for encryption? */
+    NRF_RADIO->PCNF1 = NRF_MAXLEN |
+                       (RADIO_PCNF1_ENDIAN_Little <<  RADIO_PCNF1_ENDIAN_Pos) |
+                       (NRF_BALEN << RADIO_PCNF1_BALEN_Pos) |
+                       RADIO_PCNF1_WHITEEN_Msk;
+
+    /* Set base0 with the advertising access address */
+    NRF_RADIO->BASE0 = (BLE_ACCESS_ADDR_ADV << 8) & 0xFFFFFF00;
+    NRF_RADIO->PREFIX0 = (BLE_ACCESS_ADDR_ADV >> 24) & 0xFF;
+
+    /* Configure the CRC registers */
+    NRF_RADIO->CRCCNF = RADIO_CRCCNF_SKIPADDR_Msk | RADIO_CRCCNF_LEN_Three;
+
+    /* Configure BLE poly */
+    NRF_RADIO->CRCPOLY = 0x0100065B;
+
+    /* Configure IFS */
+    NRF_RADIO->TIFS = BLE_LL_IFS;
+
+    /* Captures tx/rx start in timer0 cc 1 and tx/rx end in timer0 cc 2 */
+    NRF_PPI->CHENSET = PPI_CHEN_CH26_Msk | PPI_CHEN_CH27_Msk;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    NRF_CCM->INTENCLR = 0xffffffff;
+    NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
+    NRF_CCM->EVENTS_ERROR = 0;
+    memset(g_nrf_encrypt_scratchpad, 0, sizeof(g_nrf_encrypt_scratchpad));
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    g_ble_phy_data.phy_aar_scratch = 0;
+    NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
+    NRF_AAR->INTENCLR = 0xffffffff;
+    NRF_AAR->EVENTS_END = 0;
+    NRF_AAR->EVENTS_RESOLVED = 0;
+    NRF_AAR->EVENTS_NOTRESOLVED = 0;
+    NRF_AAR->NIRK = 0;
+#endif
+
+    /* TIMER0 setup for PHY when using RTC */
+    NRF_TIMER0->TASKS_STOP = 1;
+    NRF_TIMER0->TASKS_SHUTDOWN = 1;
+    NRF_TIMER0->BITMODE = 3;    /* 32-bit timer */
+    NRF_TIMER0->MODE = 0;       /* Timer mode */
+    NRF_TIMER0->PRESCALER = 4;  /* gives us 1 MHz */
+
+    /*
+     * PPI setup.
+     * Channel 4: Captures TIMER0 in CC[3] when EVENTS_ADDRESS occurs. Used
+     *            to cancel the wait for response timer.
+     * Channel 5: TIMER0 CC[3] to TASKS_DISABLE on radio. This is the wait
+     *            for response timer.
+     */
+    NRF_PPI->CH[4].EEP = (uint32_t)&(NRF_RADIO->EVENTS_ADDRESS);
+    NRF_PPI->CH[4].TEP = (uint32_t)&(NRF_TIMER0->TASKS_CAPTURE[3]);
+    NRF_PPI->CH[5].EEP = (uint32_t)&(NRF_TIMER0->EVENTS_COMPARE[3]);
+    NRF_PPI->CH[5].TEP = (uint32_t)&(NRF_RADIO->TASKS_DISABLE);
+
+    /* Set isr in vector table and enable interrupt */
+#ifndef RIOT_VERSION
+    NVIC_SetPriority(RADIO_IRQn, 0);
+#endif
+#if MYNEWT
+    NVIC_SetVector(RADIO_IRQn, (uint32_t)ble_phy_isr);
+#else
+    ble_npl_hw_set_isr(RADIO_IRQn, ble_phy_isr);
+#endif
+    NVIC_EnableIRQ(RADIO_IRQn);
+
+    /* Register phy statistics */
+    if (!g_ble_phy_data.phy_stats_initialized) {
+        rc = stats_init_and_reg(STATS_HDR(ble_phy_stats),
+                                STATS_SIZE_INIT_PARMS(ble_phy_stats,
+                                                      STATS_SIZE_32),
+                                STATS_NAME_INIT_PARMS(ble_phy_stats),
+                                "ble_phy");
+        assert(rc == 0);
+
+        g_ble_phy_data.phy_stats_initialized  = 1;
+    }
+
+    return 0;
+}
+
+/**
+ * Puts the phy into receive mode.
+ *
+ * @return int 0: success; BLE Phy error code otherwise
+ */
+int
+ble_phy_rx(void)
+{
+    /* Check radio state */
+    nrf_wait_disabled();
+    if (NRF_RADIO->STATE != RADIO_STATE_STATE_Disabled) {
+        ble_phy_disable();
+        STATS_INC(ble_phy_stats, radio_state_errs);
+        return BLE_PHY_ERR_RADIO_STATE;
+    }
+
+    /* Make sure all interrupts are disabled */
+    NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+
+    /* Clear events prior to enabling receive */
+    NRF_RADIO->EVENTS_END = 0;
+    NRF_RADIO->EVENTS_DISABLED = 0;
+
+    /* Setup for rx */
+    ble_phy_rx_xcvr_setup();
+
+    /* Start the receive task in the radio if not automatically going to rx */
+    if ((NRF_PPI->CHEN & PPI_CHEN_CH21_Msk) == 0) {
+        NRF_RADIO->TASKS_RXEN = 1;
+    }
+
+    return 0;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/**
+ * Called to enable encryption at the PHY. Note that this state will persist
+ * in the PHY; in other words, if you call this function you have to call
+ * disable so that future PHY transmits/receives will not be encrypted.
+ *
+ * @param pkt_counter
+ * @param iv
+ * @param key
+ * @param is_master
+ */
+void
+ble_phy_encrypt_enable(uint64_t pkt_counter, uint8_t *iv, uint8_t *key,
+                       uint8_t is_master)
+{
+    memcpy(g_nrf_ccm_data.key, key, 16);
+    g_nrf_ccm_data.pkt_counter = pkt_counter;
+    memcpy(g_nrf_ccm_data.iv, iv, 8);
+    g_nrf_ccm_data.dir_bit = is_master;
+    g_ble_phy_data.phy_encrypted = 1;
+
+    /* Encryption uses LFLEN=5, S1LEN = 3. */
+    NRF_RADIO->PCNF0 = (5 << RADIO_PCNF0_LFLEN_Pos) |
+                       (3 << RADIO_PCNF0_S1LEN_Pos) |
+                       (NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
+
+    /* Enable the module (AAR cannot be on while CCM on) */
+    NRF_AAR->ENABLE = AAR_ENABLE_ENABLE_Disabled;
+    NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Enabled;
+}
+
+void
+ble_phy_encrypt_set_pkt_cntr(uint64_t pkt_counter, int dir)
+{
+    g_nrf_ccm_data.pkt_counter = pkt_counter;
+    g_nrf_ccm_data.dir_bit = dir;
+}
+
+void
+ble_phy_encrypt_disable(void)
+{
+    NRF_PPI->CHENCLR = (PPI_CHEN_CH24_Msk | PPI_CHEN_CH25_Msk);
+    NRF_CCM->TASKS_STOP = 1;
+    NRF_CCM->EVENTS_ERROR = 0;
+    NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Disabled;
+
+    /* Switch back to normal length */
+    NRF_RADIO->PCNF0 = (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) |
+                       (NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
+
+    g_ble_phy_data.phy_encrypted = 0;
+}
+#endif
+
+void
+ble_phy_set_txend_cb(ble_phy_tx_end_func txend_cb, void *arg)
+{
+    /* Set transmit end callback and arg */
+    g_ble_phy_data.txend_cb = txend_cb;
+    g_ble_phy_data.txend_arg = arg;
+}
+
+/**
+ * Called to set the start time of a transmission.
+ *
+ * This function is called to set the start time when we are not going from
+ * rx to tx automatically.
+ *
+ * NOTE: care must be taken when calling this function. The channel should
+ * already be set.
+ *
+ * @param cputime   This is the tick at which the 1st bit of the preamble
+ *                  should be transmitted
+ * @param rem_usecs This is used only when the underlying timing uses a 32.768
+ *                  kHz crystal. It is the # of usecs from the cputime tick
+ *                  at which the first bit of the preamble should be
+ *                  transmitted.
+ * @return int
+ */
+int
+ble_phy_tx_set_start_time(uint32_t cputime, uint8_t rem_usecs)
+{
+    int rc;
+
+    ble_phy_trace_u32x2(BLE_PHY_TRACE_ID_START_TX, cputime, rem_usecs);
+
+    /* XXX: This should not be necessary, but paranoia is good! */
+    /* Clear timer0 compare to RXEN since we are transmitting */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH21_Msk;
+
+    /*
+     * XXX: The TXEN time is 140 usecs but there may be additional delays
+     * Need to look at this.
+     */
+    if (ble_phy_set_start_time(cputime, rem_usecs) != 0) {
+        STATS_INC(ble_phy_stats, tx_late);
+        ble_phy_disable();
+        rc = BLE_PHY_ERR_TX_LATE;
+    } else {
+        /* Enable PPI to automatically start TXEN */
+        NRF_PPI->CHENSET = PPI_CHEN_CH20_Msk;
+        rc = 0;
+    }
+    return rc;
+}
+/**
+ * Called to set the start time of a reception
+ *
+ * This function acts a bit differently than transmit. If we are late getting
+ * here we will still attempt to receive.
+ *
+ * NOTE: care must be taken when calling this function. The channel should
+ * already be set.
+ *
+ * @param cputime
+ *
+ * @return int
+ */
+int
+ble_phy_rx_set_start_time(uint32_t cputime, uint8_t rem_usecs)
+{
+    int rc;
+
+    ble_phy_trace_u32x2(BLE_PHY_TRACE_ID_START_RX, cputime, rem_usecs);
+
+    /* XXX: This should not be necessary, but paranoia is good! */
+    /* Clear timer0 compare to TXEN since we are transmitting */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH20_Msk;
+
+    /*
+     * XXX: The RXEN time is 138 usecs but there may be additional delays
+     * Need to look at this.
+     */
+    if (ble_phy_set_start_time(cputime, rem_usecs) != 0) {
+        STATS_INC(ble_phy_stats, rx_late);
+        NRF_PPI->CHENCLR = PPI_CHEN_CH21_Msk;
+        NRF_RADIO->TASKS_RXEN = 1;
+        rc = BLE_PHY_ERR_RX_LATE;
+    } else {
+        /* Enable PPI to automatically start RXEN */
+        NRF_PPI->CHENSET = PPI_CHEN_CH21_Msk;
+
+        /* Start rx */
+        rc = ble_phy_rx();
+    }
+    return rc;
+}
+
+int
+ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
+{
+    int rc;
+    uint8_t *dptr;
+    uint8_t payload_len;
+    uint8_t payload_off;
+    uint8_t hdr_byte;
+    uint32_t state;
+    uint32_t shortcuts;
+
+    /*
+     * This check is to make sure that the radio is not in a state where
+     * it is moving to disabled state. If so, let it get there.
+     */
+    nrf_wait_disabled();
+
+    /*
+     * XXX: Although we may not have to do this here, I clear all the PPI
+     * that should not be used when transmitting. Some of them are only enabled
+     * if encryption and/or privacy is on, but I dont care. Better to be
+     * paranoid, and if you are going to clear one, might as well clear them
+     * all.
+     */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk | PPI_CHEN_CH23_Msk |
+                       PPI_CHEN_CH25_Msk;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    if (g_ble_phy_data.phy_encrypted) {
+        /* RAM representation has S0, LENGTH and S1 fields. (3 bytes) */
+        dptr = (uint8_t *)&g_ble_phy_enc_buf[0];
+        payload_off = 3;
+
+        NRF_CCM->SHORTS = 1;
+        NRF_CCM->INPTR = (uint32_t)&g_ble_phy_enc_buf[0];
+        NRF_CCM->OUTPTR = (uint32_t)&g_ble_phy_tx_buf[0];
+        NRF_CCM->SCRATCHPTR = (uint32_t)&g_nrf_encrypt_scratchpad[0];
+        NRF_CCM->EVENTS_ERROR = 0;
+        NRF_CCM->MODE = CCM_MODE_MODE_Encryption;
+        NRF_CCM->CNFPTR = (uint32_t)&g_nrf_ccm_data;
+        NRF_PPI->CHENSET = PPI_CHEN_CH24_Msk;
+    } else {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        /* Reconfigure PCNF0 */
+        NRF_RADIO->PCNF0 = (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) |
+                           (NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
+        NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
+#endif
+        /* RAM representation has S0 and LENGTH fields (2 bytes) */
+        dptr = (uint8_t *)&g_ble_phy_tx_buf[0];
+        payload_off = 2;
+    }
+#else
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /* Reconfigure PCNF0 */
+    NRF_RADIO->PCNF0 = (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) |
+                       (NRF_S0_LEN << RADIO_PCNF0_S0LEN_Pos);
+#endif
+
+    /* RAM representation has S0 and LENGTH fields (2 bytes) */
+    dptr = (uint8_t *)&g_ble_phy_tx_buf[0];
+    payload_off = 2;
+#endif
+
+    NRF_RADIO->PACKETPTR = (uint32_t)&g_ble_phy_tx_buf[0];
+
+    /* Clear the ready, end and disabled events */
+    NRF_RADIO->EVENTS_READY = 0;
+    NRF_RADIO->EVENTS_END = 0;
+    NRF_RADIO->EVENTS_DISABLED = 0;
+
+    /* Enable shortcuts for transmit start/end. */
+    shortcuts = RADIO_SHORTS_END_DISABLE_Msk | RADIO_SHORTS_READY_START_Msk;
+    if (end_trans == BLE_PHY_TRANSITION_TX_RX) {
+        shortcuts |= RADIO_SHORTS_DISABLED_RXEN_Msk;
+    }
+    NRF_RADIO->SHORTS = shortcuts;
+    NRF_RADIO->INTENSET = RADIO_INTENSET_DISABLED_Msk;
+
+    /* Set PDU payload */
+    payload_len = pducb(&dptr[payload_off], pducb_arg, &hdr_byte);
+
+    /* Set PDU header */
+    dptr[0] = hdr_byte;
+    dptr[1] = payload_len;
+    if (payload_off > 2) {
+        dptr[2] = 0;
+    }
+
+    /* Set the PHY transition */
+    g_ble_phy_data.phy_transition = end_trans;
+
+    /* Set transmitted payload length */
+    g_ble_phy_data.phy_tx_pyld_len = payload_len;
+
+    /* If we already started transmitting, abort it! */
+    state = NRF_RADIO->STATE;
+    if (state != RADIO_STATE_STATE_Tx) {
+
+        /* Set phy state to transmitting and count packet statistics */
+        g_ble_phy_data.phy_state = BLE_PHY_STATE_TX;
+        STATS_INC(ble_phy_stats, tx_good);
+        STATS_INCN(ble_phy_stats, tx_bytes, payload_len + BLE_LL_PDU_HDR_LEN);
+        rc = BLE_ERR_SUCCESS;
+    } else {
+        ble_phy_disable();
+        STATS_INC(ble_phy_stats, tx_late);
+        rc = BLE_PHY_ERR_RADIO_STATE;
+    }
+
+    return rc;
+}
+
+/**
+ * ble phy txpwr set
+ *
+ * Set the transmit output power (in dBm).
+ *
+ * NOTE: If the output power specified is within the BLE limits but outside
+ * the chip limits, we "rail" the power level so we dont exceed the min/max
+ * chip values.
+ *
+ * @param dbm Power output in dBm.
+ *
+ * @return int 0: success; anything else is an error
+ */
+int
+ble_phy_txpwr_set(int dbm)
+{
+    /* Check valid range */
+    assert(dbm <= BLE_PHY_MAX_PWR_DBM);
+
+    /* "Rail" power level if outside supported range */
+    if (dbm > NRF_TX_PWR_MAX_DBM) {
+        dbm = NRF_TX_PWR_MAX_DBM;
+    } else {
+        if (dbm < NRF_TX_PWR_MIN_DBM) {
+            dbm = NRF_TX_PWR_MIN_DBM;
+        }
+    }
+
+    NRF_RADIO->TXPOWER = dbm;
+    g_ble_phy_data.phy_txpwr_dbm = dbm;
+
+    return 0;
+}
+
+/**
+ * ble phy txpwr round
+ *
+ * Get the rounded transmit output power (in dBm).
+ *
+ * @param dbm Power output in dBm.
+ *
+ * @return int Rounded power in dBm
+ */
+int ble_phy_txpower_round(int dbm)
+{
+    /* "Rail" power level if outside supported range */
+    if (dbm > NRF_TX_PWR_MAX_DBM) {
+        dbm = NRF_TX_PWR_MAX_DBM;
+    } else {
+        if (dbm < NRF_TX_PWR_MIN_DBM) {
+            dbm = NRF_TX_PWR_MIN_DBM;
+        }
+    }
+
+    return dbm;
+}
+
+/**
+ * ble phy txpwr get
+ *
+ * Get the transmit power.
+ *
+ * @return int  The current PHY transmit power, in dBm
+ */
+int
+ble_phy_txpwr_get(void)
+{
+    return g_ble_phy_data.phy_txpwr_dbm;
+}
+
+void
+ble_phy_set_rx_pwr_compensation(int8_t compensation)
+{
+    g_ble_phy_data.rx_pwr_compensation = compensation;
+}
+
+/**
+ * ble phy setchan
+ *
+ * Sets the logical frequency of the transceiver. The input parameter is the
+ * BLE channel index (0 to 39, inclusive). The NRF frequency register works like
+ * this: logical frequency = 2400 + FREQ (MHz).
+ *
+ * Thus, to get a logical frequency of 2402 MHz, you would program the
+ * FREQUENCY register to 2.
+ *
+ * @param chan This is the Data Channel Index or Advertising Channel index
+ *
+ * @return int 0: success; PHY error code otherwise
+ */
+int
+ble_phy_setchan(uint8_t chan, uint32_t access_addr, uint32_t crcinit)
+{
+    uint32_t prefix;
+
+    assert(chan < BLE_PHY_NUM_CHANS);
+
+    /* Check for valid channel range */
+    if (chan >= BLE_PHY_NUM_CHANS) {
+        return BLE_PHY_ERR_INV_PARAM;
+    }
+
+    /* Get correct frequency */
+    if (chan < BLE_PHY_NUM_DATA_CHANS) {
+        /* Set current access address */
+        g_ble_phy_data.phy_access_address = access_addr;
+
+        /* Configure logical address 1 and crcinit */
+        prefix = NRF_RADIO->PREFIX0;
+        prefix &= 0xffff00ff;
+        prefix |= ((access_addr >> 24) & 0xFF) << 8;
+        NRF_RADIO->BASE1 = (access_addr << 8) & 0xFFFFFF00;
+        NRF_RADIO->PREFIX0 = prefix;
+        NRF_RADIO->TXADDRESS = 1;
+        NRF_RADIO->RXADDRESSES = (1 << 1);
+        NRF_RADIO->CRCINIT = crcinit;
+    } else {
+        /* Logical adddress 0 preconfigured */
+        NRF_RADIO->TXADDRESS = 0;
+        NRF_RADIO->RXADDRESSES = (1 << 0);
+        NRF_RADIO->CRCINIT = BLE_LL_CRCINIT_ADV;
+
+        /* Set current access address */
+        g_ble_phy_data.phy_access_address = BLE_ACCESS_ADDR_ADV;
+    }
+
+    /* Set the frequency and the data whitening initial value */
+    g_ble_phy_data.phy_chan = chan;
+    NRF_RADIO->FREQUENCY = g_ble_phy_chan_freq[chan];
+    NRF_RADIO->DATAWHITEIV = chan;
+
+    return 0;
+}
+
+/**
+ * Stop the timer used to count microseconds when using RTC for cputime
+ */
+static void
+ble_phy_stop_usec_timer(void)
+{
+    NRF_TIMER0->TASKS_STOP = 1;
+    NRF_TIMER0->TASKS_SHUTDOWN = 1;
+    NRF_RTC0->EVTENCLR = RTC_EVTENSET_COMPARE0_Msk;
+}
+
+/**
+ * ble phy disable irq and ppi
+ *
+ * This routine is to be called when reception was stopped due to either a
+ * wait for response timeout or a packet being received and the phy is to be
+ * restarted in receive mode. Generally, the disable routine is called to stop
+ * the phy.
+ */
+static void
+ble_phy_disable_irq_and_ppi(void)
+{
+    NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+    NRF_RADIO->SHORTS = 0;
+    NRF_RADIO->TASKS_DISABLE = 1;
+    NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk | PPI_CHEN_CH20_Msk |
+          PPI_CHEN_CH21_Msk | PPI_CHEN_CH23_Msk | PPI_CHEN_CH24_Msk |
+          PPI_CHEN_CH25_Msk | PPI_CHEN_CH31_Msk;
+    NVIC_ClearPendingIRQ(RADIO_IRQn);
+    g_ble_phy_data.phy_state = BLE_PHY_STATE_IDLE;
+}
+
+void
+ble_phy_restart_rx(void)
+{
+    ble_phy_stop_usec_timer();
+    ble_phy_disable_irq_and_ppi();
+    ble_phy_rx();
+}
+
+/**
+ * ble phy disable
+ *
+ * Disables the PHY. This should be called when an event is over. It stops
+ * the usec timer (if used), disables interrupts, disables the RADIO, disables
+ * PPI and sets state to idle.
+ */
+void
+ble_phy_disable(void)
+{
+    ble_phy_trace_void(BLE_PHY_TRACE_ID_DISABLE);
+
+    ble_phy_stop_usec_timer();
+    ble_phy_disable_irq_and_ppi();
+}
+
+/* Gets the current access address */
+uint32_t ble_phy_access_addr_get(void)
+{
+    return g_ble_phy_data.phy_access_address;
+}
+
+/**
+ * Return the phy state
+ *
+ * @return int The current PHY state.
+ */
+int
+ble_phy_state_get(void)
+{
+    return g_ble_phy_data.phy_state;
+}
+
+/**
+ * Called to see if a reception has started
+ *
+ * @return int
+ */
+int
+ble_phy_rx_started(void)
+{
+    return g_ble_phy_data.phy_rx_started;
+}
+
+/**
+ * Return the transceiver state
+ *
+ * @return int transceiver state.
+ */
+uint8_t
+ble_phy_xcvr_state_get(void)
+{
+    uint32_t state;
+    state = NRF_RADIO->STATE;
+    return (uint8_t)state;
+}
+
+/**
+ * Called to return the maximum data pdu payload length supported by the
+ * phy. For this chip, if encryption is enabled, the maximum payload is 27
+ * bytes.
+ *
+ * @return uint8_t Maximum data channel PDU payload size supported
+ */
+uint8_t
+ble_phy_max_data_pdu_pyld(void)
+{
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    return NRF_MAX_ENCRYPTED_PYLD_LEN;
+#else
+    return BLE_LL_DATA_PDU_MAX_PYLD;
+#endif
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+void
+ble_phy_resolv_list_enable(void)
+{
+    NRF_AAR->NIRK = (uint32_t)g_nrf_num_irks;
+    g_ble_phy_data.phy_privacy = 1;
+}
+
+void
+ble_phy_resolv_list_disable(void)
+{
+    g_ble_phy_data.phy_privacy = 0;
+}
+#endif
+
+void
+ble_phy_rfclk_enable(void)
+{
+#if MYNEWT
+    nrf51_clock_hfxo_request();
+#else
+    NRF_CLOCK->TASKS_HFCLKSTART = 1;
+#endif
+}
+
+void
+ble_phy_rfclk_disable(void)
+{
+#if MYNEWT
+    nrf51_clock_hfxo_release();
+#else
+    NRF_CLOCK->TASKS_HFCLKSTOP = 1;
+#endif
+}
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/include/ble/xcvr.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/include/ble/xcvr.h
new file mode 100644
index 000000000..fd8e1e898
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/include/ble/xcvr.h
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+
+#ifndef H_BLE_XCVR_
+#define H_BLE_XCVR_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define XCVR_RX_RADIO_RAMPUP_USECS  (40)
+#define XCVR_TX_RADIO_RAMPUP_USECS  (40)
+
+/*
+ * NOTE: we have to account for the RTC output compare issue. We want it to be
+ * 5 ticks.
+ */
+#define XCVR_PROC_DELAY_USECS         (153)
+#define XCVR_RX_START_DELAY_USECS     (XCVR_RX_RADIO_RAMPUP_USECS)
+#define XCVR_TX_START_DELAY_USECS     (XCVR_TX_RADIO_RAMPUP_USECS)
+#define XCVR_TX_SCHED_DELAY_USECS     \
+    (XCVR_TX_START_DELAY_USECS + XCVR_PROC_DELAY_USECS)
+#define XCVR_RX_SCHED_DELAY_USECS     \
+    (XCVR_RX_START_DELAY_USECS + XCVR_PROC_DELAY_USECS)
+
+/*
+ * Define HW whitelist size. This is the total possible whitelist size;
+ * not necessarily the size that will be used (may be smaller)
+ */
+#define BLE_HW_WHITE_LIST_SIZE        (8)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* H_BLE_XCVR_ */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/pkg.yml
new file mode 100644
index 000000000..a1ff457e6
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/pkg.yml
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/drivers/nrf52
+pkg.description: BLE driver for nRF52 systems.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.apis: ble_driver
+pkg.deps:
+    - nimble
+    - nimble/controller
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_hw.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_hw.c
new file mode 100644
index 000000000..400fddf6f
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_hw.c
@@ -0,0 +1,491 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+
+#include <stdint.h>
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "../include/ble/xcvr.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nrf.h"
+#include "nimble/nimble/controller/include/controller/ble_hw.h"
+#if MYNEWT
+#include "mcu/cmsis_nvic.h"
+#else
+#include "core_cm4.h"
+#include "nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h"
+#endif
+#include "nimble/porting/nimble/include/os/os_trace_api.h"
+
+/* Total number of resolving list elements */
+#define BLE_HW_RESOLV_LIST_SIZE     (16)
+
+/* We use this to keep track of which entries are set to valid addresses */
+static uint8_t g_ble_hw_whitelist_mask;
+
+/* Random number generator isr callback */
+ble_rng_isr_cb_t g_ble_rng_isr_cb;
+
+/* If LL privacy is enabled, allocate memory for AAR */
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+
+/* The NRF51 supports up to 16 IRK entries */
+#if (MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE) < 16)
+#define NRF_IRK_LIST_ENTRIES    (MYNEWT_VAL(BLE_LL_RESOLV_LIST_SIZE))
+#else
+#define NRF_IRK_LIST_ENTRIES    (16)
+#endif
+
+/* NOTE: each entry is 16 bytes long. */
+uint32_t g_nrf_irk_list[NRF_IRK_LIST_ENTRIES * 4];
+
+/* Current number of IRK entries */
+uint8_t g_nrf_num_irks;
+
+#endif
+
+/* Returns public device address or -1 if not present */
+int
+ble_hw_get_public_addr(ble_addr_t *addr)
+{
+    uint32_t addr_high;
+    uint32_t addr_low;
+
+    /* Does FICR have a public address */
+    if ((NRF_FICR->DEVICEADDRTYPE & 1) != 0) {
+        return -1;
+    }
+
+    /* Copy into device address. We can do this because we know platform */
+    addr_low = NRF_FICR->DEVICEADDR[0];
+    addr_high = NRF_FICR->DEVICEADDR[1];
+    memcpy(addr->val, &addr_low, 4);
+    memcpy(&addr->val[4], &addr_high, 2);
+    addr->type = BLE_ADDR_PUBLIC;
+
+    return 0;
+}
+
+/* Returns random static address or -1 if not present */
+int
+ble_hw_get_static_addr(ble_addr_t *addr)
+{
+    int rc;
+
+    if ((NRF_FICR->DEVICEADDRTYPE & 1) == 1) {
+        memcpy(addr->val, (void *)&NRF_FICR->DEVICEADDR[0], 4);
+        memcpy(&addr->val[4], (void *)&NRF_FICR->DEVICEADDR[1], 2);
+        addr->val[5] |= 0xc0;
+        addr->type = BLE_ADDR_RANDOM;
+        rc = 0;
+    } else {
+        rc = -1;
+    }
+
+    return rc;
+}
+
+/**
+ * Clear the whitelist
+ *
+ * @return int
+ */
+void
+ble_hw_whitelist_clear(void)
+{
+    NRF_RADIO->DACNF = 0;
+    g_ble_hw_whitelist_mask = 0;
+}
+
+/**
+ * Add a device to the hw whitelist
+ *
+ * @param addr
+ * @param addr_type
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_hw_whitelist_add(const uint8_t *addr, uint8_t addr_type)
+{
+    int i;
+    uint32_t mask;
+
+    /* Find first ununsed device address match element */
+    mask = 0x01;
+    for (i = 0; i < BLE_HW_WHITE_LIST_SIZE; ++i) {
+        if ((mask & g_ble_hw_whitelist_mask) == 0) {
+            NRF_RADIO->DAB[i] = get_le32(addr);
+            NRF_RADIO->DAP[i] = get_le16(addr + 4);
+            if (addr_type == BLE_ADDR_RANDOM) {
+                NRF_RADIO->DACNF |= (mask << 8);
+            }
+            g_ble_hw_whitelist_mask |= mask;
+            return BLE_ERR_SUCCESS;
+        }
+        mask <<= 1;
+    }
+
+    return BLE_ERR_MEM_CAPACITY;
+}
+
+/**
+ * Remove a device from the hw whitelist
+ *
+ * @param addr
+ * @param addr_type
+ *
+ */
+void
+ble_hw_whitelist_rmv(const uint8_t *addr, uint8_t addr_type)
+{
+    int i;
+    uint8_t cfg_addr;
+    uint16_t dap;
+    uint16_t txadd;
+    uint32_t dab;
+    uint32_t mask;
+
+    /* Find first ununsed device address match element */
+    dab = get_le32(addr);
+    dap = get_le16(addr + 4);
+    txadd = NRF_RADIO->DACNF >> 8;
+    mask = 0x01;
+    for (i = 0; i < BLE_HW_WHITE_LIST_SIZE; ++i) {
+        if (mask & g_ble_hw_whitelist_mask) {
+            if ((dab == NRF_RADIO->DAB[i]) && (dap == NRF_RADIO->DAP[i])) {
+                cfg_addr = txadd & mask;
+                if (addr_type == BLE_ADDR_RANDOM) {
+                    if (cfg_addr != 0) {
+                        break;
+                    }
+                } else {
+                    if (cfg_addr == 0) {
+                        break;
+                    }
+                }
+            }
+        }
+        mask <<= 1;
+    }
+
+    if (i < BLE_HW_WHITE_LIST_SIZE) {
+        g_ble_hw_whitelist_mask &= ~mask;
+        NRF_RADIO->DACNF &= ~mask;
+    }
+}
+
+/**
+ * Returns the size of the whitelist in HW
+ *
+ * @return int Number of devices allowed in whitelist
+ */
+uint8_t
+ble_hw_whitelist_size(void)
+{
+    return BLE_HW_WHITE_LIST_SIZE;
+}
+
+/**
+ * Enable the whitelisted devices
+ */
+void
+ble_hw_whitelist_enable(void)
+{
+    /* Enable the configured device addresses */
+    NRF_RADIO->DACNF |= g_ble_hw_whitelist_mask;
+}
+
+/**
+ * Disables the whitelisted devices
+ */
+void
+ble_hw_whitelist_disable(void)
+{
+    /* Disable all whitelist devices */
+    NRF_RADIO->DACNF &= 0x0000ff00;
+}
+
+/**
+ * Boolean function which returns true ('1') if there is a match on the
+ * whitelist.
+ *
+ * @return int
+ */
+int
+ble_hw_whitelist_match(void)
+{
+    return (int)NRF_RADIO->EVENTS_DEVMATCH;
+}
+
+/* Encrypt data */
+int
+ble_hw_encrypt_block(struct ble_encryption_block *ecb)
+{
+    int rc;
+    uint32_t end;
+    uint32_t err;
+
+    /* Stop ECB */
+    NRF_ECB->TASKS_STOPECB = 1;
+    /* XXX: does task stop clear these counters? Anyway to do this quicker? */
+    NRF_ECB->EVENTS_ENDECB = 0;
+    NRF_ECB->EVENTS_ERRORECB = 0;
+    NRF_ECB->ECBDATAPTR = (uint32_t)ecb;
+
+    /* Start ECB */
+    NRF_ECB->TASKS_STARTECB = 1;
+
+    /* Wait till error or done */
+    rc = 0;
+    while (1) {
+        end = NRF_ECB->EVENTS_ENDECB;
+        err = NRF_ECB->EVENTS_ERRORECB;
+        if (end || err) {
+            if (err) {
+                rc = -1;
+            }
+            break;
+        }
+    }
+
+    return rc;
+}
+
+/**
+ * Random number generator ISR.
+ */
+static void
+ble_rng_isr(void)
+{
+    uint8_t rnum;
+
+    os_trace_isr_enter();
+
+    /* No callback? Clear and disable interrupts */
+    if (g_ble_rng_isr_cb == NULL) {
+        NRF_RNG->INTENCLR = 1;
+        NRF_RNG->EVENTS_VALRDY = 0;
+        (void)NRF_RNG->SHORTS;
+        os_trace_isr_exit();
+        return;
+    }
+
+    /* If there is a value ready grab it */
+    if (NRF_RNG->EVENTS_VALRDY) {
+        NRF_RNG->EVENTS_VALRDY = 0;
+        rnum = (uint8_t)NRF_RNG->VALUE;
+        (*g_ble_rng_isr_cb)(rnum);
+    }
+
+    os_trace_isr_exit();
+}
+
+/**
+ * Initialize the random number generator
+ *
+ * @param cb
+ * @param bias
+ *
+ * @return int
+ */
+int
+ble_hw_rng_init(ble_rng_isr_cb_t cb, int bias)
+{
+    /* Set bias */
+    if (bias) {
+        NRF_RNG->CONFIG = 1;
+    } else {
+        NRF_RNG->CONFIG = 0;
+    }
+
+    /* If we were passed a function pointer we need to enable the interrupt */
+    if (cb != NULL) {
+#ifndef RIOT_VERSION
+        NVIC_SetPriority(RNG_IRQn, (1 << __NVIC_PRIO_BITS) - 1);
+#endif
+#if MYNEWT
+        NVIC_SetVector(RNG_IRQn, (uint32_t)ble_rng_isr);
+#else
+        ble_npl_hw_set_isr(RNG_IRQn, ble_rng_isr);
+#endif
+        NVIC_EnableIRQ(RNG_IRQn);
+        g_ble_rng_isr_cb = cb;
+    }
+
+    return 0;
+}
+
+/**
+ * Start the random number generator
+ *
+ * @return int
+ */
+int
+ble_hw_rng_start(void)
+{
+    os_sr_t sr;
+
+    /* No need for interrupt if there is no callback */
+    OS_ENTER_CRITICAL(sr);
+    NRF_RNG->EVENTS_VALRDY = 0;
+    if (g_ble_rng_isr_cb) {
+        NRF_RNG->INTENSET = 1;
+    }
+    NRF_RNG->TASKS_START = 1;
+    OS_EXIT_CRITICAL(sr);
+
+    return 0;
+}
+
+/**
+ * Stop the random generator
+ *
+ * @return int
+ */
+int
+ble_hw_rng_stop(void)
+{
+    os_sr_t sr;
+
+    /* No need for interrupt if there is no callback */
+    OS_ENTER_CRITICAL(sr);
+    NRF_RNG->INTENCLR = 1;
+    NRF_RNG->TASKS_STOP = 1;
+    NRF_RNG->EVENTS_VALRDY = 0;
+    OS_EXIT_CRITICAL(sr);
+
+    return 0;
+}
+
+/**
+ * Read the random number generator.
+ *
+ * @return uint8_t
+ */
+uint8_t
+ble_hw_rng_read(void)
+{
+    uint8_t rnum;
+
+    /* Wait for a sample */
+    while (NRF_RNG->EVENTS_VALRDY == 0) {
+    }
+
+    NRF_RNG->EVENTS_VALRDY = 0;
+    rnum = (uint8_t)NRF_RNG->VALUE;
+
+    return rnum;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+/**
+ * Clear the resolving list
+ *
+ * @return int
+ */
+void
+ble_hw_resolv_list_clear(void)
+{
+    g_nrf_num_irks = 0;
+}
+
+/**
+ * Add a device to the hw resolving list
+ *
+ * @param irk   Pointer to IRK to add
+ *
+ * @return int 0: success, BLE error code otherwise
+ */
+int
+ble_hw_resolv_list_add(uint8_t *irk)
+{
+    uint32_t *nrf_entry;
+
+    /* Find first ununsed device address match element */
+    if (g_nrf_num_irks == NRF_IRK_LIST_ENTRIES) {
+        return BLE_ERR_MEM_CAPACITY;
+    }
+
+    /* Copy into irk list */
+    nrf_entry = &g_nrf_irk_list[4 * g_nrf_num_irks];
+    memcpy(nrf_entry, irk, 16);
+
+    /* Add to total */
+    ++g_nrf_num_irks;
+    return BLE_ERR_SUCCESS;
+}
+
+/**
+ * Remove a device from the hw resolving list
+ *
+ * @param index Index of IRK to remove
+ */
+void
+ble_hw_resolv_list_rmv(int index)
+{
+    uint32_t *irk_entry;
+
+    if (index < g_nrf_num_irks) {
+        --g_nrf_num_irks;
+        irk_entry = &g_nrf_irk_list[index];
+        if (g_nrf_num_irks > index) {
+            memmove(irk_entry, irk_entry + 4, 16 * (g_nrf_num_irks - index));
+        }
+    }
+}
+
+/**
+ * Returns the size of the resolving list. NOTE: this returns the maximum
+ * allowable entries in the HW. Configuration options may limit this.
+ *
+ * @return int Number of devices allowed in resolving list
+ */
+uint8_t
+ble_hw_resolv_list_size(void)
+{
+    return BLE_HW_RESOLV_LIST_SIZE;
+}
+
+/**
+ * Called to determine if the address received was resolved.
+ *
+ * @return int  Negative values indicate unresolved address; positive values
+ *              indicate index in resolving list of resolved address.
+ */
+int
+ble_hw_resolv_list_match(void)
+{
+    uint32_t index;
+
+    if (NRF_AAR->EVENTS_END) {
+        if (NRF_AAR->EVENTS_RESOLVED) {
+            index = NRF_AAR->STATUS;
+            return (int)index;
+        }
+    }
+
+    return -1;
+}
+#endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_phy.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_phy.c
new file mode 100644
index 000000000..2ee29ab9c
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_phy.c
@@ -0,0 +1,2120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+ 
+ #if defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+
+#include <stdint.h>
+#include <string.h>
+#include <assert.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "../include/ble/xcvr.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
+#include "nimble/nimble/controller/include/controller/ble_phy.h"
+#include "nimble/nimble/controller/include/controller/ble_phy_trace.h"
+#include "nimble/nimble/controller/include/controller/ble_ll.h"
+#include "nrf.h"
+#if MYNEWT
+#include "mcu/nrf52_clock.h"
+#include "mcu/cmsis_nvic.h"
+#include "hal/hal_gpio.h"
+#else
+#include "core_cm4.h"
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+#if !MYNEWT_VAL_CHOICE(MCU_TARGET, nRF52840) && !MYNEWT_VAL_CHOICE(MCU_TARGET, nRF52811)
+#error LE Coded PHY can only be enabled on nRF52811 or nRF52840
+#endif
+#endif
+
+/*
+ * NOTE: This code uses a couple of PPI channels so care should be taken when
+ *       using PPI somewhere else.
+ *
+ * Pre-programmed channels: CH20, CH21, CH23, CH25, CH31
+ * Regular channels: CH4, CH5 and optionally CH17, CH18, CH19
+ *  - CH4 = cancel wfr timer on address match
+ *  - CH5 = disable radio on wfr timer expiry
+ *  - CH17 = (optional) gpio debug for radio ramp-up
+ *  - CH18 = (optional) gpio debug for wfr timer RX enabled
+ *  - CH19 = (optional) gpio debug for wfr timer radio disabled
+ *
+ */
+
+/* XXX: 4) Make sure RF is higher priority interrupt than schedule */
+
+/*
+ * XXX: Maximum possible transmit time is 1 msec for a 60ppm crystal
+ * and 16ms for a 30ppm crystal! We need to limit PDU size based on
+ * crystal accuracy. Look at this in the spec.
+ */
+
+/* XXX: private header file? */
+extern uint8_t g_nrf_num_irks;
+extern uint32_t g_nrf_irk_list[];
+
+/* To disable all radio interrupts */
+#define NRF_RADIO_IRQ_MASK_ALL  (0x34FF)
+
+/*
+ * We configure the nrf with a 1 byte S0 field, 8 bit length field, and
+ * zero bit S1 field. The preamble is 8 bits long.
+ */
+#define NRF_LFLEN_BITS          (8)
+#define NRF_S0LEN               (1)
+#define NRF_S1LEN_BITS          (0)
+#define NRF_CILEN_BITS          (2)
+#define NRF_TERMLEN_BITS        (3)
+
+/* Maximum length of frames */
+#define NRF_MAXLEN              (255)
+#define NRF_BALEN               (3)     /* For base address of 3 bytes */
+
+/* NRF_RADIO->PCNF0 configuration values */
+#define NRF_PCNF0               (NRF_LFLEN_BITS << RADIO_PCNF0_LFLEN_Pos) | \
+                                (RADIO_PCNF0_S1INCL_Msk) | \
+                                (NRF_S0LEN << RADIO_PCNF0_S0LEN_Pos) | \
+                                (NRF_S1LEN_BITS << RADIO_PCNF0_S1LEN_Pos)
+#define NRF_PCNF0_1M            (NRF_PCNF0) | \
+                                (RADIO_PCNF0_PLEN_8bit << RADIO_PCNF0_PLEN_Pos)
+#define NRF_PCNF0_2M            (NRF_PCNF0) | \
+                                (RADIO_PCNF0_PLEN_16bit << RADIO_PCNF0_PLEN_Pos)
+#define NRF_PCNF0_CODED         (NRF_PCNF0) | \
+                                (RADIO_PCNF0_PLEN_LongRange << RADIO_PCNF0_PLEN_Pos) | \
+                                (NRF_CILEN_BITS << RADIO_PCNF0_CILEN_Pos) | \
+                                (NRF_TERMLEN_BITS << RADIO_PCNF0_TERMLEN_Pos)
+
+/* BLE PHY data structure */
+struct ble_phy_obj
+{
+    uint8_t phy_stats_initialized;
+    int8_t  phy_txpwr_dbm;
+    uint8_t phy_chan;
+    uint8_t phy_state;
+    uint8_t phy_transition;
+    uint8_t phy_transition_late;
+    uint8_t phy_rx_started;
+    uint8_t phy_encrypted;
+    uint8_t phy_privacy;
+    uint8_t phy_tx_pyld_len;
+    uint8_t phy_cur_phy_mode;
+    uint8_t phy_tx_phy_mode;
+    uint8_t phy_rx_phy_mode;
+    uint8_t phy_bcc_offset;
+    int8_t  rx_pwr_compensation;
+    uint32_t phy_aar_scratch;
+    uint32_t phy_access_address;
+    struct ble_mbuf_hdr rxhdr;
+    void *txend_arg;
+    ble_phy_tx_end_func txend_cb;
+    uint32_t phy_start_cputime;
+};
+struct ble_phy_obj g_ble_phy_data;
+
+/* XXX: if 27 byte packets desired we can make this smaller */
+/* Global transmit/receive buffer */
+static uint32_t g_ble_phy_tx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
+static uint32_t g_ble_phy_rx_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/* Make sure word-aligned for faster copies */
+static uint32_t g_ble_phy_enc_buf[(BLE_PHY_MAX_PDU_LEN + 3) / 4];
+#endif
+
+/* RF center frequency for each channel index (offset from 2400 MHz) */
+static const uint8_t g_ble_phy_chan_freq[BLE_PHY_NUM_CHANS] = {
+     4,  6,  8, 10, 12, 14, 16, 18, 20, 22, /* 0-9 */
+    24, 28, 30, 32, 34, 36, 38, 40, 42, 44, /* 10-19 */
+    46, 48, 50, 52, 54, 56, 58, 60, 62, 64, /* 20-29 */
+    66, 68, 70, 72, 74, 76, 78,  2, 26, 80, /* 30-39 */
+};
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+/* packet start offsets (in usecs) */
+static const uint16_t g_ble_phy_mode_pkt_start_off[BLE_PHY_NUM_MODE] = {
+    [BLE_PHY_MODE_1M] = 40,
+    [BLE_PHY_MODE_2M] = 24,
+    [BLE_PHY_MODE_CODED_125KBPS] = 376,
+    [BLE_PHY_MODE_CODED_500KBPS] = 376
+};
+#endif
+
+/* Various radio timings */
+/* Radio ramp-up times in usecs (fast mode) */
+#define BLE_PHY_T_TXENFAST      (XCVR_TX_RADIO_RAMPUP_USECS)
+#define BLE_PHY_T_RXENFAST      (XCVR_RX_RADIO_RAMPUP_USECS)
+/* delay between EVENTS_READY and start of tx */
+static const uint8_t g_ble_phy_t_txdelay[BLE_PHY_NUM_MODE] = {
+    [BLE_PHY_MODE_1M] = 4,
+    [BLE_PHY_MODE_2M] = 3,
+    [BLE_PHY_MODE_CODED_125KBPS] = 5,
+    [BLE_PHY_MODE_CODED_500KBPS] = 5
+};
+/* delay between EVENTS_END and end of txd packet */
+static const uint8_t g_ble_phy_t_txenddelay[BLE_PHY_NUM_MODE] = {
+    [BLE_PHY_MODE_1M] = 4,
+    [BLE_PHY_MODE_2M] = 3,
+    [BLE_PHY_MODE_CODED_125KBPS] = 9,
+    [BLE_PHY_MODE_CODED_500KBPS] = 3
+};
+/* delay between rxd access address (w/ TERM1 for coded) and EVENTS_ADDRESS */
+static const uint8_t g_ble_phy_t_rxaddrdelay[BLE_PHY_NUM_MODE] = {
+    [BLE_PHY_MODE_1M] = 6,
+    [BLE_PHY_MODE_2M] = 2,
+    [BLE_PHY_MODE_CODED_125KBPS] = 17,
+    [BLE_PHY_MODE_CODED_500KBPS] = 17
+};
+/* delay between end of rxd packet and EVENTS_END */
+static const uint8_t g_ble_phy_t_rxenddelay[BLE_PHY_NUM_MODE] = {
+    [BLE_PHY_MODE_1M] = 6,
+    [BLE_PHY_MODE_2M] = 2,
+    [BLE_PHY_MODE_CODED_125KBPS] = 27,
+    [BLE_PHY_MODE_CODED_500KBPS] = 22
+};
+
+/* Statistics */
+STATS_SECT_START(ble_phy_stats)
+    STATS_SECT_ENTRY(phy_isrs)
+    STATS_SECT_ENTRY(tx_good)
+    STATS_SECT_ENTRY(tx_fail)
+    STATS_SECT_ENTRY(tx_late)
+    STATS_SECT_ENTRY(tx_bytes)
+    STATS_SECT_ENTRY(rx_starts)
+    STATS_SECT_ENTRY(rx_aborts)
+    STATS_SECT_ENTRY(rx_valid)
+    STATS_SECT_ENTRY(rx_crc_err)
+    STATS_SECT_ENTRY(rx_late)
+    STATS_SECT_ENTRY(radio_state_errs)
+    STATS_SECT_ENTRY(rx_hw_err)
+    STATS_SECT_ENTRY(tx_hw_err)
+STATS_SECT_END
+STATS_SECT_DECL(ble_phy_stats) ble_phy_stats;
+
+STATS_NAME_START(ble_phy_stats)
+    STATS_NAME(ble_phy_stats, phy_isrs)
+    STATS_NAME(ble_phy_stats, tx_good)
+    STATS_NAME(ble_phy_stats, tx_fail)
+    STATS_NAME(ble_phy_stats, tx_late)
+    STATS_NAME(ble_phy_stats, tx_bytes)
+    STATS_NAME(ble_phy_stats, rx_starts)
+    STATS_NAME(ble_phy_stats, rx_aborts)
+    STATS_NAME(ble_phy_stats, rx_valid)
+    STATS_NAME(ble_phy_stats, rx_crc_err)
+    STATS_NAME(ble_phy_stats, rx_late)
+    STATS_NAME(ble_phy_stats, radio_state_errs)
+    STATS_NAME(ble_phy_stats, rx_hw_err)
+    STATS_NAME(ble_phy_stats, tx_hw_err)
+STATS_NAME_END(ble_phy_stats)
+
+/*
+ * NOTE:
+ * Tested the following to see what would happen:
+ *  -> NVIC has radio irq enabled (interrupt # 1, mask 0x2).
+ *  -> Set up nrf to receive. Clear ADDRESS event register.
+ *  -> Enable ADDRESS interrupt on nrf5 by writing to INTENSET.
+ *  -> Enable RX.
+ *  -> Disable interrupts globally using OS_ENTER_CRITICAL().
+ *  -> Wait until a packet is received and the ADDRESS event occurs.
+ *  -> Call ble_phy_disable().
+ *
+ *  At this point I wanted to see the state of the cortex NVIC. The IRQ
+ *  pending bit was TRUE for the radio interrupt (as expected) as we never
+ *  serviced the radio interrupt (interrupts were disabled).
+ *
+ *  What was unexpected was this: without clearing the pending IRQ in the NVIC,
+ *  when radio interrupts were re-enabled (address event bit in INTENSET set to
+ *  1) and the radio ADDRESS event register read 1 (it was never cleared after
+ *  the first address event), the radio did not enter the ISR! I would have
+ *  expected that if the following were true, an interrupt would occur:
+ *      -> NVIC ISER bit set to TRUE
+ *      -> NVIC ISPR bit reads TRUE, meaning interrupt is pending.
+ *      -> Radio peripheral interrupts are enabled for some event (or events).
+ *      -> Corresponding event register(s) in radio peripheral read 1.
+ *
+ *  Not sure what the end result of all this is. We will clear the pending
+ *  bit in the NVIC just to be sure when we disable the PHY.
+ */
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+
+/*
+ * Per nordic, the number of bytes needed for scratch is 16 + MAX_PKT_SIZE.
+ * However, when I used a smaller size it still overwrote the scratchpad. Until
+ * I figure this out I am just going to allocate 67 words so we have enough
+ * space for 267 bytes of scratch. I used 268 bytes since not sure if this
+ * needs to be aligned and burning a byte is no big deal.
+ */
+//#define NRF_ENC_SCRATCH_WORDS (((MYNEWT_VAL(BLE_LL_MAX_PKT_SIZE) + 16) + 3) / 4)
+#define NRF_ENC_SCRATCH_WORDS   (67)
+
+uint32_t g_nrf_encrypt_scratchpad[NRF_ENC_SCRATCH_WORDS];
+
+struct nrf_ccm_data
+{
+    uint8_t key[16];
+    uint64_t pkt_counter;
+    uint8_t dir_bit;
+    uint8_t iv[8];
+} __attribute__((packed));
+
+struct nrf_ccm_data g_nrf_ccm_data;
+#endif
+
+static void
+ble_phy_apply_errata_102_106_107(void)
+{
+    /* [102] RADIO: PAYLOAD/END events delayed or not triggered after ADDRESS
+     * [106] RADIO: Higher CRC error rates for some access addresses
+     * [107] RADIO: Immediate address match for access addresses containing MSBs 0x00
+     */
+    *(volatile uint32_t *)0x40001774 = ((*(volatile uint32_t *)0x40001774) &
+                         0xfffffffe) | 0x01000000;
+}
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+
+/* Packet start offset (in usecs). This is the preamble plus access address.
+ * For LE Coded PHY this also includes CI and TERM1. */
+uint32_t
+ble_phy_mode_pdu_start_off(int phy_mode)
+{
+    return g_ble_phy_mode_pkt_start_off[phy_mode];
+}
+
+#if NRF52840_XXAA
+static inline bool
+ble_phy_mode_is_coded(uint8_t phy_mode)
+{
+    return (phy_mode == BLE_PHY_MODE_CODED_125KBPS) ||
+           (phy_mode == BLE_PHY_MODE_CODED_500KBPS);
+}
+
+static void
+ble_phy_apply_nrf52840_errata(uint8_t new_phy_mode)
+{
+    bool new_coded = ble_phy_mode_is_coded(new_phy_mode);
+    bool cur_coded = ble_phy_mode_is_coded(g_ble_phy_data.phy_cur_phy_mode);
+
+    /*
+     * Workarounds should be applied only when switching to/from LE Coded PHY
+     * so no need to apply them every time.
+     *
+     * nRF52840 Engineering A Errata v1.2
+     * [164] RADIO: Low sensitivity in long range mode
+     *
+     * nRF52840 Rev 1 Errata
+     * [191] RADIO: High packet error rate in BLE Long Range mode
+     */
+    if (new_coded == cur_coded) {
+        return;
+    }
+
+    if (new_coded) {
+#if MYNEWT_VAL(BLE_PHY_NRF52840_ERRATA_164)
+        /* [164] */
+        *(volatile uint32_t *)0x4000173C |= 0x80000000;
+        *(volatile uint32_t *)0x4000173C =
+                        ((*(volatile uint32_t *)0x4000173C & 0xFFFFFF00) | 0x5C);
+#endif
+#if MYNEWT_VAL(BLE_PHY_NRF52840_ERRATA_191)
+        /* [191] */
+        *(volatile uint32_t *) 0x40001740 =
+                        ((*((volatile uint32_t *) 0x40001740)) & 0x7FFF00FF) |
+                        0x80000000 | (((uint32_t)(196)) << 8);
+#endif
+    } else {
+#if MYNEWT_VAL(BLE_PHY_NRF52840_ERRATA_164)
+        /* [164] */
+        *(volatile uint32_t *)0x4000173C &= ~0x80000000;
+#endif
+#if MYNEWT_VAL(BLE_PHY_NRF52840_ERRATA_191)
+        /* [191] */
+        *(volatile uint32_t *) 0x40001740 =
+                        ((*((volatile uint32_t *) 0x40001740)) & 0x7FFFFFFF);
+#endif
+    }
+}
+#endif
+
+static void
+ble_phy_mode_apply(uint8_t phy_mode)
+{
+    if (phy_mode == g_ble_phy_data.phy_cur_phy_mode) {
+        return;
+    }
+
+#if NRF52840_XXAA
+    ble_phy_apply_nrf52840_errata(phy_mode);
+#endif
+
+    switch (phy_mode) {
+    case BLE_PHY_MODE_1M:
+        NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_1Mbit;
+        NRF_RADIO->PCNF0 = NRF_PCNF0_1M;
+        break;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_2M_PHY)
+    case BLE_PHY_MODE_2M:
+        NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_2Mbit;
+        NRF_RADIO->PCNF0 = NRF_PCNF0_2M;
+        break;
+#endif
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case BLE_PHY_MODE_CODED_125KBPS:
+        NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_LR125Kbit;
+        NRF_RADIO->PCNF0 = NRF_PCNF0_CODED;
+        break;
+    case BLE_PHY_MODE_CODED_500KBPS:
+        NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_LR500Kbit;
+        NRF_RADIO->PCNF0 = NRF_PCNF0_CODED;
+        break;
+#endif
+    default:
+        assert(0);
+    }
+
+    g_ble_phy_data.phy_cur_phy_mode = phy_mode;
+}
+
+void
+ble_phy_mode_set(uint8_t tx_phy_mode, uint8_t rx_phy_mode)
+{
+    g_ble_phy_data.phy_tx_phy_mode = tx_phy_mode;
+    g_ble_phy_data.phy_rx_phy_mode = rx_phy_mode;
+}
+#endif
+
+int
+ble_phy_get_cur_phy(void)
+{
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    switch (g_ble_phy_data.phy_cur_phy_mode) {
+        case BLE_PHY_MODE_1M:
+            return BLE_PHY_1M;
+        case BLE_PHY_MODE_2M:
+            return BLE_PHY_2M;
+        case BLE_PHY_MODE_CODED_125KBPS:
+        case BLE_PHY_MODE_CODED_500KBPS:
+            return BLE_PHY_CODED;
+        default:
+            assert(0);
+            return -1;
+    }
+#else
+    return BLE_PHY_1M;
+#endif
+}
+
+/**
+ * Copies the data from the phy receive buffer into a mbuf chain.
+ *
+ * @param dptr Pointer to receive buffer
+ * @param rxpdu Pointer to already allocated mbuf chain
+ *
+ * NOTE: the packet header already has the total mbuf length in it. The
+ * lengths of the individual mbufs are not set prior to calling.
+ *
+ */
+void
+ble_phy_rxpdu_copy(uint8_t *dptr, struct os_mbuf *rxpdu)
+{
+    uint32_t rem_len;
+    uint32_t copy_len;
+    uint32_t block_len;
+    uint32_t block_rem_len;
+    void *dst;
+    void *src;
+    struct os_mbuf * om;
+
+    /* Better be aligned */
+    assert(((uint32_t)dptr & 3) == 0);
+
+    block_len = rxpdu->om_omp->omp_databuf_len;
+    rem_len = OS_MBUF_PKTHDR(rxpdu)->omp_len;
+    src = dptr;
+
+    /*
+     * Setup for copying from first mbuf which is shorter due to packet header
+     * and extra leading space
+     */
+    copy_len = block_len - rxpdu->om_pkthdr_len - 4;
+    om = rxpdu;
+    dst = om->om_data;
+
+    while (true) {
+        /*
+         * Always copy blocks of length aligned to word size, only last mbuf
+         * will have remaining non-word size bytes appended.
+         */
+        block_rem_len = copy_len;
+        copy_len = min(copy_len, rem_len);
+        copy_len &= ~3;
+
+        dst = om->om_data;
+        om->om_len = copy_len;
+        rem_len -= copy_len;
+        block_rem_len -= copy_len;
+
+        __asm__ volatile (".syntax unified              \n"
+                          "   mov  r4, %[len]           \n"
+                          "   b    2f                   \n"
+                          "1: ldr  r3, [%[src], %[len]] \n"
+                          "   str  r3, [%[dst], %[len]] \n"
+                          "2: subs %[len], #4           \n"
+                          "   bpl  1b                   \n"
+                          "   adds %[src], %[src], r4   \n"
+                          "   adds %[dst], %[dst], r4   \n"
+                          : [dst] "+r" (dst), [src] "+r" (src),
+                            [len] "+r" (copy_len)
+                          :
+                          : "r3", "r4", "memory"
+                         );
+
+        if ((rem_len < 4) && (block_rem_len >= rem_len)) {
+            break;
+        }
+
+        /* Move to next mbuf */
+        om = SLIST_NEXT(om, om_next);
+        copy_len = block_len;
+    }
+
+    /* Copy remaining bytes, if any, to last mbuf */
+    om->om_len += rem_len;
+    __asm__ volatile (".syntax unified              \n"
+                      "   b    2f                   \n"
+                      "1: ldrb r3, [%[src], %[len]] \n"
+                      "   strb r3, [%[dst], %[len]] \n"
+                      "2: subs %[len], #1           \n"
+                      "   bpl  1b                   \n"
+                      : [len] "+r" (rem_len)
+                      : [dst] "r" (dst), [src] "r" (src)
+                      : "r3", "memory"
+                     );
+
+    /* Copy header */
+    memcpy(BLE_MBUF_HDR_PTR(rxpdu), &g_ble_phy_data.rxhdr,
+           sizeof(struct ble_mbuf_hdr));
+}
+
+/**
+ * Called when we want to wait if the radio is in either the rx or tx
+ * disable states. We want to wait until that state is over before doing
+ * anything to the radio
+ */
+static void
+nrf_wait_disabled(void)
+{
+    uint32_t state;
+
+    state = NRF_RADIO->STATE;
+    if (state != RADIO_STATE_STATE_Disabled) {
+        if ((state == RADIO_STATE_STATE_RxDisable) ||
+            (state == RADIO_STATE_STATE_TxDisable)) {
+            /* This will end within a short time (6 usecs). Just poll */
+            while (NRF_RADIO->STATE == state) {
+                /* If this fails, something is really wrong. Should last
+                 * no more than 6 usecs */
+            }
+        }
+    }
+}
+
+/**
+ *
+ *
+ */
+static int
+ble_phy_set_start_time(uint32_t cputime, uint8_t rem_usecs, bool tx)
+{
+    uint32_t next_cc;
+    uint32_t cur_cc;
+    uint32_t cntr;
+    uint32_t delta;
+
+    /*
+     * We need to adjust start time to include radio ramp-up and TX pipeline
+     * delay (the latter only if applicable, so only for TX).
+     *
+     * Radio ramp-up time is 40 usecs and TX delay is 3 or 5 usecs depending on
+     * phy, thus we'll offset RTC by 2 full ticks (61 usecs) and then compensate
+     * using TIMER0 with 1 usec precision.
+     */
+
+    cputime -= 2;
+    rem_usecs += 61;
+    if (tx) {
+        rem_usecs -= BLE_PHY_T_TXENFAST;
+        rem_usecs -= g_ble_phy_t_txdelay[g_ble_phy_data.phy_cur_phy_mode];
+    } else {
+        rem_usecs -= BLE_PHY_T_RXENFAST;
+    }
+
+    /*
+     * rem_usecs will be no more than 2 ticks, but if it is more than single
+     * tick then we should better count one more low-power tick rather than
+     * 30 high-power usecs. Also make sure we don't set TIMER0 CC to 0 as the
+     * compare won't occur.
+     */
+
+    if (rem_usecs > 30) {
+        cputime++;
+        rem_usecs -= 30;
+    }
+
+    /*
+     * Can we set the RTC compare to start TIMER0? We can do it if:
+     *      a) Current compare value is not N+1 or N+2 ticks from current
+     *      counter.
+     *      b) The value we want to set is not at least N+2 from current
+     *      counter.
+     *
+     * NOTE: since the counter can tick 1 while we do these calculations we
+     * need to account for it.
+     */
+    next_cc = cputime & 0xffffff;
+    cur_cc = NRF_RTC0->CC[0];
+    cntr = NRF_RTC0->COUNTER;
+
+    delta = (cur_cc - cntr) & 0xffffff;
+    if ((delta <= 3) && (delta != 0)) {
+        return -1;
+    }
+    delta = (next_cc - cntr) & 0xffffff;
+    if ((delta & 0x800000) || (delta < 3)) {
+        return -1;
+    }
+
+    /* Clear and set TIMER0 to fire off at proper time */
+    NRF_TIMER0->TASKS_CLEAR = 1;
+    NRF_TIMER0->CC[0] = rem_usecs;
+    NRF_TIMER0->EVENTS_COMPARE[0] = 0;
+
+    /* Set RTC compare to start TIMER0 */
+    NRF_RTC0->EVENTS_COMPARE[0] = 0;
+    NRF_RTC0->CC[0] = next_cc;
+    NRF_RTC0->EVTENSET = RTC_EVTENSET_COMPARE0_Msk;
+
+    /* Enable PPI */
+    NRF_PPI->CHENSET = PPI_CHEN_CH31_Msk;
+
+    /* Store the cputime at which we set the RTC */
+    g_ble_phy_data.phy_start_cputime = cputime;
+
+    return 0;
+}
+
+static int
+ble_phy_set_start_now(void)
+{
+    os_sr_t sr;
+    uint32_t now;
+
+    OS_ENTER_CRITICAL(sr);
+
+    /*
+     * Set TIMER0 to fire immediately. We can't set CC to 0 as compare will not
+     * occur in such case.
+     */
+    NRF_TIMER0->TASKS_CLEAR = 1;
+    NRF_TIMER0->CC[0] = 1;
+    NRF_TIMER0->EVENTS_COMPARE[0] = 0;
+
+    /*
+     * Set RTC compare to start TIMER0. We need to set it to at least N+2 ticks
+     * from current value to guarantee triggering compare event, but let's set
+     * it to N+3 to account for possible extra tick on RTC0 during these
+     * operations.
+     */
+    now = os_cputime_get32();
+    NRF_RTC0->EVENTS_COMPARE[0] = 0;
+    NRF_RTC0->CC[0] = now + 3;
+    NRF_RTC0->EVTENSET = RTC_EVTENSET_COMPARE0_Msk;
+
+    /* Enable PPI */
+    NRF_PPI->CHENSET = PPI_CHEN_CH31_Msk;
+
+    /*
+     * Store the cputime at which we set the RTC
+     *
+     * XXX Compare event may be triggered on previous CC value (if it was set to
+     * less than N+2) so in rare cases actual start time may be 2 ticks earlier
+     * than what we expect. Since this is only used on RX, it may cause AUX scan
+     * to be scheduled 1 or 2 ticks too late so we'll miss it - it's acceptable
+     * for now.
+     */
+    g_ble_phy_data.phy_start_cputime = now + 3;
+
+    OS_EXIT_CRITICAL(sr);
+
+    return 0;
+}
+
+/**
+ * Function is used to set PPI so that we can time out waiting for a reception
+ * to occur. This happens for two reasons: we have sent a packet and we are
+ * waiting for a respons (txrx should be set to ENABLE_TXRX) or we are
+ * starting a connection event and we are a slave and we are waiting for the
+ * master to send us a packet (txrx should be set to ENABLE_RX).
+ *
+ * NOTE: when waiting for a txrx turn-around, wfr_usecs is not used as there
+ * is no additional time to wait; we know when we should receive the address of
+ * the received frame.
+ *
+ * @param txrx Flag denoting if this wfr is a txrx turn-around or not.
+ * @param tx_phy_mode phy mode for last TX (only valid for TX->RX)
+ * @param wfr_usecs Amount of usecs to wait.
+ */
+void
+ble_phy_wfr_enable(int txrx, uint8_t tx_phy_mode, uint32_t wfr_usecs)
+{
+    uint32_t end_time;
+    uint8_t phy;
+
+    phy = g_ble_phy_data.phy_cur_phy_mode;
+
+    if (txrx == BLE_PHY_WFR_ENABLE_TXRX) {
+        /* RX shall start exactly T_IFS after TX end captured in CC[2] */
+        end_time = NRF_TIMER0->CC[2] + BLE_LL_IFS;
+        /* Adjust for delay between EVENT_END and actual TX end time */
+        end_time += g_ble_phy_t_txenddelay[tx_phy_mode];
+        /* Wait a bit longer due to allowed active clock accuracy */
+        end_time += 2;
+        /*
+         * It's possible that we'll capture PDU start time at the end of timer
+         * cycle and since wfr expires at the beginning of calculated timer
+         * cycle it can be almost 1 usec too early. Let's compensate for this
+         * by waiting 1 usec more.
+         */
+        end_time += 1;
+#if MYNEWT_VAL(BLE_PHY_CODED_RX_IFS_EXTRA_MARGIN) > 0
+        if ((phy == BLE_PHY_MODE_CODED_125KBPS) ||
+                                    (phy == BLE_PHY_MODE_CODED_500KBPS)) {
+            /*
+             * Some controllers exceed T_IFS when transmitting on coded phy
+             * so let's wait a bit longer to be able to talk to them if this
+             * workaround is enabled.
+             */
+            end_time += MYNEWT_VAL(BLE_PHY_CODED_RX_IFS_EXTRA_MARGIN);
+        }
+#endif
+    } else {
+        /*
+         * RX shall start no later than wfr_usecs after RX enabled.
+         * CC[0] is the time of RXEN so adjust for radio ram-up.
+         * Do not add jitter since this is already covered by LL.
+         */
+        end_time = NRF_TIMER0->CC[0] + BLE_PHY_T_RXENFAST + wfr_usecs;
+    }
+
+    /*
+     * Note: on LE Coded EVENT_ADDRESS is fired after TERM1 is received, so
+     *       we are actually calculating relative to start of packet payload
+     *       which is fine.
+     */
+
+    /* Adjust for receiving access address since this triggers EVENT_ADDRESS */
+    end_time += ble_phy_mode_pdu_start_off(phy);
+    /* Adjust for delay between actual access address RX and EVENT_ADDRESS */
+    end_time += g_ble_phy_t_rxaddrdelay[phy];
+
+    /* wfr_secs is the time from rxen until timeout */
+    NRF_TIMER0->CC[3] = end_time;
+    NRF_TIMER0->EVENTS_COMPARE[3] = 0;
+
+    /* Enable wait for response PPI */
+    NRF_PPI->CHENSET = (PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk);
+
+    /* Enable the disabled interrupt so we time out on events compare */
+    NRF_RADIO->INTENSET = RADIO_INTENSET_DISABLED_Msk;
+
+    /*
+     * It may happen that if CPU is halted for a brief moment (e.g. during flash
+     * erase or write), TIMER0 already counted past CC[3] and thus wfr will not
+     * fire as expected. In case this happened, let's just disable PPIs for wfr
+     * and trigger wfr manually (i.e. disable radio).
+     *
+     * Note that the same applies to RX start time set in CC[0] but since it
+     * should fire earlier than wfr, fixing wfr is enough.
+     *
+     * CC[1] is only used as a reference on RX start, we do not need it here so
+     * it can be used to read TIMER0 counter.
+     */
+    NRF_TIMER0->TASKS_CAPTURE[1] = 1;
+    if (NRF_TIMER0->CC[1] > NRF_TIMER0->CC[3]) {
+        NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk;
+        NRF_RADIO->TASKS_DISABLE = 1;
+    }
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+static uint32_t
+ble_phy_get_ccm_datarate(void)
+{
+#if BLE_LL_BT5_PHY_SUPPORTED
+    switch (g_ble_phy_data.phy_cur_phy_mode) {
+    case BLE_PHY_MODE_1M:
+        return CCM_MODE_DATARATE_1Mbit << CCM_MODE_DATARATE_Pos;
+    case BLE_PHY_MODE_2M:
+        return CCM_MODE_DATARATE_2Mbit << CCM_MODE_DATARATE_Pos;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    case BLE_PHY_MODE_CODED_125KBPS:
+        return CCM_MODE_DATARATE_125Kbps << CCM_MODE_DATARATE_Pos;
+    case BLE_PHY_MODE_CODED_500KBPS:
+        return CCM_MODE_DATARATE_500Kbps << CCM_MODE_DATARATE_Pos;
+#endif
+    }
+
+    assert(0);
+    return 0;
+#else
+    return CCM_MODE_DATARATE_1Mbit << CCM_MODE_DATARATE_Pos;
+#endif
+}
+#endif
+
+/**
+ * Setup transceiver for receive.
+ */
+static void
+ble_phy_rx_xcvr_setup(void)
+{
+    uint8_t *dptr;
+
+    dptr = (uint8_t *)&g_ble_phy_rx_buf[0];
+    dptr += 3;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    if (g_ble_phy_data.phy_encrypted) {
+        NRF_RADIO->PACKETPTR = (uint32_t)&g_ble_phy_enc_buf[0];
+        NRF_CCM->INPTR = (uint32_t)&g_ble_phy_enc_buf[0];
+        NRF_CCM->OUTPTR = (uint32_t)dptr;
+        NRF_CCM->SCRATCHPTR = (uint32_t)&g_nrf_encrypt_scratchpad[0];
+        NRF_CCM->MODE = CCM_MODE_LENGTH_Msk | CCM_MODE_MODE_Decryption |
+                                                    ble_phy_get_ccm_datarate();
+        NRF_CCM->CNFPTR = (uint32_t)&g_nrf_ccm_data;
+        NRF_CCM->SHORTS = 0;
+        NRF_CCM->EVENTS_ERROR = 0;
+        NRF_CCM->EVENTS_ENDCRYPT = 0;
+        NRF_CCM->TASKS_KSGEN = 1;
+        NRF_PPI->CHENSET = PPI_CHEN_CH25_Msk;
+    } else {
+        NRF_RADIO->PACKETPTR = (uint32_t)dptr;
+    }
+#else
+    NRF_RADIO->PACKETPTR = (uint32_t)dptr;
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    if (g_ble_phy_data.phy_privacy) {
+        NRF_AAR->ENABLE = AAR_ENABLE_ENABLE_Enabled;
+        NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
+        NRF_AAR->SCRATCHPTR = (uint32_t)&g_ble_phy_data.phy_aar_scratch;
+        NRF_AAR->EVENTS_END = 0;
+        NRF_AAR->EVENTS_RESOLVED = 0;
+        NRF_AAR->EVENTS_NOTRESOLVED = 0;
+    } else {
+        if (g_ble_phy_data.phy_encrypted == 0) {
+            NRF_AAR->ENABLE = AAR_ENABLE_ENABLE_Disabled;
+        }
+    }
+#endif
+
+    /* Turn off trigger TXEN on output compare match and AAR on bcmatch */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH20_Msk | PPI_CHEN_CH23_Msk;
+
+    /* Reset the rx started flag. Used for the wait for response */
+    g_ble_phy_data.phy_rx_started = 0;
+    g_ble_phy_data.phy_state = BLE_PHY_STATE_RX;
+
+#if BLE_LL_BT5_PHY_SUPPORTED
+    /*
+     * On Coded PHY there are CI and TERM1 fields before PDU starts so we need
+     * to take this into account when setting up BCC.
+     */
+    if (g_ble_phy_data.phy_cur_phy_mode == BLE_PHY_MODE_CODED_125KBPS ||
+            g_ble_phy_data.phy_cur_phy_mode == BLE_PHY_MODE_CODED_500KBPS) {
+        g_ble_phy_data.phy_bcc_offset = 5;
+    } else {
+        g_ble_phy_data.phy_bcc_offset = 0;
+    }
+#else
+    g_ble_phy_data.phy_bcc_offset = 0;
+#endif
+
+    /* I want to know when 1st byte received (after address) */
+    NRF_RADIO->BCC = 8 + g_ble_phy_data.phy_bcc_offset; /* in bits */
+    NRF_RADIO->EVENTS_ADDRESS = 0;
+    NRF_RADIO->EVENTS_DEVMATCH = 0;
+    NRF_RADIO->EVENTS_BCMATCH = 0;
+    NRF_RADIO->EVENTS_RSSIEND = 0;
+    NRF_RADIO->EVENTS_CRCOK = 0;
+    NRF_RADIO->SHORTS = RADIO_SHORTS_END_DISABLE_Msk |
+                        RADIO_SHORTS_READY_START_Msk |
+                        RADIO_SHORTS_ADDRESS_BCSTART_Msk |
+                        RADIO_SHORTS_ADDRESS_RSSISTART_Msk |
+                        RADIO_SHORTS_DISABLED_RSSISTOP_Msk;
+
+    NRF_RADIO->INTENSET = RADIO_INTENSET_ADDRESS_Msk;
+}
+
+/**
+ * Called from interrupt context when the transmit ends
+ *
+ */
+static void
+ble_phy_tx_end_isr(void)
+{
+    uint8_t tx_phy_mode;
+    uint8_t was_encrypted;
+    uint8_t transition;
+    uint32_t rx_time;
+    uint32_t wfr_time;
+
+    /* Store PHY on which we've just transmitted smth */
+    tx_phy_mode = g_ble_phy_data.phy_cur_phy_mode;
+
+    /* If this transmission was encrypted we need to remember it */
+    was_encrypted = g_ble_phy_data.phy_encrypted;
+    (void)was_encrypted;
+
+    /* Better be in TX state! */
+    assert(g_ble_phy_data.phy_state == BLE_PHY_STATE_TX);
+
+    /* Clear events and clear interrupt on disabled event */
+    NRF_RADIO->EVENTS_DISABLED = 0;
+    NRF_RADIO->INTENCLR = RADIO_INTENCLR_DISABLED_Msk;
+    NRF_RADIO->EVENTS_END = 0;
+    wfr_time = NRF_RADIO->SHORTS;
+    (void)wfr_time;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    /*
+     * XXX: not sure what to do. We had a HW error during transmission.
+     * For now I just count a stat but continue on like all is good.
+     */
+    if (was_encrypted) {
+        if (NRF_CCM->EVENTS_ERROR) {
+            STATS_INC(ble_phy_stats, tx_hw_err);
+            NRF_CCM->EVENTS_ERROR = 0;
+        }
+    }
+#endif
+
+    /* Call transmit end callback */
+    if (g_ble_phy_data.txend_cb) {
+        g_ble_phy_data.txend_cb(g_ble_phy_data.txend_arg);
+    }
+
+    transition = g_ble_phy_data.phy_transition;
+    if (transition == BLE_PHY_TRANSITION_TX_RX) {
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+        ble_phy_mode_apply(g_ble_phy_data.phy_rx_phy_mode);
+#endif
+
+        /* Packet pointer needs to be reset. */
+        ble_phy_rx_xcvr_setup();
+
+        ble_phy_wfr_enable(BLE_PHY_WFR_ENABLE_TXRX, tx_phy_mode, 0);
+
+        /* Schedule RX exactly T_IFS after TX end captured in CC[2] */
+        rx_time = NRF_TIMER0->CC[2] + BLE_LL_IFS;
+        /* Adjust for delay between EVENT_END and actual TX end time */
+        rx_time += g_ble_phy_t_txenddelay[tx_phy_mode];
+        /* Adjust for radio ramp-up */
+        rx_time -= BLE_PHY_T_RXENFAST;
+        /* Start listening a bit earlier due to allowed active clock accuracy */
+        rx_time -= 2;
+
+        NRF_TIMER0->CC[0] = rx_time;
+        NRF_TIMER0->EVENTS_COMPARE[0] = 0;
+        NRF_PPI->CHENSET = PPI_CHEN_CH21_Msk;
+    } else {
+        /*
+         * XXX: not sure we need to stop the timer here all the time. Or that
+         * it should be stopped here.
+         */
+        NRF_TIMER0->TASKS_STOP = 1;
+        NRF_TIMER0->TASKS_SHUTDOWN = 1;
+        NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk |
+                           PPI_CHEN_CH20_Msk | PPI_CHEN_CH31_Msk;
+        assert(transition == BLE_PHY_TRANSITION_NONE);
+    }
+}
+
+static inline uint8_t
+ble_phy_get_cur_rx_phy_mode(void)
+{
+    uint8_t phy;
+
+    phy = g_ble_phy_data.phy_cur_phy_mode;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CODED_PHY)
+    /*
+     * For Coded PHY mode can be set to either codings since actual coding is
+     * set in packet header. However, here we need actual coding of received
+     * packet as this determines pipeline delays so need to figure this out
+     * using CI field.
+     */
+    if ((phy == BLE_PHY_MODE_CODED_125KBPS) ||
+                                    (phy == BLE_PHY_MODE_CODED_500KBPS)) {
+        phy = NRF_RADIO->PDUSTAT & RADIO_PDUSTAT_CISTAT_Msk ?
+                                   BLE_PHY_MODE_CODED_500KBPS :
+                                   BLE_PHY_MODE_CODED_125KBPS;
+    }
+#endif
+
+    return phy;
+}
+
+static void
+ble_phy_rx_end_isr(void)
+{
+    int rc;
+    uint8_t *dptr;
+    uint8_t crcok;
+    uint32_t tx_time;
+    struct ble_mbuf_hdr *ble_hdr;
+
+    /* Clear events and clear interrupt */
+    NRF_RADIO->EVENTS_END = 0;
+    NRF_RADIO->INTENCLR = RADIO_INTENCLR_END_Msk;
+
+    /* Disable automatic RXEN */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH21_Msk;
+
+    /* Set RSSI and CRC status flag in header */
+    ble_hdr = &g_ble_phy_data.rxhdr;
+    assert(NRF_RADIO->EVENTS_RSSIEND != 0);
+    ble_hdr->rxinfo.rssi = (-1 * NRF_RADIO->RSSISAMPLE) +
+                           g_ble_phy_data.rx_pwr_compensation;
+
+    dptr = (uint8_t *)&g_ble_phy_rx_buf[0];
+    dptr += 3;
+
+    /* Count PHY crc errors and valid packets */
+    crcok = NRF_RADIO->EVENTS_CRCOK;
+    if (!crcok) {
+        STATS_INC(ble_phy_stats, rx_crc_err);
+    } else {
+        STATS_INC(ble_phy_stats, rx_valid);
+        ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_CRC_OK;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+        if (g_ble_phy_data.phy_encrypted) {
+            /* Only set MIC failure flag if frame is not zero length */
+            if ((dptr[1] != 0) && (NRF_CCM->MICSTATUS == 0)) {
+                ble_hdr->rxinfo.flags |= BLE_MBUF_HDR_F_MIC_FAILURE;
+            }
+
+            /*
+             * XXX: not sure how to deal with this. This should not
+             * be a MIC failure but we should not hand it up. I guess
+             * this is just some form of rx error and that is how we
+             * handle it? For now, just set CRC error flags
+             */
+            if (NRF_CCM->EVENTS_ERROR) {
+                STATS_INC(ble_phy_stats, rx_hw_err);
+                ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
+            }
+
+            /*
+             * XXX: This is a total hack work-around for now but I dont
+             * know what else to do. If ENDCRYPT is not set and we are
+             * encrypted we need to not trust this frame and drop it.
+             */
+            if (NRF_CCM->EVENTS_ENDCRYPT == 0) {
+                STATS_INC(ble_phy_stats, rx_hw_err);
+                ble_hdr->rxinfo.flags &= ~BLE_MBUF_HDR_F_CRC_OK;
+            }
+        }
+#endif
+    }
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    ble_phy_mode_apply(g_ble_phy_data.phy_tx_phy_mode);
+#endif
+
+    /*
+     * Let's schedule TX now and we will just cancel it after processing RXed
+     * packet if we don't need TX.
+     *
+     * We need this to initiate connection in case AUX_CONNECT_REQ was sent on
+     * LE Coded S8. In this case the time we process RXed packet is roughly the
+     * same as the limit when we need to have TX scheduled (i.e. TIMER0 and PPI
+     * armed) so we may simply miss the slot and set the timer in the past.
+     *
+     * When TX is scheduled in advance, we may event process packet a bit longer
+     * during radio ramp-up - this gives us extra 40 usecs which is more than
+     * enough.
+     */
+
+    /* Schedule TX exactly T_IFS after RX end captured in CC[2] */
+    tx_time = NRF_TIMER0->CC[2] + BLE_LL_IFS;
+    /* Adjust for delay between actual RX end time and EVENT_END */
+    tx_time -= g_ble_phy_t_rxenddelay[ble_hdr->rxinfo.phy_mode];
+    /* Adjust for radio ramp-up */
+    tx_time -= BLE_PHY_T_TXENFAST;
+    /* Adjust for delay between EVENT_READY and actual TX start time */
+    tx_time -= g_ble_phy_t_txdelay[g_ble_phy_data.phy_cur_phy_mode];
+
+    NRF_TIMER0->CC[0] = tx_time;
+    NRF_TIMER0->EVENTS_COMPARE[0] = 0;
+    NRF_PPI->CHENSET = PPI_CHEN_CH20_Msk;
+
+    /*
+     * XXX: Hack warning!
+     *
+     * It may happen (during flash erase) that CPU is stopped for a moment and
+     * TIMER0 already counted past CC[0]. In such case we will be stuck waiting
+     * for TX to start since EVENTS_COMPARE[0] will not happen any time soon.
+     * For now let's set a flag denoting that we are late in RX-TX transition so
+     * ble_phy_tx() will fail - this allows everything to cleanup nicely without
+     * the need for extra handling in many places.
+     *
+     * Note: CC[3] is used only for wfr which we do not need here.
+     */
+    NRF_TIMER0->TASKS_CAPTURE[3] = 1;
+    if (NRF_TIMER0->CC[3] > NRF_TIMER0->CC[0]) {
+        NRF_PPI->CHENCLR = PPI_CHEN_CH20_Msk;
+        g_ble_phy_data.phy_transition_late = 1;
+    }
+
+    /*
+     * XXX: This is a horrible ugly hack to deal with the RAM S1 byte
+     * that is not sent over the air but is present here. Simply move the
+     * data pointer to deal with it. Fix this later.
+     */
+    dptr[2] = dptr[1];
+    dptr[1] = dptr[0];
+    rc = ble_ll_rx_end(dptr + 1, ble_hdr);
+    if (rc < 0) {
+        ble_phy_disable();
+    }
+}
+
+static bool
+ble_phy_rx_start_isr(void)
+{
+    int rc;
+    uint32_t state;
+    uint32_t usecs;
+    uint32_t pdu_usecs;
+    uint32_t ticks;
+    struct ble_mbuf_hdr *ble_hdr;
+    uint8_t *dptr;
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    int adva_offset;
+#endif
+
+    dptr = (uint8_t *)&g_ble_phy_rx_buf[0];
+
+    /* Clear events and clear interrupt */
+    NRF_RADIO->EVENTS_ADDRESS = 0;
+
+    /* Clear wfr timer channels and DISABLED interrupt */
+    NRF_RADIO->INTENCLR = RADIO_INTENCLR_DISABLED_Msk | RADIO_INTENCLR_ADDRESS_Msk;
+    NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk;
+
+    /* Initialize the ble mbuf header */
+    ble_hdr = &g_ble_phy_data.rxhdr;
+    ble_hdr->rxinfo.flags = ble_ll_state_get();
+    ble_hdr->rxinfo.channel = g_ble_phy_data.phy_chan;
+    ble_hdr->rxinfo.handle = 0;
+    ble_hdr->rxinfo.phy = ble_phy_get_cur_phy();
+    ble_hdr->rxinfo.phy_mode = ble_phy_get_cur_rx_phy_mode();
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+    ble_hdr->rxinfo.user_data = NULL;
+#endif
+
+    /*
+     * Calculate accurate packets start time (with remainder)
+     *
+     * We may start receiving packet somewhere during preamble in which case
+     * it is possible that actual transmission started before TIMER0 was
+     * running - need to take this into account.
+     */
+    ble_hdr->beg_cputime = g_ble_phy_data.phy_start_cputime;
+
+    usecs = NRF_TIMER0->CC[1];
+    pdu_usecs = ble_phy_mode_pdu_start_off(ble_hdr->rxinfo.phy_mode) +
+                g_ble_phy_t_rxaddrdelay[ble_hdr->rxinfo.phy_mode];
+    if (usecs < pdu_usecs) {
+        g_ble_phy_data.phy_start_cputime--;
+        usecs += 30;
+    }
+    usecs -= pdu_usecs;
+
+    ticks = os_cputime_usecs_to_ticks(usecs);
+    usecs -= os_cputime_ticks_to_usecs(ticks);
+    if (usecs == 31) {
+        usecs = 0;
+        ++ticks;
+    }
+
+    ble_hdr->beg_cputime += ticks;
+    ble_hdr->rem_usecs = usecs;
+
+    /* XXX: I wonder if we always have the 1st byte. If we need to wait for
+     * rx chain delay, it could be 18 usecs from address interrupt. The
+       nrf52 may be able to get here early. */
+    /* Wait to get 1st byte of frame */
+    while (1) {
+        state = NRF_RADIO->STATE;
+        if (NRF_RADIO->EVENTS_BCMATCH != 0) {
+            break;
+        }
+
+        /*
+         * If state is disabled, we should have the BCMATCH. If not,
+         * something is wrong!
+         */
+        if (state == RADIO_STATE_STATE_Disabled) {
+            NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+            NRF_RADIO->SHORTS = 0;
+            return false;
+        }
+    }
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    /*
+     * If privacy is enabled and received PDU has TxAdd bit set (i.e. random
+     * address) we try to resolve address using AAR.
+     */
+    if (g_ble_phy_data.phy_privacy && (dptr[3] & 0x40)) {
+        /*
+         * AdvA is located at 4th octet in RX buffer (after S0, length an S1
+         * fields). In case of extended advertising PDU we need to add 2 more
+         * octets for extended header.
+         */
+        adva_offset = (dptr[3] & 0x0f) == 0x07 ? 2 : 0;
+        NRF_AAR->ADDRPTR = (uint32_t)(dptr + 3 + adva_offset);
+
+        /* Trigger AAR after last bit of AdvA is received */
+        NRF_RADIO->EVENTS_BCMATCH = 0;
+        NRF_PPI->CHENSET = PPI_CHEN_CH23_Msk;
+        NRF_RADIO->BCC = (BLE_LL_PDU_HDR_LEN + adva_offset + BLE_DEV_ADDR_LEN) * 8 +
+                         g_ble_phy_data.phy_bcc_offset;
+    }
+#endif
+
+    /* Call Link Layer receive start function */
+    rc = ble_ll_rx_start(dptr + 3,
+                         g_ble_phy_data.phy_chan,
+                         &g_ble_phy_data.rxhdr);
+    if (rc >= 0) {
+        /* Set rx started flag and enable rx end ISR */
+        g_ble_phy_data.phy_rx_started = 1;
+        NRF_RADIO->INTENSET = RADIO_INTENSET_END_Msk;
+    } else {
+        /* Disable PHY */
+        ble_phy_disable();
+        STATS_INC(ble_phy_stats, rx_aborts);
+    }
+
+    /* Count rx starts */
+    STATS_INC(ble_phy_stats, rx_starts);
+
+    return true;
+}
+
+static void
+ble_phy_isr(void)
+{
+    uint32_t irq_en;
+
+    os_trace_isr_enter();
+
+    /* Read irq register to determine which interrupts are enabled */
+    irq_en = NRF_RADIO->INTENCLR;
+
+    /*
+     * NOTE: order of checking is important! Possible, if things get delayed,
+     * we have both an ADDRESS and DISABLED interrupt in rx state. If we get
+     * an address, we disable the DISABLED interrupt.
+     */
+
+    /* We get this if we have started to receive a frame */
+    if ((irq_en & RADIO_INTENCLR_ADDRESS_Msk) && NRF_RADIO->EVENTS_ADDRESS) {
+        /*
+         * wfr timer is calculated to expire at the exact time we should start
+         * receiving a packet (with 1 usec precision) so it is possible  it will
+         * fire at the same time as EVENT_ADDRESS. If this happens, radio will
+         * be disabled while we are waiting for EVENT_BCCMATCH after 1st byte
+         * of payload is received and ble_phy_rx_start_isr() will fail. In this
+         * case we should not clear DISABLED irq mask so it will be handled as
+         * regular radio disabled event below. In other case radio was disabled
+         * on purpose and there's nothing more to handle so we can clear mask.
+         */
+        if (ble_phy_rx_start_isr()) {
+            irq_en &= ~RADIO_INTENCLR_DISABLED_Msk;
+        }
+    }
+
+    /* Check for disabled event. This only happens for transmits now */
+    if ((irq_en & RADIO_INTENCLR_DISABLED_Msk) && NRF_RADIO->EVENTS_DISABLED) {
+        if (g_ble_phy_data.phy_state == BLE_PHY_STATE_RX) {
+            NRF_RADIO->EVENTS_DISABLED = 0;
+            ble_ll_wfr_timer_exp(NULL);
+        } else if (g_ble_phy_data.phy_state == BLE_PHY_STATE_IDLE) {
+            assert(0);
+        } else {
+            ble_phy_tx_end_isr();
+        }
+    }
+
+    /* Receive packet end (we dont enable this for transmit) */
+    if ((irq_en & RADIO_INTENCLR_END_Msk) && NRF_RADIO->EVENTS_END) {
+        ble_phy_rx_end_isr();
+    }
+
+    g_ble_phy_data.phy_transition_late = 0;
+
+    /* Ensures IRQ is cleared */
+    irq_en = NRF_RADIO->SHORTS;
+
+    /* Count # of interrupts */
+    STATS_INC(ble_phy_stats, phy_isrs);
+
+    os_trace_isr_exit();
+}
+
+#if MYNEWT_VAL(BLE_PHY_DBG_TIME_TXRXEN_READY_PIN) >= 0 || \
+        MYNEWT_VAL(BLE_PHY_DBG_TIME_ADDRESS_END_PIN) >= 0 || \
+        MYNEWT_VAL(BLE_PHY_DBG_TIME_WFR_PIN) >= 0
+static inline void
+ble_phy_dbg_time_setup_gpiote(int index, int pin)
+{
+    NRF_GPIO_Type *port;
+
+#if NRF52840_XXAA
+    port = pin > 31 ? NRF_P1 : NRF_P0;
+    pin &= 0x1f;
+#else
+    port = NRF_P0;
+#endif
+
+    /* Configure GPIO directly to avoid dependency to hal_gpio (for porting) */
+    port->DIRSET = (1 << pin);
+    port->OUTCLR = (1 << pin);
+
+    NRF_GPIOTE->CONFIG[index] =
+                        (GPIOTE_CONFIG_MODE_Task << GPIOTE_CONFIG_MODE_Pos) |
+                        ((pin & 0x1F) << GPIOTE_CONFIG_PSEL_Pos) |
+#if NRF52840_XXAA
+                        ((port == NRF_P1) << GPIOTE_CONFIG_PORT_Pos);
+#else
+                        0;
+#endif
+}
+#endif
+
+static void
+ble_phy_dbg_time_setup(void)
+{
+    int gpiote_idx __attribute__((unused)) = 8;
+
+    /*
+     * We setup GPIOTE starting from last configuration index to minimize risk
+     * of conflict with GPIO setup via hal. It's not great solution, but since
+     * this is just debugging code we can live with this.
+     */
+
+#if MYNEWT_VAL(BLE_PHY_DBG_TIME_TXRXEN_READY_PIN) >= 0
+    ble_phy_dbg_time_setup_gpiote(--gpiote_idx,
+                              MYNEWT_VAL(BLE_PHY_DBG_TIME_TXRXEN_READY_PIN));
+
+    NRF_PPI->CH[17].EEP = (uint32_t)&(NRF_RADIO->EVENTS_READY);
+    NRF_PPI->CH[17].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_CLR[gpiote_idx]);
+    NRF_PPI->CHENSET = PPI_CHEN_CH17_Msk;
+
+    /* CH[20] and PPI CH[21] are on to trigger TASKS_TXEN or TASKS_RXEN */
+    NRF_PPI->FORK[20].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_SET[gpiote_idx]);
+    NRF_PPI->FORK[21].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_SET[gpiote_idx]);
+#endif
+
+#if MYNEWT_VAL(BLE_PHY_DBG_TIME_ADDRESS_END_PIN) >= 0
+    ble_phy_dbg_time_setup_gpiote(--gpiote_idx,
+                              MYNEWT_VAL(BLE_PHY_DBG_TIME_ADDRESS_END_PIN));
+
+    /* CH[26] and CH[27] are always on for EVENT_ADDRESS and EVENT_END */
+    NRF_PPI->FORK[26].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_SET[gpiote_idx]);
+    NRF_PPI->FORK[27].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_CLR[gpiote_idx]);
+#endif
+
+#if MYNEWT_VAL(BLE_PHY_DBG_TIME_WFR_PIN) >= 0
+    ble_phy_dbg_time_setup_gpiote(--gpiote_idx,
+                              MYNEWT_VAL(BLE_PHY_DBG_TIME_WFR_PIN));
+
+#if NRF52840_XXAA
+    NRF_PPI->CH[18].EEP = (uint32_t)&(NRF_RADIO->EVENTS_RXREADY);
+#else
+    NRF_PPI->CH[18].EEP = (uint32_t)&(NRF_RADIO->EVENTS_READY);
+#endif
+    NRF_PPI->CH[18].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_SET[gpiote_idx]);
+    NRF_PPI->CH[19].EEP = (uint32_t)&(NRF_RADIO->EVENTS_DISABLED);
+    NRF_PPI->CH[19].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_CLR[gpiote_idx]);
+    NRF_PPI->CHENSET = PPI_CHEN_CH18_Msk | PPI_CHEN_CH19_Msk;
+
+    /* CH[4] and CH[5] are always on for wfr */
+    NRF_PPI->FORK[4].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_CLR[gpiote_idx]);
+    NRF_PPI->FORK[5].TEP = (uint32_t)&(NRF_GPIOTE->TASKS_CLR[gpiote_idx]);
+#endif
+}
+
+/**
+ * ble phy init
+ *
+ * Initialize the PHY.
+ *
+ * @return int 0: success; PHY error code otherwise
+ */
+int
+ble_phy_init(void)
+{
+    int rc;
+
+    /* Default phy to use is 1M */
+    g_ble_phy_data.phy_cur_phy_mode = BLE_PHY_MODE_1M;
+    g_ble_phy_data.phy_tx_phy_mode = BLE_PHY_MODE_1M;
+    g_ble_phy_data.phy_rx_phy_mode = BLE_PHY_MODE_1M;
+
+    g_ble_phy_data.rx_pwr_compensation = 0;
+
+    /* Set phy channel to an invalid channel so first set channel works */
+    g_ble_phy_data.phy_chan = BLE_PHY_NUM_CHANS;
+
+    /* Toggle peripheral power to reset (just in case) */
+    NRF_RADIO->POWER = 0;
+    NRF_RADIO->POWER = 1;
+
+    /* Disable all interrupts */
+    NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+
+    /* Set configuration registers */
+    NRF_RADIO->MODE = RADIO_MODE_MODE_Ble_1Mbit;
+    NRF_RADIO->PCNF0 = NRF_PCNF0;
+
+    /* XXX: should maxlen be 251 for encryption? */
+    NRF_RADIO->PCNF1 = NRF_MAXLEN |
+                       (RADIO_PCNF1_ENDIAN_Little <<  RADIO_PCNF1_ENDIAN_Pos) |
+                       (NRF_BALEN << RADIO_PCNF1_BALEN_Pos) |
+                       RADIO_PCNF1_WHITEEN_Msk;
+
+    /* Enable radio fast ramp-up */
+    NRF_RADIO->MODECNF0 |= (RADIO_MODECNF0_RU_Fast << RADIO_MODECNF0_RU_Pos) &
+                            RADIO_MODECNF0_RU_Msk;
+
+    /* Set logical address 1 for TX and RX */
+    NRF_RADIO->TXADDRESS  = 0;
+    NRF_RADIO->RXADDRESSES  = (1 << 0);
+
+    /* Configure the CRC registers */
+    NRF_RADIO->CRCCNF = (RADIO_CRCCNF_SKIPADDR_Skip << RADIO_CRCCNF_SKIPADDR_Pos) | RADIO_CRCCNF_LEN_Three;
+
+    /* Configure BLE poly */
+    NRF_RADIO->CRCPOLY = 0x0000065B;
+
+    /* Configure IFS */
+    NRF_RADIO->TIFS = BLE_LL_IFS;
+
+    /* Captures tx/rx start in timer0 cc 1 and tx/rx end in timer0 cc 2 */
+    NRF_PPI->CHENSET = PPI_CHEN_CH26_Msk | PPI_CHEN_CH27_Msk;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    NRF_CCM->INTENCLR = 0xffffffff;
+    NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
+    NRF_CCM->EVENTS_ERROR = 0;
+    memset(g_nrf_encrypt_scratchpad, 0, sizeof(g_nrf_encrypt_scratchpad));
+#endif
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+    g_ble_phy_data.phy_aar_scratch = 0;
+    NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
+    NRF_AAR->INTENCLR = 0xffffffff;
+    NRF_AAR->EVENTS_END = 0;
+    NRF_AAR->EVENTS_RESOLVED = 0;
+    NRF_AAR->EVENTS_NOTRESOLVED = 0;
+    NRF_AAR->NIRK = 0;
+#endif
+
+    /* TIMER0 setup for PHY when using RTC */
+    NRF_TIMER0->TASKS_STOP = 1;
+    NRF_TIMER0->TASKS_SHUTDOWN = 1;
+    NRF_TIMER0->BITMODE = 3;    /* 32-bit timer */
+    NRF_TIMER0->MODE = 0;       /* Timer mode */
+    NRF_TIMER0->PRESCALER = 4;  /* gives us 1 MHz */
+
+    /*
+     * PPI setup.
+     * Channel 4: Captures TIMER0 in CC[3] when EVENTS_ADDRESS occurs. Used
+     *            to cancel the wait for response timer.
+     * Channel 5: TIMER0 CC[3] to TASKS_DISABLE on radio. This is the wait
+     *            for response timer.
+     */
+    NRF_PPI->CH[4].EEP = (uint32_t)&(NRF_RADIO->EVENTS_ADDRESS);
+    NRF_PPI->CH[4].TEP = (uint32_t)&(NRF_TIMER0->TASKS_CAPTURE[3]);
+    NRF_PPI->CH[5].EEP = (uint32_t)&(NRF_TIMER0->EVENTS_COMPARE[3]);
+    NRF_PPI->CH[5].TEP = (uint32_t)&(NRF_RADIO->TASKS_DISABLE);
+
+    /* Set isr in vector table and enable interrupt */
+#ifndef RIOT_VERSION
+    NVIC_SetPriority(RADIO_IRQn, 0);
+#endif
+#if MYNEWT
+    NVIC_SetVector(RADIO_IRQn, (uint32_t)ble_phy_isr);
+#else
+    ble_npl_hw_set_isr(RADIO_IRQn, ble_phy_isr);
+#endif
+    NVIC_EnableIRQ(RADIO_IRQn);
+
+    /* Register phy statistics */
+    if (!g_ble_phy_data.phy_stats_initialized) {
+        rc = stats_init_and_reg(STATS_HDR(ble_phy_stats),
+                                STATS_SIZE_INIT_PARMS(ble_phy_stats,
+                                                      STATS_SIZE_32),
+                                STATS_NAME_INIT_PARMS(ble_phy_stats),
+                                "ble_phy");
+        assert(rc == 0);
+
+        g_ble_phy_data.phy_stats_initialized  = 1;
+    }
+
+    ble_phy_dbg_time_setup();
+
+    return 0;
+}
+
+/**
+ * Puts the phy into receive mode.
+ *
+ * @return int 0: success; BLE Phy error code otherwise
+ */
+int
+ble_phy_rx(void)
+{
+    /*
+     * Check radio state.
+     *
+     * In case radio is now disabling we'll wait for it to finish, but if for
+     * any reason it's just in idle state we proceed with RX as usual since
+     * nRF52 radio can ramp-up from idle state as well.
+     *
+     * Note that TX and RX states values are the same except for 3rd bit so we
+     * can make a shortcut here when checking for idle state.
+     */
+    nrf_wait_disabled();
+    if ((NRF_RADIO->STATE != RADIO_STATE_STATE_Disabled) &&
+            ((NRF_RADIO->STATE & 0x07) != RADIO_STATE_STATE_RxIdle)) {
+        ble_phy_disable();
+        STATS_INC(ble_phy_stats, radio_state_errs);
+        return BLE_PHY_ERR_RADIO_STATE;
+    }
+
+    /* Make sure all interrupts are disabled */
+    NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+
+    /* Clear events prior to enabling receive */
+    NRF_RADIO->EVENTS_END = 0;
+    NRF_RADIO->EVENTS_DISABLED = 0;
+
+    /* Setup for rx */
+    ble_phy_rx_xcvr_setup();
+
+    /* PPI to start radio automatically shall be set here */
+    assert(NRF_PPI->CHEN & PPI_CHEN_CH21_Msk);
+
+    return 0;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+/**
+ * Called to enable encryption at the PHY. Note that this state will persist
+ * in the PHY; in other words, if you call this function you have to call
+ * disable so that future PHY transmits/receives will not be encrypted.
+ *
+ * @param pkt_counter
+ * @param iv
+ * @param key
+ * @param is_master
+ */
+void
+ble_phy_encrypt_enable(uint64_t pkt_counter, uint8_t *iv, uint8_t *key,
+                       uint8_t is_master)
+{
+    memcpy(g_nrf_ccm_data.key, key, 16);
+    g_nrf_ccm_data.pkt_counter = pkt_counter;
+    memcpy(g_nrf_ccm_data.iv, iv, 8);
+    g_nrf_ccm_data.dir_bit = is_master;
+    g_ble_phy_data.phy_encrypted = 1;
+    /* Enable the module (AAR cannot be on while CCM on) */
+    NRF_AAR->ENABLE = AAR_ENABLE_ENABLE_Disabled;
+    NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Enabled;
+}
+
+void
+ble_phy_encrypt_set_pkt_cntr(uint64_t pkt_counter, int dir)
+{
+    g_nrf_ccm_data.pkt_counter = pkt_counter;
+    g_nrf_ccm_data.dir_bit = dir;
+}
+
+void
+ble_phy_encrypt_disable(void)
+{
+    NRF_PPI->CHENCLR = PPI_CHEN_CH25_Msk;
+    NRF_CCM->TASKS_STOP = 1;
+    NRF_CCM->EVENTS_ERROR = 0;
+    NRF_CCM->ENABLE = CCM_ENABLE_ENABLE_Disabled;
+
+    g_ble_phy_data.phy_encrypted = 0;
+}
+#endif
+
+void
+ble_phy_set_txend_cb(ble_phy_tx_end_func txend_cb, void *arg)
+{
+    /* Set transmit end callback and arg */
+    g_ble_phy_data.txend_cb = txend_cb;
+    g_ble_phy_data.txend_arg = arg;
+}
+
+/**
+ * Called to set the start time of a transmission.
+ *
+ * This function is called to set the start time when we are not going from
+ * rx to tx automatically.
+ *
+ * NOTE: care must be taken when calling this function. The channel should
+ * already be set.
+ *
+ * @param cputime   This is the tick at which the 1st bit of the preamble
+ *                  should be transmitted
+ * @param rem_usecs This is used only when the underlying timing uses a 32.768
+ *                  kHz crystal. It is the # of usecs from the cputime tick
+ *                  at which the first bit of the preamble should be
+ *                  transmitted.
+ * @return int
+ */
+int
+ble_phy_tx_set_start_time(uint32_t cputime, uint8_t rem_usecs)
+{
+    int rc;
+
+    ble_phy_trace_u32x2(BLE_PHY_TRACE_ID_START_TX, cputime, rem_usecs);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    ble_phy_mode_apply(g_ble_phy_data.phy_tx_phy_mode);
+#endif
+
+    /* XXX: This should not be necessary, but paranoia is good! */
+    /* Clear timer0 compare to RXEN since we are transmitting */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH21_Msk;
+
+    if (ble_phy_set_start_time(cputime, rem_usecs, true) != 0) {
+        STATS_INC(ble_phy_stats, tx_late);
+        ble_phy_disable();
+        rc = BLE_PHY_ERR_TX_LATE;
+    } else {
+        /* Enable PPI to automatically start TXEN */
+        NRF_PPI->CHENSET = PPI_CHEN_CH20_Msk;
+        rc = 0;
+    }
+    return rc;
+}
+
+/**
+ * Called to set the start time of a reception
+ *
+ * This function acts a bit differently than transmit. If we are late getting
+ * here we will still attempt to receive.
+ *
+ * NOTE: care must be taken when calling this function. The channel should
+ * already be set.
+ *
+ * @param cputime
+ *
+ * @return int
+ */
+int
+ble_phy_rx_set_start_time(uint32_t cputime, uint8_t rem_usecs)
+{
+    bool late = false;
+    int rc = 0;
+
+    ble_phy_trace_u32x2(BLE_PHY_TRACE_ID_START_RX, cputime, rem_usecs);
+
+#if (BLE_LL_BT5_PHY_SUPPORTED == 1)
+    ble_phy_mode_apply(g_ble_phy_data.phy_rx_phy_mode);
+#endif
+
+    /* XXX: This should not be necessary, but paranoia is good! */
+    /* Clear timer0 compare to TXEN since we are transmitting */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH20_Msk;
+
+    if (ble_phy_set_start_time(cputime, rem_usecs, false) != 0) {
+        STATS_INC(ble_phy_stats, rx_late);
+
+        /* We're late so let's just try to start RX as soon as possible */
+        ble_phy_set_start_now();
+
+        late = true;
+    }
+
+    /* Enable PPI to automatically start RXEN */
+    NRF_PPI->CHENSET = PPI_CHEN_CH21_Msk;
+
+    /* Start rx */
+    rc = ble_phy_rx();
+
+    /*
+     * If we enabled receiver but were late, let's return proper error code so
+     * caller can handle this.
+     */
+    if (!rc && late) {
+        rc = BLE_PHY_ERR_RX_LATE;
+    }
+
+    return rc;
+}
+
+int
+ble_phy_tx(ble_phy_tx_pducb_t pducb, void *pducb_arg, uint8_t end_trans)
+{
+    int rc;
+    uint8_t *dptr;
+    uint8_t *pktptr;
+    uint8_t payload_len;
+    uint8_t hdr_byte;
+    uint32_t state;
+    uint32_t shortcuts;
+
+    if (g_ble_phy_data.phy_transition_late) {
+        ble_phy_disable();
+        STATS_INC(ble_phy_stats, tx_late);
+        return BLE_PHY_ERR_TX_LATE;
+    }
+
+    /*
+     * This check is to make sure that the radio is not in a state where
+     * it is moving to disabled state. If so, let it get there.
+     */
+    nrf_wait_disabled();
+
+    /*
+     * XXX: Although we may not have to do this here, I clear all the PPI
+     * that should not be used when transmitting. Some of them are only enabled
+     * if encryption and/or privacy is on, but I dont care. Better to be
+     * paranoid, and if you are going to clear one, might as well clear them
+     * all.
+     */
+    NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk | PPI_CHEN_CH23_Msk |
+                       PPI_CHEN_CH25_Msk;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    if (g_ble_phy_data.phy_encrypted) {
+        dptr = (uint8_t *)&g_ble_phy_enc_buf[0];
+        pktptr = (uint8_t *)&g_ble_phy_tx_buf[0];
+        NRF_CCM->SHORTS = CCM_SHORTS_ENDKSGEN_CRYPT_Msk;
+        NRF_CCM->INPTR = (uint32_t)dptr;
+        NRF_CCM->OUTPTR = (uint32_t)pktptr;
+        NRF_CCM->SCRATCHPTR = (uint32_t)&g_nrf_encrypt_scratchpad[0];
+        NRF_CCM->EVENTS_ERROR = 0;
+        NRF_CCM->MODE = CCM_MODE_LENGTH_Msk | ble_phy_get_ccm_datarate();
+        NRF_CCM->CNFPTR = (uint32_t)&g_nrf_ccm_data;
+    } else {
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+        NRF_AAR->IRKPTR = (uint32_t)&g_nrf_irk_list[0];
+#endif
+        dptr = (uint8_t *)&g_ble_phy_tx_buf[0];
+        pktptr = dptr;
+    }
+#else
+    dptr = (uint8_t *)&g_ble_phy_tx_buf[0];
+    pktptr = dptr;
+#endif
+
+    /* Set PDU payload */
+    payload_len = pducb(&dptr[3], pducb_arg, &hdr_byte);
+
+    /* RAM representation has S0, LENGTH and S1 fields. (3 bytes) */
+    dptr[0] = hdr_byte;
+    dptr[1] = payload_len;
+    dptr[2] = 0;
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_ENCRYPTION)
+    /* Start key-stream generation and encryption (via short) */
+    if (g_ble_phy_data.phy_encrypted) {
+        NRF_CCM->TASKS_KSGEN = 1;
+    }
+#endif
+
+    NRF_RADIO->PACKETPTR = (uint32_t)pktptr;
+
+    /* Clear the ready, end and disabled events */
+    NRF_RADIO->EVENTS_READY = 0;
+    NRF_RADIO->EVENTS_END = 0;
+    NRF_RADIO->EVENTS_DISABLED = 0;
+
+    /* Enable shortcuts for transmit start/end. */
+    shortcuts = RADIO_SHORTS_END_DISABLE_Msk | RADIO_SHORTS_READY_START_Msk;
+    NRF_RADIO->SHORTS = shortcuts;
+    NRF_RADIO->INTENSET = RADIO_INTENSET_DISABLED_Msk;
+
+    /* Set the PHY transition */
+    g_ble_phy_data.phy_transition = end_trans;
+
+    /* Set transmitted payload length */
+    g_ble_phy_data.phy_tx_pyld_len = payload_len;
+
+    /* If we already started transmitting, abort it! */
+    state = NRF_RADIO->STATE;
+    if (state != RADIO_STATE_STATE_Tx) {
+        /* Set phy state to transmitting and count packet statistics */
+        g_ble_phy_data.phy_state = BLE_PHY_STATE_TX;
+        STATS_INC(ble_phy_stats, tx_good);
+        STATS_INCN(ble_phy_stats, tx_bytes, payload_len + BLE_LL_PDU_HDR_LEN);
+        rc = BLE_ERR_SUCCESS;
+    } else {
+        ble_phy_disable();
+        STATS_INC(ble_phy_stats, tx_late);
+        rc = BLE_PHY_ERR_RADIO_STATE;
+    }
+
+    return rc;
+}
+
+/**
+ * ble phy txpwr set
+ *
+ * Set the transmit output power (in dBm).
+ *
+ * NOTE: If the output power specified is within the BLE limits but outside
+ * the chip limits, we "rail" the power level so we dont exceed the min/max
+ * chip values.
+ *
+ * @param dbm Power output in dBm.
+ *
+ * @return int 0: success; anything else is an error
+ */
+int
+ble_phy_txpwr_set(int dbm)
+{
+    /* "Rail" power level if outside supported range */
+    dbm = ble_phy_txpower_round(dbm);
+
+    NRF_RADIO->TXPOWER = dbm;
+    g_ble_phy_data.phy_txpwr_dbm = dbm;
+
+    return 0;
+}
+
+/**
+ * ble phy txpwr round
+ *
+ * Get the rounded transmit output power (in dBm).
+ *
+ * @param dbm Power output in dBm.
+ *
+ * @return int Rounded power in dBm
+ */
+int ble_phy_txpower_round(int dbm)
+{
+    /* TODO this should be per nRF52XXX */
+
+    /* "Rail" power level if outside supported range */
+    if (dbm >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm) {
+        return (int8_t)RADIO_TXPOWER_TXPOWER_Pos4dBm;
+    }
+
+    if (dbm >= (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm) {
+        return (int8_t)RADIO_TXPOWER_TXPOWER_Pos3dBm;
+    }
+
+    if (dbm >= (int8_t)RADIO_TXPOWER_TXPOWER_0dBm) {
+        return (int8_t)RADIO_TXPOWER_TXPOWER_0dBm;
+    }
+
+    if (dbm >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm) {
+        return (int8_t)RADIO_TXPOWER_TXPOWER_Neg4dBm;
+    }
+
+    if (dbm >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm) {
+        return (int8_t)RADIO_TXPOWER_TXPOWER_Neg8dBm;
+    }
+
+    if (dbm >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm) {
+        return (int8_t)RADIO_TXPOWER_TXPOWER_Neg12dBm;
+    }
+
+    if (dbm >= (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm) {
+        return (int8_t)RADIO_TXPOWER_TXPOWER_Neg20dBm;
+    }
+
+    return (int8_t)RADIO_TXPOWER_TXPOWER_Neg40dBm;
+}
+
+/**
+ * ble phy set access addr
+ *
+ * Set access address.
+ *
+ * @param access_addr Access address
+ *
+ * @return int 0: success; PHY error code otherwise
+ */
+static int
+ble_phy_set_access_addr(uint32_t access_addr)
+{
+    NRF_RADIO->BASE0 = (access_addr << 8);
+    NRF_RADIO->PREFIX0 = (NRF_RADIO->PREFIX0 & 0xFFFFFF00) | (access_addr >> 24);
+
+    g_ble_phy_data.phy_access_address = access_addr;
+
+    ble_phy_apply_errata_102_106_107();
+
+    return 0;
+}
+
+/**
+ * ble phy txpwr get
+ *
+ * Get the transmit power.
+ *
+ * @return int  The current PHY transmit power, in dBm
+ */
+int
+ble_phy_txpwr_get(void)
+{
+    return g_ble_phy_data.phy_txpwr_dbm;
+}
+
+void
+ble_phy_set_rx_pwr_compensation(int8_t compensation)
+{
+    g_ble_phy_data.rx_pwr_compensation = compensation;
+}
+
+/**
+ * ble phy setchan
+ *
+ * Sets the logical frequency of the transceiver. The input parameter is the
+ * BLE channel index (0 to 39, inclusive). The NRF frequency register works like
+ * this: logical frequency = 2400 + FREQ (MHz).
+ *
+ * Thus, to get a logical frequency of 2402 MHz, you would program the
+ * FREQUENCY register to 2.
+ *
+ * @param chan This is the Data Channel Index or Advertising Channel index
+ *
+ * @return int 0: success; PHY error code otherwise
+ */
+int
+ble_phy_setchan(uint8_t chan, uint32_t access_addr, uint32_t crcinit)
+{
+    assert(chan < BLE_PHY_NUM_CHANS);
+
+    /* Check for valid channel range */
+    if (chan >= BLE_PHY_NUM_CHANS) {
+        return BLE_PHY_ERR_INV_PARAM;
+    }
+
+    /* Set current access address */
+    ble_phy_set_access_addr(access_addr);
+
+    /* Configure crcinit */
+    NRF_RADIO->CRCINIT = crcinit;
+
+    /* Set the frequency and the data whitening initial value */
+    g_ble_phy_data.phy_chan = chan;
+    NRF_RADIO->FREQUENCY = g_ble_phy_chan_freq[chan];
+    NRF_RADIO->DATAWHITEIV = chan;
+
+    return 0;
+}
+
+/**
+ * Stop the timer used to count microseconds when using RTC for cputime
+ */
+static void
+ble_phy_stop_usec_timer(void)
+{
+    NRF_TIMER0->TASKS_STOP = 1;
+    NRF_TIMER0->TASKS_SHUTDOWN = 1;
+    NRF_RTC0->EVTENCLR = RTC_EVTENSET_COMPARE0_Msk;
+}
+
+/**
+ * ble phy disable irq and ppi
+ *
+ * This routine is to be called when reception was stopped due to either a
+ * wait for response timeout or a packet being received and the phy is to be
+ * restarted in receive mode. Generally, the disable routine is called to stop
+ * the phy.
+ */
+static void
+ble_phy_disable_irq_and_ppi(void)
+{
+    NRF_RADIO->INTENCLR = NRF_RADIO_IRQ_MASK_ALL;
+    NRF_RADIO->SHORTS = 0;
+    NRF_RADIO->TASKS_DISABLE = 1;
+    NRF_PPI->CHENCLR = PPI_CHEN_CH4_Msk | PPI_CHEN_CH5_Msk | PPI_CHEN_CH20_Msk |
+          PPI_CHEN_CH21_Msk | PPI_CHEN_CH23_Msk |
+          PPI_CHEN_CH25_Msk | PPI_CHEN_CH31_Msk;
+    NVIC_ClearPendingIRQ(RADIO_IRQn);
+    g_ble_phy_data.phy_state = BLE_PHY_STATE_IDLE;
+}
+
+void
+ble_phy_restart_rx(void)
+{
+    ble_phy_stop_usec_timer();
+    ble_phy_disable_irq_and_ppi();
+
+    ble_phy_set_start_now();
+    /* Enable PPI to automatically start RXEN */
+    NRF_PPI->CHENSET = PPI_CHEN_CH21_Msk;
+
+    ble_phy_rx();
+}
+
+/**
+ * ble phy disable
+ *
+ * Disables the PHY. This should be called when an event is over. It stops
+ * the usec timer (if used), disables interrupts, disables the RADIO, disables
+ * PPI and sets state to idle.
+ */
+void
+ble_phy_disable(void)
+{
+    ble_phy_trace_void(BLE_PHY_TRACE_ID_DISABLE);
+
+    ble_phy_stop_usec_timer();
+    ble_phy_disable_irq_and_ppi();
+}
+
+/* Gets the current access address */
+uint32_t ble_phy_access_addr_get(void)
+{
+    return g_ble_phy_data.phy_access_address;
+}
+
+/**
+ * Return the phy state
+ *
+ * @return int The current PHY state.
+ */
+int
+ble_phy_state_get(void)
+{
+    return g_ble_phy_data.phy_state;
+}
+
+/**
+ * Called to see if a reception has started
+ *
+ * @return int
+ */
+int
+ble_phy_rx_started(void)
+{
+    return g_ble_phy_data.phy_rx_started;
+}
+
+/**
+ * Return the transceiver state
+ *
+ * @return int transceiver state.
+ */
+uint8_t
+ble_phy_xcvr_state_get(void)
+{
+    uint32_t state;
+    state = NRF_RADIO->STATE;
+    return (uint8_t)state;
+}
+
+/**
+ * Called to return the maximum data pdu payload length supported by the
+ * phy. For this chip, if encryption is enabled, the maximum payload is 27
+ * bytes.
+ *
+ * @return uint8_t Maximum data channel PDU payload size supported
+ */
+uint8_t
+ble_phy_max_data_pdu_pyld(void)
+{
+    return BLE_LL_DATA_PDU_MAX_PYLD;
+}
+
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
+void
+ble_phy_resolv_list_enable(void)
+{
+    NRF_AAR->NIRK = (uint32_t)g_nrf_num_irks;
+    g_ble_phy_data.phy_privacy = 1;
+}
+
+void
+ble_phy_resolv_list_disable(void)
+{
+    g_ble_phy_data.phy_privacy = 0;
+}
+#endif
+
+#if MYNEWT_VAL(BLE_LL_DTM)
+void ble_phy_enable_dtm(void)
+{
+    /* When DTM is enabled we need to disable whitening as per
+     * Bluetooth v5.0 Vol 6. Part F. 4.1.1
+     */
+    NRF_RADIO->PCNF1 &= ~RADIO_PCNF1_WHITEEN_Msk;
+}
+
+void ble_phy_disable_dtm(void)
+{
+    /* Enable whitening */
+    NRF_RADIO->PCNF1 |= RADIO_PCNF1_WHITEEN_Msk;
+}
+#endif
+
+void
+ble_phy_rfclk_enable(void)
+{
+#if MYNEWT
+    nrf52_clock_hfxo_request();
+#else
+    NRF_CLOCK->TASKS_HFCLKSTART = 1;
+#endif
+}
+
+void
+ble_phy_rfclk_disable(void)
+{
+#if MYNEWT
+    nrf52_clock_hfxo_release();
+#else
+    NRF_CLOCK->TASKS_HFCLKSTOP = 1;
+#endif
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_phy_trace.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_phy_trace.c
new file mode 100644
index 000000000..84dbf4def
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/src/ble_phy_trace.c
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#if defined(ARDUINO_ARCH_NRF5) && defined(NRF52_SERIES)
+
+#include <stdint.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os_trace_api.h"
+
+#if MYNEWT_VAL(BLE_PHY_SYSVIEW)
+
+static os_trace_module_t g_ble_phy_trace_mod;
+uint32_t ble_phy_trace_off;
+
+static void
+ble_phy_trace_module_send_desc(void)
+{
+    os_trace_module_desc(&g_ble_phy_trace_mod, "0 phy_set_tx cputime=%u usecs=%u");
+    os_trace_module_desc(&g_ble_phy_trace_mod, "1 phy_set_rx cputime=%u usecs=%u");
+    os_trace_module_desc(&g_ble_phy_trace_mod, "2 phy_disable");
+}
+
+void
+ble_phy_trace_init(void)
+{
+    ble_phy_trace_off =
+            os_trace_module_register(&g_ble_phy_trace_mod, "ble_phy", 3,
+                                     ble_phy_trace_module_send_desc);
+}
+#endif
+#endif
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/syscfg.yml
new file mode 100644
index 000000000..ce5123721
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/drivers/nrf52/syscfg.yml
@@ -0,0 +1,75 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_PHY_SYSVIEW:
+        description: >
+            Enable SystemView tracing module for radio driver.
+        value: 0
+
+    BLE_PHY_CODED_RX_IFS_EXTRA_MARGIN:
+        description: >
+            This defines additional margin for T_IFS tolerance while in
+            RX on coded phy to allow maintaining connections with some
+            controllers that exceed proper T_IFS (150 usecs) by more
+            than allowed 2 usecs.
+            This value shall be only used for debugging purposes. It is
+            strongly recommended to keep this settings at default value
+            to ensure compliance with specification.
+        value: 0
+    BLE_PHY_DBG_TIME_TXRXEN_READY_PIN:
+        description: >
+            When set to proper GPIO pin number, this pin will be set
+            to high state when radio is enabled using PPI channels
+            20 or 21 and back to low state on radio EVENTS_READY.
+            This can be used to measure radio ram-up time.
+        value: -1
+
+    BLE_PHY_DBG_TIME_ADDRESS_END_PIN:
+        description: >
+            When set to proper GPIO pin number, this pin will be set
+            to high state on radio EVENTS_ADDRESS and back to low state
+            on radio EVENTS_END.
+            This can be used to measure radio pipeline delays.
+        value: -1
+
+    BLE_PHY_DBG_TIME_WFR_PIN:
+        description: >
+            When set to proper GPIO pin number, this pin will be set
+            to high state on radio EVENTS_RXREADY and back to low
+            state when wfr timer expires.
+            This can be used to check if wfr is calculated properly.
+        value: -1
+
+    BLE_PHY_NRF52840_ERRATA_164:
+        description: >
+            Enable workaround for anomaly 164 found in nRF52840.
+            "[164] RADIO: Low selectivity in long range mode"
+            This shall be only enabled for:
+            - nRF52840 Engineering A
+        value: 0
+
+    BLE_PHY_NRF52840_ERRATA_191:
+        description: >
+            Enable workaround for anomaly 191 found in nRF52840.
+            "[191] RADIO: High packet error rate in BLE Long Range mode"
+            This shall be only enabled for:
+            - nRF52840 Engineering B
+            - nRF52840 Engineering C
+            - nRF52840 Rev 1 (final silicon)
+        value: 1
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_att.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_att.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_att.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_att.h
index 391a992ae..ceca35179 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_att.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_att.h
@@ -27,7 +27,7 @@
  * @{
  */
 
-#include "os/queue.h"
+#include "nimble/porting/nimble/include/os/queue.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_eddystone.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_eddystone.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_eddystone.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_eddystone.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_gap.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_gap.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_gap.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_gap.h
index ed7fbb128..edaf3bc4d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_gap.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_gap.h
@@ -28,9 +28,9 @@
  */
 
 #include <inttypes.h>
-#include "host/ble_hs.h"
-#include "host/ble_hs_adv.h"
-#include "syscfg/syscfg.h"
+#include "ble_hs.h"
+#include "ble_hs_adv.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -1821,6 +1821,22 @@ int ble_gap_wl_tx_rmv(const ble_addr_t *addrs);
 int ble_gap_update_params(uint16_t conn_handle,
                           const struct ble_gap_upd_params *params);
 
+/**
+ * Configure LE Data Length in controller (OGF = 0x08, OCF = 0x0022).
+ *
+ * @param conn_handle      Connection handle.
+ * @param tx_octets        The preferred value of payload octets that the Controller
+ *                         should use for a new connection (Range
+ *                         0x001B-0x00FB).
+ * @param tx_time          The preferred maximum number of microseconds that the local Controller
+ *                         should use to transmit a single link layer packet
+ *                         (Range 0x0148-0x4290).
+ *
+ * @return                 0 on success,
+ *                         other error code on failure.
+ */
+int ble_gap_set_data_len(uint16_t conn_handle, uint16_t tx_octets, uint16_t tx_time);
+
 /**
  * Initiates the GAP security procedure.
  *
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_gatt.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_gatt.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_gatt.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_gatt.h
index d5c3269f0..ee8f177f8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_gatt.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_gatt.h
@@ -28,8 +28,8 @@
  */
 
 #include <inttypes.h>
-#include "host/ble_att.h"
-#include "host/ble_uuid.h"
+#include "ble_att.h"
+#include "ble_uuid.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs.h
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs.h
index 43979ba57..f24b8a9e0 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs.h
@@ -27,23 +27,23 @@
  */
 
 #include <inttypes.h>
-#include "nimble/hci_common.h"
-#include "host/ble_att.h"
-#include "host/ble_eddystone.h"
-#include "host/ble_gap.h"
-#include "host/ble_gatt.h"
-#include "host/ble_hs_adv.h"
-#include "host/ble_hs_id.h"
-#include "host/ble_hs_hci.h"
-#include "host/ble_hs_log.h"
-#include "host/ble_hs_mbuf.h"
-#include "host/ble_hs_stop.h"
-#include "host/ble_ibeacon.h"
-#include "host/ble_l2cap.h"
-#include "host/ble_sm.h"
-#include "host/ble_store.h"
-#include "host/ble_uuid.h"
-#include "nimble/nimble_npl.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "ble_att.h"
+#include "ble_eddystone.h"
+#include "ble_gap.h"
+#include "ble_gatt.h"
+#include "ble_hs_adv.h"
+#include "ble_hs_id.h"
+#include "ble_hs_hci.h"
+#include "ble_hs_log.h"
+#include "ble_hs_mbuf.h"
+#include "ble_hs_stop.h"
+#include "ble_ibeacon.h"
+#include "ble_l2cap.h"
+#include "ble_sm.h"
+#include "ble_store.h"
+#include "ble_uuid.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_adv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_adv.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_adv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_adv.h
index e3b6ea709..ae2965328 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_adv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_adv.h
@@ -21,7 +21,7 @@
 #define H_BLE_HS_ADV_
 
 #include <inttypes.h>
-#include "host/ble_uuid.h"
+#include "ble_uuid.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_hci.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_hci.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_hci.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_hci.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_id.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_id.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_id.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_id.h
index c96bd20f5..568303412 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_id.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_id.h
@@ -28,7 +28,7 @@
  */
 
 #include <inttypes.h>
-#include "nimble/ble.h"
+#include "nimble/nimble/include/nimble/ble.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_log.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_log.h
similarity index 92%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_log.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_log.h
index 8d0a4596e..303b53c6e 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_log.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_log.h
@@ -20,11 +20,11 @@
 #ifndef H_BLE_HS_LOG_
 #define H_BLE_HS_LOG_
 
-#include "modlog/modlog.h"
+#include "nimble/porting/nimble/include/modlog/modlog.h"
 
 /* Only include the logcfg header if this version of newt can generate it. */
 #if MYNEWT_VAL(NEWT_FEATURE_LOGCFG)
-#include "logcfg/logcfg.h"
+#include "nimble/porting/nimble/include/logcfg/logcfg.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_mbuf.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_mbuf.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_mbuf.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_mbuf.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_pvcy.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_pvcy.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_pvcy.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_pvcy.h
index 19087f220..26450f4f8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_pvcy.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_pvcy.h
@@ -22,7 +22,7 @@
 #ifndef H_BLE_HS_PVCY_
 #define H_BLE_HS_PVCY_
 
-#include "host/ble_hs.h"
+#include "ble_hs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_stop.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_stop.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_hs_stop.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_hs_stop.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_ibeacon.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_ibeacon.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_ibeacon.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_ibeacon.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_l2cap.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_l2cap.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_l2cap.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_l2cap.h
index aef9682cc..9d92c08f1 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_l2cap.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_l2cap.h
@@ -20,7 +20,7 @@
 #ifndef H_BLE_L2CAP_
 #define H_BLE_L2CAP_
 
-#include "nimble/nimble_opt.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_monitor.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_monitor.h
similarity index 95%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_monitor.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_monitor.h
index 61722f7db..418d4e379 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_monitor.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_monitor.h
@@ -20,7 +20,7 @@
 #ifndef H_BLE_MONITOR_
 #define H_BLE_MONITOR_
 
-#include <syscfg/syscfg.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 
 #undef BLE_MONITOR
 #define BLE_MONITOR (MYNEWT_VAL(BLE_MONITOR_UART) || MYNEWT_VAL(BLE_MONITOR_RTT))
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_sm.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_sm.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_sm.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_sm.h
index ceebb8564..42414d584 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_sm.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_sm.h
@@ -21,7 +21,7 @@
 #define H_BLE_SM_
 
 #include <inttypes.h>
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_store.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_store.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_store.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_store.h
index a3eca5d23..8e6721bf3 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_store.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_store.h
@@ -21,7 +21,7 @@
 #define H_BLE_STORE_
 
 #include <inttypes.h>
-#include "nimble/ble.h"
+#include "nimble/nimble/include/nimble/ble.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/ble_uuid.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_uuid.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/ble_uuid.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/include/host/ble_uuid.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/access.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/access.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/access.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/access.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/cfg_cli.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/cfg_cli.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/cfg_cli.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/cfg_cli.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/cfg_srv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/cfg_srv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/cfg_srv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/cfg_srv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/glue.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/glue.h
similarity index 95%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/glue.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/glue.h
index 388ecba39..f50b6ece8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/mesh/glue.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/glue.h
@@ -23,19 +23,19 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "syscfg/syscfg.h"
-#include "logcfg/logcfg.h"
-#include "modlog/modlog.h"
-#include "nimble/nimble_npl.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/logcfg/logcfg.h"
+#include "nimble/porting/nimble/include/modlog/modlog.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 
-#include "os/os_mbuf.h"
-#include "os/queue.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
+#include "nimble/porting/nimble/include/os/queue.h"
 
-#include "nimble/ble.h"
-#include "host/ble_hs.h"
-#include "host/ble_uuid.h"
-#include "../src/ble_sm_priv.h"
-#include "../src/ble_hs_hci_priv.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
+#include "nimble/nimble/host/src/ble_sm_priv.h"
+#include "nimble/nimble/host/src/ble_hs_hci_priv.h"
 
 #if MYNEWT_VAL(BLE_CRYPTO_STACK_MBEDTLS)
 #include "mbedtls/aes.h"
@@ -47,11 +47,11 @@
 #include "mbedtls/ecp.h"
 
 #else
-#include "tinycrypt/aes.h"
-#include "tinycrypt/constants.h"
-#include "tinycrypt/utils.h"
-#include "tinycrypt/cmac_mode.h"
-#include "tinycrypt/ecc_dh.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/aes.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/constants.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/utils.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/cmac_mode.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/ecc_dh.h"
 #endif
 
 #if MYNEWT_VAL(BLE_MESH_SETTINGS)
@@ -359,8 +359,6 @@ static inline void net_buf_simple_restore(struct os_mbuf *buf,
 
 static inline void sys_memcpy_swap(void *dst, const void *src, size_t length)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wpointer-arith"
     __ASSERT(((src < dst && (src + length) <= dst) ||
           (src > dst && (dst + length) <= src)),
          "Source and destination buffers must not overlap");
@@ -370,7 +368,6 @@ static inline void sys_memcpy_swap(void *dst, const void *src, size_t length)
     for (; length > 0; length--) {
         *((u8_t *)dst++) = *((u8_t *)src--);
     }
-#pragma GCC diagnostic pop
 }
 
 #define popcount(x) __builtin_popcount(x)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/health_cli.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/health_cli.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/health_cli.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/health_cli.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/health_srv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/health_srv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/health_srv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/health_srv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/main.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/main.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/main.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/main.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/mesh.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/mesh.h
similarity index 78%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/mesh.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/mesh.h
index 9ba63ef0e..77b2871fc 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/mesh/mesh.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/mesh.h
@@ -11,8 +11,8 @@
 #define __BT_MESH_H
 
 #include <stddef.h>
-#include "syscfg/syscfg.h"
-#include "os/os_mbuf.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
 
 #include "glue.h"
 #include "access.h"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/model_cli.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/model_cli.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/model_cli.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/model_cli.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/model_srv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/model_srv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/model_srv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/model_srv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/porting.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/porting.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/porting.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/porting.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/proxy.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/proxy.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/proxy.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/proxy.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/slist.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/slist.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/slist.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/slist.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mesh/testing.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/testing.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mesh/testing.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/include/mesh/testing.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/pkg.yml
new file mode 100644
index 000000000..44cc0c732
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/pkg.yml
@@ -0,0 +1,49 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/mesh
+pkg.description: Bluetooth Mesh
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - mesh
+
+pkg.deps:
+    - "@apache-mynewt-core/kernel/os"
+    - "@apache-mynewt-core/util/mem"
+    - "@apache-mynewt-core/crypto/tinycrypt"
+    - nimble
+    - nimble/host
+
+pkg.deps.BLE_MESH_SHELL:
+    - "@apache-mynewt-core/sys/shell"
+
+pkg.deps.BLE_MESH_SETTINGS:
+    - "@apache-mynewt-core/encoding/base64"
+    - "@apache-mynewt-core/sys/config"
+
+pkg.req_apis:
+    - log
+    - stats
+
+pkg.init:
+    bt_mesh_register_gatt: 'MYNEWT_VAL(BLE_MESH_SYSINIT_STAGE)'
+    ble_mesh_shell_init: 'MYNEWT_VAL(BLE_MESH_SYSINIT_STAGE_SHELL)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/access.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/access.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/access.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/access.c
index ff8e99997..37580b400 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/access.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/access.c
@@ -6,13 +6,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_ACCESS_LOG
 
 #include <errno.h>
-#include <os/os_mbuf.h>
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 #include "mesh_priv.h"
 #include "adv.h"
@@ -22,7 +24,7 @@
 #include "access.h"
 #include "foundation.h"
 #if MYNEWT_VAL(BLE_MESH_SHELL_MODELS)
-#include "mesh/model_cli.h"
+#include "../include/mesh/model_cli.h"
 #endif
 
 static const struct bt_mesh_comp *dev_comp;
@@ -854,3 +856,4 @@ int bt_mesh_model_extend(struct bt_mesh_model *mod,
 	return 0;
 }
 #endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/access.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/access.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/access.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/access.h
index 48514983f..03081b9ad 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/access.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/access.h
@@ -9,7 +9,7 @@
 #ifndef __ACCESS_H__
 #define __ACCESS_H__
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 /* bt_mesh_model.flags */
 enum {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/adv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/adv.c
similarity index 94%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/adv.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/adv.c
index b8fb1c7de..b9d290176 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/adv.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/adv.c
@@ -7,16 +7,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_ADV_LOG
 
-#include "mesh/mesh.h"
-#include "host/ble_hs_adv.h"
-#include "host/ble_gap.h"
-#include "nimble/hci_common.h"
-#include "mesh/porting.h"
-#include "nimble/nimble_port.h"
-
+#include "../include/mesh/mesh.h"
+#include "nimble/nimble/host/include/host/ble_hs_adv.h"
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "../include/mesh/porting.h"
+#include "nimble/porting/nimble/include/nimble/nimble_port.h"
 #include "adv.h"
 #include "net.h"
 #include "foundation.h"
@@ -337,9 +338,12 @@ void bt_mesh_adv_init(void)
 	os_task_init(&adv_task, "mesh_adv", mesh_adv_thread, NULL,
 	             MYNEWT_VAL(BLE_MESH_ADV_TASK_PRIO), OS_WAIT_FOREVER,
 	             g_blemesh_stack, ADV_STACK_SIZE);
-#else
+#elif ESP_PLATFORM
     xTaskCreatePinnedToCore(mesh_adv_thread, "mesh_adv", 2768,
             NULL, (configMAX_PRIORITIES - 5), &adv_task_h, NIMBLE_CORE);
+#else
+    xTaskCreate(mesh_adv_thread, "mesh_adv", MYNEWT_VAL(BLE_MESH_ADV_STACK_SIZE),
+            NULL, MYNEWT_VAL(BLE_MESH_ADV_TASK_PRIO), &adv_task_h);
 #endif
 
 	/* For BT5 controllers we can have fast advertising interval */
@@ -443,3 +447,4 @@ int bt_mesh_scan_disable(void)
 
 	return 0;
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/adv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/adv.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/adv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/adv.h
index 4d0f7d8ba..40e65e5f4 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/adv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/adv.h
@@ -10,7 +10,7 @@
 #define __ADV_H__
 
 /* Maximum advertising data payload for a single data type */
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 #define BT_MESH_ADV(om) (*(struct bt_mesh_adv **) OS_MBUF_USRHDR(om))
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/atomic.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/atomic.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/atomic.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/atomic.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/beacon.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/beacon.c
index cd540aa8c..89ee1a086 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/beacon.c
@@ -6,13 +6,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_BEACON_LOG
 
 #include <errno.h>
 #include <assert.h>
-#include "os/os_mbuf.h"
-#include "mesh/mesh.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
+#include "../include/mesh/mesh.h"
 
 #include "adv.h"
 #include "mesh_priv.h"
@@ -439,3 +441,4 @@ void bt_mesh_beacon_disable(void)
 		k_delayed_work_cancel(&beacon_timer);
 	}
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/beacon.h
similarity index 89%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/beacon.h
index ac4bfed8a..08fd88d96 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/beacon.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/beacon.h
@@ -9,7 +9,7 @@
 #ifndef __BEACON_H__
 #define __BEACON_H__
 
-#include "os/os_mbuf.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
 
 void bt_mesh_beacon_enable(void);
 void bt_mesh_beacon_disable(void);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_cli.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/cfg_cli.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_cli.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/cfg_cli.c
index 2c2f6c3ff..d2596c434 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_cli.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/cfg_cli.c
@@ -6,11 +6,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
 #if MYNEWT_VAL(BLE_MESH_CFG_CLI)
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 #include <string.h>
 #include <errno.h>
@@ -1496,3 +1498,4 @@ void bt_mesh_cfg_cli_timeout_set(s32_t timeout)
 }
 
 #endif
+#endif
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_srv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/cfg_srv.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_srv.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/cfg_srv.c
index 57aac90a3..f5de01cbf 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/cfg_srv.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/cfg_srv.c
@@ -6,14 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
 
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 #include "mesh_priv.h"
 #include "adv.h"
@@ -3617,3 +3619,4 @@ void bt_mesh_subnet_del(struct bt_mesh_subnet *sub, bool store)
 	memset(sub, 0, sizeof(*sub));
 	sub->net_idx = BT_MESH_KEY_UNUSED;
 }
+#endif
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/crypto.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/crypto.c
index 20b110378..425897630 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/crypto.c
@@ -6,13 +6,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_CRYPTO_LOG
 
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
-#include "syscfg/syscfg.h"
 
 #if (MYNEWT_VAL(BLE_CRYPTO_STACK_MBEDTLS))
 #include "mbedtls/aes.h"
@@ -24,11 +25,11 @@
 #include "mbedtls/ecp.h"
 
 #else
-#include <tinycrypt/constants.h>
-#include <tinycrypt/utils.h>
-#include <tinycrypt/aes.h>
-#include <tinycrypt/cmac_mode.h>
-#include <tinycrypt/ccm_mode.h>
+#include "nimble/ext/tinycrypt/include/tinycrypt/constants.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/utils.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/aes.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/cmac_mode.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/ccm_mode.h"
 #endif
 
 #include "crypto.h"
@@ -965,3 +966,4 @@ int bt_mesh_beacon_auth(const u8_t beacon_key[16], u8_t flags,
 
 	return err;
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/crypto.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/crypto.h
index 745cf324a..8af371c60 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/crypto.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/crypto.h
@@ -8,7 +8,7 @@
 #ifndef __CRYPTO_H__
 #define __CRYPTO_H__
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 struct bt_mesh_sg {
 	const void *data;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/foundation.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/foundation.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/foundation.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/foundation.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/friend.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/friend.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/friend.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/friend.c
index 9056a8658..c10a93ec7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/friend.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/friend.c
@@ -6,7 +6,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_CRYPTO_LOG
 
 #if MYNEWT_VAL(BLE_MESH_FRIEND)
@@ -15,9 +17,9 @@
 #include <errno.h>
 #include <assert.h>
 
-#include "mesh/mesh.h"
-#include "mesh/slist.h"
-#include "mesh_priv.h"
+#include "../include/mesh/mesh.h"
+#include "../include/mesh/slist.h"
+#include "../include/mesh_priv.h"
 #include "crypto.h"
 #include "adv.h"
 #include "net.h"
@@ -1649,3 +1651,4 @@ void bt_mesh_friend_clear_incomplete(struct bt_mesh_subnet *sub, u16_t src,
 }
 
 #endif /* MYNEWT_VAL(BLE_MESH_FRIEND) */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/friend.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/friend.h
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/friend.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/friend.h
index 10ffa8190..361c1f097 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/friend.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/friend.h
@@ -9,7 +9,7 @@
 #ifndef __FRIEND_H__
 #define __FRIEND_H__
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 enum bt_mesh_friend_pdu_type {
 	BT_MESH_FRIEND_PDU_SINGLE,
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/glue.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/glue.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/glue.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/glue.c
index 7da73d15b..14e515b91 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/glue.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/glue.c
@@ -17,13 +17,15 @@
  * under the License.
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_LOG
 
-#include "mesh/glue.h"
+#include "../include/mesh/glue.h"
 #include "adv.h"
 #ifndef MYNEWT
-#include "nimble/nimble_port.h"
+#include "nimble/porting/nimble/include/nimble/nimble_port.h"
 #endif
 
 #if MYNEWT_VAL(BLE_MESH_SETTINGS)
@@ -890,4 +892,4 @@ char *settings_str_from_bytes(const void *vp, int vp_len,
 }
 
 #endif /* MYNEWT_VAL(BLE_MESH_SETTINGS) */
-
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/health_cli.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/health_cli.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/health_cli.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/health_cli.c
index 193279c28..3fc29e52f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/health_cli.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/health_cli.c
@@ -6,20 +6,22 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
 
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 #include "mesh_priv.h"
 #include "adv.h"
 #include "net.h"
 #include "transport.h"
 #include "foundation.h"
-#include "mesh/health_cli.h"
+#include "../include/mesh/health_cli.h"
 
 static s32_t msg_timeout = K_SECONDS(5);
 
@@ -554,3 +556,4 @@ static int health_cli_init(struct bt_mesh_model *model)
 const struct bt_mesh_model_cb bt_mesh_health_cli_cb = {
 	.init = health_cli_init,
 };
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/health_srv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/health_srv.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/health_srv.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/health_srv.c
index 16de83a99..7063d9203 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/health_srv.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/health_srv.c
@@ -6,14 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
 
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 #include "mesh_priv.h"
 #include "adv.h"
 #include "net.h"
@@ -451,3 +453,4 @@ void bt_mesh_attention(struct bt_mesh_model *model, u8_t time)
 		}
 	}
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/light_model.c
similarity index 87%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/light_model.c
index b6d838188..a390bf86b 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/light_model.c
@@ -1,8 +1,9 @@
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
 
-#include "mesh/mesh.h"
-#include "console/console.h"
+#include "../include/mesh/mesh.h"
+#include "nimble/console/console.h"
 #include "light_model.h"
 
 
@@ -55,4 +56,4 @@ int light_model_light_lightness_set(struct bt_mesh_model *model, s16_t lightness
 {
 	return light_model_gen_level_set(model, lightness);
 }
-
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/light_model.h
similarity index 87%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/light_model.h
index 95fcdb786..f3b1f7cb7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/light_model.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/light_model.h
@@ -6,8 +6,8 @@
 #ifndef __BT_MESH_LIGHT_MODEL_H
 #define __BT_MESH_LIGHT_MODEL_H
 
-#include "syscfg/syscfg.h"
-#include "mesh/mesh.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "../include/mesh/mesh.h"
 
 int light_model_gen_onoff_get(struct bt_mesh_model *model, u8_t *state);
 int light_model_gen_onoff_set(struct bt_mesh_model *model, u8_t state);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/lpn.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/lpn.c
index ec012a5f0..5bb64b97d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/lpn.c
@@ -6,14 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_LOW_POWER_LOG
 
 #if MYNEWT_VAL(BLE_MESH_LOW_POWER)
 
 #include <stdint.h>
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 #include "mesh_priv.h"
 #include "crypto.h"
 #include "adv.h"
@@ -1054,3 +1056,4 @@ int bt_mesh_lpn_init(void)
 }
 
 #endif /* MYNEWT_VAL(BLE_MESH_LOW_POWER) */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/lpn.h
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/lpn.h
index 0ff6c9cfd..e53c81d3d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/lpn.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/lpn.h
@@ -8,7 +8,7 @@
 #ifndef __LPN_H__
 #define __LPN_H__
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 int bt_mesh_lpn_friend_update(struct bt_mesh_net_rx *rx,
 			      struct os_mbuf *buf);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/mesh.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/mesh.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/mesh.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/mesh.c
index 52fbdbf66..7ad1264ae 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/mesh.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/mesh.c
@@ -6,15 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_LOG
 
 #include <stdbool.h>
 #include <errno.h>
 
-#include "os/os_mbuf.h"
-#include "mesh/mesh.h"
-#include "host/ble_uuid.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
+#include "../include/mesh/mesh.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
 
 #include "adv.h"
 #include "prov.h"
@@ -359,3 +361,4 @@ int bt_mesh_init(uint8_t own_addr_type, const struct bt_mesh_prov *prov,
 
 	return 0;
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/mesh_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/mesh_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/mesh_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/mesh_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/model_cli.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/model_cli.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/model_cli.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/model_cli.c
index b00cfa520..c8b10df0c 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/model_cli.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/model_cli.c
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
 
-#include "mesh/mesh.h"
-#include "mesh/model_cli.h"
+#include "../include/mesh/mesh.h"
+#include "../include/mesh/model_cli.h"
 #include "mesh_priv.h"
 
 static s32_t msg_timeout = K_SECONDS(5);
@@ -298,4 +300,4 @@ done:
 	os_mbuf_free_chain(msg);
 	return err;
 }
-
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/model_srv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/model_srv.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/model_srv.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/model_srv.c
index 5f5a8df42..e7bbf38d0 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/model_srv.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/model_srv.c
@@ -4,11 +4,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_MODEL_LOG
 
-#include "mesh/mesh.h"
-#include "mesh/model_srv.h"
+#include "../include/mesh/mesh.h"
+#include "../include/mesh/model_srv.h"
 #include "mesh_priv.h"
 
 static struct bt_mesh_gen_onoff_srv *gen_onoff_srv;
@@ -264,3 +266,4 @@ static int lightness_srv_init(struct bt_mesh_model *model)
 const struct bt_mesh_model_cb light_lightness_srv_cb = {
 	.init = lightness_srv_init,
 };
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/net.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/net.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/net.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/net.c
index cf11c2d4f..b8e48d6ed 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/net.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/net.c
@@ -6,15 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_NET_LOG
 
 #include <string.h>
 #include <errno.h>
 #include <stdbool.h>
 
-#include "os/os_mbuf.h"
-#include "mesh/mesh.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
+#include "../include/mesh/mesh.h"
 
 #include "crypto.h"
 #include "adv.h"
@@ -254,8 +256,7 @@ int friend_cred_set(struct friend_cred *cred, u8_t idx, const u8_t net_key[16])
 void friend_cred_refresh(u16_t net_idx)
 {
 	int i;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
+
 	for (i = 0; i < ARRAY_SIZE(friend_cred); i++) {
 		struct friend_cred *cred = &friend_cred[i];
 
@@ -265,7 +266,6 @@ void friend_cred_refresh(u16_t net_idx)
 			       sizeof(cred->cred[0]));
 		}
 	}
-#pragma GCC diagnostic pop
 }
 
 int friend_cred_update(struct bt_mesh_subnet *sub)
@@ -273,8 +273,7 @@ int friend_cred_update(struct bt_mesh_subnet *sub)
 	int err, i;
 
 	BT_DBG("net_idx 0x%04x", sub->net_idx);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
+
 	for (i = 0; i < ARRAY_SIZE(friend_cred); i++) {
 		struct friend_cred *cred = &friend_cred[i];
 
@@ -288,7 +287,7 @@ int friend_cred_update(struct bt_mesh_subnet *sub)
 			return err;
 		}
 	}
-#pragma GCC diagnostic pop
+
 	return 0;
 }
 
@@ -299,8 +298,7 @@ struct friend_cred *friend_cred_create(struct bt_mesh_subnet *sub, u16_t addr,
 	int i, err;
 
 	BT_DBG("net_idx 0x%04x addr 0x%04x", sub->net_idx, addr);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
+
 	for (cred = NULL, i = 0; i < ARRAY_SIZE(friend_cred); i++) {
 		if ((friend_cred[i].addr == BT_MESH_ADDR_UNASSIGNED) ||
 		    (friend_cred[i].addr == addr &&
@@ -309,7 +307,7 @@ struct friend_cred *friend_cred_create(struct bt_mesh_subnet *sub, u16_t addr,
 			break;
 		}
 	}
-#pragma GCC diagnostic pop
+
 	if (!cred) {
 		BT_WARN("No free friend credential slots");
 		return NULL;
@@ -349,8 +347,7 @@ void friend_cred_clear(struct friend_cred *cred)
 int friend_cred_del(u16_t net_idx, u16_t addr)
 {
 	int i;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
+
 	for (i = 0; i < ARRAY_SIZE(friend_cred); i++) {
 		struct friend_cred *cred = &friend_cred[i];
 
@@ -359,7 +356,7 @@ int friend_cred_del(u16_t net_idx, u16_t addr)
 			return 0;
 		}
 	}
-#pragma GCC diagnostic pop
+
 	return -ENOENT;
 }
 
@@ -369,8 +366,7 @@ int friend_cred_get(struct bt_mesh_subnet *sub, u16_t addr, u8_t *nid,
 	int i;
 
 	BT_DBG("net_idx 0x%04x addr 0x%04x", sub->net_idx, addr);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
+
 	for (i = 0; i < ARRAY_SIZE(friend_cred); i++) {
 		struct friend_cred *cred = &friend_cred[i];
 
@@ -396,7 +392,7 @@ int friend_cred_get(struct bt_mesh_subnet *sub, u16_t addr, u8_t *nid,
 
 		return 0;
 	}
-#pragma GCC diagnostic pop
+
 	return -ENOENT;
 }
 
@@ -1030,8 +1026,7 @@ static int friend_decrypt(struct bt_mesh_subnet *sub, const u8_t *data,
 	int i;
 
 	BT_DBG("NID 0x%02x net_idx 0x%04x", NID(data), sub->net_idx);
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wtype-limits"
+
 	for (i = 0; i < ARRAY_SIZE(friend_cred); i++) {
 		struct friend_cred *cred = &friend_cred[i];
 
@@ -1056,7 +1051,7 @@ static int friend_decrypt(struct bt_mesh_subnet *sub, const u8_t *data,
 			return 0;
 		}
 	}
-#pragma GCC diagnostic pop
+
 	return -ENOENT;
 }
 
@@ -1438,3 +1433,4 @@ void bt_mesh_net_init(void)
 	k_work_init(&bt_mesh.local_work, bt_mesh_net_local);
 	net_buf_slist_init(&bt_mesh.local_queue);
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/net.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/net.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/net.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/net.h
index 976da0053..1a7e3aa7d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/net.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/net.h
@@ -22,8 +22,8 @@
 
 #include <stdbool.h>
 #include "atomic.h"
-#include "mesh/mesh.h"
-#include "mesh/glue.h"
+#include "../include/mesh/mesh.h"
+#include "../include/mesh/glue.h"
 
 /* How many hours in between updating IVU duration */
 #define BT_MESH_IVU_MIN_HOURS      96
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/nodes.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/nodes.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/nodes.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/nodes.c
index 127ef21e4..de41f40d0 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/nodes.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/nodes.c
@@ -4,12 +4,14 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_PROV_LOG
 
 #if MYNEWT_VAL(BLE_MESH_PROVISIONER)
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 #include "mesh_priv.h"
 #include "net.h"
@@ -159,3 +161,4 @@ void bt_mesh_node_del(struct bt_mesh_node *node, bool store)
 }
 
 #endif
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/nodes.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/nodes.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/nodes.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/nodes.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/prov.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/prov.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/prov.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/prov.c
index fe92c0e34..f8f22fa7e 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/prov.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/prov.c
@@ -6,14 +6,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_PROV_LOG
 
 #if MYNEWT_VAL(BLE_MESH_PROV)
 
 #include <errno.h>
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 #include "mesh_priv.h"
 
 #include "crypto.h"
@@ -2006,3 +2008,4 @@ void bt_mesh_prov_reset(void)
 }
 
 #endif /* MYNEWT_VAL(BLE_MESH_PROV) */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/prov.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/prov.h
similarity index 85%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/prov.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/prov.h
index 96e5a447c..c6866c9e2 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/prov.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/prov.h
@@ -9,9 +9,9 @@
 #ifndef __PROV_H__
 #define __PROV_H__
 
-#include "os/os_mbuf.h"
-#include "mesh/mesh.h"
-#include "../src/ble_hs_conn_priv.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
+#include "../include/mesh/mesh.h"
+#include "nimble/nimble/host/src/ble_hs_conn_priv.h"
 
 int bt_mesh_pb_adv_open(const u8_t uuid[16], u16_t net_idx, u16_t addr,
 			u8_t attention_duration);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/proxy.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/proxy.c
index 134a36dd6..6801791f1 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/proxy.c
@@ -6,15 +6,17 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_PROXY_LOG
 
 #if MYNEWT_VAL(BLE_MESH_PROXY)
 
-#include "mesh/mesh.h"
-#include "host/ble_att.h"
-#include "services/gatt/ble_svc_gatt.h"
-#include "../../host/src/ble_hs_priv.h"
+#include "../include/mesh/mesh.h"
+#include "nimble/nimble/host/include/host/ble_att.h"
+#include "nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h"
+#include "nimble/nimble/host/src/ble_hs_priv.h"
 
 #include "mesh_priv.h"
 #include "adv.h"
@@ -1497,3 +1499,4 @@ int bt_mesh_proxy_init(void)
 }
 
 #endif /* MYNEWT_VAL(BLE_MESH_PROXY) */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/proxy.h
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/proxy.h
index 64338a0a3..e099947c9 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/proxy.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/proxy.h
@@ -14,7 +14,7 @@
 #define BT_MESH_PROXY_CONFIG    0x02
 #define BT_MESH_PROXY_PROV      0x03
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 
 int bt_mesh_proxy_send(uint16_t conn_handle, u8_t type, struct os_mbuf *msg);
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/settings.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/settings.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/settings.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/settings.c
index 88d9b302e..2130e9e6c 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/settings.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/settings.c
@@ -4,13 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_SETTINGS_LOG
 
 #if MYNEWT_VAL(BLE_MESH_SETTINGS)
 
-#include "mesh/mesh.h"
-#include "mesh/glue.h"
+#include "../include/mesh/mesh.h"
+#include "../include/mesh/glue.h"
 #include "net.h"
 #include "crypto.h"
 #include "transport.h"
@@ -2081,3 +2083,4 @@ void bt_mesh_settings_init(void)
 }
 
 #endif /* MYNEWT_VAL(BLE_MESH_SETTINGS) */
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/settings.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/settings.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/settings.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/settings.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/shell.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/shell.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/shell.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/shell.c
index 91fbd9785..c19342764 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/shell.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/shell.c
@@ -9,7 +9,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
 
 #if MYNEWT_VAL(BLE_MESH_SHELL)
 
@@ -2817,3 +2818,4 @@ void ble_mesh_shell_init(void)
 
 #endif
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/shell.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/shell.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/shell.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/shell.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/transport.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/transport.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/transport.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/transport.c
index caf1b4f12..c8e716a04 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/transport.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/transport.c
@@ -6,13 +6,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#if MYNEWT_VAL(BLE_MESH)
+
 #define MESH_LOG_MODULE BLE_MESH_TRANS_LOG
 
 #include <errno.h>
 #include <string.h>
 
-#include "mesh/mesh.h"
+#include "../include/mesh/mesh.h"
 #include "mesh_priv.h"
 
 #include "crypto.h"
@@ -1666,3 +1668,4 @@ int bt_mesh_app_key_get(const struct bt_mesh_subnet *subnet, u16_t app_idx,
 
 	return 0;
 }
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/transport.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/transport.h
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/transport.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/transport.h
index eff768e9f..227ba5922 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/transport.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/src/transport.h
@@ -6,8 +6,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include "syscfg/syscfg.h"
-#include "mesh/mesh.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "../include/mesh/mesh.h"
 
 #define TRANS_SEQ_AUTH_NVAL 0xffffffffffffffff
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/syscfg.yml
new file mode 100644
index 000000000..98632232b
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/mesh/syscfg.yml
@@ -0,0 +1,661 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_MESH_PROV:
+        description: >
+            Enable provisioning. It is automatically enabled whenever
+            BLE_MESH_PB_ADV or BLE_MESH_PB_GATT is set.
+        value: 1
+
+    BLE_MESH_PB_ADV:
+        description: >
+           Enable this option to allow the device to be provisioned over
+           the advertising bearer.
+        value: 1
+
+    BLE_MESH_PROVISIONER:
+        description: >
+            Enable this option to have support for provisioning remote devices.
+        value: 0
+        restrictions:
+            - (BLE_MESH_PROV)
+
+    BLE_MESH_NODE_COUNT:
+        description: >
+            This option specifies how many nodes each network can at most
+            save in the provisioning database. Range 1-4096
+        value: 1
+
+    BLE_MESH_PROXY:
+        description: >
+           Enable proxy. This is automatically set whenever BLE_MESH_PB_GATT or
+           BLE_MESH_GATT_PROXY is set.
+        value: 0
+
+    BLE_MESH_PB_GATT:
+        description: >
+           Enable this option to allow the device to be provisioned over
+           the GATT bearer.
+        value: 1
+
+    BLE_MESH_GATT_PROXY:
+        description: >
+            This option enables support for the Mesh GATT Proxy Service,
+            i.e. the ability to act as a proxy between a Mesh GATT Client
+            and a Mesh network.
+        value: 1
+
+    BLE_MESH_NODE_ID_TIMEOUT:
+        description: >
+            This option determines for how long the local node advertises
+            using Node Identity. The given value is in seconds. The
+            specification limits this to 60 seconds, and implies that to
+            be the appropriate value as well, so just leaving this as the
+            default is the safest option.
+        value: 60
+
+    BLE_MESH_PROXY_FILTER_SIZE:
+        descryption: >
+            This option specifies how many Proxy Filter entries the local
+            node supports.
+        value: 1
+
+    BLE_MESH_SUBNET_COUNT:
+        description: >
+            This option specifies how many subnets a Mesh network can
+            participate in at the same time.
+        value: 1
+
+    BLE_MESH_APP_KEY_COUNT:
+        description: >
+            This option specifies how many application keys the device can
+            store per network.
+        value: 1
+
+    BLE_MESH_MODEL_KEY_COUNT:
+        description: >
+             This option specifies how many application keys each model can
+             at most be bound to.
+        value: 1
+
+    BLE_MESH_MODEL_GROUP_COUNT:
+        description: >
+            This option specifies how many group addresses each model can
+            at most be subscribed to.
+        value: 1
+
+    BLE_MESH_LABEL_COUNT:
+        description: >
+            This option specifies how many Label UUIDs can be stored.
+        value: 1
+
+    BLE_MESH_CRPL:
+        description: >
+            This options specifies the maximum capacity of the replay
+            protection list. This option is similar to the network message
+            cache size, but has a different purpose.
+        value: 10
+
+    BLE_MESH_ADV_TASK_PRIO:
+        description: >
+            Advertising task prio (FIXME)
+        type: task_priority
+        value: 9
+
+    BLE_MESH_MSG_CACHE_SIZE:
+        description: >
+            Number of messages that are cached for the network. This description
+            prevent unnecessary decryption operations and unnecessary
+            relays. This option is similar to the replay protection list,
+            but has a different purpose.
+        value: 10
+
+    BLE_MESH_ADV_BUF_COUNT:
+        description: >
+            Number of advertising buffers available. This should be chosen
+            based on what kind of features the local node shoule have. E.g.
+            a relay will perform better the more buffers it has. Another
+            thing to consider is outgoing segmented messages. There must
+            be at least three more advertising buffers than the maximum
+            supported outgoing segment count (BT_MESH_TX_SEG_MAX).
+        value: 6
+
+    BLE_MESH_IVU_DIVIDER:
+        description: >
+            When the IV Update state enters Normal operation or IV Update
+            in Progress, we need to keep track of how many hours has passed
+            in the state, since the specification requires us to remain in
+            the state at least for 96 hours (Update in Progress has an
+            additional upper limit of 144 hours).
+
+            In order to fulfil the above requirement, even if the node might
+            be powered off once in a while, we need to store persistently
+            how many hours the node has been in the state. This doesn't
+            necessarily need to happen every hour (thanks to the flexible
+            duration range). The exact cadence will depend a lot on the
+            ways that the node will be used and what kind of power source it
+            has.
+
+            Since there is no single optimal answer, this configuration
+            option allows specifying a divider, i.e. how many intervals
+            the 96 hour minimum gets split into. After each interval the
+            duration that the node has been in the current state gets
+            stored to flash. E.g. the default value of 4 means that the
+            state is saved every 24 hours (96 / 4).
+        value: 4
+
+    BLE_MESH_TX_SEG_MSG_COUNT:
+        description: >
+            Maximum number of simultaneous outgoing multi-segment and/or
+            reliable messages.
+        value: 4
+
+    BLE_MESH_RX_SEG_MSG_COUNT:
+        description: >
+            Maximum number of simultaneous incoming multi-segment and/or
+            reliable messages.
+        value: 2
+
+    BLE_MESH_RX_SDU_MAX:
+        description: >
+            Maximum incoming Upper Transport Access PDU length. This
+            determines also how many segments incoming segmented messages
+            can have. Each segment can contain 12 bytes, so this value should
+            be set to a multiple of 12 to avoid wasted memory. The minimum
+            requirement is 2 segments (24 bytes) whereas the maximum supported
+            by the Mesh specification is 32 segments (384 bytes).
+        value: 72
+
+    BLE_MESH_TX_SEG_MAX:
+        description: >
+            Maximum number of segments supported for outgoing messages.
+            This value should typically be fine-tuned based on what
+            models the local node supports, i.e. what's the largest
+            message payload that the node needs to be able to send.
+            This value affects memory and call stack consumption, which
+            is why the default is lower than the maximum that the
+            specification would allow (32 segments).
+
+            The maximum outgoing SDU size is 12 times this number (out of
+            which 4 or 8 bytes is used for the Transport Layer MIC). For
+            example, 5 segments means the maximum SDU size is 60 bytes,
+            which leaves 56 bytes for application layer data using a
+            4-byte MIC and 52 bytes using an 8-byte MIC.
+
+            Be sure to specify a sufficient number of advertising buffers
+            when setting this option to a higher value. There must be at
+            least three more advertising buffers (BT_MESH_ADV_BUF_COUNT)
+            as there are outgoing segments.
+        value: 3
+
+    BLE_MESH_SEG_RETRANSMIT_ATTEMPTS:
+        description: >
+            Number of retransmit attempts (after the initial transmit) per segment
+        value: 4
+        retrictions: 'BLE_MESH_SEG_RETRANSMIT_ATTEMPTS > 1'
+
+    BLE_MESH_RELAY:
+        description: >
+            Support for acting as a Mesh Relay Node.
+        value: 0
+
+    BLE_MESH_LOW_POWER:
+        description: >
+           Enable this option to be able to act as a Low Power Node.
+        value: 0
+
+    BLE_MESH_LPN_ESTABLISHMENT:
+        description: >
+           Perform the Friendship establishment using low power, with
+           the help of a reduced scan duty cycle. The downside of this
+           is that the node may miss out on messages intended for it
+           until it has successfully set up Friendship with a Friend
+           node.
+        value: 1
+
+    BLE_MESH_LPN_AUTO:
+        description: >
+           Automatically enable LPN functionality once provisioned and start
+           looking for Friend nodes. If this option is disabled LPN mode
+           needs to be manually enabled by calling bt_mesh_lpn_set(true).
+           node.
+        value: 1
+
+    BLE_MESH_LPN_AUTO_TIMEOUT:
+        description: >
+           Time in seconds from the last received message, that the node
+           will wait before starting to look for Friend nodes.
+        value: 15
+
+    BLE_MESH_LPN_RETRY_TIMEOUT:
+        description: >
+           Time in seconds between Friend Requests, if a previous Friend
+           Request did not receive any acceptable Friend Offers.
+        value: 8
+
+    BLE_MESH_LPN_RSSI_FACTOR:
+        description: >
+            The contribution of the RSSI measured by the Friend node used
+            in Friend Offer Delay calculations. 0 = 1, 1 = 1.5, 2 = 2, 3 = 2.5.
+        value: 0
+
+    BLE_MESH_LPN_RECV_WIN_FACTOR:
+        description: >
+           The contribution of the supported Receive Window used in
+           Friend Offer Delay calculations. 0 = 1, 1 = 1.5, 2 = 2, 3 = 2.5.
+        value: 0
+
+    BLE_MESH_LPN_MIN_QUEUE_SIZE:
+        description: >
+           The MinQueueSizeLog field is defined as log_2(N), where N is
+           the minimum number of maximum size Lower Transport PDUs that
+           the Friend node can store in its Friend Queue. As an example,
+           MinQueueSizeLog value 1 gives N = 2, and value 7 gives N = 128.
+        value: 1
+
+    BLE_MESH_LPN_RECV_DELAY:
+        description: >
+            The ReceiveDelay is the time between the Low Power node
+            sending a request and listening for a response. This delay
+            allows the Friend node time to prepare the response. The value
+            is in units of milliseconds.
+        value: 100
+
+    BLE_MESH_LPN_POLL_TIMEOUT:
+        description: >
+            PollTimeout timer is used to measure time between two
+            consecutive requests sent by the Low Power node. If no
+            requests are received by the Friend node before the
+            PollTimeout timer expires, then the friendship is considered
+            terminated. The value is in units of 100 milliseconds, so e.g.
+            a value of 300 means 30 seconds.
+        value: 300
+
+    BLE_MESH_LPN_INIT_POLL_TIMEOUT:
+        description: >
+            The initial value of the PollTimeout timer when Friendship
+            gets established for the first time. After this the timeout
+            will gradually grow toward the actual PollTimeout, doubling
+            in value for each iteration. The value is in units of 100
+            milliseconds, so e.g. a value of 300 means 3 seconds.
+        value: MYNEWT_VAL_BLE_MESH_LPN_POLL_TIMEOUT
+
+    BLE_MESH_LPN_SCAN_LATENCY:
+        description: >
+            Latency in milliseconds that it takes to enable scanning. This
+            is in practice how much time in advance before the Receive Window
+            that scanning is requested to be enabled.
+        value: 10
+
+    BLE_MESH_LPN_GROUPS:
+        description: >
+            Maximum number of groups that the LPN can subscribe to.
+        value: 10
+
+    BLE_MESH_FRIEND:
+        description: >
+            Enable this option to be able to act as a Friend Node.
+        value: 0
+
+    BLE_MESH_FRIEND_RECV_WIN:
+        description: >
+            Receive Window in milliseconds supported by the Friend node.
+        value: 255
+
+    BLE_MESH_FRIEND_QUEUE_SIZE:
+        description: >
+            Minimum number of buffers available to be stored for each
+            local Friend Queue.
+        value: 16
+
+    BLE_MESH_FRIEND_SUB_LIST_SIZE:
+        description: >
+            Size of the Subscription List that can be supported by a
+            Friend node for a Low Power node.
+        value: 3
+
+    BLE_MESH_FRIEND_LPN_COUNT:
+        description: >
+            Number of Low Power Nodes the Friend can have a Friendship
+            with simultaneously.
+        value: 2
+
+    BLE_MESH_FRIEND_SEG_RX:
+        description: >
+            Number of incomplete segment lists that we track for each LPN
+            that we are Friends for. In other words, this determines how
+            many elements we can simultaneously be receiving segmented
+            messages from when the messages are going into the Friend queue.
+        value: 1
+
+    BLE_MESH_CFG_CLI:
+        description: >
+            Enable support for the configuration client model.
+        value: 0
+
+    BLE_MESH_HEALTH_CLI:
+        description: >
+            Enable support for the health client model.
+        value: 0
+
+    BLE_MESH_SHELL:
+        description: >
+            Activate shell module that provides Bluetooth Mesh commands to
+            the console.
+        value: 0
+
+    BLE_MESH_MODEL_EXTENSIONS:
+        description: >
+            Enable support for the model extension concept, allowing the Access
+            layer to know about Mesh model relationships.
+        value: 0
+
+    BLE_MESH_IV_UPDATE_TEST:
+        description: >
+            This option removes the 96 hour limit of the IV Update
+            Procedure and lets the state be changed at any time.
+        value: 0
+
+    BLE_MESH_TESTING:
+        description: >
+            This option enables testing API.
+        value: 0
+
+    BLE_MESH_DEV_UUID:
+        description: >
+            Device UUID
+        value: ((uint8_t[16]){0x11, 0x22, 0})
+
+    BLE_MESH_SHELL_MODELS:
+        description: >
+            Include implementation of some demo models.
+        value: 0
+
+    BLE_MESH_OOB_OUTPUT_ACTIONS:
+        description: >
+            Supported Output OOB Actions
+            BT_MESH_NO_OUTPUT       = 0,
+            BT_MESH_BLINK           = BIT(0)
+            BT_MESH_BEEP            = BIT(1)
+            BT_MESH_VIBRATE         = BIT(2)
+            BT_MESH_DISPLAY_NUMBER  = BIT(3)
+            BT_MESH_DISPLAY_STRING  = BIT(4)
+        value: ((BT_MESH_DISPLAY_NUMBER))
+
+    BLE_MESH_OOB_OUTPUT_SIZE:
+        description: >
+            Output OOB size
+        value: 4
+
+    BLE_MESH_OOB_INPUT_ACTIONS:
+        description: >
+            Supported Input OOB Actions
+            BT_MESH_NO_INPUT      = 0,
+            BT_MESH_PUSH          = BIT(0)
+            BT_MESH_TWIST         = BIT(1)
+            BT_MESH_ENTER_NUMBER  = BIT(2)
+            BT_MESH_ENTER_STRING  = BIT(3)
+        value: ((BT_MESH_NO_INPUT))
+
+    BLE_MESH_OOB_INPUT_SIZE:
+        description: >
+            Input OOB size
+        value: 4
+
+    BLE_MESH_SETTINGS:
+        description: >
+            This option enables Mesh settings storage.
+        value: 1
+
+    BLE_MESH_STORE_TIMEOUT:
+        description: >
+            This value defines in seconds how soon any pending changes
+            are actually written into persistent storage (flash) after
+            a change occurs.
+        value: 2
+
+    BLE_MESH_SEQ_STORE_RATE:
+        description: >
+            This value defines how often the local sequence number gets
+            updated in persistent storage (i.e. flash). E.g. a value of 100
+            means that the sequence number will be stored to flash on every
+            100th increment. If the node sends messages very frequently a
+            higher value makes more sense, whereas if the node sends
+            infrequently a value as low as 0 (update storage for every
+            increment) can make sense. When the stack gets initialized it
+            will add this number to the last stored one, so that it starts
+            off with a value that's guaranteed to be larger than the last
+            one used before power off.
+        value: 128
+
+    BLE_MESH_RPL_STORE_TIMEOUT:
+        description: >
+            This value defines in seconds how soon the RPL gets written to
+            persistent storage after a change occurs. If the node receives
+            messages frequently it may make sense to have this set to a
+            large value, whereas if the RPL gets updated infrequently a
+            value as low as 0 (write immediately) may make sense. Note that
+            if the node operates a security sensitive use case, and there's
+            a risk of sudden power loss, it may be a security vulnerability
+            to set this value to anything else than 0 (a power loss before
+            writing to storage exposes the node to potential message
+            replay attacks).
+        value: 5
+
+    BLE_MESH_DEVICE_NAME:
+        description: >
+            This value defines BLE Mesh device/node name.
+        value: '"nimble-mesh-node"'
+
+    BLE_MESH_SYSINIT_STAGE:
+        description: >
+            Primary sysinit stage for BLE mesh functionality.
+        value: 500
+
+    BLE_MESH_SYSINIT_STAGE_SHELL:
+        description: >
+            Secondary sysinit stage for BLE mesh functionality.
+        value: 1000
+
+    ### Log settings.
+
+    BLE_MESH_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh log messages.
+        value: 9
+    BLE_MESH_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh log.
+        value: 1
+
+    BLE_MESH_ACCESS_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Access-related log messages.
+        value: 10
+    BLE_MESH_ACCESS_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Access-related log.
+        value: 1
+
+    BLE_MESH_ADV_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh advertising log messages.
+        value: 11
+    BLE_MESH_ADV_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh log.
+        value: 1
+
+    BLE_MESH_BEACON_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Beacon-related log messages.
+        value: 12
+    BLE_MESH_BEACON_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Beacon-related log.
+        value: 1
+
+    BLE_MESH_CRYPTO_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh cryptographic log messages.
+        value: 13
+    BLE_MESH_CRYPTO_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh cryptographic log.
+        value: 1
+
+    BLE_MESH_FRIEND_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Friend log messages.
+        value: 14
+    BLE_MESH_FRIEND_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Friend log.
+        value: 1
+
+    BLE_MESH_LOW_POWER_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Low Power log messages.
+        value: 15
+    BLE_MESH_LOW_POWER_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Low Power log.
+        value: 1
+
+    BLE_MESH_MODEL_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Foundation Models log messages.
+        value: 16
+    BLE_MESH_MODEL_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Foundation Models log.
+        value: 1
+
+    BLE_MESH_NET_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Network layer log messages.
+        value: 17
+    BLE_MESH_NET_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Network layer log.
+        value: 1
+
+    BLE_MESH_PROV_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Provisioning log messages.
+        value: 18
+    BLE_MESH_PROV_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Provisioning log.
+        value: 1
+
+    BLE_MESH_PROXY_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Proxy protocol log messages.
+        value: 19
+    BLE_MESH_PROXY_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Proxy protocol log.
+        value: 1
+
+    BLE_MESH_SETTINGS_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh persistent settings log messages.
+        value: 20
+    BLE_MESH_SETTINGS_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh persistent settings log.
+        value: 1
+
+    BLE_MESH_TRANS_LOG_MOD:
+        description: >
+            Numeric module ID to use for BLE Mesh Transport Layer log messages.
+        value: 21
+    BLE_MESH_TRANS_LOG_LVL:
+        description: >
+            Minimum level for the BLE Mesh Transport Layer log.
+        value: 1
+
+syscfg.logs:
+    BLE_MESH_LOG:
+        module: MYNEWT_VAL(BLE_MESH_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_LOG_LVL)
+
+    BLE_MESH_ACCESS_LOG:
+        module: MYNEWT_VAL(BLE_MESH_ACCESS_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_ACCESS_LOG_LVL)
+
+    BLE_MESH_ADV_LOG:
+        module: MYNEWT_VAL(BLE_MESH_ADV_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_ADV_LOG_LVL)
+
+    BLE_MESH_BEACON_LOG:
+        module: MYNEWT_VAL(BLE_MESH_BEACON_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_BEACON_LOG_LVL)
+
+    BLE_MESH_CRYPTO_LOG:
+        module: MYNEWT_VAL(BLE_MESH_CRYPTO_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_CRYPTO_LOG_LVL)
+
+    BLE_MESH_FRIEND_LOG:
+        module: MYNEWT_VAL(BLE_MESH_FRIEND_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_FRIEND_LOG_LVL)
+
+    BLE_MESH_LOW_POWER_LOG:
+        module: MYNEWT_VAL(BLE_MESH_LOW_POWER_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_LOW_POWER_LOG_LVL)
+
+    BLE_MESH_MODEL_LOG:
+        module: MYNEWT_VAL(BLE_MESH_MODEL_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_MODEL_LOG_LVL)
+
+    BLE_MESH_NET_LOG:
+        module: MYNEWT_VAL(BLE_MESH_NET_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_NET_LOG_LVL)
+
+    BLE_MESH_PROV_LOG:
+        module: MYNEWT_VAL(BLE_MESH_PROV_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_PROV_LOG_LVL)
+
+    BLE_MESH_PROXY_LOG:
+        module: MYNEWT_VAL(BLE_MESH_PROXY_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_PROXY_LOG_LVL)
+
+    BLE_MESH_SETTINGS_LOG:
+        module: MYNEWT_VAL(BLE_MESH_SETTINGS_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_SETTINGS_LOG_LVL)
+
+    BLE_MESH_TRANS_LOG:
+        module: MYNEWT_VAL(BLE_MESH_TRANS_LOG_MOD)
+        level: MYNEWT_VAL(BLE_MESH_TRANS_LOG_LVL)
+
+syscfg.vals.BLE_MESH_SHELL:
+    BLE_MESH_CFG_CLI: 1
+    BLE_MESH_HEALTH_CLI: 1
+    BLE_MESH_IV_UPDATE_TEST: 1
+
+syscfg.vals.BLE_MESH_GATT_PROXY:
+    BLE_MESH_PROXY: 1
+
+syscfg.vals.BLE_MESH_PB_GATT:
+    BLE_MESH_PROXY: 1
+    BLE_MESH_PROV: 1
+
+syscfg.vals.BLE_MESH_PB_ADV:
+    BLE_MESH_PROV: 1
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pkg.yml
new file mode 100644
index 000000000..a063a0b63
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pkg.yml
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host
+pkg.description: Host side of the nimble Bluetooth Smart stack.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.deps:
+    - "@apache-mynewt-core/kernel/os"
+    - "@apache-mynewt-core/sys/log/modlog"
+    - "@apache-mynewt-core/util/mem"
+    - nimble
+
+pkg.deps.BLE_SM_LEGACY:
+    - "@apache-mynewt-core/crypto/tinycrypt"
+
+pkg.deps.BLE_SM_SC:
+    - "@apache-mynewt-core/crypto/tinycrypt"
+
+pkg.deps.BLE_MONITOR_RTT:
+    - "@apache-mynewt-core/hw/drivers/rtt"
+
+pkg.deps.BLE_MESH:
+    - nimble/host/mesh
+
+pkg.req_apis:
+    - ble_transport
+    - console
+    - stats
+
+pkg.init:
+    ble_hs_init: 'MYNEWT_VAL(BLE_HS_SYSINIT_STAGE)'
+
+pkg.down.BLE_HS_STOP_ON_SHUTDOWN:
+    ble_hs_shutdown: 200
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/README.txt b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/README.txt
new file mode 100644
index 000000000..bb03b18ca
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/README.txt
@@ -0,0 +1,8 @@
+This folder contains qualification tests results against BT SIG Profile Test
+Suite.
+
+pts-FOO.txt files contain result for specific profiles or protocols. This
+includes PTS version, test date, enabled tests, results etc.
+
+In addition to tests results 'tpg' folder constains Test Plang Generator
+configuration files that can be imported by PTS for tests configuration.
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-gap.txt b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-gap.txt
new file mode 100644
index 000000000..29ed2446e
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-gap.txt
@@ -0,0 +1,367 @@
+PTS test results for GAP
+
+PTS version: 7.5.0
+Tested: 27-Sept-2019
+
+Results:
+PASS	test passed
+FAIL	test failed
+INC	test is inconclusive
+N/A	test is disabled due to PICS setup
+
+-------------------------------------------------------------------------------
+Test Name		Result	Notes
+-------------------------------------------------------------------------------
+
+GAP/BROB/BCST/BV-01-C	PASS	advertise-configure legacy=1 connectable=0 scannable=0
+GAP/BROB/BCST/BV-02-C	PASS	advertise-configure legacy=1 connectable=0 scannable=0
+
+GAP/BROB/BCST/BV-03-C	PASS	set irk=<IRK> e.g: 00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:11
+				Note: in PTS IXIT please set:
+				TSPX_iut_device_IRK_for_resolvable_privacy_address_generation_procedure=11000000000000000000000000000000
+				set advertise-set-adv-data name=<name> flags=4
+				advertise-configure connectable=0 scannable=0 own_addr_type=rpa_pub
+GAP/BROB/BCST/BV-04-C	PASS    TSPX_advertising_data=07086E696D626C65
+				advertise-set-adv-data name=nimble
+				set addr_type=random addr=01:3e:56:f7:46:21
+				advertise-configure connectable=0 scannable=0 own_addr_type=random
+GAP/BROB/BCST/BV-05-C	N/A
+GAP/BROB/OBSV/BV-01-C	PASS	scan passive
+GAP/BROB/OBSV/BV-02-C	PASS	scan
+GAP/BROB/OBSV/BV-03-C	PASS	scan
+GAP/BROB/OBSV/BV-04-C	PASS	connect peer_addr=<addr>
+				security-set-data bonding=1
+				security-pair conn=<handle>
+				<OK>
+				<OK>
+GAP/BROB/OBSV/BV-05-C	PASS	scan own_addr_type=rpa_pub
+GAP/BROB/OBSV/BV-06-C	PASS	scan own_addr_type=rpa_pub
+-------------------------------------------------------------------------------
+
+GAP/DISC/NONM/BV-01-C	PASS	advertise-configure connectable=0 legacy=1 adverdise=non
+GAP/DISC/NONM/BV-02-C	PASS	advertise-configure connectable=0
+
+GAP/DISC/LIMM/BV-01-C	N/A
+GAP/DISC/LIMM/BV-02-C	N/A
+GAP/DISC/LIMM/BV-03-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=5
+				advertise-start duration= e.g.3000
+GAP/DISC/LIMM/BV-04-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=5
+				advertising-start duration=<e.g.3000>
+GAP/DISC/GENM/BV-01-C	N/A
+GAP/DISC/GENM/BV-02-C	N/A
+GAP/DISC/GENM/BV-03-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=6
+				advertise-start
+GAP/DISC/GENM/BV-04-C	PASS	advertise-configure legacy=1 connectable=0
+				advertise-set-adv-data flags=6
+				advertising-start
+
+GAP/DISC/LIMP/BV-01-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-02-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-03-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-04-C	PASS	scan limited=1 nodups=1
+GAP/DISC/LIMP/BV-05-C	PASS	scan limited=1 nodups=1
+
+GAP/DISC/GENP/BV-01-C	PASS	scan nodups=1
+GAP/DISC/GENP/BV-02-C	PASS	scan nodups=1
+GAP/DISC/GENP/BV-03-C	PASS	scan nodups=1
+				<OK>
+GAP/DISC/GENP/BV-04-C	PASS	scan nodups=1
+				<OK>
+GAP/DISC/GENP/BV-05-C	PASS	scan nodups=1
+
+GAP/DISC/RPA/BV-01-C	N/A		scan nodups=1
+-------------------------------------------------------------------------------
+
+GAP/IDLE/GIN/BV-01-C	N/A
+GAP/IDLE/GIN/BV-02-C	N/A
+GAP/IDLE/NAMP/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertising-start
+				gatt-discover-full conn=<handle>
+				gatt-show
+				<check start end handle for 0x1800>
+				gatt-read conn=<handle> uuid=0x2a00 start=<start> end=<end>
+				disconnect conn=<handle>
+GAP/IDLE/NAMP/BV-02-C	PASS	<answer NO to role question>
+				advertise-configure connectable=1 legacy=1
+				advertising-start
+GAP/IDLE/DED/BV-01-C	N/A
+GAP/IDLE/DED/BV-02-C	N/A
+-------------------------------------------------------------------------------
+
+GAP/CONN/NCON/BV-01-C	PASS	advertise-configure connectable=0 legacy=1
+				advertising-start
+GAP/CONN/NCON/BV-02-C	PASS	advertise-configure connectable=0 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+GAP/CONN/NCON/BV-03-C	PASS	advertise-configure connectable=0 legacy=1
+				advertise-set-adv-data flags=5
+				advertise-start
+
+GAP/CONN/DCON/BV-01-C	PASS	advertise-configure connectable=0 directed=1 peer_addr=<addr>
+				advertise-start
+GAP/CONN/DCON/BV-02-C	N/A
+GAP/CONN/DCON/BV-03-C	N/A
+
+GAP/CONN/UCON/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=4
+				advertise-start
+GAP/CONN/UCON/BV-02_C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=5
+				advertise-start
+GAP/CONN/UCON/BV-03_C	PASS	adbertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+GAP/CONN/UCON/BV-04_C	N/A
+GAP/CONN/UCON/BV-05_C	N/A
+GAP/CONN/UCON/BV-06_C	N/A
+
+GAP/CONN/ACEP/BV-01-C	PASS	white-list addr_type=public addr=<addr>
+				connect
+				disconnect conn=<handle>
+GAP/CONN/ACEP/BV-02-C	N/A
+
+GAP/CONN/GCEP/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/GCEP/BV-02-C	PASS	connect peer_addr=<addr>
+GAP/CONN/GCEP/BV-03-C	PASS	set irk=<irk>
+				connect peer_addr=<addr> own_addr_type=rpa_pub
+				security-set-data bonding=1 our_key_dist=7 their_key_dist=7
+				security-pair conn=<handle>
+				connect peer_addr=<addr>
+				disconnect conn=1
+GAP/CONN/GCEP/BV-04-C	N/A
+GAP/CONN/SCEP/BV-01-C	PASS	white-list addr_type=public addr=<addr>
+				connect
+				disconnect conn=<handle>
+GAP/CONN/SCEP/BV-02-C	INC
+GAP/CONN/DCEP/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/DCEP/BV-02-C	INC
+GAP/CONN/DCEP/BV-03-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/DCEP/BV-04-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+
+GAP/CONN/CPUP/BV-01-C	PASS	advertise-start
+				conn-update-params conn=<handle>
+GAP/CONN/CPUP/BV-02-C	PASS	advertise-start
+				conn-update-params conn=<handle>
+GAP/CONN/CPUP/BV-03-C	PASS	advertise-start
+				conn-update-params conn=<handle>
+GAP/CONN/CPUP/BV-04-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/CPUP/BV-05-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/CPUP/BV-06-C	PASS	conect peer_addr=<addr>
+				conn-update-params conn=<handle> eg.latency=20
+				disconnect conn=<handle>
+GAP/CONN/CPUP/BV-08-C	PASS	advertise-configure legacy=1 connectable=1
+				advertise-set-data name=<name>
+				advertise-start
+
+GAP/CONN/TERM/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+GAP/CONN/PRDA/BV-01-C	N/A
+GAP/CONN/PRDA/BV-02-C	N/A
+-------------------------------------------------------------------------------
+GAP/BOND/NBON/BV-01-C	PASS	security-set-data bonding=0
+				connect peer_addr=<addr>
+				<ok>
+				connect peer_addr=<addr>
+				<ok>
+GAP/BOND/NBON/BV-02-C	PASS	security-set-data bonding=0
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				<ok>
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				<ok>
+GAP/BOND/NBON/BV-03-C	PASS	security-set-data bonding=0
+				advertise-configure legacy=1 connectable=1
+				advertise-set-data name=<name>
+				advertise-start
+				<ok>
+
+GAP/BOND/BON/BV-01-C	PASS	security-set-data bonding=1 sc=1 our_key_dist=7 their_key_dist=7
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				security-start conn=<handle>
+				<ok>
+				advertise-start
+				<ok>
+GAP/BOND/BON/BV-02-C	PASS	security-set-data bonding=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				<ok>
+				connect peer_addr=<addr>
+				seccurity-pair conn=<handle>
+				<ok>
+GAP/BOND/BON/BV-03-C	PASS	security-set-sm-data bonding=1 our_key_dist=7 their_key_dist=7
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				<ok>
+				advertise-start
+				<ok>
+GAP/BOND/BON/BV-04-C	PASS	security-set-data bonding=1
+				connect-peer_addr=<addr>
+				disconnect conn=<handle>
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=<handle>
+-------------------------------------------------------------------------------
+
+GAP/SEC/AUT/BV-11-C	PASS	security-set-data io_capabilities=1 sc=1
+				advertise-configure legacy=1 connectable=1
+				advertising-start
+				Note: in PTS enter handle for characteristics
+				      value which requires encryption for read (gatt-show-local)
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+GAP/SEC/AUT/BV-12-C	PASS	security-set-data io_capabilities=1 bonding=1 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				connect peer_addr=<addr>
+				gatt-show-local
+				Note: in PTS enter handle for characteristics
+				      value which requires encryption for read
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+GAP/SEC/AUT/BV-13-C	PASS	Note: in PTS confirm that IUT supports GATT Server
+				security-set-data io_capabilities=1 bonding=1 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				connect peer_addr=<addr>
+				gatt-show-local
+				Note: in PTS enter handle for characteristics
+				      value which requires authenticated pairing for read
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+GAP/SEC/AUT/BV-14-C	PASS	security-set-data io_capabilities=1
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				gatt-show-local
+				Note: in PTS enter handle for characteristics
+				      value which requires authenticated pairing for read
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+GAP/SEC/AUT/BV-15-C	N/A	security-set-data bonding=1 io_capabilities=4 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				advertise-configure legacy=1 connectable=1
+				advertise-start
+				auth-passkey conn=<handle> action=2 key=<key>
+				advertise-start
+				gatt-show-local
+				Note: in PTS enter handle for characteristics
+				      value which requires authenticated pairing for read
+GAP/SEC/AUT/BV-16-C	N/A	security-set-data io_capabilities=1 bonding=1 mitm_flag=1 sc=1 our_key_dist=7 their_key_dist=7
+				connect peer_addr=<addr>
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+				connect peer_addr=<addr>
+				gatt-show-local
+				Note: in PTS enter handle for characteristics
+				      value which requires authenticated pairing for read
+GAP/SEC/AUT/BV-17-C	N/A
+GAP/SEC/AUT/BV-18-C	N/A
+GAP/SEC/AUT/BV-19-C	N/A
+GAP/SEC/AUT/BV-20-C	N/A
+GAP/SEC/AUT/BV-21-C	N/A
+GAP/SEC/AUT/BV-22-C	N/A
+GAP/SEC/AUT/BV-23-C	N/A
+GAP/SEC/AUT/BV-24-C	N/A
+
+GAP/SEC/CSIGN/BV-01-C	N/A
+GAP/SEC/CSIGN/BV-02-C	N/A
+
+GAP/SEC/CSIGN/BI-01-C	N/A
+GAP/SEC/CSIGN/BI-02-C	N/A
+GAP/SEC/CSIGN/BI-03-C	N/A
+GAP/SEC/CSIGN/BI-04-C	N/A
+-------------------------------------------------------------------------------
+
+GAP/PRIV/CONN/BV-01-C	N/A
+GAP/PRIV/CONN/BV-02-C	N/A
+GAP/PRIV/CONN/BV-03-C	N/A
+GAP/PRIV/CONN/BV-04-C	INC
+GAP/PRIV/CONN/BV-05-C	N/A
+GAP/PRIV/CONN/BV-06-C	N/A
+GAP/PRIV/CONN/BV-07-C	N/A
+GAP/PRIV/CONN/BV-08-C	N/A
+GAP/PRIV/CONN/BV-09-C	N/A
+GAP/PRIV/CONN/BV-10-C	N/A
+GAP/PRIV/CONN/BV-11-C	N/A
+-------------------------------------------------------------------------------
+
+GAP/ADV/BV-01-C		PASS	advertise-set-adv_data uuid16=0x1802
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-02-C		PASS	advertise-set-adv_data name=<name>
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-03-C		PASS	advertise-set-adv_data flags=6
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-04-C		PASS	advertise-set-adv_data mfg_data=ff:ff
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-05-C		PASS	advertise-set-adv_data tx_pwr_lvl=10
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-08-C		N/A
+GAP/ADV/BV-09-C		N/A
+GAP/ADV/BV-10-C		PASS	advetrise-set-adv_data service_data_uuid16=18:02:ff:ff
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-11-C		PASS	advertise-set -dv_data appearance=12
+				advertise-start
+				advertise-stop
+GAP/ADV/BV-12-C		N/A
+GAP/ADV/BV-13-C		N/A
+GAP/ADV/BV-14-C		N/A
+GAP/ADV/BV-15-C		N/A
+GAP/ADV/BV-16-C		N/A
+GAP/ADV/BV-17-C		PASS	In PTS: TSPX_URI=<bytes>
+				set-adv-data uri=<bytes>
+				advertise-start
+				advertise-stop
+-------------------------------------------------------------------------------
+
+GAP/GAT/BV-01-C		PASS	<if NO>
+				advertising-start
+				<if YES>
+				connect peer_addr=<addr>
+GAP/GAT/BV-02-C		N/A
+GAP/GAT/BV-03-C		N/A
+GAP/GAT/BV-04-C		PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GAP/GAT/BV-05-C		N/A
+GAP/GAT/BV-06-C		N/A
+GAP/GAT/BV-07-C		N/A
+GAP/GAT/BV-08-C		N/A
+----------------------------------------------------------------------------
+
+GAP/DM/NCON/BV-01-C	N/A
+GAP/DM/CON/BV-01-C	N/A
+GAP/DM/NBON/BV-01-C	N/A
+GAP/DM/BON/BV-01-C	N/A
+GAP/DM/GIN/BV-01-C	N/A
+GAP/DM/LIN/BV-01-C	N/A
+GAP/DM/NAD/BV-01-C	N/A
+GAP/DM/NAD/BV-02-C	N/A
+GAP/DM/LEP/BV-01-C	N/A
+GAP/DM/LEP/BV-02-C	N/A
+GAP/DM/LEP/BV-04-C	N/A
+GAP/DM/LEP/BV-05-C	N/A
+GAP/DM/LEP/BV-06-C	N/A
+GAP/DM/LEP/BV-07-C	N/A
+GAP/DM/LEP/BV-08-C	N/A
+GAP/DM/LEP/BV-09-C	N/A
+GAP/DM/LEP/BV-10-C	N/A
+GAP/DM/LEP/BV-11-C	N/A
+-------------------------------------------------------------------------------
+
+GAP/MOD/NDIS/BV-01-C	N/A
+GAP/MOD/LDIS/BV-01-C	N/A
+GAP/MOD/LDIS/BV-02-C	N/A
+GAP/MOD/LDIS/BV-03-C	N/A
+GAP/MOD/GDIS/BV-01-C	N/A
+GAP/MOD/GDIS/BV-02-C	N/A
+GAP/MOD/NCON/BV-01-C	N/A
+GAP/MOD/CON/BV-01-C	N/A
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-gatt.txt b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-gatt.txt
new file mode 100644
index 000000000..74c0a2e01
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-gatt.txt
@@ -0,0 +1,508 @@
+PTS test results for GATT
+
+PTS version: 7.5.0
+Tested: 27-Sept-2019
+
+Results:
+PASS	test passed
+FAIL	test failed
+INC	test is inconclusive
+N/A	test is disabled due to PICS setup
+
+-------------------------------------------------------------------------------
+Test Name		Result	Notes
+-------------------------------------------------------------------------------
+GATT/CL/GAC/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-exchanche-mtu conn=<handle>
+				gatt-write conn=<handle> long=1 attr=<val_handle> value=<xx:...>
+				disconnect conn=<handle>
+-------------------------------------------------------------------------------
+
+GATT/CL/GAD/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle>
+				gatt-show
+				<answer YES>
+				disconnect conn=<handle>
+				<repeat>
+GATT/CL/GAD/BV-02-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle> uuid=<uuid>
+				gatt-show
+				<answer YES>
+				disconnect conn=<handle>
+				<repeat>
+GATT/CL/GAD/BV-03-C	PASS	connect peer_addr=<addr>
+				gatt-find-included-services conn=<handle> start=1 end=0xffff
+				<answer YES>
+				disconnect conn=<handle>
+				<repeat>
+GATT/CL/GAD/BV-04-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle> uuid=<uuid>
+				gatt-discover-characteristic conn=<handle> start=<start hdl> end=<end hdl>
+				gatt-show
+				<answer YES>
+				disconnect conn=<handle>
+				<repeat>
+GATT/CL/GAD/BV-05-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle>
+				gatt-discover-characteristic conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				gatt-show
+				<answer YES>
+				disconnect conn=<handle>
+				<repeat>
+GATT/CL/GAD/BV-06-C	PASS	connect peer_addr=<addr>
+				gatt-discover-service conn=<handle>
+				gatt-discover-characteristic conn=<handle> start=<start-hdl> end=<end-hdl>
+				gatt-discover-descriptor conn=<handle> start=<start-hdl> end=<end-hdl>
+				<answer YES>
+				disconnect conn=<handle>
+				<repeat>
+GATT/CL/GAD/BV-07-C	N/A
+GATT/CL/GAD/BV-08-C	N/A
+-------------------------------------------------------------------------------
+
+GATT/CL/GAR/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-01-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-02-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-03-C	N/A
+
+GATT/CL/GAR/BI-04-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-05-C	PASS    connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-03-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=1 end=0xffff
+				<answer YES>
+				<repeat>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-06-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-07-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-09-C	N/A
+GATT/CL/GAR/BI-10-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> uuid=<uuid> start=<start hdl> end=<end hdl>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-11-C	PASS    connect perr_addr=<addr>
+				gatt-read conn=<handle> start=<start_hdl> end=<end_hdl>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BV-04-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				<answer YES>
+				<repeat>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-12-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-13-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle> offset=<offset>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-14-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-15-C	N/A
+
+GATT/CL/GAR/BI-16-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-17-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-05-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-18-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-19-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-20-C	N/A
+
+GATT/CL/GAR/BI-21-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				disconnect conn=<handle>
+				<answer YES>
+GATT/CL/GAR/BI-22-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle1> attr=<val_handle2>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-06-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+GATT/CL/GAR/BV-07-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				<answer YES>
+				<repeat>
+				disconnect conn=<handle>
+GATT/CL/GAR/BI-34-C	N/A
+GATT/CL/GAR/BI-35-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> long=1 attr=<val_handle>
+				<answer YES>
+				disconnect conn=<handle>
+-------------------------------------------------------------------------------
+
+GATT/CL/GAW/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-write no_rsp=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BV-02-C	N/A
+
+GATT/CL/GAW/BV-03-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-02-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-03-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-04-C	N/A
+
+GATT/CL/GAW/BI-05-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-06-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BV-05-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-07-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disocnnect conn=<handle>
+GATT/CL/GAW/BI-08-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				diconnect conn=<handle>
+GATT/CL/GAW/BI-09-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val> offset=<offset>
+				diconnect conn=1
+GATT/CL/GAW/BI-11-C	N/A
+
+GATT/CL/GAW/BI-12-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-13-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				diconnect conn=<handle>
+GATT/CL/GAW/BV-06-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+
+GAAT/CL/GAW/BV-08-C	PASS	connect peer_addr=<addr>
+				gat-write conn=<handle> attr=<val_handle> value=<val>
+
+GATT/CL/GAW/BV-09-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+
+GATT/CL/GAW/BI-32-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-33-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+GATT/CL/GAW/BI-34-C	PASS	connect peer_addr=<addr>
+				gatt-write long=1 conn=<handle> attr=<val_handle> value=<val>
+				disconnect conn=<handle>
+
+-------------------------------------------------------------------------------
+
+GATT/CL/GAN/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=01:00
+				Note: verify that the notification was received
+				disconnect conn=<handle>
+-------------------------------------------------------------------------------
+
+GATT/CL/GAI/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=01:00
+				Note: verify that the notification was received
+				disconnect conn=<handle>
+-------------------------------------------------------------------------------
+
+GATT/CL/GAS/BV-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+-------------------------------------------------------------------------------
+
+GATT/CL/GAT/BV-01-C	PASS	connect peer_addr=<addr>
+				gatt-read conn=<handle> attr=<val_handle>
+GATT/CL/GAT/BV-02-C	PASS	connect peer_addr=<addr>
+				gatt-write conn=<handle> attr=<val_handle> value=<val>
+-------------------------------------------------------------------------------
+
+GATT/CL/GPA/BV-01-C	N/A
+GATT/CL/GPA/BV-02-C	N/A
+GATT/CL/GPA/BV-03-C	N/A
+GATT/CL/GPA/BV-04-C	N/A
+GATT/CL/GPA/BV-05-C	N/A
+GATT/CL/GPA/BV-06-C	N/A
+GATT/CL/GPA/BV-07-C	N/A
+GATT/CL/GPA/BV-08-C	N/A
+GATT/CL/GPA/BV-11-C	N/A
+GATT/CL/GPA/BV-12-C	N/A
+-------------------------------------------------------------------------------
+
+GATT/SR/GAC/BV-01-C	PASS	set mtu=25
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				advertise-start
+-------------------------------------------------------------------------------
+
+GATT/SR/GAD/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
+				<YES>
+GATT/SR/GAD/BV-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
+				<YES>
+GATT/SR/GAD/BV-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
+				<YES>
+GATT/SR/GAD/BV-04-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<confirm handles range for services>
+GATT/SR/GAD/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAD/BV-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAD/BV-07-C	N/A
+GATT/SR/GAD/BV-08-C	N/A
+-------------------------------------------------------------------------------
+
+GATT/SR/GAR/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAR/BI-03-C	N/A
+GATT/SR/GAR/BI-04-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BV-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-show-local
+				<enter uuid without READ flag>
+				<enter value handle>
+GATT/SR/GAR/BI-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAR/BI-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-09-C	N/A
+GATT/SR/GAR/BI-10-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-11-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter characteristic wit READ|READ_ENC flags>
+GATT/SR/GAR/BV-04-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-12-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter long value handle without READ flag>
+GATT/SR/GAR/BI-13-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-14-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAR/BI-15-C	N/A
+GATT/SR/GAR/BI-16-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-17-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-18-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter value handle without READ flag>
+GATT/SR/GAR/BI-19-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAR/BI-20-C	N/A
+GATT/SR/GAR/BI-21-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-22-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-startt
+GATT/SR/GAR/BV-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-23-C	N/A
+GATT/SR/GAR/BI-24-C	N/A
+GATT/SR/GAR/BI-25-C	N/A
+GATT/SR/GAR/BI-26-C	N/A
+GATT/SR/GAR/BI-27-C	N/A
+GATT/SR/GAR/BV-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BV-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAR/BI-28-C	N/A
+GATT/SR/GAR/BI-29-C	N/A
+GATT/SR/GAR/BI-30-C	N/A
+GATT/SR/GAR/BI-31-C	N/A
+GATT/SR/GAR/BI-32-C	N/A
+GATT/SR/GAR/BI-33-C	N/A
+GATT/SR/GAR/BI-34-C	N/A
+GATT/SR/GAR/BI-35-C	N/A
+-------------------------------------------------------------------------------
+
+GATT/SR/GAW/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-02-C	N/A
+GATT/SR/GAW/BI-01-C	N/A
+GATT/SR/GAW/BV-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAW/BI-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-04-C	N/A
+GATT/SR/GAW/BI-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAW/BI-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter long value handle without WRITE flag>
+GATT/SR/GAW/BI-09-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-11-C	N/A
+GATT/SR/GAW/BI-12-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-13-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-10-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-14-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAW/BI-15-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter value handle without WRITE flag>
+GATT/SR/GAW/BI-17-C	N/A
+GATT/SR/GAW/BI-18-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-19-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-11-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-20-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAW/BI-21-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter dsc value handle without WRITE flag>
+GATT/SR/GAW/BI-22-C	N/A
+GATT/SR/GAW/BI-23-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-24-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BV-09-C	PASS	advertise-configure connectable=1 legacy=1q
+				advertise-start
+GATT/SR/GAW/BI-25-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter ffff>
+GATT/SR/GAW/BI-26-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<enter dsc value handle without WRITE flag>
+GATT/SR/GAW/BI-27-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-29-C	N/A
+GATT/SR/GAW/BI-30-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-31-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-32-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-33-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-34-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/GAW/BI-35-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+------------------------------------------------------------------------------
+
+GATT/SR/GAN/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-notify attr=<val_handle>
+------------------------------------------------------------------------------
+
+GATT/SR/GAI/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				gatt-notify attr=<val_handle>
+-------------------------------------------------------------------------------
+
+GATT/SR/GAS/BV-01-C	PASS	Note: set TSPX_security_enabled to TRUE
+				security-set-data bonding=1 our_key_dist=7 their_key_dist=7
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				<click OK>
+				gatt-service-changed start=1 end=0xffff
+				advertise-start
+				security-start conn=<handle>
+-------------------------------------------------------------------------------
+
+GATT/SR/GAT/BV-01-C	PASS	advertise-start
+				gatt-notify attr=0x0008
+------------------------------------------------------------------------------
+
+GATT/SR/GPA/BV-01-C	N/A
+GATT/SR/GPA/BV-02-C	N/A
+GATT/SR/GPA/BV-03-C	N/A
+GATT/SR/GPA/BV-04-C	N/A
+GATT/SR/GPA/BV-05-C	N/A
+GATT/SR/GPA/BV-06-C	N/A
+GATT/SR/GPA/BV-07-C	N/A
+GATT/SR/GPA/BV-08-C	N/A
+GATT/SR/GPA/BV-11-C	N/A
+GATT/SR/GPA/BV-12-C	N/A
+-------------------------------------------------------------------------------
+
+GATT/SR/UNS/BI-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+GATT/SR/UNS/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+
+--------------------------------------------------------------------------------
+
+GATT/SR/GPM/BV-01-C	N/A
+
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-l2cap.txt b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-l2cap.txt
new file mode 100644
index 000000000..c09add916
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-l2cap.txt
@@ -0,0 +1,304 @@
+PTS test results for L2CAP
+
+PTS version: 7.5.0
+Tested: 07-Oct-2019
+
+syscfg.vals:
+    BLE_EXT_ADV: 1
+    BLE_PUBLIC_DEV_ADDR: "((uint8_t[6]){0x01, 0xff, 0xff, 0xc0, 0xde, 0xc0})"
+    BLE_SM_LEGACY: 1
+    BLE_SM_SC: 1
+    BLE_L2CAP_COC_MAX_NUM: 5
+    BLE_SVC_GAP_PPCP_MIN_CONN_INTERVAL: 9
+    BLE_SVC_GAP_PPCP_MAX_CONN_INTERVAL: 30
+    BLE_SVC_GAP_PPCP_SUPERVISION_TMO: 2000
+    CONSOLE_HISTORY_SIZE: 10
+
+Results:
+PASS   test passed
+FAIL   test failed
+INC    test is inconclusive
+N/A    test is disabled due to PICS setup
+
+-------------------------------------------------------------------------------
+Test Name		Result	Notes
+-------------------------------------------------------------------------------
+
+L2CAP/COS/CED/BV-01-C	N/A
+L2CAP/COS/CED/BV-03-C	N/A
+L2CAP/COS/CED/BV-04-C	N/A
+L2CAP/COS/CED/BV-05-C	N/A
+L2CAP/COS/CED/BV-07-C	N/A
+L2CAP/COS/CED/BV-08-C	N/A
+L2CAP/COS/CED/BV-09-C	N/A
+L2CAP/COS/CED/BV-10-C	N/A
+L2CAP/COS/CED/BV-11-C	N/A
+L2CAP/COS/CED/BI-01-C	N/A
+-------------------------------------------------------------------------------
+
+L2CAP/COS/CFD/BV-01-C	N/A
+L2CAP/COS/CFD/BV-02-C	N/A
+L2CAP/COS/CFD/BV-03-C	N/A
+L2CAP/COS/CFD/BV-08-C	N/A
+L2CAP/COS/CFD/BV-09-C	N/A
+L2CAP/COS/CFD/BV-10-C	N/A
+L2CAP/COS/CFD/BV-11-C	N/A
+L2CAP/COS/CFD/BV-12-C	N/A
+L2CAP/COS/CFD/BV-13-C	N/A
+-------------------------------------------------------------------------------
+
+L2CAP/COS/IEX/BV-01-C	N/A
+L2CAP/COS/IEX/BV-02-C	N/A
+-------------------------------------------------------------------------------
+
+L2CAP/COS/ECH/BV-01-C	N/A
+L2CAP/COS/ECH/BV-02-C	N/A
+-------------------------------------------------------------------------------
+
+L2CAP/COS/CFC/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+				l2cap-send conn=<handle> idx=0 bytes=15
+				<YES>
+L2CAP/COS/CFC/BV-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+				l2cap-send conn=<handle> idx=0 bytes=15
+				<YES>
+L2CAP/COS/CFC/BV-03-C	PASS	NOTE: #define BTSHELL_COC_MTU = 512
+				advertise-configure connectable=1 legacy=1
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+L2CAP/COS/CFC/BV-04-C	PASS	advertise-configure connectable=1 legacy=1
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+L2CAP/COS/CFC/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+				l2cap-connect conn=<handle> psm=<your psm>
+				l2cap-connect conn=<handle> psm=<2nd psm>
+-------------------------------------------------------------------------------
+
+L2CAP/CLS/CLR/BV-01-C	N/A
+-------------------------------------------------------------------------------
+
+L2CAP/CLS/UCD/BV-01-C	N/A
+L2CAP/CLS/UCD/BV-02-C	N/A
+L2CAP/CLS/UCD/BV-03-C	N/A
+-------------------------------------------------------------------------------
+
+L2CAP/EXF/BV-01-C		N/A
+L2CAP/EXF/BV-02-C		N/A
+L2CAP/EXF/BV-03-C		N/A
+L2CAP/EXF/BV-04-C		N/A
+L2CAP/EXF/BV-05-C		N/A
+L2CAP/EXF/BV-06-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/CMC/BV-01-C		N/A
+L2CAP/CMC/BV-02-C		N/A
+L2CAP/CMC/BV-03-C		N/A
+L2CAP/CMC/BV-04-C		N/A
+L2CAP/CMC/BV-05-C		N/A
+L2CAP/CMC/BV-06-C		N/A
+L2CAP/CMC/BV-07-C		N/A
+L2CAP/CMC/BV-08-C		N/A
+L2CAP/CMC/BV-09-C		N/A
+L2CAP/CMC/BV-10-C		N/A
+L2CAP/CMC/BV-11-C		N/A
+L2CAP/CMC/BV-12-C		N/A
+L2CAP/CMC/BV-13-C		N/A
+L2CAP/CMC/BV-14-C		N/A
+L2CAP/CMC/BV-15-C		N/A
+L2CAP/CMC/BI-01-C		N/A
+L2CAP/CMC/BI-02-C		N/A
+L2CAP/CMC/BI-03-C		N/A
+L2CAP/CMC/BI-04-C		N/A
+L2CAP/CMC/BI-05-C		N/A
+L2CAP/CMC/BI-06-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/FOC/BV-01-C		N/A
+L2CAP/FOC/BV-02-C		N/A
+L2CAP/FOC/BV-03-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/OFS/BV-01-C		N/A
+L2CAP/OFS/BV-02-C		N/A
+L2CAP/OFS/BV-03-C		N/A
+L2CAP/OFS/BV-04-C		N/A
+L2CAP/OFS/BV-05-C		N/A
+L2CAP/OFS/BV-06-C		N/A
+L2CAP/OFS/BV-07-C		N/A
+L2CAP/OFS/BV-08-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/ERM/BV-01-C		N/A
+L2CAP/ERM/BV-02-C		N/A
+L2CAP/ERM/BV-03-C		N/A
+L2CAP/ERM/BV-05-C		N/A
+L2CAP/ERM/BV-06-C		N/A
+L2CAP/ERM/BV-07-C		N/A
+L2CAP/ERM/BV-08-C		N/A
+L2CAP/ERM/BV-09-C		N/A
+L2CAP/ERM/BV-10-C		N/A
+L2CAP/ERM/BV-11-C		N/A
+L2CAP/ERM/BV-12-C		N/A
+L2CAP/ERM/BV-13-C		N/A
+L2CAP/ERM/BV-14-C		N/A
+L2CAP/ERM/BV-15-C		N/A
+L2CAP/ERM/BV-16-C		N/A
+L2CAP/ERM/BV-17-C		N/A
+L2CAP/ERM/BV-18-C		N/A
+L2CAP/ERM/BV-19-C		N/A
+L2CAP/ERM/BV-20-C		N/A
+L2CAP/ERM/BV-21-C		N/A
+L2CAP/ERM/BV-22-C		N/A
+L2CAP/ERM/BV-23-C		N/A
+L2CAP/ERM/BI-01-C		N/A
+L2CAP/ERM/BI-02-C		N/A
+L2CAP/ERM/BI-03-C		N/A
+L2CAP/ERM/BI-04-C		N/A
+L2CAP/ERM/BI-05-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/STM/BV-01-C		N/A
+L2CAP/STM/BV-02-C		N/A
+L2CAP/STM/BV-03-C		N/A
+L2CAP/STM/BV-11-C		N/A
+L2CAP/STM/BV-12-C		N/A
+L2CAP/STM/BV-13-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/FIX/BV-01-C		N/A
+L2CAP/FIX/BV-02-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/EWC/BV-01-C		N/A
+L2CAP/EWC/BV-02-C		N/A
+L2CAP/EWC/BV-03-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/LSC/BV-01-C		N/A
+L2CAP/LSC/BV-02-C		N/A
+L2CAP/LSC/BV-03-C		N/A
+L2CAP/LSC/BI-04-C		N/A
+L2CAP/LSC/BI-05-C		N/A
+L2CAP/LSC/BV-06-C		N/A
+L2CAP/LSC/BV-07-C		N/A
+L2CAP/LSC/BV-08-C		N/A
+L2CAP/LSC/BV-09-C		N/A
+L2CAP/LSC/BI-10-C		N/A
+L2CAP/LSC/BI-11-C		N/A
+L2CAP/LSC/BV-12-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/CCH/BV-01-C		N/A
+L2CAP/CCH/BV-02-C		N/A
+L2CAP/CCH/BV-03-C		N/A
+L2CAP/CCH/BV-04-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/ECF/BV-01-C		N/A
+L2CAP/ECF/BV-02-C		N/A
+L2CAP/ECF/BV-03-C		N/A
+L2CAP/ECF/BV-04-C		N/A
+L2CAP/ECF/BV-05-C		N/A
+L2CAP/ECF/BV-06-C		N/A
+L2CAP/ECF/BV-07-C		N/A
+L2CAP/ECF/BV-08-C		N/A
+-------------------------------------------------------------------------------
+
+L2CAP/LE/CPU/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				l2cap-update conn=<handle>
+L2CAP/LE/CPU/BV-02-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+L2CAP/LE/CPU/BI-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=<handle>
+L2CAP/LE/CPU/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+-------------------------------------------------------------------------------
+
+L2CAP/LE/REJ/BI-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+L2CAP/LE/REJ/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				disconnect conn=<handle>
+-------------------------------------------------------------------------------
+
+L2CAP/LE/CFC/BV-01-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+L2CAP/LE/CFC/BV-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				l2cap-connect conn=<handle> psm=90
+L2CAP/LE/CFC/BV-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+				l2cap-send conn=<handle> idx=0 bytes=15
+				<YES>
+L2CAP/LE/CFC/BV-04-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				l2cap-connect conn=<handle> psm=<unsuppported psm from ixit>
+L2CAP/LE/CFC/BV-05-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+L2CAP/LE/CFC/BV-06-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+				l2cap-send conn=<handle> idx=0 bytes=15
+L2CAP/LE/CFC/BV-07-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+L2CAP/LE/CFC/BI-01-C	PASS	advertise-configure connectable=1 legacy=1
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+L2CAP/LE/CFC/BV-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				l2cap-create-server psm=<your psm>
+				advertise-start
+				l2cap-disconnect conn=<handle> idx=0
+L2CAP/LE/CFC/BV-09-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+L2CAP/LE/CFC/BV-16-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				l2cap-connect conn=<handle> psm=90
+L2CAP/LE/CFC/BV-17-C	N/A
+L2CAP/LE/CFC/BV-18-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				l2cap-connect conn=<handle> psm=90
+L2CAP/LE/CFC/BV-19-C	PASS	NOTE: TSPC_L2CAP_3_16 (multiple channel support) must be checked
+				advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				l2cap-connect conn=<handle> psm=90
+L2CAP/LE/CFC/BV-20-C	PASS	NOTE: TSPC_L2CAP_3_16 (multiple channel support) must be checked
+				advertise-configure connectable=1 legacy=1
+				l2cap-create-server psm=<TSPX_le_psm from ixit>
+				advertise-start
+L2CAP/LE/CFC/BV-21-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-set-adv-data flags=6
+				advertise-start
+				l2cap-connect conn=<handle> psm=90
+-------------------------------------------------------------------------------
+
+L2CAP/LE/CID/BV-01-C	N/A
+L2CAP/LE/CID/BV-02-C	N/A
+-------------------------------------------------------------------------------
+
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-sm.txt b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-sm.txt
new file mode 100644
index 000000000..ac26db712
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/pts-sm.txt
@@ -0,0 +1,310 @@
+PTS test results for SM
+
+PTS version: 7.5.0
+Tested: 07-Oct-2019
+
+syscfg.vals:
+    BLE_EXT_ADV: 1
+    BLE_PUBLIC_DEV_ADDR: "((uint8_t[6]){0x01, 0xff, 0xff, 0xc0, 0xde, 0xc0})"
+    BLE_SM_LEGACY: 1
+    BLE_SM_SC: 1
+    BLE_L2CAP_COC_MAX_NUM: 5
+    BLE_SVC_GAP_PPCP_MIN_CONN_INTERVAL: 9
+    BLE_SVC_GAP_PPCP_MAX_CONN_INTERVAL: 30
+    BLE_SVC_GAP_PPCP_SUPERVISION_TMO: 2000
+    CONSOLE_HISTORY_SIZE: 10
+
+Results:
+PASS	test passed
+FAIL	test failed
+INC		test is inconclusive
+N/A		test is disabled due to PICS setup
+NONE	test result is none
+
+-------------------------------------------------------------------------------
+Test Name		Result	Notes
+-------------------------------------------------------------------------------
+
+SM/MAS/PROT/BV-01-C	PASS	connect peer_addr=<addr>
+				security-set-data bonding=1 sc=1 our_key_dist=7 their_key_dist=7
+				security-pair conn=<handle>
+-------------------------------------------------------------------------------
+
+SM/MAS/JW/BV-01-C	N/A
+SM/MAS/JW/BV-05-C	PASS	connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=<handle>
+                                <repeat>
+SM/MAS/JW/BI-01-C	PASS	connect peer_addr=<addr>
+				security-pair conn=<handle>
+SM/MAS/JW/BI-04-C	PASS	connect peer_addr=<addr>
+				security-set-data bonding=1 sc=1
+				security-pair conn=<handle>
+-------------------------------------------------------------------------------
+
+SM/MAS/PKE/BV-01-C	PASS	security-set-data io_capabilities=1
+				connect peer_addr=<addr>
+				b sec pair conn=<handle>
+				b passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+SM/MAS/PKE/BV-04-C	PASS	security-set-data bonding=1 oob_flag=0
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=<handle>
+SM/MAS/PKE/BI-01-C	PASS	ecurity-set-data io_capabilities=1 oob_flag=0
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter invalid passkey
+SM/MAS/PKE/BI-02-C	PASS	security-set-data io_capabilities=1 oob_flag=0
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+-------------------------------------------------------------------------------
+
+SM/MAS/OOB/BV-01-C	N/A
+SM/MAS/OOB/BV-03-C	N/A
+SM/MAS/OOB/BV-05-C	PASS	security-set-data io_capabilities=1 oob_flag=0
+				connect-peer_addr=<addr>
+				security-pair conn=<handle>
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter '123456' passkey in PTS
+				disconnect conn=1
+SM/MAS/OOB/BV-07-C	PASS	ecurity-set-data io_capabilities=1 oob_flag=0
+				connect-peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/OOB/BV-09-C	N/A
+SM/MAS/OOB/BI-01-C	N/A
+-------------------------------------------------------------------------------
+
+SM/MAS/EKS/BV-01-C	PASS	connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/EKS/BI-01-C	PASS	connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+-------------------------------------------------------------------------------
+
+SM/MAS/SIGN/BV-01-C	N/A
+SM/MAS/SIGN/BV-03-C	N/A
+SM/MAS/SIGN/BI-01-C	N/A
+-------------------------------------------------------------------------------
+
+SM/MAS/KDU/BV-04-C	PASS	security-set-data our_key_dist=4
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/KDU/BV-05-C	PASS	security-set-data our_key_dist=2
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/KDU/BV-06-C	PASS	security-set-data our_key_dist=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/KDU/BV-10-C	PASS	security-set-data our_key_dist=2 sc=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/KDU/BV-11-C	PASS	security-set-data our_key_dist=2 sc=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/KDU/BI-01-C	PASS	connect peer_addr=<addr>
+				disconnect conn=1
+				reset device
+				<OK>
+				<repeat>
+-------------------------------------------------------------------------------
+
+SM/MAS/SIP/BV-02-C	PASS	security-set-data io_capabilities=4
+				connect peer_addr=<addr>
+				disconnect conn=1
+-------------------------------------------------------------------------------
+SM/MAS/SCJW/BV-01-C	PASS	security-set-data sc=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/SCJW/BV-04-C	PASS	security-set-data sc=1 io_capabilities=1 our_key_dist=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+SM/MAS/SCJW/BI-01-C	PASS	security-set-data sc=1 io_capabilities=4
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+				<repeat>
+				<confirm key number with PTS>
+-------------------------------------------------------------------------------
+
+SM/MAS/SCPK/BV-01-C	PASS	security-set-data sc=1 io_capabilities=2
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				auth_passkey conn=1 action=2 key=123456
+				Note: enter '123456' passkey in PTS
+				disconnect conn=1
+SM/MAS/SCPK/BV-04-C	PASS	security-set-data io_capabilities=4 oob_flag=0 our_key_dist=1 their_key_dist=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				auth_passkey conn=1 action=2 key=123456
+				Note: enter '123456' passkey in PTS
+				disconnect conn=1
+SM/MAS/SCPK/BI-01-C	PASS	security-set-data io_capabilities=4 oob_flag=0 sc=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				disconnect conn=1
+				<repeat>
+				auth_passkey conn=1 action=2 key=123456
+				Note: enter '123456' passkey in PTS
+				disconnect conn=1
+SM/MAS/SCPK/BI-02-C	PASS	security-set-data io_capabilities=2 oob_flag=0 bonding=1 sc=1
+				connect peer_addr=<addr>
+				security-pair conn=<handle>
+				auth_passkey conn=1 action=2 key=123456
+				Note: enter '123456' passkey in PTS
+				disconnect conn=1
+-------------------------------------------------------------------------------
+
+SM/MAS/SCOB/BV-01-C	N/A
+SM/MAS/SCOB/BI-04-C	N/A
+SM/MAS/SCOB/BV-01-C	N/A
+SM/MAS/SCOB/BI-04-C	N/A
+-------------------------------------------------------------------------------
+
+SM/MAS/SCCT/BV-01-C	N/A
+SM/MAS/SCCT/BV-03-C	N/A
+SM/MAS/SCCT/BV-05-C	N/A
+SM/MAS/SCCT/BV-07-C	N/A
+SM/MAS/SCCT/BV-09-C	N/A
+-------------------------------------------------------------------------------
+
+SM/SLA/PROT/BV-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+				<wait>
+-------------------------------------------------------------------------------
+
+SM/MAS/JW/BV-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/JW/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/JW/BI-03-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+-------------------------------------------------------------------------------
+
+SM/SLA/PKE/BV-02-C	PASS	security-set-data io_capabilities=4
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				auth-passkey conn=<handle> action=2 key=<key>
+				<OK>
+SM/SLA/PKE/BV-05-C	PASS	security-set-data io_capabilities=4
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/PKE/BI-03-C	PASS	security-set-data io_capabilities=4
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				auth-passkey conn=<handle> action=3 key=123456
+				Note: enter invalid passkey
+-------------------------------------------------------------------------------
+
+SM/SLA/OOB/BV-02-C	N/A
+SM/SLA/OOB/BV-04-C	N/A
+SM/SLA/OOB/BV-06-C	PASS	security-set-data io_capabilities=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				auth-passkey conn=<handle> action=3 key=<key>
+SM/SLA/OOB/BV-08-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/OOB/BV-10-C	N/A
+SM/SLA/OOB/BI-02-C	N/A
+-------------------------------------------------------------------------------
+
+SM/SLA/EKS/BV-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/EKS/BI-02-C	PASS	advertise-configure connectable=1 legacy=1
+				advertise-start
+-------------------------------------------------------------------------------
+
+SM/SLA/KDU/BV-01-C	PASS	security-set-data io_capabilities=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/KDU/BV-02-C	PASS	security-set-data io_capabilities=2
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/KDU/BV-03-C	PASS	security-set-data io_capabilities=4
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/KDU/BV-07-C	PASS	security-set-data our_key_dist=1 bonding=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/KDU/BV-08-C	PASS	security-set-data our_key_dist=2 sc=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/KDU/BV-09-C	PASS	security-set-data our_key_dist=4 bonding=0
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/KDU/BI-01-C	PASS	advertise-configure connectable=1 legacy=1
+				security-set-data sc=1
+				advertise-start
+				<reset device>
+				<repeat>
+-------------------------------------------------------------------------------
+
+SM/SLA/SIP/BV-01-C	PASS	security-set-data io_capabilities=4
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				security-start conn=<handle>
+-------------------------------------------------------------------------------
+
+SM/SLA/SIE/BV-01-C	PASS	security-set-data io_capabilities=3 bonding=1 our_key_dist=1 their_key_dist=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				advertise-start
+				security-start conn=<handle>
+-------------------------------------------------------------------------------
+
+SM/SLA/SCJW/BV-02-C	PASS	security-set-data io_capabilities=4 oob_flag=0 bonding=0 mitm_flag=0 sc=1 our_key_dist=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/SCJW/BV-03-C	PASS	security-set-data io_capabilities=1 our_key_dist=1 oob_flag=0
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+SM/SLA/SCJW/BI-02-C	PASS	security-set-data io_capabilities=1 oob_flag=0 bonding=1 sc=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+-------------------------------------------------------------------------------
+
+SM/SLA/SCPK/BV-02-C	PASS	security-set-data io_capabilities=1 oob_flag=0 sc=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				auth-passkey conn=1 action=4 key=186900 yesno=yy
+SM/SLA/SCPK/BV-03-C	PASS	security-set-data io_capabilities=2 oob_flag=0 our_key_dist=1 their_key_dist=1 sc=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				auth-passkey conn=1 action=2 key=123456
+				Note: enter '123456' passkey in PTS
+SM/SLA/SCPK/BI-03-C	PASS	security-set-data io_capabilities=2 oob_flag=0 sc=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				auth-passkey conn=1 action=2 key=123456 oob=<xx:xx:xx...>
+				Note: enter '123456' passkey in PTS
+SM/SLA/SCPK/BI-04-C	PASS	security-set-data io_capabilities=2 oob_flag=0 mitm_flag=1 sc=1
+				advertise-configure connectable=1 legacy=1
+				advertise-start
+				<repeat>
+				auth-passkey conn=1 action=2 key=123456
+				Note: enter '123456' passkey in PTS
+-------------------------------------------------------------------------------
+
+SM/SLA/SCOB/BV-02-C	N/A
+SM/SLA/SCOB/BI-03-C	N/A
+SM/SLA/SCOB/BV-02-C	N/A
+SM/SLA/SCOB/BI-03-C	N/A
+-------------------------------------------------------------------------------
+
+SM/SLA/SCCT/BV-02-C	N/A
+SM/SLA/SCCT/BV-04-C	N/A
+SM/SLA/SCCT/BV-06-C	N/A
+SM/SLA/SCCT/BV-08-C	N/A
+SM/SLA/SCCT/BV-10-C	N/A
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg
new file mode 100644
index 000000000..3cc985fab
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/tpg/94654-20170317-085122560.tpg
@@ -0,0 +1,1026 @@
+<!-- START ENCRYPTED FILE --->
+M'&/JP\$+#X83?)"[ M2E=\N*7*U 5)JSKT(5#=>@^/#]IP*[GTZ0%0]$F(/$
+MEK[V7>349??;!JZJNFZ CK=QGD^FOYV^FU>"DK<@0U*##HV\H9&_%["5IK@1
+MA9F,FJO2P^3:4_]04%-0T%9=^XCMWKF"L$[)%)G>_I 0Q?@:H)&1HX)7VY&.
+M3 *!JH;^YUJ1[_*7JN2'Z5^*0I&NP+[LAE:>S92BP^T:3+B>IKFJJ8A,4Y^L
+MUX+P_C'Z#VN20)A!ANN2@J#!AYY4"KQ\5):1]+[B\TN+BI"AB8NJH ,NZ(()
+MG>K?^<ZA'-8.RL-J$<)(C9[Q!,J#I\O^U //$%L+CAC;BZR I+VL1_?1UG&4
+M!5L,T[F[JEFYD;^4JYE2JO%6O=+:CXZ6CL\:\-LP1(%UF9F8$Q"A4XJ_PM#^
+M^G*CZ8!#KXH7096+O4QZ6O<)Y-4PO:<0N*]7B9PRW"'X3YL(Z^S%XUB5@[F_
+MDKB?NDVX39/(_5[/I!?M_Q@F4A[/?PD7SQS?21+70M!:Y6RP0BX8<[N>A\<!
+MP;[%Q]OXC)K'KI)<7)&;^(F:\LT# \[#W\8ZPLK5 P_-VNG$WL]# ]#5GJU?
+M_XM5B%5INH>-B,<@/IVC+$#XFXJ<65V*OE'"L]7*OEJ*C]CS^."A/) (K_@0
+ME"&)D)^IP]?+')Q(%NM&7:VL@*6#D!-TU,7.WG SERP(@*R+DH"MPH;@X:Y)
+M]X6NG8^EC)N?AH+3[\3SG''R3(?WRGF0NZ#,_4%*E)&>&9R)5[F0OM$A0Y.;
+MA8R7%EGBS&\IDPYNR<DUG*^8[.&)T2! "F\<2L/VCZNXDHN=O2"O2JR,P_'V
+MG^??HX&-:=ZO$Z 2GFNL<++PP(K$$0N4(]"2F,96FJV0FH^?]A"7P_+ Y<M/
+MGZT#BI_?NH.HFKN/E?B#&*\.!<2?KFV9BD>%4ZV$FK^(F[P B/[TU86=H%S^
+MH[H^EYQB:MZ)A:2@IV)4O=//SXNP#%F]5N&<3KZL>(#6'H"D4\DST(O!(![@
+MUYZX#+:1G:V5BE&TGHK]<N.^GDWRF%EQIU^G$*K#YOS0P=X<DJ^=O2$:V::\
+M;-X;,QD[X;?P@%Q"C9N54GVF6KYV8NK8U#<EP^!X#<NJI.V#JI22F'S;3(3Z
+M.>+;@:^JF;;2-&@WD;Z8I9*SB5D+7 &/J8NI6GYGMDGK2(U+_)K!,I$6Q4R%
+MAIE9A<NX;^965G^IIA-2QKVO\TZZK("PEB\(Q=7%#</<JX7X3&6.GP41]*8L
+MY7R<6?M:U)NK >K#]!JAFCWWD:A8K.9O/I(;D(F2G*6A0YUCMIOQ5M*VD#1:
+MG9^)MMZ GIK7,^R0^M"/\%^_B9Y7TLQ/^N?S1 DEF 6XUJU"V_3_U\44H9.;
+M6C/PV(36QT(9B9^.C)*YUP?BN>#F%4ST/JM>\*Y;K)J:S<F0V:R=A)% E4*K
+M896!\7"QW^_2F;!_['8?NR?_P<DI\[R_&X04-D"*V^O$VZ_G'%W;FU01FEL*
+MSO#(?)&QE;>+4[O%?G[S[L"<B<&$DE6: Z&6J=*%J]0=\*/]\+$_F9!R$\4@
+M^=?2 (->^FPVC9/W+<BNPH65S)H$1>).O2<ZY.7_Q1107Z].<XH6I\DGXYA*
+M5E$VH8H7B>3U=;?;2EV+G5"5%KG(EED8SLB#Q["2.9YW6IB4DKT QL7P\,%#
+MAY^ (+Y+V8GD:B</')R,'%225'-E,!4W[\60BHNOAZ$,/R>'!S H%G*;=[-\
+M 0+QQ3;G\H21FY_P4-)38+ =K,/38[24B[6W\(N-L/(9[/_LY.X/OLZ%S;A>
+MO0TN'._"@/.)DDZ*AGY.V1XW%G7:O+R67U"C@:L%+T\24!11KH^]@[UR\Y\T
+M'G.5D/)=H)R"J6R470%+AO24DHF5L -2OV(60>3Z]/#0\HE4<(V%GXBM% 0-
+M3X-@G;H%E[2$DL$P-?W&"JI0-EV0AUP(\>] XIW!BI6DO7I9T33VE._FJ(*_
+MKQ6$@E,QFO?! P_#OYFAJ_:"JEF6?]O2PM3:)3"+BYBAK :/H:SLBX.NP<W#
+MPC,T%:]X55#.:9.- %JZ68*:HWJ&B>OA_3S>U9*&PG[SAU:$=KQR\M>?\!X3
+MZYZ?J;\8N0V1]JOBJ@3;9=L01YQ<:%>>U)-!GAL!T^"]VF8KB/^$EH.ENI:4
+M[(80V,)1T>^'[@;!KIZ5T4.RQW)2M,X;#;8LTO_GV8V[OD6F@JNK JO G$2Q
+MH(=0E:GW!3:0E_/T4ZF!M!D-F1F7NI*^QP;A%%V8M*U:R59]QE^+$NONY](%
+M28E"K!J#K5N5E8#B_O<UU\\.G_G]6Y'(MXM*P=86VM+2&SSPGY_74JN HY0K
+M\-7K*,[/6+]$+*_I?YR:D!9;$_O&TM^>U9L819J(CL]20ZBF"L4*4D#JV,*&
+MYJV<6(JKE<K[D8RGDN4PY162K>ZZ4+^NI?%8D<$.P^*4 Z#=7K><JJ?QDS[5
+MY@*/M()=CJ*L4NR5D-+)!="N< ")5YK:G;!7WV,:E?/@I?)*ABQ;B[J,>XM.
+MU3'S/BX/AP [V4*K!EY0C-/CE//ME"./3?_H5OQM$R!7NN&@21#()=Q)MEIG
+MU_Y)N7IZ .'V51 ]]L:;LEZ+DI"H^K R=CO:@D2&#^H,PQ!"EDZ>@'"*JK)I
+MM9<-XF7"=^(HC+:D156UME\ U?+P=G >A(^3=EW1ZB[7^C_1CZ&R#Y!"F:FH
+MHO_0SL+1D%1$55K!?)*MLC?(]!3G_A,(AXY&\M.G+@>5;>6Z]?^Z&KBV:9N<
+MBRWP0KI!\#7P]MOC;Y)<5(NN%8*2GEL9'\7/SMD 1Q6PCZ]6;0T*&KK)-^4N
+M-OV!3U6TE8(,B;9"K*0WH=?J*<_9J=-(NK)0LY:FO5R)P'*3V.;%;^Z6() 2
+MWEB>F*H-#0RERD0TG[]6I4)#T_26M/[GQ8V5MO]RIY&RN%W_S1G/L829DMR2
+M]('/K/92XJKUML7OR!,>P)J*"H>&-Q0-\]<V+\:+!:) UDM8MG+HQ?/31</O
+MPKV&>("+'L^-EO>=(036Y>P%.:V&"8V-7ZT1<Y"1Y3;]_Y8F#\=7CJ*JM*U 
+M=*"27=K8$<H/QY[AXHB>39&:(YNN@Z VJQCV=M VOMJ:E/XOE(L[GZ4;QT"H
+M$!AY7Y>2^:<R4?72$N>N K"-$'B0L[FEJN#[Q19:D[2;=9F*>)!$@X/4']#"
+M!1&2G)8;"$M&=?M B=+DQ^YQ"-!FB)9'T\^32NDK[68N]-J[6Y^IR:Z(A[..
+M6R<AS,3XATA#DIZ5EX;'N*RBEP71EOK&.EM)C']?0:)1K%F25ZNI^L0JYZXG
+MT<!>G95?0:6^K'2FAK[7\O>>+_9#G(I4O*2<FIOA*Q$2A%"2L::0B:]Q\O.?
+M]A %?("2*Y"0@+JPEAGRU84\?I&P41J]"G=IEH,MY[CUYMO9J?:B@M*0G97*
+MO/6S_192P8VR8:J(&-:^?IZ-Y$6V?A?)0UZ,E%:H/YT@L%'%'@W#Q,7V[)^$
+MA9V7G-+H0)TE*G/;[OI1DZZ6N+I62UQ1XY>=3,_<+@R)UM-9DW*NL+I?DJA^
+M:X8+&-[1=O9MX:R#BIVVVL*?&,-#U928LBR6DI:OR/OQV_;Z"H13GEZ <)J[
+M^8(-)]\+U9V24@V?@HK_A'3=YS&MN]3U&:<&)%JJPHZ6H4 --!,T\L,(ICBY
+M$XOXI)]-\^"U_CHZ!52.^"'OK$V=K;>;@,34R_HCW U3FB1#KKV/@Z#_S.'%
+M9M 26;U3E76LAFN3DZG5@QO8R.G+!?N(V9N<2;,*E9E2@K&$0L$X+707X.^\
+MT*.^GE""6H$?\19Z=D.11X"6D]CR\RWCD_%?L8J<EAF:O>F/FV$&X]!:4**[
+MIJ&85T .P5K[]>8?Q92+TN#S6X[[MHCH"</L\!K"BQ; 5I"/F'9#GO'0Q-8U
+M[@*)<*I%IU^[1LR 62'!U0G+R^.OMXJ,AK8?;R"@VL$R&?9R/=>/&KV'J%?'
+MDXN2D@L"PEG3X\S?#I9!&(61@+:/6K0YEXK-.ODV/_?'<;&3^)J!2E##A^,3
+M^E;>K7N=]K<"P^$PWC05A%.T7+ 72YJ2?GKS[_#*?9/+D5I=DGF1MKNMU-:;
+MTA'SN[>Q@KJ'7 >7QXCJY?#F JZBH%J*TH7WD[S#-.W&]"["KX^N/$.2E8- 
+M\'OI3>S9)=OP3U7$O"FNK.\J5(+0IC<F/^X'*U:4D5&@2,*CL(Q"S,X8* ,%
+MS\;CJZ^7$XNWB5:'Z+;!I/[F]_WUR+BB4$F: XF3TNF3X%Y ']Z0=:R(\3@5
+M,C+#RK_8$G]:&+I7::92S1?U"*^1LY&EE5N [*1761Y$[\8(T8:&NIJJNUB,
+M%8BA.NS"TJ*2FA3] @L'OGJ$ 13S9L66$R:FT)R]4D%-H%VW[>!.XWY;M$\.
+M=$Z/KD^-C/1_0?_L_+W"8^N=B7="A8V64I)?G0DOR_KWS/WPQFUSE4C6DDBH
+MPJ(PFL.YN.[W]D+^>+I&EEF\EPW'VQA<& I.AD"V5P+ .6_&1:%>-O&=E8%*
+M4Z0_F\3GXHI]D-*1FG<:^(&&FQ$__=_Z\-!-I[N#<Z:&OX"_C9/7\_+SD8V2
+MUQ:JNY;RG-CWWN_&-@Z<M[^,(H>]"^O-VP$ U1GN0\!K]*A/C9:4F99SFM+[
+M[/?CV\*/O(Z#ME:'OC&&?BVA3B31],CN[TF*EE6"FYY(_IXY];+QIY%OQ/?P
+MO'*3\1.ABJKLSL+ 7[&CG)>!3%[%>BSWMCX#>%VV+I"SC'*XM%O%*Q$\F$3R
+MFPZ16JEA@IM"\L/P^B,0TK:X6KG'%9"W[*C0N>76+Q%7H<_>PHYZHI3A)I%T
+M'CJE1J;\5+\;VP%IFYWG(<')6(D;XR:/K)56#*O 5YC#VK;WD_H'2JC>IQI2
+M#Q)4X? :TPVM[5T "L<4HRZ>IZZGK_N#H)Z#!2#PQ>W&P5H#TE6?DII]0?_U
+M&*Q64E:.A]I>Y.KMN_K%\W60 9M4G7>#89>?AQ=WP<6$M/BPF(@#DXY8H>HV
+M_98"]E%UHB\\ASAPD.K1\^:UE\.K'Z!]6YL*DABNQ='FFM8U\J>$N;^)5E:;
+M)HY7P\"EFN02YN[;E$Z.O[U&K 1"I3*7,,8P<KN?E-J)M&^3@J92D,$&^M+G
+M^&Q'R8:+F9D<3^M1PK@'F.'1]382>B6.?)NNE%"<+^?)R\BZB9Z6IC<;N)4W
+MEY_GY\JLE%.13J-^"6Q2BLC7\M ,DGJQ)(E!VJ2>JL$T&>X]XL(MD$C9 KM8
+M%Y>>1_Z3H)?PNK"UEQY;MXY:G%GHQVX4[8_K5(P&CO(<C6O:/VW]S?JKSM"/
+M.@R$"PR-C:F.@L3";/;Z/E&;4H27FH>G'D&LVCKQRXG#YNWUT]23B'FSNANK
+M@Z20C[BBQL4UU=+ND/(1D56Y OC->0^5A'RAD:0)&OZ$T.<N^^;'E9V@38ZA
+MVZMIH)M#"0C2K9!2L51W>+\%E=K2E)F21L'SG5?CVIO&C8Z+K@7F\3[O\+J%
+MK ,6OHYV"U3WZ=%^O_I*[+2LOFNZ'JB&3Z[%X$%9K\/(9II5A+\>CLV44)DG
+MY"7V/;KFB)A=4].7@ZASJ'":Q?OL=UEIJBM)BH:'DOQRDJGTL!*[0>HY??Y=
+MFH1(OYRWAUJ2T4S+"ZR@FZZRN4&HP\;T]IH2Q9F!DZV225N_C9);$_T!Y9J6
+MB?F&05X*DJ"#A3HS)L?'&@E>::Z<OORRU[_!P"WMFD<GT*  EIN%LI:_H<*\
+M__KZX^]:>$F&OD%;D[>K$/HNT2&C7!VF$ _$SYEG(;VM@7+&[?+^VI-.F;>X
+M4$N*I)"B-MC^$ ;YV2@#T;JXA(JZ$ N<M*FPG:<1]?/5VD"7H%^=M@L8LP+?
+M(_A<78.Y?'""OPG8P>3WQ-JL"%2M&J##F86WT/<K$LF?R8N0EI'2WXR>BL'P
+MY.VZ(+&==J "\H:'QX.LP/#E[>8/BUZF'QI-5Y"0G*"V[S?D9O%'18Y.OQY.
+MBN.WELSHV]K#\>(NUEP8;K>_4;:W^HE8]=?]M-" G)V?4[6AJYZ2EEO(SYH.
+MTTO,P0*3G@<SBY""JI2@$E#5F^7$\#7 V%&^F52PJEUJU_-$$;91B)8%?(O7
+M\^#^U^XJGYB:FX2=7*FL3:MA?,\=BMOR?)#PT'>V)GMG/YD6U,L<2Y XGUX)
+M5_*33$# Y3?& [B;I:JP:89:E>KG^_6:7=8*G*!8[&^$;(Z@1</8S$[A!,+0
+M2;94883'CNO,1!C:^_4TE?7:R89]>KQ02XQR>D^[0?W8I/O-HL#UDI)0DZAU
+MB0)0^(Z7S,)\T"?Z U#6N@25I]B*U0;.UH2"=%]>6:ZX\2'U/M(5U716I!UU
+MAU>VX _/V?RJT)V2DA"&F9I3<(VJ\_9U\.#3L9.F9)JHII.?H+_E_M'N.AC'
+MLJ26B+DMEGL&T.?A\O3"2VZZG P?TXM@[/:MS>W.P<\+W$D$U;_/>$NY>I>X
+M@7(U+^;^3T^$B;-_E[M7GA&.60E*V?<3XZ;8V;L]]0J6EIF<%& -J5L2]SOF
+M)..<4(JK6EB.FR?/*Y/<H)I=\(N<JYGWP?I2;B5XH9.9]IR\GVPV??+G@MI=
+MEJ.=$Y42&.V%RR5^?KW4 ^&?,$18J<:&E;]$P33A[]8CFY7YJ)R3NIR3#/*3
+MQ,?^U</KD(::E+@?4[!27YD<I<_4ZMVII8RNBUJ N:F,>*3^&/#W\G-)F'B?
+M_I^'2E1MGHKG[)A4BPP,6SO'#EU2L@8-FX'XNKJJMD?P]A#56)N3GJ:]0(]#
+MKQOCD)&4K4(9#][#/G_6O= #>+!255^7FJLR<%C8RX_1K[:$A7N@B;OC]X-8
+MD<#T'M<6O7NCD]Z'?G!;B/,JPSIMY8V7L!]:YYA>@(CT]#ETYC7;3**MC$LL
+MGITZ!Y[MV@],Q_+DGQ6>J,^3K(EMA+=-(OW7L//1@8:QI5G:JH(>;!2"QRXJ
+M+R[F!=L=DUCVD5J60+I_Q%R+1_*UQG;UV46@EY],D=";@:GC\)J8F)M;W8R;
+M*.+3[O8_Q?!5A-&;R((_DEJ? LG"R$Q\%E20$:^YD96)27[S\]/WG8,";9:<
+MB\;UOXW--C77[].KC!/_VJ;VMZ.4P+KM^M R]8]67@PGA[R'HA)=V0W=!13!
+MY%:R5&I>GJT_;)R Q5/7[);$"[J:>U7SEY&\5B95RW<.4*_2T\;"V(-3OI]Y
+M\@__\X:4/1J3QT3^-=.<W"*-N[=<&\V<P)*6B:*4ID??NLKIU<:N)$>J<AZ$
+MDE66KJ92U_*C63)0\X ,CXF;DY/?NY,S].04&].-E(B?LJO2OJ"HS./1[FX%
+MAH>L]O[I3=Q1GB=J]ISE]AB"MH2<GIJ%K::7NH#8 43E]_.77IC&0P9.QQ)-
+MN^R:]3^V]@/KDI^7FHR=F[)&D%O"Q\ /^?G*I0NO&Z^ T=^+6I( 7IC!'O4R
+MQ?:/GHB4>U.UFE?U7^,8K))8C=:WBEBA$ISUM_JO# !"7X>:K!ML#X,"_.J=
+MG!R4+TY!FAEF5YO2PO$U[*- [4:L7U8]CA>_O)CFP<7;TQ"2IKGZN5>GGPAS
+M.;5>5A ;3I:$O*=<CJ^(E '0^8O:]],#UI2HO;N?Y5N \!<,\//_[B8!"=*&
+M@PB.27RR>[#2@N0NZU'H$O7!BZB==5R7@K:4D->IP,'V\CHW@)Z40(>&U;>7
+M1P/+%KBF6Y]?D)!6\L'U->V;]1S=])[\45:#HI67Q<WPL*J3\'U^VPN9@9NZ
+MV//!F^^/O U 1(/<C7X.@(S1*F\7_@"HE\+7BZZT3:6.F,(W.O;V(5_$A+R/
+MG<F[Y@8KP<KDVLSC=(^;_!PM#.%+H9H=)/8__O8^6I"XK)&#EFZ:2FF,EJ+/
+M_H; R=_FUH:N<)O)]8> LF:<'<TJ.=6ZO >M@% 1!+V?BN4)3P"-F-18@GM^
+MB*CJ)3+6X,]04)Y;!?R;@V&PFM7.UT&$4!&III5*O9)WV=L2=^YN&LJ[%^V>
+M^8,L'!J(D2(FN_1!#SIX%YN/5E^Q;BS"YO_$/\M-5H2=KYR&T+"@GN#,(?G!
+M#\A+NYR\%)V%/7N.>R3Q[._&\]JK7Y"+2Y>*JA>IIZE)7I@*XWH6T32[6]6:
+MDE";E_',D)?HU"T:YM[A4""1K*)S\ED S^+T6 O:>(>5&_W',OEWT#[C78">
+M&9/2N;T(C;VI#ML)O9.24?.8_!ULCY#%%\3&^]DT8IN UZJHKOWRJB$S^58O
+MVTM:L8-\#__SHTK3:?&_L/#V[).5W*:>.9*3O%L"P*T-[H-"IR>MSFR?C*V,
+M7@BBPF?DU' *@?*UWU>:HT);D=H.\9>.2TT$P_?4:TX,\+NFJZ@";%6XXS;N
+M\O"]VI6&I%N&,+:S)2L3YC&CGJ]R")Y[PR@P[;/_R7I0<K645WN+L(V9H0,%
+M%I><TE#WN7)1J!_W 1/S8OKPXFO\L[]YQ[)6B^W9^\? $,N.C;G_@K^/ME#N
+M0M3F^^?[TL/;D"6#B#W'%%7(P.1,V.=9P*]7M+Y"DFR]N9^7\O.?/L7MY6JS
+MFYZ*6]JZ7K .^('$V<OM^^!'V!%3O(DII%#8"J& 6M4R-O[U],&0@D.-G+6^
+M@LGYV]Q8W+&_'G29OV<ATSI3[G>,$)*=0Y7SNZ"6D_%]Q="<F9>M%!&:FJS7
+MEMDR]?W +_V8I>";BHB]UK.,S/(QE??CBZ9@20F__):6I('^/,;W]=B/6Y^,
+M@IA>B[!3FPDMX<T#!["6I'A,#PRHKZB7J-CP5.;F+L^]_Y]QGYYK*YN5G[?8
+MW  E6,DNHN6*C'US6A^[&\)CIX/7,_[^/\7;7IQ!C(?9<X+37.$ 3[/3O9:+
+MGGOWT>WV\C 9CG6)O96G H-MEHO!3L#FE)82CY>(F8FACI^'F^\P\%K0YJ>(
+ML\Z3DHZWO$DPP>+ TPT@28J,F+R&64#!QNR0/]!8CU::O8^>O6>AH$+!S/[-
+MY]/4CY#_N8\NCTN@6[?1:OF6]?7%!U>?7UKPC5)"XY*;\,82 ^\%R\-)ZJR9
+M7UK0FZJFL%>MTR9W-<75I9A0@EOP6)^=4-4#Y@^CDZTT45I;R?XY9__P Y!2
+M7D2 ,)(7HJ8:T<,*_863^XETD)J;8I92Y_(E]B_3U(>2X)WV2]:"AIS''MS^
+M-/*(EZQ:@^W7PK6*(.)9Y/8PXI:"! Z?BZMI1I;91/[)R.7"MNN:D Q'<H'9
+MM/2=)R/\_\7N&6>^KU<\5$<:<8!WC4$,SLT-V_Z M$U=GJ"^3D?;FF.T@2?V
+M/K0[HE"0G'@_UI2;]]COX1F<%%&5CISZ>\3'Y-_Z-/.JEI.MH-,7JJ9VE_%=
+M<W'YHK/6FDF,MZ8CF<<Q\Y"6X\ JA&97UXJ^78M&&6J3_CK;.*:D6()'1:6[
+M#<#^)S_N]^:^]E>,@YVK@V2V6]?*7-+JUMJ/6I"5IY^5"W.R$^'S^486[]%*
+MKI$C6Z9.F*)@GKB'B  %&2#&U3&8K:U9&J81DY*05ADDPG'6X$8+D/:8<+Z)
+MN-DM1\'<6@O>?07UF%C),M,P]/X*^GR3AU99G .AEBG-[=NPF9+?A(Q=2]N$
+M3Y\"DKTZQN49B(YX&HF'3K:*FG,;O3KG\ZU6A/.I@RV&4(KP^C<\^\>E#*1%
+MZ!F/CKJYCIO#QX&,RV;0CZ)=J :>#8N")MLI<]7V+._BGI)]FQ>WD5H(:))7
+M8*(+U0L(Y^-8N0X9$+RF0*I?K,Y7S=0YU/Y$\3CVHKREH,*!P0,*T;BFHXV.
+M7;B-1='8T/OGR+F6O@Z65ZFWJ'^;052%R)&@<D6FM)^8J8YYR/#]-=#E%$<.
+M.#JH1MWV7LQK(\7T,/.[%O@;J[BVL+>$5_ 9[CIPQ1=7FHV9>NE*HH6="LC/
+M2-'6V$:D7!^]AX]O>HW]\3@9I^;U\Z:8G)M7LHJ*T'"@4L$-^E[3AL[ \8K=
+MN;>LF@^KLZF0>MCPEI/0N\=:=C>(EEU*5N4,HN"4G(H=I8D2C<CT$S:T._:>
+MMJ"?DX&;MP6R*N#-PW:<D%I?4%&YFZ)?B."1]-7&P_"1VBPJFE.?FA6_X-;U
+M?O)S1P9X6T/JGX^+;]EJU;?5]-KFCY"^G:^_AWB6 >/]WPO6PQ)%,%VJ:ZJ.
+MJ*"2@0+#]^_N]@^JAX:?0J:-O'&1SE>@COOE".;#]^9)FKGW"?9##K:3L'JL
+M].TPY]##+%);A/H'0EL'W(\0CY&TMU"G^KG"XG3:M";)+'G_E:!=@JNX7)F)
+M3T4QOG0#F*7WDZED%C="PC/[_?%4KH^64UAKV%*U0=G'[/04B:N2N,F+GIA&
+MB97"X^[TU_971:1]B:=6N)U&NMCPSXOY#\[9O:.=@$,.0:B25[L'/O;%TE+/
+M2:H9@YY7C2QT08^0S2VJQ\<*U4?B/]2=I5NEKPN2\+:+(O+'-^X^YWF@DYN/
+MHKR7)<O"M R=@$Z041.! 1'4GC7Z8JQ3\Y47MTI;.%.395SS$+& 0?ZD49A#
+MD$ :X3+5-[[/M("7L;B7FT9?@I3PP[DTU -"NI01G,='CK.$ SK8]B2ZQ6EU
+MC^BOCZ^#MEYW30^O_-'+R&]PO9I>KXL-1;176O#6D!?FKJN&QW^?C\J;DNQV
+MBZ'6$*'/'<HG4:*&?*&>ACJ<GG8^6>TYYK!F]%LOM)X9&@F;F0,'![/]D:.-
+M6@C^ N/$\2PMFL.8!!'UEA&8GN2FGL'#0<05D)X=FJ*[F(&6]PWST-7$\+2K
+MCJ2=>EE?E=*\Z?IMU#)+2IK* IQMAX!:O\JJ=<3\]M"+1I'JJYZ]"*2:G5C<
+MR*5C0/&/5I")E(RNJ_B5VLT^.6(ZED^'NX]3G_(MC'NZMIG,S_C5_2?9HM&>
+MG'BS>O!FBY.LEY<!/G7$%D93BA:"75>W6(OR_.$QA8H!T494B8K,]'35DI1&
+MN@@1A)^2_@VAI9E2XLL05! 4W9(U69*P7E+1\/3[E]+@FX6AL]>-#8*!O**Z
+M/:S$SS^ZQ!JKC87[B[@)X_R@QOP%N?>IO(*&A<\1LYLA#$S[(<=1CO8-K8,:
+M;(J0]XCG'_F@8L2:HKQ]V7J<9T*4:%9;04[J"^.+T<, @5^[HIX7N[N4N_!V
+MQ-[O$/_D<)R"D+VDR9Z7 -: AA"$B"R5G9A+!_#@_%;F3PJ<4XZ0E5>KL!(J
+M],+:DH_"0]^D=((*H)I?V.@U;<9ET8%0HI>H@Y1T YCU_F?P\@-)L)!6UDM.
+M#XLMI\ 3]]HP U[WA)Q/.$'/*%"!]]3!:I[U!@<2^@J$F V0ED19VOXSUN;V
+MXKBMJWZLEAN:6*P6F<+"R ,/Q^'W2(C2"4N:$+N"@[B0F_+;Y28:,L"\H)I?
+M]ET;B_7,YQVOL91TGE%:FU+K^>YOUE.?D_ %LY/^FTQ3FLW_J39\\EX4S**Z
+MF:(&]MGKP/?5Q=C*G*B76&C=IEL:HL(NFB?AJ51RJQKO5C!)O '7T_?@[\*B
+MCKR<0UQOBV"F \OL?)D/Y1:#Q/W.@]X.O9)7B4B0+MYR=<N13X6:D;#JMA2C
+MMY,9':'!HR4;\-A+EE$#+(6--A."FZ_)--76E^WC7EG9K;J"N@C(_\+47J&*
+M?7:0B@+HZ9$OY^;"A9!"D19#FZF LO_- L?&788)]7!1'Y>1DYL)P\??[<[2
+MRU*47U>'#*6@O&5B$?I\V+^3H%=:4K9:GX0!5CCZ\_X/:S9<@:^&5I-PM_O9
+MBERO2_; 1PY?A(,/AJMKG?DG,?]^U"?3XY)5$*S/BOF!IC.XR,C0(J+DR\"<
+MQ[(UDU>'AZGX(%:7YSYCYN;>SQ"0B]TV 8NHP0[ \_&6(ATF79>O 3#SKL9O
+MSYJ;M/$>]UG^L%Y;&?KS')ZQMJ^FM)):AD87"JOC+/H+,D>4$9J?DUW&4HHG
+MX#3:-\F-<KBK68]X4J+D&3Y&QA_R4*F%EI6/5DN"I%.71=Y\[07S9>J0>LSC
+ME\";IG1["//YML:23[M=KU5ZSN\6"&6VLR$,Z O'!\S9$"*V>YL C:J<DG0.
+MOU74^1 ^_LJ>=K^=5G>?]\E6\S!0\Y2?DEV" PDYEM?E]<JL-8N?<(++@R16
+MG_$<CM.]M+.<];F8^KBP?0$W]_?OFQ2;0N6:FA+6H/,Z#>CS]_#7391&JIG+
+M4E^5'<<4+3+N;O*.@ER>%(V^@I./NHG$Q,S5P/!'M]P=B_^!;SA63Q+K^3OE
+MO\\^EIT?2I:/&DFF#[C!#,"G^\_^Q39JNERS6Y:;@Y^QAE>9__B;_=IK49CS
+MK821OX*1 O;1F)&1O7*0F%# T^3"=L"C'8@)M8:S4M/&>YK:R0_!CIB;E7*@
+MJ;:ZD'L(U#EZ1L,1F2:@2UJ-6$WPC$CJ_3KURHN_AJNL1Y)&$HSRPM2ZUBS'
+M#I2(3L=:;XUF<E+,_:O3#/+<27.1BDZ.CKZYE@K-,.7^^C+0N70$_JJPAWQ6
+MH):ZR1K3A\O "P](NQJ=D[@6NP!Q@):6X_YMQ?[VSX6@5(R@D9Q?V5=1&*R0
+M6:RPW;Z]0=O\\^3%FUR(L+_']Q^#IE_W"U[3XY"( IV UU.MK8X;Q3_Q_>XC
+M.HNR(@->1T^:D(JBY_62- -#6C@!EIM/E:6*23IM?]>20:D&#>F,AI2[#$9^
+MZ,_@^,4#X ]V48P6EX\8H 9:Q_1#-/+N#P*-A8**1D">5BF&@0D"B<\##JW9
+M-=BN!+M65;CYDJ&.ET<^</V6]\^5@ I[FI#!G1#<\LF<F(&11ER7KX$:[+J6
+M9B>*$X.>LK.*'ZBB+2#*T(95U%2=#(&:@+*@>_,T.?;0(+!+%$&;K&J/CY#*
+MHM+QTI(/1_ [O9Q(A)):NL#$^1)GYL6,GK&,5H>/:Q!>6<W6[:K%I^9M=%!%
+MB72>SV/2725PU=[ U>MOEX]2N/^BCG(,M%:DSM'B^X);Q]:]F"RRDI>KL()C
+MIE<#,KVWF^XB_[*7KH+QKE?E:X-ACY:1]+ZW6+/9(L7G[+_S"K*FG,>\G'*6
+M<#G'W<>05).VA)^%KE."EACQ/N;UQ"?;O5^P"5@;OY!35='"=O746TJ5E+%3
+MA_;<FH0E\#<OQ_2BJ:7XJ8]%Q)*SDAFG0,'*AZ'(5)!0H(N^5U&0<KWA9''W
+MX.WOS4R;M9F<B4Z?@$^3U]Y)SPF'_J4]Z*Y.U5&FJ7*7J9?;\SXMUC_0(Q32
+M4X2068NRY^L*V!V3]I?_BMF^X,(T^L7VVUSX4="00INW8YH]I:/FT%P1M)D%
+MHX+WB%68TOOC,C#RUBE3PEN7D70ZI97(ZL3F]@&C59/:C*N3@';7X/ZX]M;L
+MPH*B'8Q#F,U2H]Y3X,76S?< G(*EC+V6_$4O@%V8X/_A$^?>(*JJ7M#Z!X<>
+M08"Z5X#X#%\3RMCQ8 L.3)+[QEOV5+F:4X5QQ.:P4@F47 I_1:"HF]$&R6.L
+ME%.=H%%>F<DW]3# )LJ:7=Z;4['Z>(" 6>WO#^1'T'((FMD6&\.WL_3B..1&
+MQU:MGF&KFDM\3[*GR3+G\!K!8)9F*9F3?9J;O_&S[.6UQ -?5X> C-N>HJV.
+M6/' I0"3T>9<I9Y$7YRNZ[17GMGH)N[N;]"]EI2S*$Y ^E! IOL@_O[#YPK^
+M\>6:O[58O*>HJEN5I)[!OD:2=N G'!!>=(*9KXW5Z0,0CM!SE4^9OI,*]\,Z
+M=&?/AG&4G?69 %>QM_O7'JO;K?R^O:;97JFL'?L-T.$_^B+P2:>&.1/95X>B
+MH%GT./;B<KN2J'-:@XKV=[Y%4N'D'A3;E)">Z9?;OV-D<)]E#M3YRU$YBY61
+M[$^.F)BAI(MQU/4WY_32HH^<U8'UNM:F982#%P^KAPW-PR4PJI.$I5B&4IB 
+M286MQ20S_^YV$]Q0WA"EMY;?3,S%,"SR?@5&$+BJS13%VY6Z"O!)RYM.<?Z.
+MD):= 0++6(R0@X3TMTX8D):^F<1E^I3#P)J5HD#2CUQR&HW!PO/6=@>[VJ/;
+MJ:-R_Z4  1;EVI#V&6.S_92M2&V;I'9*R-S!T,;VTYU>K,1)EI];N$>3))'5
+M$!3[\+TLFW*6I:B<0:.20N?B3@\K!F6OT^L/J8B#MX]<U*3>+>,2/./%T.ZN
+M6*1Q'I&^FL?<]M"?H)1WMH&:OUG^_)?F]<"=@#9>II%+^JRFOL46PY;^O<&-
+M3I>;O6I:&_<3[=+FPQ"#A$KXEDN;E_&*&SIU^C7/$[:&>YPG<A6?3/%S]-?\
+MQ<5)5@3(ZQ04B+;4B1=*#:J+I3/BIHV4F7^]*X"/UMG",7_V)D.'+?2@K'"#
+M'A)IGYO![!Q!S-WOP)B&WBR:VI>)GH.EQEO,Y,$?POKPG-9QO(Z)UXNHPMKC
+MK***N194FK<"Z#/ZW^;;K8N7K/>7<XNVC:M)%RCPA()0A(#R^KM(>XKM^^?F
+MWB$269JXK1.14E;Q <#^9I+2:U*,AE^;FY)7@L?:PM,>^FS2O_"8A)^^/KF0
+M4AE#1<_(]=5T3(Y_KY2<AHL3V_;2OF52MG;#F96Y"HR;BYRR8/J8XL[;],?,
+MWJ<;ZYY=6Q8/B)IRK92RX3CW-NX7V9^&%)47B(.+#2TOXE"<DY2:1ZI9Q6K_
+M-<0490^3PYZ:$(K7IK>O60O(M%^9M-D2)U*!-/;RT)+C-?(;L9%2L-*;AS^4
+M=8?:P_E[YA6;=+3_$BC=C8#J31.19G#028S_OXY"N%RHI)0+0<!&^0_;\D^2
+M+DV#7$E"H)J#)20WT/HFR(T^G+F"5(^Z4:&7C0D6F_:.#NS#Y,B<$1^"4X=\
+M6*REC2+7E^ V-9L$V(N,FIR[J-#)RI1:E*!4NE"KDMDKW,;T[AG_IEN=5IC 
+MEVV6/\*/V]:L\ G=4I-:#4!'C_"K_17PVTB2HJSPN>MZ7XMAS=_\^L;%;Q)(
+M>IRG5Y>5O@3CDS[F/I""D%6*CMR52JSUEMD<1OT5V1Q&O[F4:7Z6BZ#RDM/B
+M\3;RU\"2GBB3K%YOMYJLGI_-5@OO^<T,]['8V+Z?TK2]6IAD E<8PB=&UC0C
+MG(AR%)R@FIMM#NM4-]"1D9J\SIK!Q.S@MN[%7)RCD57YF%F0G?$I)Z,9A; 2
+MC[6A"?^QAIWK--669]/<6[N,C?A?7Y>0C$4D-7!@T8CUEI.#DT_>BKQ,\.S2
+MNCO6B;JMA>]R:X*J6DT(S\O3]L\1S[11J!:+X8-@1/W3\O/0+OK7 QZ>H9*$
+MSJFGH*>=#5?HP<H#[>$:CY_]@JA,C992@Y>MV_#PY_ EVU06<+E?E8)3!WVE
+M *W3H-"F2KI;9]'Y<M;F6ZVV6EF$ 5)ZIE*9).OGXE9SMIF404^[LY[WR>OU
+MQOH*UJM.1D.)C01P2.B-_M?FY<,^AFA0JZL&MJ<4<<34T#?6(QE2VFCOAFZ 
+ML(W]+?H,[UR@Y)>$C8J_FXNGP9I(TQ;WT[ L#Y&8G-JJI(B>T^!6^-'"49\K
+MS(KE18J5D2$#CH,(LF!=PU'>U,+:]<-4$YN\D@$"EPS*T[65B8N4AAFJ&1?K
+M[)?RP@MY]I:MCZ% DJ&,DJ?)SM*%G(.;F@*^5L)?U^5[T2?&SU1*G^V;@X>]
+MU9;%P7)C>CHE2)9!NP&'6YO3*O$S_6XU^O+"A'Y 0JI;:4765Q',R0\' U6'
+MEH6437W%1J"6K0=I[7OW]L-*CH2*WE(+F?&H5E*:[M *^(?1Q0B+5)Z@G!:[
+MNH)@7%^A4!6^)B+G** +E-")N9K+!M+DK_K+W7!0@H_G]C3P\K(%_Y&>L?+%
+M4[T-NH+EZ440G)12*QH9FIJ5CK<5\O?W\\#)CY:A^U.-J%"EC,#Z-MSR6(>6
+MI:U6RUJ2 X_ UM$F-/?SAQZ,+>^<K;B&6JD'2LCEWUN4YUI<3&[7BT=L-(#7
+M$YD6T!JA3];9F-N7OUPYQJ #18+8\<K]Q!M\[5V1DWN2AIQT)KI+B+!D_J/V
+M WS\H"BTE[;SHH_/M(6SGORDB9I1B20^T#Z: XP)H?V65Y:"J)";PQW9V"Z1
+MHIR465"3AI:71\?5<G?5$), 8%C629*5IT3A%GS:=]N3EZKZEHF_DY*D6.AM
+M^^0ZI[_&=("'GF#OQ-H*H/SM^M-FBKZ.7"R6WHUM;/I;43OY]O[[QU%]AU.1
+MD,E6B>S6@R#J&$;)APO!9DNOKW"?CJNJ6[JEW>CY^77P, "X49I;IZ"3BL#%
+M)O11HDN$Q*5:K\+2K?#&QMM<5(.8LB&V2X9PJ2G_ZU&?H(&>GY._@J)/F8+ 
+M[3HW\N"ZC\&8\8]=OX.^(>'%<BVGC?9AF/R>GJ:A0!DC\^8WU\-71CC825X!
+M*J8 D,3J>,7NSMQ)C\Z,'+X50)0WB<GJT<#VWO*;5K2A@I"8J()FCI+9Q]X!
+M!A3U\1!)G9RCFI"2G%/ ]YO"P^;F>N^+G*(DJ5VW@H/!V2.<G#2FG=*)&H,)
+M,O[[Y<7"A'WV7:>)<JNX1I_-5O,3WDF21?8R\@JB1H,#>CG 8"L0#T^P,:N+
+MAZ17B<"KM=8N*(G7H/NN37^"7Z#8\<,Z,'K*@XY=X(M22T>26K:CP-7?WI,8
+MBS>L'&FH;4\FLM-,WC?$/!?S!UAVDK86KU>#D*:QR<HNQ*O"0_+@GI*^_P/3
+MZ)R>,=J]+,)4PI(6"ZZ1\YFZ2(NHJ<FFB%&9A_UV])I"V.KV]99RQYIUHH>'
+MF).=8Y>:R.+:P8^;D;ZPD5)W!8RXT/;Q)O;U0Z<G@%<2BU@6F(0 JO:PYL=8
+MCZ2[O[B^LY:F\_ 1^N84V8D:K$RIJ+]?A##3<4'!"2,)4\M5B$_IFHT31-NZ
+MV5HE\C_5\\V%F:">E<B<7FQ5OPC(*(3L_M?GT$V.4)4Z%8JL/N&:NN#"Y?60
+MTG%:H:+[E)N0LO*%!<!0H%2$EI"#LZ#F1-#&]J.8=G*)O9&!F.R&@TGOT<BO
+M\ 1[7Y$V%KNGN\4P]O64 (6*FG!_BD=6FIC/T7XDQ![EJU![MUG+KG6 @''V
+MU_O[Q 5NEKF_[K:$FN#6E_+OS_L6PO"6IX:5[ZQM:J.>>.%S]]!NI^Z&]DRQ
+M=IJZBH&B#(W)@@7+QJY;ZT.[MZE;"*)=7Z+CUDNM(N?^P-3BA" 6NQITMBT*
+MBO"+_B*0'8R'G'O@]O3N>OKS3$G2^0^(NE<#GGK#S\M02D/Q_W:4RGNBMXG!
+M,C#V[%#EPY1F0UKKGJ;?3B7W]?0UD6-WIJN;AQ[%F*7A]#Z:\._5BY><3*O[
+MG3NMEDL- <;HR\?PEH!<5,3RGK^UH(M1<L3PYO);1S@=6/IR4X^9H*8:T:_)
+MYLI__!=42*X1 ]X/B*@;B!0Z[3K3/\3UT)3<D-WR4PO]X\2KV$6(A)% 45N8
+MF5XSQK V"I 3H ;6I):ZE,!=P:\"R;>3\M"4&KJ8@I[[\6/!\^0GF%O[MH.2
+MB+WPLL#W]_4P-!L:D$Q=NX=6!KM!T=XY.G#OVIF:K(V#!ZD9N%K#PQWDR-[%
+MY ^F#$SLM[MJN%ZHP4/TYA8P6LB_EK*"?E*:"^@PEV36  <JW<>G4*_[GW-8
+MCY."H[G4^<CH-3OUDLBZ K*51*"6N\=7V+'WH8.-E)6*^<3T,_?2.\ZOD[H[
+MD,,66T!?GLG]3UFL?'(\G8E64WJGMR,HX7^01TN2CZ0:K *8UAN463(3T&W/
+M1Q0I_MI GEZ:A<'J6;:B=!4#D%2AC99-F6 :6UC(6\7E#WAI=8R\UU>$BKB,
+M5P#4V=/E[E.#>'M56@"Y5X*J<YE-WH#&S,K0=?2ZGBRSKM^/$_>@7(/PTF<6
+M[N6FC NQN/>0^9[$PJ75WJ6>65J=BA$A:[E3T/W%6EB G9>5JECAC%?!_0])
+M\* ZA9:AFD*!GYO8\O;V<]K0FI:4B*NY5I1'C%#V=3:V Y*[DML*N)>4DVH(
+M].W&-,;PCU8)[9J%Z[BAUBW*S.L%3R+8EW:=C$M5A)"I^I[ NN$0XOK'S;^+
+MH:HFYJNQPEK#$L9)Q*OL!P\VAK);4*Z@K_;1H8X?<,/3.C_@(X1V?H>ZD+J3
+ME<GRP9V8MET2 QQ#\R(^TC3V4UV05@U:HUN3;-K1S03'X_:BM(4\<HS[M$!7
+M4_?NV_2;W8>2IA^,:IRG\JP'GK;:Y!"#7FQ LY/=EEZ64O(]W^62SX^V>&W/
+M6XV I%^IX,:)R4]#FF,?J8Q##<VKADZ3X?3VMC86BUOVVYF.WD^#A^FGDN47
+M^ K0R I:YEN<O;,:E@N<=F'46\%B\_#Z),.:\-KU3XC:G0U,T;CZEI.9L@5+
+MBU/R.:?V\EE1B%.15?V<FSF;]O/7Q5"$").NEE>:4T1.FJW"+);'V]R*D$:K
+MNJ:6\)<(D_GWQ'XBIIKBB1:=.O(0JJC$)-_V9D^GED3EC(9?3<"0O]G_J,D5
+M6]8I1@^-AYB.B[F0?<C[]3[$]@"[?XE2N*;BEGIMF@,-?>77^"$HT<:+_=&'
+M?@Y+G['&GXD*F<'W]<8*O)""B1X'DIO"_]J9S-02F[>BFA#C\O,_[N;)7[R2
+M'02(GHJFE[K(P_#=J$B;JZ8E>_M,%_T16_#"<AG4B59"F*YG7X60A/5JUW3$
+M#YU'IJ_YF5^"4T;8PD,0--?1@Z>?O(FL1(FT<%+)S=;+(=B63WN.CXF:F;F0
+M5HL2N^3F)?S(DP>$IK>WDI8@99^;Q>QYT\'_C<\":7^9PRF6NX)0A* )\<#W
+M1</DSUJ*@967H)9"\0[8F9R(2X]6"):76?G5_A8OP:Y049S0=YZM0%6Z\?Z 
+MMH?2A+M2BJO=8Y^+4M Y=]736;J.NXC[O01]E90#T?,L]LL?#ZF]0DL>G'. 
+M03CN]L8W\X=>7#VO5:UOS .:S-P.S>O'X@J&1-1&CI2;,/#ZS/8M[AW^!Z],
+M%5,;\JZV7B , QD(J,>*K<G)&AN>#?><\)*;DI 4NO?B>>#WV]5-ED914*'Z
+M"\SNP_91D]&-IEU:D\/6N-65_L\=O88?4]2:7;"0EW$'04F9D,I$IYTJ6_AV
+M@PW &4?ORV2-6BR:DJJ*IM*IX=0LWI)/ Y*DDHI8BEN53?$Q_Q8N5\6LFE&Z
+MAUH%4T9-S2' ZP#2AM"?SYV<J8:-F8!7E]D@]>?BPMEGN%T3S%JO%I>IMHO:
+MPX'$V'S)\]P;FK2%EZ9-ED.@6EOB]C]^W_Y!=8F*CO67OG/A(],5K]A*5))3
+M7X.)*B#N0!*+,!S;G*1QEY*CW#U)_X+<&-"6/(ZE_X%[EIW2T?ST=\/+A_PU
+MU_N(OH^E;,&X93+0(PN4H9U!FWQVD4QEXY;5YO*!E[I0"9S^H2C!I9+2S(TI
+MZ_'+KH2LOX:/O*J4$%/Q,><:WC7' SA0BKHW[KN"#):=T5[!XNH-S:[8D5Z%
+M0YN60IBBK8^;I?;DQ=3OHZV6&'B:HJN=$_ZC&;&:4?R7^).1PI(L_>;$*5BQ
+MF_"%\5J7::6^@7SQPIQ1HIZ.B/);\HZ9#/#@^A^GUKB'PI] CXN?ATX(PM5&
+M-_.Y3A 76X?XU9>7T,'E+9HD"I]4#X'IEXWMQ89]PLP!Q5U%V[NPF!6-/D[-
+MJ >8S9(Y,#J[Y6&(3-> GDN;FJP/N>+B"-[1W*<FY@J>7;=(AKLJOI9WJ/7_
+M[3?N%\^>E*>KFDB#D2W4RN"5D'Z,FM"9T,%^P<7$/E,?EEY>FA&(NN&V6Q3#
+MP-NX<J/]5;>64[FD0H/D^=?PS]!"AFJ/J-M2EE.X4.)LM!7#6Z:ZCZF0K%;7
+M:M+"+5/U]]57''F5BQ>=2[I^KRB**P_CQ]SNM%H-F1:EH(@WJT+P)NX6[/61
+M?:T1 "*"BX)IA*O P_H!Z^A= ]1(F@L@VD:K@@2!AIK'PD7[U]/CM=PCE=*7
+M I<9QO,<N8!0CQ*=J8+%WD4WTMX!?91>54R@DBCB1Y'E^4]D'?  WJ>9=IJF
+MM9TKE^/N-_*;HI.@4H&/N)9)E$/S^,9V!]E08%&SBKW.G^_%T,5_\L/V@U1Z
+M:FU&:VF@I+_3^-:OWO/9GU>6KHJ=CQJV_XE2\?F:U\8GXYK.OZARJH)0K Z>
+MZ1@M]/Q_S.,3RYZ?MT*ZJ)J2IG")\Y \]O8T 4>\0I66D*B!P4TCT9GX4I".
+M49H)V.+T_Y VP)2QDX^6<9Y0DHR=V>?/^:PCE%L0\:GY1!^# L#35A?BLDJ,
+M-E/9NI)4'[R-ZM,7N]6? NC_6ZM.)J"_\.@1-_!NYHU/F=6;6%6[(Y>3R_[)
+M+0L32@R&6KA#7 5*I%I!*/B3N]KMTXN.6P";CD&:0&RRN^S\V,;("A^CX:N-
+MGH&*6H;^D('^7UDQ^4;%Q-NZ2%^6AE*?^L+_#[8&B9:[$'<<C]/4UK7R%A%]
+MH#!4O9BHEZ9/KZF#R-*.F)!\D("2K6:@FLMH.6_$ST:3@&);G%L:!A"=P>*N
+M_I &V5;(&=.9LI>3KZ4?\304]B>*ICWNOL:N@Y*GK5B,#H3! +0Y39Q.29H;
+MBZ&7U^<Q[O[VPL^2FE"72I#- E!LL)/"_>[U'"W>!M#+J#V74Z(;&%.@5OT!
+M]"5N1B;BG*!QL3)S@8G#6L,:1Z&+C573EINHXFSWP-> K)*7D:9=2XM@!JC3
+M%P+ESI3T!O9\BIBF6@/-_NUN\"71BPY$]IZ-TA11J!":_)8UVU*^)I>2DP^/
+MH(^-*;SL[; #2869B$6'G;ESFHKPU FM!L/EA7>_P#F:P8^X%?DAXFSZQ>_U
+MJ0Z(EKBZ@4NAH%>3".SIALF):P-"H[ROMUIR ZX?DG>"C>K6Q_ILP-_\N@Z%
+MI8*ZS=G1UEP1LG:U\*F*S?G&YM(OVKI=MJM[MXG[>)>"T<\@M'Q6DY^46?#Q
+M((*HP78W=C?/X$K=Z8/\CH7<%:C%(#/']L6Y<I"]5Z>>^Y\4&>KT]M26)\S6
+MCXP_+>^M+*:? ^K/$,%8\,*T18^+?HNK@IVZV6@5)\?@((</G)'SAKB[B_F2
+M$*,<*";F"\+BD:NZ!8O^7[FJMB9:ET+SP)_P\ 7ZMI:=AEV[K5*>QQ"0($FO
+M5H-9D\W^->;U^]5<=O.=1HJ*F*@, _#,UU&_MI&;<'%7F+A>J]4R?; _HMP/
+MI&)"D[J&P%75PN+_[]+6D[7SDU:M59*:O\?$/T;Z)B:.FE2,EXALDRQ4N]C 
+MUH55#V OCE@4AIP/2*/;_V$0U/Y YL5*F];95Y"]G+.REILBABFBZ?G-PYV(
+MK+V F):;7K>@7@O!8D:R[M)GO)*TG(^8BJU!!-O@4/9R_I90UD,G,_,_]^Y&
+MD<@+E7+0@=V$A:_K+2\;D=Q4F170BA>[L%GPZGG;[@*6OP>,2*A*A+7>B 'Q
+M^,?0 \]6H"J1BIH<0X[T^C:U[/7#1:1VR>/_G;O$G?_(B$]:Z\76B9Q*G$>&
+MNY"[IH-U<'FTPD3.ZT>LH-&PQ[I3K(VWP>KZ"L>M_//3D7+57YY>F)HVIE6K
+M0O#4]C3EX71TI%$&H[(MD-;;V+FXWE^PT5(ID/INVC)6H*V(?[M6FIF2N!XK
+MQ<W3<X6B(YT&QPI7)I96P33]\'?PT8V%B'>8DI:-B:RI,\;%E_*''8!=5NN2
+M&O\!Q\ W/L>OSHO]D.V-3KZG,/ S"0[>H\OE$%Z?AYR'K$R#,[!XD>G5-#IF
+MSQ":A0B,=>J6,[JCF0-*_/4H M_RP9%'C<.,I$:P0OA0BP*D]?XZ.Z:7\!*?
+M4@F;JT+OPOR0D+"YMY&L>M?_[,>L=J*P")Z?=H&IDZ8U^^/%X4C\5J*HMG>H
+M6*V,347V7)?_YU"=5G*9M@E_EY"\X4'Y.F[78H>0^HAM&J>#+<N7]3_L--M"
+M]XQL.8B>S7!^",7D"\#!VQI)S@^EEUH4FX6'MP$4$SH>E\*[EI674G*XDY8L
+M%YT(Q='2QBGJ#U&Z])]>L\:JG+ZLAIOS-CD^-# #F$&P'J" JYN'+0&P.G(*
+MFUI94ZCQU/GPX"^#]YA?G/J<DKJL6X-%U^$ Q#R86QRE68B 5EK90BTP+"+X
+MVH)L%KJ^AEKW+^#F-O#]I2O'P+JZ6UZ>")PM?G/:]^?9IHY*5^FNE5.&C[K!
+MP'U2RR+8XQ:4Z)RR%-BDD%$H\O;%Y?8 JS*=TKF5Y[H>H$8 \0X$2OC+ .76
+MDJZONUKZ2]Q:;81XB>+%0/OR<:Z4AE$2U]J]\*W1BH9)B?T:6)>"Y_OU]?H^
+MUY>A@IU?DI)8ECV[S>L'29&PD)U:HP.;:/:= 7YS?C3OUKM/L%U2'0Y6(0K8
+MP!'D]^>;H&R:ELM?A(- 09^L\C 0VT,0C(KM7^2Y089+]/KNR.=:V$V41DJK
+M3;ZYJI29\RO1]K*T0J^>'4#7GXV2DX"&F6<'[,7JK<G#.$,?U)J;UF\,<B.%
+M_^#P'6YO]"^4=;&+]<*Z6JW<X</TR8;Q$)FW^_#R).WBW@.L>[);=EUV=V&D
+MD^C' +)<"%^9#KU#N)*$2-$^9/8^)I!"C$!^F@Z<E%^.H3.Y-^[S2P!!@ZI&
+MEXV*B-CZ/37?Y*67-XY47:Z+0)*T<]C*7<%WV32_4(QLQIJ]F4/[MZ7B&6#R
+M58.&EGD1%A!'F( X7:KW!@Y7^$DFVL"0J(71DYJ#@IX1]=T8Z/S\\!#EA8F2
+M4=+7K/?HSQ;UCDN:!7YTF9O!W]3N.N8EG)&3NP_7BINRFD-G"1KPG(@&%Y!Q
+MJIU$)J\#XM/VEM'V#4^D>Y&-1?00JBWZ-7?GP.V0I%:0AJWP\HG ]#;Z]!):
+MGK2'[:_8;-]L]X+8W.'JI\$)AI_>X%Z>K:JYL(,*]^W$V_7PS9*57ZI64)R^
+M,_6N]0+ITOZ'XL$QG8@>M7GTBU9&B*6S8*K&QM#GY7J+H)6F4I/SS,M2X?V(
+M.H6UTT#S"1[4QCI]PP0R6_R>5UZXY9Q*]R+2U86BNE6,D8G#>*3]X\+Q_^X%
+M$D+R(%/QQKA3GTP PC7V']*)5[.^FH*L3Z&< >+VT/;%B,>-G)Q/CHF-D(V_
+MP/S$S5S VZ_:F$B'TA[J[!?_$_?]PNXTSXJ,51]^!A-RE'(0<.W-Q!;.R\/"
+MU$;:!:&7HHU>D\&:NP#S[S8R/>:X@Y^\E%BZGLD-HQ)0E).TP%R6"N?P-9WV
+M\@%=D9J-=I*KEY;<7TC/ZH6%G!.,L)":FS > O?R)?;GVLIH]:.#FBV*\+%-
+MK3+%DL8!0(>@&];FTX)2E@V6Q-;VE@.6FK:<C_B[AL1>$H'(54W'&MB7D%0:
+MZ9R!.L"F"QD2T]?0]"6O"(4UJ@^/0Z1%E9=Q&"A.TLI"6\!+7<6CFG^(D]ZY
+MCM+!,>SNOA037(JD?50#O%DMPUNT#(*:$9_53KU%D&;BE:W/79F)K9V$@KBQ
+MI)C([VO*=8F6E)H)7JB@A:M(^=DUK\/\3\3$F+N*GX!S'Z7VE1KSVYJ7I B"
+M T2$,Z !WD&O]):BB7*$GIZZ#+K&FO?11>WJW=$9BJ7]BD,]ELJYCI*B\Z'Z
+ME^7 IU(<D8Q?B8I^P;?#Y0I,7R@,W4>P0T>K!8ASI_SV8G0;I_+9)BP2!YCP
+MD9":$0.(PRK#"9I4@!^.F8+3#70Y,#SZ2KIP6OBU]XB#:;>#!\U%/"^B I2B
+M7+*]0):3V?+')G;%&HN%D+U:B(>:DT_9DO4[_ .&FGJ"FI/ZII68U\*L[B[O
+MX8=%G[Y4OXNM1C>9)\P$S4OKG!>.E$0\OX22EK*0T.J<G^7P(:JUE1.J!YT<
+M6L6-FO-]_<5.PNQ#UIB'E)*JVHOSI$A.>PD3]?+V+G&X0_>=7IERJ,'?S^"5
+MB!X=A)<H@_2[U?XV=<5>D%)4M!-3K:.V6Q$)BN <U*";CX*LGW"$5R#_Q?X0
+M)=R"L'#;]@URH(N,6_##$O_;6X7LMUN8O:75BL51^97 %]J*AOIMXI*="H(.
+M6/'FV7L+$YF?5(V  UZ\C4NT4N3H[?^2UO'CG;\RG#8&BK&0=?M'RE 5Y@G]
+M"T@3?ZVC6_N>@_9SFB[1D/%P,F_:G8J;KYYWJYO1+L_6AZ&V!9."O$-SZ_7&
+ML#)"A+&BKYW7?JB3GX]PW=#B7IQ2O( WUYE(LI+AZ\;^==D(JI;AUP(GEGI?
+MJ-GT-3>2YTM0^)-[NUPR]I7LZF-F.D:G@Q8NK(*8J\^DO9+,U:L?)O+6NU^6
+MC(<854> #'K!WB[Z-"[BO9B>@SN$DUJFLD2J]_P*)T;2R?;)TH>8@(&0@WI*
+M29* S93'5?_T6ZW<5(W?\JN7$8;NX8BV/JE679IXS3)4_<#VCK^D4GR/B8*=
+MI9""Y,.EU%^ ]JV. JJJJEY102O?$,7IUCF.N+.^BIB2_[Z'_K;'YHJ=O_A6
+MN9*6=]"\R/'Y;AO$TS\4>DQ9C8U&L#JK@LK\R43S$\] %F@7NKR=0X:SQ\(P
+MD#?%K[J<>(%:IXM>"Z&6JZ<JR_/)S\D;X*M?FW7ZA@*3H93T*0#AG/#B;AJ\
+MH'*0\@$" ]G&SQ!<BXF5\IT\C<#[^)37Q=#_@(FLIG2\>H #J^#NT]2_B)8%
+M==SZ@L9?NO>[U>;6Q=2 EZ&ZNH:'GE%, NHU\)X(Y]*2-PF*]EJ11>7R=3?5
+M\,-OE[V=EJYAB6"DN2S*CL%&U1Q?IX?!C*P-2Z&5_\%ZM-;EYD$9N/R1C%R3
+MJYF3IK;8POS1!@J+S_9C?+V;@9N2J'.20YT@YL;V?O8BF+96&9I=&G\55PMF
+MA(B3D)>8J[,-]#UT']?.NJ**1[:*LOZT1X,!6<#6C)!>1*0=RD%@FO_:^^;G
+M]<+VS="MLO*OCOH I:/R,1?N0XJRI$E+GIZ5FX##/GGVX-#'3X:$/(FLSH>Y
+MDC_+ 8Z3SLNV382'BKM,2;MSCE^-<I,4.A )059]F_)R4YJ&8E:W\P_(INS2
+M"M,22Y6,NOR5[=R2+:2"PO'Y9'?DPHV5FXV:H1^([-;&\%"CBZV6,KH9T-23
+M=OK:\TV%^,7VE*I0D?:8\4DC5GR\LH]R5X.*HK.;FO&Y-9/1-H..P!C)B-V@
+MB9?2TNWZE"=#1^9+?)*J%:=:B3[7YC:5P[R-KFF6UI\K@_71P<1/RR&;P(E?
+MGDV=KD&(NK"#"1/'Q_?2Z-\-QY[^%@E:EZ*F@]C6",M.><>'BF^?CU>"T#B;
+MDL&DD,JS].[2YB&T4G);AAR#J4WCBT6828H%D$JH?W&6],?W]@N>B9.1-X""
+MD+0V4LD#KL#^$ JLH_T;F6RV0N*:]71FKO!GGJ K7$*3IA6DQ]Y6DM?50J:6
+M>]ZM6EZ:G<V;L^_T\,]'3EQ7GI>&N4)T=^$ %JKA 10+7ER/YJR\AKFB5P'"
+M]II0K *3WDVSK)2IC(.AAIW9Z'HA@X7^P)F3GJM;J ^;_%*DGJT!$'&6^C6%
+ME'04J=ZS_ZC@S/"3VHO[KYN(^9[2U/74NM!'^*/2A-I7@EZ"IGOA^0[=WZ8Q
+MK=ZQ0EVAI9_A(KG /J"<H/6 42J[3(^0JG#P[OK&2ZN$(8J034I'HZ_'U!/B
+M]<8 KJ1TA .?H(-Q]Y*-%-3HU2%!JY>?GIVMOIB S@-8XC,VFN8*KYH$B[F$
+M@MATJ:>HV-7KURX2_J+42\AY\MNPGKN*N).W3<;!;_/WPHFQFGW4L7Z7PJM;
+M<?F"MG&0E));TQYD\#?OTSR@D:^EG+I+88;[#-WBR$644D^0>3Q+8[!;!S[S
+M[?8%-HB/D%J#CY00N(6@X!$W]>]+592I5HB'GZ-8$_XU%CI_P,T>?YB7L@EH
+MJ W6R0_NVO3U&<*6A[_75>V+HI>;\_[U\#9&X(B^G:""=M#>TJ $6(T-RXJJ
+MR\%!F*O^F5&[OD&8<K!;CP#4,<?WX&/*@+>0LIV8E]3#Y].1D$&M5:?^LT?J
+M)SK%L]JNAE^0LA=[NTV&DL<,RM:\T%.-4%RSJ7A'JJC!M?3'RQ.+5J!7";BK
+MOI,\P7+U]/?+B\:@@)Q''J23C.6S]2_N]N4>M;S,3YR$@SBRB,'5Q(3U ,&)
+MEE^!EYY+4,9^@(CT]V;U]@.M7HUSB)^*LE'!IIW0PO@<S-K<SPF=3CR7MYOK
+MJI.1HE',^CGV-97S?9R@KI9;B8K5!/+"!)CWA+!QG%NAJG7T]M3!7KV2A);'
+M68MJMI=#SNEQBI&F'J8'GE<FFI<'DC32ND4QH-V1JQBJCAZ2G]+ $2 3\8O3
+MAH^#B]Z 4V1#PO<6[I?6E3:8O*OV/YVAED"@V('1 ^?(KO).GD423*K$LE=1
+M]D=_Q^YSAY:1678?HI+^IE9;R,_NH>G RP_(D72$I:N7F1FQH8Z):?[YU#K^
+M IQ3T[E&43.1PHL'T[CP6AZ 0O:0\,;%0KOV HB((927D7RMPMN2Q://M'HV
+M%+BD01H]MI8.P?OMQCX#YDJ6K*JHN5^>=X^%*FRR[\5#5B1:NJC\OO4*67OQ
+M1Y)RH)Z@1\"&FYZHS%*:]]W/R-_Q,)?R.M2_'8F-+)!8R)O$U_HFVUF.L??9
+M_NM#F9#W^(E&:N7&>M[G5D<$^WM^5A**"I2-F.$PQJ_^%=*L4Y_[5O2^0O+[
+M!V9<L!*=GY";NR7R^99&,-J<D 1<C@BV":"5F-CI0\"<0*1=UI"JF9!4G0'Z
+M-? ;]?RID'F;6F,2 I>4PS(S8/K:C79DGJJ3J(^5K=<Q_9X5Q!=#7I!=[(1I
+MB\N?ULC6S\G?\U)%E9!,C1>KSRRB_\#V-.77W@5M1ICUEH2=*HJHC_J@R@A%
+M2%&M\N)M7X6+6(_/?$*B]X+K:J:VML0:^I"PGI(0FH/ JL58?8B7G195+ZK-
+M\>W@^CWCE;P1\5>PFJO@IEL#*V?;D9/47T:=EE= 5%W9TMU<$Z;V6- A@IJ"
+MDA7RBG$R_336B,. 8)*#V1N&!:P!PO3ZU?(2O[Z<5\KX[5,ACIW*S=?Y7=J8
+MBQ>,[ZD5CHJH3ZK1,\3S\% #1])<OJRWFYR+L%J:E.C+@0/C2//0:UA<H*JV
+MKYO;@Z:3U_9U._?$$_CVP!S>&9SXIUW3,ZA<BZE6TWP3S>+W]CXP)52\VJN5
+MB/;SP%.+!=T#286<-E4]B;F)1O"/I_0M/C_#";J&)*FR"+6@(*?E>=-P5L.*
+MI[F*_D"6EJ*4V//D\#;_\HR&5<!/GXM;!E17PP3-_0;CRXNF')14C(%'9!(:
+MY^G3,$ 7TJ^6%9Z:6J^I\\.D>^#/Q$$)Z/?3.:JLA(*V,I"*@ZQ=U\,Z,2[M
+MVJ:<$%).IO";LL?\RN"%HZ(=18"[@=J2Q)7P1>54MHJVAB":G_I:"PSM#]&*
+MG%&[]J>2F:R.2UO^$78OTK@/AY/#>@*2%;J]Y?F5(."@BPX@>HH[+":BE=K@
+M.;0VYO5FGAI,9KB) ZP]JT7.%2CO@]1&MEV 'Q6,B,*Z_P+FE_OR) <-A?M*
+MV@Q;DXI&%:O9!, E+@K* P*;>E"2C%O/JDHIFH$A_F3$Q;_&E+#+L:60K'D9
+M*\_D7HBB]7"A?(K7%[SRQ^Q+<;"3^3!;>@\AEI,;#\7P7[!+G7:;0G]LGJN1
+M^I>OP,5<2;9P HB*C]1!3=#RQ>P0 ,MUDD":0W[P@Z'!<>TF[F7+KZ)059]%
+MG*DAFYL*W LA%L4<S9P6;%:JSQM,=ZN@_G=F=_H/2(8Q I:@23"?B;9"]>^(
+M)LH(#HG("H?=@:R>F4""N+>31-+LUA#MY5!85%&02(H#P<*O\9F+H=26F8("
+M\O+Y]BZET=>0E%VTUUA:H/*6VP,*V%2;WI&5V('_0*:JX1*=[Y9B^ K7D%B6
+MJ)H&5:GPT#"0.H"=0*9>D(MR&_.\\L)%-N[MSXT$""J&ADE+,II7 ,[[!*7:
+M\LRWF@9/K;FG.;(O*1+EQG;@P6FJCIE*A8V\0::'FT$#JA?1CBLNVKL._55:
+MGFJ GI/0>/';N47D8-'5M(J=!=&V?\W9PM.=AK*[U9""K\UB;/3 +\*$6!'\
+MFD&"KKFD5LT% -)_D)@&MA2<K6"7F]E@T,8VP+#FE^F8D8N\E)?LX+[%\#I!
+M3J*V&+:+'YI?A 6T\Q>OQ@*ZD$>7B89-TJR:&QD.?Q'+RO&'=':-B7V%7KI7
+MFR?3[\06/MNYFM"#.)^1B98PFO\E!^[A+@O$]WQ"KHF? B>+J8+#E)[,TOG 
+M=9/!6 &25I"Q7/T91,'!A;!;N9!;BG+8\_/V<O_RKYB+B9(56(*ZIZG S.6Q
+MVI)T7T9"J8*,)9?$]A26/M'@6U^62H)*DGI5G_*RX- 0Y4&-DYM[B]:/FZK'
+M,OTVW#?REUZ0%8.6 5CMOI.C"!3;1].\A*>0C$^8 ;JV6YO8\G[2/?[!BIB=
+M2)J<:ZF7[(Y[P\:IP\S-Z\,!ZHNQBI[&"8RAIE*^Y[CY;CYRCTI1@JR7@+XI
+MP8VB]EJ+AJVR1/JW#;;'-]KURX>E^85:5YY8P!:74,M3580 DY\WE5>)<%:_
+M()Y=GNV"UEJ08X-;C9A:N(1(Z]$>)@'/6XB:W$B,L[&, >HYD!#DP5>5K*&I
+MFX5JHYY[",0&VM[ FX6D#$&)5YR+$;N8@[&7+]8[PH=]MU$:=&>Z7C1:G2?+
+MZ:\*S^_OX$B5K94<6J]<-( 6 L>K[/00[,56  ";4J"^J\3,X0A4"G9=CG"_
+M@ZE8W78@+L??\%3TDI*:5S*T00+YT=:=HJ*579FKEJ 7M\<B$WN2#^.3CL.3
+MRJ\8\Y::]4#5M[O!1H2B *I''E"AON#PT.9@4@Z^AO8OG[85TJ20_0W Z0#>
+MRM&KGG:EI9(!JR('J\>V.=Y4K<]+E_:?7%7"D[>HDOD+S]C7!LL0\P&(JYRQ
+M^E92J+)CH C8\C%_QBX(G$A3\;*!7EK PJ'D+H9^6;"(^D'AWO:B,/K@M+:>
+MCUH509.0?ZMBSZ?$6%R:?H^7NAZKMZT4].;>)-K<RYQ!F-G2DGI?C<,JL7>E
+MQ8JGJ8W9B(V0Q:H JD5$QA_/3([$%%2M@9*L) -3)<VO U$$AKJ:CXD>@9N0
+MFECQ,?7OT/W"DU71$I.:NUP+L]:7TPV!ZL'+BPOQJX7=FI:T1ZJ4@-Y7:1OG
+M\# 663R"DYU0=;J=QX]S/9 (,G7 <7F[<2HVYG9OZKKVH%[P2Y97H'!"YPRC
+MV%P0<IU24?9*L*6;FM05M;Z T*N2DYVN0*B6"X;1,"56-@"-HFW:JXZ2.J%,
+MYT?6T/(TP.>01;^O>$&YIIZ9P4#)!=70V8^#C$&NB*R'HY36QV'LU=WWT]*<
+MK8>NGJG8^>&GBQC=G)'#K]^NV%N8&;::E::"GI&.>L'JXS?MP-"^$(N5CE%2
+MJ-'#H+&^<(I;@A%_C>?4UMOMU\>?LE1Q=I.NUZ1.*Q/.K_A=N%I_CI6)J4.<
+MB/<T=-)&)3&'5JVK ^?]D$"4V2G ]:Q/@5>$J9:#G ZS3\T0N4:5^\5E_%7N
+M29. DTR0>\35Z_K%!<@/GDQ%S*_%7J"@%^%ITQ8F[N-0LKV@EH^(V)"3E$"M
+M"JP+XP''QT/O#G^?2OZ-FI[H!AW9$A'WOE0/+D:QG5?36D/%70/)O8A>K9Q1
+M6:[C*]#PYCY1F%":4;Y5>Y=@FXMQ:H];A\B"4+11G%U!EX'%-O4R/O#82)HP
+MG5.]^(6%Q<+P[/(L&U-:D$M^:I:7HI0E.F5MD\;+9J.>6$.>[,?LFJO-SBS/
+M <K*CM989:J8A8V 7=<8ZJS[]#O!B/[;BUFVZ5I6E8Y0YR?!]LL%2L$0B8Y0
+M@XGWFYFF.'N?V-_U-]J5T;&2D%N<'2G8V,[:\I!2<Y%:<*Y*C3;6F^_D3YX3
+MMBZRO9N/I-2;S=["TH6T2IU'RIX6J)29\_3$M9[5TE,2.8,J:Q:F=0#"D)G:
+M5E*/-D&]?+NN'[* DO(FKL _P+LGE)2#7LF_<H*MPJH,[PL3&$-4GJQ5%AN]
+M9E?] /'&Q9664P?/A)6;I),)][O.64&,>^'' =\GD%^>7=6ZQ+MZBZ& 4L?V
+M/,;2YF".O9^5^C58_H4*[MR0&?J/MX>?^P5 Y.)#\@?%DXN$II*OJ/BV4-C#
+MP=)>@J)%&Y+ZJJQ:4?*K\^8UIO&K6CB_%Y&^I:-,0_1TT.WU4J9H0UZ3WY:3
+M;<3IV.S [\.ZH+B8Z:R]DZ6.N(NGSHDD\>9LWYJ 3RBOKTQ:6(KZUJ(P9 J3
+ME'];@?"C@[BH#GL!'<#!X>N@*_9C1I<75\?HC%.RM;O#/YW4T^R@G!N0B3*=
+M6%=QXT_#_(*!G1ZTDKM8GA4^)? *_!&@D<X(EK_"5EGU!L<9A8.*]5N2W-J-
+MD%-;].UMTJ,1BL^L?HB)>K+[3^CRE93F6UF:J)<9KOA3GT#3_I&:]Y3NGU".
+M1==>0)BL!:[9S?O,U]+0AY>42(*%C8<ALBV-$L7U_O+PBJQ-WY9-@KB>Q-JK
+MX2S%YO71$:=2#OI="ZG>BIS0I:>30/(G$&_F*-85D)WUM9J#26_"XM>2/[R:
+MD1^?P_.C=9*SPTRPBHTE_5F788Z)UP_*R# 448R5D).:LGY"Y/OU+F[NT>N/
+MJ!T#N890DIA+$N,_Y!NBE<![JEM6IE"5U=HPQMHZ"IDGK<;I?+^MH+^] 0"K
+M -;#D+^UK)6&OKN);:13 I/TYM)V#I*7FWZ05(K"I#.&J,<"P"3&Y(B5L$JZ
+M.8N65Z-\H> ?FU+"U6>D[O"XB(I1=;%3EZT,XPNWL9Z[4L.J]\S7UQ+$.X=]
+MG!>^E:4;J,0G@=*NP-&=M;2-5;>V_Z:BCNTSU]3Z&MR.IGFNS!,J-J-$P>0Q
+M^_Z3&Y>M@HA)JX23+\36X2;Z]_"NEEB(BQZA2H::/^G]S,KG(=1LC$2_E+B4
+MD*W;K=DW]-;']O-MA?N?JD1+G':3@%;8PM##XOE8[]9OB)BCC%^:GHI!D(K!
+M.^?%[\)RV8:>D(V1<@-0R0+:_-0&U)I35@''(\3F$"_;JHAP6)^1"8-B=_F-
+M6J,2!;:@NS>AG)UFE@,-^_G\E^_<K]#JB5>)F Y'UN,:_586&[F.<Y>(3TV?
+MES_%EC4@-! /.O2IA9V;C8LD#K?HR*S/\?+ "[N,C$Z25)UR>IC!P-CV\'78
+MBI@<DYRWNH*0<!^;R-O1](T%@P?4B*Z^UZ@4"U: N$^#HN)<\AO6!7W9@;WU
+MN8I1Y]S&D$CP29L0"?N*RL+&WCWZ#U&)@:^R2X.?;%8K85_.W'^RBEGT@=PR
+ML:)!#603+J_#XXE6H)_<B?BFDXG:X/#"9".+MI*#JHL>EZ, 6,+U/O8R)TRD
+MGX2/-YWHNZ:=4\PLWXKBT8F7O$ /KY43:+23@-[%;^Y:6H"6]K[3ODMR7D&F
+M&\&H"NZA38[#R)E648B9EIVN%ZB/C\'^Q_)SY_$ND*![CX-<6RS/!4*>UIZ%
+ME:">GIB3E-9_QHO<M")8IAD66X0/EMDO)N9/B/*UVYBZGW .EP?>Y?J^!WVZ
+MGC""J!C8EE]%A>/%_[;;B5YL6)N'FY92@*CQN7?Z\D;7%Y =HOX B,;/K^T 
+MU (!\P/.MA7L5?KLN*Q5NLCYYIY +87"EZNPV[:)<Y0B3ZM1S,OW#,9B#O"]
+MD@2'LG>;NAN@SY<#PBT[[=:!4!6AO(81VBG'#O$V>I&QD8Y16H/PX.%%U[;7
+M][:^!9JCG(J@7XK'')/F5=#0"521JENHL%[''O4N5M#P.H[@$I:#<E"ZE<3Q
+MK*[$(SZ6D[J1CUBFBZW8GI?"+D0&C/J9F>]&J;JFE9OQ#M8#].$23WYX5&^>
+MO^BLD@O,LNS3[]9W3_Z?2YN>6?ZZJ!8I6:9YQ0ZFJ0[<$TR,L9^2D7):;"13
+M25#VE_ON\)6)H(D0BJF3 M2CPH0+DZMR18*)]W#FEO7MT4J!@964(JJ=^8^X
+MH<?O?)H@I(E625JKD%"ZS-)O-CX+/%*D:+BRNPIPDZ^1T!-0,,.Y=B9*^BER
+MEE*: K[6U?8>)IZ?C^1,KJS)["6;&NW/XO;:T*^0GF"?K&&3LI1:PN2UE]8R
+MTIV-K5Z7MZTKMC'46MGZ$-7)0JO6\IM:F3BIQKBJ=/OV3\'BE/X^U-N<"%ZW
+M<E2VM\#;*]G:EE&<SB"<OL?;\^W$%^"8)K)/H)E>2OA45R==D(#T"Z(Q%CN6
+MN99V0]FR=J_M\UP FB9:FKJ'O8M H/Z=]<+%480V+WJ-FI"0[,%I]K/T=>.,
+MDM_HEWQ9B3JZ#4T%_(XA!3 7LIJ!C+CAJ+@&J8WJD1)21:<(N]4BD):*GD*$
+M>X,!SY#?P1;2P].#4JMRG(Z+C+^YG]E(\NT>D"W;3"&2A(8)D__RQ0/(BG61
+MFU^7&9C@\_CR\'"KW[:3A(13L[JEMGK,@]K$FEF4N;I14?JDGGU$\/D^>]?+
+MJH^VNPQM?X8?)N=^126O@-#62'^+GYA6LT_9=!$^-G[UO7()G(*.7NJL5IK!
+M#HPMKL/1[HX%O!R2+8JL$%L#U//V;:Q+O08K5II6BOZB1I 7VLY-]P'GKN#0
+M*9)1,K:.4MNV+ Z6Q2OT\&80V_VCLEZUB)ROB-W2X89SN'M0$:NS&S/M]^?T
+M+Y63@YU?@5B*JEVKV/]'7%&\4KU66JH#JA>#I^O6L/330$\5L=.,P[6D2I^D
+M\.5F?L*8]K&XOD:'EO/L$NOVUM;LSHZ0?KV$F+R3,L) @MP &G4%0X^:1:B/
+MG\T+ME92P>/Q-L8V08N'](N,^EJJE*9SBR"L0O? #T\*X$-2MYM\=B^R0GCW
+MO5#S\=1P,.6LH]0;6Z"KJ4T7HP!,G8F<MG$*4LWZ9/7^.B*/L;:$M;>H4JFZ
+M@<TNTTB:4!.1>D"6%Y.;DHCR/J)OP./'I:.8FHJ.F_<-\,+U'<8"K8_&FY:'
+M4HZ#.HUR5VXR<!-#AH6 J7B9SX/V 0T(U]P4F>!/@%KJ7YY?TZR&0L7S[N8Z
+MW<O'GX50\O7K>?#  '/C']ND_^G4(Q13K?F_DE>'2E:LIYD8P>W5K,0E=-!;
+ML;N0GIK+QJ,VA'8"AK>:JE,BEO'F0_OG!_&FL82PG)NVGX+-!_48G';_B5N@
+MNGNJ?YO!>]'O]@,PB]N@ UIOBI;S3!L;\77ZP+L&()?(27)66IH!8?;&EM/*
+MAX:L1*NN7IF[C;\2W8#B7L\9OX1QG$-2@*Z1TJO2\C3V$MI)BH91=9XF&QIT
+M$%.7S*SX$]S6JX\4POI<B)Z2#])2N#Y91Y0]._8Z04>"7@6^<8*XQWG#'+V@
+M"G%:H5I]<SISP/?]Q7V0_X2'ERFK9G:7P53;^]!:TJ^7E0);I :#04/XUO#;
+MPF>'C+J:.J^5BL_U%/?@W\5MAZ(3DY+_AG*J ^O%M]7B"QV3NIV^EZF.H9Z*
+MU:G4UJ3K8;NZFJA"B)?-@Y[72/*]4E03T)E*?55:WHJV4GF?@P%"S-=-P]H@
+MF8BN!3*IMXF[D+AT4<<6QR[>4"E_]H*QD(*ZGT<74MA0-/*%3EW#OP'@-9W%
+M[<*JE(*%I?2[G[C.5]?OQ1B&N &%7%%:$W %JQ<KY9*0*MJ(UI [%@N'FHM,
+MI, =-K)@P)9B4I8HN)V0A='J-/K$Q@J)3JY 0P9HT*Q/JM& P [U+]0I=XQ(
+MAY*4F[A;B7+P=L8W^].=G9'7 X"[JO:SC;=:R /W5 3MVM"ZDA]Q&@(-F$O&
+MI=W9Z'4VT$6A>,BR'/:AEY;)!O,3D9!PC*!4@E*%TB=OEKX77%W"O9*RNXNL
+MWH':C,[*F$.2NW8"B=^039U2XC\4$/&02I )J_R"F$X*KL3B-\1U\UJ I),P
+M/ZY;E4W#%[7_W9>!J[.:C$^5OU,2=/_-3(XNH<5$#(ZIE,V&F4UJAE+7(E3G
+M]?_+O9_;BHX&8HFC@!(-]>C\T0'9"AL1IH>-F9:.1UZ)QEN;!2HG\!+^Q9&]
+MGE_279I7H6M:X$6(D;"0B*Z7 )KXMG_6 IJ@%)5:H7HZLG(=)4;:G/K4$OO.
+M 4)#>E"7&+34^M+8\+BGQ +3PI*.$HY;\O,N.B_:G+B;BF*OM?J'X?(YEY?N
+M"X,4G,FYNF%(N#:>H:14 DJ(R(>F6@&"GD"+.'*H\-'M%I9WR)F'AWZ#D$T7
+MMF+0&^+8[/3>%NO#"9"5D?::L&N"FZQ: M'Q^>#R$,-YD:&M4L7ZE_%&VS10
+MH8N>W/21M]-VQ9>UM>/\4DH%#8JK@X1.60=+!THOG/ZTDJ/8OZ);@<<>,.^:
+MX]*1L*0;@ZN'GDBDA?#Q[C/3CUIXG7F[5:*SED/[L7?E]--7!86J;Z@%4L.@
+MB<%(WE^BJM1O1%B(0IV^V, =@N$T-O[VUX_MEBZ9%Y:M&!I,5=T"S,!"G$G1
+M\/ 2K$6+3X/MJEN@=[W!\GSB,O 'E)"@#Y!9UZCQQR_RA%Q3V98@OZ\8\>3D
+M\) +CY*+KO90J).FIZ_'_<>P3*._GY7#K(*LMYO3,_]5L!KUBT+&$XCCGE"%
+M1 SC[/;EYPBF8D*RNMV^BQY"PI4E__YU1Q#:;$Z.2+N#I;[BU]1X!T*TCKR'
+MX(NZO6NCEE?-Z]3\VO7S3861F,O4C?N_K,2[I]WX$JS4H,5@31R%EZK2Z,H7
+MDY./TIZ3%COFXPBRD'U0EY"_ Q4 PE 6"D7>E5.]Q\&_U>;  Q^CMH[[HIR3
+MJ9J?T<[*])1"E%B6N)X3;9"K43+ETMQ%MN<0,+?<2QAZ7Z" _^SP\@^!IX)?
+M*I]<D**AYR/%-?^_]4^<K:_+C(T+L:!_ UW<U<>E,"U64$ ,CI7)MK"8ZK)E
+M5<*OCX\NO5"KMAN*4*N/^*/=R@%  OS)X^U3GX".^CB6>J.%^O#J[._>=NJ5
+MG;.=VY"6'O+^X]RLMO1'\J**@M?J1?_ZE8_>&$2MM?=3G89UMT=LJ]*)EA)?
+MAA*;@JSWFO<3T7WWQ<92M*F:^XJ&7)+ X^I#M<9#D_!JKQ/'?::@G^&6[700
+M%.*O%X67OQ^KO3@GJ5G=W(YG"N OMX6 O)>!AJR?G?,6'T77_]M)+)"3B[*3
+M-HNPT)LG2-)![ @#P_ !7,2PJ99)4Z+F!H#-Y.TFQ\#;7XNCCUI8D[J- Z;#
+MO;83CQN0BIC9XZ42QN?#4%B^&[6EMDNP\(+E5_,0';!+O/J7_'^(4+OEZO$N
+M[\4V;49&PZI*C%Z3'ZOK[1HV\XD.NDBKDI^FD(C-_^[ZQ_1.@I67K\LHKKJL
+M<$L(JBP+Y/$::XR/E+U?G8MFMA$)$+7P+9XIII)&PY:7NZF7H+: P8I: ^SB
+MR^,".Y(I4UR"0_JB8!6NR>/%Q>WV#_RED:Z.L+N7K0[ X+I=@$4"LKG](OXP
+M]#3%A5QV<9&F77NHJY[["R3O";@2BZN,L9J;)EI#663U]]+ P"L6H)B6GPCW
+MLXS:VL7EK@.+7ZA_DH"NEG\%]^K9U_;RRHUZ5;_/F$N[8EN!B4RMAX2GT9\ 
+MGD2)6BVZD*:+030QY;(ZYQL,K*-8<X<6&B8RUUGCVB;_ZOP75;M^A)*HFH:3
+MHKF66MKQ^9 R^^O$"K90CK=9G8*NVK"5DK;0I8"8G0TT.93T$]O,%A'75E&J
+M7>RGN]FCROVX\\FIG-*<FVP.F,+!PS_VV["OOZ!]^N.JDDNL(-3M9_ 2@)!X
+MW7!M<A1:B /;]?(N%N[KVX_LB9A52X:06<%43\3+2S//IDKAGP>_9H2=NPW$
+M??;[M/-#7XZ3BO7/0\NX5)N-'=/'UZ_KQ?:&AIZ:G)7'5O^@VGCI_L<?[N;%
+MN$@1O)9<FZC QMJVG'84D;7=\XL \!RUOCK+#';3O/7Y$JUFIBGG+*-%O9I'
+MG(_55MN%DIK']#S =\* AT6FOYN&OY>5O@?V-^^P1P]>^IVL0]8/GX"A-Y75
+MT& FOJ.07$S(;8MXA9<)+-3.(>#:1590C%5:0+MX]GK!LCGPU_)&TY^%BUFC
+MIU^2(9Y]"8[+X=K=Y\#FC_.1=Y["NY'2>:!7V.)!\N_VQ[^CFHW>0JJ= OS.
+M\GZ)DYVUH5[RI7KL]\74"KF3MENF=SI^N9*]9?GSR(29T;N7U(NX@IRHX39S
+MY="+6I.[D8#V1OA;FV0#%C7%]^.O3FJ[6X>'D)#MB<;3/\601\F:^*RCE)ZO
+M:9VI&P_\0ES#R8^4^D#FG8U/H82=0_0TW_;6(T=2U5-:I9&II[I%@L<."Z3L
+M^LS/&,==OI,2VA"\5K2[GIFA]>P2VH>,49*%\%V[]M*#]='0DCZ1UXD:>5G"
+M%1_&$ ^0(%0;6IVL7Y#0?_#90+C]B?!1C#U8BI664R/R-Q 7DU*;6G"H^^J$
+MNE\-P]/E+,7##IN3ETFHKY.# />>_16N%?5E<+KL%JV)8J"7@NG\P.3#PYF,
+MG9YDKJZ DJWWD^3J-9?<_]JHQKD2O(>/7A8LI[?JB/OTJ@W[\=:[MZZ@NB93
+MJ[B 7I>BT.Z6>_3S4+944)2*JA=GZ4=1M!)(GOVPJM<(T.4V+!_;7:#?GU07
+MFLBQAM^I#0,P<:6CR()=>K^0E'OMY#74+L7@S89A][J13G^C/?#PV?+UVY*=
+MK%=7FP:,6Y7PTY:^>C?0K72/E+E[OH:XCY+RE9W.UL\23Y95C)J_H*J@FHO1
+MP/<2]]!#.WR<D9H":UY?L*6WQ1^D72C*]QL1CI.9I4B/JT.6AIV[]=8O$\/R
+M")Z(?D>6DZ^=V/E#R)RB&E%6H:Z;1<8S;L+'PT1&GER2UT.;+!>*R^L)TII"
+M]@2PP9:6K/H+P12TQ<?@UHM3N(M6&100<[_QP\?WU\_KMFQ#^KJ5I?^:V.K$
+MUJ/6Q\L2\$J#DHR@D!N+%_[(3D=:P+]7CX#O4H6ZQ!HO)6/%/B3P&8*?CJ6#
+MFJM:UF.7PN5#P\T>00[#RIB\G5]8=HG"=$16EPS^M<60%O.Z<$@]5C";@R%?
+MP<.YH!YQO%"KJ(G"7)66E@5Z4X>=#A"+K:.0?]'7<,F$UE"[&Z%V2?&,70TQ
+M\3?<\/:.D^V"]I.VI@L,&>/%L.V*N*:X75.-!XZ3G C#]S_UPL,75E6$KU^-
+MQK!WRUD$),@+T32#\EY*@X9!27GR4J#>^31NY,B+>@U0@Y"3").IFM+W_^X*
+M^ASXE1"2^IV?^Z:KNG*@1%WQP?CT%O3%1;.+D=*1]MOG U4*-)2SW;:1FYL5
+M(G,6]O9CO(.PO9:7VX.FG_=!SR=AF+12O9;QOC_B6I[!Z?'T;]-8CZ80@Y)'
+MLEJ2I=#V-)HZSXB7EKB"4W^.F8_8U!DUY!3S:8"\A[R:.)*6A@#!_.W.+]CT
+MKXV%J*Z:E1.X&I?7(\3 U9)EAUR8@H!TBPA^D"!S -W('/C5 4,UA[Z-L+*V
+M"7[^B+)=\O1YTGXPRPJBOXS\6)./0/D/4GA0GXZ2<9(; >)1)!;$$TR;T F2
+ME9.?J/*7F:GJQ%^AFO%UB5R;;'V_HSXNG:;%"DN]P)N6CYR7DHS"T^W"NO6+
+MDI&=JX]65I5J&M;'+]/ $XZ6F$R/GXV8H+6;P1S.[L[7T(G7JDR#F(V(S9J=
+MPQ/%\O2Z][B.7;^L=8-X"&VVE_#*! K5S<[%2:,>_9%:UKE:GZ!TDL'JE>XV
+MQ>L,G!F>Q)6<?Q'NVQ&=D_.=5;E,@<SK^/>ZY=J45@!1IA>+@7IR4\,K[P0%
+MH))=CKU6FJ"06W%WQ? VPL#M<"Q#G,N+I$N>S?O9]/O/A].BF9P)AEJA0%D4
+M\W?F9>>\E?F 2[N4BK&5F0KY[.Z!<TAOCH>'[UKNJZ64N-D_W-+WY!5GM9V9
+M6H_M&K:XE(NAWOA3S=4OR=6.LA6?TY"JJE+VCZKRO\4@<#8"K%B249H=KE;S
+MU\?@68+:ET22R/;%(=4V%M8KKHH>7(;9?+Z05ZK#WL<]J)S+E-!]5[\AE?,,
+MZBWV_L\4D)20&[:#1YX2UA'PET8]CZN5H+] DIY;DT3-_CCNL/I#%Z!<;:Z&
+MZ4>1DJL2U<K6SR[QKJ65I&M,NTL26[_-<G/ZY]! A[[W%I/229^$>(;7"?C2
+M"_C\J]C82-QTF_Y2XIX)S!J1!>A%P/8L6_QUHKE6<?AYS.ZE=IX07XM>L)H9
+M\=/6FI_&YS>=FX6PG9[#N86]=^G%$ZA1GEV5^KN_M!I*P<+C(]?.U%N-K)O#
+M@UJ&]^3"]Z,0I@JO%^2;J)L>3:>OF?(W8_KWP1^VA<Q+7K^[8E87R._=W*+C
+M/*>FKD6NKMD9N >0QY/YV^9<V0,%J(59FDJ*)GJ6KTWN+N?<S4_Q'*%-G2.;
+MM^>.E**VDPF2>?07K,%45@G[D+.>JQK^V^ %W!!17HO87\/")-+OP@%$E@'8
+MD+NL<^*7@TSO!=;PF9.0_J*\6H@:6)'!T_)WCN9ID*Q#6^UXEJ:%R>ID]D3"
+MB5N!LH.;7H*RO%GF[,6U[>=-I[Y47I>]IWF@<M+?_XC7 ]#INJX%@IZ-YK..
+M6(4P]??V/^]/5XV3LHZ-5E& 5IV@_J@/0<W,:S&-782(@I2 J'&P)9KU\#'U
+MQ!O'_%!4AI*7J8+:V77QO(GP6U)Q=X-"]GCR/^;3\<BAD=JWG):HEX,LUM+1
+MK!9^F4Q1.:BD__L \M5E]=D0 K*TJ5F2KK9>@ W1Q6 R<HZ?A%,<C;NS@4WA
+M(#G:-]?H@U2LE$O232<SLYCR[_X'Z\_0E_>$B+N>/)MFEK;1\>;$+_;S.)YY
+M7RB2B+Z*I)N;14W%]MP$P<\6FZN;58O[Z(.+D9"Y*3YU(#?"[H664)&>\*J2
+MQ]3%, Q %IDE]Q.2R. L^O??D*_[PIOPD7J;H->_0(_#RY"$$ZV6D1RS)H7+
+MP?/FT)SO4&N5H'V#KQAVDVK'UAG5^L/ID#F-7+]%]I*J!_+L[_;6\Y:VO.R9
+MG;W+('*"P43=V-W W$F?JI86AY6XQEWZP33U+BRVT,KSFZ>3IHF"4L&R%_'*
+M @^JW0P+&(>ZK55V]I*<F"SP4L+>^<0U^Z&?F! MIZ%8.QC\A=Q%G".;IHJ(
+M6/+^=*XGQ@:><%9\D%U>K6S0]PM[A3.UEEN.H)&7LTB>6\?RU:_U]5"CE&."
+MJ(.?D)*?[<'5+OQSP7+DDQZ-CA8>H"T_MS>S]?&)5I0*OKR%JKB:/2<:_Z_F
+MVV.O%IIMK7^MJSB6NL4;[/ PUL,=3=E7"E6]=I&@L('U5L##3,7MXM!;OYR*
+MO$20F**-MGK1P?S%L/3%7["T5(V1 9C@QH[6G( 4NU^16%O%-!; /O+6E)Q 
+M'16Q&[VD3D, J>+@&+!*#YY<LX*0)ZK*^ACVWJ7VN*6L?5N+#XRUC@TR;_)0
+M)4=0N)-#@QZ,_I7"EN]@]N_BG=)?P(RLR6UIDZGBI-2#BL$PEH2,/$\:3(M#
+MT*CAGL<^1^71.QY5$KN>QY):C%I#V7PL!?GHS\J00H>M2HB06QI219*:P7'X
+M]9:6=ZZ9AY2:M:I[ ^DC":I8&]BP)U.+P6NTQ[;OU5R<E*S4D?JKEIORR-?:
+MT;RRHIZWE_B[::.:Q][@[^W@T)M;A*J8:PB5LHWS/M?R^L?M5B!XO$T25D64
+MC?G5.A"2\.Z:O$K>J&3OC:2II>I)S^3C'.M>!8Q#6HD:AO>HQSOFOL(P6J]&
+M!9-8NJ>;G[F6LJ#$T,,$RLP#'>JRA5%ZG(>)ENQ'@Z?!\;WZPAJJE"&OHXN\
+M0R7+0L.LF9.$E]N8F<5PQS+Z[<5=H_1-4A26^9&46,U6VV/Z.@J[A?% ?R"6
+MW1LR,_8VP]F3G[I[B8N?GJ=,0/;UT.#32/>SVY['7?>C  $RV7O>+EE95DR*
+MIXB^B^@7BM$ #LPBV=Q4L+I/UYB-NHB06PF2.?0F-N*JA(5SNXR-=\9QHDL0
+M@BG'S" 3H;2BUIU36\Q/&A*L$E_!*!W0]_X Q(B:K)8+?[L"CQ,<++">JZ>2
+M@YG+\C_B/.Q%F!:BC5Z(D[F67Y]-#U,3L9.0JWN8J?-@%XB-]M7P)A/R#9N&
+MFQF9K%#?O-':;R(WYT]&<-*:DQY=WQ12ZO30%_?JEH^>7+_<3HNX59T#($ .
+MW*?DOIKX'H^^U0;,6MOG$O%WY!K"N9;=5;>7BWN!J96RH,_XH^:H^\#\K[V]
+M7ZG/BJFV; 73!7+%%\;LR,?4@(>GD7N#PJ/3"8>\BZ]&EY8"U?#M]G8O]X:@
+M]@6:4I.=N' =R:V768IQBY\2"+I(P)K_3=/Y\A8"PX\$;;>^1X2:@8S),\4T
+M<EJ+D"V8_[];E9.]\3[UP+?6ST.\>HV5%DV[C)":B87^SZ;;W8F2O(2^AZ4'
+MAO +TNG%_A OVHV6/)#VD&"6H;.UB=FN"&'IS=L%]*V$E=B\IKBNP8&0>,,9
+MU/RZ8 5Z@*.%C@E"B,?[QP&:7+9<CG22NQ*V;-?%DMJX')"-3OV8NH.DDO3+
+M -.OLX:/E?U65X"E]^*[]/;'HQ!"]L'[@>B,AJ-%V?;LG^#/ PV2G7R-1[3(
+M[-%IE77<$,^"FCQ)C9Y+:>R/MP5,ZJCA3_9/3;^,!+NM0I!5D/%K]?JV?]F#
+MOY&8K)_+"8F,1EK-K_JOP$CDZO)ME[U>B:>-%D.YAXC'%$;&T#>9D9.*GJ77
+M@HK9%0/CW:(R>W)#EIG)$L;VYJ[1NER?NY;=5JK %9K!"U"24%147+8+F@.5
+MC[GQ=M7G^J4 '0_#W5N8N'*73-C^-Y;Z$P>7K!U!NYV0P4RJX/3R<];3[K2>
+M#9N.'4=F<+K8[OJ,]M=<9/JJ5%3-U9J,DEL9\?;%\N^2NYA5BTH635.29%H!
+MT(P8!Q[%PJM<JW:-5WB01JASK*2O;6CY\!7$&UF0GKN4_9!#0<;2U800$'66
+M4+RKK/0U-_8N14V3GJRGH0.)LZ>/$R[0PEYYEAV2!UF?YC2#P/YVFA +$FUZ
+MN:J*6]>0EXK'(&SP\G.8G;B9<;J,ME6N&?KY,E R#J*5FFQ%C9N+XZ>K94AN
+MS@[8]8>Z3^_CDI2+:9Z:X//6YI8_PP-/ELB,](:IUI/V^,C^:$>!K\7N\$==
+MW)&NMH,7RB95TTCSV-:@Q=NV4Y:;GO=(5X'Y3Q&Z&))PEYB>N(<J]/K E?>X
+M5%:>];?06I!$O\/KV-F$%E^%I'*(CHQ$6RO"P3ID\]!(D[A;F;V>ODL-U?'E
+M]+_ONW:KDII&NK.9@%DR=Q3&&B*[7Y^\"4?/T;BZVLKZS_Q#"T&<^IJ*C):7
+M4H&V6*#JQI#N\@K-_*^52I)8W@@2?;K)U$FGS,<G<_&#?IV8W')3*DO EKMP
+MX'CP=?;!6H.3NW>76IG8^=NT7_;PG(V13D+8]&\VQG[K5!B0GO6PN(JJ6AL1
+M+O,!NG8@G1I;5ET@FH'G%C<]YL"P!U:2J?Q+DG>UK!<CU78;V;C7H/VKR9^T
+MAXKW(.;\.JS;XQ>/E$V<3V_ $)#E"$[MQ.?X0]:T2::X@1*L!H+;<M#PQ,3%
+MDKY=\P!2#U;R8::"S=C1KI12_@4 !Q^LH7X&$IB$./)=(=KDWD7B4/KPL9".
+MB7H+P.OPN9^Z5-V0F)H6H,'1]]0LQ5"(@I6G\5B?3'Z1S5;*U8@"LE57A7GY
+M(;>WBS_MWY//' BVK8,;NOO:59S)).RV\!KND$*"J.NNGM% :9_W-NWOXS]W
+MFH /&XRHC:776LX [^JJT[Z&A+WC'I4'*'IRP/+^Y<?2\+J$BY"(D@B\<8&:
+MVMOHT ;4!V$;X"T*+H*H5KJ"4J!?J^'ATR;UWJ-,T8JME)VL_<T-Y1"&]9F[
+M7[=1D\4JD_ @]_>&&!2?E9*>D_G/^PE?\>**@)"_M8B"?WN5J*3$/27"+["[
+MEK:]@8=.L).<22(\Q_X#AUN6?IH0A;*3#,KJ%K?VIL=K5=KL7X8-1R.G@//H
+MSZ(&XN/OCZ^NBZV4H( 6T<K1E=OS]@Z"A<53&/6-C'XPVED$Y HFS$_X!U"9
+MNYUW_B MFY^DAZKQ_BWONCX*D!B"?HQ=>YT%5QL#V)0^%0Z)7E\#.M7_P+N.
+MFE0>KYZG2HVRC],"CP,06 /".[2GEAUH-@/LZ!$Z-G'&6I;YJ4 /=::?/-GR
+M8S?@\TM&H!^[AU.4@X^A.\<N/C)5CU6$E8JZ7;NIQ=K9+>SN"M/3O5OP;9V&
+MGHMZEK=)0<;Z-_#"C7N>^JKPYYFB8/:+R,( Y*K]RL"YNJB4@WF>1X*VL9"_
+M$V@Y9N7@<*^0EYN/^IFK <\E2'R8HY%6DJF"\=[99.[V UZ 7YU?D8#2LAN]
+MPLO%XI;XI![UT/R#D$X3\NO],]0EM;B?DEDKZ)>?E0Q1GCSZU\N2E+F2D&:'
+MA9E Y-9M?O;Z0VZ6D>@/G>E(QG:?Q\S Q@?"D9^0$:J&GYR#J9J# _OO[<#R
+M&KF'JUM:>KM:GD"05^/"# ?ITL<'' ]WG)-:!ZV?WGF?G0/:Q=96%-M07!I5
+M1AVV*.<BVV(.H;0]EK.<>*<R%?;%VML\T:*=ME=2662FFH*CRK+?NY(%5X%3
+MLJ.6L5>?U/;5@Q"?G&!7N8E^MY>4V-8]U_8FNUI&GP*/*Y21;DT2%2WWY<]#
+M6ZJZA[_=#6@V@><J!!WF"M2BM;VE@[A!KJ1;D05K[9*WY=-)KI'?2XX=_EN[
+MHI[QQ\'!#.[(S\A-&OF;6@0&OXNZ39DG-./2WK[#?Y&$%((5VI+GU\]=A;GV
+MFY"B@@KQ\?:V1-/BC9 SD5(CEX% C@D3+L>3WI8 78^)T_*L%9K!<?W]GDK0
+M*\1&>[I=4HY3  $R;=80!6UWZ9"YDIB0<V#S:C\BT#"C2W>IC(,(ZVUF<_+ 
+MS P>W\.]A96\3XR.A:F $*[@EG;'K[I:[9B-<Q86.Y:;A(V"\4[9QHK.[/-)
+MB4R/"_PENIR4K+):R>O<^G 6+IBV(OV@V5*+=</8TZK;_GB0B[B/!S+#_D3E
+ME81\HKR/H/^9.'>(V.; \'SQ@:UWD0)[>(R#V4 U/#_2PZ^@89^:457&"\XB
+MTL7VQ]CI7X.96H#>)DKI\3;UE^X^T(FCA(A&FZ^-YDZ7Q50DX]_U$8L4+;V?
+M5H'C)/93$I8V]^7Z4.<8B9DIE8U:GGJ.B]%<V,O( M_! EE^AI?[A@]:BI*E
+MEIB0%\8F19M,BX!15*":0T$)0UNX,%!%HXFL>]&?\_KD%\^:5(IQVA>#@:RE
+M^.D7&L15B+>;4AB<'4.^6>/0%/*R<P:]6\0K5EU(1@MHP=KU]&P/2Y60F_J-
+M2Y:Y3,-V]/:V-ML,MO"5F9YK&I!WF.4,[=AU]59I/ZR?@YH-;:"W@PWZ-._6
+M]:#F_YM)JM:'0H1HA!BA_8[!REI'!=2=%X56KD!)'(.L7@+-,M?ED[O.EJ";
+MKW11N(,@V<+1D%!+L272G%L8P;3V]C_+7!"Q_98G@ZUF=K=9SL=0T!:&79(7
+MJJMTA:L!:Y,UQ<7!N)^F4Y)*A_!1 -#STS/&TH:G@[MZK8:]]Y7+T#;^1_:/
+MJ;)5FA:608\YT%BDS"!?P,*SAYJ$F$RNE1*(SE/@M/DZQ)?QNKV'5XH;DJAV
+M:G16Q/X1Z\S*!MLQJ[Z=DI[-[WJZH)>HA_13<,;V ]6<BX;VD4I[34]1V)V!
+MVZ^>H=:8BS?S)E04HX23UER$"OP;.+?VY1<;U+Z#TH=:01I#=!Y[0-03[BZ0
+MV8:4[)*NJU^'BTI9$YW$,%M"HX2!.X?R?=.*H30NYD;ZP[JF4$P6_82+(K8?
+MQWQ S_8.X<:5EE6/$FW8AH2[\3X\QC)[\)"^/I,7I&NIFK)ZF2W]Q/;8_ K!
+MUI-3AP&V]$J^)B060PSC_6;DUD5&G$N'AH=)NM++H\/>D%Z,HY$8_\+;W18V
+M1_?<$]F]1XB3VN& ER4<\M+>]EI$O[#WN,9/BUB2\\;_PQ2'D'236N\&I9*-
+MQ2GU->7%2J2DGI^2J)H?/LSQ[/8T):B+4L6^;[A-NW.[^]'4_-@FPM!>M?R\
+M3XV,AX(.DL3S[;I%OEB#5ER N)>HCE>0=KTAR.F/J,)8 - Y>HRPK(8ZJJ*Q
+MC$B%/C,T\!:E?).R57)2JAW YL+CCZ99KI80@[CQP<;NXM/%5?"P7PZA')*@
+M5'W;RQ""M=#!E]6EF]BLI%V8D_40_<]A[59B6W?/1J>2BA%Q]KOZB.LGIGVV
+MFZQRGTG0Z^TZEG!Q;J2^1KZ_E(JXI%/JB/WXPY'2EX(%G8F3G5-LAI^2L_;^
+M5^_#IQ>9VTP&4JN3I9 !U\VH%,7"#X\QNUX50*F:HIQ9K!W7 3O\EA?UIIQP
+M4:T 2:H]PPM%X;B4]@:F6X/_"7 9[/J0(1S4&JRGHIQZH-^=)^*F\!6&D9:?
+MD99.P%8#2/3TTO?8X:UP1E.<FWA?VXS-P-WNQ<*+E8&=6)F&5'./T-XXM%_R
+MXY:"7>Q7DD"KK)6*V,[-SG;Q'"T"A8I.DKV"I/+8VSNU%^^2$U%XD0/\7DN7
+MDF*EVL+]RJ?H$\#GR*J*'Z62>@]^0F!: P50+,+7L!OWU/*QP'.[D\EJRS20
+M!!XKG;&[K8#R53+F.D+00+.;7*48N62_^L"*XN):I9:1-X>)F6V44Z/9[6[F
+MVS&/4$R"L=L^1%<MX6+U1_[*CU"T4YC'1Y"B@&?T]6_VY]JI6HP\RYAIBR&/
+MBN+MS<X>2LFIL*V\0YB@DZVEDMOFM.WV=D*3J*\5@J22F8*1CGCC+>KDZ=U'
+M:L@15;BSUHQOJ*&@DHK9XF;6]E/E#;1+J9;4FEW"_Z/2=! !K9Y4FHM:\_?0
+M+-;1O9/R+I>BFXCKCA<(SL#9A*3&"492V;^Y@)N$X[,^+?#8B/K[OQ^*C982
+ME-CC_<?WT;J,>[?R0[Q[HNC!=,/7X/?C;YI01$,2A9*IEJO-#'K8W"<4G)"M
+MC<M>:(_AH[WBQ\7FQ\(!BU0<E0&VD-J"P$Y= LC0U=_/JG#DV/Y94:A6'H.?
+ML$__<Q(S]#IL+YR<VDU3BY*;I0S@VZW8MIU4"*Z-IQ#M]=7[PHX42%UT>(*^
+ME/"?QW_/&'RF2YR.TX*]899:V5/$D.:ORYU/DXB/AQ>22Y7,]#<7[_&G$JP"
+MJ*BNI*%M\\3&K[K^4ZV0$8RBF#BI=/.+V?W,U\?NU$.3JF2+KXD/K Z3TSHE
+MNKH?SY"8GK&O_[J#BZJ. ('X^<,'^_\/W*EW^Y*)IDM2N*1>D]"0U/[F-I,%
+MB8NTC9*KJP.O4]P:H;.'7_*"G:5KQ.W&^^4<7%*$E9.>NJ >J,+O]YRTB=ZM
+M$(GY@S.:G2B08]OL4KSMFJV;*HM.-8642/*1O"X#$5!-FW^]#MVS:L7V]/?P
+M9\6<DER(0IB!N)+5BL$)VBP@Q1Q"_)Y41TX%BX 05T4CM?9GLN4NA9:CFYVY
+M4I*$0)KGENC+^NG$[_ 3G[%8F%"9"Y+AL%W9%D4_[/?RGGGVF[:)B]>#2<4#
+MG:!;FZ2)?Y?1$!5ME]/:AE&@10.7>H"H=%KS+LM06'7:488T]IZ-EZB1%#7F
+M-B.P@U>@O;*"E91^AL>^Q930VY".E9:+DH>%V8@7L]5&]BXA'UN8:.^2H5M#
+MDC[J[-@.)";(CYZ4E-:?E(NVG:V ^G7G[E(2NMA=GP./J7NCDG*=Q,H.]2HJ
+MF_7<J(1+ 8.>2:FWLI8#"7_XP#;&VMY:^I64<8.) 5\"L*^4GE^&71N3\RHE
+M?<?"SZY(HHE,<3I9>(X#T0/'% J(M%O_B?Q];8Y)S3_Y5/9:XF?6:*BJAU;>
+MBI1:P^7Z^D</5\AWD9U-_(= H3I]5O66@*N@6EV/AD]3>E>ZT\Q^!O#+$K]6
+M7,:?'"LFJ9?:P-03QO9ORPU6FU^:MY_V2,Q4B\3^Y,2MRP8#$[J?E7]<58\3
+MN[CSJ.34;91VM<+=H%&TEB5;@Z+"V[9\$%.'=;R[@Z#"+1:0]^]46%H4MAV<
+M.I&@20FL\1*0H;*56Y.\TVQ:FQCB.,3 UQ"K=&2_]D.^SD=J!^CNK?I"HU[L
+M2*J.CD#70-/JT)3_[_"[5X^\1IAKJZ&;@R??UD[""\)K5=>43YR!9J.FC0SR
+MX1_PU,>'5IN(ED^^D-YPOY+2U<@75@K%]1RXKE[S7@6[BY@F<-MMGF_B6L3)
+M?HF>7(:=J@/M"R\V1Y/^1KYPK%;2\.7WP-9SC:(2GZ 56XJMII['UV;!Q89R
+MD:.*^OZ0A9/:L;;P].#:A[>DMU*9N ^+'@L^<._MPS]48)U867)7DKW!Z]7O
+MM9?*KX^-C8F\JVJBI'LE*%>"WZ, 3(^$C9M7GVJP3Y_!'G-@$I#KGIY?HYZU
+MJ=F3[ ^:\OS[[LI*[LOPK9X%"/B;CQCR+$2-4\/A;L VY9GYWD5V4IB-$0_"
+MXYGVMMVEH9B?X6HF_N;V6U6P&9Z:%1JZX'7_36D!TGJ!VD:F65"3.X[=Q30W
+M^_#%&%*V>8]7AP>WTH3-*,$F/\_(I&!:JKJ2,@.\$93Y;_KT#[G4NF0,\KT3
+M.;^:I\#4H@H/$)Z.3%6*GLTZP\Y*YW[A\,+>&UN+G[,HC+J6"L&=M_$'K@M&
+M#02KRFJ;G=NN7KM;H8&7DP3^.:XV/\#1M!A%1[6*^<'6PK)=@Z:OEAW\ Q?:
+M.38;[F=1H%[[LY$9VH"GEP,.SQ*L5+0ISYU>_K1: L$^&3_@%="-1H/[?HO>
+ME9>ET;'T[O6BJ)W"=IF;FJ2)2-+T[L+$,\;NAM6-B9>4BKHUEQG:@ P=HM 4
+MIEKHZ5*+8[".32BS]/3P-"N CX7!7@:[N_Y$M%T3%.#JRB*@<1")%EN#FI^'
+MFA>Z4']!ZFSV(/(#?)G6D;97DYM"W?6<NGS6FQQ5^]GQP"_&;J 0N F6F]^ 
+MF[NX?I=Q'6.QF: 0CY*3,KMYDYT:\]46E"#5G9"QC9^ZA8_PB<J[Q/?&6L:'
+MLIJL4PX4447QPOS%W/H@CKJ'CX\3N1/!FOMAR%S"%XKFQX;\F8,>'UN3A)W*
+MZN7^<C+EDJR9$OFEO7B >!>+ OX8#OSIK1=&ZIBMUMQ7JTQ)QE?ZP,#L_O;N
+M)40<2D2Z49H"TL2EPYS0FIZ.@*J2P3[\T/I%]Y"@D8VV5YJ[>E:RTPU0T800
+M5IM:45I=;*)7YQ03__(3XIVWDIJKNWQSL3K9]&% >_.'5B69FKV8E+"_S2+Y
+M;.(N R2VF:>>G$5*LY6:\P0,:M?#'(N5CYQNVXF[A)^JZ233U[WN(VK?C5M#
+MCKBWB+&.4H$/R_=Z! %0M,L]O:*ZEIC27F)^6\'CYL9EU^><D%I<M[D<F]D=
+MVUROU9*<C(*P2LTT]>8S[L%45EZ=7@B>F*6^B\E_(LB&T9X<^E2"6JQ.LL7J
+MK,8?]M*3H&P#BXU>&XJ\[<'5(##S4)83@MN3D@QWA*%!E/_%^L"CLMP9C)(,
+MOVQZ6L+   _'XI.4FEZ5RH9=3N3WC>$Z)Q(E]:BC4["@F[9-FX)XCH,'!,A=
+M7LOJ%>"KKHE*F9I+3J&CT)FJ_N5ZTCO"KI6+^UPW2'K1+<[;G))V>Z1 EY?!
+MD]-T/_ KG)V4K[912GN@4$F3AZ#;G/92/*8=*'F@59WCE&WR.LK=D*)MDY:3
+MDEI[C #1L3?EVIND@JJYA]9,D>IE:.S2>L#3UI:5C"*8GX/@D(O-W^BH0 /=
+MF8"\'FU8B:V1]YT#'O__K]H%2).9L=J06+Y#NKH/0?[!X=7\$\?3ZI^5RQHF
+M[?:+DYI!P\/G/C[E\8QT6AT$>7Q:U0SWV)!1B?[RB?NK\SIF]9?\C[V<@9&D
+MPH""RK[9VN+9R8>06YLD$9S>N(YQ03+36D+0\+ORIIJ"ZI*/EVP9ZC-EX-*"
+M\K@8_&^4A%D, SOM[I1V KF?O$!6AH]-J%>7)\HJS>I/0NM?K8Z<KD$:D[>I
+M)2/QM#6UAPM/AK;VI)&^/J:/B<#?[$<-V^G3R<U2J;,H3$JLI(F2_L?RQO)@
+M^O5?P)XU'YBVJP/)T7/X4K^M-EF*O_%I]-#_X.6/L%.)&EK[EVQ0@O#;V-!/
+M\%N;1%6YG[!V0_.4&3HT1U9-A(W[B+M;A%K!P/+'(CNBZY9C^WJ+J+:9O<-R
+M_3WV-!D+=IV6B9Y>BNFFG=#<W.Z&(\:6CAF "IN,CJWRLP+CU6#0_>]'+'O%
+M?IN9%IX@E%KRULOCU"C/HM([CO]U>J!#4E;Q@)C%^>;$%,73^HF4\:)TJA;0
+MR_,"OMR41II(T'\!/C\TUA##E%"!WO97FIUYEOL0RQ?0E)B;E5^Q&I<B'E;9
+MT#7N<B4TFP^LDK^XK)JEK=C6\_;UV;J@(-BZBU3S\VP)=O5T-C>BG4*<9 ?2
+MK(# IHB:B!A7P,]3HY.&C9F-CY.XAI$%U!D^;A+(B).IE5Y2JI)0.)JY QN:
+M8?Q\V\ZT2YZ? 9[UZTH2H)*7*)[1K_;V&XX0VZ\0D9.7\>_0D)!#H8>%DW)[
+MT?!Y/N9MPKR!BZ]&21*70:*:S5VKY;Q1DM%?G5S;:X29P/;#.C7U] M>N:EZ
+MF)I?H^[)\?3B>IO-):N96XJX<GZ,#=/].O[Z#I^P1&'&B*VO)$8#Q7[N+_"G
+M\Y>:F%J>G<&M1EY_@3OGQF(VX)K_G2%:=H<IOB:DG\75R\?%Y$$'$LJ^O746
+M5-Z+HJ6:_NCA]I^V,.\<E(*;FCR>4\4,@L!<W(*9M8%6*^4J\R_OTB<:G%O\
+MEE&<6J9TG2W6P]A9\DJ5I9V:".R$BRTH;O?V!Y0'3J*9>JU'I($40+'5%O?S
+MG79FKTO+DG>5EAKT%_><NN=/MYGMC5.4ZVS:7=+ Y!;> 1&6GEA O8><IT9Z
+M4N<3QR_[\"4(_I'RVOX#N;*KWZM,U]B*H<[ &WB#'H5#JB8+"%*ZAA[19N7Z
+M\F!AL"9:549#F[=!%5-6_'!R?;;<T%&)WM'_]_;"O9Q66=7QFETS\\CQ O#<
+MG%F2G9R4NHM EGW)TM$0]L<$O;*CEQ*+7E#UKEBZ])8]]V*'D%N"2)QWB9W;
+M\],[]G*!1MJLK(F2/V-@FE.9QOS,(,-6G9"J3)]^/2U,5[?9H\4R=I?';]A^
+MFJI69P.@L\Y0X-C*Q2P>[N.RFW:LFY)2OKFPPD7]U. 4]F9"4)Q3DXFE\9:8
+M\P_C1!264YR3MUA#S3/%+K RHQ!&@YG22)./;':I"WL+YG2#G_R6D=R?D?>2
+MP??L]9>GXFVFH9L>6P>V18SSY].7]\N[D.:95^J+@I%&#?[U/OOFVXF;G$&?
+M$E6_H_+[(0HD_\K/ [LF^81&AZU&H$^7T,3UE>;ZY5*($9E\H(*ZM+&F^_?M
+MSL\(5L/:R:]&>*>.$@**EFRVER+6;_#TQ Z?W%:?@H4:6L#YPL*-@*"'IE%;
+MJ/?&^3HT,D#^D8I96J-^<T&/@Z<=QU&$ @&1@Y*\BH"D7=GH$VXZ!]9'>F6+
+MFZJJCJ".2.KS[C?&C86(&K.9NE(!*<?6Q?I_OL-9![Q)CIZM1H*$>-+-W _B
+MHLF_%GC@O_VNAI(7O1#@V7NZ],N'2(^ E@:]KIZF58-)3='#U<34U0GG\K>^
+MDZ7+FEIXC+;E>O7^9CKRG*/RGW"W<\+9RW,0A(:2A9+TFZK9\E5O]_90U9!6
+MOW"#CYJ@^X$IZ='(BI22U/HU'*NYEGUG\\;\/J+0:YJX,IN2AY7SF-K2<);7
+MRZVFP;^*0W>R7M0MU\4G[_ CBQI03<UTK4>BQH-*S@"<!_&P7,>>OH.N%ZOS
+MI9< P\3[[N;W1K9[5T(0AKQ2>Z1:\M? <MSW@*#9H5W1BI8,1W^4N/)ZVO)O
+M.NW%VJI9D96;TJC_P5W.T9!"B:V#B5F T=HO]_/%KHW<GO6V25J:@8VXU?[O
+MT+ZV<Z]>=5Z:\E6#TL;%;N;/-D.VQ$M:;Y.VLIP(]\4P^J-=M+ 9K$=7T)Z>
+M6RIL]]0P&P]PF8CM6X;KD%6#&6K8!J80ME2GO;Y5$D6=H#6"\?XXU^[_]IB.
+MOQ"3CXE*F^)>?U'?R\<MYP$BT:U7F)5\7JJYEZC0&UOGYW?=[X>\4Y>90(N!
+MJH<# -S1EO&5\+V?LMF0;._2%$^\EH0=E:27WV" 6L',QM)>B%>=^K"3O[.%
+M^L$4GQ(FA;R=%!8;DB\/FH,-P?G%\D/O4Z"AF9R)59YRC!#JX<7'[]574E1*
+MI(J'B+GT?MM<' W*]MP/D#ZAHTRORY!?@\,Z$.06VO.KEE&0F+N&F]Y@1E<#
+MJM'C7-]")IQ3BYT0J R^FO;AI9OR\?:BGN7OFH)2732'>AMRJ^- >DF:!?:'
+M6(KR]K[OUM?U=YA?D*)2WIMD!@O-'L[PNA9#BU>2\8N0)E?'UL7EUA+<ZIV%
+M@TF:EZ1(P"$>_3605XM/IKB^2)X6D(G3/OC&^_;5SYY>BK^=GLOX7E,L_-A(
+MS^*6GU9?E8U604+H-D+E?NS\]^?%O[7$AUN/D4^+H'NJF0[(H0'!S4#&B_[?
+M$((,NYHR<9_1 L#U-?X_UUV <KMRRYN;&.SSD"Q0H(6^4-RK8<(VUA0N!86Y
+M@G%%F+:)<_: X,\5,ZR4GLF:G2@;,$X9S3!%UL?+ N]:D%K8;0WWBU>DD'G'
+M]O"9EFA7*%N83;6.VO+E_O7"P6O6JHH)F(Z->(X8S=_@U\K3"ZU]C!^6QEWK
+MAI!0S69EGFWPHHM2G)=7I*U\H:S6")&CZ!\%U<K!W*J2!)*3EEM6H(V6'0EP
+M[.X0,J>MPAN^\@B+JTU=P+&LECZO<)>+DL$3[>8:^]DUEG.1C**"FT.UJ0TB
+MD1"*H\F<H!&*G8R:JT&:\VXV&QR2E+"K+)M2L(NH8,/WTG^NF9ZLV4N0E9:"
+ME(C:;<?N]:]NEEB]O52)DK)7CQ<,Q((&VY"'DE^!SO^]C2!0J*%QV9:P\E<*
+MFE"U"KW/GO^T@(/A \H?G<\#!M./OENW/Z"YN NKHBC!\=<0,G_/'%">38VE
+MTEORSQ'P6E9031"7LY$'._$@=93'6EP;KYJ=T+F0)ZD#Q.;<,%V+O873LJB@
+MFY-SJ]3?UL+"1X^AJ*J[E%)*B,GJ9?7PXL=:,'VXAQI$LY_)-\=PQ?!SETVX
+M#+[&#H>-EKL3V@H"2M/\GU"6N+L7C4-Y\ZKQ8MF64$6BPJB$GJF66IB+N:6H
+MQ5[84Z#+7L+8ZL^\BON6./^:+%_941(\Q-HOPQC3LX2?D5N)(PL'" 1P"AR'
+MN+R]96H\QC VTIR3FZT025J];).ZQU=:T9P05DF.%?*_N8^K IYX__Y/<$ZF
+MN8U64,Y;GS_%P^7V+ME#I9&/VHL/E9CO@V+VNYZB]TOVD(^_6F<Y8$Z=",& 
+M3HX V*^EG$Q,QI;;,%"9 M3M-C"4&H=_D049W]&;F[I.3\?NQ.K,[B[VT,>]
+MG56HIJN6I"0647%D__02[]-<0!2M4+-*.P>"]4NN>Y11A<N:J/+R%N^U]\&J
+ML/>IGXF<6I3?F,%'0-R$@Y95D$>I@I.:7P4J-/8GHYS I")2JX*N=!.?R^ M
+M._OBB_!&JJ@-&!1#G-JJU.?^-<4+CM6F0PQO:+&WJ<'-B@/<H>)OEKYLA7NM
+M"Z"%W<#RL3;TY$#KQY&3EYY(@K/$EGKE)E&&_ ?.]U62F(T%K)>/N%K$#Y<)
+MY-C:Q<7"A$2CA9.72JE5PRC(C9R*K9K;EBN,W^/2\#X'A%"?E[255X,UEJB@
+MIRMTG_!3AHV5%XMFCY?5M-%R,_?QD(YYL)!3+J !;_+2\3>0RXKWH-.KOZJ0
+MT0WG$9V:ME %GW90E&SRO4*RWAWD_M1>IO&SHPZ>U8.HBYZ GIUQ(''@-A;8
+MC[J8L)R:2():>AZ](O_:%(?"I-#Z.9W^E7.ZKIK2PZ#;46OL]IKEX712BI#W
+M@)R*VNL/\%A#ODMTD5X2X=[Q9OIN$/24<962BI&+AGY(\></6:P3T;R0NUF]
+M1$YZY2)!^_?95+E4(]J"#9VB5TKCYMBT-D*:VX8^F$V'E=J\P>'YDD*4PH^/
+MNKY.J%VOH_J Q=S4_D8AP82$F9YCBFM2EKY8T_#SDO8G]]FOOJ6ZFMLJ2(&U
+MM\,&0<'6=]PC4E[2.YJWC(=2DKI4FJ/7[?:4TM,QMJ*<TB%;_<%#0^'\.!">
+MHG&L7_'6,S8W[\&7M!Z']@"6MV!P>LT7(1FO@[.6I+R+BL97FH?T[>?_PQ.Z
+MCX&/6B:ZI'+!P^KD]F7;XYY%V*AK6%I5@=%^^>)T)8&#\$S5E*V/.L.4^5C(
+M5,+=R+!BQKV E?WM1Z 25TSJ$48UG\:;A*M[OZ:36 J1UAK'PD1WK:KJXO&3
+M5YZW6?Y/7O1J]XG1,:/3P#9PK )T_<Z2G)C,_X]8?-GR1YZAUD'%:C/^+\1C
+M&G:D2<^"EY>YDH'$QO7A_HFV_:8=MM#"#9"H\&:\FL\0!Y20FP)-KD!3'@' 
+M9QS&TPJ6.YUZOIAT4JS9T>7&.L"BOT>N0$D5ZT$Y@(,IS?W^R@/&0Q8&K$F>
+M36U@6A" P96FL/KO@UY]5U9'DUF  ?9)+:)1X7_%VDO2#5@=BZ^%P)B@M!9W
+M\?/Y.F?0PHA0E%F^68(!\<[)6;V#GHZVI5^-I.H8_\9URI!0>G']G)Q^I-93
+M)]\%@*V)@\Z]]*^"@ 690?(M\"? UJN6DYV(3PVRDZ?QP=4N5J.(E[)]JBV3
+ME@-6"<0Y),?WVT]5G>V<JH#O$(7+!>S [L[S]E;PE9:-$DRGHHY7\<)D[C8Z
+M\4Z^1)\L4XB(GB:&T]KOX$\J*@# Q@V;AP"Z\$*?BLF&FL?S_>XR;L%_L%N%
+M0%>6F-K>PO"YB9(KCZ-;JZ#B=/ P%<C0=H))\G"+B6!ZUPF-]0I*E-8>H%R:
+ME[:Z7\TBY?0R\,6#]I.;JB:65]M4HO.=TC_+K87TGY:3F >>ZL7 W-9R/\"&
+MGDP\#-:!HV9P4MC]^DP Y32"G)!%B:^[2V!0>,GVP3WT_\J3._U>FY!#=HN@
+M6KMQ" 76P, 1SM*Y/JLA4E93>::0MI,1,=_&1E;"SLF4CHXA&GLD_P*!B8)0
+M?I6GN@/3_N<ZPC0+%(A?D*95O)<YIX]95_+V%%:3O9^=SI"4,)C1P"[^UL'C
+MY\^@'I&+N*:"E(CAY?#?QU'.08-#@HY2EHHM,=46-_O1AW*IO9M2Y(BV5-L+
+M0=CN%<4YOQ7]KI2.P8F4M'CL^[E@\E7/$TZ$D1N5AJR+N-X+]]W0R__P]*DT
+M!ZKXGP!42YPDM)JKR33UUF__VIVF6YVEE0/[ L\CP!!<FJE&HYG7&9)E,C3^
+M(UR(=ORP6/N]9A13&.^G\YY<LDUUB4'[-82XQQ035C/B\^U%N9F(38_6)03R
+MZM;#Q@-K\"&2J>^?@IJ$T2OW-/3F!UZ,FI1+'[\O.9H9TP %Q\I#XYR@G*6I
+M6HT=.*:=PV+C-C 6\(J<G)N,=XBJIGB/LR*"P>/<"H#WXD>XE4B#\[M"H8&E
+MNJG ]1YN/ML:LY.4I%5: N#6V3!7D#0,E]&"@Z#RDQ8R]AM4"+25C@BZ66)T
+M^<T-)=.7L_&O>DBVBS!0"<&6/3/EKQF'E*))LYNJ7Z>)PO)E[G?3"W+&E_I"
+MKE6*CZS">+YV>_%ICII 3K96BVP"D]&L!(_& T 76K!$'\;ANJRZ\\U^,]6]
+MQ9M:F([&_'"+EE1H7YO-2LG3^,/(@)"&K*Z@FEN_&Y_&7%W%]$7DQO;8O=!6
+MKOJ0G*K"[*"(K)P6.4^<G%K:\_#VW]0AN!R?OY>1*Z\B<JL8SW,9G8&)K)(<
+M^)<RC;J(P"RWW@-R2MI@NI^JAG+RRL36%,1 4**/L%M,N-Z6B97A$FWF]O#B
+MXU)0J ^?Y.K%G\]'S-S&1@_0%I::3;L?G9/@LH/0J_3'UM.*@5Y?@(*>DH.4
+MDYHJ\L@)RP%&U-LXJ(?%E5P%DQ;T>DZ[YQ+&Q;O&PU@1AA^6E9A*\03:T)!0
+MHDL'E)*:S?O5_<?Z4[GQE%6F^*I;0'73X2<#L=^QNOZRN)QS9M"#+.?M[G61
+M/%&B(;O?OUZ7L:_*DA_V_@= QB.8G(OX0I*5R,;!]/7V01W&'%2<F$^2K9(#
+MR,W(ZZ#0Y)]_O;@<ONO#8]*/VO:Q-&+23\B/_UK;MX*V>X:P@8/H+-W*[8>*
+MO8F\F7JWD&NKL997O\#A]6S0^J,<!DN>DE6L=XW'Q?0/\9._DE&QB1G6-] T
+MQ@%=E*.QQ?F^$Y/^2<C/ ,)%G)Y>I;>9_3"=VTE$\<;NQ=Q!#L&ZJH=?VEN/
+MTOY$\.X%:Q>3@K:XVZ7:@)F1E,?&]ZZ>\(V439X,DK)?^.<EWLQ$P)#KEH2=
+MN[V,AZ!>MV4^// 0-L]-G_M2@IJ-"%J CKZ [MC#QLT/Q<A+/H>Q_DY"MX"D
+M)%%QP/3L+L CG;VBD9"PFITEP\K0,8F2K773NAMB\BT:,- ++%.TF[#W0%ML
+M5 . YU/3GKP*VW2%JH*MMMTEN^UO]D\02H6KGKZ3A_>9O(73]O_ZY1-?I:E_
+MDXQ42TW9YO7^-Y>K2;2<P!Z:3(;&7[O1ZAX?T,/@B5><OI>>+4FTE*K1^_:=
+MTO6:ZIX$@IHZAY?RP,R?T0+,SY/O*@L(3XBU&W:_AUP&)J)RTV'0U^; )?22
+M%EU&4)99P-WS\:B$H[7;@WGS)]/1Y_07VZV*6;U45UY?*8Z:]PE%2:X*<YT@
+M@JF;H+>KR7OM-O0JU9U%LAN6@MR@DJP!^_'^4.-/?J&="D*=\HBJ1?''\#9Z
+M\HZRFJ^'=<DGK(:_].A<YMY2\JF6O$J;K<2BH+" K<&9>_(ZPH*8<)5>AX\H
+ME*2/@NTHZ>,C@P4'$DB7E0&[M@-#B^VGD0C#[J#@]8%0$(&[EZ"9@P%/HU&(
+M5D&K@)*Z?<L3E?+4^D]?EJ)=_;=>0OO=EPJ'R].\D*"=$A$6FZ&.GLCS[,;V
+M=M*O1:2+GIM25K%,6? 55/K.J8>ADQ^3!A/^H,R4)^_ZQ=..E9R5A4^^BT:@
+MFPK@U<W'SM:)E9ZMKPB_2K""22EZN<8PQ:."K_OQ%B"@@O)QLXWSR\GTS0L 
+MQ3&-KAZ+-AZ/J%>)A=;QX95L[_8EG9:>A8>)BYL(ZP44#Z:1])"*D8]A]/W5
+MFL2GKX">6W>BB(GH!9G2[L<6#YN1E+?$CDF&VOTGX/3&^EK=IWVX'_JJCXZ@
+MB?<QT3?DYPVDIKM8N))$7JK O_#L[A#EB9"83"E6"XK%E;["S 'X*LKSEYJP
+MG(V,"3UAL+\!X?VN^C7HFYI$@IA J[^6.*6_ ,_^SPW'!]K :I.[I;X&KQ;#
+MNYV/\_3QP]>5\*VR@+NFF+F-K8+:M82(7[> M:Y*A3GUQ-_7VWVFEIZ B,&?
+M;%Z_07SOUH_PH]'V$WR=$9 #K/OM9?K/XX>:D$J#JJRR!TIST<77PHOCHJ8O
+MNE&5I+=, 3YYY\0Z$4*W_8VYA;MKH)03&,^,3<_B_$S&6HIOGE^-8;H+"?+M
+ME_HV15">F5:#H%O\<I"4_?7.3.2+&Q?#."C8_5*J6@J3E&6%^V+$^>^7UZ.Z
+MO#9$E%22B/+_VK2H&%H&DI6*P^23Y=6V18*5DE;VAG264O*'KT<CYL6,D8']
+M59N1F*!/F<C&-\7OPM.?%GFVUX-?MZ69PO+VK^?8C1J6FZJ->%^+1N':Q;I?
+MNN:/U*B<CI9-;3A2<\<J0$S.]36?E)IO@IB-HJ FJPCAW?ZV.B])1<52OY =
+M'E*V$L-)S>X7Q]Y6SQP3AZVCUO^'&Y20\)?UZFWEPL#Q^8@+N5(R_BB9@U/8
+M>9Q4?867FG[(WK6Z9CK'C%P!K;:@DL,YLE?9YZKZK:"+K-^=F:ZLFJ[1.9,N
+M\,*XGQ8PDY.#&(ZPC-/ T1O4 -V:P?U**T9.FX ,TKFW_.93[Z:,.$*2/)D@
+M6J[##:Q4YMOQ@Z2]@$^3SU*( "TG/B7^IO)#BZZ0HIN.BYO4N\":U,[;XLK&
+MUL/<0-^="H)>BY::2+>ZV7+P]:_P)8_)@)U4B;^Z\<?1 %!PUJV:$)A7"1@\
+M]G[2X+P<E)[\@_Q3:[:/X5:*V;2<D+ZF48(:HE97#3'!]<7@EN^2>9><@UA_
+MB6RA:_<67Z.-GZ*_>(F=U8*4), O_/?P%6=.G,V7C V2J)7_4L#$R:E#\9^T
+M?DS%CHBHJZ7XQ;05QKWN\*&J^QO6$Y*!EZF7K:-OPB]/G_SJU$=^SK<?C\>>
+MT[.2FM'[Y.V4^BN$$%&],J*J6Q5.TO0=EA.IAE*RG>TVE3__K=/P78G/O8D:
+M]S!RFU%58S %G/*%59%8$\PPGN<^\7YEV_#+FL&]>^^<=B.EZ?XU=>X%CW"L
+MET.G2"!?G_#DU1+0]MM-< YL2Q*-0)&0>T5O_\U/%<.&]]^,5W^!/6:.70$6
+MQ^_FTE#M?9DFD9"0JI>YE]WRS<S'*M?.ZN 9B)SPEJ7KKXHQDD#E=/G][Y91
+MBK16&U>CB9C0_PLTO?P)SKHP@@ML_^SWMN^)6!!1GY"AJI'CO9U'(T#PK=S3
+MF4;7@KUAH(CJZL<0$,7!C;:YJIJO7;!Q1\7$-;_DQHJ:*/NJ.QS5H)G2]GFE
+MY!#BF51_G#L83+TAM[;GR$C5U_=XCI!)GDD.BXULEXM(U/-W[Y;;4HA?BUI/
+MB9PRK+(-40V+Q<EJ"EK5J:KUE8F:D_Z$>#*O!)&\UB^?V*^"ADM.L(+2H4OQ
+MT(P"HYU7@M.;\L*C.N_NVORP5ID$45F8P<R6C,[)_*VPTYT;@WBM09R"Q-&1
+M,]+*L9&&X;OVCWQ,]K_S^G#LE@NXC_F_2XBXGX%,D=1QO<0MSY:2C909GHL:
+MEE 1)T3*U4[;-.:%F !#&D&ZN:63T-+&KA/ (Q"<31\*1HV*WHF2U_'HVN-3
+M+^_P]F>25*.WD(Z:4'A%@PSZ->_7UZ?XL_Y-M'B!DN4#PM94=DH,M_>87XGF
+M+,?NU@5.?9:<\'U6J,!>BUG#QMQ?H90\E;$(@VP 5]*2967E]=&=ID7RF<J>
+M5$MH0,#$]'/'DI*X]H.#';)1O:"V\5 UDNZ]&Y>\KY>/JZP:&,<L7?VGVN&]
+MI(6^3)^KD4A$ P'"+9?FOL5;>*T?%G>/G)K!LX+(_ YUSPH'X\N(KMO!6)9M
+MGO)*3E,BDC[&)&;/4=A6A10)@ZODV=CX_9(B'YN5JHKRPC5M[_Y0N(NCA5H)
+M\C&CIJW7QO+"FI19K(^ASEVTAD+8H9;UT-'&F\:KJ]@0TM10K$6C]1 ?T6>R
+M;%\*FX>/DT 1'K3NUL;E8Q"]B@V'[1LAVD$)"@ 6!-K(AY;0/)RX9:MLEY_-
+M]-$P]B?;[YQY?H.62*BPI(^:P*I2*M$.2?. NYZ<@U9 FI&2H(_-Q^NN[O;^
+MRY!<DZZ6DMI7S:['T)01FE&@G1&;R+X\DCJ^);R4GAU>6K.18**7H:Z#Q+RC
+MG_F<69ZY0 _#R//F]\6K$HF/D[J2CPA7@HA8T]76U\J[TBP?LI&H=8FO\.'D
+M]^SZ)KM/C> ]<@%3EI(70.W>"N;"Q!22N)P4JX"3N*0^P-;U1L:N0ZB&F?#8
+MC[N6)NR<0LW]J</'".SE&,U^>8JHC8J:%^+5@M&C\S?O]'51H%I&FO"+F]D=
+M$_6X0GY=D%F"6\-R-?+FQ8^=G*2<I]*;F^VGD],KY=Q<$;>M,(M""V/7FR+V
+M-,6:<L'+18.XFJZ'AXNJ*];U-O EQZ:L$YAKOEK?#$R2?>_ZK^>6IMV_OUHK
+MAK&2TT$/ZLCF5SF5=GF4N:C,ZI!T@N+DQS"^,E6_%?&UEC!B@')P3H+9#LCW
+M6LC?&4"+3[=>J?J#FJ)LEI['\#7P;C;2EYRRD9HQEX+Q2O72?IB6G(Q0F8*C
+M,A/P]/( J(.*O)^8B+MIH(+S[84<+_)X6U8(O\.CUE<@\OGW^LBUJ/:D6_'/
+MG[>3O<+V'>0^Q1*2(_*;N(:&G[ZA0/U]_?ONNQ*0+]Z:JXNML B@Z ?H!LN(
+MJ:><@(SZ3IUSEI]!-^<;[O[#:9O=DIO6CU86@))?\?[KYNO(@&_5ARP1D7Q^
+MRISSD86:P/C&NB7D\_2)EM64>KFY@,+:X+PV4;BD=Y?;)_;S-OWPSZQ6RAF>
+M5WFY0]HXRP.NN'JCF)TSE5JIQHR#X1 \]C!7-8U6:9J;HU):GTJ@QL%]XB5&
+M_8R)K@_7L%.-US_NI]8VPI:6OHV]AXV3X%NZVJK4SXH"TKL5K]2)N)5'ME>=
+MPO1%)'_^"KNRK4.)H$U2LF.?B<W-^/;[!IT8X%N]D0**OH:6@8F%PT.R;,7V
+M)O4>6Y1%#9/;G?&)X-2N,_!6DEO,>0+QLS8R_\+^7-N]?;$*W2*$77##\1@J
+M@8&;=Z>06^R"0^#1\;?_T^ 2I&P)2CBJ.J%,R/&VUO("BZ>D0WJA%);U9%+_
+MQ>;\QO.&E!BHETV.JR10\P/^#,%+43VILDF.HWN^BZQ6BQ?6]_;ZUO#K+ASS
+MB;J-J9G!CIW)HAQ?(M_!0N&"GM\+GI)#5X.B-YCQOCE"_\8C68 6G8ZRB:CC
+M52G0/AP+A;"0G/?EP>?6_/IS+!:)KL*7NAEF0#O SN=45""6G0ZALD#CEE/)
+M%#3O]_'3DX!I@U&#OX1WG.S3P20ZP)*7H!.HK[.<%;C:GCSO_G/S ]91G\FH
+M0;ML(%?-R@\:QHK0EUX1CXN+C:]F_XJ#%L7^P&Z(AU97]Y>>J)^F\+Y[2._D
+M0]31 G$(N9/]&H!^F8A8L%.KP/XS.OXZY1J1^["0E*H+@O_STLQ0 Y$WEUJ>
+M\JOLGN64X[Q<@;6>4*^+S');(-L'W*Y;^Y"0DU:"J::9XT(W\,+CP^<7J8BO
+M@T:2D9H$P?COQNNFGY.#6AV2$HL:VI?V^A)'X3T:'$_M1HL.H8Y;%^0)_^?B
+MXH./E$1<BXS3Y!"]4L(E/K14)4NMC(JH4$.HGH9?K1GBZ=<C+B_"UI-[L0J*
+M=HU9H'"008URUL;N\,%V\)F^EZ&.B^</ N.-DH.%AK"H@O+ (7HGLA<ZD_*$
+MOC#(O:2'FL"*P,&:6;:$FGE9K76 F-DV+.WFPL.)7&P:V\>>4X",V3;%=J+:
+MDY>V5S9;K@Y3K,#0[])OUE.-O97MOU^)BL:$5_$*'N/' ,B4M%14G_8@CY:.
+M4Q$V-7OE^EJYAY"UJ:>]=A*[LX.E!EC/S\@LSO&KJ)[SL?62B?*2AYK#*A7N
+MTE?U?G >5:#1]I\%Z8'(#Y."T2 PO(#(T\<ZEO(!4%:^7<^17EUD^AC%U\D<
+M!KV*_W>"VKNB5Y+0L;/O]O-29YHJTI9+C%^5ZB#"/-#^R4:")9?ZJKX5HX!,
+MH?37^BY/G19>FF2N()MMAL*IR$VHWO,<3I:L3;D&[U-F=K;A,A#OYF6A@Y+Y
+MFP+R@7N*:80?AP)*S,\*5,J#JIN,B*FFDII3Q+!WPSKD]N7N\)J3E(MR@,.K
+M$7\5V*YR7@Z:\-B6\</U)")F1Q!+ABWVDU.2B/*3Z<[ L-@27EVRG5FNS-0/
+M09'X[^;.MHJ5EGV;G9^4BH# ]N7O\\_H]CA"^+J61:"$#/8\G=W PKF/K<YE
+MGHR)E(^?0\S?S03RRY>^GJJDJ&"':%6;%SO%]L7_\,N&G:.>]XJ:,J16T*<N
+M&/3'#LW#\YEZ7:%6CXMR-#BUF<W2.787[B>XV;).IO7\'T3)V^(:M?8[1YRL
+MJR22D?0N=>M%EHN<D@%:5ZQ:_N&IXQ80]@O]CG"#ES ,4L<0\3/6&W":G81]
+MBYJ^FD%-U7HO$]!CRXY@ 5J+AJ275LFR]626=\B+%MA9BI^AJ<"7@L#_U>+Q
+M4].#G@9@KYJ(G:P&EW'V-.+'^O/*EM%:T+Z?RJ'YDAOWB*ZG1) OTN6C2O&;
+MC'^/ I!ACA+1X_?UTM.%4));FU:E3$/EUX-AD)#0^Q(3U@W',;\5L+O VI ?
+MG+18F*DXA /'_,\+L+!3JX19J%OD$%W-,!&7]:L<&;V$@JGIE;K;X$F>EWK$
+MVP^>>8-3NHN=I5;EL";WYMK#UU^,; >]C4UCOG?HU"D9Q5LREIN?S R7N4TY
+MI9,%,\3V5A &DH^,VX.5AIX&:;>0D0*LU\>-QL661T^-DT.=JH!*IEZ:PI#E
+MEM>:P7^(0%U.2H*X[1G/\Y0+GBV7E192UZO\^O/N"YIQB\5&M+9;XM:M\1O/
+M'(6V,@2GDIZZH+>"QSO7<CO#0X_V;-=^8WZGM;YP]&?:9,]'\JNH@X*25Y^4
+M!^KF[-HT&)4/T8A'5ZD+;)1?\OP!6?<%T8* AJA.K[B):)^"\I8MM.9D6JM3
+MNX726FN65( @@RCH&-?M!8Q:DFBN&W6;A9.#H;)WFL#>+/J^/>"T>(JNCDB\
+MCZ5*X;6:<Y2[I:>Q_4>1T[_#QO"<VZ!?5I*9NY.VJLW.YOB\$G1WEAN>C_!6
+ME\4B-.X[RW#GIG1= X:MCHM/A^ 3];9PCJ7L0QB37Y33Z*USESO[^]B/4*Q(
+MZ9N;CX7<\7$/VMT6P\F/W+F:2_I-K::"@,SD^?ODTH_HEJRS>O>'4[8%MZV@
+M_H1QR\_$CL&'GYV0J;6)3A& EYKG_O/D]NW%A$B(J5J1'*GKWZ<07)7[D1QS
+M29+ ]G&6/I/+?(N3L0^=_)*4$-L(SP]D.)Q?A5>2FH%AI)<94;7FU@+(4H^@
+M5T.[#Z971@TPY^__SI*,H(M3@HCPA83 T_;2,!0!G)99KY:HJYUCAJ[#5I1\
+MK*4(OW2:1YFXC(:*5[_HU#WMM=;S0K95LUO5COI*;+9#$-@ X_]BRR>T4U>;
+M1Q&0II821I.;)</#\_ZD4)V+NE3'G(A;;=;W"+ <DXVV-Y.8V_13P,;&RO!<
+M4)6Z_0.?IG9!B>Z%%'"@%*^R6))6PYN_</_CW!/!'8K"K!NJNUY7GJK ZE4Z
+MXM'+%:Q9W(*&>A"MY^@NVJ_08HFF&8R]GI]!1D^7P,#.;<\HYH] '8B/7LVK
+M8$1;F9KL\C?Z3XJ2A7=<M[BWDDI3PIKH! 5)R\E#T(J67UZ3EHN7IG*DJN<R
+M]?#V;G%=D)']E8B:60',S])$4]&MEO<JV0DW[,;^[AJ:6Y&=L+E<.:*;FR+'
+M5M8\(%:1!"66JV32/<?RY=I7V)Q3FFR8^)V>U[6LR3C$]MY"PYH0>0F+?XRC
+M3<#^;>[P9AJ)5 9-@IR<CJ906>E( !D,STJ>@(YJ75YHNKG[FM'S[/3P,@-)
+MOME;5J1(G[N OXF% ONCRX_"CKR!E'V%J//GDY3!EY[-,A<L/\0 K[AR4=:5
+M%OMBH]L=G(@'KZ"! (/!:_22;AS%T)R"A:!9_'VXC(+$R\>9G_:*3_>(DXLH
+MAX#;:&SN,O<84)6 FM.I=HR5JL'B_/+D]5*VDIJYNPI&DHW17\=V=C[15W:(
+MO#^&#HZXCDC-#?^O#<NU@_ %C<FHE(/D!I#Q>=/27B_'RI6MPPI&NH.QEIJ*
+M\,9" 5+,Q]K)F7@YFI9:+?R?H)^-I.(]%>[WCSV T;$Z,9:9!=SE$)B2$ECW
+MD1J0P])O^[;$PKP*7H22H)NM0I/=*,-*_)"[FJF5]UH>IHY33>)6_;XK.X*C
+MK;BS@OI&=8X TB&6VD^[GD&7^CV8SZ:M]-XNQ?Y@PVR6GZJ\VH]=H+79V\[*
+MS0;2RK^RNHRL^Z6BK!X;K7*YQ].Z<X.^D3]65H^.0F&&V\S*H ;3+O_#R T_
+MKX* >X^>!&)7O1KSG<;POB.\B()UL'2^6]+*V?*4D9.%4%37@<'F[,)O[\..
+M\(.;EG>"@SF7MJ7)V1 .B+*MFB%<@TR^B,/3D3!4TM!'Q[*=%\<(C[<&X./U
+M^I;6DIV%@MJ2UH9(K:'P_<?6<\^)5X1'GH^6JRBGJM+MZ@_#&,)$TJIH@U*]
+MO:",7<?69W7F_D5(QE&?0?;C?YIBM+['W?AT!Q7OXM6&NGV!FJ>ZEYX%EY_ 
+MU-SN>O+:])R$FP!QB8/1^87 A(A?FU2C?%+"PCCR$.6CNHBSK5H$KH/!WD'9
+M(P/R7"2&B38128FR]YK,\_E %^5)IX_#FKB-?I91@:+D%6[WU4_2;).L;Y^7
+MVK[-UM5VFL8;KJ2. 8FOKI,$L(K)5EP; L7REH_PK+V>1-*[EBG)$N<V\/?!
+MD+:\D[R3AUZ#D;99R6^ X/B/R5K%D)B$BHOPDXR9L<1;83 WQC)DPUV8-EBP
+M6YF=5P7(XYSQL:F4B8*?!31'^F_Z ZV"69%>\5R+E9:*T->.QAJ<D ??H)NO
+M:*97\L8UT'O/M)-4H%L?D+^:23C,]^S6;"Z+5)&2@)J>5L*5TRJO$O 6X4^0
+ME)2'7EZ;I8"!TJ * <F+5NV:# B;6BRM#(Z^V/'Q-9;PU:K_AJ*KE<?#FA.T
+M<74&Z:0BS4[#$;M2_1""EZVO@$B^"0'V'W:7^@-<RY.=,$D<>]G?*\B>0M(-
+M6MF1FM+ ?,?3[N*1EI"$AXF#@6P-FU/4\QF?O!&%CE5*6J2'@QDYV?_04-O)
+M7Z 6N;C7E_4<F/8XVG7AJ7J1LH.IECZ6%G $HMQ2FZX'!S+=;-"'3%ZWD\!W
+L@U91N$5;H(.IY7/\[ +<DK:=41RCLZB8DY:;7E]*"<<2\\K1C(F(AZJX39  
+<!-- END ENCRYPTED FILE --->
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts
new file mode 100644
index 000000000..6760d5ec6
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/pts/tpg/94654-20170317-085441153.pts
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project><qdid>94654</qdid><name>mynewt-Updated</name>
+	<pics>
+		<profile>
+		<name>L2CAP</name>
+			<item><table>0</table><row>2</row></item>
+			<item><table>1</table><row>3</row></item>
+			<item><table>1</table><row>4</row></item>
+			<item><table>1</table><row>5</row></item>
+			<item><table>1</table><row>6</row></item>
+			<item><table>2</table><row>40</row></item>
+			<item><table>2</table><row>41</row></item>
+			<item><table>2</table><row>42</row></item>
+			<item><table>2</table><row>43</row></item>
+			<item><table>2</table><row>45</row></item>
+			<item><table>2</table><row>46</row></item>
+			<item><table>2</table><row>47</row></item>
+			<item><table>3</table><row>1</row></item>
+			<item><table>3</table><row>12</row></item>
+			<item><table>3</table><row>16</row></item>
+		</profile>
+		<profile>
+		<name>GAP</name>
+			<item><table>0</table><row>2</row></item>
+			<item><table>0a</table><row>4</row></item>
+			<item><table>10</table><row>1</row></item>
+			<item><table>12</table><row>1</row></item>
+			<item><table>13</table><row>1</row></item>
+			<item><table>13</table><row>2</row></item>
+			<item><table>14</table><row>1</row></item>
+			<item><table>15</table><row>1</row></item>
+			<item><table>16</table><row>1</row></item>
+			<item><table>18</table><row>1</row></item>
+			<item><table>18</table><row>2</row></item>
+			<item><table>19</table><row>1</row></item>
+			<item><table>19</table><row>2</row></item>
+			<item><table>19</table><row>3</row></item>
+			<item><table>20</table><row>1</row></item>
+			<item><table>20</table><row>2</row></item>
+			<item><table>20</table><row>3</row></item>
+			<item><table>20</table><row>4</row></item>
+			<item><table>20A</table><row>1</row></item>
+			<item><table>20A</table><row>10</row></item>
+			<item><table>20A</table><row>11</row></item>
+			<item><table>20A</table><row>12</row></item>
+			<item><table>20A</table><row>13</row></item>
+			<item><table>20A</table><row>14</row></item>
+			<item><table>20A</table><row>15</row></item>
+			<item><table>20A</table><row>16</row></item>
+			<item><table>20A</table><row>17</row></item>
+			<item><table>20A</table><row>2</row></item>
+			<item><table>20A</table><row>3</row></item>
+			<item><table>20A</table><row>4</row></item>
+			<item><table>20A</table><row>5</row></item>
+			<item><table>20A</table><row>7</row></item>
+			<item><table>20A</table><row>8</row></item>
+			<item><table>20A</table><row>9</row></item>
+			<item><table>21</table><row>1</row></item>
+			<item><table>21</table><row>2</row></item>
+			<item><table>21</table><row>3</row></item>
+			<item><table>21</table><row>4</row></item>
+			<item><table>21</table><row>5</row></item>
+			<item><table>21</table><row>6</row></item>
+			<item><table>21</table><row>7</row></item>
+			<item><table>21</table><row>8</row></item>
+			<item><table>21</table><row>9</row></item>
+			<item><table>22</table><row>1</row></item>
+			<item><table>22</table><row>2</row></item>
+			<item><table>22</table><row>3</row></item>
+			<item><table>22</table><row>4</row></item>
+			<item><table>23</table><row>1</row></item>
+			<item><table>23</table><row>2</row></item>
+			<item><table>23</table><row>3</row></item>
+			<item><table>23</table><row>4</row></item>
+			<item><table>23</table><row>5</row></item>
+			<item><table>24</table><row>1</row></item>
+			<item><table>24</table><row>2</row></item>
+			<item><table>24</table><row>3</row></item>
+			<item><table>24</table><row>4</row></item>
+			<item><table>25</table><row>1</row></item>
+			<item><table>25</table><row>2</row></item>
+			<item><table>25</table><row>3</row></item>
+			<item><table>25</table><row>4</row></item>
+			<item><table>25</table><row>7</row></item>
+			<item><table>25</table><row>8</row></item>
+			<item><table>25</table><row>9</row></item>
+			<item><table>26</table><row>1</row></item>
+			<item><table>26</table><row>2</row></item>
+			<item><table>26</table><row>3</row></item>
+			<item><table>26</table><row>4</row></item>
+			<item><table>27</table><row>1</row></item>
+			<item><table>27</table><row>2</row></item>
+			<item><table>28</table><row>1</row></item>
+			<item><table>28</table><row>2</row></item>
+			<item><table>29</table><row>1</row></item>
+			<item><table>29</table><row>2</row></item>
+			<item><table>29</table><row>3</row></item>
+			<item><table>29</table><row>4</row></item>
+			<item><table>30</table><row>1</row></item>
+			<item><table>30</table><row>2</row></item>
+			<item><table>31</table><row>1</row></item>
+			<item><table>31</table><row>2</row></item>
+			<item><table>31</table><row>3</row></item>
+			<item><table>31</table><row>4</row></item>
+			<item><table>31</table><row>5</row></item>
+			<item><table>31</table><row>6</row></item>
+			<item><table>31</table><row>7</row></item>
+			<item><table>31</table><row>8</row></item>
+			<item><table>31</table><row>9</row></item>
+			<item><table>32</table><row>1</row></item>
+			<item><table>32</table><row>2</row></item>
+			<item><table>32</table><row>3</row></item>
+			<item><table>33</table><row>1</row></item>
+			<item><table>33</table><row>2</row></item>
+			<item><table>33</table><row>3</row></item>
+			<item><table>33</table><row>4</row></item>
+			<item><table>33</table><row>5</row></item>
+			<item><table>33</table><row>6</row></item>
+			<item><table>34</table><row>1</row></item>
+			<item><table>34</table><row>2</row></item>
+			<item><table>34</table><row>3</row></item>
+			<item><table>35</table><row>1</row></item>
+			<item><table>35</table><row>2</row></item>
+			<item><table>35</table><row>3</row></item>
+			<item><table>35</table><row>4</row></item>
+			<item><table>35</table><row>5</row></item>
+			<item><table>35</table><row>7</row></item>
+			<item><table>35</table><row>8</row></item>
+			<item><table>35</table><row>9</row></item>
+			<item><table>37</table><row>1</row></item>
+			<item><table>37</table><row>2</row></item>
+			<item><table>37</table><row>3</row></item>
+			<item><table>5</table><row>1</row></item>
+			<item><table>5</table><row>2</row></item>
+			<item><table>5</table><row>3</row></item>
+			<item><table>5</table><row>4</row></item>
+			<item><table>6</table><row>1</row></item>
+			<item><table>7</table><row>1</row></item>
+			<item><table>7</table><row>2</row></item>
+			<item><table>8</table><row>1</row></item>
+			<item><table>8</table><row>2</row></item>
+			<item><table>8a</table><row>3</row></item>
+			<item><table>9</table><row>1</row></item>
+		</profile>
+		<profile>
+		<name>SUM ICS</name>
+		</profile>
+		<profile>
+		<name>PROD</name>
+		</profile>
+		<profile>
+		<name>GATT</name>
+			<item><table>1</table><row>1</row></item>
+			<item><table>1</table><row>2</row></item>
+			<item><table>2</table><row>2</row></item>
+			<item><table>3</table><row>1</row></item>
+			<item><table>3</table><row>10</row></item>
+			<item><table>3</table><row>11</row></item>
+			<item><table>3</table><row>12</row></item>
+			<item><table>3</table><row>14</row></item>
+			<item><table>3</table><row>15</row></item>
+			<item><table>3</table><row>16</row></item>
+			<item><table>3</table><row>17</row></item>
+			<item><table>3</table><row>18</row></item>
+			<item><table>3</table><row>19</row></item>
+			<item><table>3</table><row>2</row></item>
+			<item><table>3</table><row>20</row></item>
+			<item><table>3</table><row>21</row></item>
+			<item><table>3</table><row>22</row></item>
+			<item><table>3</table><row>23</row></item>
+			<item><table>3</table><row>3</row></item>
+			<item><table>3</table><row>4</row></item>
+			<item><table>3</table><row>5</row></item>
+			<item><table>3</table><row>6</row></item>
+			<item><table>3</table><row>7</row></item>
+			<item><table>3</table><row>8</row></item>
+			<item><table>3</table><row>9</row></item>
+			<item><table>4</table><row>1</row></item>
+			<item><table>4</table><row>10</row></item>
+			<item><table>4</table><row>11</row></item>
+			<item><table>4</table><row>12</row></item>
+			<item><table>4</table><row>14</row></item>
+			<item><table>4</table><row>15</row></item>
+			<item><table>4</table><row>16</row></item>
+			<item><table>4</table><row>17</row></item>
+			<item><table>4</table><row>18</row></item>
+			<item><table>4</table><row>19</row></item>
+			<item><table>4</table><row>2</row></item>
+			<item><table>4</table><row>20</row></item>
+			<item><table>4</table><row>21</row></item>
+			<item><table>4</table><row>22</row></item>
+			<item><table>4</table><row>23</row></item>
+			<item><table>4</table><row>3</row></item>
+			<item><table>4</table><row>4</row></item>
+			<item><table>4</table><row>5</row></item>
+			<item><table>4</table><row>6</row></item>
+			<item><table>4</table><row>7</row></item>
+			<item><table>4</table><row>8</row></item>
+			<item><table>4</table><row>9</row></item>
+			<item><table>7</table><row>2</row></item>
+			<item><table>7</table><row>3</row></item>
+			<item><table>7</table><row>4</row></item>
+		</profile>
+		<profile>
+		<name>ATT</name>
+			<item><table>1</table><row>1</row></item>
+			<item><table>1</table><row>2</row></item>
+			<item><table>2</table><row>2</row></item>
+			<item><table>3</table><row>1</row></item>
+			<item><table>3</table><row>10</row></item>
+			<item><table>3</table><row>11</row></item>
+			<item><table>3</table><row>12</row></item>
+			<item><table>3</table><row>13</row></item>
+			<item><table>3</table><row>14</row></item>
+			<item><table>3</table><row>15</row></item>
+			<item><table>3</table><row>16</row></item>
+			<item><table>3</table><row>17</row></item>
+			<item><table>3</table><row>18</row></item>
+			<item><table>3</table><row>19</row></item>
+			<item><table>3</table><row>2</row></item>
+			<item><table>3</table><row>20</row></item>
+			<item><table>3</table><row>22</row></item>
+			<item><table>3</table><row>23</row></item>
+			<item><table>3</table><row>24</row></item>
+			<item><table>3</table><row>25</row></item>
+			<item><table>3</table><row>26</row></item>
+			<item><table>3</table><row>27</row></item>
+			<item><table>3</table><row>28</row></item>
+			<item><table>3</table><row>29</row></item>
+			<item><table>3</table><row>3</row></item>
+			<item><table>3</table><row>4</row></item>
+			<item><table>3</table><row>5</row></item>
+			<item><table>3</table><row>6</row></item>
+			<item><table>3</table><row>7</row></item>
+			<item><table>3</table><row>8</row></item>
+			<item><table>3</table><row>9</row></item>
+			<item><table>4</table><row>1</row></item>
+			<item><table>4</table><row>10</row></item>
+			<item><table>4</table><row>11</row></item>
+			<item><table>4</table><row>12</row></item>
+			<item><table>4</table><row>13</row></item>
+			<item><table>4</table><row>14</row></item>
+			<item><table>4</table><row>15</row></item>
+			<item><table>4</table><row>16</row></item>
+			<item><table>4</table><row>17</row></item>
+			<item><table>4</table><row>18</row></item>
+			<item><table>4</table><row>19</row></item>
+			<item><table>4</table><row>2</row></item>
+			<item><table>4</table><row>20</row></item>
+			<item><table>4</table><row>22</row></item>
+			<item><table>4</table><row>23</row></item>
+			<item><table>4</table><row>24</row></item>
+			<item><table>4</table><row>25</row></item>
+			<item><table>4</table><row>26</row></item>
+			<item><table>4</table><row>27</row></item>
+			<item><table>4</table><row>28</row></item>
+			<item><table>4</table><row>29</row></item>
+			<item><table>4</table><row>3</row></item>
+			<item><table>4</table><row>4</row></item>
+			<item><table>4</table><row>5</row></item>
+			<item><table>4</table><row>6</row></item>
+			<item><table>4</table><row>7</row></item>
+			<item><table>4</table><row>8</row></item>
+			<item><table>4</table><row>9</row></item>
+			<item><table>5</table><row>2</row></item>
+			<item><table>5</table><row>3</row></item>
+			<item><table>5</table><row>4</row></item>
+		</profile>
+		<profile>
+		<name>SM</name>
+			<item><table>1</table><row>1</row></item>
+			<item><table>1</table><row>2</row></item>
+			<item><table>2</table><row>1</row></item>
+			<item><table>2</table><row>2</row></item>
+			<item><table>2</table><row>3</row></item>
+			<item><table>2</table><row>5</row></item>
+			<item><table>3</table><row>1</row></item>
+			<item><table>4</table><row>1</row></item>
+			<item><table>4</table><row>2</row></item>
+			<item><table>5</table><row>1</row></item>
+			<item><table>5</table><row>2</row></item>
+			<item><table>5</table><row>3</row></item>
+			<item><table>5</table><row>4</row></item>
+			<item><table>7</table><row>1</row></item>
+			<item><table>7</table><row>2</row></item>
+			<item><table>7</table><row>3</row></item>
+		</profile>
+	</pics>
+	</project>
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/ans/ble_svc_ans.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/include/services/ans/ble_svc_ans.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/ans/ble_svc_ans.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/include/services/ans/ble_svc_ans.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/pkg.yml
new file mode 100644
index 000000000..691e566e1
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/pkg.yml
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/ans
+pkg.description: Alert Notification Service Server.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - ans
+    - nimble
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_ans_init: 'MYNEWT_VAL(BLE_SVC_ANS_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ans/src/ble_svc_ans.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/src/ble_svc_ans.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ans/src/ble_svc_ans.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/src/ble_svc_ans.c
index 5b64f18c4..2fc50c4be 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ans/src/ble_svc_ans.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/src/ble_svc_ans.c
@@ -20,11 +20,11 @@
 #include <assert.h>
 #include <string.h>
 
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "host/ble_hs.h"
-#include "host/ble_gap.h"
-#include "services/ans/ble_svc_ans.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#include "../include/services/ans/ble_svc_ans.h"
 
 /* Max length of new alert info string */
 #define BLE_SVC_ANS_INFO_STR_MAX_LEN        18
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/syscfg.yml
new file mode 100644
index 000000000..74de8d963
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ans/syscfg.yml
@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+syscfg.defs:
+    BLE_SVC_ANS_NEW_ALERT_CAT:
+        description: "Initial supported new alert category bitmask."
+        value: 0
+
+    BLE_SVC_ANS_UNR_ALERT_CAT:
+        description: "Initial supported unread alert category bitmask."
+        value: 0
+
+    BLE_SVC_ANS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the alert notification service.
+        value: 303
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/bas/ble_svc_bas.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/include/services/bas/ble_svc_bas.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/bas/ble_svc_bas.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/include/services/bas/ble_svc_bas.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/pkg.yml
new file mode 100644
index 000000000..afdc69421
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/pkg.yml
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/bas
+pkg.description: Battery Service
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - bas
+    - nimble
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_bas_init: 'MYNEWT_VAL(BLE_SVC_BAS_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/bas/src/ble_svc_bas.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/src/ble_svc_bas.c
similarity index 92%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/bas/src/ble_svc_bas.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/src/ble_svc_bas.c
index 631519cf9..317b11627 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/bas/src/ble_svc_bas.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/src/ble_svc_bas.c
@@ -20,11 +20,11 @@
 #include <assert.h>
 #include <string.h>
 
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "host/ble_hs.h"
-#include "host/ble_gap.h"
-#include "services/bas/ble_svc_bas.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#include "../include/services/bas/ble_svc_bas.h"
 
 /* Characteristic value handles */
 #if MYNEWT_VAL(BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE) > 0
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/syscfg.yml
new file mode 100644
index 000000000..279930f14
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/bas/syscfg.yml
@@ -0,0 +1,34 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+syscfg.defs:
+    BLE_SVC_BAS_BATTERY_LEVEL_READ_PERM:
+        description: >
+            Defines permissions for reading "Battery Level" characteristics. Can
+            be zero to allow read without extra permissions or combination of:
+                BLE_GATT_CHR_F_READ_ENC
+                BLE_GATT_CHR_F_READ_AUTHEN
+                BLE_GATT_CHR_F_READ_AUTHOR
+        value: 0
+    BLE_SVC_BAS_BATTERY_LEVEL_NOTIFY_ENABLE:
+        description: >
+            Set to 1 to support notification or 0 to disable it.
+        value: 1
+    BLE_SVC_BAS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the battery level service.
+        value: 303
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/include/services/dis/ble_svc_dis.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/include/services/dis/ble_svc_dis.h
new file mode 100644
index 000000000..d095e959a
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/include/services/dis/ble_svc_dis.h
@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#ifndef H_BLE_SVC_DIS_
+#define H_BLE_SVC_DIS_
+
+/**
+ * Example:
+ *
+ *    char firmware_revision[20] = '?.?.?';
+ *    struct image_version iv;
+ *    if (!imgr_my_version(&iv)) {
+ *	snprintf(firmware_revision, sizeof(firmware_revision),
+ *		 "%u.%u.%u", iv.iv_major, iv.iv_minor, iv.iv_revision);
+ *    }
+ *    ble_svc_dis_manufacturer_name_set("MyNewt");
+ *    ble_svc_dis_firmware_revision_set(firmware_revision);
+ *
+ */
+
+#define BLE_SVC_DIS_UUID16					0x180A
+#define BLE_SVC_DIS_CHR_UUID16_SYSTEM_ID			0x2A23
+#define BLE_SVC_DIS_CHR_UUID16_MODEL_NUMBER			0x2A24
+#define BLE_SVC_DIS_CHR_UUID16_SERIAL_NUMBER			0x2A25
+#define BLE_SVC_DIS_CHR_UUID16_FIRMWARE_REVISION 		0x2A26
+#define BLE_SVC_DIS_CHR_UUID16_HARDWARE_REVISION 		0x2A27
+#define BLE_SVC_DIS_CHR_UUID16_SOFTWARE_REVISION 		0x2A28
+#define BLE_SVC_DIS_CHR_UUID16_MANUFACTURER_NAME		0x2A29
+
+/**
+ * Structure holding data for the main characteristics
+ */
+struct ble_svc_dis_data {
+    /**
+     * Model number.
+     * Represent the model number that is assigned by the device vendor.
+     */
+    const char *model_number;
+    /**
+     * Serial number.
+     * Represent the serial number for a particular instance of the device.
+     */
+    const char *serial_number;
+    /**
+     * Firmware revision.
+     * Represent the firmware revision for the firmware within the device.
+     */
+    const char *firmware_revision;
+    /**
+     * Hardware revision.
+     * Represent the hardware revision for the hardware within the device.
+     */
+    const char *hardware_revision;
+    /**
+     * Software revision.
+     * Represent the software revision for the software within the device.
+     */
+    const char *software_revision;
+    /**
+     * Manufacturer name.
+     * Represent the name of the manufacturer of the device.
+     */
+    const char *manufacturer_name;
+    /**
+     * System ID.
+     * Represent the System Id of the device.
+     */
+    const char *system_id;
+};
+
+/**
+ * Variable holding data for the main characteristics.
+ */
+extern struct ble_svc_dis_data ble_svc_dis_data;
+
+/**
+ * Service initialisation.
+ * Automatically called during package initialisation.
+ */
+void ble_svc_dis_init(void);
+
+const char *ble_svc_dis_model_number(void);
+int ble_svc_dis_model_number_set(const char *value);
+const char *ble_svc_dis_serial_number(void);
+int ble_svc_dis_serial_number_set(const char *value);
+const char *ble_svc_dis_firmware_revision(void);
+int ble_svc_dis_firmware_revision_set(const char *value);
+const char *ble_svc_dis_hardware_revision(void);
+int ble_svc_dis_hardware_revision_set(const char *value);
+const char *ble_svc_dis_software_revision(void);
+int ble_svc_dis_software_revision_set(const char *value);
+const char *ble_svc_dis_manufacturer_name(void);
+int ble_svc_dis_manufacturer_name_set(const char *value);
+const char *ble_svc_dis_system_id(void);
+int ble_svc_dis_system_id_set(const char *value);
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/pkg.yml
new file mode 100644
index 000000000..b914ca90a
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/pkg.yml
@@ -0,0 +1,34 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/dis
+pkg.description: Device Information Service Implementation.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - dis
+    - nimble
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_dis_init: 'MYNEWT_VAL(BLE_SVC_DIS_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/src/ble_svc_dis.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/src/ble_svc_dis.c
new file mode 100644
index 000000000..55c6f1d56
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/src/ble_svc_dis.c
@@ -0,0 +1,331 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+#include <assert.h>
+#include <string.h>
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/services/dis/ble_svc_dis.h"
+
+/* Device information */
+struct ble_svc_dis_data ble_svc_dis_data = {
+    .model_number      = MYNEWT_VAL(BLE_SVC_DIS_MODEL_NUMBER_DEFAULT),
+    .serial_number     = MYNEWT_VAL(BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT),
+    .firmware_revision = MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT),
+    .hardware_revision = MYNEWT_VAL(BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT),
+    .software_revision = MYNEWT_VAL(BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT),
+    .manufacturer_name = MYNEWT_VAL(BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT),
+    .system_id         = MYNEWT_VAL(BLE_SVC_DIS_SYSTEM_ID_DEFAULT),
+};
+
+/* Access function */
+#if (MYNEWT_VAL(BLE_SVC_DIS_MODEL_NUMBER_READ_PERM)      >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM)     >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM) >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM) >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM) >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM) >= 0) || \
+    (MYNEWT_VAL(BLE_SVC_DIS_SYSTEM_ID_READ_PERM) >= 0)
+static int
+ble_svc_dis_access(uint16_t conn_handle, uint16_t attr_handle,
+                   struct ble_gatt_access_ctxt *ctxt, void *arg);
+#endif
+
+static const struct ble_gatt_svc_def ble_svc_dis_defs[] = {
+    { /*** Service: Device Information Service (DIS). */
+        .type = BLE_GATT_SVC_TYPE_PRIMARY,
+        .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_UUID16),
+        .characteristics = (struct ble_gatt_chr_def[]) { {
+#if (MYNEWT_VAL(BLE_SVC_DIS_MODEL_NUMBER_READ_PERM) >= 0)
+	    /*** Characteristic: Model Number String */
+            .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_CHR_UUID16_MODEL_NUMBER),
+            .access_cb = ble_svc_dis_access,
+            .flags = BLE_GATT_CHR_F_READ |
+	             MYNEWT_VAL(BLE_SVC_DIS_MODEL_NUMBER_READ_PERM),
+        }, {
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM) >= 0)
+	    /*** Characteristic: Serial Number String */
+            .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_CHR_UUID16_SERIAL_NUMBER),
+            .access_cb = ble_svc_dis_access,
+            .flags = BLE_GATT_CHR_F_READ |
+	             MYNEWT_VAL(BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM),
+        }, {
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM) >= 0)
+	    /*** Characteristic: Hardware Revision String */
+            .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_CHR_UUID16_HARDWARE_REVISION),
+            .access_cb = ble_svc_dis_access,
+            .flags = BLE_GATT_CHR_F_READ |
+	             MYNEWT_VAL(BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM),
+        }, {
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM) >= 0)
+	    /*** Characteristic: Firmware Revision String */
+            .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_CHR_UUID16_FIRMWARE_REVISION),
+            .access_cb = ble_svc_dis_access,
+            .flags = BLE_GATT_CHR_F_READ |
+	             MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM),
+        }, {
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM) >= 0)
+	    /*** Characteristic: Software Revision String */
+            .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_CHR_UUID16_SOFTWARE_REVISION),
+            .access_cb = ble_svc_dis_access,
+            .flags = BLE_GATT_CHR_F_READ |
+	             MYNEWT_VAL(BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM),
+        }, {
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM) >= 0)
+	    /*** Characteristic: Manufacturer Name */
+            .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_CHR_UUID16_MANUFACTURER_NAME),
+            .access_cb = ble_svc_dis_access,
+            .flags = BLE_GATT_CHR_F_READ |
+	             MYNEWT_VAL(BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM),
+        }, {
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_SYSTEM_ID_READ_PERM) >= 0)
+      /*** Characteristic: System Id */
+            .uuid = BLE_UUID16_DECLARE(BLE_SVC_DIS_CHR_UUID16_SYSTEM_ID),
+            .access_cb = ble_svc_dis_access,
+            .flags = BLE_GATT_CHR_F_READ |
+               MYNEWT_VAL(BLE_SVC_DIS_SYSTEM_ID_READ_PERM),
+            }, {
+#endif
+
+            0, /* No more characteristics in this service */
+        }, }
+    },
+
+    {
+        0, /* No more services. */
+    },
+};
+
+/**
+ * Simple read access callback for the device information service
+ * characteristic.
+ */
+#if (MYNEWT_VAL(BLE_SVC_DIS_MODEL_NUMBER_READ_PERM)      >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM)     >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM) >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM) >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM) >= 0) ||	\
+    (MYNEWT_VAL(BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM) >= 0) || \
+    (MYNEWT_VAL(BLE_SVC_DIS_SYSTEM_ID_READ_PERM) >= 0)
+static int
+ble_svc_dis_access(uint16_t conn_handle, uint16_t attr_handle,
+                   struct ble_gatt_access_ctxt *ctxt, void *arg)
+{
+    uint16_t uuid    = ble_uuid_u16(ctxt->chr->uuid);
+    const char *info = NULL;
+
+    switch(uuid) {
+#if (MYNEWT_VAL(BLE_SVC_DIS_MODEL_NUMBER_READ_PERM) >= 0)
+    case BLE_SVC_DIS_CHR_UUID16_MODEL_NUMBER:
+        info = ble_svc_dis_data.model_number;
+#ifdef MYNEWT_VAL_BLE_SVC_DIS_MODEL_NUMBER_NAME_DEFAULT
+        if (info == NULL) {
+            info = MYNEWT_VAL(BLE_SVC_DIS_MODEL_NUMBER_DEFAULT);
+        }
+#endif
+        break;
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM) >= 0)
+    case BLE_SVC_DIS_CHR_UUID16_SERIAL_NUMBER:
+        info = ble_svc_dis_data.serial_number;
+#ifdef MYNEWT_VAL_BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT
+        if (info == NULL) {
+            info = MYNEWT_VAL(BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT);
+        }
+#endif
+        break;
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM) >= 0)
+    case BLE_SVC_DIS_CHR_UUID16_FIRMWARE_REVISION:
+        info = ble_svc_dis_data.firmware_revision;
+#ifdef MYNEWT_VAL_BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT
+        if (info == NULL) {
+            info = MYNEWT_VAL(BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT);
+        }
+#endif
+        break;
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM) >= 0)
+    case BLE_SVC_DIS_CHR_UUID16_HARDWARE_REVISION:
+        info = ble_svc_dis_data.hardware_revision;
+#ifdef MYNEWT_VAL_BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT
+        if (info == NULL) {
+            info = MYNEWT_VAL(BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT);
+        }
+#endif
+        break;
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM) >= 0)
+    case BLE_SVC_DIS_CHR_UUID16_SOFTWARE_REVISION:
+        info = ble_svc_dis_data.software_revision;
+#ifdef MYNEWT_VAL_BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT
+        if (info == NULL) {
+            info = MYNEWT_VAL(BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT);
+        }
+#endif
+        break;
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM) >= 0)
+    case BLE_SVC_DIS_CHR_UUID16_MANUFACTURER_NAME:
+        info = ble_svc_dis_data.manufacturer_name;
+#ifdef MYNEWT_VAL_BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT
+        if (info == NULL) {
+            info = MYNEWT_VAL(BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT);
+        }
+#endif
+        break;
+#endif
+#if (MYNEWT_VAL(BLE_SVC_DIS_SYSTEM_ID_READ_PERM) >= 0)
+    case BLE_SVC_DIS_CHR_UUID16_SYSTEM_ID:
+        info = ble_svc_dis_data.system_id;
+#ifdef MYNEWT_VAL_BLE_SVC_DIS_SYSTEM_ID_DEFAULT
+        if (info == NULL) {
+            info = MYNEWT_VAL(BLE_SVC_DIS_SYSTEM_ID_DEFAULT);
+        }
+#endif
+        break;
+#endif
+    default:
+        assert(0);
+        return BLE_ATT_ERR_UNLIKELY;
+    }
+
+    if (info != NULL) {
+       int rc = os_mbuf_append(ctxt->om, info, strlen(info));
+       return rc == 0 ? 0 : BLE_ATT_ERR_INSUFFICIENT_RES;
+    }
+
+    return 0;
+}
+#endif
+
+const char *
+ble_svc_dis_model_number(void)
+{
+    return ble_svc_dis_data.model_number;
+}
+
+int
+ble_svc_dis_model_number_set(const char *value)
+{
+    ble_svc_dis_data.model_number = value;
+    return 0;
+}
+
+const char *
+ble_svc_dis_serial_number(void)
+{
+    return ble_svc_dis_data.serial_number;
+}
+
+int
+ble_svc_dis_serial_number_set(const char *value)
+{
+    ble_svc_dis_data.serial_number = value;
+    return 0;
+}
+
+const char *
+ble_svc_dis_firmware_revision(void)
+{
+    return ble_svc_dis_data.firmware_revision;
+}
+
+int
+ble_svc_dis_firmware_revision_set(const char *value)
+{
+    ble_svc_dis_data.firmware_revision = value;
+    return 0;
+}
+
+const char *
+ble_svc_dis_hardware_revision(void)
+{
+    return ble_svc_dis_data.hardware_revision;
+}
+
+int
+ble_svc_dis_hardware_revision_set(const char *value)
+{
+    ble_svc_dis_data.hardware_revision = value;
+    return 0;
+}
+
+const char *
+ble_svc_dis_software_revision(void)
+{
+    return ble_svc_dis_data.software_revision;
+}
+
+int
+ble_svc_dis_software_revision_set(const char *value)
+{
+    ble_svc_dis_data.software_revision = value;
+    return 0;
+}
+
+const char *
+ble_svc_dis_manufacturer_name(void)
+{
+    return ble_svc_dis_data.manufacturer_name;
+}
+
+int
+ble_svc_dis_manufacturer_name_set(const char *value)
+{
+    ble_svc_dis_data.manufacturer_name = value;
+    return 0;
+}
+
+const char *
+ble_svc_dis_system_id(void)
+{
+    return ble_svc_dis_data.system_id;
+}
+
+int
+ble_svc_dis_system_id_set(const char *value)
+{
+    ble_svc_dis_data.system_id = value;
+    return 0;
+}
+
+/**
+ * Initialize the DIS package.
+ */
+void
+ble_svc_dis_init(void)
+{
+    int rc;
+
+    /* Ensure this function only gets called by sysinit. */
+    SYSINIT_ASSERT_ACTIVE();
+
+    rc = ble_gatts_count_cfg(ble_svc_dis_defs);
+    SYSINIT_PANIC_ASSERT(rc == 0);
+
+    rc = ble_gatts_add_svcs(ble_svc_dis_defs);
+    SYSINIT_PANIC_ASSERT(rc == 0);
+}
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/syscfg.yml
new file mode 100644
index 000000000..b306d3bb5
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/dis/syscfg.yml
@@ -0,0 +1,109 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_SVC_DIS_DEFAULT_READ_PERM:
+        description: >
+            Defines default permissions for reading characteristics. Can be
+            zero to allow read without extra permissions or combination of:
+                BLE_GATT_CHR_F_READ_ENC
+                BLE_GATT_CHR_F_READ_AUTHEN
+                BLE_GATT_CHR_F_READ_AUTHOR
+            Set to '-1' to remove this characteristic.
+        value: -1
+    BLE_SVC_DIS_MODEL_NUMBER_READ_PERM:
+        description: >
+            Defines permissions for reading "Model Number" characteristics.
+            Can be set to BLE_SVC_DIS_DEFAULT_READ_PERM or use any of the
+            possible values defined for that setting.
+        value: 0
+    BLE_SVC_DIS_MODEL_NUMBER_DEFAULT:
+        description: >
+            Defines a default value for "Model number" if not set with
+            'ble_svc_dis_model_number_set'.
+        value: '"Apache Mynewt NimBLE"'
+    BLE_SVC_DIS_SERIAL_NUMBER_READ_PERM:
+        description: >
+            Defines permissions for reading "Serial Number" characteristics.
+            Can be set to BLE_SVC_DIS_DEFAULT_READ_PERM or use any of the
+            possible values defined for that setting.
+        value: MYNEWT_VAL(BLE_SVC_DIS_DEFAULT_READ_PERM)
+    BLE_SVC_DIS_SERIAL_NUMBER_DEFAULT:
+        description: >
+            Defines a default value for "Serial number" if not set with
+            'ble_svc_dis_serial_number_set'.
+        value: NULL
+    BLE_SVC_DIS_HARDWARE_REVISION_READ_PERM:
+        description: >
+            Defines permissions for reading "Hardware Revision" characteristics.
+            Can be set to BLE_SVC_DIS_DEFAULT_READ_PERM or use any of the
+            possible values defined for that setting.
+        value: MYNEWT_VAL(BLE_SVC_DIS_DEFAULT_READ_PERM)
+    BLE_SVC_DIS_HARDWARE_REVISION_DEFAULT:
+        description: >
+            Defines a default value for "Hardware revision" if not set with
+            'ble_svc_dis_hardware_revision_set'.
+        value: NULL
+    BLE_SVC_DIS_FIRMWARE_REVISION_READ_PERM:
+        description: >
+            Defines permissions for reading "Firmware Revision" characteristics.
+            Can be set to BLE_SVC_DIS_DEFAULT_READ_PERM or use any of the
+            possible values defined for that setting.
+        value: MYNEWT_VAL(BLE_SVC_DIS_DEFAULT_READ_PERM)
+    BLE_SVC_DIS_FIRMWARE_REVISION_DEFAULT:
+        description: >
+            Defines a default value for "Software revision" if not set with
+            'ble_svc_dis_firmware_revision_set'.
+        value: NULL
+    BLE_SVC_DIS_SOFTWARE_REVISION_READ_PERM:
+        description: >
+            Defines permissions for reading "Software Revision" characteristics.
+            Can be set to BLE_SVC_DIS_DEFAULT_READ_PERM or use any of the
+            possible values defined for that setting.
+        value: MYNEWT_VAL(BLE_SVC_DIS_DEFAULT_READ_PERM)
+    BLE_SVC_DIS_SOFTWARE_REVISION_DEFAULT:
+        description: >
+            Defines a default value for "Software revision" if not set with
+            'ble_svc_dis_software_revision_set'.
+        value: NULL
+    BLE_SVC_DIS_MANUFACTURER_NAME_READ_PERM:
+        description: >
+            Defines permissions for reading "Manufacturer name" characteristics.
+            Can be set to BLE_SVC_DIS_DEFAULT_READ_PERM or use any of the
+            possible values defined for that setting.
+        value: MYNEWT_VAL(BLE_SVC_DIS_DEFAULT_READ_PERM)
+    BLE_SVC_DIS_MANUFACTURER_NAME_DEFAULT:
+        description: >
+            Defines a default value for "Manufacturer name" if not set with
+            'ble_svc_dis_manufacturer_name_set'.
+        value: NULL
+    BLE_SVC_DIS_SYSTEM_ID_READ_PERM:
+        description: >
+            Defines permissions for reading "System ID" characteristics.
+            Can be set to BLE_SVC_DIS_DEFAULT_READ_PERM or use any of the
+            possible values defined for that setting.
+        value: MYNEWT_VAL(BLE_SVC_DIS_DEFAULT_READ_PERM)
+    BLE_SVC_DIS_SYSTEM_ID_DEFAULT:
+        description: >
+            Defines a default value for "System ID" if not set with
+            'ble_svc_dis_manufacturer_name_set'.
+        value: NULL
+    BLE_SVC_DIS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the device information BLE service.
+        value: 303
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/gap/ble_svc_gap.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/gap/ble_svc_gap.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/include/services/gap/ble_svc_gap.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/pkg.yml
new file mode 100644
index 000000000..a2ef756e3
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/pkg.yml
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/gap
+pkg.description: Implements the GAP Service.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - nimble
+    - gap
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_gap_init: 'MYNEWT_VAL(BLE_SVC_GAP_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/gap/src/ble_svc_gap.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/src/ble_svc_gap.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/gap/src/ble_svc_gap.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/src/ble_svc_gap.c
index e79b2b872..f1cf2d9ba 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/gap/src/ble_svc_gap.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/src/ble_svc_gap.c
@@ -20,10 +20,10 @@
 #include <assert.h>
 #include <string.h>
 
-#include "sysinit/sysinit.h"
-#include "host/ble_hs.h"
-#include "services/gap/ble_svc_gap.h"
-#include "os/endian.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/services/gap/ble_svc_gap.h"
+#include "nimble/porting/nimble/include/os/endian.h"
 
 #define PPCP_ENABLED \
     MYNEWT_VAL(BLE_ROLE_PERIPHERAL) && \
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/syscfg.yml
new file mode 100644
index 000000000..ad6aa7ef3
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gap/syscfg.yml
@@ -0,0 +1,83 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_SVC_GAP_DEVICE_NAME:
+        description: >
+            Default value for "Device Name" characteristics, unless overwritten
+            by application.
+        value: '"nimble"'
+    BLE_SVC_GAP_DEVICE_NAME_WRITE_PERM:
+        description: >
+            Defines permissions for writing "Device Name" characteristics. Can
+            be zero to allow write without extra permissions or combination of:
+                BLE_GATT_CHR_F_WRITE_ENC
+                BLE_GATT_CHR_F_WRITE_AUTHEN
+                BLE_GATT_CHR_F_WRITE_AUTHOR
+            Set to '-1' to make characteristic read only.
+        value: -1
+    BLE_SVC_GAP_DEVICE_NAME_MAX_LENGTH:
+        description: Maximum length for "Device Name" characteristics
+        value: 31
+    BLE_SVC_GAP_APPEARANCE:
+        description: 'Device appearance'
+        value: 0
+    BLE_SVC_GAP_APPEARANCE_WRITE_PERM:
+        description: >
+            Defines permissions for writing "Appearance" characteristics. Can
+            be zero to allow write without extra permissions or combination of:
+                BLE_GATT_CHR_F_WRITE_ENC
+                BLE_GATT_CHR_F_WRITE_AUTHEN
+                BLE_GATT_CHR_F_WRITE_AUTHOR
+            Set to '-1' to make characteristic read only.
+        value: -1
+
+    # Setting all values for PPCP to '0' will disable characteristic!
+    BLE_SVC_GAP_PPCP_MIN_CONN_INTERVAL:
+        description: >
+            Value of "minimum connection interval" of PPCP characteristic as
+            defined by Core specification 5.0, Vol 3, Part C, section 12.3.
+        value: 0
+    BLE_SVC_GAP_PPCP_MAX_CONN_INTERVAL:
+        description: >
+            Value of "maximum connection interval" of PPCP characteristic as
+            defined by Core specification 5.0, Vol 3, Part C, section 12.3.
+        value: 0
+    BLE_SVC_GAP_PPCP_SLAVE_LATENCY:
+        description: >
+            Value of "slave latency" of PPCP characteristic as  defined by Core
+            specification 5.0, Vol 3, Part C, section 12.3.
+        value: 0
+    BLE_SVC_GAP_PPCP_SUPERVISION_TMO:
+        description: >
+            Value of "connection supervision timeout multiplier" of PPCP
+            characteristic as defined by Core specification 5.0, Vol 3, Part C,
+            section 12.3.
+        value: 0
+
+    BLE_SVC_GAP_CENTRAL_ADDRESS_RESOLUTION:
+        description: >
+            Value of "Central Address Resolution" characteristics, as defined
+            by Core specification 5.0, Vol 3, Part C, section 12.
+            Set to '-1' to disable.
+        value: -1
+
+    BLE_SVC_GAP_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the GAP BLE service.
+        value: 301
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/gatt/ble_svc_gatt.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/gatt/ble_svc_gatt.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/include/services/gatt/ble_svc_gatt.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/pkg.yml
new file mode 100644
index 000000000..e3704bc18
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/pkg.yml
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/gatt
+pkg.description: Implements the GATT service.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - nimble
+    - gatt
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_gatt_init: 'MYNEWT_VAL(BLE_SVC_GATT_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/gatt/src/ble_svc_gatt.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/src/ble_svc_gatt.c
similarity index 95%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/gatt/src/ble_svc_gatt.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/src/ble_svc_gatt.c
index 78b4a0683..eef3c49ba 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/gatt/src/ble_svc_gatt.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/src/ble_svc_gatt.c
@@ -19,9 +19,9 @@
 
 #include <assert.h>
 
-#include "sysinit/sysinit.h"
-#include "host/ble_hs.h"
-#include "services/gatt/ble_svc_gatt.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/services/gatt/ble_svc_gatt.h"
 
 static uint16_t ble_svc_gatt_changed_val_handle;
 static uint16_t ble_svc_gatt_start_handle;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/syscfg.yml
new file mode 100644
index 000000000..6ba1b333e
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/gatt/syscfg.yml
@@ -0,0 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_SVC_GATT_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the GATT BLE service
+        value: 302
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/ias/ble_svc_ias.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/include/services/ias/ble_svc_ias.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/ias/ble_svc_ias.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/include/services/ias/ble_svc_ias.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/pkg.yml
new file mode 100644
index 000000000..3b0ca0745
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/pkg.yml
@@ -0,0 +1,34 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/ias
+pkg.description: Immediate Alert Service Implementation.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - ias
+    - nimble
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_ias_init: 'MYNEWT_VAL(BLE_SVC_IAS_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ias/src/ble_svc_ias.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/src/ble_svc_ias.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ias/src/ble_svc_ias.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/src/ble_svc_ias.c
index 9f5da1485..98be867f1 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ias/src/ble_svc_ias.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/src/ble_svc_ias.c
@@ -19,9 +19,9 @@
 
 #include <assert.h>
 #include <string.h>
-#include "sysinit/sysinit.h"
-#include "host/ble_hs.h"
-#include "services/ias/ble_svc_ias.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/services/ias/ble_svc_ias.h"
 
 /* Callback function */
 static ble_svc_ias_event_fn *ble_svc_ias_cb_fn;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/syscfg.yml
new file mode 100644
index 000000000..2cbed3ab4
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ias/syscfg.yml
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_SVC_IAS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the immediate alert BLE service.
+        value: 303
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/ipss/ble_svc_ipss.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/include/services/ipss/ble_svc_ipss.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/ipss/ble_svc_ipss.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/include/services/ipss/ble_svc_ipss.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/pkg.yml
new file mode 100644
index 000000000..55be157d9
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/pkg.yml
@@ -0,0 +1,35 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/ipss
+pkg.description: Implements the IPSS service for IPSP suppoort.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - nimble
+    - ipsp
+    - ipss
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_ipss_init: 'MYNEWT_VAL(BLE_SVC_IPSS_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ipss/src/ble_svc_ipss.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/src/ble_svc_ipss.c
similarity index 89%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ipss/src/ble_svc_ipss.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/src/ble_svc_ipss.c
index f42ca1e9e..dd9d4ee96 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/ipss/src/ble_svc_ipss.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/src/ble_svc_ipss.c
@@ -19,9 +19,9 @@
 
 #include <assert.h>
 
-#include "sysinit/sysinit.h"
-#include "host/ble_hs.h"
-#include "services/ipss/ble_svc_ipss.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/services/ipss/ble_svc_ipss.h"
 
 static const struct ble_gatt_svc_def ble_svc_ipss_defs[] = {
     {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/syscfg.yml
new file mode 100644
index 000000000..dd89608e3
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/ipss/syscfg.yml
@@ -0,0 +1,24 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_SVC_IPSS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the IPSS BLE service
+        value: 303
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/lls/ble_svc_lls.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/include/services/lls/ble_svc_lls.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/lls/ble_svc_lls.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/include/services/lls/ble_svc_lls.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/pkg.yml
new file mode 100644
index 000000000..6160f020e
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/pkg.yml
@@ -0,0 +1,34 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/lls
+pkg.description: Link Loss Service Implementation.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - lls
+    - nimble
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_lls_init: 'MYNEWT_VAL(BLE_SVC_LLS_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/lls/src/ble_svc_lls.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/src/ble_svc_lls.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/lls/src/ble_svc_lls.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/src/ble_svc_lls.c
index b5f7f9bd4..822f72ece 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/lls/src/ble_svc_lls.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/src/ble_svc_lls.c
@@ -19,9 +19,9 @@
 
 #include <assert.h>
 #include <string.h>
-#include "sysinit/sysinit.h"
-#include "host/ble_hs.h"
-#include "services/lls/ble_svc_lls.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/services/lls/ble_svc_lls.h"
 
 /* Callback function */
 static ble_svc_lls_event_fn *ble_svc_lls_cb_fn;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/syscfg.yml
new file mode 100644
index 000000000..312b08a2f
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/lls/syscfg.yml
@@ -0,0 +1,22 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+syscfg.defs:
+    BLE_SVC_LLS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the link loss BLE service.
+        value: 303
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/services/tps/ble_svc_tps.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/include/services/tps/ble_svc_tps.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/services/tps/ble_svc_tps.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/include/services/tps/ble_svc_tps.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/pkg.yml
new file mode 100644
index 000000000..3d4c5e98e
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/pkg.yml
@@ -0,0 +1,34 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/services/tps
+pkg.description: Tx Power Service adopted specification.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - tps
+    - nimble
+
+pkg.deps:
+    - nimble/host
+
+pkg.init:
+    ble_svc_tps_init: 'MYNEWT_VAL(BLE_SVC_TPS_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_svc_tps.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/src/ble_svc_tps.c
similarity index 91%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_svc_tps.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/src/ble_svc_tps.c
index 9885a9216..0099a9689 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_svc_tps.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/src/ble_svc_tps.c
@@ -19,16 +19,16 @@
 
 #include <assert.h>
 #include <string.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "host/ble_hs.h"
-#include "services/tps/ble_svc_tps.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/services/tps/ble_svc_tps.h"
 
 /* XXX: We shouldn't be including the host's private header files.  The host
  * API needs to be updated with a function to query the advertising transmit
  * power.
  */
-#include "../src/ble_hs_hci_priv.h"
+#include "nimble/nimble/host/src/ble_hs_hci_priv.h"
 
 int8_t ble_svc_tps_tx_power_level;
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/syscfg.yml
new file mode 100644
index 000000000..0391e8b1d
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/services/tps/syscfg.yml
@@ -0,0 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+syscfg.defs:
+    BLE_SVC_TPS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the transmit power BLE service.
+        value: 303
+
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att.c
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att.c
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_clt.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_clt.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_clt.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_clt.c
index 09fc9ea23..2416ecbcb 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_clt.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_clt.c
@@ -21,9 +21,9 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
-#include "os/os_mempool.h"
-#include "nimble/ble.h"
-#include "host/ble_uuid.h"
+#include "nimble/porting/nimble/include/os/os_mempool.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
 #include "ble_hs_priv.h"
 
 /*****************************************************************************
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_cmd.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_cmd.c
index 81b070f9c..4c3af1f60 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_cmd.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_cmd.c
@@ -19,11 +19,11 @@
 
 #include <errno.h>
 #include <string.h>
-#include "os/os.h"
-#include "nimble/ble.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
 #include "ble_hs_priv.h"
-#include "host/ble_att.h"
-#include "host/ble_uuid.h"
+#include "nimble/nimble/host/include/host/ble_att.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
 #include "ble_hs_priv.h"
 
 void *
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_cmd_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_cmd_priv.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_cmd_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_cmd_priv.h
index 70f33260a..18f473603 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_cmd_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_cmd_priv.h
@@ -22,7 +22,7 @@
 
 #include <inttypes.h>
 #include <stddef.h>
-#include "os/os_mbuf.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_priv.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_priv.h
index 73b6aeab0..ab59c4f01 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_att_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_priv.h
@@ -21,10 +21,10 @@
 #define H_BLE_ATT_PRIV_
 
 #include <inttypes.h>
-#include "stats/stats.h"
-#include "host/ble_att.h"
-#include "host/ble_uuid.h"
-#include "nimble/nimble_npl.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
+#include "nimble/nimble/host/include/host/ble_att.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_svr.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_svr.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_svr.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_svr.c
index afcf90372..73172ef73 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_att_svr.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_att_svr.c
@@ -20,11 +20,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "os/os.h"
-#include "nimble/ble.h"
-#include "host/ble_uuid.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
 #include "ble_hs_priv.h"
-#include "esp_nimble_mem.h"
+
+#ifdef ESP_PLATFORM
+#include "nimble/esp_port/port/include/esp_nimble_mem.h"
+#endif
 
 /**
  * ATT server - Attribute Protocol
@@ -2669,7 +2672,11 @@ ble_att_svr_reset(void)
 static void
 ble_att_svr_free_start_mem(void)
 {
+#ifdef ESP_PLATFORM
     nimble_platform_mem_free(ble_att_svr_entry_mem);
+#else
+    free(ble_att_svr_entry_mem);
+#endif
     ble_att_svr_entry_mem = NULL;
 }
 
@@ -2681,7 +2688,11 @@ ble_att_svr_start(void)
     ble_att_svr_free_start_mem();
 
     if (ble_hs_max_attrs > 0) {
+#ifdef ESP_PLATFORM
         ble_att_svr_entry_mem = nimble_platform_mem_malloc(
+#else
+        ble_att_svr_entry_mem = malloc(
+#endif
             OS_MEMPOOL_BYTES(ble_hs_max_attrs,
                              sizeof (struct ble_att_svr_entry)));
         if (ble_att_svr_entry_mem == NULL) {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_eddystone.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_eddystone.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_eddystone.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_eddystone.c
index eccb3e988..ad0f449df 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_eddystone.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_eddystone.c
@@ -18,9 +18,9 @@
  */
 
 #include <string.h>
-#include "os/endian.h"
-#include "host/ble_eddystone.h"
-#include "host/ble_hs_adv.h"
+#include "nimble/porting/nimble/include/os/endian.h"
+#include "../include/host/ble_eddystone.h"
+#include "nimble/nimble/host/include/host/ble_hs_adv.h"
 #include "ble_hs_priv.h"
 
 #define BLE_EDDYSTONE_MAX_SVC_DATA_LEN  22
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gap.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gap.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gap.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gap.c
index 17ff4eae0..068414bbf 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gap.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gap.c
@@ -20,9 +20,9 @@
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
-#include "nimble/nimble_opt.h"
-#include "host/ble_hs_adv.h"
-#include "host/ble_hs_hci.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/host/include/host/ble_hs_adv.h"
+#include "nimble/nimble/host/include/host/ble_hs_hci.h"
 #include "ble_hs_priv.h"
 #include "ble_hs_resolv_priv.h"
 
@@ -2246,11 +2246,6 @@ ble_gap_wl_set(const ble_addr_t *addrs, uint8_t white_list_count)
 
     ble_hs_lock();
 
-    if (white_list_count == 0) {
-        rc = BLE_HS_EINVAL;
-        goto done;
-    }
-
     for (i = 0; i < white_list_count; i++) {
         if (addrs[i].type != BLE_ADDR_PUBLIC &&
             addrs[i].type != BLE_ADDR_RANDOM) {
@@ -5617,6 +5612,11 @@ done:
 #endif
 }
 
+int ble_gap_set_data_len(uint16_t conn_handle, uint16_t tx_octets, uint16_t tx_time)
+{
+    return ble_hs_hci_util_set_data_len(conn_handle, tx_octets, tx_time);
+}
+
 /*****************************************************************************
  * $security                                                                 *
  *****************************************************************************/
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gap_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gap_priv.h
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gap_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gap_priv.h
index 2b6b40696..3767ddba8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_gap_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gap_priv.h
@@ -21,9 +21,9 @@
 #define H_BLE_GAP_CONN_
 
 #include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "stats/stats.h"
-#include "host/ble_gap.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
+#include "nimble/nimble/host/include/host/ble_gap.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatt_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatt_priv.h
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatt_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatt_priv.h
index 4a59635b8..07616d011 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatt_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatt_priv.h
@@ -20,9 +20,9 @@
 #ifndef H_BLE_GATT_PRIV_
 #define H_BLE_GATT_PRIV_
 
-#include "syscfg/syscfg.h"
-#include "stats/stats.h"
-#include "host/ble_gatt.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
+#include "nimble/nimble/host/include/host/ble_gatt.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gattc.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gattc.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gattc.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gattc.c
index a6e114cc2..f7bc9f47f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gattc.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gattc.c
@@ -54,10 +54,10 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include "os/os_mempool.h"
-#include "nimble/ble.h"
-#include "host/ble_uuid.h"
-#include "host/ble_gap.h"
+#include "nimble/porting/nimble/include/os/os_mempool.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
+#include "nimble/nimble/host/include/host/ble_gap.h"
 #include "ble_hs_priv.h"
 
 /*****************************************************************************
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatts.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatts.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatts.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatts.c
index e53cc116f..c805d2ab2 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatts.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatts.c
@@ -20,11 +20,14 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include "nimble/ble.h"
-#include "host/ble_uuid.h"
-#include "host/ble_store.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
+#include "nimble/nimble/host/include/host/ble_store.h"
 #include "ble_hs_priv.h"
-#include "esp_nimble_mem.h"
+
+#ifdef ESP_PLATFORM
+#include "nimble/esp_port/port/include/esp_nimble_mem.h"
+#endif
 
 #define BLE_GATTS_INCLUDE_SZ    6
 #define BLE_GATTS_CHR_MAX_SZ    19
@@ -1155,7 +1158,11 @@ ble_gatts_connection_broken(uint16_t conn_handle)
 static void
 ble_gatts_free_svc_defs(void)
 {
+#ifdef ESP_PLATFORM
     nimble_platform_mem_free(ble_gatts_svc_defs);
+#else
+    free(ble_gatts_svc_defs);
+#endif
     ble_gatts_svc_defs = NULL;
     ble_gatts_num_svc_defs = 0;
 }
@@ -1163,11 +1170,19 @@ ble_gatts_free_svc_defs(void)
 static void
 ble_gatts_free_mem(void)
 {
+#ifdef ESP_PLATFORM
     nimble_platform_mem_free(ble_gatts_clt_cfg_mem);
     ble_gatts_clt_cfg_mem = NULL;
 
     nimble_platform_mem_free(ble_gatts_svc_entries);
     ble_gatts_svc_entries = NULL;
+#else
+    free(ble_gatts_clt_cfg_mem);
+    ble_gatts_clt_cfg_mem = NULL;
+
+    free(ble_gatts_svc_entries);
+    ble_gatts_svc_entries = NULL;
+#endif
 }
 
 
@@ -1210,7 +1225,11 @@ ble_gatts_start(void)
     }
 
     if (ble_hs_max_client_configs > 0) {
+#ifdef ESP_PLATFORM
         ble_gatts_clt_cfg_mem = nimble_platform_mem_malloc(
+#else
+        ble_gatts_clt_cfg_mem = malloc(
+#endif
             OS_MEMPOOL_BYTES(ble_hs_max_client_configs,
                              sizeof (struct ble_gatts_clt_cfg)));
         if (ble_gatts_clt_cfg_mem == NULL) {
@@ -1221,7 +1240,11 @@ ble_gatts_start(void)
 
     if (ble_hs_max_services > 0) {
         ble_gatts_svc_entries =
+#ifdef ESP_PLATFORM
             nimble_platform_mem_malloc(ble_hs_max_services * sizeof *ble_gatts_svc_entries);
+#else
+            malloc(ble_hs_max_services * sizeof *ble_gatts_svc_entries);
+#endif
         if (ble_gatts_svc_entries == NULL) {
             rc = BLE_HS_ENOMEM;
             goto done;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatts_lcl.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatts_lcl.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatts_lcl.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatts_lcl.c
index a45f397bc..989eb5c27 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_gatts_lcl.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_gatts_lcl.c
@@ -19,9 +19,9 @@
 
 #include <stddef.h>
 #include <string.h>
-#include "host/ble_uuid.h"
-#include "console/console.h"
-#include "nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
+#include "nimble/console/console.h"
+#include "nimble/nimble/include/nimble/ble.h"
 #include "ble_hs_priv.h"
 
 static const ble_uuid_t *uuid_ccc =
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs.c
index d819e20df..4a7087b15 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs.c
@@ -20,15 +20,15 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "stats/stats.h"
-#include "nimble/ble_hci_trans.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
 #include "ble_hs_priv.h"
 #include "ble_monitor_priv.h"
-#include "nimble/nimble_npl.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 #ifndef MYNEWT
-#include "nimble/nimble_port.h"
+#include "nimble/porting/nimble/include/nimble/nimble_port.h"
 #endif
 
 #define BLE_HS_HCI_EVT_COUNT                    \
@@ -86,8 +86,10 @@ uint16_t ble_hs_max_services;
 uint16_t ble_hs_max_client_configs;
 
 #if MYNEWT_VAL(BLE_HS_DEBUG)
+#ifdef ESP_PLATFORM
 static uint8_t ble_hs_mutex_locked;
 static TaskHandle_t ble_hs_task_handle;
+#endif
 static uint8_t ble_hs_dbg_mutex_locked;
 #endif
 
@@ -131,8 +133,10 @@ ble_hs_locked_by_cur_task(void)
 
     owner = ble_hs_mutex.mu.mu_owner;
     return owner != NULL && owner == os_sched_get_current_task();
-#else
+#elif ESP_PLATFORM
     return (ble_hs_mutex_locked && ble_hs_task_handle == xTaskGetCurrentTaskHandle());
+#else
+    return 1;
 #endif
 }
 #endif
@@ -164,7 +168,7 @@ ble_hs_lock_nested(void)
 
     rc = ble_npl_mutex_pend(&ble_hs_mutex, 0xffffffff);
 
-#if MYNEWT_VAL(BLE_HS_DEBUG)
+#if MYNEWT_VAL(BLE_HS_DEBUG) && defined(ESP_PLATFORM)
     ble_hs_mutex_locked = 1;
     ble_hs_task_handle = xTaskGetCurrentTaskHandle();
 #endif
@@ -184,10 +188,12 @@ ble_hs_unlock_nested(void)
         ble_hs_dbg_mutex_locked = 0;
         return;
     }
+#ifdef ESP_PLATFORM
     if(ble_hs_task_handle == xTaskGetCurrentTaskHandle()) {
         ble_hs_task_handle = NULL;
         ble_hs_mutex_locked = 0;
     }
+#endif
 #endif
 
     rc = ble_npl_mutex_release(&ble_hs_mutex);
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_adv.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_adv.c
index 1d938b958..1fe183977 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_adv.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_adv.c
@@ -19,8 +19,8 @@
 
 #include <string.h>
 #include <errno.h>
-#include "nimble/ble.h"
-#include "host/ble_hs_adv.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_hs_adv.h"
 #include "ble_hs_priv.h"
 
 struct find_field_data {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_adv_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_adv_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_adv_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_adv_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_atomic.c
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_atomic.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_atomic.c
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_atomic_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_atomic_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_atomic_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_atomic_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_cfg.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_cfg.c
similarity index 92%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_cfg.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_cfg.c
index a46a604ac..0569ccee8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_cfg.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_cfg.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "syscfg/syscfg.h"
-#include "host/ble_hs.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
 
 struct ble_hs_cfg ble_hs_cfg = {
     /** Security manager settings. */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_conn.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_conn.c
index 31830c98a..1625e7305 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_conn.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_conn.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 #include <errno.h>
-#include "syscfg/syscfg.h"
-#include "os/os.h"
-#include "host/ble_hs_id.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/host/include/host/ble_hs_id.h"
 #include "ble_hs_priv.h"
 #include "ble_hs_resolv_priv.h"
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_conn_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_conn_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_conn_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_conn_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_flow.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_flow.c
index 2520c8541..e74f5da36 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_flow.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "syscfg/syscfg.h"
-#include "nimble/ble_hci_trans.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
 #include "ble_hs_priv.h"
 
 #if MYNEWT_VAL(BLE_HS_FLOW_CTRL)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_flow_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_flow_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_flow_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_flow_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci.c
index 3cfed27e2..214fc8214 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci.c
@@ -20,10 +20,10 @@
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include "os/os.h"
-#include "mem/mem.h"
-#include "nimble/ble_hci_trans.h"
-#include "host/ble_monitor.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/mem/mem.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "nimble/nimble/host/include/host/ble_monitor.h"
 #include "ble_hs_priv.h"
 #include "ble_monitor_priv.h"
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_cmd.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_cmd.c
similarity index 79%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_cmd.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_cmd.c
index 7aa9e4e74..63242ca88 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_cmd.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_cmd.c
@@ -21,24 +21,13 @@
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include "os/os.h"
-#include "nimble/hci_common.h"
-#include "nimble/ble_hci_trans.h"
-#include "host/ble_monitor.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "nimble/nimble/host/include/host/ble_monitor.h"
 #include "ble_hs_priv.h"
 #include "ble_monitor_priv.h"
 
-/*
- * HCI Command Header
- *
- * Comprises the following fields
- *  -> Opcode group field & Opcode command field (2)
- *  -> Parameter Length                          (1)
- *      Length of all the parameters (does not include any part of the hci
- *      command header
- */
-#define BLE_HCI_CMD_HDR_LEN                 (3)
-
 static int
 ble_hs_hci_cmd_transport(struct ble_hci_cmd *cmd)
 {
@@ -62,6 +51,18 @@ ble_hs_hci_cmd_transport(struct ble_hci_cmd *cmd)
     }
 }
 
+#ifdef ESP_PLATFORM
+/*
+ * HCI Command Header
+ *
+ * Comprises the following fields
+ *  -> Opcode group field & Opcode command field (2)
+ *  -> Parameter Length                          (1)
+ *      Length of all the parameters (does not include any part of the hci
+ *      command header
+ */
+#define BLE_HCI_CMD_HDR_LEN                 (3)
+
 static int
 ble_hs_hci_cmd_send(uint16_t opcode, uint8_t len, const void *cmddata)
 {
@@ -98,6 +99,34 @@ ble_hs_hci_cmd_send(uint16_t opcode, uint8_t len, const void *cmddata)
     return rc;
 }
 
+#else
+static int
+ble_hs_hci_cmd_send(uint16_t opcode, uint8_t len, const void *cmddata)
+{
+    struct ble_hci_cmd *cmd;
+    int rc;
+
+    cmd = (void *) ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_CMD);
+    BLE_HS_DBG_ASSERT(cmd != NULL);
+
+    cmd->opcode = htole16(opcode);
+    cmd->length = len;
+    if (len != 0) {
+        memcpy(cmd->data, cmddata, len);
+    }
+
+    rc = ble_hs_hci_cmd_transport(cmd);
+
+    if (rc == 0) {
+        STATS_INC(ble_hs_stats, hci_cmd);
+    } else {
+        BLE_HS_LOG(DEBUG, "ble_hs_hci_cmd_send failure; rc=%d\n", rc);
+    }
+
+    return rc;
+}
+#endif
+
 int
 ble_hs_hci_cmd_send_buf(uint16_t opcode, const void *buf, uint8_t buf_len)
 {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_evt.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_evt.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_evt.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_evt.c
index 4a6b0716e..9b97f433b 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_evt.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_evt.c
@@ -20,11 +20,11 @@
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include "os/os.h"
-#include "nimble/hci_common.h"
-#include "nimble/ble_hci_trans.h"
-#include "host/ble_gap.h"
-#include "host/ble_monitor.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "nimble/nimble/host/include/host/ble_gap.h"
+#include "nimble/nimble/host/include/host/ble_monitor.h"
 #include "ble_hs_priv.h"
 #include "ble_hs_resolv_priv.h"
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_hs_hci_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_priv.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_hs_hci_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_priv.h
index 362f12cbd..d8a72cb29 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/services/tps/src/ble_hs_hci_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_priv.h
@@ -20,7 +20,7 @@
 #ifndef H_BLE_HS_HCI_PRIV_
 #define H_BLE_HS_HCI_PRIV_
 
-#include "nimble/hci_common.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_util.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_util.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_util.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_util.c
index 996e0fc10..1f63acc94 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_hci_util.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_hci_util.c
@@ -18,8 +18,8 @@
  */
 
 #include <string.h>
-#include "nimble/hci_common.h"
-#include "host/ble_hs_hci.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
+#include "nimble/nimble/host/include/host/ble_hs_hci.h"
 #include "ble_hs_priv.h"
 
 uint16_t
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_id.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_id.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_id.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_id.c
index e30a3a1bc..83ee49393 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_id.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_id.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "host/ble_hs_id.h"
+#include "nimble/nimble/host/include/host/ble_hs_id.h"
 #include "ble_hs_priv.h"
 #include "ble_hs_resolv_priv.h"
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_id_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_id_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_id_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_id_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_log.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_log.c
similarity index 92%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_log.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_log.c
index 7ec69469e..b4d496703 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_log.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_log.c
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#include "os/os.h"
-#include "host/ble_hs.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
 
 struct log ble_hs_log;
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_mbuf.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_mbuf.c
index ea660c633..680fbe38a 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mbuf.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_mbuf.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "host/ble_hs.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
 #include "ble_hs_priv.h"
 
 /**
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_mbuf_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_mbuf_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_mbuf_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_mbuf_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_misc.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_misc.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_misc.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_misc.c
index dfb46b741..b9567f382 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_misc.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_misc.c
@@ -19,7 +19,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include "os/os.h"
+#include "nimble/porting/nimble/include/os/os.h"
 #include "ble_hs_priv.h"
 
 const uint8_t ble_hs_misc_null_addr[6];
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mqueue.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_mqueue.c
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_mqueue.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_mqueue.c
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_periodic_sync.c
similarity index 95%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_periodic_sync.c
index dad535138..05a928201 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_periodic_sync.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 #include <errno.h>
-#include "syscfg/syscfg.h"
-#include "os/os.h"
-#include "host/ble_hs_id.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/host/include/host/ble_hs_id.h"
 #include "ble_hs_priv.h"
 
 #if MYNEWT_VAL(BLE_PERIODIC_ADV)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_periodic_sync_priv.h
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_periodic_sync_priv.h
index c82ea7904..f16132f04 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_periodic_sync_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_periodic_sync_priv.h
@@ -21,7 +21,7 @@
 #define H_BLE_HS_PERIODIC_SYNC_
 
 #include <inttypes.h>
-#include "os/queue.h"
+#include "nimble/porting/nimble/include/os/queue.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_priv.h
similarity index 95%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_priv.h
index 538d07a97..952690e71 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_priv.h
@@ -42,10 +42,10 @@
 #include "ble_hs_id_priv.h"
 #include "ble_hs_periodic_sync_priv.h"
 #include "ble_uuid_priv.h"
-#include "host/ble_hs.h"
-#include "host/ble_monitor.h"
-#include "nimble/nimble_opt.h"
-#include "stats/stats.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "nimble/nimble/host/include/host/ble_monitor.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_pvcy.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_pvcy.c
index 9e92c660f..2d7db0bcc 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_pvcy.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_pvcy.c
@@ -19,10 +19,10 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
-#include "stats/stats.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
 #include "ble_hs_priv.h"
 #include "ble_hs_resolv_priv.h"
-#include "host/ble_hs_pvcy.h"
+#include "nimble/nimble/host/include/host/ble_hs_pvcy.h"
 
 static uint8_t ble_hs_pvcy_started;
 static uint8_t ble_hs_pvcy_irk[16];
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_pvcy_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_pvcy_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_pvcy_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_pvcy_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_resolv.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_resolv.c
index 6add1018b..7ae9ef12b 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_resolv.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_resolv.c
@@ -19,17 +19,17 @@
  * under the License.
  */
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 #if MYNEWT_VAL(BLE_HOST_BASED_PRIVACY)
 
 #include <stdint.h>
 #include <string.h>
 #include "ble_hs_priv.h"
-#include "host/ble_hs_id.h"
-#include "nimble/ble.h"
-#include "nimble/nimble_opt.h"
+#include "../include/host/ble_hs_id.h"
+#include "../../include/nimble/ble.h"
+#include "../../include/nimble/nimble_opt.h"
 #include "ble_hs_resolv_priv.h"
-#include "store/config/ble_store_config.h"
+#include "../store/config/include/store/config/ble_store_config.h"
 #include "../store/config/src/ble_store_config_priv.h"
 
 /* Resolve list size, additional space to save local device's configuration */
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_resolv_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_resolv_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_resolv_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_resolv_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_shutdown.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_shutdown.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_shutdown.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_shutdown.c
index f29d4a669..9dacccbaf 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_shutdown.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_shutdown.c
@@ -19,7 +19,7 @@
 
 #if MYNEWT
 
-#include "os/mynewt.h"
+#include "nimble/porting/nimble/include/os/mynewt.h"
 #include "ble_hs_priv.h"
 
 static struct ble_hs_stop_listener ble_hs_shutdown_stop_listener;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_startup.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_startup.c
index 83026ac18..2ec17a13b 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_startup.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_startup.c
@@ -19,8 +19,8 @@
 
 #include <stddef.h>
 #include <string.h>
-#include "host/ble_hs.h"
-#include "host/ble_hs_hci.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "nimble/nimble/host/include/host/ble_hs_hci.h"
 #include "ble_hs_priv.h"
 
 #if !MYNEWT_VAL(BLE_CONTROLLER)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_startup_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_startup_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_hs_startup_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_startup_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_stop.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_stop.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_stop.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_stop.c
index b90d3ec6f..92fae1263 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_stop.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_hs_stop.c
@@ -18,12 +18,12 @@
  */
 
 #include <assert.h>
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 #include "ble_hs_priv.h"
-#include "nimble/nimble_npl.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 #ifndef MYNEWT
-#include "nimble/nimble_port.h"
+#include "nimble/porting/nimble/include/nimble/nimble_port.h"
 #endif
 
 #define BLE_HOST_STOP_TIMEOUT_MS MYNEWT_VAL(BLE_HS_STOP_ON_SHUTDOWN_TIMEOUT)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_ibeacon.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_ibeacon.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_ibeacon.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_ibeacon.c
index 0c6ef99d5..62c7bc1d1 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_ibeacon.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_ibeacon.c
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "host/ble_hs_adv.h"
+#include "nimble/nimble/host/include/host/ble_hs_adv.h"
 #include "ble_hs_priv.h"
 
 #define BLE_IBEACON_MFG_DATA_SIZE       25
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap.c
index 0d9f082d4..a4b98a9e7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap.c
@@ -19,10 +19,10 @@
 
 #include <string.h>
 #include <errno.h>
-#include "syscfg/syscfg.h"
-#include "os/os.h"
-#include "nimble/ble.h"
-#include "nimble/hci_common.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/hci_common.h"
 #include "ble_hs_priv.h"
 #include "ble_l2cap_coc_priv.h"
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_coc.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_coc.c
index 41a831565..5258da84d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_coc.c
@@ -19,7 +19,7 @@
 
 #include <string.h>
 #include <errno.h>
-#include "nimble/ble.h"
+#include "nimble/nimble/include/nimble/ble.h"
 #include "ble_hs_priv.h"
 #include "ble_l2cap_priv.h"
 #include "ble_l2cap_coc_priv.h"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_coc_priv.h
similarity index 93%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_coc_priv.h
index 5ebdaa050..911946e05 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_coc_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_coc_priv.h
@@ -21,10 +21,10 @@
 #define H_L2CAP_COC_PRIV_
 
 #include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "os/queue.h"
-#include "os/os_mbuf.h"
-#include "host/ble_l2cap.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/queue.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
+#include "nimble/nimble/host/include/host/ble_l2cap.h"
 #include "ble_l2cap_sig_priv.h"
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_priv.h
similarity index 95%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_priv.h
index e3409743b..30af30427 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_priv.h
@@ -21,11 +21,11 @@
 #define H_L2CAP_PRIV_
 
 #include "ble_l2cap_coc_priv.h"
-#include "host/ble_l2cap.h"
+#include "nimble/nimble/host/include/host/ble_l2cap.h"
 #include <inttypes.h>
-#include "stats/stats.h"
-#include "os/queue.h"
-#include "os/os_mbuf.h"
+#include "nimble/porting/nimble/include/stats/stats.h"
+#include "nimble/porting/nimble/include/os/queue.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig.c
index 58f96b0f3..f9d32d0ac 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig.c
@@ -44,8 +44,8 @@
 
 #include <string.h>
 #include <errno.h>
-#include "nimble/ble.h"
-#include "host/ble_monitor.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/host/include/host/ble_monitor.h"
 #include "ble_hs_priv.h"
 
 /*****************************************************************************
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_cmd.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig_cmd.c
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_l2cap_sig_cmd.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig_cmd.c
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_sig_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig_priv.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_sig_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig_priv.h
index a698cd0d8..a0e2e58cf 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_l2cap_sig_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_l2cap_sig_priv.h
@@ -20,7 +20,7 @@
 #ifndef H_BLE_L2CAP_SIG_
 #define H_BLE_L2CAP_SIG_
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_monitor.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_monitor.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_monitor.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_monitor.c
index e6db48b82..d4a468284 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_monitor.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_monitor.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "host/ble_monitor.h"
+#include "nimble/nimble/host/include/host/ble_monitor.h"
 
 #if BLE_MONITOR
 
@@ -28,10 +28,10 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <inttypes.h>
-#include "os/os.h"
-#include "log/log.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/log/log.h"
 #if MYNEWT_VAL(BLE_MONITOR_UART)
-#include "uart/uart.h"
+#include "nimble/porting/nimble/include/uart/uart.h"
 #endif
 #if MYNEWT_VAL(BLE_MONITOR_RTT)
 #include "rtt/SEGGER_RTT.h"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_monitor_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_monitor_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/mesh/src/src/ble_monitor_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_monitor_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm.c
index 8422c044f..acbe8a1c1 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm.c
@@ -43,9 +43,9 @@
 
 #include <string.h>
 #include <errno.h>
-#include "nimble/ble.h"
-#include "nimble/nimble_opt.h"
-#include "host/ble_sm.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/host/include/host/ble_sm.h"
 #include "ble_hs_priv.h"
 #include "ble_hs_resolv_priv.h"
 #include "../store/config/src/ble_store_config_priv.h"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_alg.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_alg.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_alg.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_alg.c
index ee8b937c5..e17760efe 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_alg.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_alg.c
@@ -20,12 +20,12 @@
 
 #include <inttypes.h>
 #include <string.h>
-#include "syscfg/syscfg.h"
-#include "nimble/nimble_opt.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
 
 #if NIMBLE_BLE_SM
 
-#include "nimble/ble.h"
+#include "nimble/nimble/include/nimble/ble.h"
 #include "ble_hs_priv.h"
 
 #if MYNEWT_VAL(BLE_CRYPTO_STACK_MBEDTLS)
@@ -41,13 +41,13 @@
 #endif
 
 #else
-#include "tinycrypt/aes.h"
-#include "tinycrypt/constants.h"
-#include "tinycrypt/utils.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/aes.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/constants.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/utils.h"
 
 #if MYNEWT_VAL(BLE_SM_SC)
-#include "tinycrypt/cmac_mode.h"
-#include "tinycrypt/ecc_dh.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/cmac_mode.h"
+#include "nimble/ext/tinycrypt/include/tinycrypt/ecc_dh.h"
 #if MYNEWT_VAL(TRNG)
 #include "trng/trng.h"
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_cmd.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_cmd.c
similarity index 92%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_cmd.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_cmd.c
index 01651f1df..92a34ed36 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_cmd.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_cmd.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 #include <errno.h>
-#include "nimble/ble.h"
-#include "nimble/nimble_opt.h"
-#include "host/ble_sm.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/host/include/host/ble_sm.h"
 #include "ble_hs_priv.h"
 
 void *
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_lgcy.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_lgcy.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_lgcy.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_lgcy.c
index bb2d66d5d..2f150eeb3 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_lgcy.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_lgcy.c
@@ -19,9 +19,9 @@
 
 #include <string.h>
 #include <errno.h>
-#include "nimble/ble.h"
-#include "nimble/nimble_opt.h"
-#include "host/ble_sm.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/host/include/host/ble_sm.h"
 #include "ble_hs_priv.h"
 
 #if MYNEWT_VAL(BLE_SM_LEGACY)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_priv.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_priv.h
index def0a32f5..853b33f7a 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_priv.h
@@ -21,9 +21,9 @@
 #define H_BLE_SM_PRIV_
 
 #include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "os/queue.h"
-#include "nimble/nimble_opt.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/queue.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_sc.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_sc.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_sc.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_sc.c
index 333310702..ffc807fa6 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_sm_sc.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_sm_sc.c
@@ -19,8 +19,8 @@
 
 #include <string.h>
 
-#include "nimble/nimble_opt.h"
-#include "host/ble_sm.h"
+#include "nimble/nimble/include/nimble/nimble_opt.h"
+#include "nimble/nimble/host/include/host/ble_sm.h"
 #include "ble_hs_priv.h"
 #include "ble_sm_priv.h"
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_store.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_store.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_store.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_store.c
index 22e608947..e5a475530 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_store.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_store.c
@@ -19,7 +19,7 @@
 
 #include <string.h>
 
-#include "host/ble_store.h"
+#include "nimble/nimble/host/include/host/ble_store.h"
 #include "ble_hs_priv.h"
 
 int
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_store_util.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_store_util.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_store_util.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_store_util.c
index 73c71d93b..033261242 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_store_util.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_store_util.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "host/ble_store.h"
+#include "nimble/nimble/host/include/host/ble_store.h"
 #include "ble_hs_priv.h"
 #include "ble_hs_resolv_priv.h"
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_uuid.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_uuid.c
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_uuid.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_uuid.c
index 3a1642480..1b2443683 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_uuid.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_uuid.c
@@ -22,10 +22,10 @@
 #include <string.h>
 #include <errno.h>
 #include <stdio.h>
-#include "os/os_mbuf.h"
-#include "nimble/ble.h"
+#include "nimble/porting/nimble/include/os/os_mbuf.h"
+#include "nimble/nimble/include/nimble/ble.h"
 #include "ble_hs_priv.h"
-#include "host/ble_uuid.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
 
 static uint8_t ble_uuid_base[16] = {
     0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80,
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_uuid_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_uuid_priv.h
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_uuid_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_uuid_priv.h
index 3dbcc6b8e..39ce88d7a 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_uuid_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/src/ble_uuid_priv.h
@@ -20,7 +20,7 @@
 #ifndef H_BLE_UUID_PRIV_
 #define H_BLE_UUID_PRIV_
 
-#include "host/ble_uuid.h"
+#include "nimble/nimble/host/include/host/ble_uuid.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/store/config/ble_store_config.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/include/store/config/ble_store_config.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/store/config/ble_store_config.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/include/store/config/ble_store_config.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/pkg.yml
new file mode 100644
index 000000000..db80d1df8
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/pkg.yml
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/store/config
+pkg.description: sys/config-based persistence layer for the NimBLE host.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+    - nimble
+    - persistence
+
+pkg.deps:
+    - "@apache-mynewt-core/encoding/base64"
+    - nimble/host
+
+pkg.deps.BLE_STORE_CONFIG_PERSIST:
+    - "@apache-mynewt-core/sys/config"
+
+pkg.init:
+    ble_store_config_init: 'MYNEWT_VAL(BLE_STORE_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config.c
index a2c9aaf27..4ffaaf4e1 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config.c
@@ -20,10 +20,10 @@
 #include <inttypes.h>
 #include <string.h>
 
-#include "sysinit/sysinit.h"
-#include "syscfg/syscfg.h"
-#include "host/ble_hs.h"
-#include "store/config/ble_store_config.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/store/config/ble_store_config.h"
 #include "ble_store_config_priv.h"
 
 struct ble_store_value_sec
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config_conf.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config_conf.c
new file mode 100644
index 000000000..c492c59bc
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config_conf.c
@@ -0,0 +1,296 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Modified work Copyright (c) 2021 Ryan Powell.
+ */
+
+#ifndef ESP_PLATFORM
+
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+
+#if MYNEWT_VAL(BLE_STORE_CONFIG_PERSIST)
+
+#include <inttypes.h>
+//#include <string.h>
+
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "../../../include/host/ble_hs.h"
+//#include "config/config.h"
+#include "base64/base64.h"
+#include "../include/store/config/ble_store_config.h"
+#include "ble_store_config_priv.h"
+#include "ble_bond_nvs.h"
+
+/*
+static int
+ble_store_config_conf_set(int argc, char **argv, char *val);
+static int
+ble_store_config_conf_export(void (*func)(char *name, char *val),
+                             enum conf_export_tgt tgt);
+
+static struct conf_handler ble_store_config_conf_handler = {
+    .ch_name = "ble_hs",
+    .ch_get = NULL,
+    .ch_set = ble_store_config_conf_set,
+    .ch_commit = NULL,
+    .ch_export = ble_store_config_conf_export
+};
+*/
+#define BLE_STORE_CONFIG_SEC_ENCODE_SZ      \
+    BASE64_ENCODE_SIZE(sizeof (struct ble_store_value_sec))
+
+#define BLE_STORE_CONFIG_SEC_SET_ENCODE_SZ  \
+    (MYNEWT_VAL(BLE_STORE_MAX_BONDS) * BLE_STORE_CONFIG_SEC_ENCODE_SZ + 1)
+
+#define BLE_STORE_CONFIG_CCCD_ENCODE_SZ     \
+    BASE64_ENCODE_SIZE(sizeof (struct ble_store_value_cccd))
+
+#define BLE_STORE_CONFIG_CCCD_SET_ENCODE_SZ \
+    (MYNEWT_VAL(BLE_STORE_MAX_CCCDS) * BLE_STORE_CONFIG_CCCD_ENCODE_SZ + 1)
+
+static void
+ble_store_config_serialize_arr(const void *arr, int obj_sz, int num_objs,
+                               char *out_buf, int buf_sz)
+{
+    int arr_size;
+
+    arr_size = obj_sz * num_objs;
+    assert(arr_size <= buf_sz);
+
+    base64_encode(arr, arr_size, out_buf, 1);
+}
+
+static int
+ble_store_config_deserialize_arr(const char *enc,
+                                 void *out_arr,
+                                 int obj_sz,
+                                 int *out_num_objs)
+{
+    int len;
+
+    len = base64_decode(enc, out_arr);
+    if (len < 0) {
+        return OS_EINVAL;
+    }
+
+    *out_num_objs = len / obj_sz;
+    return 0;
+}
+/*
+static int
+ble_store_config_conf_set(int argc, char **argv, char *val)
+{
+    int rc;
+
+    if (argc == 1) {
+        if (strcmp(argv[0], "our_sec") == 0) {
+            rc = ble_store_config_deserialize_arr(
+                    val,
+                    ble_store_config_our_secs,
+                    sizeof *ble_store_config_our_secs,
+                    &ble_store_config_num_our_secs);
+            printf("\nloading: %s %s rc=%d\n", *argv, val, rc);
+            return rc;
+        } else if (strcmp(argv[0], "peer_sec") == 0) {
+            rc = ble_store_config_deserialize_arr(
+                    val,
+                    ble_store_config_peer_secs,
+                    sizeof *ble_store_config_peer_secs,
+                    &ble_store_config_num_peer_secs);
+            printf("\nloading: %s %s rc=%d\n", *argv, val, rc);
+            return rc;
+        } else if (strcmp(argv[0], "cccd") == 0) {
+            rc = ble_store_config_deserialize_arr(
+                    val,
+                    ble_store_config_cccds,
+                    sizeof *ble_store_config_cccds,
+                    &ble_store_config_num_cccds);
+            printf("\nloading: %s %s rc=%d\n", *argv, val, rc);
+            return rc;
+        }
+    }
+    return OS_ENOENT;
+}
+
+static int
+ble_store_config_conf_export(void (*func)(char *name, char *val),
+                             enum conf_export_tgt tgt)
+{
+    union {
+        char sec[BLE_STORE_CONFIG_SEC_SET_ENCODE_SZ];
+        char cccd[BLE_STORE_CONFIG_CCCD_SET_ENCODE_SZ];
+    } buf;
+
+    ble_store_config_serialize_arr(ble_store_config_our_secs,
+                                   sizeof *ble_store_config_our_secs,
+                                   ble_store_config_num_our_secs,
+                                   buf.sec,
+                                   sizeof buf.sec);
+    func("ble_hs/our_sec", buf.sec);
+
+    ble_store_config_serialize_arr(ble_store_config_peer_secs,
+                                   sizeof *ble_store_config_peer_secs,
+                                   ble_store_config_num_peer_secs,
+                                   buf.sec,
+                                   sizeof buf.sec);
+    func("ble_hs/peer_sec", buf.sec);
+
+    ble_store_config_serialize_arr(ble_store_config_cccds,
+                                   sizeof *ble_store_config_cccds,
+                                   ble_store_config_num_cccds,
+                                   buf.cccd,
+                                   sizeof buf.cccd);
+    func("ble_hs/cccd", buf.cccd);
+
+    return 0;
+}
+*/
+static int
+ble_store_config_persist_sec_set(uint32_t setting_name,
+                                 const struct ble_store_value_sec *secs,
+                                 int num_secs)
+{
+    char buf[BLE_STORE_CONFIG_SEC_SET_ENCODE_SZ];
+    int rc;
+
+    ble_store_config_serialize_arr(secs, sizeof *secs, num_secs,
+                                   buf, sizeof buf);
+
+    rc = ble_bond_nvs_save_entry(setting_name, buf);
+    if (rc != 0) {
+        return BLE_HS_ESTORE_FAIL;
+    }
+
+    return 0;
+}
+
+int
+ble_store_config_persist_our_secs(void)
+{
+    int rc;
+
+    rc = ble_store_config_persist_sec_set(our_sec,
+                                          ble_store_config_our_secs,
+                                          ble_store_config_num_our_secs);
+    if (rc != 0) {
+        return rc;
+    }
+
+    return 0;
+}
+
+int
+ble_store_config_persist_peer_secs(void)
+{
+    int rc;
+
+    rc = ble_store_config_persist_sec_set(peer_sec,
+                                          ble_store_config_peer_secs,
+                                          ble_store_config_num_peer_secs);
+    if (rc != 0) {
+        return rc;
+    }
+
+    return 0;
+}
+
+int
+ble_store_config_persist_cccds(void)
+{
+    char buf[BLE_STORE_CONFIG_CCCD_SET_ENCODE_SZ];
+    int rc;
+
+    ble_store_config_serialize_arr(ble_store_config_cccds,
+                                   sizeof *ble_store_config_cccds,
+                                   ble_store_config_num_cccds,
+                                   buf,
+                                   sizeof buf);
+
+    rc = ble_bond_nvs_save_entry(cccd, buf);
+    if (rc != 0) {
+        return BLE_HS_ESTORE_FAIL;
+    }
+
+    return 0;
+}
+
+void
+ble_store_config_conf_init(void)
+{
+    uint32_t val_addr = 0;
+    int rc = 0;
+
+    rc = ble_bond_nvs_get_entry(our_sec, &val_addr);
+    if (rc == 0) {
+        rc = ble_store_config_deserialize_arr(
+                (char*)val_addr,
+                ble_store_config_our_secs,
+                sizeof *ble_store_config_our_secs,
+                &ble_store_config_num_our_secs);
+        if (rc != 0) {
+             BLE_HS_LOG(ERROR, "our_sec restore error rc=%d\n", rc);
+            return;
+        }
+
+        rc = ble_bond_nvs_get_entry(peer_sec, &val_addr);
+        if (rc == 0) {
+            rc = ble_store_config_deserialize_arr(
+                    (char*)val_addr,
+                    ble_store_config_peer_secs,
+                    sizeof *ble_store_config_peer_secs,
+                    &ble_store_config_num_peer_secs);
+            if (rc != 0) {
+                 BLE_HS_LOG(ERROR, "peer_sec restore error rc=%d\n", rc);
+                return;
+            }
+
+        } else {
+            /* If we have a security entry for our security but not a peer
+             * we should assume something wrong with the store so delete it.
+             */
+            BLE_HS_LOG(ERROR, "peer info not found\n");
+            ble_store_clear();
+            return;
+        }
+
+        rc = ble_bond_nvs_get_entry(cccd, &val_addr);
+        if (rc == 0) {
+            rc = ble_store_config_deserialize_arr(
+                    (char*)val_addr,
+                    ble_store_config_cccds,
+                    sizeof *ble_store_config_cccds,
+                    &ble_store_config_num_cccds);
+            if (rc != 0) {
+                 BLE_HS_LOG(ERROR, "cccd restore error rc=%d\n", rc);
+                return;
+            }
+        }
+    }
+
+ /*   int rc;
+
+    rc = conf_register(&ble_store_config_conf_handler);
+    SYSINIT_PANIC_ASSERT_MSG(rc == 0,
+                             "Failed to register ble_store_config conf");
+ */
+}
+
+#endif /* MYNEWT_VAL(BLE_STORE_CONFIG_PERSIST) */
+#endif /* ESP_PLATFORM */
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config_priv.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_config_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_config_priv.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_nvs.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_nvs.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_nvs.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_nvs.c
index 49ca6ed73..e09182d9f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/store/config/src/ble_store_nvs.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/src/ble_store_nvs.c
@@ -19,16 +19,16 @@
 * under the License.
 */
 
-
-#include "syscfg/syscfg.h"
+#ifdef ESP_PLATFORM
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 
 #if MYNEWT_VAL(BLE_STORE_CONFIG_PERSIST)
 
 #include <string.h>
 #include <esp_system.h>
-#include "sysinit/sysinit.h"
-#include "host/ble_hs.h"
-#include "store/config/ble_store_config.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "../../../include/host/ble_hs.h"
+#include "../include/store/config/ble_store_config.h"
 #include "ble_store_config_priv.h"
 #include "esp_log.h"
 #include "nvs.h"
@@ -650,3 +650,4 @@ void ble_store_config_conf_init(void)
 
 /***************************************************************************************/
 #endif /* MYNEWT_VAL(BLE_STORE_CONFIG_PERSIST) */
+#endif /* ESP_PLATFORM */
\ No newline at end of file
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/syscfg.yml
new file mode 100644
index 000000000..ff0689c6d
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/store/config/syscfg.yml
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_STORE_CONFIG_PERSIST:
+        description: >
+            Whether to save data to sys/config, or just keep it in RAM.
+        value: 1
+    BLE_STORE_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for BLE host store.
+        value: 500
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/syscfg.yml
new file mode 100644
index 000000000..e72e8d529
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/syscfg.yml
@@ -0,0 +1,471 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_HOST:
+        description: 'Indicates that a BLE host is present.'
+        value: 1
+
+    BLE_HS_AUTO_START:
+        description: >
+                Causes the BLE host to automatically start during system
+                initialization.
+        value: 1
+
+    # Debug settings.
+    BLE_HS_DEBUG:
+        description: 'Enables extra runtime assertions.'
+        value: 0
+    BLE_HS_PHONY_HCI_ACKS:
+        description: >
+            Rather than wait for HCI acknowledgements from a controller, the
+            host simulates incoming acks.  Only recommended for test code
+            running in the simulator.
+        value: 0
+    BLE_HS_REQUIRE_OS:
+        description: >
+            Specifies whether the host can depend on the kernel being present.
+            This should only be disabled for unit tests running in the
+            simulator.
+        value: 1
+
+    # Monitor interface settings
+    BLE_MONITOR_UART:
+        description: Enables monitor interface over UART
+        value: 0
+    BLE_MONITOR_UART_DEV:
+        description: Monitor interface UART device
+        value: '"uart0"'
+    BLE_MONITOR_UART_BAUDRATE:
+        description: Baudrate for monitor interface UART
+        value: 1000000
+    BLE_MONITOR_UART_BUFFER_SIZE:
+        description: >
+            Monitor interface ringbuffer size for UART.
+            This value should be a power of 2.
+        value: 64
+    BLE_MONITOR_RTT:
+        description: Enables monitor interface over RTT
+        value: 0
+    BLE_MONITOR_RTT_BUFFER_NAME:
+        description: Monitor interface upstream buffer name
+        value: '"btmonitor"'
+    BLE_MONITOR_RTT_BUFFER_SIZE:
+        description: Monitor interface upstream buffer size
+        value: 256
+    BLE_MONITOR_RTT_BUFFERED:
+        description: >
+            Enables buffering when using monitor interface over RTT. The data
+            are written to RTT once complete packet is created in intermediate
+            buffer. This allows to skip complete packet if there is not enough
+            space in RTT buffer (e.g. there is no reader connected). If disabled,
+            monitor will simply block waiting for RTT to free space in buffer.
+        value: 1
+    BLE_MONITOR_CONSOLE_BUFFER_SIZE:
+        description: >
+            Size of internal buffer for console output. Any line exceeding this
+            length value will be split.
+        value: 128
+
+    # L2CAP settings.
+    BLE_L2CAP_MAX_CHANS:
+        description: >
+            The number of L2CAP channels to allocate.  The default value allows
+            for the signal, ATT, and SM channels for each connection.
+        value: '3*MYNEWT_VAL_BLE_MAX_CONNECTIONS'
+    BLE_L2CAP_SIG_MAX_PROCS:
+        description: >
+            The maximum number of concurrent L2CAP signal procedures.
+        value: 1
+    BLE_L2CAP_JOIN_RX_FRAGS:
+        description: >
+            Whether to collapse incoming L2CAP fragments into a minimal set of
+            mbufs.
+                1: Slower, more memory efficient.
+                0: Faster, less memory efficient.
+        value: 1
+    BLE_L2CAP_RX_FRAG_TIMEOUT:
+        description: >
+            Expiry time for incoming data packets (ms).  If this much time
+            passes since the previous fragment was received, the connection is
+            terminated.  A value of 0 means no timeout.
+        value: 30000
+    BLE_L2CAP_COC_MAX_NUM:
+        description: >
+            Defines maximum number of LE Connection Oriented Channels channels.
+            When set to (0), LE COC is not compiled in.
+        value: 0
+    BLE_L2CAP_COC_MPS:
+        description: >
+            Defines the MPS of L2CAP COC module. This is actually NimBLE's internal
+            L2CAP MTU. The default MPS size is chosen in a way, that the MPS plus
+            the required HCI and L2CAP headers fit into the smallest available
+            MSYS blocks.
+        value: 'MYNEWT_VAL_MSYS_1_BLOCK_SIZE-8'
+
+    BLE_L2CAP_ENHANCED_COC:
+        description: >
+            Enables LE Enhanced CoC mode.
+        value: 0
+        restrictions:
+            - '(BLE_L2CAP_COC_MAX_NUM > 0) && (BLE_VERSION >= 52) if 1'
+
+    # Security manager settings.
+    BLE_SM_LEGACY:
+        description: 'Security manager legacy pairing.'
+        value: 1
+    BLE_SM_SC:
+        description: 'Security manager secure connections (4.2).'
+        value: 0
+
+    BLE_SM_MAX_PROCS:
+        description: >
+            The maximum number of concurrent security manager procedures.
+        value: 1
+    BLE_SM_IO_CAP:
+        description: >
+            The IO capabilities to report during pairing.  Valid values are:
+                BLE_HS_IO_DISPLAY_ONLY
+                BLE_HS_IO_DISPLAY_YESNO
+                BLE_HS_IO_KEYBOARD_ONLY
+                BLE_HS_IO_NO_INPUT_OUTPUT
+                BLE_HS_IO_KEYBOARD_DISPLAY
+        value: 'BLE_HS_IO_NO_INPUT_OUTPUT'
+    BLE_SM_OOB_DATA_FLAG:
+        description: >
+            Whether the out-of-band pairing algorithm is advertised. (0/1)
+        value: 0
+    BLE_SM_BONDING:
+        description: >
+            Enables bonding (persistence and restoration of secure links). (0/1)
+        value: 0
+    BLE_SM_MITM:
+        description: >
+            Whether man-in-the-middle protection is advertised during
+            pairing. (0/1)
+        value: 0
+    BLE_SM_KEYPRESS:
+        description: >
+            Whether keypress support is advertised during pairing. (0/1)
+        value: 0
+    BLE_SM_OUR_KEY_DIST:
+        description: >
+            A bitmap indicating which keys to distribute during pairing.  The
+            bits are defined as follows:
+                0x01: BLE_SM_PAIR_KEY_DIST_ENC
+                0x02: BLE_SM_PAIR_KEY_DIST_ID
+                0x04: BLE_SM_PAIR_KEY_DIST_SIGN
+                0x08: BLE_SM_PAIR_KEY_DIST_LINK
+        value: 0
+    BLE_SM_THEIR_KEY_DIST:
+        description: >
+            A bitmap indicating which keys to accept during pairing.  The
+            bits are defined as follows:
+                0x01: BLE_SM_PAIR_KEY_DIST_ENC
+                0x02: BLE_SM_PAIR_KEY_DIST_ID
+                0x04: BLE_SM_PAIR_KEY_DIST_SIGN
+                0x08: BLE_SM_PAIR_KEY_DIST_LINK
+        value: 0
+    BLE_SM_SC_DEBUG_KEYS:
+        description: >
+            Enable SM debug mode. In this mode SM uses predefined DH key pair as
+            described in Core Specification 5.0, Vol. 3, Part H, 2.3.5.6.1. This
+            allows to decrypt air traffic easily and thus should be only used
+            for debugging.
+        value: 0
+
+    # GAP options.
+    BLE_GAP_MAX_PENDING_CONN_PARAM_UPDATE:
+        description: >
+            Controls the number of connection parameter updates that can be pending
+            simultaneously. Devices with many concurrent connections may need
+            to increase this value.
+        value: 1
+
+    # Supported GATT procedures.  By default:
+    #     o Notify and indicate are enabled;
+    #     o All other procedures are enabled for centrals.
+    BLE_GATT_DISC_ALL_SVCS:
+        description: >
+            Enables the Discover All Primary Services GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_DISC_SVC_UUID:
+        description: >
+            Enables the Discover Primary Services by Service UUID GATT
+            procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_FIND_INC_SVCS:
+        description: >
+            Enables the Find Included Services GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_DISC_ALL_CHRS:
+        description: >
+            Enables the Discover All Characteristics of a Service GATT
+            procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_DISC_CHR_UUID:
+        description: >
+            Enables the Discover Characteristics by UUID GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_DISC_ALL_DSCS:
+        description: >
+            Enables the Discover All Primary Services GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_READ:
+        description: >
+            Enables the Read Characteristic Value GATT procedure. (0/1)
+            (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_READ_UUID:
+        description: >
+            Enables the Read Using Characteristic UUID GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_READ_LONG:
+        description: >
+            Enables the Read Long Characteristic Values GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_READ_MULT:
+        description: >
+            Enables the Read Multiple Characteristic Values GATT procedure.
+            (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_WRITE_NO_RSP:
+        description: >
+            Enables the Write Without Response GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_SIGNED_WRITE:
+        description: >
+            Enables the Signed Write Without Response GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_WRITE:
+        description: >
+            Enables the Write Characteristic Value GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_WRITE_LONG:
+        description: >
+            Enables the Write Long Characteristic Values GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_WRITE_RELIABLE:
+        description: >
+            Enables the Reliable Writes GATT procedure. (0/1)
+        value: MYNEWT_VAL_BLE_ROLE_CENTRAL
+    BLE_GATT_NOTIFY:
+        description: >
+            Enables sending and receiving of GATT notifications. (0/1)
+        value: 1
+    BLE_GATT_INDICATE:
+        description: >
+            Enables sending and receiving of GATT indications. (0/1)
+        value: 1
+
+    # GATT options.
+    BLE_GATT_READ_MAX_ATTRS:
+        description: >
+            The maximum number of attributes that can be read with a single
+            GATT Read Multiple Characteristic Values procedure. (0/1)
+        value: 8
+    BLE_GATT_WRITE_MAX_ATTRS:
+        description: >
+            The maximum number of attributes that can be written with a single
+            GATT Reliable Write procedure. (0/1)
+        value: 4
+    BLE_GATT_MAX_PROCS:
+        description: >
+            The maximum number of concurrent client GATT procedures. (0/1)
+        value: 4
+    BLE_GATT_RESUME_RATE:
+        description: >
+            The rate to periodically resume GATT procedures that have stalled
+            due to memory exhaustion. (0/1)  Units are milliseconds. (0/1)
+        value: 1000
+
+    # Supported server ATT commands. (0/1)
+    BLE_ATT_SVR_FIND_INFO:
+        description: >
+            Enables processing of incoming Find Information Request ATT
+            commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_FIND_TYPE:
+        description: >
+            Enables processing of incoming Find By Type Value Request ATT
+            commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_READ_TYPE:
+        description: >
+            Enables processing of incoming Read By Type Request ATT commands.
+            (0/1)
+        value: 1
+    BLE_ATT_SVR_READ:
+        description: >
+            Enables processing of incoming Read Request ATT commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_READ_BLOB:
+        description: >
+            Enables processing of incoming Read Blob Request ATT commands.
+            (0/1)
+        value: 1
+    BLE_ATT_SVR_READ_MULT:
+        description: >
+            Enables processing of incoming Read Multiple Request ATT commands.
+            (0/1)
+        value: 1
+    BLE_ATT_SVR_READ_GROUP_TYPE:
+        description: >
+            Enables processing of incoming Read by Group Type Request ATT
+            commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_WRITE:
+        description: >
+            Enables processing of incoming Write Request ATT commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_WRITE_NO_RSP:
+        description: >
+            Enables processing of incoming Write Command ATT commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_SIGNED_WRITE:
+        description: >
+            Enables processing of incoming Signed Write Command ATT commands.
+            (0/1)
+        value: 1
+    BLE_ATT_SVR_QUEUED_WRITE:
+        description: >
+            Enables processing of incoming Prepare Write Request and Execute
+            Write Request ATT commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_NOTIFY:
+        description: >
+            Enables processing of incoming Handle Value Notification ATT
+            commands. (0/1)
+        value: 1
+    BLE_ATT_SVR_INDICATE:
+        description: >
+            Enables processing of incoming Handle Value Indication ATT
+            commands.  (0/1)
+        value: 1
+
+    # ATT options.
+    BLE_ATT_PREFERRED_MTU:
+        description: The preferred MTU to indicate in MTU exchange commands.
+        value: 256
+
+    BLE_ATT_SVR_MAX_PREP_ENTRIES:
+        description: >
+            A GATT server uses these when a peer performs a "write long
+            characteristic values" or "write long characteristic descriptors"
+            procedure.  One of these resources is consumed each time a peer
+            sends a partial write.
+        value: 64
+
+    BLE_ATT_SVR_QUEUED_WRITE_TMO:
+        description: >
+            Expiry time for incoming ATT queued writes (ms).  If this much
+            time passes since the previous prepared write was received, the
+            connection is terminated.  A value of 0 means no timeout.
+        value: 30000
+
+    # Privacy options.
+    BLE_RPA_TIMEOUT:
+        description: >
+            The rate that new random addresses should be generated (seconds).
+        value: 300
+
+    # Store settings.
+    BLE_STORE_MAX_BONDS:
+        description: >
+            Maximum number of bonds that can be persisted.  Note: increasing
+            this value may also require increasing the capacity of the
+            underlying storage mechanism.
+        value: 3
+    BLE_STORE_MAX_CCCDS:
+        description: >
+            Maximum number of client characteristic configuration descriptors
+            that can be persisted.  Note: increasing this value may also
+            require increasing the capacity of the underlying storage
+            mechanism.
+
+        value: 8
+
+    BLE_MESH:
+        description: >
+            This option enables Bluetooth Mesh support. The specific
+            features that are available may depend on other features
+            that have been enabled in the stack, such as GATT support.
+        value: 0
+
+    # Flow control settings.
+    BLE_HS_FLOW_CTRL:
+        description: >
+            Whether to enable host-side flow control.  This should only be
+            enabled in host-only setups (i.e., not combined-host-controller).
+        value: 0
+
+    BLE_HS_FLOW_CTRL_ITVL:
+        description: >
+            The interval, in milliseconds, that the host should provide
+            number-of-completed-packets updates to the controller.
+        value: 1000
+
+    BLE_HS_FLOW_CTRL_THRESH:
+        description: >
+            If the number of data buffers available to the controller falls to
+            this number, immediately send a number-of-completed-packets event.
+            The free buffer count is calculated as follows:
+            (total-acl-bufs - bufs-freed-since-last-num-completed-event).
+        value: 2
+
+    BLE_HS_FLOW_CTRL_TX_ON_DISCONNECT:
+        description: >
+            If enabled, the host will immediately transmit a
+            host-number-of-completed-packets command whenever a connection
+            terminates.  This behavior is not required by the standard, but is
+            a necessary workaround when interfacing with some controllers.
+        value: 0
+
+    BLE_HS_STOP_ON_SHUTDOWN:
+        description: >
+            Stops the Bluetooth host when the system shuts down.  Stopping
+            entails aborting all GAP procedures and terminating open
+            connections.
+        value: 1
+
+    BLE_HS_STOP_ON_SHUTDOWN_TIMEOUT:
+        description: >
+            Timeout used in NimBLE's host stop procedure in ms.
+        value: 2000
+
+    BLE_HS_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the NimBLE host.
+        value: 200
+
+    ### Log settings.
+
+    BLE_HS_LOG_MOD:
+        description: 'Numeric module ID to use for BLE host log messages.'
+        value: 4
+    BLE_HS_LOG_LVL:
+        description: 'Minimum level for the BLE host log.'
+        value: 1
+
+syscfg.logs:
+    BLE_HS_LOG:
+        module: MYNEWT_VAL(BLE_HS_LOG_MOD)
+        level: MYNEWT_VAL(BLE_HS_LOG_LVL)
+
+syscfg.vals.BLE_MESH:
+    BLE_SM_SC: 1
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/tools/log2smtest.rb b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/tools/log2smtest.rb
new file mode 100644
index 000000000..e253e69f0
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/tools/log2smtest.rb
@@ -0,0 +1,1029 @@
+#!/usr/bin/env ruby
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+### This script converts a bletiny log into a security manager unit test.  The
+### input log must contain the connection establishment and complete pairing
+### procedure.
+###
+### Arguments: None
+### Stdin: bletiny log file
+
+$PAIR_ALG_STRINGS = {
+    0 => [ 'BLE_SM_PAIR_ALG_JW',        'just works',           'jw' ],
+    1 => [ 'BLE_SM_PAIR_ALG_PASSKEY',   'passkey entry',        'pk' ],
+    2 => [ 'BLE_SM_PAIR_ALG_OOB',       'out of band',          'ob' ],
+    3 => [ 'BLE_SM_PAIR_ALG_NUMCMP',    'numeric comparison',   'nc' ]
+}
+
+$ADDR_TYPE_STRINGS = {
+    0 => 'BLE_ADDR_TYPE_PUBLIC',
+    1 => 'BLE_ADDR_TYPE_RANDOM',
+    2 => 'BLE_ADDR_TYPE_RPA_PUB_DEFAULT',
+    3 => 'BLE_ADDR_TYPE_RPA_RND_DEFAULT',
+}
+
+$ACTION_STRINGS = {
+    0 => 'BLE_SM_IOACT_NONE',
+    1 => 'BLE_SM_IOACT_OOB',
+    2 => 'BLE_SM_IOACT_INPUT',
+    3 => 'BLE_SM_IOACT_DISP',
+    4 => 'BLE_SM_IOACT_NUMCMP',
+}
+
+$prev_idx = 0
+$ctxt = {}
+
+def test_case_name
+    type_str = $ctxt[:sc] ? "sc" : "lgcy"
+    init_str = $ctxt[:we_are_init] ? "us" : "peer"
+    alg_str = $PAIR_ALG_STRINGS[$ctxt[:pair_alg]][2]
+    iio_cap_str = "iio#{$ctxt[:pair_req][:io_cap]}"
+    rio_cap_str = "rio#{$ctxt[:pair_rsp][:io_cap]}"
+    bonding_str = "b#{$ctxt[:bonding] ? 1 : 0}"
+    iat_str = "iat#{$ctxt[:addrs][:init_type]}"
+    rat_str = "rat#{$ctxt[:addrs][:resp_type]}"
+    ikey_str = "ik#{$ctxt[:pair_rsp][:init_key_dist]}"
+    rkey_str = "rk#{$ctxt[:pair_rsp][:resp_key_dist]}"
+
+    "ble_sm_" +
+    "#{type_str}_#{init_str}_#{alg_str}_#{iio_cap_str}_#{rio_cap_str}_" +
+    "#{bonding_str}_#{iat_str}_#{rat_str}_#{ikey_str}_#{rkey_str}"
+end
+
+def test_case_comment
+<<-eos
+/**
+ * #{$ctxt[:sc] ? 'Secure connections' : 'Legacy'} pairing
+ * Master: #{$ctxt[:we_are_init] ? "us" : "peer"}
+ * Pair algorithm: #{$PAIR_ALG_STRINGS[$ctxt[:pair_alg]][1]}
+ * Initiator IO capabilities: #{$ctxt[:pair_req][:io_cap]}
+ * Responder IO capabilities: #{$ctxt[:pair_rsp][:io_cap]}
+ * Bonding: #{$ctxt[:bonding]}
+ * Initiator address type: #{$ADDR_TYPE_STRINGS[$ctxt[:addrs][:init_type]]}
+ * Responder address type: #{$ADDR_TYPE_STRINGS[$ctxt[:addrs][:resp_type]]}
+ * Initiator key distribution: #{$ctxt[:pair_rsp][:init_key_dist]}
+ * Responder key distribution: #{$ctxt[:pair_rsp][:resp_key_dist]}
+ */
+eos
+end
+
+def to_hex_s(byte)
+    if byte.is_a?(String)
+        byte = s_to_i(byte)
+    end
+
+    "0x#{byte.to_s(16).rjust(2, '0')}"
+end
+
+# to_i(0) but interpret leading zeros as decimal.
+def s_to_i(s)
+    if s[0..1] == "0x"
+        return s.to_i(16)
+    else
+        return s.to_i(10)
+    end
+end
+
+def invalid_byte_line(msg, line)
+    str = "invalid byte line"
+    if msg != nil
+        str += ": #{msg}"
+    end
+
+    str += "; line=#{line}"
+
+    raise str
+end
+
+def token_string_to_bytes(line, delim = ' ')
+    tokens = line.split(delim)
+    bytes = []
+    tokens.each do |token|
+        begin
+            byte = token.to_i(16)
+            bytes << byte
+        rescue
+            invalid_byte_line("token=#{token}", line)
+        end
+    end
+
+    return bytes
+end
+
+def txrx_prefix(is_tx)
+    if is_tx
+        return "tx"
+    else
+        return "rx"
+    end
+end
+
+def reqrsp_s(is_req)
+    reqrsp = nil
+    if is_req
+        return "req"
+    else
+        return "rsp"
+    end
+end
+
+def bytes_to_arr_body(bytes, indent)
+    lines = []
+
+    idx = 0
+    while idx < bytes.size
+        slice_len = nil
+        if bytes.size - idx >= 8
+            slice_len = 8
+        else
+            slice_len = bytes.size - idx
+        end
+
+        slice = bytes[idx...(idx + slice_len)]
+        line = ' ' * indent +
+            slice.map{|b| to_hex_s(b)}.join(", ") + ","
+        lines << line
+
+        idx += slice_len
+    end
+
+    return lines.join("\n") << "\n"
+end
+
+def bytes_to_arr(bytes, name, indent)
+    str = "#{' ' * indent}.#{name} = {\n"
+    str << bytes_to_arr_body(bytes, indent + 4)
+    str << "#{' ' * indent}},"
+
+    return str
+end
+
+def addr_string_to_bytes(addr_string)
+    token_string_to_bytes(addr_string, ':').reverse
+end
+
+def parse_pair_cmd(line, is_req)
+    suffix = reqrsp_s(is_req)
+    re = %r{
+        pair\s#{suffix};
+        \s
+        conn=\d+
+        \s
+        io_cap=(?<io_cap>\d+)
+        \s
+        oob_data_flag=(?<oob_data_flag>\d+)
+        \s
+        authreq=(?<authreq>0x[0-9a-f]+)
+        \s
+        mac_enc_key_size=(?<max_enc_key_size>\d+)
+        \s
+        init_key_dist=(?<init_key_dist>\d+)
+        \s
+        resp_key_dist=(?<resp_key_dist>\d+)
+    }x
+
+    m = re.match(line)
+    if m == nil
+        return nil
+    end
+
+    cmd = {}
+    cmd[:io_cap] = s_to_i(m[:io_cap])
+    cmd[:oob_data_flag] = s_to_i(m[:oob_data_flag])
+    cmd[:authreq] = s_to_i(m[:authreq])
+    cmd[:max_enc_key_size] = s_to_i(m[:max_enc_key_size])
+    cmd[:init_key_dist] = s_to_i(m[:init_key_dist])
+    cmd[:resp_key_dist] = s_to_i(m[:resp_key_dist])
+
+    return cmd
+end
+
+def parse_privkey(line)
+    if !(line =~ /our privkey=(.+)/)
+        return nil
+    end
+    return token_string_to_bytes($1)
+end
+
+def parse_public_key(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: public key; conn=\d+ x=(.+) y=(.+)/)
+        return nil
+    end
+
+    pubkey = {}
+    pubkey[:x] = token_string_to_bytes($1)
+    pubkey[:y] = token_string_to_bytes($2)
+
+    if pubkey[:x].size != 32
+        raise "invalid public key: x length incorrect; line=#{line}"
+    end
+
+    if pubkey[:y].size != 32
+        raise "invalid public key: y length incorrect; line=#{line}"
+    end
+
+    return pubkey
+end
+
+def parse_confirm(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: confirm; conn=\d+ value=(.+)/)
+        return nil
+    end
+
+    bytes = token_string_to_bytes($1)
+    if bytes.size != 16
+        raise "invalid confirm line (length mismatch): #{line}"
+    end
+
+    return { :value => bytes }
+end
+
+def parse_random(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: random; conn=\d+ value=(.+)/)
+        return nil
+    end
+
+    bytes = token_string_to_bytes($1)
+    if bytes.size != 16
+        raise "invalid random line (length mismatch): #{line}"
+    end
+
+    return { :value => bytes }
+end
+
+def parse_stk(line)
+    if !(line =~ /^    out=(.+)/)
+        return nil
+    end
+
+    bytes = token_string_to_bytes($1)
+    if bytes.size != 16
+        raise "invalid stk line (length mismatch): #{line}"
+    end
+
+    return bytes
+end
+
+def parse_dhkey_check(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: dhkey check; conn=\d+ value=(.+)/)
+        return nil
+    end
+
+    bytes = token_string_to_bytes($1)
+    if bytes.size != 16
+        raise "invalid dhkey_check line (length mismatch): #{line}"
+    end
+
+    return { :value => bytes }
+end
+
+def parse_ltk(line)
+    if !(line =~ /persisting.+ltk=([^ ]+)/)
+        return nil
+    end
+
+    bytes = $1.split(":")
+    if bytes.size != 16
+        raise "invalid ltk line (length mismatch): exp=16 got=#{bytes.size} " +
+              "line=#{line}"
+    end
+
+    return bytes
+end
+
+def parse_enc_info(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: enc info; conn=\d+ ltk=(.+)/)
+        return nil
+    end
+
+    bytes = token_string_to_bytes($1)
+    if bytes.size != 16
+        raise "invalid enc info line (length mismatch): #{line}"
+    end
+
+    return { :ltk => bytes }
+end
+
+def parse_master_id(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: master id; conn=\d+ ediv=(.+) rand=(.+)/)
+        return nil
+    end
+
+    return {
+        :ediv => s_to_i($1),
+        :rand => s_to_i($2),
+    }
+end
+
+def parse_id_info(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: id info; conn=\d+ irk=(.+)/)
+        return nil
+    end
+
+    bytes = token_string_to_bytes($1)
+    if bytes.size != 16
+        raise "invalid id info line (length mismatch): #{line}"
+    end
+
+    return { :irk => bytes }
+end
+
+def parse_id_addr_info(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: id addr info; conn=\d+ addr_type=(\d+) addr=(.+)/)
+        return nil
+    end
+
+    bytes = addr_string_to_bytes($2)
+    if bytes.size != 6
+        raise "invalid id addr info line (length mismatch): #{line}"
+    end
+
+    return {
+        :addr_type => s_to_i($1),
+        :addr => bytes,
+    }
+end
+
+def parse_sign_info(line, is_tx)
+    prefix = txrx_prefix(is_tx)
+    if !(line =~ /#{prefix}ed sm command: sign info; conn=\d+ sig_key=(.+)/)
+        return nil
+    end
+
+    bytes = token_string_to_bytes($1)
+    if bytes.size != 16
+        raise "invalid sign info line (length mismatch): #{line}"
+    end
+
+    return {
+        :sig_key => bytes,
+    }
+end
+
+def parse_passkey_info(line)
+    passkey_info = {}
+
+    case line
+    when /passkey action event; action=4 numcmp=(\d+)/
+        passkey_info[:action] = 4
+        passkey_info[:numcmp] = $1.to_i(10)
+    when /^b passkey conn=\d+ action=1 oob=(\S+)/
+        passkey_info[:action] = 1
+        passkey_info[:oob] = token_string_to_bytes($1, ':')
+    when /^b passkey conn=\d+ action=2 key=(\d+)/
+        passkey_info[:action] = 2
+        passkey_info[:key] = $1.to_i(10)
+    when /b passkey conn=\d+ action=3 key=(\d+)/
+        passkey_info[:action] = 3
+        passkey_info[:key] = $1.to_i(10)
+    else
+        return nil
+    end
+
+    return passkey_info
+end
+
+def parse_addrs(line)
+    if !(line =~ /our_ota_addr_type=(\d+) our_ota_addr=(\S+) our_id_addr_type=(\d+) our_id_addr=(\S+) peer_ota_addr_type=(\d+) peer_ota_addr=(\S+) peer_id_addr_type=(\d+) peer_id_addr=(\S+)/)
+        return nil
+    end
+
+    our_ota_addr_bytes = addr_string_to_bytes($2)
+    our_id_addr_bytes = addr_string_to_bytes($4)
+    peer_ota_addr_bytes = addr_string_to_bytes($6)
+    peer_id_addr_bytes = addr_string_to_bytes($8)
+
+    if $ctxt[:we_are_init]
+        init_id_bytes = our_id_addr_bytes
+        init_ota_bytes = our_ota_addr_bytes
+        resp_id_bytes = peer_id_addr_bytes
+        resp_ota_bytes = peer_ota_addr_bytes
+        init_addr_type = s_to_i($1)
+        resp_addr_type = s_to_i($5)
+    else
+        init_id_bytes = peer_id_addr_bytes
+        init_ota_bytes = peer_ota_addr_bytes
+        resp_id_bytes = our_id_addr_bytes
+        resp_ota_bytes = our_ota_addr_bytes
+        init_addr_type = s_to_i($5)
+        resp_addr_type = s_to_i($1)
+    end
+
+    if init_id_bytes == init_ota_bytes
+        init_ota_bytes = [0] * 6
+    end
+    if resp_id_bytes == resp_ota_bytes
+        resp_ota_bytes = [0] * 6
+    end
+
+    return {
+        :init_type => init_addr_type,
+        :resp_type => resp_addr_type,
+        :init_id_addr => init_id_bytes,
+        :resp_id_addr => resp_id_bytes,
+        :init_rpa => init_ota_bytes,
+        :resp_rpa => resp_ota_bytes,
+    }
+end
+
+def detect_initiator(lines)
+    lines.each do |line|
+        if line =~ /txed sm command: pair req/
+            $ctxt[:we_are_init] = true
+        elsif line =~ /txed sm command: pair rsp/
+            $ctxt[:we_are_init] = false
+        end
+    end
+
+    if $ctxt[:we_are_init] == nil
+        raise "could not detect which peer is the initiator"
+    end
+end
+
+def pair_cmd_to_s(cmd, is_req)
+    suffix = reqrsp_s(is_req)
+    return <<-eos
+        .pair_#{suffix} = {
+            .io_cap = #{to_hex_s(cmd[:io_cap])},
+            .oob_data_flag = #{to_hex_s(cmd[:oob_data_flag])},
+            .authreq = #{to_hex_s(cmd[:authreq])},
+            .max_enc_key_size = #{to_hex_s(cmd[:max_enc_key_size])},
+            .init_key_dist = #{to_hex_s(cmd[:init_key_dist])},
+            .resp_key_dist = #{to_hex_s(cmd[:resp_key_dist])},
+        },
+    eos
+end
+
+def privkey_to_s(privkey)
+    return bytes_to_arr(privkey, "our_priv_key", 8)
+end
+
+def public_key_to_s(public_key, is_req)
+    suffix = reqrsp_s(is_req)
+    return <<-eos
+        .public_key_#{suffix} = {
+#{bytes_to_arr(public_key[:x], "x", 12)}
+#{bytes_to_arr(public_key[:y], "y", 12)}
+        },
+    eos
+end
+
+def confirm_to_s(confirm, is_req, idx)
+    return <<-eos
+        .confirm_#{reqrsp_s(is_req)}[#{idx}] = {
+#{bytes_to_arr(confirm[:value], "value", 12)}
+        },
+    eos
+end
+
+def random_to_s(random, is_req, idx)
+    return <<-eos
+        .random_#{reqrsp_s(is_req)}[#{idx}] = {
+#{bytes_to_arr(random[:value], "value", 12)}
+        },
+    eos
+end
+
+def ltk_to_s(ltk)
+    return bytes_to_arr(ltk, "ltk", 8)
+end
+
+def stk_to_s(stk)
+    return bytes_to_arr(stk, "stk", 8)
+end
+
+def enc_info_to_s(id_info, is_req)
+    return <<-eos
+        .enc_info_#{reqrsp_s(is_req)} = {
+#{bytes_to_arr(id_info[:ltk], "ltk", 12)}
+        },
+    eos
+end
+
+def master_id_to_s(master_id, is_req)
+    return <<-eos
+        .master_id_#{reqrsp_s(is_req)} = {
+            .ediv = 0x#{master_id[:ediv].to_s(16)},
+            .rand_val = 0x#{master_id[:rand].to_s(16)},
+        },
+    eos
+end
+
+def id_info_to_s(id_info, is_req)
+    return <<-eos
+        .id_info_#{reqrsp_s(is_req)} = {
+#{bytes_to_arr(id_info[:irk], "irk", 12)}
+        },
+    eos
+end
+
+def id_addr_info_to_s(id_addr_info, is_req)
+    return <<-eos
+        .id_addr_info_#{reqrsp_s(is_req)} = {
+            .addr_type = #{id_addr_info[:addr_type]},
+#{bytes_to_arr(id_addr_info[:addr], "bd_addr", 12)}
+        },
+    eos
+end
+
+def sign_info_to_s(sign_info, is_req)
+    return <<-eos
+        .sign_info_#{reqrsp_s(is_req)} = {
+#{bytes_to_arr(sign_info[:sig_key], "sig_key", 12)}
+        },
+    eos
+end
+
+def passkey_info_fill(passkey_info)
+    case passkey_info[:action]
+    # None
+    when 0
+        $ctxt[:pair_alg] = 0
+        $ctxt[:authenticated] = false
+
+    # OOB
+    when 1
+        $ctxt[:pair_alg] = 2
+        $ctxt[:authenticated] = true
+
+    # Input
+    when 2
+        $ctxt[:pair_alg] = 1
+        $ctxt[:authenticated] = true
+
+    # Display
+    when 3
+        $ctxt[:pair_alg] = 1
+        $ctxt[:authenticated] = true
+
+    # Numeric comparison
+    when 4
+        $ctxt[:pair_alg] = 3
+        $ctxt[:authenticated] = true
+
+    else
+        raise "invalid MITM action: #{passkey_info[:action]}"
+    end
+end
+
+def passkey_info_s
+    passkey_info = $ctxt[:passkey_info]
+    action_str = $ACTION_STRINGS[passkey_info[:action]]
+
+    result = <<-eos
+        .pair_alg = #{$ctxt[:pair_alg]},
+        .authenticated = #{$ctxt[:authenticated]},
+        .passkey_info = {
+            .passkey = {
+                .action = #{action_str},
+    eos
+
+    if passkey_info[:key] != nil
+        result << <<-eos
+                .passkey = #{passkey_info[:key].to_i},
+        eos
+    end
+    if passkey_info[:oob] != nil
+        result << <<-eos
+#{bytes_to_arr(passkey_info[:oob], "oob", 16)}
+        eos
+    end
+    if passkey_info[:numcmp] != nil
+        result << <<-eos
+                .numcmp_accept = 1,
+        eos
+    end
+
+    result << <<-eos
+            },
+    eos
+
+    if passkey_info[:numcmp] != nil
+        result << <<-eos
+            .exp_numcmp = #{passkey_info[:numcmp].to_i},
+        eos
+    end
+
+    result << <<-eos
+        },
+    eos
+end
+
+def addrs_to_s(addrs)
+    s = ''
+
+    init_type = addrs[:init_type]
+    resp_type = addrs[:resp_type]
+
+    if init_type != 0
+        s += "        .init_addr_type = #{$ADDR_TYPE_STRINGS[init_type]},\n"
+    end
+    s += bytes_to_arr(addrs[:init_id_addr], "init_id_addr", 8) + "\n"
+    if init_type >= 2
+        s += bytes_to_arr(addrs[:init_rpa], "init_rpa", 8) + "\n"
+    end
+
+    if resp_type != 0
+        s += "        .resp_addr_type = #{$ADDR_TYPE_STRINGS[resp_type]},\n"
+    end
+    s += bytes_to_arr(addrs[:resp_id_addr], "resp_id_addr", 8) + "\n"
+    if resp_type >= 2
+        s += bytes_to_arr(addrs[:resp_rpa], "resp_rpa", 8) + "\n"
+    end
+
+    return s
+end
+
+def dhkey_check_to_s(dhkey_check, is_req)
+    return <<-eos
+        .dhkey_check_#{reqrsp_s(is_req)} = {
+#{bytes_to_arr(dhkey_check[:value], "value", 12)}
+        },
+    eos
+end
+
+def extract_one(lines, ignore_prev = false)
+    if ignore_prev
+        start = 0
+    else
+        start = $prev_idx
+    end
+
+    (start...lines.size).each do |idx|
+        line = lines[idx]
+        result = yield(line)
+        if result != nil
+            if !ignore_prev
+                $prev_idx = idx
+            end
+            return result
+        end
+    end
+
+    return nil
+end
+
+def extract_pair_req(lines)
+    return extract_one(lines) {|line| parse_pair_cmd(line, true)}
+end
+
+def extract_pair_rsp(lines)
+    return extract_one(lines) {|line| parse_pair_cmd(line, false)}
+end
+
+def extract_privkey(lines)
+    return extract_one(lines) {|line| parse_privkey(line)}
+end
+
+def extract_public_key_req(lines)
+    return extract_one(lines) do |line|
+        parse_public_key(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_public_key_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_public_key(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_confirm_req(lines)
+    return extract_one(lines) do |line|
+        parse_confirm(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_confirm_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_confirm(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_random_req(lines)
+    return extract_one(lines) do |line|
+        parse_random(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_random_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_random(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_confirm_random(lines)
+    confirm_reqs = []
+    confirm_rsps = []
+    random_reqs = []
+    random_rsps = []
+
+    idx = 0
+    loop do
+        confirm_req = extract_confirm_req(lines)
+        if confirm_req != nil
+            confirm_reqs << confirm_req
+        end
+
+        confirm_rsp = extract_confirm_rsp(lines)
+        break if confirm_rsp == nil
+        if idx >= 20
+            raise "too many confirm rsps (>20)"
+        end
+        confirm_rsps << confirm_rsp
+
+        random_req = extract_random_req(lines)
+        break if random_req == nil
+        random_reqs << random_req
+
+        random_rsp = extract_random_rsp(lines)
+        break if random_rsp == nil
+        random_rsps << random_rsp
+
+        idx += 1
+    end
+
+    return confirm_reqs, confirm_rsps, random_reqs, random_rsps
+end
+
+def extract_stk(lines)
+    return extract_one(lines, true) do |line|
+        parse_stk(line)
+    end
+end
+
+def extract_dhkey_check_req(lines)
+    return extract_one(lines) do |line|
+        parse_dhkey_check(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_dhkey_check_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_dhkey_check(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_enc_info_req(lines)
+    return extract_one(lines) do |line|
+        parse_enc_info(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_enc_info_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_enc_info(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_master_id_req(lines)
+    return extract_one(lines) do |line|
+        parse_master_id(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_master_id_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_master_id(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_id_info_req(lines)
+    return extract_one(lines) do |line|
+        parse_id_info(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_id_info_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_id_info(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_id_addr_info_req(lines)
+    return extract_one(lines) do |line|
+        parse_id_addr_info(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_id_addr_info_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_id_addr_info(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_sign_info_req(lines)
+    return extract_one(lines) do |line|
+        parse_sign_info(line, !$ctxt[:we_are_init])
+    end
+end
+
+def extract_sign_info_rsp(lines)
+    return extract_one(lines) do |line|
+        parse_sign_info(line, $ctxt[:we_are_init])
+    end
+end
+
+def extract_ltk(lines)
+    return extract_one(lines) do |line|
+        parse_ltk(line)
+    end
+end
+
+def extract_passkey_info(lines)
+    passkey_info = extract_one(lines, true) do |line|
+        parse_passkey_info(line)
+    end
+
+    if passkey_info == nil
+        passkey_info = { :action => 0 }
+    end
+
+    return passkey_info
+end
+
+def extract_addrs(lines)
+    return extract_one(lines) do |line|
+        parse_addrs(line)
+    end
+end
+
+
+lines = STDIN.readlines
+
+detect_initiator(lines)
+$ctxt[:pair_req] = extract_pair_req(lines)
+$ctxt[:pair_rsp] = extract_pair_rsp(lines)
+$ctxt[:privkey] = extract_privkey(lines)
+$ctxt[:public_key_req] = extract_public_key_req(lines)
+$ctxt[:public_key_rsp] = extract_public_key_rsp(lines)
+$ctxt[:confirm_reqs], $ctxt[:confirm_rsps], $ctxt[:random_reqs], $ctxt[:random_rsps] = extract_confirm_random(lines)
+$ctxt[:passkey_info] = extract_passkey_info(lines)
+$ctxt[:dhkey_check_req] = extract_dhkey_check_req(lines)
+$ctxt[:dhkey_check_rsp] = extract_dhkey_check_rsp(lines)
+$ctxt[:enc_info_req] = extract_enc_info_req(lines)
+$ctxt[:master_id_req] = extract_master_id_req(lines)
+$ctxt[:id_info_req] = extract_id_info_req(lines)
+$ctxt[:id_addr_info_req] = extract_id_addr_info_req(lines)
+$ctxt[:sign_info_req] = extract_sign_info_req(lines)
+$ctxt[:enc_info_rsp] = extract_enc_info_rsp(lines)
+$ctxt[:master_id_rsp] = extract_master_id_rsp(lines)
+$ctxt[:id_info_rsp] = extract_id_info_rsp(lines)
+$ctxt[:id_addr_info_rsp] = extract_id_addr_info_rsp(lines)
+$ctxt[:sign_info_rsp] = extract_sign_info_rsp(lines)
+$ctxt[:addrs] = extract_addrs(lines)
+$ctxt[:ltk] = extract_ltk(lines)
+$ctxt[:stk] = extract_stk(lines)
+
+expected_confirm_rsps = nil
+expected_random_reqs = nil
+expected_random_rsps = nil
+if $ctxt[:confirm_reqs].size == 0
+    expected_confirm_rsps = 1
+    expected_random_reqs = 1
+    expected_random_rsps = 1
+else
+    expected_confirm_rsps = $ctxt[:confirm_reqs].size
+    expected_random_reqs = $ctxt[:random_reqs].size
+    expected_random_rsps = $ctxt[:random_rsps].size
+end
+
+if $ctxt[:confirm_rsps].size != expected_confirm_rsps
+    raise "wrong number of confirm responses " +
+          "(exp=#{expected_confirm_rsps}; got=#{$ctxt[:confirm_rsps].size}"
+end
+
+if $ctxt[:random_reqs].size != expected_random_reqs
+    raise "wrong number of random requests " +
+          "(exp=#{expected_random_reqs}; got=#{$ctxt[:random_reqs].size}"
+end
+
+if $ctxt[:random_rsps].size != expected_random_rsps
+    raise "wrong number of random responses " +
+          "(exp=#{expected_random_rsps}; got=#{$ctxt[:random_rsps].size}"
+end
+
+passkey_info_fill($ctxt[:passkey_info])
+
+$ctxt[:sc] = $ctxt[:public_key_req] != nil
+$ctxt[:bonding] = $ctxt[:pair_req][:authreq] & 1 == 1 &&
+                  $ctxt[:pair_rsp][:authreq] & 1 == 1
+
+puts test_case_comment()
+puts <<-eos
+TEST_CASE(#{test_case_name()})
+{
+    struct ble_sm_test_params params;
+
+    params = (struct ble_sm_test_params) {
+eos
+
+puts addrs_to_s($ctxt[:addrs])
+
+puts pair_cmd_to_s($ctxt[:pair_req], true)
+puts pair_cmd_to_s($ctxt[:pair_rsp], false)
+
+if $ctxt[:sc]
+    puts privkey_to_s($ctxt[:privkey])
+    puts public_key_to_s($ctxt[:public_key_req], true)
+    puts public_key_to_s($ctxt[:public_key_req], false)
+end
+
+$ctxt[:confirm_rsps].size.times do |i|
+    confirm_req = $ctxt[:confirm_reqs][i]
+    confirm_rsp = $ctxt[:confirm_rsps][i]
+    random_req = $ctxt[:random_reqs][i]
+    random_rsp = $ctxt[:random_rsps][i]
+
+    if confirm_req != nil
+        puts confirm_to_s(confirm_req, true, i)
+    end
+
+    puts confirm_to_s(confirm_rsp, false, i)
+    puts random_to_s(random_req, true, i)
+    puts random_to_s(random_rsp, false, i)
+end
+
+if $ctxt[:sc]
+    puts dhkey_check_to_s($ctxt[:dhkey_check_req], true)
+    puts dhkey_check_to_s($ctxt[:dhkey_check_rsp], false)
+end
+
+if $ctxt[:enc_info_req] != nil
+    puts enc_info_to_s($ctxt[:enc_info_req], true)
+end
+if $ctxt[:master_id_req] != nil
+    puts master_id_to_s($ctxt[:master_id_req], true)
+end
+if $ctxt[:id_info_req] != nil
+    puts id_info_to_s($ctxt[:id_info_req], true)
+end
+if $ctxt[:id_addr_info_req] != nil
+    puts id_addr_info_to_s($ctxt[:id_addr_info_req], true)
+end
+if $ctxt[:sign_info_req] != nil
+    puts sign_info_to_s($ctxt[:sign_info_req], true)
+end
+if $ctxt[:enc_info_rsp] != nil
+    puts enc_info_to_s($ctxt[:enc_info_rsp], false)
+end
+if $ctxt[:master_id_rsp] != nil
+    puts master_id_to_s($ctxt[:master_id_rsp], false)
+end
+if $ctxt[:id_info_rsp] != nil
+    puts id_info_to_s($ctxt[:id_info_rsp], false)
+end
+if $ctxt[:id_addr_info_rsp] != nil
+    puts id_addr_info_to_s($ctxt[:id_addr_info_rsp], false)
+end
+if $ctxt[:sign_info_rsp] != nil
+    puts sign_info_to_s($ctxt[:sign_info_rsp], false)
+end
+if $ctxt[:sc]
+    puts ltk_to_s($ctxt[:ltk])
+else
+    puts stk_to_s($ctxt[:stk])
+end
+puts passkey_info_s()
+
+puts '    };'
+
+if $ctxt[:sc]
+    if $ctxt[:we_are_init]
+        puts '    ble_sm_test_util_us_sc_good(&params);'
+    else
+        puts '    ble_sm_test_util_peer_sc_good(&params);'
+    end
+else
+    if $ctxt[:we_are_init]
+        puts '    ble_sm_test_util_us_lgcy_good(&params);'
+    else
+        puts '    ble_sm_test_util_peer_lgcy_good(&params);'
+    end
+end
+puts '}'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/host/util/util.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/include/host/util/util.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/host/util/util.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/include/host/util/util.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/pkg.yml
new file mode 100644
index 000000000..0f5f3a5de
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/pkg.yml
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/host/util
+pkg.description: Supplementary utilities for the NimBLE host
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.deps:
+    - nimble/host
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/util/src/addr.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/src/addr.c
similarity index 94%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/util/src/addr.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/src/addr.c
index 9b43d237c..b8195a5b7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/util/src/addr.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/src/addr.c
@@ -17,11 +17,11 @@
  * under the License.
  */
 
-#include "host/ble_hs.h"
-#include "host/util/util.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/host/util/util.h"
 
 #if MYNEWT_VAL(BLE_CONTROLLER)
-#include "controller/ble_hw.h"
+#include "nimble/nimble/controller/include/controller/ble_hw.h"
 #endif
 
 static int
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/syscfg.yml
new file mode 100644
index 000000000..2cdd57468
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/host/util/syscfg.yml
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/ble.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/ble.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/ble.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/ble.h
index 3fc2902ec..f6847728c 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/ble.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/ble.h
@@ -22,8 +22,8 @@
 
 #include <inttypes.h>
 #include <string.h>
-#include "syscfg/syscfg.h"
-#include "os/os.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/os/os.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/ble_hci_trans.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/ble_hci_trans.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/ble_hci_trans.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/ble_hci_trans.h
index e8d3ec031..d4c353f1f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/ble_hci_trans.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/ble_hci_trans.h
@@ -21,7 +21,7 @@
 #define H_HCI_TRANSPORT_
 
 #include <inttypes.h>
-#include "os/os_mempool.h"
+#include "nimble/porting/nimble/include/os/os_mempool.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/hci_common.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/hci_common.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/hci_common.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/hci_common.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_npl.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_npl.h
similarity index 97%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_npl.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_npl.h
index 883832289..091cbea59 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_npl.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_npl.h
@@ -23,7 +23,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include "nimconfig.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -51,7 +50,7 @@ enum ble_npl_error {
 typedef enum ble_npl_error ble_npl_error_t;
 
 /* Include OS-specific definitions */
-#include "nimble/nimble_npl_os.h"
+#include "nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h"
 
 /*
  * Generic
@@ -164,7 +163,7 @@ void ble_npl_time_delay(ble_npl_time_t ticks);
 
 #if NIMBLE_CFG_CONTROLLER
 
-void ble_npl_hw_set_isr(int irqn, uint32_t addr);
+void ble_npl_hw_set_isr(int irqn, void (*addr)(void));
 
 #endif
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_opt.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_opt.h
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_opt.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_opt.h
index f0e988b27..7de55d668 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_opt.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_opt.h
@@ -25,7 +25,7 @@ extern "C" {
 #endif
 
 /* Include automatically-generated settings. */
-#include "nimble/nimble_opt_auto.h"
+#include "nimble_opt_auto.h"
 
 #ifdef __cplusplus
 }
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_opt_auto.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_opt_auto.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_opt_auto.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_opt_auto.h
index 33a1e2aac..056eb1b02 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_opt_auto.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/include/nimble/nimble_opt_auto.h
@@ -20,7 +20,7 @@
 #ifndef H_NIMBLE_OPT_AUTO_
 #define H_NIMBLE_OPT_AUTO_
 
-#include "syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/pkg.yml
new file mode 100644
index 000000000..8b6058e11
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/pkg.yml
@@ -0,0 +1,30 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble
+pkg.description: Generic functionality for the nimble Bluetooth Smart stack; used by both the controller and the host.
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.deps:
+    - porting/npl/mynewt
+    - "@apache-mynewt-core/kernel/os"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/syscfg.yml
new file mode 100644
index 000000000..537fd9ba5
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/syscfg.yml
@@ -0,0 +1,83 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    # Supported GAP roles.  By default, all four roles are enabled.
+    BLE_ROLE_CENTRAL:
+        description: 'Enables the Central bluetooth role. (0/1)'
+        value: 1
+    BLE_ROLE_PERIPHERAL:
+        description: 'Enables the Peripheral bluetooth role. (0/1)'
+        value: 1
+    BLE_ROLE_BROADCASTER:
+        description: 'Enables the Broadcaster bluetooth role. (0/1)'
+        value: 1
+    BLE_ROLE_OBSERVER:
+        description: 'Enables the Observer bluetooth role. (0/1)'
+        value: 1
+
+    BLE_MAX_CONNECTIONS:
+        description: 'The maximum number of concurrent connections.'
+        value: 1
+    BLE_MAX_PERIODIC_SYNCS:
+        description: >
+            The maximum number of concurrent periodic syncs that can 
+            be created
+        value: 1
+    BLE_WHITELIST:
+        description: >
+            Enables the BLE whitelist for controlling who to connect to or
+            accept a connection from. (0/1)
+        value: 1
+    BLE_MULTI_ADV_INSTANCES:
+        description: >
+            This is the number of multi-advertising instances. This is NOT the
+            total number of advertising instances. The total number of
+            advertising instances is this number plus 1 (assuming the device
+            supports advertising).
+        value: 0
+    BLE_EXT_ADV:
+        description: >
+            This enables extended advertising feature.
+        value: 0
+    BLE_PERIODIC_ADV:
+        description: >
+            This enables periodic advertising feature.
+        value: 0
+    BLE_PERIODIC_ADV_SYNC_TRANSFER:
+        description: >
+            This enables Periodic Advertising Sync Transfer Feature.
+        value: 0
+
+    BLE_EXT_ADV_MAX_SIZE:
+        description: >
+            This allows to configure maximum size of advertising data and
+            scan response data used in LE Advertising Extensions.
+            Valid range 31-1650.
+        value: 31
+    BLE_VERSION:
+        description: >
+            This allows to configure supported Bluetooth Core version. Some
+            features may not be available if version is too low. Version is
+            integer for easy comparison.
+        range: 50, 51, 52
+        value: 50
+
+# Allow periodic sync transfer only if 5.1 or higher
+syscfg.restrictions:
+    - "'BLE_PERIODIC_ADV_SYNC_TRANSFER == 0' || 'BLE_VERSION >= 51'"
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/pkg.yml
new file mode 100644
index 000000000..2bc4ac293
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/pkg.yml
@@ -0,0 +1,45 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/transport
+pkg.description: Meta-package for NimBLE HCI transport
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.deps.'BLE_HCI_TRANSPORT == "builtin"':
+    - nimble/transport/ram
+    - nimble/controller
+
+pkg.deps.'BLE_HCI_TRANSPORT == "emspi"':
+    - nimble/transport/emspi
+
+pkg.deps.'BLE_HCI_TRANSPORT == "ram"':
+    - nimble/transport/ram
+
+pkg.deps.'BLE_HCI_TRANSPORT == "socket"':
+    - nimble/transport/socket
+
+pkg.deps.'BLE_HCI_TRANSPORT == "uart"':
+    - nimble/transport/uart
+
+pkg.deps.'BLE_HCI_TRANSPORT == "da1469x"':
+    - nimble/transport/da1469x
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/include/transport/ram/ble_hci_ram.h
similarity index 80%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow_priv.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/include/transport/ram/ble_hci_ram.h
index 753eaf8ff..00530798d 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/host/src/ble_hs_flow_priv.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/include/transport/ram/ble_hci_ram.h
@@ -17,17 +17,16 @@
  * under the License.
  */
 
-#ifndef H_BLE_HS_FLOW_PRIV_
-#define H_BLE_HS_FLOW_PRIV_
+#ifndef H_BLE_HCI_RAM_
+#define H_BLE_HCI_RAM_
+
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
 
-#include <inttypes.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void ble_hs_flow_connection_broken(uint16_t conn_handle);
-void ble_hs_flow_track_data_mbuf(struct os_mbuf *om);
-int ble_hs_flow_startup(void);
+void ble_hci_ram_init(void);
 
 #ifdef __cplusplus
 }
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/pkg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/pkg.yml
new file mode 100644
index 000000000..bb8397bf3
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/pkg.yml
@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+pkg.name: nimble/transport/ram
+pkg.description: XXX
+pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
+pkg.homepage: "http://mynewt.apache.org/"
+pkg.keywords:
+    - ble
+    - bluetooth
+
+pkg.deps:
+    - "@apache-mynewt-core/kernel/os"
+    - nimble
+
+pkg.apis:
+    - ble_transport
+
+pkg.init:
+    ble_hci_ram_init: 'MYNEWT_VAL(BLE_TRANS_RAM_SYSINIT_STAGE)'
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/src/ble_hci_ram.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/src/ble_hci_ram.c
new file mode 100644
index 000000000..9eaa1d866
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/src/ble_hci_ram.c
@@ -0,0 +1,241 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+#ifndef ESP_PLATFORM
+
+#include <assert.h>
+#include <errno.h>
+#include <stddef.h>
+#include "nimble/porting/nimble/include/syscfg/syscfg.h"
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
+#include "nimble/porting/nimble/include/os/os.h"
+#include "nimble/porting/nimble/include/mem/mem.h"
+#include "nimble/nimble/include/nimble/ble.h"
+#include "nimble/nimble/include/nimble/ble_hci_trans.h"
+#include "../include/transport/ram/ble_hci_ram.h"
+
+static ble_hci_trans_rx_cmd_fn *ble_hci_ram_rx_cmd_hs_cb;
+static void *ble_hci_ram_rx_cmd_hs_arg;
+
+static ble_hci_trans_rx_cmd_fn *ble_hci_ram_rx_cmd_ll_cb;
+static void *ble_hci_ram_rx_cmd_ll_arg;
+
+static ble_hci_trans_rx_acl_fn *ble_hci_ram_rx_acl_hs_cb;
+static void *ble_hci_ram_rx_acl_hs_arg;
+
+static ble_hci_trans_rx_acl_fn *ble_hci_ram_rx_acl_ll_cb;
+static void *ble_hci_ram_rx_acl_ll_arg;
+
+static struct os_mempool ble_hci_ram_cmd_pool;
+static os_membuf_t ble_hci_ram_cmd_buf[
+        OS_MEMPOOL_SIZE(1, BLE_HCI_TRANS_CMD_SZ)
+];
+
+static struct os_mempool ble_hci_ram_evt_hi_pool;
+static os_membuf_t ble_hci_ram_evt_hi_buf[
+    OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT),
+                    MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE))
+];
+
+static struct os_mempool ble_hci_ram_evt_lo_pool;
+static os_membuf_t ble_hci_ram_evt_lo_buf[
+        OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT),
+                        MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE))
+];
+
+void
+ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *cmd_cb,
+                     void *cmd_arg,
+                     ble_hci_trans_rx_acl_fn *acl_cb,
+                     void *acl_arg)
+{
+    ble_hci_ram_rx_cmd_hs_cb = cmd_cb;
+    ble_hci_ram_rx_cmd_hs_arg = cmd_arg;
+    ble_hci_ram_rx_acl_hs_cb = acl_cb;
+    ble_hci_ram_rx_acl_hs_arg = acl_arg;
+}
+
+void
+ble_hci_trans_cfg_ll(ble_hci_trans_rx_cmd_fn *cmd_cb,
+                     void *cmd_arg,
+                     ble_hci_trans_rx_acl_fn *acl_cb,
+                     void *acl_arg)
+{
+    ble_hci_ram_rx_cmd_ll_cb = cmd_cb;
+    ble_hci_ram_rx_cmd_ll_arg = cmd_arg;
+    ble_hci_ram_rx_acl_ll_cb = acl_cb;
+    ble_hci_ram_rx_acl_ll_arg = acl_arg;
+}
+
+int
+ble_hci_trans_hs_cmd_tx(uint8_t *cmd)
+{
+    int rc;
+
+    assert(ble_hci_ram_rx_cmd_ll_cb != NULL);
+
+    rc = ble_hci_ram_rx_cmd_ll_cb(cmd, ble_hci_ram_rx_cmd_ll_arg);
+    return rc;
+}
+
+int
+ble_hci_trans_ll_evt_tx(uint8_t *hci_ev)
+{
+    int rc;
+
+    assert(ble_hci_ram_rx_cmd_hs_cb != NULL);
+
+    rc = ble_hci_ram_rx_cmd_hs_cb(hci_ev, ble_hci_ram_rx_cmd_hs_arg);
+    return rc;
+}
+
+int
+ble_hci_trans_hs_acl_tx(struct os_mbuf *om)
+{
+    int rc;
+
+    assert(ble_hci_ram_rx_acl_ll_cb != NULL);
+
+    rc = ble_hci_ram_rx_acl_ll_cb(om, ble_hci_ram_rx_acl_ll_arg);
+    return rc;
+}
+
+int
+ble_hci_trans_ll_acl_tx(struct os_mbuf *om)
+{
+    int rc;
+
+    assert(ble_hci_ram_rx_acl_hs_cb != NULL);
+
+    rc = ble_hci_ram_rx_acl_hs_cb(om, ble_hci_ram_rx_acl_hs_arg);
+    return rc;
+}
+
+uint8_t *
+ble_hci_trans_buf_alloc(int type)
+{
+    uint8_t *buf;
+
+    switch (type) {
+    case BLE_HCI_TRANS_BUF_CMD:
+        buf = os_memblock_get(&ble_hci_ram_cmd_pool);
+        break;
+
+    case BLE_HCI_TRANS_BUF_EVT_HI:
+        buf = os_memblock_get(&ble_hci_ram_evt_hi_pool);
+        if (buf == NULL) {
+            /* If no high-priority event buffers remain, try to grab a
+             * low-priority one.
+             */
+            buf = ble_hci_trans_buf_alloc(BLE_HCI_TRANS_BUF_EVT_LO);
+        }
+        break;
+
+    case BLE_HCI_TRANS_BUF_EVT_LO:
+        buf = os_memblock_get(&ble_hci_ram_evt_lo_pool);
+        break;
+
+    default:
+        assert(0);
+        buf = NULL;
+    }
+
+    return buf;
+}
+
+void
+ble_hci_trans_buf_free(uint8_t *buf)
+{
+    int rc;
+
+    /* XXX: this may look a bit odd, but the controller uses the command
+    * buffer to send back the command complete/status as an immediate
+    * response to the command. This was done to insure that the controller
+    * could always send back one of these events when a command was received.
+    * Thus, we check to see which pool the buffer came from so we can free
+    * it to the appropriate pool
+    */
+    if (os_memblock_from(&ble_hci_ram_evt_hi_pool, buf)) {
+        rc = os_memblock_put(&ble_hci_ram_evt_hi_pool, buf);
+        assert(rc == 0);
+    } else if (os_memblock_from(&ble_hci_ram_evt_lo_pool, buf)) {
+        rc = os_memblock_put(&ble_hci_ram_evt_lo_pool, buf);
+        assert(rc == 0);
+    } else {
+        assert(os_memblock_from(&ble_hci_ram_cmd_pool, buf));
+        rc = os_memblock_put(&ble_hci_ram_cmd_pool, buf);
+        assert(rc == 0);
+    }
+}
+
+/**
+ * Unsupported; the RAM transport does not have a dedicated ACL data packet
+ * pool.
+ */
+int
+ble_hci_trans_set_acl_free_cb(os_mempool_put_fn *cb, void *arg)
+{
+    return BLE_ERR_UNSUPPORTED;
+}
+
+int
+ble_hci_trans_reset(void)
+{
+    /* No work to do.  All allocated buffers are owned by the host or
+     * controller, and they will get freed by their owners.
+     */
+    return 0;
+}
+
+void
+ble_hci_ram_init(void)
+{
+    int rc;
+
+    /* Ensure this function only gets called by sysinit. */
+    SYSINIT_ASSERT_ACTIVE();
+
+    /*
+     * Create memory pool of HCI command buffers. NOTE: we currently dont
+     * allow this to be configured. The controller will only allow one
+     * outstanding command. We decided to keep this a pool in case we allow
+     * allow the controller to handle more than one outstanding command.
+     */
+    rc = os_mempool_init(&ble_hci_ram_cmd_pool,
+                         1,
+                         BLE_HCI_TRANS_CMD_SZ,
+                         ble_hci_ram_cmd_buf,
+                         "ble_hci_ram_cmd_pool");
+    SYSINIT_PANIC_ASSERT(rc == 0);
+
+    rc = os_mempool_init(&ble_hci_ram_evt_hi_pool,
+                         MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT),
+                         MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE),
+                         ble_hci_ram_evt_hi_buf,
+                         "ble_hci_ram_evt_hi_pool");
+    SYSINIT_PANIC_ASSERT(rc == 0);
+
+    rc = os_mempool_init(&ble_hci_ram_evt_lo_pool,
+                         MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT),
+                         MYNEWT_VAL(BLE_HCI_EVT_BUF_SIZE),
+                         ble_hci_ram_evt_lo_buf,
+                         "ble_hci_ram_evt_lo_pool");
+    SYSINIT_PANIC_ASSERT(rc == 0);
+}
+
+#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/syscfg.yml
new file mode 100644
index 000000000..3b822fcc6
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/ram/syscfg.yml
@@ -0,0 +1,48 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_HCI_EVT_HI_BUF_COUNT:
+        description: 'Number of high-priority event buffers.'
+        value:  2
+
+    BLE_HCI_EVT_LO_BUF_COUNT:
+        description: 'Number of low-priority event buffers.'
+        value:  8
+
+    BLE_HCI_EVT_BUF_SIZE:
+        description: 'Size of each event buffer, in bytes.'
+        value:  70
+
+    BLE_ACL_BUF_COUNT:
+        description: 'The number of ACL data buffers'
+        value: 4
+
+    BLE_ACL_BUF_SIZE:
+        description: >
+            This is the maximum size of the data portion of HCI ACL data
+            packets. It does not include the HCI data header (of 4 bytes).
+        value: 255
+
+    BLE_TRANS_RAM_SYSINIT_STAGE:
+        description: >
+            Sysinit stage for the RAM BLE transport.
+        value: 100
+
+syscfg.vals.BLE_EXT_ADV:
+    BLE_HCI_EVT_BUF_SIZE: 257
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/syscfg.yml b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/syscfg.yml
new file mode 100644
index 000000000..137d6e94f
--- /dev/null
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble/transport/syscfg.yml
@@ -0,0 +1,68 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+syscfg.defs:
+    BLE_HCI_TRANSPORT:
+        description: >
+            Selects HCI transport to be included in build.
+            This has virtually the same effect as including package dependency
+            manually, but it allows to easily override HCI transport package in
+            application or target settings.
+        value: builtin
+        restrictions: $notnull
+        choices:
+            - builtin   # Built-in NimBLE controller and RAM transport
+            - custom    # Custom transport, has to be included manually by user
+            - ram       # RAM transport
+            - uart      # UART HCI H4 transport
+            - socket    # Socket transport (for native builds)
+            - emspi     # SPI transport for EM Microelectionic controllers
+            - da1469x   # Dialog DA1469x integrated controller
+
+# Deprecated settings
+    BLE_HCI_TRANSPORT_NIMBLE_BUILTIN:
+        description: Use BLE_HCI_TRANSPORT instead.
+        value: 0
+        deprecated: 1
+    BLE_HCI_TRANSPORT_EMSPI:
+        description: Use BLE_HCI_TRANSPORT instead.
+        value: 0
+        deprecated: 1
+    BLE_HCI_TRANSPORT_RAM:
+        description: Use BLE_HCI_TRANSPORT instead.
+        value: 0
+        deprecated: 1
+    BLE_HCI_TRANSPORT_SOCKET:
+        description: Use BLE_HCI_TRANSPORT instead.
+        value: 0
+        deprecated: 1
+    BLE_HCI_TRANSPORT_UART:
+        description: Use BLE_HCI_TRANSPORT instead.
+        value: 0
+        deprecated: 1
+
+syscfg.vals.BLE_HCI_TRANSPORT_NIMBLE_BUILTIN:
+    BLE_HCI_TRANSPORT: builtin
+syscfg.vals.BLE_HCI_TRANSPORT_RAM:
+    BLE_HCI_TRANSPORT: ram
+syscfg.vals.BLE_HCI_TRANSPORT_UART:
+    BLE_HCI_TRANSPORT: uart
+syscfg.vals.BLE_HCI_TRANSPORT_SOCKET:
+    BLE_HCI_TRANSPORT: socket
+syscfg.vals.BLE_HCI_TRANSPORT_EMSPI:
+    BLE_HCI_TRANSPORT: emspi
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/hal/hal_timer.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/hal/hal_timer.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/hal/hal_timer.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/hal/hal_timer.h
index be41c6095..936545d8c 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/hal/hal_timer.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/hal/hal_timer.h
@@ -29,7 +29,7 @@
 #define H_HAL_TIMER_
 
 #include <inttypes.h>
-#include "os/queue.h"
+#include "../os/queue.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/log/log.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/log/log.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/log/log.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/log/log.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/log_common/ignore.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/log_common/ignore.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/log_common/ignore.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/log_common/ignore.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/log_common/log_common.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/log_common/log_common.h
similarity index 84%
rename from lib/libesp32_div/NimBLE-Arduino/src/log_common/log_common.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/log_common/log_common.h
index ad79f8905..f6c9e57e0 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/log_common/log_common.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/log_common/log_common.h
@@ -20,26 +20,18 @@
 #ifndef H_LOG_COMMON_
 #define H_LOG_COMMON_
 
-#include "log_common/ignore.h"
+#include "ignore.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
 #define LOG_LEVEL_DEBUG    (0)
 #define LOG_LEVEL_INFO     (1)
 #define LOG_LEVEL_WARN     (2)
 #define LOG_LEVEL_ERROR    (3)
 #define LOG_LEVEL_CRITICAL (4)
 #define LOG_LEVEL_NONE     (5)
-*/
-#define LOG_LEVEL_DEBUG    (3)
-#define LOG_LEVEL_INFO     (2)
-#define LOG_LEVEL_WARN     (5)
-#define LOG_LEVEL_ERROR    (1)
-#define LOG_LEVEL_CRITICAL (4)
-#define LOG_LEVEL_NONE     (0)
 /* Up to 7 custom log levels. */
 #define LOG_LEVEL_MAX      (15)
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/logcfg/logcfg.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/logcfg/logcfg.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/logcfg/logcfg.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/logcfg/logcfg.h
index 764f87f27..d7422cc8f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/logcfg/logcfg.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/logcfg/logcfg.h
@@ -5,8 +5,8 @@
 #ifndef H_MYNEWT_LOGCFG_
 #define H_MYNEWT_LOGCFG_
 
-#include "modlog/modlog.h"
-#include "log_common/log_common.h"
+#include "../modlog/modlog.h"
+#include "../log_common/log_common.h"
 
 #if (MYNEWT_VAL(BLE_HS_LOG_LVL) == LOG_LEVEL_DEBUG)
 #define BLE_HS_LOG_DEBUG(...) MODLOG_DEBUG(4, __VA_ARGS__)
@@ -130,6 +130,7 @@
 #define BLE_MESH_TRANS_LOG_ERROR(...) MODLOG_ERROR(21, __VA_ARGS__)
 #define BLE_MESH_TRANS_LOG_CRITICAL(...) MODLOG_CRITICAL(21, __VA_ARGS__)
 #define BLE_MESH_TRANS_LOG_DISABLED(...) MODLOG_DISABLED(21, __VA_ARGS__)
+
 #define DFLT_LOG_DEBUG(...) IGNORE(__VA_ARGS__)
 #define DFLT_LOG_INFO(...) MODLOG_INFO(0, __VA_ARGS__)
 #define DFLT_LOG_WARN(...) MODLOG_WARN(0, __VA_ARGS__)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/mem/mem.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/mem/mem.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/mem/mem.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/mem/mem.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/modlog/modlog.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/modlog/modlog.h
similarity index 79%
rename from lib/libesp32_div/NimBLE-Arduino/src/modlog/modlog.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/modlog/modlog.h
index e81ea3812..c12b13991 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/modlog/modlog.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/modlog/modlog.h
@@ -22,7 +22,8 @@
 
 #include <stdio.h>
 
-#include "log/log.h"
+#include "../log/log.h"
+#include "../log_common/log_common.h"
 
 #ifdef ESP_PLATFORM
 #include "esp_log.h"
@@ -32,36 +33,11 @@
 
 #define MODLOG_MODULE_DFLT 255
 
-#if (MYNEWT_VAL(LOG_LEVEL) > 0)
-static inline void
-modlog_dummy(const char *msg, ...)
-{
-    (void)msg;
-}
-#endif
-
-#ifdef ESP_PLATFORM
+#if defined(ESP_PLATFORM) && !defined(ARDUINO_ARCH_ESP32)
 #define MODLOG_ESP_LOCAL(level, ml_msg_, ...) do { \
-    if (LOG_LOCAL_LEVEL >= level) esp_log_write(level, "NimBLE", ml_msg_, ##__VA_ARGS__); \
+    if (MYNEWT_VAL(BLE_HS_LOG_LVL) <= LOG_LOCAL_LEVEL) ESP_LOG_LEVEL_LOCAL(level, "NimBLE", ml_msg_, ##__VA_ARGS__); \
 } while(0)
 
-#ifdef ARDUINO_ARCH_ESP32
-#include "nimconfig.h"
-#endif
-
-#if defined(ARDUINO_ARCH_ESP32) && defined(CONFIG_BT_NIMBLE_DEBUG)
-
-#define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \
-    MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__)
-
-#define MODLOG_INFO(ml_mod_, ml_msg_, ...) \
-    MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__)
-
-#define MODLOG_WARN(ml_mod_, ml_msg_, ...) \
-    MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__)
-
-#else
-
 #define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \
     MODLOG_ESP_LOCAL(ESP_LOG_DEBUG, ml_msg_, ##__VA_ARGS__)
 
@@ -71,8 +47,6 @@ modlog_dummy(const char *msg, ...)
 #define MODLOG_WARN(ml_mod_, ml_msg_, ...) \
     MODLOG_ESP_LOCAL(ESP_LOG_WARN, ml_msg_, ##__VA_ARGS__)
 
-#endif
-
 #define MODLOG_ERROR(ml_mod_, ml_msg_, ...) \
     MODLOG_ESP_LOCAL(ESP_LOG_ERROR, ml_msg_, ##__VA_ARGS__)
 
@@ -81,12 +55,30 @@ modlog_dummy(const char *msg, ...)
 
 #else
 
+#if (MYNEWT_VAL(LOG_LEVEL) > 0)
+static inline void
+modlog_dummy(const char *msg, ...)
+{
+    (void)msg;
+}
+#endif
+
+#include "nimble/console/console.h"
+
+#if (MYNEWT_VAL(LOG_LEVEL) > 0)
+#define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \
+        modlog_dummy((ml_msg_), ##__VA_ARGS__)
+#else
+#define MODLOG_DEBUG(ml_mod_, ml_msg_, ...) \
+        console_printf((ml_msg_), ##__VA_ARGS__);
+#endif
+
 #if (MYNEWT_VAL(LOG_LEVEL) > 1)
 #define MODLOG_INFO(ml_mod_, ml_msg_, ...) \
         modlog_dummy((ml_msg_), ##__VA_ARGS__)
 #else
 #define MODLOG_INFO(ml_mod_, ml_msg_, ...) \
-        printf((ml_msg_), ##__VA_ARGS__);
+        console_printf((ml_msg_), ##__VA_ARGS__);
 #endif
 
 #if (MYNEWT_VAL(LOG_LEVEL) > 2)
@@ -94,7 +86,7 @@ modlog_dummy(const char *msg, ...)
         modlog_dummy((ml_msg_), ##__VA_ARGS__)
 #else
 #define MODLOG_WARN(ml_mod_, ml_msg_, ...) \
-        printf((ml_msg_), ##__VA_ARGS__);
+        console_printf((ml_msg_), ##__VA_ARGS__);
 #endif
 
 #if (MYNEWT_VAL(LOG_LEVEL) > 3)
@@ -102,7 +94,7 @@ modlog_dummy(const char *msg, ...)
         modlog_dummy((ml_msg_), ##__VA_ARGS__)
 #else
 #define MODLOG_ERROR(ml_mod_, ml_msg_, ...) \
-        printf((ml_msg_), ##__VA_ARGS__);
+        console_printf((ml_msg_), ##__VA_ARGS__);
 #endif
 
 #if (MYNEWT_VAL(LOG_LEVEL) > 4)
@@ -110,7 +102,7 @@ modlog_dummy(const char *msg, ...)
         modlog_dummy((ml_msg_), ##__VA_ARGS__)
 #else
 #define MODLOG_CRITICAL(ml_mod_, ml_msg_, ...) \
-        printf((ml_msg_), ##__VA_ARGS__);
+        console_printf((ml_msg_), ##__VA_ARGS__);
 #endif
 
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_port.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/nimble/nimble_port.h
similarity index 88%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_port.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/nimble/nimble_port.h
index e8996a666..68e7cdbb8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_port.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/nimble/nimble_port.h
@@ -20,11 +20,16 @@
 #ifndef _NIMBLE_PORT_H
 #define _NIMBLE_PORT_H
 
-#include "nimble/nimble_npl.h"
-#include "nimconfig.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 
+#ifdef ESP_PLATFORM
+#include "nimconfig.h"
 #define NIMBLE_CORE (CONFIG_BT_NIMBLE_PINNED_TO_CORE < portNUM_PROCESSORS ? CONFIG_BT_NIMBLE_PINNED_TO_CORE : tskNO_AFFINITY)
 #define NIMBLE_STACK_SIZE CONFIG_BT_NIMBLE_TASK_STACK_SIZE
+#else
+#include "../syscfg/syscfg.h"
+#define NIMBLE_HS_TASK_STACK_SIZE (CONFIG_BT_NIMBLE_TASK_STACK_SIZE / 4)
+#endif
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/endian.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/endian.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/endian.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/endian.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/os.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os.h
similarity index 89%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/os.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os.h
index f7a7ef9c5..d4f6101b7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/os/os.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os.h
@@ -34,8 +34,8 @@ extern "C" {
 #define max(a, b) ((a)>(b)?(a):(b))
 #endif
 
-#include "syscfg/syscfg.h"
-#include "nimble/nimble_npl.h"
+#include "../syscfg/syscfg.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 
 #define OS_ALIGN(__n, __a) (                             \
         (((__n) & ((__a) - 1)) == 0)                   ? \
@@ -50,11 +50,11 @@ typedef uint32_t os_sr_t;
 #define OS_ASSERT_CRITICAL() assert(ble_npl_hw_is_in_critical())
 
 /* Mynewt components (not abstracted in NPL) */
-#include "os/endian.h"
-#include "os/queue.h"
-#include "os/os_error.h"
-#include "os/os_mbuf.h"
-#include "os/os_mempool.h"
+#include "endian.h"
+#include "queue.h"
+#include "os_error.h"
+#include "os_mbuf.h"
+#include "os_mempool.h"
 
 #ifdef __cplusplus
 }
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/os_cputime.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_cputime.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/os_cputime.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_cputime.h
index 20124b574..9002ca56a 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/os/os_cputime.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_cputime.h
@@ -31,9 +31,9 @@
 extern "C" {
 #endif
 
-#include "syscfg/syscfg.h"
-#include "hal/hal_timer.h"
-#include "os/os.h"
+#include "../syscfg/syscfg.h"
+#include "../hal/hal_timer.h"
+#include "os.h"
 
 /*
  * NOTE: these definitions allow one to override the cputime frequency used.
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/os_error.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_error.h
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/os_error.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_error.h
index 15cc62282..f2213bdf9 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/os/os_error.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_error.h
@@ -20,7 +20,7 @@
 #ifndef H_OS_ERROR_
 #define H_OS_ERROR_
 
-#include "os/os.h"
+#include "os.h"
 
 enum os_error {
     OS_OK = 0,
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/os_mbuf.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_mbuf.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/os_mbuf.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_mbuf.h
index f3857fe46..0775556d2 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/os/os_mbuf.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_mbuf.h
@@ -29,7 +29,7 @@
 #ifndef _OS_MBUF_H
 #define _OS_MBUF_H
 
-#include "os/os.h"
+#include "os.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/os_mempool.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_mempool.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/os_mempool.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_mempool.h
index 251858742..a01d34ded 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/os/os_mempool.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_mempool.h
@@ -29,8 +29,8 @@
 #define _OS_MEMPOOL_H_
 
 #include <stdbool.h>
-#include "os/os.h"
-#include "os/queue.h"
+#include "os.h"
+#include "queue.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/os_trace_api.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_trace_api.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/os_trace_api.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/os_trace_api.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/queue.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/queue.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/queue.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/queue.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/os/util.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/util.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/os/util.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/os/util.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/stats/stats.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/stats/stats.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/stats/stats.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/stats/stats.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/syscfg/syscfg.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/syscfg/syscfg.h
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/syscfg/syscfg.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/syscfg/syscfg.h
index 8dccca5eb..3cb2b14ba 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/syscfg/syscfg.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/syscfg/syscfg.h
@@ -6,8 +6,12 @@
 #define H_MYNEWT_SYSCFG_
 
 #ifdef ESP_PLATFORM
-#include "esp_nimble_cfg.h"
+#include "nimble/esp_port/port/include/esp_nimble_cfg.h"
 #else
+#include "ext_nimble_config.h"
+#endif
+
+#if 0
 
 /**
  * This macro exists to ensure code includes this header when needed.  If code
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/sysflash/sysflash.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/sysflash/sysflash.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/sysflash/sysflash.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/sysflash/sysflash.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/sysinit/sysinit.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/sysinit/sysinit.h
similarity index 100%
rename from lib/libesp32_div/NimBLE-Arduino/src/sysinit/sysinit.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/include/sysinit/sysinit.h
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/endian.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/endian.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/endian.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/endian.c
index 2afd6a22e..c1b181dfe 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/endian.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/endian.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "os/endian.h"
+#include "../include/os/endian.h"
 
 void
 put_le16(void *buf, uint16_t x)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/hal_timer.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/hal_timer.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/hal_timer.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/hal_timer.c
index 14f746e85..93dfc8df3 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/hal_timer.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/hal_timer.c
@@ -16,14 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#if 0
+#ifndef ESP_PLATFORM
+
 #include <string.h>
 #include <stdint.h>
 #include <assert.h>
 #include <errno.h>
-#include "os/os.h"
-#include "nrfx.h"
-#include "hal/hal_timer.h"
+#include "../include/os/os.h"
+#include "nrf.h"
+#include "../include/hal/hal_timer.h"
 
 /* IRQ prototype */
 typedef void (*hal_timer_irq_handler_t)(void);
@@ -486,9 +487,7 @@ hal_timer_init(int timer_num, void *cfg)
 
     /* Disable IRQ, set priority and set vector in table */
     NVIC_DisableIRQ(irq_num);
-#ifndef RIOT_VERSION
     NVIC_SetPriority(irq_num, (1 << __NVIC_PRIO_BITS) - 1);
-#endif
 #if MYNEWT
     NVIC_SetVector(irq_num, (uint32_t)irq_isr);
 #else
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/mem.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/mem.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/mem.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/mem.c
index 256632333..bf1ae7ee3 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/mem.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/mem.c
@@ -18,9 +18,12 @@
  */
 
 #include <stdlib.h>
-#include "os/os.h"
-#include "mem/mem.h"
-#include "esp_nimble_mem.h"
+#include "../include/os/os.h"
+#include "../include/mem/mem.h"
+
+#ifdef ESP_PLATFORM
+#include "nimble/esp_port/port/include/esp_nimble_mem.h"
+#endif
 
 /**
  * Generic mempool allocation function.  Used with basic and extended mempools.
@@ -32,7 +35,11 @@ mem_malloc_mempool_gen(uint16_t num_blocks, uint32_t block_size,
     block_size = OS_ALIGN(block_size, OS_ALIGNMENT);
 
     if (num_blocks > 0) {
+#ifdef ESP_PLATFORM
         *out_buf = nimble_platform_mem_malloc(OS_MEMPOOL_BYTES(num_blocks, block_size));
+#else
+        *out_buf = malloc(OS_MEMPOOL_BYTES(num_blocks, block_size));
+#endif
         if (*out_buf == NULL) {
             return OS_ENOMEM;
         }
@@ -73,7 +80,11 @@ mem_malloc_mempool(struct os_mempool *mempool, uint16_t num_blocks,
 
     rc = os_mempool_init(mempool, num_blocks, block_size, buf, name);
     if (rc != 0) {
+#ifdef ESP_PLATFORM
         nimble_platform_mem_free(buf);
+#else
+        free(buf);
+#endif
         return rc;
     }
 
@@ -114,7 +125,11 @@ mem_malloc_mempool_ext(struct os_mempool_ext *mpe, uint16_t num_blocks,
 
     rc = os_mempool_ext_init(mpe, num_blocks, block_size, buf, name);
     if (rc != 0) {
+#ifdef ESP_PLATFORM
         nimble_platform_mem_free(buf);
+#else
+        free(buf);
+#endif
         return rc;
     }
 
@@ -161,7 +176,11 @@ mem_malloc_mbuf_pool(struct os_mempool *mempool,
 
     rc = os_mbuf_pool_init(mbuf_pool, mempool, block_size, num_blocks);
     if (rc != 0) {
+#ifdef ESP_PLATFORM
         nimble_platform_mem_free(buf);
+#else
+        free(buf);
+#endif
         return rc;
     }
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/nimble_port.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/nimble_port.c
similarity index 90%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/nimble_port.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/nimble_port.c
index 5cd377582..98902ce60 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/nimble_port.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/nimble_port.c
@@ -18,12 +18,13 @@
  */
 
 #include <stddef.h>
-#include "os/os.h"
-#include "sysinit/sysinit.h"
-#include "host/ble_hs.h"
-#include "nimble/nimble_port.h"
+#include "../include/os/os.h"
+#include "../include/sysinit/sysinit.h"
+#include "nimble/nimble/host/include/host/ble_hs.h"
+#include "../include/nimble/nimble_port.h"
+
 #if NIMBLE_CFG_CONTROLLER
-#include "controller/ble_ll.h"
+#include "nimble/nimble/controller/include/controller/ble_ll.h"
 #endif
 #ifdef ESP_PLATFORM
 #include "esp_log.h"
@@ -38,12 +39,9 @@ void
 nimble_port_init(void)
 {
     void os_msys_init(void);
-    void ble_store_ram_init(void);
+
 #if NIMBLE_CFG_CONTROLLER
     void ble_hci_ram_init(void);
-#endif
-#ifdef ESP_PLATFORM
-    esp_log_level_set("NimBLE", LOG_LOCAL_LEVEL);
 #endif
     /* Initialize default event queue */
     ble_npl_eventq_init(&g_eventq_dflt);
@@ -52,13 +50,13 @@ nimble_port_init(void)
 
     ble_hs_init();
 
-    /* XXX Need to have template for store */
-    ble_store_ram_init();
-
 #if NIMBLE_CFG_CONTROLLER
     hal_timer_init(5, NULL);
+
     os_cputime_init(32768);
+
     ble_ll_init();
+
     ble_hci_ram_init();
 #endif
 }
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_cputime.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_cputime.c
similarity index 96%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_cputime.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_cputime.c
index 6c95c4f19..5c418c6a8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_cputime.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_cputime.c
@@ -20,9 +20,9 @@
 #include <string.h>
 #include <stdint.h>
 #include <assert.h>
-#include "syscfg/syscfg.h"
-#include "os/os_cputime.h"
-#include "hal/hal_timer.h"
+#include "../include/syscfg/syscfg.h"
+#include "../include/os/os_cputime.h"
+#include "../include/hal/hal_timer.h"
 
 #if defined(OS_CPUTIME_FREQ_HIGH)
 struct os_cputime_data g_os_cputime;
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_cputime_pwr2.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_cputime_pwr2.c
similarity index 98%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_cputime_pwr2.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_cputime_pwr2.c
index 1567070ae..7a17aabc5 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_cputime_pwr2.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_cputime_pwr2.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "os/os_cputime.h"
+#include "../include/os/os_cputime.h"
 
 /**
  * This module implements cputime functionality for timers for which:
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_mbuf.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_mbuf.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_mbuf.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_mbuf.c
index ed18405b8..426bd47d8 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_mbuf.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_mbuf.c
@@ -33,7 +33,7 @@
  *
  */
 
-#include "os/os.h"
+#include "../include/os/os.h"
 
 #include <assert.h>
 #include <stddef.h>
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_mempool.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_mempool.c
similarity index 99%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_mempool.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_mempool.c
index ba837e7d6..a26099ef0 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_mempool.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_mempool.c
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "os/os.h"
+#include "../include/os/os.h"
 
 #include <string.h>
 #include <assert.h>
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_msys_init.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_msys_init.c
similarity index 90%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_msys_init.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_msys_init.c
index 905e7bd09..180e18d60 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/nimble/src/os_msys_init.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/nimble/src/os_msys_init.c
@@ -18,9 +18,12 @@
  */
 
 #include <assert.h>
-#include "os/os.h"
-#include "mem/mem.h"
-#include "esp_nimble_mem.h"
+#include "../include/os/os.h"
+#include "../include/mem/mem.h"
+
+#ifdef ESP_PLATFORM
+#include "nimble/esp_port/port/include/esp_nimble_mem.h"
+#endif
 
 #if MYNEWT_VAL(MSYS_1_BLOCK_COUNT) > 0
 #define SYSINIT_MSYS_1_MEMBLOCK_SIZE                \
@@ -28,7 +31,11 @@
 #define SYSINIT_MSYS_1_MEMPOOL_SIZE                 \
     OS_MEMPOOL_SIZE(MYNEWT_VAL(MSYS_1_BLOCK_COUNT),  \
                     SYSINIT_MSYS_1_MEMBLOCK_SIZE)
+#ifdef ESP_PLATFORM
 static os_membuf_t *os_msys_init_1_data;
+#else
+static os_membuf_t os_msys_init_1_data[SYSINIT_MSYS_1_MEMPOOL_SIZE];
+#endif
 static struct os_mbuf_pool os_msys_init_1_mbuf_pool;
 static struct os_mempool os_msys_init_1_mempool;
 #endif
@@ -39,7 +46,11 @@ static struct os_mempool os_msys_init_1_mempool;
 #define SYSINIT_MSYS_2_MEMPOOL_SIZE                 \
     OS_MEMPOOL_SIZE(MYNEWT_VAL(MSYS_2_BLOCK_COUNT),  \
                     SYSINIT_MSYS_2_MEMBLOCK_SIZE)
+#ifdef ESP_PLATFORM
 static os_membuf_t *os_msys_init_2_data;
+#else
+static os_membuf_t os_msys_init_2_data[SYSINIT_MSYS_2_MEMPOOL_SIZE];
+#endif
 static struct os_mbuf_pool os_msys_init_2_mbuf_pool;
 static struct os_mempool os_msys_init_2_mempool;
 #endif
@@ -59,6 +70,7 @@ os_msys_init_once(void *data, struct os_mempool *mempool,
     assert(rc == 0);
 }
 
+#ifdef ESP_PLATFORM
 int
 os_msys_buf_alloc(void)
 {
@@ -93,6 +105,7 @@ os_msys_buf_free(void)
 #endif
 
 }
+#endif
 
 void
 os_msys_init(void)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_npl_os.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h
similarity index 89%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_npl_os.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h
index f24371653..7321cd27a 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_npl_os.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h
@@ -37,6 +37,13 @@ extern "C" {
 
 #define BLE_NPL_TIME_FOREVER    portMAX_DELAY
 
+#ifndef ESP_PLATFORM
+#define NIMBLE_CFG_CONTROLLER 1
+#define NIMBLE_EVT_QUEUE_SIZE 4
+#else
+#define NIMBLE_EVT_QUEUE_SIZE 32
+#endif
+
 /* This should be compatible with TickType_t */
 typedef uint32_t ble_npl_time_t;
 typedef int32_t ble_npl_stime_t;
@@ -52,7 +59,11 @@ struct ble_npl_eventq {
 };
 
 struct ble_npl_callout {
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+   esp_timer_handle_t handle;
+#else
     TimerHandle_t handle;
+#endif
     struct ble_npl_eventq *evq;
     struct ble_npl_event ev;
 };
@@ -88,7 +99,7 @@ ble_npl_get_current_task_id(void)
 static inline void
 ble_npl_eventq_init(struct ble_npl_eventq *evq)
 {
-    evq->q = xQueueCreate(32, sizeof(struct ble_npl_eventq *));
+    evq->q = xQueueCreate(NIMBLE_EVT_QUEUE_SIZE, sizeof(struct ble_npl_eventq *));
 }
 
 static inline void
@@ -214,6 +225,7 @@ ble_npl_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq,
 {
     npl_freertos_callout_init(co, evq, ev_cb, ev_arg);
 }
+
 static inline void
 ble_npl_callout_deinit(struct ble_npl_callout *co)
 {
@@ -229,19 +241,19 @@ ble_npl_callout_reset(struct ble_npl_callout *co, ble_npl_time_t ticks)
 static inline void
 ble_npl_callout_stop(struct ble_npl_callout *co)
 {
-    xTimerStop(co->handle, portMAX_DELAY);
+    npl_freertos_callout_stop(co);
 }
 
 static inline bool
 ble_npl_callout_is_active(struct ble_npl_callout *co)
 {
-    return xTimerIsTimerActive(co->handle) == pdTRUE;
+    return npl_freertos_callout_is_active(co);
 }
 
 static inline ble_npl_time_t
 ble_npl_callout_get_ticks(struct ble_npl_callout *co)
 {
-    return xTimerGetExpiryTime(co->handle);
+    return npl_freertos_callout_get_ticks(co);
 }
 
 static inline uint32_t
@@ -295,13 +307,20 @@ ble_npl_time_delay(ble_npl_time_t ticks)
 
 #if NIMBLE_CFG_CONTROLLER
 static inline void
-ble_npl_hw_set_isr(int irqn, uint32_t addr)
+ble_npl_hw_set_isr(int irqn, void (*addr)(void))
 {
     npl_freertos_hw_set_isr(irqn, addr);
 }
+
+static inline bool
+ble_npl_hw_is_in_critical(void)
+{
+    return (uxGetCriticalNestingDepth() > 0);
+}
 #endif
 
-extern portMUX_TYPE ble_port_mutex; 
+#ifdef ESP_PLATFORM
+extern portMUX_TYPE ble_port_mutex;
 //critical section
 static inline uint32_t
 ble_npl_hw_enter_critical(void)
@@ -314,9 +333,24 @@ static inline void
 ble_npl_hw_exit_critical(uint32_t ctx)
 {
     portEXIT_CRITICAL(&ble_port_mutex);
-
 }
 
+#else
+static inline uint32_t
+ble_npl_hw_enter_critical(void)
+{
+    vPortEnterCritical();
+    return 0;
+}
+
+static inline void
+ble_npl_hw_exit_critical(uint32_t ctx)
+{
+    (void)ctx;
+    vPortExitCritical();
+}
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_port_freertos.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/nimble_port_freertos.h
similarity index 85%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_port_freertos.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/nimble_port_freertos.h
index ddeefc71c..94d75f5a5 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/nimble_port_freertos.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/nimble_port_freertos.h
@@ -20,7 +20,7 @@
 #ifndef _NIMBLE_PORT_FREERTOS_H
 #define _NIMBLE_PORT_FREERTOS_H
 
-#include "nimble/nimble_npl.h"
+#include "nimble/nimble/include/nimble/nimble_npl.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -28,6 +28,10 @@ extern "C" {
 
 void nimble_port_freertos_init(TaskFunction_t host_task_fn);
 void nimble_port_freertos_deinit(void);
+#ifndef ESP_PLATFORM
+UBaseType_t nimble_port_freertos_get_ll_hwm(void);
+#endif
+UBaseType_t nimble_port_freertos_get_hs_hwm(void);
 
 #ifdef __cplusplus
 }
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimble/npl_freertos.h b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/npl_freertos.h
similarity index 91%
rename from lib/libesp32_div/NimBLE-Arduino/src/nimble/npl_freertos.h
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/npl_freertos.h
index 2bf7b3d23..69942773f 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimble/npl_freertos.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/include/nimble/npl_freertos.h
@@ -57,6 +57,12 @@ void npl_freertos_callout_init(struct ble_npl_callout *co,
 
 void npl_freertos_callout_deinit(struct ble_npl_callout *co);
 
+void npl_freertos_callout_stop(struct ble_npl_callout *co);
+
+bool npl_freertos_callout_is_active(struct ble_npl_callout *co);
+
+ble_npl_time_t npl_freertos_callout_get_ticks(struct ble_npl_callout *co);
+
 ble_npl_error_t npl_freertos_callout_reset(struct ble_npl_callout *co,
                                            ble_npl_time_t ticks);
 
@@ -69,7 +75,7 @@ ble_npl_error_t npl_freertos_time_ms_to_ticks(uint32_t ms,
 ble_npl_error_t npl_freertos_time_ticks_to_ms(ble_npl_time_t ticks,
                                               uint32_t *out_ms);
 
-void npl_freertos_hw_set_isr(int irqn, uint32_t addr);
+void npl_freertos_hw_set_isr(int irqn, void (*addr)(void));
 
 uint32_t npl_freertos_hw_enter_critical(void);
 
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/npl/freertos/src/nimble_port_freertos.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/src/nimble_port_freertos.c
similarity index 61%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/npl/freertos/src/nimble_port_freertos.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/src/nimble_port_freertos.c
index f0f80561f..a674e2a56 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/npl/freertos/src/nimble_port_freertos.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/src/nimble_port_freertos.c
@@ -20,11 +20,24 @@
 #include <stddef.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
-#include "nimble/nimble_port.h"
+#include "../../../nimble/include/nimble/nimble_port.h"
 
 #if NIMBLE_CFG_CONTROLLER
+#if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
+#define NIMBLE_LL_TASK_STACK_SIZE   (120)
+#else
+#define NIMBLE_LL_TASK_STACK_SIZE   (90)
+#endif
+static StackType_t ll_xStack[ NIMBLE_LL_TASK_STACK_SIZE ];
+static StaticTask_t ll_xTaskBuffer;
 static TaskHandle_t ll_task_h;
 #endif
+
+#ifndef ESP_PLATFORM
+static StackType_t hs_xStack[ NIMBLE_HS_TASK_STACK_SIZE ];
+static StaticTask_t hs_xTaskBuffer;
+#endif
+
 static TaskHandle_t host_task_h;
 
 void
@@ -37,8 +50,8 @@ nimble_port_freertos_init(TaskFunction_t host_task_fn)
      * provided by NimBLE and in case of FreeRTOS it does not need to be wrapped
      * since it has compatible prototype.
      */
-    xTaskCreate(nimble_port_ll_task_func, "ll", configMINIMAL_STACK_SIZE + 400,
-                NULL, configMAX_PRIORITIES - 1, &ll_task_h);
+    ll_task_h = xTaskCreateStatic(nimble_port_ll_task_func, "ll", NIMBLE_LL_TASK_STACK_SIZE,
+                                  NULL, configMAX_PRIORITIES, ll_xStack, &ll_xTaskBuffer);
 #endif
 
     /*
@@ -46,8 +59,13 @@ nimble_port_freertos_init(TaskFunction_t host_task_fn)
      * have separate task for NimBLE host, but since something needs to handle
      * default queue it is just easier to make separate task which does this.
      */
+#ifdef ESP_PLATFORM
     xTaskCreatePinnedToCore(host_task_fn, "ble", NIMBLE_STACK_SIZE,
-                NULL, (configMAX_PRIORITIES - 4), &host_task_h, NIMBLE_CORE);
+                            NULL, (configMAX_PRIORITIES - 4), &host_task_h, NIMBLE_CORE);
+#else
+    host_task_h = xTaskCreateStatic(host_task_fn, "ble", NIMBLE_HS_TASK_STACK_SIZE,
+                                    NULL, (configMAX_PRIORITIES - 1), hs_xStack, &hs_xTaskBuffer);
+#endif
 }
 
 void
@@ -57,3 +75,17 @@ nimble_port_freertos_deinit(void)
         vTaskDelete(host_task_h);
     }
 }
+
+#if NIMBLE_CFG_CONTROLLER
+UBaseType_t
+nimble_port_freertos_get_ll_hwm(void)
+{
+    return uxTaskGetStackHighWaterMark(ll_task_h);
+}
+#endif
+
+UBaseType_t
+nimble_port_freertos_get_hs_hwm(void)
+{
+    return uxTaskGetStackHighWaterMark(host_task_h);
+}
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/porting/npl/freertos/src/npl_os_freertos.c b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/src/npl_os_freertos.c
similarity index 66%
rename from lib/libesp32_div/NimBLE-Arduino/src/porting/npl/freertos/src/npl_os_freertos.c
rename to lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/src/npl_os_freertos.c
index 07f1294e7..3f9c530e4 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/porting/npl/freertos/src/npl_os_freertos.c
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimble/porting/npl/freertos/src/npl_os_freertos.c
@@ -20,11 +20,22 @@
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
-#include "nimble/nimble_npl.h"
-#include "freertos/portable.h"
 
+#include "nimble/nimble/include/nimble/nimble_npl.h"
+
+#ifdef ESP_PLATFORM
+#include "freertos/portable.h"
 portMUX_TYPE ble_port_mutex = portMUX_INITIALIZER_UNLOCKED;
 
+#else
+#include "nrf.h"
+
+static void *radio_isr_addr;
+static void *rng_isr_addr;
+static void *rtc0_isr_addr;
+#endif
+
+#ifdef ESP_PLATFORM
 static inline bool
 in_isr(void)
 {
@@ -32,6 +43,50 @@ in_isr(void)
     return xPortInIsrContext() != 0;
 }
 
+#else
+static inline bool
+in_isr(void)
+{
+    /* XXX hw specific! */
+    return (SCB->ICSR & SCB_ICSR_VECTACTIVE_Msk) != 0;
+}
+
+void
+RADIO_IRQHandler(void)
+{
+    ((void (*)(void))radio_isr_addr)();
+}
+
+void
+RNG_IRQHandler(void)
+{
+    ((void (*)(void))rng_isr_addr)();
+}
+
+void
+RTC0_IRQHandler(void)
+{
+    ((void (*)(void))rtc0_isr_addr)();
+}
+
+/* This is called by NimBLE radio driver to set interrupt handlers */
+void
+npl_freertos_hw_set_isr(int irqn, void (*addr)(void))
+{
+    switch (irqn) {
+    case RADIO_IRQn:
+        radio_isr_addr = addr;
+        break;
+    case RNG_IRQn:
+        rng_isr_addr = addr;
+        break;
+    case RTC0_IRQn:
+        rtc0_isr_addr = addr;
+        break;
+    }
+}
+#endif
+
 struct ble_npl_event *
 npl_freertos_eventq_get(struct ble_npl_eventq *evq, ble_npl_time_t tmo)
 {
@@ -42,9 +97,13 @@ npl_freertos_eventq_get(struct ble_npl_eventq *evq, ble_npl_time_t tmo)
     if (in_isr()) {
         assert(tmo == 0);
         ret = xQueueReceiveFromISR(evq->q, &ev, &woken);
+#ifdef ESP_PLATFORM
         if( woken == pdTRUE ) {
             portYIELD_FROM_ISR();
         }
+#else
+        portYIELD_FROM_ISR(woken);
+#endif
     } else {
         ret = xQueueReceive(evq->q, &ev, tmo);
     }
@@ -71,9 +130,13 @@ npl_freertos_eventq_put(struct ble_npl_eventq *evq, struct ble_npl_event *ev)
 
     if (in_isr()) {
         ret = xQueueSendToBackFromISR(evq->q, &ev, &woken);
+#ifdef ESP_PLATFORM
         if( woken == pdTRUE ) {
             portYIELD_FROM_ISR();
         }
+#else
+        portYIELD_FROM_ISR(woken);
+#endif
     } else {
         ret = xQueueSendToBack(evq->q, &ev, portMAX_DELAY);
     }
@@ -120,13 +183,20 @@ npl_freertos_eventq_remove(struct ble_npl_eventq *evq,
             woken |= woken2;
         }
 
+#ifdef ESP_PLATFORM
         if( woken == pdTRUE ) {
             portYIELD_FROM_ISR();
         }
+#else
+        portYIELD_FROM_ISR(woken);
+#endif
     } else {
+#ifdef ESP_PLATFORM
         portMUX_TYPE ble_npl_mut = portMUX_INITIALIZER_UNLOCKED;
         portENTER_CRITICAL(&ble_npl_mut);
-
+#else
+        vPortEnterCritical();
+#endif
         count = uxQueueMessagesWaiting(evq->q);
         for (i = 0; i < count; i++) {
             ret = xQueueReceive(evq->q, &tmp_ev, 0);
@@ -139,8 +209,11 @@ npl_freertos_eventq_remove(struct ble_npl_eventq *evq,
             ret = xQueueSendToBack(evq->q, &tmp_ev, 0);
             assert(ret == pdPASS);
         }
-
+#ifdef ESP_PLATFORM
         portEXIT_CRITICAL(&ble_npl_mut);
+#else
+        vPortExitCritical();
+#endif
     }
 
     ev->queued = 0;
@@ -256,9 +329,13 @@ npl_freertos_sem_pend(struct ble_npl_sem *sem, ble_npl_time_t timeout)
     if (in_isr()) {
         assert(timeout == 0);
         ret = xSemaphoreTakeFromISR(sem->handle, &woken);
+#ifdef ESP_PLATFORM
         if( woken == pdTRUE ) {
             portYIELD_FROM_ISR();
         }
+#else
+        portYIELD_FROM_ISR(woken);
+#endif
     } else {
         ret = xSemaphoreTake(sem->handle, timeout);
     }
@@ -280,10 +357,13 @@ npl_freertos_sem_release(struct ble_npl_sem *sem)
 
     if (in_isr()) {
         ret = xSemaphoreGiveFromISR(sem->handle, &woken);
-        
+#ifdef ESP_PLATFORM
         if( woken == pdTRUE ) {
             portYIELD_FROM_ISR();
         }
+#else
+        portYIELD_FROM_ISR(woken);
+#endif
     } else {
         ret = xSemaphoreGive(sem->handle);
     }
@@ -292,6 +372,38 @@ npl_freertos_sem_release(struct ble_npl_sem *sem)
     return BLE_NPL_OK;
 }
 
+
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+static void
+ble_npl_event_fn_wrapper(void *arg)
+{
+    struct ble_npl_callout *co = (struct ble_npl_callout *)arg;
+
+    if (co->evq) {
+        ble_npl_eventq_put(co->evq, &co->ev);
+    } else {
+        co->ev.fn(&co->ev);
+    }
+}
+
+static
+ble_npl_error_t esp_err_to_npl_error(esp_err_t err)
+{
+    switch(err) {
+    case ESP_ERR_INVALID_ARG:
+        return BLE_NPL_INVALID_PARAM;
+
+    case ESP_ERR_INVALID_STATE:
+        return BLE_NPL_EINVAL;
+
+    case ESP_OK:
+        return BLE_NPL_OK;
+
+    default:
+        return BLE_NPL_ERROR;
+    }
+}
+#else
 static void
 os_callout_timer_cb(TimerHandle_t timer)
 {
@@ -306,29 +418,64 @@ os_callout_timer_cb(TimerHandle_t timer)
         co->ev.fn(&co->ev);
     }
 }
+#endif
 
 void
 npl_freertos_callout_init(struct ble_npl_callout *co, struct ble_npl_eventq *evq,
-                     ble_npl_event_fn *ev_cb, void *ev_arg)
+                          ble_npl_event_fn *ev_cb, void *ev_arg)
 {
-    memset(co, 0, sizeof(*co));
-    co->handle = xTimerCreate("co", 1, pdFALSE, co, os_callout_timer_cb);
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+    co->ev.fn = ev_cb;
+    co->ev.arg = ev_arg;
+    co->evq = evq;
+
+    esp_timer_create_args_t create_args = {
+      .callback = ble_npl_event_fn_wrapper,
+      .arg = co,
+      .name = "nimble_timer"
+    };
+
+    ESP_ERROR_CHECK(esp_timer_create(&create_args, &co->handle));
+#else
+    if (co->handle == NULL) {
+        co->handle = xTimerCreate("co", 1, pdFALSE, co, os_callout_timer_cb);
+    }
+
     co->evq = evq;
     ble_npl_event_init(&co->ev, ev_cb, ev_arg);
+#endif
 }
+
 void
 npl_freertos_callout_deinit(struct ble_npl_callout *co)
 {
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+    ESP_ERROR_CHECK_WITHOUT_ABORT(esp_timer_stop(co->handle));
+    ESP_ERROR_CHECK_WITHOUT_ABORT(esp_timer_delete(co->handle));
+#else
     if (co->handle) {
         xTimerDelete(co->handle, portMAX_DELAY);
+        co->handle = NULL;
     }
+#endif
 }
 
 ble_npl_error_t
 npl_freertos_callout_reset(struct ble_npl_callout *co, ble_npl_time_t ticks)
 {
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+    esp_timer_stop(co->handle);
+
+    return esp_err_to_npl_error(esp_timer_start_once(co->handle, ticks*1000));
+#else
+
     BaseType_t woken1, woken2, woken3;
 
+    if (co->handle == NULL) {
+        co->handle = xTimerCreate("co", 1, pdFALSE, co, os_callout_timer_cb);
+        assert(co->handle);
+    }
+
     if (ticks == 0) {
         ticks = 1;
     }
@@ -337,10 +484,13 @@ npl_freertos_callout_reset(struct ble_npl_callout *co, ble_npl_time_t ticks)
         xTimerStopFromISR(co->handle, &woken1);
         xTimerChangePeriodFromISR(co->handle, ticks, &woken2);
         xTimerResetFromISR(co->handle, &woken3);
-
+#ifdef ESP_PLATFORM
         if( woken1 == pdTRUE || woken2 == pdTRUE || woken3 == pdTRUE) {
             portYIELD_FROM_ISR();
         }
+#else
+        portYIELD_FROM_ISR(woken1 || woken2 || woken3);
+#endif
     } else {
         xTimerStop(co->handle, portMAX_DELAY);
         xTimerChangePeriod(co->handle, ticks, portMAX_DELAY);
@@ -348,6 +498,49 @@ npl_freertos_callout_reset(struct ble_npl_callout *co, ble_npl_time_t ticks)
     }
 
     return BLE_NPL_OK;
+#endif
+}
+
+void
+npl_freertos_callout_stop(struct ble_npl_callout *co)
+{
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+    esp_timer_stop(co->handle);
+#else
+    xTimerStop(co->handle, portMAX_DELAY);
+#endif
+}
+
+bool
+npl_freertos_callout_is_active(struct ble_npl_callout *co)
+{
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+    return esp_timer_is_active(co->handle);
+#else
+    /* Workaround for bug in xTimerIsTimerActive with FreeRTOS V10.2.0, fixed in V10.4.4
+     * See: https://github.com/FreeRTOS/FreeRTOS-Kernel/pull/305
+     * Sometimes xTimerIsTimerActive returns pdTRUE even though the timer has expired, so we double check.
+     */
+    return xTimerIsTimerActive(co->handle) == pdTRUE && xTimerGetExpiryTime(co->handle) > xTaskGetTickCountFromISR();
+#endif
+}
+
+ble_npl_time_t
+npl_freertos_callout_get_ticks(struct ble_npl_callout *co)
+{
+#if CONFIG_BT_NIMBLE_USE_ESP_TIMER
+   /* Currently, esp_timer does not support an API which gets the expiry time for
+    * current timer.
+    * Returning 0 from here should not cause any effect.
+    * Drawback of this approach is that existing code to reset timer would be called
+    * more often (since the if condition to invoke reset timer would always succeed if
+    * timer is active).
+    */
+
+    return 0;
+#else
+    return xTimerGetExpiryTime(co->handle);
+#endif
 }
 
 ble_npl_time_t
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h b/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h
index cf7711c08..b66993ef7 100644
--- a/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h
+++ b/lib/libesp32_div/NimBLE-Arduino/src/nimconfig.h
@@ -1,6 +1,11 @@
  #pragma once
 
+#ifdef ESP_PLATFORM
 #include "sdkconfig.h"
+#else
+#include "ext_nimble_config.h"
+#endif
+
 #include "nimconfig_rename.h"
 
 /***********************************************
@@ -16,10 +21,17 @@
 /** @brief Un-comment to change default device name */
 // #define CONFIG_BT_NIMBLE_SVC_GAP_DEVICE_NAME "nimble"
 
-/** @brief Un-comment to see debug log messages from the NimBLE host
+/** @brief Un-comment to set the debug log messages level from the NimBLE host stack.\n
+ *  Values: 0 = DEBUG, 1 = INFO, 2 = WARNING, 3 = ERROR, 4 = CRITICAL, 5+ = NONE\n
  *  Uses approx. 32kB of flash memory.
  */
-// #define CONFIG_BT_NIMBLE_DEBUG
+ // #define CONFIG_BT_NIMBLE_LOG_LEVEL 5
+
+ /** @brief Un-comment to set the debug log messages level from the NimBLE CPP Wrapper.\n
+ *  Values: 0 = NONE, 1 = ERROR, 2 = WARNING, 3 = INFO, 4+ = DEBUG\n
+ *  Uses approx. 32kB of flash memory.
+ */
+ // #define NIMBLE_CPP_DEBUG_LEVEL 0
 
 /** @brief Un-comment to see NimBLE host return codes as text debug log messages.
  *  Uses approx. 7kB of flash memory.
@@ -150,6 +162,10 @@
 #define CONFIG_BT_NIMBLE_RPA_TIMEOUT 900
 #endif
 
+#ifndef CONFIG_BT_NIMBLE_LOG_LEVEL
+#define CONFIG_BT_NIMBLE_LOG_LEVEL 5
+#endif
+
 
 /** @brief Set if CCCD's and bond data should be stored in NVS */
 #define CONFIG_BT_NIMBLE_NVS_PERSIST 1
@@ -192,14 +208,27 @@
 #define CONFIG_BT_ENABLED
 #endif
 
+#ifdef ESP_PLATFORM
 #ifndef CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY
 #define CONFIG_BTDM_CONTROLLER_MODE_BLE_ONLY
 #endif
 
+#ifndef CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE
+#define CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE 0
+#endif
+
+#ifndef CONFIG_BTDM_SCAN_DUPL_TYPE_DATA
+#define CONFIG_BTDM_SCAN_DUPL_TYPE_DATA 1
+#endif
+
+#ifndef CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE
+#define CONFIG_BTDM_SCAN_DUPL_TYPE_DATA_DEVICE 2
+#endif
 
 #if !defined(CONFIG_IDF_TARGET_ESP32) && !defined(CONFIG_IDF_TARGET_ESP32C3)
 #define CONFIG_IDF_TARGET_ESP32 1
 #endif
+#endif
 
 /* Cannot use client without scan */
 #if defined(CONFIG_BT_NIMBLE_ROLE_CENTRAL) && !defined(CONFIG_BT_NIMBLE_ROLE_OBSERVER)
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/src/ble_hs_hci_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/src/ble_hs_hci_priv.h
deleted file mode 100644
index 362f12cbd..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/src/ble_hs_hci_priv.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_HS_HCI_PRIV_
-#define H_BLE_HS_HCI_PRIV_
-
-#include "nimble/hci_common.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_hs_conn;
-struct os_mbuf;
-
-#define BLE_HS_HCI_LE_FEAT_ENCRYPTION                   (0x00000001)
-#define BLE_HS_HCI_LE_FEAT_CONN_PARAM_REQUEST           (0x00000002)
-#define BLE_HS_HCI_LE_FEAT_EXT_REJECT                   (0x00000004)
-#define BLE_HS_HCI_LE_FEAT_SLAVE_FEAT_EXCHANGE          (0x00000008)
-#define BLE_HS_HCI_LE_FEAT_PING                         (0x00000010)
-#define BLE_HS_HCI_LE_FEAT_DATA_PACKET_LENGTH_EXT       (0x00000020)
-#define BLE_HS_HCI_LE_FEAT_LL_PRIVACY                   (0x00000040)
-#define BLE_HS_HCI_LE_FEAT_EXT_SCANNER_FILTER_POLICIES  (0x00000080)
-#define BLE_HS_HCI_LE_FEAT_2M_PHY                       (0x00000100)
-#define BLE_HS_HCI_LE_FEAT_STABLE_MOD_INDEX_TX          (0x00000200)
-#define BLE_HS_HCI_LE_FEAT_STABLE_MOD_INDEX_RX          (0x00000400)
-#define BLE_HS_HCI_LE_FEAT_CODED_PHY                    (0x00000800)
-#define BLE_HS_HCI_LE_FEAT_EXT_ADV                      (0x00001000)
-#define BLE_HS_HCI_LE_FEAT_PERIODIC_ADV                 (0x00002000)
-#define BLE_HS_HCI_LE_FEAT_CSA2                         (0x00004000)
-#define BLE_HS_HCI_LE_FEAT_POWER_CLASS_1                (0x00008000)
-#define BLE_HS_HCI_LE_FEAT_MIN_NUM_USED_CHAN            (0x00010000)
-
-struct ble_hs_hci_ack {
-    int bha_status;         /* A BLE_HS_E<...> error; NOT a naked HCI code. */
-    const uint8_t *bha_params;
-    int bha_params_len;
-    uint16_t bha_opcode;
-    uint8_t bha_hci_handle;
-};
-
-#if MYNEWT_VAL(BLE_EXT_ADV)
-struct ble_hs_hci_ext_scan_param {
-    uint8_t scan_type;
-    uint16_t scan_itvl;
-    uint16_t scan_window;
-};
-
-struct ble_hs_hci_ext_conn_params {
-    uint16_t scan_itvl;
-    uint16_t scan_window;
-    uint16_t conn_itvl;
-    uint16_t conn_windows;
-};
-
-#if MYNEWT_VAL(BLE_PERIODIC_ADV)
-/* Periodic Advertising Parameters */
-struct hci_periodic_adv_params
-{
-    uint16_t min_interval;
-    uint16_t max_interval;
-    uint16_t properties;
-};
-#endif
-#endif
-
-extern uint16_t ble_hs_hci_avail_pkts;
-
-int ble_hs_hci_cmd_tx(uint16_t opcode, const void *cmd, uint8_t cmd_len,
-                      void *rsp, uint8_t rsp_len);
-void ble_hs_hci_init(void);
-void ble_hs_hci_deinit(void);
-
-void ble_hs_hci_set_le_supported_feat(uint32_t feat);
-uint32_t ble_hs_hci_get_le_supported_feat(void);
-void ble_hs_hci_set_hci_version(uint8_t hci_version);
-uint8_t ble_hs_hci_get_hci_version(void);
-
-#if MYNEWT_VAL(BLE_HS_PHONY_HCI_ACKS)
-typedef int ble_hs_hci_phony_ack_fn(uint8_t *ack, int ack_buf_len);
-void ble_hs_hci_set_phony_ack_cb(ble_hs_hci_phony_ack_fn *cb);
-#endif
-
-int ble_hs_hci_util_read_adv_tx_pwr(int8_t *out_pwr);
-int ble_hs_hci_util_rand(void *dst, int len);
-int ble_hs_hci_util_read_rssi(uint16_t conn_handle, int8_t *out_rssi);
-int ble_hs_hci_util_set_random_addr(const uint8_t *addr);
-int ble_hs_hci_util_data_hdr_strip(struct os_mbuf *om,
-                                   struct hci_data_hdr *out_hdr);
-int ble_hs_hci_evt_process(const struct ble_hci_ev *ev);
-
-int ble_hs_hci_cmd_send_buf(uint16_t opcode, const void *buf, uint8_t buf_len);
-int ble_hs_hci_set_buf_sz(uint16_t pktlen, uint16_t max_pkts);
-void ble_hs_hci_add_avail_pkts(uint16_t delta);
-
-uint16_t ble_hs_hci_util_handle_pb_bc_join(uint16_t handle, uint8_t pb,
-                                           uint8_t bc);
-
-int ble_hs_hci_acl_tx_now(struct ble_hs_conn *conn, struct os_mbuf **om);
-int ble_hs_hci_acl_tx(struct ble_hs_conn *conn, struct os_mbuf **om);
-
-int ble_hs_hci_frag_num_mbufs(void);
-int ble_hs_hci_frag_num_mbufs_free(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/src/ble_sm_priv.h b/lib/libesp32_div/NimBLE-Arduino/src/src/ble_sm_priv.h
deleted file mode 100644
index def0a32f5..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/src/ble_sm_priv.h
+++ /dev/null
@@ -1,428 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_SM_PRIV_
-#define H_BLE_SM_PRIV_
-
-#include <inttypes.h>
-#include "syscfg/syscfg.h"
-#include "os/queue.h"
-#include "nimble/nimble_opt.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ble_gap_sec_state;
-struct hci_le_lt_key_req;
-struct hci_encrypt_change;
-
-#define BLE_SM_MTU                  65
-
-#define BLE_SM_OP_PAIR_REQ                      0x01
-#define BLE_SM_OP_PAIR_RSP                      0x02
-#define BLE_SM_OP_PAIR_CONFIRM                  0x03
-#define BLE_SM_OP_PAIR_RANDOM                   0x04
-#define BLE_SM_OP_PAIR_FAIL                     0x05
-#define BLE_SM_OP_ENC_INFO                      0x06
-#define BLE_SM_OP_MASTER_ID                     0x07
-#define BLE_SM_OP_IDENTITY_INFO                 0x08
-#define BLE_SM_OP_IDENTITY_ADDR_INFO            0x09
-#define BLE_SM_OP_SIGN_INFO                     0x0a
-#define BLE_SM_OP_SEC_REQ                       0x0b
-#define BLE_SM_OP_PAIR_PUBLIC_KEY               0x0c
-#define BLE_SM_OP_PAIR_DHKEY_CHECK              0x0d
-#define BLE_SM_OP_PAIR_KEYPRESS_NOTIFY          0x0e
-
-struct ble_sm_hdr {
-    uint8_t opcode;
-    uint8_t data[0];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x01/0x02 [req/rsp])         | 1                 |
- * | IO Capability                      | 1                 |
- * | OOB data flag                      | 1                 |
- * | AuthReq                            | 1                 |
- * | Maximum Encryption Key Size        | 1                 |
- * | Initiator Key Distribution         | 1                 |
- * | Responder Key Distribution         | 1                 |
- */
-
-struct ble_sm_pair_cmd {
-    uint8_t io_cap;
-    uint8_t oob_data_flag;
-    uint8_t authreq;
-    uint8_t max_enc_key_size;
-    uint8_t init_key_dist;
-    uint8_t resp_key_dist;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x03)                        | 1                 |
- * | Confirm Value                      | 16                |
- */
-
-struct ble_sm_pair_confirm {
-    uint8_t value[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x04)                        | 1                 |
- * | Random Value                       | 16                |
- */
-struct ble_sm_pair_random {
-    uint8_t value[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x05)                        | 1                 |
- * | Reason                             | 1                 |
- */
-struct ble_sm_pair_fail {
-    uint8_t reason;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x06)                        | 1                 |
- * | ltk                                | 16                |
- */
-struct ble_sm_enc_info {
-    uint8_t ltk[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x07)                        | 1                 |
- * | EDIV                               | 2                 |
- * | RAND                               | 8                 |
- */
-struct ble_sm_master_id {
-    uint16_t ediv;
-    uint64_t rand_val;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x08)                        | 1                 |
- * | irk                                | 16                |
- */
-struct ble_sm_id_info {
-    uint8_t irk[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x09)                        | 1                 |
- * | addr_type                          | 1                 |
- * | address                            | 6                 |
- */
-struct ble_sm_id_addr_info {
-    uint8_t addr_type;
-    uint8_t bd_addr[6];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0A)                        | 1                 |
- * | csrk                               | 16                |
- */
-struct ble_sm_sign_info {
-    uint8_t sig_key[16];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0B)                        | 1                 |
- * | authreq                            | 1                 |
- */
-struct ble_sm_sec_req {
-    uint8_t authreq;
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0c)                        | 1                 |
- * | Public Key X                       | 32                |
- * | Public Key Y                       | 32                |
- */
-struct ble_sm_public_key {
-    uint8_t x[32];
-    uint8_t y[32];
-} __attribute__((packed));
-
-/**
- * | Parameter                          | Size (octets)     |
- * +------------------------------------+-------------------+
- * | (Code=0x0d)                        | 1                 |
- * | DHKey Check                        | 16                |
- */
-struct ble_sm_dhkey_check {
-    uint8_t value[16];
-} __attribute__((packed));
-
-#if NIMBLE_BLE_SM
-
-#define BLE_SM_PROC_STATE_NONE              ((uint8_t)-1)
-
-#define BLE_SM_PROC_STATE_PAIR              0
-#define BLE_SM_PROC_STATE_CONFIRM           1
-#define BLE_SM_PROC_STATE_RANDOM            2
-#define BLE_SM_PROC_STATE_LTK_START         3
-#define BLE_SM_PROC_STATE_LTK_RESTORE       4
-#define BLE_SM_PROC_STATE_ENC_START         5
-#define BLE_SM_PROC_STATE_ENC_RESTORE       6
-#define BLE_SM_PROC_STATE_KEY_EXCH          7
-#define BLE_SM_PROC_STATE_SEC_REQ           8
-#define BLE_SM_PROC_STATE_PUBLIC_KEY        9
-#define BLE_SM_PROC_STATE_DHKEY_CHECK       10
-#define BLE_SM_PROC_STATE_CNT               11
-
-#define BLE_SM_PROC_F_INITIATOR             0x01
-#define BLE_SM_PROC_F_IO_INJECTED           0x02
-#define BLE_SM_PROC_F_ADVANCE_ON_IO         0x04
-#define BLE_SM_PROC_F_AUTHENTICATED         0x08
-#define BLE_SM_PROC_F_SC                    0x10
-#define BLE_SM_PROC_F_BONDING               0x20
-
-#define BLE_SM_KE_F_ENC_INFO                0x01
-#define BLE_SM_KE_F_MASTER_ID               0x02
-#define BLE_SM_KE_F_ID_INFO                 0x04
-#define BLE_SM_KE_F_ADDR_INFO               0x08
-#define BLE_SM_KE_F_SIGN_INFO               0x10
-
-typedef uint8_t ble_sm_proc_flags;
-
-struct ble_sm_keys {
-    unsigned ltk_valid:1;
-    unsigned ediv_rand_valid:1;
-    unsigned irk_valid:1;
-    unsigned csrk_valid:1;
-    unsigned addr_valid:1;
-    uint16_t ediv;
-    uint64_t rand_val;
-    uint8_t addr_type;
-    uint8_t key_size;
-    uint8_t ltk[16];    /* Little endian. */
-    uint8_t irk[16];    /* Little endian. */
-    uint8_t csrk[16];   /* Little endian. */
-    uint8_t addr[6];    /* Little endian. */
-};
-
-struct ble_sm_proc {
-    STAILQ_ENTRY(ble_sm_proc) next;
-
-    ble_npl_time_t exp_os_ticks;
-    ble_sm_proc_flags flags;
-    uint16_t conn_handle;
-    uint8_t pair_alg;
-    uint8_t state;
-    uint8_t rx_key_flags;
-    uint8_t key_size;
-
-    uint8_t pair_req[sizeof(struct ble_sm_hdr) + sizeof(struct ble_sm_pair_cmd)];
-    uint8_t pair_rsp[sizeof(struct ble_sm_hdr) + sizeof(struct ble_sm_pair_cmd)];
-    uint8_t tk[16];
-    uint8_t confirm_peer[16];
-    uint8_t randm[16];
-    uint8_t rands[16];
-    uint8_t ltk[16]; /* Little endian. */
-    struct ble_sm_keys our_keys;
-    struct ble_sm_keys peer_keys;
-
-#if MYNEWT_VAL(BLE_SM_SC)
-    /* Secure connections. */
-    uint8_t passkey_bits_exchanged;
-    uint8_t ri;
-    struct ble_sm_public_key pub_key_peer;
-    uint8_t mackey[16];
-    uint8_t dhkey[32];
-    const struct ble_sm_sc_oob_data *oob_data_local;
-    const struct ble_sm_sc_oob_data *oob_data_remote;
-#endif
-};
-
-struct ble_sm_result {
-    int app_status;
-    uint8_t sm_err;
-    struct ble_gap_passkey_params passkey_params;
-    void *state_arg;
-    unsigned execute : 1;
-    unsigned enc_cb : 1;
-    unsigned bonded : 1;
-    unsigned restore : 1;
-};
-
-#if MYNEWT_VAL(BLE_HS_DEBUG)
-void ble_sm_dbg_set_next_pair_rand(uint8_t *next_pair_rand);
-void ble_sm_dbg_set_next_ediv(uint16_t next_ediv);
-void ble_sm_dbg_set_next_master_id_rand(uint64_t next_master_id_rand);
-void ble_sm_dbg_set_next_ltk(uint8_t *next_ltk);
-void ble_sm_dbg_set_next_csrk(uint8_t *next_csrk);
-void ble_sm_dbg_set_sc_keys(uint8_t *pubkey, uint8_t *privkey);
-#endif
-
-int ble_sm_num_procs(void);
-
-int ble_sm_alg_s1(const uint8_t *k, const uint8_t *r1, const uint8_t *r2,
-                  uint8_t *out);
-int ble_sm_alg_c1(const uint8_t *k, const uint8_t *r,
-                  const uint8_t *preq, const uint8_t *pres,
-                  uint8_t iat, uint8_t rat,
-                  const uint8_t *ia, const uint8_t *ra,
-                  uint8_t *out_enc_data);
-int ble_sm_alg_f4(const uint8_t *u, const uint8_t *v, const uint8_t *x,
-                  uint8_t z, uint8_t *out_enc_data);
-int ble_sm_alg_g2(const uint8_t *u, const uint8_t *v, const uint8_t *x,
-                  const uint8_t *y, uint32_t *passkey);
-int ble_sm_alg_f5(const uint8_t *w, const uint8_t *n1, const uint8_t *n2,
-                  uint8_t a1t, const uint8_t *a1, uint8_t a2t,
-                  const uint8_t *a2, uint8_t *mackey, uint8_t *ltk);
-int ble_sm_alg_f6(const uint8_t *w, const uint8_t *n1, const uint8_t *n2,
-                  const uint8_t *r, const uint8_t *iocap, uint8_t a1t,
-                  const uint8_t *a1, uint8_t a2t, const uint8_t *a2,
-                  uint8_t *check);
-int ble_sm_alg_gen_dhkey(const uint8_t *peer_pub_key_x,
-                         const uint8_t *peer_pub_key_y,
-                         const uint8_t *our_priv_key, uint8_t *out_dhkey);
-int ble_sm_alg_gen_key_pair(uint8_t *pub, uint8_t *priv);
-void ble_sm_alg_ecc_init(void);
-
-void ble_sm_enc_change_rx(const struct ble_hci_ev_enrypt_chg *ev);
-void ble_sm_enc_key_refresh_rx(const struct ble_hci_ev_enc_key_refresh *ev);
-int ble_sm_ltk_req_rx(const struct ble_hci_ev_le_subev_lt_key_req *ev);
-
-#if MYNEWT_VAL(BLE_SM_LEGACY)
-int ble_sm_lgcy_io_action(struct ble_sm_proc *proc, uint8_t *action);
-void ble_sm_lgcy_confirm_exec(struct ble_sm_proc *proc,
-                              struct ble_sm_result *res);
-void ble_sm_lgcy_random_exec(struct ble_sm_proc *proc,
-                             struct ble_sm_result *res);
-void ble_sm_lgcy_random_rx(struct ble_sm_proc *proc,
-                           struct ble_sm_result *res);
-#else
-#define ble_sm_lgcy_io_action(proc, action) (BLE_HS_ENOTSUP)
-#define ble_sm_lgcy_confirm_exec(proc, res)
-#define ble_sm_lgcy_random_exec(proc, res)
-#define ble_sm_lgcy_random_rx(proc, res)
-#endif
-
-#if MYNEWT_VAL(BLE_SM_SC)
-int ble_sm_sc_io_action(struct ble_sm_proc *proc, uint8_t *action);
-void ble_sm_sc_confirm_exec(struct ble_sm_proc *proc,
-                            struct ble_sm_result *res);
-void ble_sm_sc_random_exec(struct ble_sm_proc *proc,
-                           struct ble_sm_result *res);
-void ble_sm_sc_random_rx(struct ble_sm_proc *proc, struct ble_sm_result *res);
-void ble_sm_sc_public_key_exec(struct ble_sm_proc *proc,
-                               struct ble_sm_result *res,
-                               void *arg);
-void ble_sm_sc_public_key_rx(uint16_t conn_handle, struct os_mbuf **rxom,
-                             struct ble_sm_result *res);
-void ble_sm_sc_dhkey_check_exec(struct ble_sm_proc *proc,
-                                struct ble_sm_result *res, void *arg);
-void ble_sm_sc_dhkey_check_rx(uint16_t conn_handle, struct os_mbuf **rxom,
-                              struct ble_sm_result *res);
-bool ble_sm_sc_oob_data_check(struct ble_sm_proc *proc,
-                              bool oob_data_local_present,
-                              bool oob_data_remote_present);
-void ble_sm_sc_oob_confirm(struct ble_sm_proc *proc, struct ble_sm_result *res);
-void ble_sm_sc_init(void);
-#else
-#define ble_sm_sc_io_action(proc, action) (BLE_HS_ENOTSUP)
-#define ble_sm_sc_confirm_exec(proc, res)
-#define ble_sm_sc_random_exec(proc, res)
-#define ble_sm_sc_random_rx(proc, res)
-#define ble_sm_sc_public_key_exec(proc, res, arg)
-#define ble_sm_sc_public_key_rx(conn_handle, op, om, res)
-#define ble_sm_sc_dhkey_check_exec(proc, res, arg)
-#define ble_sm_sc_dhkey_check_rx(conn_handle, op, om, res)
-#define ble_sm_sc_init()
-
-#endif
-
-struct ble_sm_proc *ble_sm_proc_find(uint16_t conn_handle, uint8_t state,
-                                     int is_initiator,
-                                     struct ble_sm_proc **out_prev);
-int ble_sm_gen_pair_rand(uint8_t *pair_rand);
-uint8_t *ble_sm_our_pair_rand(struct ble_sm_proc *proc);
-uint8_t *ble_sm_peer_pair_rand(struct ble_sm_proc *proc);
-int ble_sm_ioact_state(uint8_t action);
-int ble_sm_proc_can_advance(struct ble_sm_proc *proc);
-void ble_sm_process_result(uint16_t conn_handle, struct ble_sm_result *res);
-void ble_sm_confirm_advance(struct ble_sm_proc *proc);
-void ble_sm_ia_ra(struct ble_sm_proc *proc,
-                  uint8_t *out_iat, uint8_t *out_ia,
-                  uint8_t *out_rat, uint8_t *out_ra);
-
-int32_t ble_sm_timer(void);
-void ble_sm_connection_broken(uint16_t conn_handle);
-int ble_sm_pair_initiate(uint16_t conn_handle);
-int ble_sm_slave_initiate(uint16_t conn_handle);
-int ble_sm_enc_initiate(uint16_t conn_handle, uint8_t key_size,
-                        const uint8_t *ltk, uint16_t ediv,
-                        uint64_t rand_val, int auth);
-int ble_sm_alg_encrypt(const uint8_t *key, const uint8_t *plaintext,
-                       uint8_t *enc_data);
-int ble_sm_init(void);
-#else
-
-#define ble_sm_enc_change_rx(evt) ((void)(evt))
-#define ble_sm_ltk_req_rx(evt) ((void)(evt))
-#define ble_sm_enc_key_refresh_rx(evt) ((void)(evt))
-
-#define ble_sm_timer() BLE_HS_FOREVER
-#define ble_sm_connection_broken(conn_handle)
-#define ble_sm_pair_initiate(conn_handle)   BLE_HS_ENOTSUP
-#define ble_sm_slave_initiate(conn_handle)  BLE_HS_ENOTSUP
-#define ble_sm_enc_initiate(conn_handle, keysize, ltk, ediv, rand_val, auth) \
-        BLE_HS_ENOTSUP
-
-#define ble_sm_init() 0
-
-#define ble_sm_alg_encrypt(key, plaintext, enc_data) \
-        BLE_HS_ENOTSUP
-
-#endif
-
-struct ble_l2cap_chan *ble_sm_create_chan(uint16_t handle);
-void *ble_sm_cmd_get(uint8_t opcode, size_t len, struct os_mbuf **txom);
-int ble_sm_tx(uint16_t conn_handle, struct os_mbuf *txom);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/store/ram/ble_store_ram.h b/lib/libesp32_div/NimBLE-Arduino/src/store/ram/ble_store_ram.h
deleted file mode 100644
index 842fb5f3f..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/store/ram/ble_store_ram.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#ifndef H_BLE_STORE_RAM_
-#define H_BLE_STORE_RAM_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-union ble_store_key;
-union ble_store_value;
-
-int ble_store_ram_read(int obj_type, const union ble_store_key *key,
-                       union ble_store_value *value);
-int ble_store_ram_write(int obj_type, const union ble_store_value *val);
-int ble_store_ram_delete(int obj_type, const union ble_store_key *key);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/AUTHORS b/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/AUTHORS
deleted file mode 100644
index 0a8e9f806..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/AUTHORS
+++ /dev/null
@@ -1,15 +0,0 @@
-Architect: 
-Rafael Misoczki <rafael.misoczki@intel.com>
-
-Open Source Maintainer: 
-Constanza Heath <constanza.m.heath@intel.com>
-Rafael Misoczki <rafael.misoczki@intel.com>
-
-Contributors:
-Constanza Heath <constanza.m.heath@intel.com>
-Rafael Misoczki <rafael.misoczki@intel.com> 
-Flavio Santes <flavio.santes@intel.com>
-Jarkko Sakkinen <jarkko.sakkinen@intel.com>
-Chris Morrison
-Marti Bolivar
-Colin Ian King
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/LICENSE b/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/LICENSE
deleted file mode 100644
index 2e1db516a..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/LICENSE
+++ /dev/null
@@ -1,61 +0,0 @@
-
-================================================================================
-
-                     TinyCrypt Cryptographic Library                       
-
-================================================================================
-
-          Copyright (c) 2017, Intel Corporation. All rights reserved.         
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright notice, this 
-      list of conditions and the following disclaimer.
-      
-  - Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-      
-  - Neither the name of the Intel Corporation nor the names of its contributors 
-      may be used to endorse or promote products derived from this software 
-      without specific prior written permission. 
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-Copyright (c) 2014, Kenneth MacKay
-All rights reserved.
-
-https://github.com/kmackay/micro-ecc
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/README b/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/README
deleted file mode 100644
index fb52c196a..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/README
+++ /dev/null
@@ -1,71 +0,0 @@
-
-================================================================================
-
-                     TinyCrypt Cryptographic Library
-
-================================================================================
-
-          Copyright (c) 2017, Intel Corporation. All rights reserved.         
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright notice, this 
-      list of conditions and the following disclaimer.
-      
-  - Redistributions in binary form must reproduce the above copyright notice, 
-      this list of conditions and the following disclaimer in the documentation 
-      and/or other materials provided with the distribution.
-      
-  - Neither the name of the Intel Corporation nor the names of its contributors 
-      may be used to endorse or promote products derived from this software 
-      without specific prior written permission. 
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR 
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON 
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-================================================================================
-
-Overview:
-
-The TinyCrypt Library provides an implementation for constrained devices of a 
-minimal set of standard cryptography primitives. 
-
-Please, ***SEE THE DOCUMENTATION*** folder for more information on the supported 
-cryptographic primitives and the limitations of TinyCrypt library. For usage,
-security and technicalities, please see the corresponding header file of each 
-cryptographic primitive. 
-
-================================================================================
-
-Organization:
-
-/lib: C source code of the cryptographic primitives.
-/lib/include/tinycrypt: C header files of the cryptographic primitives.
-/tests: Test vectors of the cryptographic primitives.
-/doc: Documentation of TinyCrypt. 
-
-================================================================================
-
-Building:
-
-1) In Makefile.conf set: 
-    - CFLAGS for compiler flags.
-    - CC for compiler.
-    - ENABLE_TESTS for enabling (true) or disabling (false) tests compilation.
-2) In lib/Makefile select the primitives required by your project.
-3) In tests/Makefile select the corresponding tests of the selected primitives.
-4) make 
-5) run tests in tests/
-
-================================================================================
-
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/VERSION b/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/VERSION
deleted file mode 100644
index a45be4627..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.2.8
diff --git a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/documentation/tinycrypt.rst b/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/documentation/tinycrypt.rst
deleted file mode 100644
index 356c099a0..000000000
--- a/lib/libesp32_div/NimBLE-Arduino/src/tinycrypt/documentation/tinycrypt.rst
+++ /dev/null
@@ -1,352 +0,0 @@
-
-TinyCrypt Cryptographic Library
-###############################
-Copyright (C) 2017 by Intel Corporation, All Rights Reserved.
-
-Overview
-********
-The TinyCrypt Library provides an implementation for targeting constrained devices
-with a minimal set of standard cryptography primitives, as listed below. To better
-serve applications targeting constrained devices, TinyCrypt implementations differ
-from the standard specifications (see the Important Remarks section for some
-important differences). Certain cryptographic primitives depend on other
-primitives, as mentioned in the list below.
-
-Aside from the Important Remarks section below, valuable information on the usage,
-security and technicalities of each cryptographic primitive are found in the
-corresponding header file.
-
-* SHA-256:
-
-  * Type of primitive: Hash function.
-  * Standard Specification: NIST FIPS PUB 180-4.
-  * Requires: --
-
-* HMAC-SHA256:
-
-  * Type of primitive: Message authentication code.
-  * Standard Specification: RFC 2104.
-  * Requires: SHA-256
-
-* HMAC-PRNG:
-
-  * Type of primitive: Pseudo-random number generator (256-bit strength).
-  * Standard Specification: NIST SP 800-90A.
-  * Requires: SHA-256 and HMAC-SHA256.
-
-* AES-128:
-
-  * Type of primitive: Block cipher.
-  * Standard Specification: NIST FIPS PUB 197.
-  * Requires: --
-
-* AES-CBC mode:
-
-  * Type of primitive: Encryption mode of operation.
-  * Standard Specification: NIST SP 800-38A.
-  * Requires: AES-128.
-
-* AES-CTR mode:
-
-  * Type of primitive: Encryption mode of operation.
-  * Standard Specification: NIST SP 800-38A.
-  * Requires: AES-128.
-
-* AES-CMAC mode:
-
-  * Type of primitive: Message authentication code.
-  * Standard Specification: NIST SP 800-38B.
-  * Requires: AES-128.
-
-* AES-CCM mode:
-
-  * Type of primitive: Authenticated encryption.
-  * Standard Specification: NIST SP 800-38C.
-  * Requires: AES-128.
-
-* CTR-PRNG:
-
-  * Type of primitive: Pseudo-random number generator (128-bit strength).
-  * Standard Specification: NIST SP 800-90A.
-  * Requires: AES-128.
-  
-* ECC-DH:
-
-  * Type of primitive: Key exchange based on curve NIST p-256.
-  * Standard Specification: RFC 6090.
-  * Requires: ECC auxiliary functions (ecc.h/c).
-
-* ECC-DSA:
-
-  * Type of primitive: Digital signature based on curve NIST p-256.
-  * Standard Specification: RFC 6090.
-  * Requires: ECC auxiliary functions (ecc.h/c).
-
-Design Goals
-************
-
-* Minimize the code size of each cryptographic primitive. This means minimize
- the size of a platform-independent implementation, as presented in TinyCrypt.
- Note that various applications may require further features, optimizations with
- respect to other metrics and countermeasures for particular threats. These
- peculiarities would increase the code size and thus are not considered here.
-
-* Minimize the dependencies among the cryptographic primitives. This means
- that it is unnecessary to build and allocate object code for more primitives
- than the ones strictly required by the intended application. In other words,
- one can select and compile only the primitives required by the application.
-
-
-Important Remarks
-*****************
-
-The cryptographic implementations in TinyCrypt library have some limitations.
-Some of these limitations are inherent to the cryptographic primitives
-themselves, while others are specific to TinyCrypt. These limitations were accepted
-in order to meet its design goals (in special, minimal code size) and to better 
-serve applications targeting constrained devices in general. Some of these 
-limitations are discussed in-depth below.
-
-General Remarks
-***************
-
-* TinyCrypt does **not** intend to be fully side-channel resistant. Due to the
-  variety of side-channel attacks, many of them only relevant to certain 
-  platforms. In this sense, instead of penalizing all library users with
-  side-channel countermeasures such as increasing the overall code size,
-  TinyCrypt only implements certain generic timing-attack countermeasures.
-
-Specific Remarks
-****************
-
-* SHA-256:
-
-  * The number of bits_hashed in the state is not checked for overflow. Note
-    however that this will only be a problem if you intend to hash more than
-    2^64 bits, which is an extremely large window.
-
-* HMAC:
-
-  * The HMAC verification process is assumed to be performed by the application.
-    This compares the computed tag with some given tag.
-    Note that conventional memory-comparison methods (such as memcmp function)
-    might be vulnerable to timing attacks; thus be sure to use a constant-time
-    memory comparison function (such as compare_constant_time
-    function provided in lib/utils.c).
-
-  * The tc_hmac_final function, responsible for computing the message tag,
-    cleans the state context before exiting. Thus, applications do not need to
-    clean the TCHmacState_t ctx after calling tc_hmac_final. This should not
-    be changed in future versions of the library as there are applications
-    currently relying on this good-practice/feature of TinyCrypt.
-
-* HMAC-PRNG:
-
-  * Before using HMAC-PRNG, you *must* find an entropy source to produce a seed.
-    PRNGs only stretch the seed into a seemingly random output of arbitrary
-    length. The security of the output is exactly equal to the
-    unpredictability of the seed.
-
-  * NIST SP 800-90A requires three items as seed material in the initialization
-    step: entropy seed, personalization and a nonce (which is not implemented).
-    TinyCrypt requires the personalization byte array and automatically creates
-    the entropy seed using a mandatory call to the re-seed function.
-
-* AES-128:
-
-  * The current implementation does not support other key-lengths (such as 256
-    bits). Note that if you need AES-256, it doesn't sound as though your
-    application is running in a constrained environment. AES-256 requires keys
-    twice the size as for AES-128, and the key schedule is 40% larger.
-
-* CTR mode:
-
-  * The AES-CTR mode limits the size of a data message they encrypt to 2^32
-    blocks. If you need to encrypt larger data sets, your application would
-    need to replace the key after 2^32 block encryptions.
-
-* CTR-PRNG:
-
-  * Before using CTR-PRNG, you *must* find an entropy source to produce a seed.
-    PRNGs only stretch the seed into a seemingly random output of arbitrary
-    length. The security of the output is exactly equal to the
-    unpredictability of the seed.
-
-* CBC mode:
-
-  * TinyCrypt CBC decryption assumes that the iv and the ciphertext are
-    contiguous (as produced by TinyCrypt CBC encryption). This allows for a
-    very efficient decryption algorithm that would not otherwise be possible.
-
-* CMAC mode:
-
-  * AES128-CMAC mode of operation offers 64 bits of security against collision
-    attacks. Note however that an external attacker cannot generate the tags
-    him/herself without knowing the MAC key. In this sense, to attack the
-    collision property of AES128-CMAC, an external attacker would need the
-    cooperation of the legal user to produce an exponentially high number of
-    tags (e.g. 2^64) to finally be able to look for collisions and benefit
-    from them. As an extra precaution, the current implementation allows to at
-    most 2^48 calls to tc_cmac_update function before re-calling tc_cmac_setup
-    (allowing a new key to be set), as suggested in Appendix B of SP 800-38B.
-
-* CCM mode:
-
-  * There are a few tradeoffs for the selection of the parameters of CCM mode.
-    In special, there is a tradeoff between the maximum number of invocations
-    of CCM under a given key and the maximum payload length for those
-    invocations. Both things are related to the parameter 'q' of CCM mode. The
-    maximum number of invocations of CCM under a given key is determined by
-    the nonce size, which is: 15-q bytes. The maximum payload length for those
-    invocations is defined as 2^(8q) bytes.
-
-    To achieve minimal code size, TinyCrypt CCM implementation fixes q = 2,
-    which is a quite reasonable choice for constrained applications. The
-    implications of this choice are:
-
-    The nonce size is: 13 bytes.
-
-    The maximum payload length is: 2^16 bytes = 65 KB.
-
-    The mac size parameter is an important parameter to estimate the security
-    against collision attacks (that aim at finding different messages that
-    produce the same authentication tag). TinyCrypt CCM implementation
-    accepts any even integer between 4 and 16, as suggested in SP 800-38C.
-
-  * TinyCrypt CCM implementation accepts associated data of any length between
-    0 and (2^16 - 2^8) = 65280 bytes.
-
-  * TinyCrypt CCM implementation accepts:
-
-        * Both non-empty payload and associated data (it encrypts and
-          authenticates the payload and only authenticates the associated data);
-
-        * Non-empty payload and empty associated data (it encrypts and
-          authenticates the payload);
-
-        * Non-empty associated data and empty payload (it degenerates to an
-          authentication-only mode on the associated data).
-
-   * RFC-3610, which also specifies CCM, presents a few relevant security
-     suggestions, such as: it is recommended for most applications to use a
-     mac size greater than 8. Besides, it is emphasized that the usage of the
-     same nonce for two different messages which are encrypted with the same
-     key obviously destroys the security properties of CCM mode.
-
-* ECC-DH and ECC-DSA:
-
-  * TinyCrypt ECC implementation is based on micro-ecc (see
-    https://github.com/kmackay/micro-ecc). In the original micro-ecc 
-    documentation, there is an important remark about the way integers are
-    represented:
-
-    "Integer representation: To reduce code size, all large integers are
-    represented using little-endian words - so the least significant word is
-    first. You can use the 'ecc_bytes2native()' and 'ecc_native2bytes()'
-    functions to convert between the native integer representation and the
-    standardized octet representation."
-
-    Note that the assumed bit layout is: {31, 30, ..., 0}, {63, 62, ..., 32},
-    {95, 94, ..., 64}, {127, 126, ..., 96} for a very-long-integer (vli)
-    consisting of 4 unsigned integers (as an example).
-
-  * A cryptographically-secure PRNG function must be set (using uECC_set_rng())
-    before calling uECC_make_key() or uECC_sign().
-
-Examples of Applications
-************************
-It is possible to do useful cryptography with only the given small set of
-primitives. With this list of primitives it becomes feasible to support a range
-of cryptography usages:
-
- * Measurement of code, data structures, and other digital artifacts (SHA256);
-
- * Generate commitments (SHA256);
-
- * Construct keys (HMAC-SHA256);
-
- * Extract entropy from strings containing some randomness (HMAC-SHA256);
-
- * Construct random mappings (HMAC-SHA256);
-
- * Construct nonces and challenges (HMAC-PRNG, CTR-PRNG);
-
- * Authenticate using a shared secret (HMAC-SHA256);
-
- * Create an authenticated, replay-protected session (HMAC-SHA256 + HMAC-PRNG);
-
- * Authenticated encryption (AES-128 + AES-CCM);
-
- * Key-exchange (EC-DH);
-
- * Digital signature (EC-DSA);
-
-Test Vectors
-************
-
-The library provides a test program for each cryptographic primitive (see 'test'
-folder). Besides illustrating how to use the primitives, these tests evaluate
-the correctness of the implementations by checking the results against
-well-known publicly validated test vectors.
-
-For the case of the HMAC-PRNG, due to the necessity of performing an extensive
-battery test to produce meaningful conclusions, we suggest the user to evaluate
-the unpredictability of the implementation by using the NIST Statistical Test
-Suite (see References).
-
-For the case of the EC-DH and EC-DSA implementations, most of the test vectors
-were obtained from the site of the NIST Cryptographic Algorithm Validation
-Program (CAVP), see References.
-
-References
-**********
-
-* `NIST FIPS PUB 180-4 (SHA-256)`_
-
-.. _NIST FIPS PUB 180-4 (SHA-256):
-   http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf
-
-* `NIST FIPS PUB 197 (AES-128)`_
-
-.. _NIST FIPS PUB 197 (AES-128):
-   http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf
-
-* `NIST SP800-90A (HMAC-PRNG)`_
-
-.. _NIST SP800-90A (HMAC-PRNG):
-   http://csrc.nist.gov/publications/nistpubs/800-90A/SP800-90A.pdf
-
-* `NIST SP 800-38A (AES-CBC and AES-CTR)`_
-
-.. _NIST SP 800-38A (AES-CBC and AES-CTR):
-   http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
-
-* `NIST SP 800-38B (AES-CMAC)`_
-
-.. _NIST SP 800-38B (AES-CMAC):
-   http://csrc.nist.gov/publications/nistpubs/800-38B/SP_800-38B.pdf
-
-* `NIST SP 800-38C (AES-CCM)`_
-
-.. _NIST SP 800-38C (AES-CCM):
-    http://csrc.nist.gov/publications/nistpubs/800-38C/SP800-38C_updated-July20_2007.pdf
-
-* `NIST Statistical Test Suite (useful for testing HMAC-PRNG)`_
-
-.. _NIST Statistical Test Suite (useful for testing HMAC-PRNG):
-   http://csrc.nist.gov/groups/ST/toolkit/rng/documentation_software.html
-
-* `NIST Cryptographic Algorithm Validation Program (CAVP) site`_
-
-.. _NIST Cryptographic Algorithm Validation Program (CAVP) site:
-   http://csrc.nist.gov/groups/STM/cavp/
-
-* `RFC 2104 (HMAC-SHA256)`_
-
-.. _RFC 2104 (HMAC-SHA256):
-   https://www.ietf.org/rfc/rfc2104.txt
-
-* `RFC 6090 (ECC-DH and ECC-DSA)`_
-
-.. _RFC 6090 (ECC-DH and ECC-DSA):
-   https://www.ietf.org/rfc/rfc6090.txt
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 5d3175b06..3bbbc9f44 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -89,11 +89,8 @@ lib_extra_dirs          = ${library.lib_extra_dirs}
 
 
 [env:tasmota32_base]
-; *** Uncomment next lines ";" to enable development Tasmota Arduino version ESP32
-;platform                = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
-;platform_packages       = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1/framework-arduinoespressif32-release_IDF4.4.tar.gz
-;                          platformio/tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v3.2/esptool-v3.2.zip
-;                          platformio/tool-mklittlefs @ ~1.203.200522
+; *** Uncomment next line ";" to enable development Tasmota Arduino version ESP32
+;platform_packages       = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/525/framework-arduinoespressif32-release_v4.4-7cac8278e.tar.gz
 build_unflags           = ${esp32_defaults.build_unflags}
 build_flags             = ${esp32_defaults.build_flags}
 
diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini
index f832417ea..575f9d160 100644
--- a/platformio_tasmota32.ini
+++ b/platformio_tasmota32.ini
@@ -32,18 +32,14 @@ build_flags                 = ${esp_defaults.build_flags}
                               -Wl,--wrap=panicHandler -Wl,--wrap=xt_unhandled_exception
 
 [core32]
-platform                    = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
-platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1.1/framework-arduinoespressif32-release_IDF4.4.tar.gz
-                              platformio/tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v3.2/esptool-v3.2.zip
-                              platformio/tool-mklittlefs @ ~1.203.200522
+platform                    = https://github.com/tasmota/platform-espressif32/releases/download/v3.4.1/Tasmota-platform-espressif32.zip
+platform_packages           =
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}
 
 
 [core32solo1]
-platform                    = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
+platform                    = https://github.com/tasmota/platform-espressif32/releases/download/v3.4.1/Tasmota-platform-espressif32.zip
 platform_packages           = framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1.1/framework-arduinoespressif32-solo1-release_IDF4.4.tar.gz
-                              platformio/tool-esptoolpy @ https://github.com/tasmota/esptool/releases/download/v3.2/esptool-v3.2.zip
-                              platformio/tool-mklittlefs @ ~1.203.200522
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${esp32_defaults.build_flags}
diff --git a/tasmota/berry/drivers/Shift595.be b/tasmota/berry/drivers/Shift595.be
new file mode 100644
index 000000000..3e22f9b33
--- /dev/null
+++ b/tasmota/berry/drivers/Shift595.be
@@ -0,0 +1,80 @@
+# Sample Relay driver for 595 shift registers
+# -------------------------------------------------------------------------
+# You can cascade multiple '595 for a total of 28 relays (including other native relays)
+# Include the following lines in 'preinit.be'
+#   import Shift595
+#   tasmota.add_driver(Shift595(srclk,ser,rclk,count,inverted))
+# where
+#   srclk     : GPIO number connected to the 595's SRCLK pin (serial shift clock)
+#   ser       : GPIO number connected to the 595's SER pin (serial data in)
+#   rclk      : GPIO number connected to the 595's RCLK pin (transfer to output)
+#   count     : number of used output pins / relays (must be consecutive)
+#   inverted  : if true, relay is driven by a 0/LOW inverted (instead of 1/HIGH)
+#
+# To use multiple '595, connects
+#   all SRCLK together to GPIO srclk
+#   all RCLK together to GPIO rclk
+#   GPIO ser to SER input of first '595
+#   QH' output of first '595 to SER input of 2nd '595 and so on
+# -------------------------------------------------------------------------
+
+import string
+import gpio
+
+class Shift595
+
+  var srclk, ser, rclk, count, inverted
+  var first, state
+
+  def log_relay(relay)
+    var s = ""
+    for r:relay if r s+='1' else s+='0' end end
+    log("595: "+s,2)
+  end
+
+  def shift_out(relay)
+    self.log_relay(relay)
+
+    for i:0..size(relay)-1
+      var bit
+      bit = (relay[size(relay)-1 - i]) ? int(!self.inverted) : int(self.inverted)
+      gpio.digital_write(self.srclk, 0)
+      gpio.digital_write(self.ser, bit)
+      gpio.digital_write(self.srclk, 1)
+    end
+
+    gpio.digital_write(self.rclk, 1)
+    gpio.digital_write(self.rclk, 0)
+    gpio.digital_write(self.srclk, 0)
+  end
+
+  def init(srclk, ser, rclk, count, inverted)
+    self.srclk= srclk
+    self.ser = ser
+    self.rclk = rclk
+    self.count = count
+    self.inverted = inverted
+    self.first = tasmota.global.devices_present
+    tasmota.global.devices_present += count
+
+    gpio.pin_mode(self.srclk, gpio.OUTPUT)
+    gpio.pin_mode(self.ser,    gpio.OUTPUT)
+    gpio.pin_mode(self.rclk,   gpio.OUTPUT)
+    gpio.digital_write(self.srclk, 0)
+    gpio.digital_write(self.ser,    0)
+    gpio.digital_write(self.rclk,   0)
+
+    self.state = 0
+  end
+
+  def set_power_handler(cmd, idx)
+    var new_state = tasmota.get_power()[self.first..self.first+self.count]
+    if self.state != new_state
+      self.state = new_state
+      self.shift_out(self.state)
+    end
+  end
+
+end
+
+return Shift595 # allow using 'import' instead of 'load()'
diff --git a/tasmota/berry/leds/rainbow.be b/tasmota/berry/leds/rainbow.be
index bb7a4f105..bf3801556 100644
--- a/tasmota/berry/leds/rainbow.be
+++ b/tasmota/berry/leds/rainbow.be
@@ -11,28 +11,6 @@ rainbow.start()
 
 import animate
 
-# https://stackoverflow.com/questions/34187171/fast-integer-square-root-approximation
-def fast_sqrt_int(val)
-  var a, b
-
-  if val < 2 return val end
-
-  a = 1255        # starting point is relatively unimportant
-
-  b = val / a; a = (a+b) /2;
-  b = val / a; a = (a+b) /2;
-  b = val / a; a = (a+b) /2;
-  b = val / a; a = (a+b) /2;
-  b = val / a; a = (a+b) /2;
-  b = val / a; a = (a+b) /2;
-  if (val < 20000)
-    b = val / a; a = (a+b) /2;
-    b = val / a; a = (a+b) /2;
-  end
-
-  return a
-end
-
 class Rainbow : Leds_animator
   var cur_offset     # current offset in the palette
   static palette = [ 0xFF0000, #- red -#
@@ -45,6 +23,7 @@ class Rainbow : Leds_animator
                   ]
 
   def init(strip, duration)
+    import animate
     super(self).init(strip)
     self.cur_offset = 0
     # add an animator to change `self.cur_offset` to each value of the palette
@@ -73,7 +52,7 @@ end
 
 #-
 
-var strip = Leds_matrix(5,5, gpio.pin(gpio.WS2812, 1))
+var strip = Leds.matrix(5,5, gpio.pin(gpio.WS2812, 1))
 var r = Rainbow(strip, 1.0)
 r.start()
 
@@ -91,6 +70,7 @@ class Rainbow_stripes : Leds_animator
                   ]
 
   def init(strip, duration)
+    import animate
     super(self).init(strip)
     self.cur_offset = 0
     # add an animator to change `self.cur_offset` to each value of the palette
@@ -125,7 +105,7 @@ end
 
 #-
 
-var strip = Leds_matrix(5,5, gpio.pin(gpio.WS2812, 1))
+var strip = Leds.matrix(5,5, gpio.pin(gpio.WS2812, 1))
 var r = Rainbow_Matrix(strip, 0.5)
 r.start()
 
@@ -138,6 +118,7 @@ class Round : Leds_animator
   var h
 
   def init(strip, glow_duration, color_duration)
+    import animate
     super(self).init(strip)
     self.cur_val = 5 << 8
     self.h = 0          # start with hue = 0 (red)
@@ -162,7 +143,7 @@ class Round : Leds_animator
       var x = 0
       while x < w
         var col = col_ref
-        var dist = fast_sqrt_int( ((y - ch)*(y - ch) + (x - cw)*(x - cw)) << 16)
+        var dist = self.fast_sqrt_int( ((y - ch)*(y - ch) + (x - cw)*(x - cw)) << 16)
         var rel_bri = tasmota.scale_uint(dist, 0, self.cur_val, bri, 0)
         set_matrix_pixel_color(strip, x, y, col, rel_bri)   # simulate the method call without GETMET
         x += 1
@@ -172,11 +153,32 @@ class Round : Leds_animator
     strip.show()
   end
 
+  # https://stackoverflow.com/questions/34187171/fast-integer-square-root-approximation
+  static def fast_sqrt_int(val)
+    var a, b
+
+    if val < 2 return val end
+
+    a = 1255        # starting point is relatively unimportant
+
+    b = val / a; a = (a+b) /2;
+    b = val / a; a = (a+b) /2;
+    b = val / a; a = (a+b) /2;
+    b = val / a; a = (a+b) /2;
+    b = val / a; a = (a+b) /2;
+    b = val / a; a = (a+b) /2;
+    if (val < 20000)
+      b = val / a; a = (a+b) /2;
+      b = val / a; a = (a+b) /2;
+    end
+
+    return a
+  end
 end
 
 #-
 
-var strip = Leds_matrix(5,5, gpio.pin(gpio.WS2812, 1))
+var strip = Leds.matrix(5,5, gpio.pin(gpio.WS2812, 1))
 var r = Round(strip, 2, 30)
 r.start()
 
diff --git a/tasmota/i18n.h b/tasmota/i18n.h
index 2e31ff08d..387ba8f33 100644
--- a/tasmota/i18n.h
+++ b/tasmota/i18n.h
@@ -371,6 +371,7 @@
 // Commands xdrv_02_mqtt.ino
 #define D_SO_MQTTJSONONLY "MqttJSONOnly"
 #define D_SO_MQTTTLS "MqttTLS"
+#define D_SO_MQTTTLS_FINGERPRINT "MqttTLSFingerprint"
 #define D_SO_MQTTNORETAIN "MqttNoRetain"
 #define D_SO_MQTTDETACHRELAY "MqttDetachRelay"
 #define D_CMND_MQTTLOG "MqttLog"
@@ -715,6 +716,9 @@
 #define D_CMND_BR_RUN ""
 #define D_BR_NOT_STARTED  "Berry not started"
 
+// Commands xdrv_60_shift595.ino - 74x595 family shift register driver
+#define D_CMND_SHIFT595_DEVICE_COUNT "Shift595DeviceCount"
+
 // Commands xsns_02_analog.ino
 #define D_CMND_ADCPARAM "AdcParam"
 
diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
index 62ffd8920..b9e290410 100644
--- a/tasmota/language/af_AF.h
+++ b/tasmota/language/af_AF.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h
index d4015f984..fac7105f1 100644
--- a/tasmota/language/bg_BG.h
+++ b/tasmota/language/bg_BG.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h
index 08e72f1ea..a297d5f0f 100644
--- a/tasmota/language/cs_CZ.h
+++ b/tasmota/language/cs_CZ.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h
index cc8080529..e801818df 100644
--- a/tasmota/language/de_DE.h
+++ b/tasmota/language/de_DE.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Herzschlag"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h
index df517a383..b777c0965 100644
--- a/tasmota/language/el_GR.h
+++ b/tasmota/language/el_GR.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
index 79eb011f1..128e1c3bf 100644
--- a/tasmota/language/en_GB.h
+++ b/tasmota/language/en_GB.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h
index 6ef4fa653..f88f62cdb 100644
--- a/tasmota/language/es_ES.h
+++ b/tasmota/language/es_ES.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h
index 5dad0c998..01ae71a67 100644
--- a/tasmota/language/fr_FR.h
+++ b/tasmota/language/fr_FR.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h
index 569a0a830..0adcef573 100644
--- a/tasmota/language/fy_NL.h
+++ b/tasmota/language/fy_NL.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h
index b77b75a23..d00bac271 100644
--- a/tasmota/language/he_HE.h
+++ b/tasmota/language/he_HE.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h
index 713979b48..85db8bbce 100644
--- a/tasmota/language/hu_HU.h
+++ b/tasmota/language/hu_HU.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h
index f706ee9ad..9fcb4b292 100644
--- a/tasmota/language/it_IT.h
+++ b/tasmota/language/it_IT.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX               "HRG15 - TX"
 #define D_SENSOR_VINDRIKTNING_RX        "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT              "Battito cardiaco"
+#define D_GPIO_SHIFT595_SRCLK           "74x595 - SRCLK"
+#define D_GPIO_SHIFT595_RCLK            "74x595 - RCLK"
+#define D_GPIO_SHIFT595_OE              "74x595 - OE"
+#define D_GPIO_SHIFT595_SER             "74x595 - SER"
 
 // Units
 #define D_UNIT_AMPERE                     "A"
diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h
index a4ce5eae0..365480ef5 100644
--- a/tasmota/language/ko_KO.h
+++ b/tasmota/language/ko_KO.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h
index 7076b545f..991187eb4 100644
--- a/tasmota/language/nl_NL.h
+++ b/tasmota/language/nl_NL.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h
index 52802b75c..770606fd8 100644
--- a/tasmota/language/pl_PL.h
+++ b/tasmota/language/pl_PL.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h
index 4b59fce59..bb039ff4d 100644
--- a/tasmota/language/pt_BR.h
+++ b/tasmota/language/pt_BR.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h
index a5bdc4974..89da9f494 100644
--- a/tasmota/language/pt_PT.h
+++ b/tasmota/language/pt_PT.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h
index d4ca37c23..16e8f042b 100644
--- a/tasmota/language/ro_RO.h
+++ b/tasmota/language/ro_RO.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h
index 25942817c..56233f278 100644
--- a/tasmota/language/ru_RU.h
+++ b/tasmota/language/ru_RU.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "А"
diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h
index aa77fbaef..b3a1098e5 100644
--- a/tasmota/language/sk_SK.h
+++ b/tasmota/language/sk_SK.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h
index 1ff6c8108..aaf32fbde 100644
--- a/tasmota/language/sv_SE.h
+++ b/tasmota/language/sv_SE.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h
index 301feed7e..b9b2b7256 100644
--- a/tasmota/language/tr_TR.h
+++ b/tasmota/language/tr_TR.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h
index 044eaf47e..a9b1f98f6 100644
--- a/tasmota/language/uk_UA.h
+++ b/tasmota/language/uk_UA.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE                    "А"
diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h
index f31be5015..3bc724566 100644
--- a/tasmota/language/vi_VN.h
+++ b/tasmota/language/vi_VN.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h
index 3bfed5647..d2d9f0d97 100644
--- a/tasmota/language/zh_CN.h
+++ b/tasmota/language/zh_CN.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "A"
diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h
index a82028e71..39f468e0b 100644
--- a/tasmota/language/zh_TW.h
+++ b/tasmota/language/zh_TW.h
@@ -843,6 +843,10 @@
 #define D_SENSOR_HRG15_TX      "HRG15 Tx"
 #define D_SENSOR_VINDRIKTNING_RX "VINDRIKTNING"
 #define D_SENSOR_HEARTBEAT     "Heartbeat"
+#define D_GPIO_SHIFT595_SRCLK  "74x595 SRCLK"
+#define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
+#define D_GPIO_SHIFT595_OE     "74x595 OE"
+#define D_GPIO_SHIFT595_SER    "74x595 SER"
 
 // Units
 #define D_UNIT_AMPERE "安培"
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index bf887ff19..b77efe515 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -170,6 +170,7 @@
 #define MQTT_INDEX_SEPARATOR   false             // [SetOption64] Enable "_" instead of "-" as sensor index separator
 #define MQTT_TUYA_RECEIVED     false             // [SetOption66] Enable TuyaMcuReceived messages over Mqtt
 #define MQTT_TLS_ENABLED       false             // [SetOption103] Enable TLS mode (requires TLS version)
+#define MQTT_TLS_FINGERPRINT   false             // [SetOption132] Force TLS fingerprint validation instead of CA (requires TLS version)
 
 // -- HTTP ----------------------------------------
 #define WEB_SERVER             2                 // [WebServer] Web server (0 = Off, 1 = Start as User, 2 = Start as Admin)
@@ -337,6 +338,7 @@
 #define RF_DATA_RADIX          false             // [SetOption28] RF receive data format (false = hexadecimal, true = decimal)
 #define IR_DATA_RADIX          false             // [SetOption29] IR receive data format (false = hexadecimal, true = decimal)
 #define TUYA_SETOPTION_20      false             // [SetOption54] Apply SetOption20 settings to Tuya device
+#define TUYA_ALLOW_DIMMER_0    false             // [SetOption131] Allow save dimmer = 0 receved by MCU
 #define TUYA_TEMP_SET_RES      1                 // [TuyaTempSetRes] Maximum number of decimals (0 - 3) showing sensor TemperatureSet
 #define IR_ADD_RAW_DATA        false             // [SetOption58] Add IR Raw data to JSON message
 #define BUZZER_ENABLE          false             // [SetOption67] Enable buzzer when available
@@ -429,9 +431,7 @@
 // -- MQTT - TLS - AWS IoT ------------------------
 // Using TLS starting with version v6.5.0.16 compilation will only work using Core 2.4.2 and 2.5.2. No longer supported: 2.3.0
 //#define USE_MQTT_TLS                             // Use TLS for MQTT connection (+34.5k code, +7.0k mem and +4.8k additional during connection handshake)
-//  #define USE_MQTT_TLS_CA_CERT                   // Force full CA validation instead of fingerprints, slower, but simpler to use.  (+2.2k code, +1.9k mem during connection handshake)
-                                                   // This includes the LetsEncrypt CA in tasmota_ca.ino for verifying server certificates
-//  #define USE_MQTT_TLS_FORCE_EC_CIPHER           // Force Elliptic Curve cipher (higher security) required by some servers (automatically enabled with USE_MQTT_AWS_IOT) (+11.4k code, +0.4k mem)
+//  #define USE_MQTT_TLS_CA_CERT                   // [DEPRECATED] Now TLS supports dual mode using SetOption132 - this flag is now ignored
 //  #define USE_MQTT_AWS_IOT_LIGHT                 // Enable MQTT for AWS IoT in light mode, with user/password instead of private certificate
 //  #define USE_MQTT_AWS_IOT                       // [Deprecated] Enable MQTT for AWS IoT - requires a private key (+11.9k code, +0.4k mem)
                                                  //   Note: you need to generate a private key + certificate per device and update 'tasmota/tasmota_aws_iot.cpp'
@@ -452,7 +452,6 @@
 // -- Telegram Protocol ---------------------------
 //#define USE_TELEGRAM                             // Support for Telegram protocol (+49k code, +7.0k mem and +4.8k additional during connection handshake)
   #define USE_TELEGRAM_FINGERPRINT "\xB2\x72\x47\xA6\x69\x8C\x3C\x69\xF9\x58\x6C\xF3\x60\x02\xFB\x83\xFA\x8B\x1F\x23" // Telegram api.telegram.org TLS public key fingerpring
-//  #define USE_MQTT_TLS_CA_CERT                   // Use certificate instead of fingerprint
 
 // -- KNX IP Protocol -----------------------------
 //#define USE_KNX                                  // Enable KNX IP Protocol Support (+9.4k code, +3k7 mem)
@@ -552,6 +551,7 @@
 #define USE_LIGHT_PALETTE                        // Add support for color palette (+0k7 code)
 #define USE_LIGHT_VIRTUAL_CT                     // Add support for Virtual White Color Temperature (+1.1k code)
 #define USE_DGR_LIGHT_SEQUENCE                   // Add support for device group light sequencing (requires USE_DEVICE_GROUPS) (+0k2 code)
+//#define USE_LSC_MCSL                             // Add support for GPE Multi color smart light as sold by Action in the Netherlands (+1k1 code)
 
 // -- Counter input -------------------------------
 #define USE_COUNTER                              // Enable inputs as counter (+0k8 code)
@@ -893,6 +893,10 @@
 
 // -- Other sensors/drivers -----------------------
 
+//#define USE_SHIFT595                             // Add support for 74xx595 8-bit shift registers (+0k7 code)
+  #define SHIFT595_INVERT_OUTPUTS false            // [SetOption133] Don't invert outputs of 74x595 shift register
+  #define SHIFT595_DEVICE_COUNT  1                 // [Shift595DeviceCount] Set the number of connected 74x595 shift registers
+
 //#define USE_TM1638                               // Add support for TM1638 switches copying Switch1 .. Switch8 (+1k code)
 //#define USE_HX711                                // Add support for HX711 load cell (+1k5 code)
 //  #define USE_HX711_GUI                          // Add optional web GUI to HX711 as scale (+1k8 code)
@@ -966,6 +970,11 @@
 
 #ifdef ESP32
 
+//#define USE_SONOFF_SPM                           // Add support for ESP32 based Sonoff Smart Stackable Power Meter(+6k3 code)
+#ifdef USE_SONOFF_SPM
+#define USE_ETHERNET
+#endif
+
 //#define USE_ETHERNET                             // Add support for ethernet (Currently fixed for Olimex ESP32-PoE)
 //  #define USE_WT32_ETH01                         // Add support for Wireless-Tag WT32-ETH01
 //  #define ETH_TYPE          0                    // [EthType] 0 = ETH_PHY_LAN8720, 1 = ETH_PHY_TLK110/ETH_PHY_IP101, 2 = ETH_PHY_RTL8201, 3 = ETH_PHY_DP83848, 4 = ETH_PHY_DM9051, 5 = ETH_PHY_KSZ8081
@@ -1110,10 +1119,6 @@
 
 #if defined(USE_MQTT_TLS) || defined(USE_SENDMAIL) || defined(USE_TELEGRAM) || defined(USE_WEBCLIENT_HTTPS) || defined(USE_ALEXA_AVS)
   #define USE_TLS                                  // flag indicates we need to include TLS code
-
-  #if defined(USE_MQTT_AWS_IOT) || defined(USE_TELEGRAM) || defined(USE_WEBCLIENT_HTTPS)
-    #define USE_MQTT_TLS_FORCE_EC_CIPHER           // AWS IoT and TELEGRAM require EC Cipher
-  #endif
 #endif
 
 #endif  // _MY_USER_CONFIG_H_
diff --git a/tasmota/settings.h b/tasmota/settings.h
index c75842aac..8b7d1a956 100644
--- a/tasmota/settings.h
+++ b/tasmota/settings.h
@@ -160,9 +160,9 @@ typedef union {                            // Restricted by MISRA-C Rule 18.4 bu
     uint32_t disable_referer_chk : 1;      // bit 14 (v9.5.0.5)  - SetOption128 - (Web) Allow access without referer check
     uint32_t energy_phase : 1;             // bit 15 (v9.5.0.9)  - SetOption129 - (Energy) Show phase information
     uint32_t show_heap_with_timestamp : 1; // bit 16 (v9.5.0.9)  - SetOption130 - (Debug) Show heap with logging timestamp
-    uint32_t spare17 : 1;                  // bit 17
-    uint32_t spare18 : 1;                  // bit 18
-    uint32_t spare19 : 1;                  // bit 19
+    uint32_t tuya_allow_dimmer_0 : 1;      // bit 17 (v10.0.0.3) - SetOption131 - (Tuya) Allow save dimmer = 0 receved by MCU
+    uint32_t tls_use_fingerprint : 1;      // bit 18 (v10.0.0.4) - SetOption132 - (TLS) Use fingerprint validation instead of CA based
+    uint32_t shift595_invert_outputs : 1;  // bit 19 (v10.0.0.4) - SetOption133 - (Shift595) Invert outputs of 74x595 shift registers
     uint32_t spare20 : 1;                  // bit 20
     uint32_t spare21 : 1;                  // bit 21
     uint32_t spare22 : 1;                  // bit 22
@@ -250,7 +250,7 @@ typedef union {
     uint32_t sonoff_l1_music_sync : 1;     // bit 5  (v9.5.0.5) - CMND_L1MUSICSYNC - Enable sync to music
     uint32_t influxdb_default : 1;         // bit 6  (v9.5.0.5) - Set influxdb initial defaults if 0
     uint32_t influxdb_state : 1;           // bit 7  (v9.5.0.5) - CMND_IFX - Enable influxdb support
-    uint32_t spare08 : 1;                  // bit 8
+    uint32_t sspm_display : 1;             // bit 8  (v10.0.0.4) - CMND_SSPMDISPLAY - Enable gui display of powered on relays only
     uint32_t spare09 : 1;                  // bit 9
     uint32_t spare10 : 1;                  // bit 10
     uint32_t spare11 : 1;                  // bit 11
@@ -686,8 +686,9 @@ typedef struct {
   uint8_t       weight_change;             // E9F
   uint8_t       web_color2[2][3];          // EA0  Needs to be on integer / 3 distance from web_color
 
-  uint8_t       free_ea6[33];              // EA6
+  uint8_t       free_ea6[32];              // EA6
 
+  uint8_t       shift595_device_count;     // EC6
   uint8_t       sta_config;                // EC7
   uint8_t       sta_active;                // EC8
   uint8_t       rule_stop;                 // EC9
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index ec09129f4..31dd8a87c 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -1182,6 +1182,7 @@ void SettingsDefaultSet2(void) {
 
   // Tuya
   flag3.tuya_apply_o20 |= TUYA_SETOPTION_20;
+  flag5.tuya_allow_dimmer_0 |= TUYA_ALLOW_DIMMER_0;
   flag3.tuya_serial_mqtt_publish |= MQTT_TUYA_RECEIVED;
   mbflag2.temperature_set_res |= TUYA_TEMP_SET_RES;
 
@@ -1195,6 +1196,10 @@ void SettingsDefaultSet2(void) {
   flag4.mqtt_tls |= MQTT_TLS_ENABLED;
   flag4.mqtt_no_retain |= MQTT_NO_RETAIN;
 
+  flag5.shift595_invert_outputs |= SHIFT595_INVERT_OUTPUTS;
+  Settings->shift595_device_count = SHIFT595_DEVICE_COUNT;
+  flag5.tls_use_fingerprint |= MQTT_TLS_FINGERPRINT;
+
   Settings->flag = flag;
   Settings->flag2 = flag2;
   Settings->flag3 = flag3;
@@ -1457,6 +1462,14 @@ void SettingsDelta(void) {
     if (Settings->version < 0x0A000003) {
       if (0 == Settings->param[P_ARP_GRATUITOUS]) {
         Settings->param[P_ARP_GRATUITOUS] = WIFI_ARP_INTERVAL;
+#ifdef USE_TLS
+        for (uint32_t i = 0; i < 20; i++) {
+          if (Settings->mqtt_fingerprint[0][i]) {
+            Settings->flag5.tls_use_fingerprint = true;   // if the fingerprint1 is non null we expect it to be actually used
+            break;
+          }
+        }
+#endif
       }
     }
 
diff --git a/tasmota/support.ino b/tasmota/support.ino
index 76ca608e9..303a66e87 100644
--- a/tasmota/support.ino
+++ b/tasmota/support.ino
@@ -21,10 +21,15 @@ extern "C" {
 extern struct rst_info resetInfo;
 }
 
+#ifdef USE_KNX
+bool knx_started = false;
+#endif  // USE_KNX
+
 /*********************************************************************************************\
  * Watchdog extension (https://github.com/esp8266/Arduino/issues/1532)
 \*********************************************************************************************/
 
+#ifdef ESP8266
 #include <Ticker.h>
 
 Ticker tickerOSWatch;
@@ -38,12 +43,7 @@ uint8_t oswatch_blocked_loop = 0;
 //void OsWatchTicker() IRAM_ATTR;
 #endif  // USE_WS2812_DMA
 
-#ifdef USE_KNX
-bool knx_started = false;
-#endif  // USE_KNX
-
-void OsWatchTicker(void)
-{
+void OsWatchTicker(void) {
   uint32_t t = millis();
   uint32_t last_run = t - oswatch_last_loop_time;
 
@@ -66,27 +66,33 @@ void OsWatchTicker(void)
   }
 }
 
-void OsWatchInit(void)
-{
+void OsWatchInit(void) {
   oswatch_blocked_loop = RtcSettings.oswatch_blocked_loop;
   RtcSettings.oswatch_blocked_loop = 0;
   oswatch_last_loop_time = millis();
   tickerOSWatch.attach_ms(((OSWATCH_RESET_TIME / 3) * 1000), OsWatchTicker);
 }
 
-void OsWatchLoop(void)
-{
+void OsWatchLoop(void) {
   oswatch_last_loop_time = millis();
 //  while(1) delay(1000);  // this will trigger the os watch
 }
 
-bool OsWatchBlockedLoop(void)
-{
+bool OsWatchBlockedLoop(void) {
   return oswatch_blocked_loop;
 }
 
-uint32_t ResetReason(void)
-{
+#else  // Anything except ESP8266
+
+void OsWatchInit(void) {}
+void OsWatchLoop(void) {}
+bool OsWatchBlockedLoop(void) {
+  return false;
+}
+
+#endif  // ESP8266
+
+uint32_t ResetReason(void) {
   /*
     user_interface.h
     REASON_DEFAULT_RST      = 0,  // "Power on"                normal startup by power on
@@ -100,9 +106,8 @@ uint32_t ResetReason(void)
   return ESP_ResetInfoReason();
 }
 
-String GetResetReason(void)
-{
-  if (oswatch_blocked_loop) {
+String GetResetReason(void) {
+  if (OsWatchBlockedLoop()) {
     char buff[32];
     strncpy_P(buff, PSTR(D_JSON_BLOCKED_LOOP), sizeof(buff));
     return String(buff);
diff --git a/tasmota/support_button.ino b/tasmota/support_button.ino
index 3fbfff702..783ad475d 100644
--- a/tasmota/support_button.ino
+++ b/tasmota/support_button.ino
@@ -167,7 +167,7 @@ void ButtonHandler(void) {
     if (PinUsed(GPIO_KEY1, button_index)) {
       button_present = 1;
 #ifdef ESP32
-#ifndef CONFIG_IDF_TARGET_ESP32C3      
+#ifndef CONFIG_IDF_TARGET_ESP32C3
       if (bitRead(Button.touch_mask, button_index)) {          // Touch
         uint32_t _value = touchRead(Pin(GPIO_KEY1, button_index));
         button = NOT_PRESSED;
@@ -313,6 +313,13 @@ void ButtonHandler(void) {
                   }
                 }
               }
+
+              XdrvMailbox.index = button_index;
+              XdrvMailbox.payload = Button.press_counter[button_index];
+              if (XdrvCall(FUNC_BUTTON_MULTI_PRESSED)) {
+                // Serviced
+              } else
+
 #ifdef ROTARY_V1
               if (!RotaryButtonPressed(button_index)) {
 #endif
diff --git a/tasmota/support_command.ino b/tasmota/support_command.ino
index 23cd04c0b..a467f2de1 100644
--- a/tasmota/support_command.ino
+++ b/tasmota/support_command.ino
@@ -1068,6 +1068,9 @@ void CmndSetoptionBase(bool indexed) {
                   TasmotaGlobal.restart_flag = 2;
                 }
                 break;
+              case 18:                     // SetOption132 - TLS Fingerprint
+                TasmotaGlobal.restart_flag = 2;
+                break;
             }
           }
         } else {
diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
index 9236a511b..206735a15 100644
--- a/tasmota/support_features.ino
+++ b/tasmota/support_features.ino
@@ -778,9 +778,15 @@ void ResponseAppendFeatures(void)
 #if defined(USE_I2C) && defined(USE_HDC2010)
     feature8 |= 0x00010000;  // xsns_94_hdc2010.ino
 #endif
-//    feature8 |= 0x00020000;
-//    feature8 |= 0x00040000;
-//    feature8 |= 0x00080000;
+#if defined(USE_LIGHT) && defined(USE_LSC_MCSL)
+    feature8 |= 0x00020000;  // xlgt_07_lsc_mcsl.ino
+#endif
+#ifdef USE_SONOFF_SPM
+    feature8 |= 0x00040000;
+#endif
+#ifdef USE_SHIFT595
+    feature8 |= 0x00080000;  // xdrv_60_shift595.ino
+#endif
 
 //    feature8 |= 0x00100000;
 //    feature8 |= 0x00200000;
diff --git a/tasmota/support_float.ino b/tasmota/support_float.ino
index e2877e5a3..330daa480 100644
--- a/tasmota/support_float.ino
+++ b/tasmota/support_float.ino
@@ -407,14 +407,8 @@ uint16_t changeUIntScale(uint16_t inum, uint16_t ifrom_min, uint16_t ifrom_max,
     to_max = ito_min;
   }
 
-  uint32_t numerator = (num - from_min) * (to_max - to_min);
-  uint32_t result;
-  if (numerator >= 0x80000000L) {
-    // don't do rounding as it would create an overflow
-    result = numerator / (from_max - from_min) + to_min;
-  } else {
-    result = (((numerator * 2) / (from_max - from_min)) + 1) / 2 + to_min;
-  }
+  uint32_t numerator = (num - from_min) * (to_max - to_min + 1);
+  uint32_t result = numerator / (from_max - from_min) + to_min;
   return (uint32_t) (result > to_max ? to_max : (result < to_min ? to_min : result));
 }
 
diff --git a/tasmota/support_tasmota.ino b/tasmota/support_tasmota.ino
index 13671b18f..3129c2831 100644
--- a/tasmota/support_tasmota.ino
+++ b/tasmota/support_tasmota.ino
@@ -491,6 +491,9 @@ void SetLedLink(uint32_t state)
 #ifdef USE_BUZZER
   BuzzerSetStateToLed(state);
 #endif // USE_BUZZER
+#ifdef USE_PWM_DIMMER
+  if (Settings->flag4.powered_off_led) TasmotaGlobal.restore_powered_off_led_counter = 3;
+#endif  // USE_PWM_DIMMER
 }
 
 void SetPulseTimer(uint32_t index, uint32_t time)
@@ -1040,7 +1043,7 @@ void Every100mSeconds(void)
     if (TasmotaGlobal.pulse_timer[i] != 0L) {           // Timer active?
       if (TimeReached(TasmotaGlobal.pulse_timer[i])) {  // Timer finished?
         TasmotaGlobal.pulse_timer[i] = 0L;              // Turn off this timer
-        for (uint32_t j = 0; j < TasmotaGlobal.devices_present; j = j +MAX_PULSETIMERS) {
+        for (uint32_t j = 0; (i + j) < TasmotaGlobal.devices_present; j = j +MAX_PULSETIMERS) {
           ExecuteCommandPower(i + j +1, (POWER_ALL_OFF_PULSETIME_ON == Settings->poweronstate) ? POWER_ON : POWER_OFF, SRC_PULSETIMER);
         }
       }
diff --git a/tasmota/tasmota.h b/tasmota/tasmota.h
index f6a2b113d..77cbd00ce 100644
--- a/tasmota/tasmota.h
+++ b/tasmota/tasmota.h
@@ -341,7 +341,7 @@ enum XsnsFunctions {FUNC_SETTINGS_OVERRIDE, FUNC_PIN_STATE, FUNC_MODULE_INIT, FU
                     FUNC_MQTT_SUBSCRIBE, FUNC_MQTT_INIT, FUNC_MQTT_DATA,
                     FUNC_SET_POWER, FUNC_SET_DEVICE_POWER, FUNC_SHOW_SENSOR, FUNC_ANY_KEY,
                     FUNC_ENERGY_EVERY_SECOND, FUNC_ENERGY_RESET,
-                    FUNC_RULES_PROCESS, FUNC_TELEPERIOD_RULES_PROCESS, FUNC_SERIAL, FUNC_FREE_MEM, FUNC_BUTTON_PRESSED,
+                    FUNC_RULES_PROCESS, FUNC_TELEPERIOD_RULES_PROCESS, FUNC_SERIAL, FUNC_FREE_MEM, FUNC_BUTTON_PRESSED, FUNC_BUTTON_MULTI_PRESSED,
                     FUNC_WEB_ADD_BUTTON, FUNC_WEB_ADD_CONSOLE_BUTTON, FUNC_WEB_ADD_MANAGEMENT_BUTTON, FUNC_WEB_ADD_MAIN_BUTTON,
                     FUNC_WEB_ADD_HANDLER, FUNC_SET_CHANNELS, FUNC_SET_SCHEME, FUNC_HOTPLUG_SCAN,
                     FUNC_DEVICE_GROUP_ITEM };
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index 3e1ed63c4..872ad6ace 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -184,6 +184,9 @@ struct TasmotaGlobal_t {
   uint8_t last_source;                      // Last command source
   uint8_t shutters_present;                 // Number of actual define shutters
   uint8_t discovery_counter;                // Delayed discovery counter
+#ifdef USE_PWM_DIMMER
+  uint8_t restore_powered_off_led_counter;  // Seconds before powered-off LED (LEDLink) is restored
+#endif  // USE_PWM_DIMMER
 
 #ifndef SUPPORT_IF_STATEMENT
   uint8_t backlog_index;                    // Command backlog index
diff --git a/tasmota/tasmota_ca.ino b/tasmota/tasmota_ca.ino
index 90a90d961..ce78760b6 100644
--- a/tasmota/tasmota_ca.ino
+++ b/tasmota/tasmota_ca.ino
@@ -21,7 +21,7 @@
 // Please use fingerprint validation instead
 // However, the CA are available below for future use if it appears to be useful
 
-#if defined(USE_TLS) && defined(USE_MQTT_TLS_CA_CERT)
+#if defined(USE_TLS)
 
 /*********************************************************************************************\
  * LetsEncrypt R3 certificate, RSA 2048 bits SHA 256, valid until 20250915
@@ -86,7 +86,7 @@ static const br_x509_trust_anchor PROGMEM LetsEncryptR3_TA = {
 /*********************************************************************************************\
  * Amazon Root CA, RSA 2048 bits SHA 256, valid until 20380117
  *
- * https://letsencrypt.org/certificates/
+ * https://www.amazontrust.com/repository/
  * Downloaded from https://www.amazontrust.com/repository/AmazonRootCA1.pem
  *
  * to convert do: "bearssl ta AmazonRootCA1.pem"
@@ -232,4 +232,4 @@ const br_x509_trust_anchor GoDaddyCAG2_TA PROGMEM = {
 	}
 };
 
-#endif // defined(USE_TLS) && defined(USE_MQTT_TLS_CA_CERT)
+#endif // defined(USE_TLS)
diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h
index 8dc302dad..7a417e787 100644
--- a/tasmota/tasmota_configurations.h
+++ b/tasmota/tasmota_configurations.h
@@ -497,9 +497,6 @@
 // -- MQTT - TLS - AWS IoT ------------------------
 #ifdef USE_ZBBRIDGE_TLS                            // Enable TLS for ZbBridge
   #define USE_MQTT_TLS                             // Use TLS for MQTT connection (+34.5k code, +7.0k mem and +4.8k additional during connection handshake)
-    #define USE_MQTT_TLS_CA_CERT                   // Force full CA validation instead of fingerprints, slower, but simpler to use.  (+2.2k code, +1.9k mem during connection handshake)
-                                                   // This includes the LetsEncrypt CA in tasmota_ca.ino for verifying server certificates
-    #define USE_MQTT_TLS_FORCE_EC_CIPHER           // Force Elliptic Curve cipher (higher security) required by some servers (automatically enabled with USE_MQTT_AWS_IOT) (+11.4k code, +0.4k mem)
     #define USE_MQTT_AWS_IOT_LIGHT                 // Enable MQTT for AWS IoT in light mode, with user/password instead of private certificate
   #define USE_TLS                                  // flag indicates we need to include TLS code
 #endif                                             // USE_ZBBRIDGE_TLS
diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
index bbbce4d01..d8aa87742 100644
--- a/tasmota/tasmota_template.h
+++ b/tasmota/tasmota_template.h
@@ -176,6 +176,7 @@ enum UserSelectablePins {
   GPIO_BL0942_RX,                      // BL0942 Serial interface
   GPIO_HM330X_SET,                     // HM330X SET pin (sleep when low)
   GPIO_HEARTBEAT, GPIO_HEARTBEAT_INV,
+  GPIO_SHIFT595_SRCLK, GPIO_SHIFT595_RCLK, GPIO_SHIFT595_OE, GPIO_SHIFT595_SER,   // 74x595 Shift register
   GPIO_SENSOR_END };
 
 enum ProgramSelectablePins {
@@ -372,7 +373,9 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_BL0942_RX "|"
   D_SENSOR_HM330X_SET "|"
   D_SENSOR_HEARTBEAT "|" D_SENSOR_HEARTBEAT "_i|"
-  ;
+
+  D_GPIO_SHIFT595_SRCLK "|" D_GPIO_SHIFT595_RCLK "|" D_GPIO_SHIFT595_OE "|" D_GPIO_SHIFT595_SER "|"
+;
 
 const char kSensorNamesFixed[] PROGMEM =
   D_SENSOR_USER;
@@ -930,6 +933,13 @@ const uint16_t kGpioNiceList[] PROGMEM = {
   AGPIO(GPIO_ADC_JOY) + MAX_ADCS,         // Joystick
   AGPIO(GPIO_ADC_PH) + MAX_ADCS,          // Analog PH Sensor
 #endif  // ESP32
+
+#ifdef USE_SHIFT595
+  AGPIO(GPIO_SHIFT595_SRCLK),            // 74x595 shift register
+  AGPIO(GPIO_SHIFT595_RCLK),
+  AGPIO(GPIO_SHIFT595_OE),
+  AGPIO(GPIO_SHIFT595_SER),
+#endif
 };
 
 /*-------------------------------------------------------------------------------------------*\
diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h
index 7e3e74d42..d03c4e088 100644
--- a/tasmota/tasmota_version.h
+++ b/tasmota/tasmota_version.h
@@ -20,6 +20,6 @@
 #ifndef _TASMOTA_VERSION_H_
 #define _TASMOTA_VERSION_H_
 
-const uint32_t VERSION = 0x0A000003;
+const uint32_t VERSION = 0x0A010001;
 
 #endif  // _TASMOTA_VERSION_H_
diff --git a/tasmota/xdrv_02_9_mqtt.ino b/tasmota/xdrv_02_9_mqtt.ino
index f5302330f..a1a763b47 100644
--- a/tasmota/xdrv_02_9_mqtt.ino
+++ b/tasmota/xdrv_02_9_mqtt.ino
@@ -48,11 +48,11 @@ const char kMqttCommands[] PROGMEM = "|"  // No prefix
   // SetOption synonyms
   D_SO_MQTTJSONONLY "|"
 #ifdef USE_MQTT_TLS
-  D_SO_MQTTTLS "|"
+  D_SO_MQTTTLS "|" D_SO_MQTTTLS_FINGERPRINT "|"
 #endif
   D_SO_MQTTNORETAIN "|" D_SO_MQTTDETACHRELAY "|"
   // regular commands
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+#if defined(USE_MQTT_TLS)
   D_CMND_MQTTFINGERPRINT "|"
 #endif
   D_CMND_MQTTUSER "|" D_CMND_MQTTPASSWORD "|" D_CMND_MQTTKEEPALIVE "|" D_CMND_MQTTTIMEOUT "|" D_CMND_MQTTWIFITIMEOUT "|"
@@ -70,18 +70,13 @@ const char kMqttCommands[] PROGMEM = "|"  // No prefix
 SO_SYNONYMS(kMqttSynonyms,
   90,
 #ifdef USE_MQTT_TLS
-  103,
+  103, 132,
 #endif
   104, 114
 );
 
-// const uint8_t kMqttSynonyms[] PROGMEM = {
-//   4,  // number of synonyms
-//   90, 103, 104, 114,
-// };
-
 void (* const MqttCommand[])(void) PROGMEM = {
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+#if defined(USE_MQTT_TLS)
   &CmndMqttFingerprint,
 #endif
   &CmndMqttUser, &CmndMqttPassword, &CmndMqttKeepAlive, &CmndMqttTimeout, &CmndMqttWifiTimeout,
@@ -197,6 +192,7 @@ void MqttInit(void) {
   Settings->mqtt_port = 8883;
 #endif //USE_MQTT_AZURE_IOT
 #ifdef USE_MQTT_TLS
+  bool aws_iot_host = false;
   if ((8883 == Settings->mqtt_port) || (8884 == Settings->mqtt_port) || (443 == Settings->mqtt_port)) {
     // Turn on TLS for port 8883 (TLS), 8884 (TLS, client certificate), 443 (TLS, user/password)
     Settings->flag4.mqtt_tls = true;
@@ -207,6 +203,7 @@ void MqttInit(void) {
   String host = String(SettingsText(SET_MQTT_HOST));
   if (host.indexOf(F(".iot.")) && host.endsWith(F(".amazonaws.com"))) {  // look for ".iot." and ".amazonaws.com" in the domain name
     Settings->flag4.mqtt_no_retain = true;
+    aws_iot_host = true;
   }
 
   if (Mqtt.mqtt_tls) {
@@ -216,12 +213,10 @@ void MqttInit(void) {
     tlsClient = new BearSSL::WiFiClientSecure_light(1024,1024);
 #endif
 
-#ifdef USE_MQTT_AWS_IOT_LIGHT
-    if (443 == Settings->mqtt_port) {
+    if (443 == Settings->mqtt_port && aws_iot_host) {
       static const char * alpn_mqtt = "mqtt";   // needs to be static
       tlsClient->setALPN(&alpn_mqtt, 1);         // need to set alpn to 'mqtt' for AWS IoT
     }
-#endif
 #ifdef USE_MQTT_AWS_IOT
     loadTlsDir();   // load key and certificate data from Flash
     if ((nullptr != AWS_IoT_Private_Key) && (nullptr != AWS_IoT_Client_Certificate)) {
@@ -231,9 +226,9 @@ void MqttInit(void) {
     }
 #endif
 
-#ifdef USE_MQTT_TLS_CA_CERT
-    tlsClient->setTrustAnchor(Tasmota_TA, nitems(Tasmota_TA));
-#endif // USE_MQTT_TLS_CA_CERT
+    if (!Settings->flag5.tls_use_fingerprint) {
+      tlsClient->setTrustAnchor(Tasmota_TA, nitems(Tasmota_TA));
+    }
 
     MqttClient.setClient(*tlsClient);
   } else {
@@ -953,7 +948,7 @@ void MqttConnected(void) {
 void MqttReconnect(void) {
   char stopic[TOPSZ];
 
-  Mqtt.allowed = Settings->flag.mqtt_enabled;  // SetOption3 - Enable MQTT
+  Mqtt.allowed = Settings->flag.mqtt_enabled && (TasmotaGlobal.restart_flag == 0);  // SetOption3 - Enable MQTT, and don't connect if restart in process
   if (Mqtt.allowed) {
 #if defined(USE_MQTT_AZURE_DPS_SCOPEID) && defined(USE_MQTT_AZURE_DPS_PRESHAREDKEY)
   ProvisionAzureDPS();
@@ -1043,11 +1038,11 @@ void MqttReconnect(void) {
   MqttClient.setServer(SettingsText(SET_MQTT_HOST), Settings->mqtt_port);
 
   uint32_t mqtt_connect_time = millis();
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
-  bool allow_all_fingerprints;
-  bool learn_fingerprint1;
-  bool learn_fingerprint2;
-  if (Mqtt.mqtt_tls) {
+#if defined(USE_MQTT_TLS)
+  bool allow_all_fingerprints = false;
+  bool learn_fingerprint1 = false;
+  bool learn_fingerprint2 = false;
+  if (Mqtt.mqtt_tls && Settings->flag5.tls_use_fingerprint) {
     allow_all_fingerprints = false;
     learn_fingerprint1 = is_fingerprint_mono_value(Settings->mqtt_fingerprint[0], 0x00);
     learn_fingerprint2 = is_fingerprint_mono_value(Settings->mqtt_fingerprint[1], 0x00);
@@ -1094,35 +1089,37 @@ void MqttReconnect(void) {
       if (!tlsClient->getMFLNStatus()) {
         AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "MFLN not supported by TLS server"));
       }
-#ifndef USE_MQTT_TLS_CA_CERT  // don't bother with fingerprints if using CA validation
-      const uint8_t *recv_fingerprint = tlsClient->getRecvPubKeyFingerprint();
-      // create a printable version of the fingerprint received
-      char buf_fingerprint[64];
-      ToHex_P(recv_fingerprint, 20, buf_fingerprint, sizeof(buf_fingerprint), ' ');
-      AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Server fingerprint: %s"), buf_fingerprint);
 
-      bool learned = false;
+      if (Settings->flag5.tls_use_fingerprint) {    // CA validation
+        const uint8_t *recv_fingerprint = tlsClient->getRecvPubKeyFingerprint();
+        // create a printable version of the fingerprint received
+        char buf_fingerprint[64];
+        ToHex_P(recv_fingerprint, 20, buf_fingerprint, sizeof(buf_fingerprint), ' ');
+        AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_MQTT "Server fingerprint: %s"), buf_fingerprint);
 
-      // If the fingerprint slot is marked for update, we'll do so.
-      // Otherwise, if the fingerprint slot had the magic trust-on-first-use
-      // value, we will save the current fingerprint there, but only if the other fingerprint slot
-      // *didn't* match it.
-      if (recv_fingerprint[20] & 0x1 || (learn_fingerprint1 && 0 != memcmp(recv_fingerprint, Settings->mqtt_fingerprint[1], 20))) {
-        memcpy(Settings->mqtt_fingerprint[0], recv_fingerprint, 20);
-        learned = true;
-      }
-      // As above, but for the other slot.
-      if (recv_fingerprint[20] & 0x2 || (learn_fingerprint2 && 0 != memcmp(recv_fingerprint, Settings->mqtt_fingerprint[0], 20))) {
-        memcpy(Settings->mqtt_fingerprint[1], recv_fingerprint, 20);
-        learned = true;
+        bool learned = false;
+
+        // If the fingerprint slot is marked for update, we'll do so.
+        // Otherwise, if the fingerprint slot had the magic trust-on-first-use
+        // value, we will save the current fingerprint there, but only if the other fingerprint slot
+        // *didn't* match it.
+        if (recv_fingerprint[20] & 0x1 || (learn_fingerprint1 && 0 != memcmp(recv_fingerprint, Settings->mqtt_fingerprint[1], 20))) {
+          memcpy(Settings->mqtt_fingerprint[0], recv_fingerprint, 20);
+          learned = true;
+        }
+        // As above, but for the other slot.
+        if (recv_fingerprint[20] & 0x2 || (learn_fingerprint2 && 0 != memcmp(recv_fingerprint, Settings->mqtt_fingerprint[0], 20))) {
+          memcpy(Settings->mqtt_fingerprint[1], recv_fingerprint, 20);
+          learned = true;
+        }
+
+        if (learned) {
+          AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Fingerprint learned: %s"), buf_fingerprint);
+
+          SettingsSaveAll();  // save settings
+        }
       }
 
-      if (learned) {
-        AddLog(LOG_LEVEL_INFO, PSTR(D_LOG_MQTT "Fingerprint learned: %s"), buf_fingerprint);
-
-        SettingsSaveAll();  // save settings
-      }
-#endif // !USE_MQTT_TLS_CA_CERT
     }
 #endif // USE_MQTT_TLS
     MqttConnected();
@@ -1275,7 +1272,7 @@ bool KeyTopicActive(uint32_t key) {
  * Commands
 \*********************************************************************************************/
 
-#if defined(USE_MQTT_TLS) && !defined(USE_MQTT_TLS_CA_CERT)
+#if defined(USE_MQTT_TLS)
 void CmndMqttFingerprint(void) {
   if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= 2)) {
     char fingerprint[60];
diff --git a/tasmota/xdrv_03_energy.ino b/tasmota/xdrv_03_energy.ino
index 1a71d5adb..161681e14 100644
--- a/tasmota/xdrv_03_energy.ino
+++ b/tasmota/xdrv_03_energy.ino
@@ -249,7 +249,7 @@ void EnergyUpdateTotal(void) {
   // Provide total import active energy as float Energy.import_active[phase] in kWh: 98Wh = 0.098kWh
 
   for (uint32_t i = 0; i < Energy.phase_count; i++) {
-    AddLog(LOG_LEVEL_DEBUG, PSTR("NRG: EnergyTotal[%d] %4_f kWh"), i, &Energy.import_active[i]);
+    AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("NRG: EnergyTotal[%d] %4_f kWh"), i, &Energy.import_active[i]);
 
     if (0 == Energy.start_energy[i] || (Energy.import_active[i] < Energy.start_energy[i])) {
       Energy.start_energy[i] = Energy.import_active[i];  // Init after restart and handle roll-over if any
diff --git a/tasmota/xdrv_04_light.ino b/tasmota/xdrv_04_light.ino
index a4f2c3e7e..b05386f4a 100644
--- a/tasmota/xdrv_04_light.ino
+++ b/tasmota/xdrv_04_light.ino
@@ -1855,10 +1855,12 @@ bool isChannelGammaCorrected(uint32_t channel) {
   if (channel >= Light.subtype) { return false; }     // Out of range
 #ifdef ESP8266
   if ((PHILIPS == TasmotaGlobal.module_type) || (Settings->flag4.pwm_ct_mode)) {
+#else
+  if (Settings->flag4.pwm_ct_mode) {
+#endif  // ESP8266
     if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return false; }   // PMW reserved for CT
     if ((LST_RGBCW == Light.subtype) && (4 == channel)) { return false; }   // PMW reserved for CT
   }
-#endif  // ESP8266
   return true;
 }
 
@@ -1866,10 +1868,12 @@ bool isChannelGammaCorrected(uint32_t channel) {
 bool isChannelCT(uint32_t channel) {
 #ifdef ESP8266
   if ((PHILIPS == TasmotaGlobal.module_type) || (Settings->flag4.pwm_ct_mode)) {
+#else
+  if (Settings->flag4.pwm_ct_mode) {
+#endif  // ESP8266
     if ((LST_COLDWARM == Light.subtype) && (1 == channel)) { return true; }   // PMW reserved for CT
     if ((LST_RGBCW == Light.subtype) && (4 == channel)) { return true; }   // PMW reserved for CT
   }
-#endif  // ESP8266
   return false;
 }
 
@@ -2159,9 +2163,12 @@ bool calcGammaBulbs(uint16_t cur_col_10[5]) {
 
   // Now we know ct_10 and white_bri10 (gamma corrected if needed)
 
-#ifdef ESP8266
   if ((LST_COLDWARM == Light.subtype) || (LST_RGBCW == Light.subtype)) {
+#ifdef ESP8266
     if ((PHILIPS == TasmotaGlobal.module_type) || (Settings->flag4.pwm_ct_mode)) {   // channel 1 is the color tone, mapped to cold channel (0..255)
+#else
+    if (Settings->flag4.pwm_ct_mode) {   // channel 1 is the color tone, mapped to cold channel (0..255)
+#endif  // ESP8266
       pwm_ct = true;
       // Xiaomi Philips bulbs follow a different scheme:
       // channel 0=intensity, channel1=temperature
@@ -2170,7 +2177,6 @@ bool calcGammaBulbs(uint16_t cur_col_10[5]) {
       return false;     // avoid any interference
     }
   }
-#endif  // ESP8266
 
   // Now see if we need to mix RGB and  White
   // Valid only for LST_RGBW, LST_RGBCW, SetOption105 1, and white is zero (see doc)
@@ -3205,6 +3211,9 @@ bool Xdrv04(uint8_t function)
       case FUNC_SET_POWER:
         LightSetPower();
         break;
+      case FUNC_BUTTON_MULTI_PRESSED:
+        result = XlgtCall(FUNC_BUTTON_MULTI_PRESSED);
+        break;
       case FUNC_COMMAND:
         result = DecodeCommand(kLightCommands, LightCommand, kLightSynonyms);
         if (!result) {
diff --git a/tasmota/xdrv_10_scripter.ino b/tasmota/xdrv_10_scripter.ino
index d5a2c5bdb..f744d850b 100755
--- a/tasmota/xdrv_10_scripter.ino
+++ b/tasmota/xdrv_10_scripter.ino
@@ -116,6 +116,9 @@ uint32_t DecodeLightId(uint32_t hue_id);
 #define UNISHOXRSIZE 2560
 #endif
 
+#ifndef MAX_EXT_ARRAYS
+#define MAX_EXT_ARRAYS 5
+#endif
 
 #ifndef STASK_PRIO
 #define STASK_PRIO 1
@@ -1163,6 +1166,22 @@ float *Get_MFAddr(uint8_t index, uint16_t *len, uint16_t *ipos) {
 
 char *isvar(char *lp, uint8_t *vtype, struct T_INDEX *tind, float *fp, char *sp, struct GVARS *gv);
 
+char *get_array_by_name(char *lp, float **fp, uint16_t *alen) {
+  struct T_INDEX ind;
+  uint8_t vtype;
+  lp = isvar(lp, &vtype, &ind, 0, 0, 0);
+  if (vtype==VAR_NV) return 0;
+  if (vtype&STYPE) return 0;
+  uint16_t index = glob_script_mem.type[ind.index].index;
+
+  if (glob_script_mem.type[ind.index].bits.is_filter) {
+    float *fa = Get_MFAddr(index, alen, 0);
+    *fp = fa;
+    return lp;
+  }
+  *fp = 0;
+  return lp;
+}
 
 float *get_array_by_name(char *name, uint16_t *alen) {
   struct T_INDEX ind;
@@ -1281,6 +1300,133 @@ float DoMedian5(uint8_t index, float in) {
   return median_array(mf->buffer, MEDIAN_SIZE);
 }
 
+
+#ifdef USE_FEXTRACT
+// convert tasmota time stamp to ul seconds
+uint32_t tstamp2l(char *ts) {
+uint16_t year;
+uint8_t month;
+uint8_t day;
+uint8_t hour;
+uint8_t mins;
+uint8_t secs;
+
+  if (strchr(ts, 'T')) {
+    // 2020-12-16T15:36:41
+    year = strtol(ts, &ts, 10);
+    if (year < 2020 || year > 2040) {
+      year = 2020;
+    }
+    year -= 2000;
+    ts++;
+    month = strtol(ts, &ts, 10);
+    ts++;
+    day = strtol(ts, &ts, 10);
+    ts++;
+    hour = strtol(ts, &ts, 10);
+    ts++;
+    mins = strtol(ts, &ts, 10);
+    ts++;
+    secs = strtol(ts, &ts, 10);
+  } else {
+    // german excel fromat 16.12.20 15:36
+    day = strtol(ts, &ts, 10);
+    ts++;
+    month = strtol(ts, &ts, 10);
+    ts++;
+    year = strtol(ts, &ts, 10);
+    ts++;
+    hour = strtol(ts, &ts, 10);
+    ts++;
+    mins = strtol(ts, &ts, 10);
+    secs = 0;
+  }
+  return (year*365*86400)+(month*31*86400)+(day*86400)+(hour*3600)+(mins*60)+secs;
+}
+
+// assume 1. entry is timestamp, others are tab delimited values until LF
+// file refernece, from timestamp, to timestampm, column offset, array pointers, array lenght, number of arrays
+int32_t extract_from_file(uint8_t fref,  char *ts_from, char *ts_to, uint8_t coffs, float **a_ptr, uint16_t *a_len, uint8_t numa, int16_t accum) {
+  if (!glob_script_mem.file_flags[fref].is_open) return -1;
+  char rstr[32];
+  uint8_t sindex = 0;
+  uint8_t colpos = 0;
+  uint8_t range = 0;
+  uint32_t tsfrom = tstamp2l(ts_from);
+  uint32_t tsto = tstamp2l(ts_to);
+  uint16_t lines = 0;
+  uint16_t rlines = 0;
+  float summs[numa];
+  uint16_t accnt[numa];
+  for (uint8_t cnt = 0; cnt < numa; cnt++) {
+     summs[cnt] = 0;
+     accnt[cnt] = 0;
+  }
+  uint8_t dflg = 1;
+  if (accum < 0) {
+    dflg = 0;
+    accum = -accum;
+  }
+  if (accum == 0) accum = 1;
+  while (glob_script_mem.files[fref].available()) {
+    // scan through file
+    uint8_t buff[2], iob;
+    glob_script_mem.files[fref].read(buff, 1);
+    iob = buff[0];
+    if (iob == '\t' || iob == ',' || iob == '\n') {
+      rstr[sindex] = 0;
+      sindex = 0;
+      if (colpos == 0) {
+          // timestamp  2020-12-16T15:36:41
+          // decompose timestamps
+          uint32_t cts = tstamp2l(rstr);
+          if (cts > tsto) break;
+          if (cts >= tsfrom && cts <= tsto) {
+            // we want this range
+            range = 1;
+            rlines++;
+          } else {
+            range = 0;
+          }
+      } else {
+          // data columns
+          if (range) {
+            uint8_t curpos = colpos - coffs;
+            if (colpos >= coffs && curpos < numa) {
+              if (a_len[curpos]) {
+                float fval = CharToFloat(rstr);
+                //AddLog(LOG_LEVEL_INFO, PSTR("cpos %d colp %d numa %d - %s %d"),curpos, colpos, a_len[curpos], rstr, (uint32_t)fval);
+                summs[curpos] += fval;
+                accnt[curpos] += 1;
+                if (accnt[curpos] == accum) {
+                  if (dflg) {
+                    *a_ptr[curpos]++ = summs[curpos] / accum;
+                  } else {
+                    *a_ptr[curpos]++ = summs[curpos];
+                  }
+                  summs[curpos] = 0;
+                  accnt[curpos] = 0;
+                  a_len[curpos]--;
+                }
+              } else {
+                break;
+              }
+            }
+          }
+      }
+      colpos++;
+      if (iob == '\n') {
+          colpos = 0;
+          lines ++;
+      }
+    }
+    rstr[sindex] = iob;
+    sindex++;
+  }
+  return rlines;
+}
+#endif // USE_FEXTRACT
+
 #ifdef USE_LIGHT
 uint32_t HSVToRGB(uint16_t hue, uint8_t saturation, uint8_t value) {
 float r = 0, g = 0, b = 0;
@@ -1782,26 +1928,20 @@ chknext:
         if (!strncmp(vname, "acos(", 5)) {
           lp=GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = acosf(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif
         if (!strncmp(vname, "abs(", 4)) {
           lp=GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = fabs(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 
         if (!strncmp(vname, "asc(", 4)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, gv);
           fvar = str[0];
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "adc(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
@@ -1831,6 +1971,26 @@ chknext:
           len = 0;
           goto exit;
         }
+        if (!strncmp(vname, "acp(", 4)) {
+          lp += 4;
+          SCRIPT_SKIP_SPACES
+          uint16_t alend;
+          fvar = -1;
+          float *fpd;
+          lp = get_array_by_name(lp, &fpd, &alend);
+          SCRIPT_SKIP_SPACES
+          uint16_t alens;
+          float *fps;
+          lp = get_array_by_name(lp, &fps, &alens);
+          SCRIPT_SKIP_SPACES
+          if (alend != alens) {
+            fvar = -1;
+          } else {
+            memcpy(fpd, fps, alend * sizeof(float));
+            fvar = 0;
+          }
+          goto nfuncexit;
+        }
         break;
 
       case 'b':
@@ -1887,9 +2047,7 @@ chknext:
           float fvar1;
           lp = GetNumericArgument(lp, OPER_EQU, &fvar1, gv);
           fvar = Core2SetAxpPin(fvar, fvar1);
-          lp++;
-          len=0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif // USE_M5STACK_CORE2
 
@@ -1906,10 +2064,8 @@ chknext:
           if (*lp!=')') {
             lp = GetNumericArgument(lp, OPER_EQU, &prio, gv);
           }
-          lp++;
           fvar = scripter_create_task(fvar, fvar1, fvar2, prio);
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //USE_SCRIPT_TASK
 #endif //ESP32
@@ -1917,9 +2073,7 @@ chknext:
         if (!strncmp(vname, "cos(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = cosf(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif
         break;
@@ -1997,9 +2151,7 @@ chknext:
               fvar = 99999;
               break;
           }
-          len = 0;
-          lp++;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //USE_ENERGY_SENSOR
         break;
@@ -2065,9 +2217,7 @@ chknext:
               break;
             }
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "fc(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
@@ -2081,9 +2231,7 @@ chknext:
             glob_script_mem.file_flags[ind].is_open = 0;
           }
           fvar = 0;
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "ff(", 3)) {
           lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
@@ -2091,9 +2239,7 @@ chknext:
           if (ind>=SFS_MAX) ind = SFS_MAX - 1;
           glob_script_mem.files[ind].flush();
           fvar = 0;
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "fw(", 3)) {
           char str[SCRIPT_MAXSSIZE];
@@ -2107,10 +2253,24 @@ chknext:
           } else {
             fvar = 0;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
+        if (!strncmp(vname, "fwb(", 4)) {
+          lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
+          uint8_t buf[2];
+          buf[0] = fvar;
+          SCRIPT_SKIP_SPACES
+          lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+          uint8_t ind = fvar;
+          if (ind>=SFS_MAX) ind = SFS_MAX - 1;
+          if (glob_script_mem.file_flags[ind].is_open) {
+            fvar = glob_script_mem.files[ind].write(buf, 1);
+          } else {
+            fvar = 0;
+          }
+          goto nfuncexit;
+        }
+
         if (!strncmp(vname, "fr(", 3)) {
           struct T_INDEX ind;
           uint8_t vtype;
@@ -2184,14 +2344,75 @@ chknext:
           len = 0;
           goto exit;
         }
+        if (!strncmp(vname, "frb(", 4)) {
+          lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+          uint8_t ind = fvar;
+          if (ind>=SFS_MAX) ind = SFS_MAX - 1;
+          if (glob_script_mem.file_flags[ind].is_open) {
+            uint8_t buf[2];
+            buf[0] = 0;
+            glob_script_mem.files[ind].read(buf, 1);
+            fvar = buf[0];
+          } else {
+            fvar = 0;
+          }
+          goto nfuncexit;
+        }
+        if (!strncmp(vname, "fa(", 3)) {
+          lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
+          uint8_t ind = fvar;
+          if (ind>=SFS_MAX) ind = SFS_MAX - 1;
+          if (glob_script_mem.file_flags[ind].is_open) {
+            fvar = glob_script_mem.files[ind].available();
+          } else {
+            fvar = -1;
+          }
+          goto nfuncexit;
+        }
+        if (!strncmp(vname, "fs(", 3)) {
+          lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
+          uint8_t ind = fvar;
+          SCRIPT_SKIP_SPACES
+          lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          if (ind>=SFS_MAX) ind = SFS_MAX - 1;
+          if (glob_script_mem.file_flags[ind].is_open) {
+            fvar = glob_script_mem.files[ind].seek(fvar, fs::SeekMode::SeekCur);
+          } else {
+            fvar = -1;
+          }
+          goto nfuncexit;
+        }
+        if (!strncmp(vname, "fz(", 3)) {
+          lp = GetNumericArgument(lp + 3, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          uint8_t ind = fvar;
+          if (ind>=SFS_MAX) ind = SFS_MAX - 1;
+          if (glob_script_mem.file_flags[ind].is_open) {
+            fvar = glob_script_mem.files[ind].size();
+          } else {
+            fvar = -1;
+          }
+          goto nfuncexit;
+        }
         if (!strncmp(vname, "fd(", 3)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           ufsp->remove(str);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
+#ifdef USE_UFILESYS
+        if (!strncmp(vname, "frw(", 4)) {
+          // read file from web
+          lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          char url[SCRIPT_MAXSSIZE];
+          lp = ForceStringVar(lp, url);
+          SCRIPT_SKIP_SPACES
+          fvar = url2file(fvar, url);
+          goto nfuncexit;
+        }
+#endif
 #if defined(ESP32) && defined(USE_WEBCAM)
         if (!strncmp(vname, "fwp(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
@@ -2215,9 +2436,7 @@ chknext:
           } else {
             fvar = 0;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //ESP32 && USE_WEBCAM
 #ifdef USE_SCRIPT_FATFS_EXT
@@ -2240,17 +2459,13 @@ chknext:
             }
             ef.close();
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "fmd(", 4)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
           fvar = ufsp->mkdir(str);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "fmt(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
@@ -2259,64 +2474,99 @@ chknext:
           } else {
             //SD.format();
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "frd(", 4)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
           fvar = ufsp->rmdir(str);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "fx(", 3)) {
           char str[glob_script_mem.max_ssize + 1];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           if (ufsp->exists(str)) fvar = 1;
           else fvar = 0;
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 
         if (!strncmp(vname, "fsi(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = UfsInfo(fvar, 0);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 
-        if (!strncmp(vname, "fwa(", 4)) {
-          struct T_INDEX ind;
-          uint8_t vtype;
-          lp = isvar(lp + 4, &vtype, &ind, 0, 0, gv);
-          if (vtype!=VAR_NV && (vtype&STYPE)==0 && glob_script_mem.type[ind.index].bits.is_filter) {
-            // found array as result
+#ifdef USE_FEXTRACT
+        if (!strncmp(vname, "fxt(", 4)) {
+          // extract from file
+          lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          uint8_t fref = fvar;
 
-          } else {
-            // error
+          //2020-12-16T14:30:00
+          char ts_from[24];
+          lp = GetStringArgument(lp, OPER_EQU, ts_from, 0);
+          SCRIPT_SKIP_SPACES
+
+          char ts_to[24];
+          lp = GetStringArgument(lp, OPER_EQU, ts_to, 0);
+          SCRIPT_SKIP_SPACES
+
+          lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          uint8_t coffs = fvar;
+
+          lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          int16_t accum = fvar;
+
+          uint16_t a_len[MAX_EXT_ARRAYS];
+          float *a_ptr[MAX_EXT_ARRAYS];
+
+          uint8_t index = 0;
+          while (index < MAX_EXT_ARRAYS) {
+            lp = get_array_by_name(lp, &a_ptr[index], &a_len[index]);
+            SCRIPT_SKIP_SPACES
+            index++;
+            if (*lp == ')' || *lp == '\n') {
+              break;
+            }
+          }
+          fvar = extract_from_file(fref,  ts_from, ts_to, coffs, a_ptr, a_len, index, accum);
+          goto nfuncexit;
+        }
+#endif // USE_FEXTRACT
+        if (!strncmp(vname, "fwa(", 4)) {
+          uint16_t alen;
+          float *fa;
+          lp = get_array_by_name(lp + 4, &fa, &alen);
+          if (!fa) {
             fvar = 0;
             goto exit;
           }
-
-          while (*lp==' ') lp++;
+          SCRIPT_SKIP_SPACES
           lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
+          SCRIPT_SKIP_SPACES
+          uint8_t append = 0;
+          if (*lp == 'a') {
+            lp++;
+            append = 1;
+          }
           uint8_t index = fvar;
-          if (index>=SFS_MAX) index = SFS_MAX - 1;
+          if (index >= SFS_MAX) index = SFS_MAX - 1;
           if (glob_script_mem.file_flags[index].is_open) {
-            uint16_t len = 0;
-            float *fa = Get_MFAddr(glob_script_mem.type[ind.index].index, &len, 0);
             char dstr[24];
-            for (uint32_t cnt = 0; cnt<len; cnt++) {
+            for (uint32_t cnt = 0; cnt < alen; cnt++) {
               dtostrfd(*fa, glob_script_mem.script_dprec, dstr);
               fa++;
               if (cnt < (len - 1)) {
                 strcat(dstr,"\t");
               } else {
-                strcat(dstr,"\n");
+                if (!append) {
+                  strcat(dstr,"\n");
+                } else {
+                  strcat(dstr,"\t");
+                }
               }
               glob_script_mem.files[index].print(dstr);
             }
@@ -2324,44 +2574,42 @@ chknext:
           } else {
             fvar = 0;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "fra(", 4)) {
-          struct T_INDEX ind;
-          uint8_t vtype;
-          lp = isvar(lp + 4, &vtype, &ind, 0, 0, gv);
-          if (vtype!=VAR_NV && (vtype&STYPE)==0 && glob_script_mem.type[ind.index].bits.is_filter) {
-            // found array as result
-
-          } else {
-            // error
+          uint16_t alen;
+          float *fa;
+          lp = get_array_by_name(lp + 4, &fa, &alen);
+          if (!fa) {
             fvar = 0;
             goto exit;
           }
-
-          while (*lp==' ') lp++;
+          SCRIPT_SKIP_SPACES
           lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
           uint8_t find = fvar;
-          if (find>=SFS_MAX) find = SFS_MAX - 1;
+          SCRIPT_SKIP_SPACES
+
+          if (find >= SFS_MAX) find = SFS_MAX - 1;
           char str[glob_script_mem.max_ssize + 1];
           if (glob_script_mem.file_flags[find].is_open) {
-            uint16_t len = 0;
-            float *fa = Get_MFAddr(glob_script_mem.type[ind.index].index, &len, 0);
-            char dstr[24];
-            for (uint32_t cnt = 0; cnt<len; cnt++) {
-              uint8_t index = 0;
+            uint8_t first = 0;
+            for (uint32_t cnt = 0; cnt < alen; cnt++) {
+              uint8_t slen = 0;
               char *cp = str;
+              *cp = 0;
               while (glob_script_mem.files[find].available()) {
                 uint8_t buf[1];
                 glob_script_mem.files[find].read(buf,1);
                 if (buf[0]=='\t' || buf[0]==',' || buf[0]=='\n' || buf[0]=='\r') {
-                  break;
+                  // skip leading TAB
+                  if (first) {
+                    break;
+                  }
                 } else {
                   *cp++ = buf[0];
-                  index++;
-                  if (index>=glob_script_mem.max_ssize - 1) break;
+                  first = 1;
+                  slen++;
+                  if (slen >= glob_script_mem.max_ssize - 1) break;
                 }
               }
               *cp = 0;
@@ -2370,9 +2618,7 @@ chknext:
           } else {
             fvar = 0;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 
 #endif // USE_SCRIPT_FATFS_EXT
@@ -2382,10 +2628,8 @@ chknext:
           lp = GetStringArgument(lp + 4, OPER_EQU, str, 0);
           if (lknum<1 || lknum>2) lknum = 1;
           strlcpy(glob_script_mem.flink[lknum - 1], str, 14);
-          lp++;
           fvar = 0;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "fsm", 3)) {
           fvar=(uint32_t)ufsp;
@@ -2501,9 +2745,7 @@ chknext:
           char path[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp, OPER_EQU, path, 0);
           fvar = call2https(host, path);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //SCRIPT_GET_HTTPS_JP
         break;
@@ -2539,9 +2781,36 @@ chknext:
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
           fvar = strtol(str, NULL, 16);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
+        }
+        if (!strncmp(vname, "hf(", 3)) {
+          char str[SCRIPT_MAXSSIZE];
+          lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
+          SCRIPT_SKIP_SPACES
+          if (strlen(str) != 8) {
+            fvar = -1;
+          } else {
+            uint8_t *ucp = (uint8_t*)&fvar;
+            uint8_t rflg = 0;
+            if (*lp=='r') {
+              rflg = 1;
+              ucp += sizeof(float);
+              lp++;
+            }
+            char substr[3];
+            char *cp = str;
+            for (uint32_t cnt = 0; cnt < 4; cnt++) {
+              substr[0] = *cp++;
+              substr[1] = *cp++;
+              substr[2] = 0;
+              if (!rflg) {
+                *ucp++ = strtol(substr, NULL, 16);
+              } else {
+                *--ucp = strtol(substr, NULL, 16);
+              }
+            }
+          }
+          goto nfuncexit;
         }
         if (!strncmp(vname, "http(", 5)) {
           char host[SCRIPT_MAXSSIZE];
@@ -2551,9 +2820,7 @@ chknext:
           lp = GetStringArgument(lp, OPER_EQU, request, 0);
           SCRIPT_SKIP_SPACES
           fvar = http_req(host, request);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #ifdef USE_LIGHT
         if (!strncmp(vname, "hsvrgb(", 7)) {
@@ -2571,9 +2838,7 @@ chknext:
           if (fvar3<0 || fvar3>100) fvar3 = 0;
 
           fvar = HSVToRGB(fvar, fvar2, fvar3);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //USE_LIGHT
 
@@ -2588,9 +2853,7 @@ chknext:
               glob_script_mem.homekit_running == false;
             }
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif
         break;
@@ -2608,16 +2871,12 @@ chknext:
           } else {
             fvar = -1;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "int(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = floor(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "is(", 3)) {
           lp = isargs(lp + 3, 0);
@@ -2662,9 +2921,7 @@ chknext:
           }
           lp = GetNumericArgument(lp + 1, OPER_EQU, &fvar, gv);
           fvar = script_i2c(0, fvar, bus);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "iw", 2)) {
           uint8_t bytes = 1;
@@ -2681,9 +2938,7 @@ chknext:
           float fvar2;
           lp = GetNumericArgument(lp, OPER_EQU, &fvar2, gv);
           fvar = script_i2c(9 + bytes, fvar, fvar2);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "ir", 2)) {
           uint8_t bytes = 1;
@@ -2696,9 +2951,7 @@ chknext:
           }
           lp = GetNumericArgument(lp + 1, OPER_EQU, &fvar, gv);
           fvar = script_i2c(2, fvar, bytes);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif // USE_SCRIPT_I2C
         break;
@@ -2728,9 +2981,7 @@ chknext:
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           fvar = lvgl_test(&lp, fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif // USE_LVGL
         break;
@@ -2743,17 +2994,13 @@ chknext:
           float fvar2;
           lp = GetNumericArgument(lp, OPER_EQU, &fvar2, gv);
           fvar = DoMedian5(fvar1, fvar2);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #ifdef USE_ANGLE_FUNC
         if (!strncmp(vname, "mpt(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = MeasurePulseTime(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //USE_ANGLE_FUNC
         if (!strncmp(vname, "micros", 6)) {
@@ -2911,10 +3158,8 @@ chknext:
           // arg2
           float fvar2;
           lp = GetNumericArgument(lp, OPER_EQU, &fvar2, gv);
-          lp++;
           fvar = FastPrecisePowf(fvar1, fvar2);
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "pwr[", 4)) {
           GetNumericArgument(vname + 4, OPER_EQU, &fvar, gv);
@@ -2998,10 +3243,8 @@ chknext:
         if (!strncmp(vname, "sl(", 3)) {
           char str[SCRIPT_MAXSSIZE];
           lp = GetStringArgument(lp + 3, OPER_EQU, str, 0);
-          lp++;
-          len = 0;
           fvar = strlen(str);
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "sb(", 3)) {
           char str[SCRIPT_MAXSSIZE];
@@ -3081,9 +3324,7 @@ chknext:
           if (fvar>240) fvar = 240;
           setCpuFrequencyMhz(fvar);
           fvar = getCpuFrequencyMhz();
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //ESP32
 #ifdef USE_TTGO_WATCH
@@ -3091,9 +3332,7 @@ chknext:
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           TTGO_Sleep(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //USE_TTGO_WATCH
 #if defined(USE_TIMERS) && defined(USE_SUNRISE)
@@ -3124,16 +3363,12 @@ chknext:
         if (!strncmp(vname, "sin(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           fvar = sinf(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "sqrt(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = sqrtf(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //USE_ANGLE_FUNC
 
@@ -3142,9 +3377,7 @@ chknext:
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           fvar = SML_GetVal(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "sml(", 4)) {
           float fvar1;
@@ -3177,9 +3410,7 @@ chknext:
             fvar = 0;
 #endif //ED300L
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "smlj", 4)) {
           fvar = sml_json_enable;
@@ -3190,16 +3421,12 @@ chknext:
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           if (fvar < 1) fvar = 1;
           SML_Decode(fvar - 1);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "smlv[", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = sml_getv(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //USE_SML_M
 
@@ -3261,9 +3488,7 @@ chknext:
               fvar = -2;
             }
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "sw(", 3)) {
           char str[SCRIPT_MAXSSIZE];
@@ -3273,9 +3498,7 @@ chknext:
             glob_script_mem.sp->write(str, strlen(str));
             fvar = 0;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "swb(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, 0);
@@ -3284,18 +3507,14 @@ chknext:
             glob_script_mem.sp->write((uint8_t)fvar);
             fvar = 0;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "sa(", 3)) {
           fvar = -1;
           if (glob_script_mem.sp) {
             fvar = glob_script_mem.sp->available();
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "srb(", 3)) {
           fvar = -1;
@@ -3305,9 +3524,7 @@ chknext:
               fvar = glob_script_mem.sp->read();
             }
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "sp(", 3)) {
           fvar = -1;
@@ -3317,9 +3534,7 @@ chknext:
               fvar = glob_script_mem.sp->peek();
             }
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "sr(", 3)) {
           uint16_t size = glob_script_mem.max_ssize;
@@ -3396,33 +3611,25 @@ chknext:
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker1.attach_ms(fvar, Script_ticker1_end);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "ts2(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker2.attach_ms(fvar, Script_ticker2_end);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "ts3(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker3.attach_ms(fvar, Script_ticker3_end);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
         if (!strncmp(vname, "ts4(", 4)) {
           lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, gv);
           if (fvar<10) fvar = 10;
           Script_ticker4.attach_ms(fvar, Script_ticker4_end);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif // USE_SCRIPT_TIMER
 
@@ -3462,10 +3669,8 @@ chknext:
             }
             accu += ESP.getCycleCount()-cycles;
           }
-          lp++;
-          len = 0;
           fvar = accu / 1000;
-          goto exit;
+          goto nfuncexit;
         }
 #endif
 
@@ -3478,9 +3683,7 @@ chknext:
           lp = GetNumericArgument(lp, OPER_EQU, &fvar, gv);
           SCRIPT_SKIP_SPACES
           fvar = get_tpars(index - 1, fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif
         break;
@@ -3570,9 +3773,7 @@ chknext:
             default:
               fvar = 0;
           }
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif //ESP32, USE_WEBCAM
 #if defined(USE_TTGO_WATCH) && defined(USE_BMA423)
@@ -3589,9 +3790,7 @@ chknext:
         if (!strncmp(vname, "wtch(", 5)) {
           lp = GetNumericArgument(lp + 5, OPER_EQU, &fvar, gv);
           fvar = Touch_Status(fvar);
-          lp++;
-          len = 0;
-          goto exit;
+          goto nfuncexit;
         }
 #endif // USE_FT5206
         if (!strncmp(vname, "wm", 2)) {
@@ -3638,6 +3837,9 @@ notfound:
     glob_script_mem.var_not_found = 1;
     return lp;
     // return constant numbers
+nfuncexit:
+    lp++;
+    len = 0;
 exit:
     if (fp) *fp = fvar;
     *vtype = NUM_RES;
@@ -6770,6 +6972,7 @@ char buff[512];
     if (renderer && renderer->framebuffer) {
       uint8_t *bp = renderer->framebuffer;
       uint8_t *lbuf = (uint8_t*)special_malloc(Settings->display_width * 3 + 2);
+      memset(lbuf, 0, Settings->display_width * 3);
       if (!lbuf) return;
       uint8_t dmflg = 0;
       if (renderer->disp_bpp & 0x40) dmflg = 1;
@@ -6808,11 +7011,12 @@ char buff[512];
                   } else {
                     pixel = *bp & 0xf;
                   }
+                  pixel *= 15;
+                  *--lbp = pixel;
+                  *--lbp = pixel;
+                  *--lbp = pixel;
                 }
-                pixel *= 15;
-                *--lbp = pixel;
-                *--lbp = pixel;
-                *--lbp = pixel;
+
               } else {
                 for (uint32_t cnt = 0; cnt <= 1; cnt++) {
                   if (!(cnt & 1)) {
@@ -7941,18 +8145,20 @@ void script_task2(void *arg) {
     }
   }
 }
-uint32_t scripter_create_task(uint32_t num, uint32_t time, uint32_t core, uint32_t prio) {
+uint32_t scripter_create_task(uint32_t num, uint32_t time, uint32_t core, int32_t prio) {
   //return 0;
   BaseType_t res = 0;
   if (core > 1) { core = 1; }
-  if (num == 1) {
-    if (esp32_tasks[0].task_t) { vTaskDelete(esp32_tasks[0].task_t); }
-    res = xTaskCreatePinnedToCore(script_task1, "T1", STASK_STACK, NULL, prio, &esp32_tasks[0].task_t, core);
-    esp32_tasks[0].task_timer = time;
-  } else {
-    if (esp32_tasks[1].task_t) { vTaskDelete(esp32_tasks[1].task_t); }
-    res = xTaskCreatePinnedToCore(script_task2, "T2", STASK_STACK, NULL, prio, &esp32_tasks[1].task_t, core);
-    esp32_tasks[1].task_timer = time;
+  if (num < 1) { num = 1; }
+  if (num > 2) { num = 2; }
+  num--;
+  if (esp32_tasks[num].task_t) {
+    vTaskDelete(esp32_tasks[num].task_t);
+    esp32_tasks[num].task_t = 0;
+  }
+  if (prio >= 0) {
+    res = xTaskCreatePinnedToCore(script_task1, num==0?"T1":"T2", STASK_STACK, NULL, prio, &esp32_tasks[num].task_t, core);
+    esp32_tasks[num].task_timer = time;
   }
   return res;
 }
@@ -7977,7 +8183,7 @@ void script_task2(void *arg) {
   }
 }
 
-uint32_t scripter_create_task(uint32_t num, uint32_t time, uint32_t core, uint32_t prio) {
+uint32_t scripter_create_task(uint32_t num, uint32_t time, uint32_t core, int32_t prio) {
   //return 0;
   BaseType_t res = 0;
   if (core > 1) { core = 1; }
@@ -7997,6 +8203,42 @@ uint32_t scripter_create_task(uint32_t num, uint32_t time, uint32_t core, uint32
 #endif // USE_SCRIPT_TASK
 #endif // ESP32
 
+
+#ifdef USE_UFILESYS
+// read http content to file
+int32_t url2file(uint8_t fref, char *url) {
+  WiFiClient http_client;
+  HTTPClient http;
+  int32_t httpCode = 0;
+  char hbuff[128];
+  strcpy(hbuff, "http://");
+  strcat(hbuff, url);
+  http.begin(http_client, UrlEncode(hbuff));
+  httpCode = http.GET();
+  if (httpCode == HTTP_CODE_OK || httpCode == HTTP_CODE_MOVED_PERMANENTLY) {
+    WiFiClient *stream = http.getStreamPtr();
+    int32_t len = http.getSize();
+    if (len < 0) len = 99999999;
+    uint8_t buff[512];
+    while (http.connected() && (len > 0)) {
+      size_t size = stream->available();
+      if (size) {
+        if (size > sizeof(buff)) {
+          size = sizeof(buff);
+        }
+        uint32_t read = stream->readBytes(buff, size);
+        glob_script_mem.files[fref].write(buff, read);
+        len -= read;
+      }
+      delayMicroseconds(1);
+    }
+  }
+  http.end();
+  http_client.stop();
+  return httpCode;
+}
+#endif
+
 int32_t http_req(char *host, char *request) {
   WiFiClient http_client;
   HTTPClient http;
@@ -8613,6 +8855,10 @@ int32_t retval = 0;
     case 7:
       retval = Settings->timer[index].arm;
       break;
+    case 8:
+      retval = Settings->flag3.timers_enable;
+      break;
+
   }
   return retval;
 }
diff --git a/tasmota/xdrv_12_home_assistant.ino b/tasmota/xdrv_12_home_assistant.ino
index 2ece432c7..a686531f6 100644
--- a/tasmota/xdrv_12_home_assistant.ino
+++ b/tasmota/xdrv_12_home_assistant.ino
@@ -35,12 +35,12 @@ const char kHAssJsonSensorUnits[] PROGMEM =
   "ppm|ppm|ppb|R|G|B|" D_UNIT_KELVIN "| |";
 
 const char kHAssJsonSensorDevCla[] PROGMEM =
-  "dev_cla\":\"temperature|ic\":\"mdi:weather-rainy|dev_cla\":\"pressure|dev_cla\":\"pressure|"
-  "dev_cla\":\"power|dev_cla\":\"battery|ic\":\"mdi:alpha-a-circle-outline|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
+  "dev_cla\":\"temperature|dev_cla\":\"temperature|dev_cla\":\"pressure|dev_cla\":\"pressure|"
+  "dev_cla\":\"power|dev_cla\":\"battery|dev_cla\":\"current|ic\":\"mdi:leak|ic\":\"mdi:current-ac|dev_cla\":\"humidity|dev_cla\":\"illuminance|"
   "ic\":\"mdi:cup-water|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|ic\":\"mdi:flask|"
-  "ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:air-filter|ic\":\"mdi:alpha-f-circle-outline|dev_cla\":\"power|ic\":\"mdi:progress-clock|"
-  "dev_cla\":\"power|dev_cla\":\"power|dev_cla\":\"power|ic\":\"mdi:alpha-v-circle-outline|ic\":\"mdi:scale|dev_cla\":\"power|"
-  "ic\":\"mdi:molecule-co2|ic\":\"mdi:molecule-co2|ic\":\"mdi:air-filter|"
+  "dev_cla\":\"pm1|dev_cla\":\"pm25|dev_cla\":\"pm10|dev_cla\":\"power_factor|dev_cla\":\"power|ic\":\"mdi:progress-clock|"
+  "dev_cla\":\"power|dev_cla\":\"energy|dev_cla\":\"energy|dev_cla\":\"voltage|ic\":\"mdi:scale|dev_cla\":\"energy|"
+  "dev_cla\":\"carbon_dioxide|dev_cla\":\"carbon_dioxide|dev_class\":\"volatile_organic_compounds|"
   "ic\":\"mdi:palette|ic\":\"mdi:palette|ic\":\"mdi:palette|ic\":\"mdi:temperature-kelvin|ic\":\"mdi:ruler|dev_cla\":\"illuminance|";
 
 // List of sensors ready for discovery
diff --git a/tasmota/xdrv_13_display.ino b/tasmota/xdrv_13_display.ino
index 4b4a988cf..ffded1fde 100755
--- a/tasmota/xdrv_13_display.ino
+++ b/tasmota/xdrv_13_display.ino
@@ -96,6 +96,11 @@ void Get_display(uint8_t index) {
 }
 #endif // USE_MULTI_DISPLAY
 
+#ifndef TXT_MAX_SFAC
+#define TXT_MAX_SFAC 4
+#endif // TXT_MAX_SFAC
+
+
 const uint8_t DISPLAY_MAX_DRIVERS = 32;        // Max number of display drivers/models supported by xdsp_interface.ino
 const uint8_t DISPLAY_MAX_COLS = 64;           // Max number of columns allowed with command DisplayCols
 const uint8_t DISPLAY_MAX_ROWS = 64;           // Max number of lines allowed with command DisplayRows
@@ -875,9 +880,11 @@ void DisplayText(void)
             break;
           case 's':
             // size sx
-            if (renderer) renderer->setTextSize(*cp&7);
+            var = atoiv(cp, &temp);
+            if (temp > TXT_MAX_SFAC) temp = TXT_MAX_SFAC;
+            if (renderer) renderer->setTextSize(temp);
             //else DisplaySetSize(*cp&3);
-            cp += 1;
+            cp+=var;
             break;
           case 'f':
             // font sx
@@ -2011,7 +2018,7 @@ void CmndDisplayDimmer(void) {
 }
 
 void CmndDisplaySize(void) {
-  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 4)) {
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= TXT_MAX_SFAC)) {
     Settings->display_size = XdrvMailbox.payload;
     if (renderer) renderer->setTextSize(Settings->display_size);
     //else DisplaySetSize(Settings->display_size);
diff --git a/tasmota/xdrv_16_tuyamcu.ino b/tasmota/xdrv_16_tuyamcu.ino
index c00765f0e..250c28b21 100644
--- a/tasmota/xdrv_16_tuyamcu.ino
+++ b/tasmota/xdrv_16_tuyamcu.ino
@@ -663,7 +663,7 @@ void LightSerialDuty(uint16_t duty, char *hex_char, uint8_t TuyaIdx)
     if (duty > 0 && !Tuya.ignore_dim && TuyaSerial && dpid > 0) {
       if (TuyaIdx == 2 && CTLight) {
         duty = changeUIntScale(duty, Tuya.CTMin, Tuya.CTMax, Settings->dimmer_hw_max, 0);
-      } else { duty = changeUIntScale(duty, 0, 100, 0, Settings->dimmer_hw_max); }
+      } else { duty = changeUIntScale(duty, 0, 100, Settings->dimmer_hw_min, Settings->dimmer_hw_max); }
 
       if (duty < Settings->dimmer_hw_min) { duty = Settings->dimmer_hw_min; }  // dimming acts odd below 25(10%) - this mirrors the threshold set on the faceplate itself
         Tuya.ignore_dimmer_cmd_timeout = millis() + 250; // Ignore serial received dim commands for the next 250ms
@@ -679,7 +679,7 @@ void LightSerialDuty(uint16_t duty, char *hex_char, uint8_t TuyaIdx)
       if (TuyaIdx == 2 && CTLight) {
         duty = changeUIntScale(duty, Tuya.CTMin, Tuya.CTMax, Settings->dimmer_hw_max, 0);
       } else {
-        duty = changeUIntScale(duty, 0, 100, 0, Settings->dimmer_hw_max);
+        duty = changeUIntScale(duty, 0, 100, Settings->dimmer_hw_min, Settings->dimmer_hw_max);
       }
       AddLog(LOG_LEVEL_DEBUG, PSTR("TYA: Send dim skipped value %d for dpid %d"), duty, dpid);  // due to 0 or already set
     } else {
@@ -768,7 +768,7 @@ void TuyaProcessStatePacket(void) {
 
         if (fnId >= TUYA_MCU_FUNC_REL1 && fnId <= TUYA_MCU_FUNC_REL8) {
           AddLog(LOG_LEVEL_DEBUG, PSTR("TYA: RX Relay-%d --> MCU State: %s Current State:%s"), fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4]?"On":"Off",bitRead(TasmotaGlobal.power, fnId - TUYA_MCU_FUNC_REL1)?"On":"Off");
-          if ((TasmotaGlobal.power || Settings->light_dimmer > 0) && (Tuya.buffer[dpidStart + 4] != bitRead(TasmotaGlobal.power, fnId - TUYA_MCU_FUNC_REL1))) {
+          if (Tuya.buffer[dpidStart + 4] != bitRead(TasmotaGlobal.power, fnId - TUYA_MCU_FUNC_REL1)) {
             if (!Tuya.buffer[dpidStart + 4]) { PowerOff = true; }
             ExecuteCommandPower(fnId - TUYA_MCU_FUNC_REL1 + 1, Tuya.buffer[dpidStart + 4], SRC_SWITCH);  // send SRC_SWITCH? to use as flag to prevent loop from inbound states from faceplate interaction
           }
@@ -832,7 +832,7 @@ void TuyaProcessStatePacket(void) {
         if (dimIndex == 1 && !Settings->flag3.pwm_multi_channels) {
           Tuya.Levels[1] = changeUIntScale(packetValue, 0, Settings->dimmer_hw_max, Tuya.CTMax, Tuya.CTMin);
         } else {
-          Tuya.Levels[dimIndex] = changeUIntScale(packetValue, 0, Settings->dimmer_hw_max, 0, 100);
+          Tuya.Levels[dimIndex] = changeUIntScale(packetValue, Settings->dimmer_hw_min, Settings->dimmer_hw_max, 0, 100);
         }
 
         AddLog(LOG_LEVEL_DEBUG, PSTR("TYA: RX value %d from dpId %d "), packetValue, Tuya.buffer[dpidStart]);
@@ -842,7 +842,7 @@ void TuyaProcessStatePacket(void) {
             (fnId == TUYA_MCU_FUNC_CT) || (fnId == TUYA_MCU_FUNC_WHITE)) {
 
           if (Tuya.ignore_dimmer_cmd_timeout < millis()) {
-            if ((TasmotaGlobal.power || Settings->flag3.tuya_apply_o20) && ((Tuya.Levels[dimIndex] > 0) && (Tuya.Levels[dimIndex] != Tuya.Snapshot[dimIndex]))) { // SetOption54 - Apply SetOption20 settings to Tuya device
+            if ((TasmotaGlobal.power || Settings->flag3.tuya_apply_o20) && ((Tuya.Levels[dimIndex] > 0 || Settings->flag5.tuya_allow_dimmer_0) && (Tuya.Levels[dimIndex] != Tuya.Snapshot[dimIndex]))) { // SetOption54 - Apply SetOption20 settings to Tuya device / SetOption131 Allow save dimmer = 0 receved by MCU
               Tuya.ignore_dim = true;
               TasmotaGlobal.skip_light_fade = true;
 
diff --git a/tasmota/xdrv_23_zigbee_9_serial.ino b/tasmota/xdrv_23_zigbee_9_serial.ino
index 3eaea4048..2d054aebb 100644
--- a/tasmota/xdrv_23_zigbee_9_serial.ino
+++ b/tasmota/xdrv_23_zigbee_9_serial.ino
@@ -282,6 +282,17 @@ void ZigbeeInputLoop(void) {
 void ZigbeeInitSerial(void)
 {
   zigbee.active = false;
+
+  // always initialize reset pins for TCP serial server
+  if (PinUsed(GPIO_ZIGBEE_RST)) {
+    pinMode(Pin(GPIO_ZIGBEE_RST), OUTPUT);
+    digitalWrite(Pin(GPIO_ZIGBEE_RST), 1);
+  }
+  if (PinUsed(GPIO_ZIGBEE_RST, 1)) {
+    pinMode(Pin(GPIO_ZIGBEE_RST, 1), OUTPUT);
+    digitalWrite(Pin(GPIO_ZIGBEE_RST, 1), 1);
+  }
+
   if (PinUsed(GPIO_ZIGBEE_RX) && PinUsed(GPIO_ZIGBEE_TX)) {
 		AddLog(LOG_LEVEL_DEBUG_MORE, PSTR(D_LOG_ZIGBEE "GPIOs Rx:%d Tx:%d"), Pin(GPIO_ZIGBEE_RX), Pin(GPIO_ZIGBEE_TX));
     // if TasmotaGlobal.seriallog_level is 0, we allow GPIO 13/15 to switch to Hardware Serial
@@ -295,15 +306,6 @@ void ZigbeeInitSerial(void)
 			zigbee_buffer = new SBuffer(ZIGBEE_BUFFER_SIZE);
 		}
 
-    if (PinUsed(GPIO_ZIGBEE_RST)) {
-      pinMode(Pin(GPIO_ZIGBEE_RST), OUTPUT);
-      digitalWrite(Pin(GPIO_ZIGBEE_RST), 1);
-    }
-    if (PinUsed(GPIO_ZIGBEE_RST, 1)) {
-      pinMode(Pin(GPIO_ZIGBEE_RST, 1), OUTPUT);
-      digitalWrite(Pin(GPIO_ZIGBEE_RST, 1), 1);
-    }
-
     zigbee.active = true;
 		zigbee.init_phase = true;			// start the state machine
     zigbee.state_machine = true;      // start the state machine
diff --git a/tasmota/xdrv_35_pwm_dimmer.ino b/tasmota/xdrv_35_pwm_dimmer.ino
index 4b5101818..aad092643 100644
--- a/tasmota/xdrv_35_pwm_dimmer.ino
+++ b/tasmota/xdrv_35_pwm_dimmer.ino
@@ -63,11 +63,11 @@ struct remote_pwm_dimmer {
 uint32_t ignore_any_key_time = 0;
 uint32_t button_hold_time[3];
 uint8_t led_timeout_seconds = 0;
-uint8_t restore_powered_off_led_counter = 0;
 uint8_t power_button_index = 0;
 uint8_t down_button_index = 1;
 uint8_t buttons_pressed = 0;
 uint8_t local_fixed_color_index = 128;
+bool is_two_button;
 bool button_tapped = false;
 bool down_button_tapped = false;
 bool ignore_power_button = false;
@@ -111,16 +111,19 @@ void PWMModulePreInit(void)
   // The relay initializes to on. If the power is supposed to be off, turn the relay off.
 //  if (!TasmotaGlobal.power && PinUsed(GPIO_REL1)) digitalWrite(Pin(GPIO_REL1), bitRead(TasmotaGlobal.rel_inverted, 0) ? 1 : 0);
 
+  // Find out how many buttons we have.
+  uint8_t button_count = 0;
+  for (uint32_t button_index = 0; button_index < MAX_PWM_DIMMER_KEYS; button_index++) {
+    if (PinUsed(GPIO_KEY1, button_index)) button_count++;
+  }
+  if ((is_two_button = (button_count == 2))) down_button_index = 99;
+
 #ifdef USE_PWM_DIMMER_REMOTE
   // If remote device mode is enabled, set the device group count to the number of buttons
   // present.
   if (Settings->flag4.multiple_device_groups) {
     Settings->flag4.device_groups_enabled = true;
-
-    device_group_count = 0;
-    for (uint32_t button_index = 0; button_index < MAX_PWM_DIMMER_KEYS; button_index++) {
-      if (PinUsed(GPIO_KEY1, button_index)) device_group_count++;
-    }
+    device_group_count = button_count;
 
     // If no relay or PWM is defined, all buttons control remote devices.
     if (!PinUsed(GPIO_REL1) && !PinUsed(GPIO_PWM1)) {
@@ -267,6 +270,22 @@ void PWMDimmerHandleDevGroupItem(void)
 }
 #endif  // USE_DEVICE_GROUPS
 
+/*
+*      ---------------- Single -----------------  ------------------------- Hold -------------------------
+*      Off                       On               Off                       On
+*
+* 3 Button:
+*   1  Power on                  Power off        Power on at low preset    Alternately inc/dec brightness
+*   2  Power on at low preset    Dec brightness   NOP                       Dec brightness
+*   3  Power on at high preset   Inc brightness   NOP                       Inc brightness
+*
+* 2 Button:
+*   1  NOP                       Power off        Power on at low preset    Dec brightness
+*   2  Power on                  Inc brightness   Power on at high preset   Inc brightness
+*
+* 1 Button:
+*   1  Power on                  Power off        Power on at low preset    Alternately inc/dec brightness
+*/
 void PWMDimmerHandleButton(uint32_t button_index, bool pressed)
 {
   bool handle_tap = false;
@@ -287,7 +306,7 @@ void PWMDimmerHandleButton(uint32_t button_index, bool pressed)
 #else // USE_PWM_DIMMER_REMOTE
   bool power_is_on = TasmotaGlobal.power;
   bool is_power_button = !button_index;
-  bool is_down_button = (button_index == (power_button_index ? 0 : 1));
+  bool is_down_button = (is_two_button ? false : button_index == (power_button_index ? 0 : 1));
 #endif  // USE_PWM_DIMMER_REMOTE
 
   // If the button is being held, ...
@@ -314,12 +333,17 @@ void PWMDimmerHandleButton(uint32_t button_index, bool pressed)
         // direction for the device and then invert the direction when the power button is released.
         // The new brightness will be calculated below.
         if (power_is_on) {
+          if (is_two_button && !Settings->flag4.multiple_device_groups) {
+            bri_hold = -1;
+          }
+          else {
 #ifdef USE_PWM_DIMMER_REMOTE
-          bri_hold = (active_remote_pwm_dimmer ? (active_remote_pwm_dimmer->power_button_increases_bri ? 1 : -1) : (power_button_increases_bri ? 1 : -1));
+            bri_hold = (active_remote_pwm_dimmer ? (active_remote_pwm_dimmer->power_button_increases_bri ? 1 : -1) : (power_button_increases_bri ? 1 : -1));
 #else // USE_PWM_DIMMER_REMOTE
-          bri_hold = (power_button_increases_bri ? 1 : -1);
+            bri_hold = (power_button_increases_bri ? 1 : -1);
 #endif  // USE_PWM_DIMMER_REMOTE
-          invert_power_button_bri_direction = true;
+            invert_power_button_bri_direction = true;
+          }
         }
 
         // If the power is not on, turn it on using an initial brightness of bri_preset_low and set
@@ -365,8 +389,21 @@ void PWMDimmerHandleButton(uint32_t button_index, bool pressed)
 
       // Otherwise, if the power is on, adjust the brightness. Set the direction based on which
       // button is pressed. The new brightness will be calculated below.
-      else if (power_is_on && !button_tapped) {
-        bri_hold = (is_down_button ? -1 : 1);
+      if (!button_tapped) {
+        if (power_is_on) {
+          bri_hold = (is_down_button ? -1 : 1);
+        }
+
+        // If the power is off and this ia a two button switch, turn the power
+        // on using a temporary brightness of bri_preset_high.
+        else {
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (active_remote_pwm_dimmer)
+            power_on_bri = active_remote_pwm_dimmer->bri = active_remote_pwm_dimmer->bri_preset_high;
+          else
+#endif  // USE_PWM_DIMMER_REMOTE
+            power_on_bri = Settings->bri_preset_high;
+        }
       }
     }
   }
@@ -433,7 +470,8 @@ void PWMDimmerHandleButton(uint32_t button_index, bool pressed)
           power_on_bri = active_remote_pwm_dimmer->bri_power_on;
         else
 #endif  // USE_PWM_DIMMER_REMOTE
-          power_on_bri = Settings->bri_power_on;
+          if (!is_two_button || Settings->flag4.multiple_device_groups || power_is_on)
+            power_on_bri = Settings->bri_power_on;
       }
     }
 
@@ -479,8 +517,20 @@ void PWMDimmerHandleButton(uint32_t button_index, bool pressed)
           }
         }
 
-        // If the power is off, turn it on using a temporary brightness of bri_preset_low if the
-        // down button is pressed or bri_preset_low if the up button is pressed.
+        // If the power is off and this is a two button switch, turn the power
+        // on.
+        else if (is_two_button) {
+#ifdef USE_PWM_DIMMER_REMOTE
+          if (active_remote_pwm_dimmer)
+            power_on_bri = active_remote_pwm_dimmer->bri_power_on;
+          else
+#endif  // USE_PWM_DIMMER_REMOTE
+            power_on_bri = Settings->bri_power_on;
+        }
+
+        // If the power is off and this is not a two button switch, turn the
+        // power on using a temporary brightness of bri_preset_low if the down
+        // button is pressed or bri_preset_high if the up button is pressed.
         else {
 #ifdef USE_PWM_DIMMER_REMOTE
           if (active_remote_pwm_dimmer)
@@ -564,12 +614,9 @@ void PWMDimmerHandleButton(uint32_t button_index, bool pressed)
       new_power = active_remote_pwm_dimmer->power_on;
       PWMDimmerSetBrightnessLeds(new_power ? -power_on_bri : 0);
     }
-    else {
+    else
 #endif  // USE_PWM_DIMMER_REMOTE
       new_power = TasmotaGlobal.power ^ 1;
-#ifdef USE_PWM_DIMMER_REMOTE
-    }
-#endif  // USE_PWM_DIMMER_REMOTE
     if (new_power)
       SendDeviceGroupMessage(negated_device_group_index, DGR_MSGTYP_UPDATE, DGR_ITEM_LIGHT_BRI, power_on_bri, DGR_ITEM_POWER, new_power);
     else
@@ -744,16 +791,10 @@ bool Xdrv35(uint8_t function)
         PWMDimmerSetBrightnessLeds(-2);
       }
 
-      // The powered-off LED is also the LedLink LED. If we lose the WiFi or MQTT server connection,
-      // the LED will be set to a blinking state and will be turned off when the connection is
-      // restored. If the state is blinking now, set a flag so we know that we need to restore it
-      // when it stops blinking.
-      if (TasmotaGlobal.global_state.data)
-        restore_powered_off_led_counter = 5;
-      else if (restore_powered_off_led_counter) {
-        PWMDimmerSetPoweredOffLed();
-        restore_powered_off_led_counter--;
-      }
+      // The powered-off LED is also the LedLink LED. If the state of it gets changed,
+      // restore_powered_off_led_counter will get set to the number of seconds
+      // to wait before restoring it to the proper state.
+      if (TasmotaGlobal.restore_powered_off_led_counter && !--TasmotaGlobal.restore_powered_off_led_counter) PWMDimmerSetPoweredOffLed();
       break;
 
     case FUNC_BUTTON_PRESSED:
@@ -784,7 +825,7 @@ bool Xdrv35(uint8_t function)
             // Bottom      15          3    15     1
             if (!buttons_pressed && Settings->flag4.multiple_device_groups) {
               power_button_index = button_index;
-              down_button_index = (Pin(GPIO_KEY1, power_button_index) == 15 ? TasmotaGlobal.gpio_pin[1] : TasmotaGlobal.gpio_pin[15]) - 32;
+              down_button_index = (is_two_button ? 99 : Pin(GPIO_KEY1, power_button_index) == 15 ? TasmotaGlobal.gpio_pin[1] : TasmotaGlobal.gpio_pin[15]) - 32;
               active_remote_pwm_dimmer = nullptr;
               if (power_button_index || !first_device_group_is_local)
                 active_remote_pwm_dimmer = &remote_pwm_dimmers[power_button_index];
diff --git a/tasmota/xdrv_39_thermostat.ino b/tasmota/xdrv_39_thermostat.ino
index 60a8c7b10..414cb358b 100644
--- a/tasmota/xdrv_39_thermostat.ino
+++ b/tasmota/xdrv_39_thermostat.ino
@@ -1400,6 +1400,12 @@ void CmndThermostatModeSet(void)
         Thermostat[ctr_output].status.thermostat_mode = value;
         Thermostat[ctr_output].timestamp_input_on = 0;     // Reset last manual switch timer if command set externally
       }
+      if ((value == THERMOSTAT_OFF) && (Thermostat[ctr_output].status.enable_output == IFACE_ON)) {
+        // Make sure the relay is switched to off once if the thermostat is being disabled,
+        // or it will get stuck on (danger!)
+        Thermostat[ctr_output].status.command_output = IFACE_OFF;
+        ThermostatOutputRelay(ctr_output, Thermostat[ctr_output].status.command_output);
+      }
     }
     ResponseCmndIdxNumber((int)Thermostat[ctr_output].status.thermostat_mode);
   }
@@ -2022,8 +2028,17 @@ const char HTTP_THERMOSTAT_HL[]          PROGMEM = "{s}<hr>{m}<hr>{e}";
 
 #endif  // USE_WEBSERVER
 
-void ThermostatShow(uint8_t ctr_output)
+void ThermostatShow(uint8_t ctr_output, bool json)
 {
+  if (json) {
+    float f_target_temp = Thermostat[ctr_output].temp_target_level / 10.0f;
+    ResponseAppend_P(PSTR(",\"Thermostat%i\":{"), ctr_output);
+    ResponseAppend_P(PSTR("%s\"%s\":%i"), "", D_CMND_THERMOSTATMODESET, Thermostat[ctr_output].status.thermostat_mode);
+    ResponseAppend_P(PSTR("%s\"%s\":%2_f"), ",", D_CMND_TEMPTARGETSET, &f_target_temp);
+    ResponseAppend_P(PSTR("%s\"%s\":%i"), ",", D_CMND_CTRDUTYCYCLEREAD, ThermostatGetDutyCycle(ctr_output));
+    ResponseJsonEnd();
+    return;
+  }
 #ifdef USE_WEBSERVER
 
   WSContentSend_P(HTTP_THERMOSTAT_HL);
@@ -2110,11 +2125,16 @@ bool Xdrv39(uint8_t function)
         }
       }
       break;
+    case FUNC_JSON_APPEND:
+      for (ctr_output = 0; ctr_output < THERMOSTAT_CONTROLLER_OUTPUTS; ctr_output++) {
+        ThermostatShow(ctr_output, true);
+      }
+      break;
 
 #ifdef USE_WEBSERVER
     case FUNC_WEB_SENSOR:
       for (ctr_output = 0; ctr_output < THERMOSTAT_CONTROLLER_OUTPUTS; ctr_output++) {
-        ThermostatShow(ctr_output);
+        ThermostatShow(ctr_output, false);
       }
       break;
 #endif  // USE_WEBSERVER
diff --git a/tasmota/xdrv_40_telegram.ino b/tasmota/xdrv_40_telegram.ino
index f50d14a88..aebb2579a 100644
--- a/tasmota/xdrv_40_telegram.ino
+++ b/tasmota/xdrv_40_telegram.ino
@@ -47,13 +47,8 @@
 #define TELEGRAM_SEND_RETRY        4    // Retries
 #define TELEGRAM_MAX_MESSAGES      2
 
-#ifdef USE_MQTT_TLS_CA_CERT
-  static const uint32_t tls_rx_size = 2048;   // since Telegram CA is bigger than 1024 bytes, we need to increase rx buffer
-  static const uint32_t tls_tx_size = 1024;
-#else
-  static const uint32_t tls_rx_size = 1024;
-  static const uint32_t tls_tx_size = 1024;
-#endif
+static const uint32_t tls_rx_size = 2048;   // since Telegram CA is bigger than 1024 bytes, we need to increase rx buffer
+static const uint32_t tls_tx_size = 1024;
 
 #include "WiFiClientSecureLightBearSSL.h"
 BearSSL::WiFiClientSecure_light *telegramClient = nullptr;
@@ -87,11 +82,13 @@ bool TelegramInit(void) {
   if (strlen(SettingsText(SET_TELEGRAM_TOKEN))) {
     if (!telegramClient) {
       telegramClient = new BearSSL::WiFiClientSecure_light(tls_rx_size, tls_tx_size);
-#ifdef USE_MQTT_TLS_CA_CERT
-      telegramClient->setTrustAnchor(&GoDaddyCAG2_TA, 1);
-#else
-      telegramClient->setPubKeyFingerprint(Telegram_Fingerprint, Telegram_Fingerprint, false); // check server fingerprint
-#endif
+
+      if (Settings->flag5.tls_use_fingerprint) {
+        telegramClient->setPubKeyFingerprint(Telegram_Fingerprint, Telegram_Fingerprint, false); // check server fingerprint
+      } else {
+        telegramClient->setTrustAnchor(&GoDaddyCAG2_TA, 1);
+      }
+
       Telegram.message_count = 0;     // Number of received messages
       Telegram.next_update_id = 0;    // Code of last read Message
       Telegram.message[0].text = "";
diff --git a/tasmota/xdrv_44_miel_hvac.ino b/tasmota/xdrv_44_miel_hvac.ino
index dd7461d8c..66e034fec 100644
--- a/tasmota/xdrv_44_miel_hvac.ino
+++ b/tasmota/xdrv_44_miel_hvac.ino
@@ -42,6 +42,8 @@
 #include <TasmotaSerial.h>
 
 /* from hvac */
+bool temp_type = false; 
+
 struct miel_hvac_header {
 	uint8_t			start;
 #define MIEL_HVAC_H_START		0xfc
@@ -68,11 +70,14 @@ struct miel_hvac_data_settings {
 	uint8_t			widevane;
 #define MIEL_HVAC_SETTTINGS_WIDEVANE_MASK \
 					0x0f
+	uint8_t			temp05;
 };
 
 struct miel_hvac_data_roomtemp {
 	uint8_t			_pad1[2];
 	uint8_t			temp;
+	uint8_t			_pad2[2];
+	uint8_t			temp05;
 };
 
 struct miel_hvac_data_status {
@@ -109,8 +114,10 @@ CTASSERT(offsetof(struct miel_hvac_data, data.settings.temp) == 5);
 CTASSERT(offsetof(struct miel_hvac_data, data.settings.fan) == 6);
 CTASSERT(offsetof(struct miel_hvac_data, data.settings.vane) == 7);
 CTASSERT(offsetof(struct miel_hvac_data, data.settings.widevane) == 10);
+CTASSERT(offsetof(struct miel_hvac_data, data.settings.temp05) == 11);
 
 CTASSERT(offsetof(struct miel_hvac_data, data.roomtemp.temp) == 3);
+CTASSERT(offsetof(struct miel_hvac_data, data.roomtemp.temp05) == 6);
 
 /* to hvac */
 
@@ -180,7 +187,8 @@ struct miel_hvac_msg_update {
 #define MIEL_HVAC_UPDATE_WIDEVANE_LR	0x08
 #define MIEL_HVAC_UPDATE_WIDEVANE_SWING	0x0c
 #define MIEL_HVAC_UPDATE_WIDEVANE_ADJ	0x80
-	uint8_t			_pad2[2];
+	uint8_t			temp05;
+	uint8_t			_pad2[1];
 } __packed;
 
 CTASSERT(sizeof(struct miel_hvac_msg_update) == 16);
@@ -192,23 +200,42 @@ CTASSERT(offsetof(struct miel_hvac_msg_update, temp) == MIEL_HVAC_OFFS(10));
 CTASSERT(offsetof(struct miel_hvac_msg_update, fan) == MIEL_HVAC_OFFS(11));
 CTASSERT(offsetof(struct miel_hvac_msg_update, vane) == MIEL_HVAC_OFFS(12));
 CTASSERT(offsetof(struct miel_hvac_msg_update, widevane) == MIEL_HVAC_OFFS(18));
+CTASSERT(offsetof(struct miel_hvac_msg_update, temp05) == MIEL_HVAC_OFFS(19));
 
 static inline uint8_t
-miel_hvac_deg2temp(uint8_t deg)
+miel_hvac_deg2temp(float deg)
 {
-	return (31 - deg);
+	if (!temp_type) {
+		return (31 - deg);
+	}
+	else {
+		deg = 2*deg + 128;
+		return ((uint8_t) deg);
+	}
 }
 
-static inline uint8_t
+static inline float
 miel_hvac_temp2deg(uint8_t temp)
 {
-	return (31 - temp);
+	if (!temp_type) {
+		return (31 - temp);
+	}
+	else {
+		temp -= 128;
+		return ((float) temp/2);
+	}
 }
 
-static inline unsigned int
+static inline float
 miel_hvac_roomtemp2deg(uint8_t roomtemp)
 {
-	return ((unsigned int)roomtemp + 10);
+	if (!temp_type) {
+		return ((unsigned int)roomtemp + 10);
+	}
+	else {
+		roomtemp -= 128;
+		return ((float) roomtemp/2);
+	}
 }
 
 struct miel_hvac_msg_remotetemp {
@@ -682,20 +709,27 @@ miel_hvac_cmnd_settemp(void)
 {
 	struct miel_hvac_softc *sc = miel_hvac_sc;
 	struct miel_hvac_msg_update *update = &sc->sc_update;
-	unsigned long degc;
+	float degc;
 
 	if (XdrvMailbox.data_len == 0)
 		return;
-
-	degc = strtoul(XdrvMailbox.data, nullptr, 0);
+	
+	degc = strtof(XdrvMailbox.data, nullptr);
 	if (degc < MIEL_HVAC_UPDATE_TEMP_MIN ||
 	    degc > MIEL_HVAC_UPDATE_TEMP_MAX) {
 		miel_hvac_respond_unsupported();
 		return;
 	}
-
 	update->flags |= htons(MIEL_HVAC_UPDATE_F_TEMP);
-	update->temp = miel_hvac_deg2temp(degc);
+	if (!temp_type) {
+		update->temp = miel_hvac_deg2temp(degc);
+		update->temp05 = 0;
+	}
+
+	else {
+		update->temp = 0;
+		update->temp05 = miel_hvac_deg2temp(degc);
+	}
 
 	ResponseCmndNumber(degc);
 }
@@ -871,9 +905,15 @@ miel_hvac_publish_settings(struct miel_hvac_softc *sc)
 		ResponseAppend_P(PSTR(",\"HA" D_JSON_IRHVAC_MODE "\":\"%s\""),
 		    set->power ? name : "off");
 	}
-
-	dtostrfd(ConvertTemp(miel_hvac_temp2deg(set->temp)),
-	    Settings->flag2.temperature_resolution, temp);
+	if (set->temp05 == 0) {
+		dtostrfd(ConvertTemp(miel_hvac_temp2deg(set->temp)),
+	    		Settings->flag2.temperature_resolution, temp);
+	}
+	else {
+		temp_type = true;
+		dtostrfd(ConvertTemp(miel_hvac_temp2deg(set->temp05)),
+	    		Settings->flag2.temperature_resolution, temp);
+	}
 	ResponseAppend_P(PSTR(",\"" D_JSON_IRHVAC_TEMP "\":%s"), temp);
 
 	name = miel_hvac_map_byval(set->fan,
@@ -1074,11 +1114,18 @@ miel_hvac_sensor(struct miel_hvac_softc *sc)
 	if (sc->sc_temp.type != 0) {
 		const struct miel_hvac_data_roomtemp *rt =
 		    &sc->sc_temp.data.roomtemp;
-		unsigned int temp = miel_hvac_roomtemp2deg(rt->temp);
 		char room_temp[33];
-
-		dtostrfd(ConvertTemp(temp),
-		    Settings->flag2.temperature_resolution, room_temp);
+		if(rt->temp05 == 0) {
+			unsigned int temp = miel_hvac_roomtemp2deg(rt->temp);
+			dtostrfd(ConvertTemp(temp),
+		    	    Settings->flag2.temperature_resolution, room_temp);
+			}
+		else {
+			temp_type = true;
+			float temp = miel_hvac_roomtemp2deg(rt->temp05);
+			dtostrfd(ConvertTemp(temp),
+		    	    Settings->flag2.temperature_resolution, room_temp);
+		}
 		ResponseAppend_P(PSTR("\"" D_JSON_TEMPERATURE "\":%s"),
 		    room_temp);
 
diff --git a/tasmota/xdrv_52_0_berry_struct.ino b/tasmota/xdrv_52_0_berry_struct.ino
index 61ff080c5..fe09b3c84 100644
--- a/tasmota/xdrv_52_0_berry_struct.ino
+++ b/tasmota/xdrv_52_0_berry_struct.ino
@@ -25,32 +25,63 @@
 
 #include "re1.5.h"
 
+/*********************************************************************************************\
+ * Logging for Tasmota Berry console
+ *
+ * We need to declare the the log class first since it is used in structure
+\*********************************************************************************************/
 #define BERRY_CONSOLE_CMD_DELIMITER   "\x01"
 
-typedef LList_elt<char[0]> log_elt;   // store the string after the header to avoid double allocation if we had used char*
+class Log_line {
+public:
+  Log_line() : log_line(nullptr) {}
+  ~Log_line() {
+    if (log_line != nullptr) {
+      berry_free(log_line);
+    }
+  }
+  char * getBuffer() { return log_line; }
+  char * allocate(size_t size) {
+    if (log_line != nullptr) {
+      berry_free(log_line);
+    }
+    log_line = (char*) berry_malloc(size);
+    return log_line;
+  }
+
+  char * log_line;
+};
+
+// typedef LList_elt<Log_line> log_elt;   // store the string after the header to avoid double allocation if we had used char*
+
 
 class BerryLog {
 public:
-  // typedef LList_elt<char[0]> log_elt;   // store the string after the header to avoid double allocation if we had used char*
-  inline static size_t size(size_t chars) { return sizeof(log_elt) + chars; }
   inline bool isEmpty(void) const { return log.isEmpty(); }
-  log_elt * addString(const char * s, const char * prefix = nullptr, const char * suffix = nullptr) {
+  LList_elt<Log_line> * addString(const char * s, const char * prefix = nullptr, const char * suffix = nullptr) {
     if (suffix == nullptr) { suffix = ""; }
     if (prefix == nullptr) { prefix = ""; }
     if (s == nullptr) { s = ""; }
     size_t s_len = strlen_P(s) + strlen_P(prefix) + strlen_P(suffix);
     if (0 == s_len) { return nullptr; }   // do nothing
-    log_elt * elt = (log_elt*) ::operator new(sizeof(log_elt) + s_len + 1); // use low-level new to specify the bytes size
-    snprintf_P((char*) &elt->val(), s_len+1, PSTR("%s%s%s"), prefix, s, suffix);
-    log.addToLast(elt);
-    return elt;
+    LList_elt<Log_line> * log_elt = new LList_elt<Log_line>();
+    log_elt->val().allocate(s_len + 1);
+    snprintf_P(log_elt->val().getBuffer(), s_len+1, PSTR("%s%s%s"), prefix, s, suffix);
+    log.addToLast(log_elt);
+    return log_elt;
   }
   void reset(void) {
     log.reset();
   }
-  LList<char[0]> log;
+  LList<Log_line> log;
 };
 
+/*********************************************************************************************\
+ * Berry global structure
+ *
+\*********************************************************************************************/
+class BerryLog;
+
 class BerrySupport {
 public:
   bvm *vm = nullptr;                    // berry vm
@@ -64,5 +95,4 @@ public:
 };
 BerrySupport berry;
 
-
 #endif  // USE_BERRY
diff --git a/tasmota/xdrv_52_2_berry_native.ino b/tasmota/xdrv_52_1_berry_native.ino
similarity index 93%
rename from tasmota/xdrv_52_2_berry_native.ino
rename to tasmota/xdrv_52_1_berry_native.ino
index e8acc8039..970d26c48 100644
--- a/tasmota/xdrv_52_2_berry_native.ino
+++ b/tasmota/xdrv_52_1_berry_native.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_52_3_berry_native.ino - Berry scripting language, native fucnctions
+  xdrv_52_1_berry_native.ino - Berry scripting language, native fucnctions
 
   Copyright (C) 2021 Stephan Hadinger, Berry language by Guan Wenliang https://github.com/Skiars/berry
 
@@ -45,6 +45,11 @@ extern "C" {
  * Responds to virtual constants
 \*********************************************************************************************/
 extern "C" {
+  // Clear all elements on the stack
+  void be_pop_all(bvm *vm) {
+    be_pop(vm, be_top(vm));       // clear Berry stack
+  }
+
   #include "be_exec.h"
   #include "be_debug.h"
   void be_dumpstack(bvm *vm) {
@@ -259,12 +264,27 @@ extern "C" {
 /*********************************************************************************************\
  * Generalized callbacks
  * 
+ * Warning, the following expect all parameters to be 32 bits wide
 \*********************************************************************************************/
+
 extern "C" {
   
+  /*********************************************************************************************\
+   * Callback structures
+   * 
+   * We allow 4 parameters, or 3 if method (first arg is `self`)
+   * This could be extended if needed
+  \*********************************************************************************************/
   typedef int32_t (*berry_callback_t)(int32_t v0, int32_t v1, int32_t v2, int32_t v3);
+
   extern void BerryDumpErrorAndClear(bvm *vm, bool berry_console);
 
+  /*********************************************************************************************\
+   * Callback structures
+   * 
+   * We allow 4 parameters, or 3 if method (first arg is `self`)
+   * This could be extended if needed
+  \*********************************************************************************************/
   int32_t call_berry_cb(int32_t num, int32_t v0, int32_t v1, int32_t v2, int32_t v3) {
     // call berry cb dispatcher
     int32_t ret = 0;
@@ -285,6 +305,7 @@ extern "C" {
         ret = be_pcall(berry.vm, 6);   // 5 arguments
         if (ret != 0) {
           BerryDumpErrorAndClear(berry.vm, false);  // log in Tasmota console only
+          be_pop_all(berry.vm);             // clear Berry stack
           return 0;
         }
         be_pop(berry.vm, 6);
@@ -353,10 +374,6 @@ extern "C" {
   };
 }
 
-
-#define LV_OBJ_CLASS    "lv_obj"
-#define LV_MODULE       "lvgl"    // name of the lvgl module
-
 /*********************************************************************************************\
  * Automatically parse Berry stack and call the C function accordingly
  * 
@@ -424,7 +441,7 @@ int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = null
       const void * func = be_tocomptr(vm, -6);
       be_pop(vm, 6);
 
-      // berry_log_P("func=%p", func);
+      // berry_log_C("func=%p", func);
       return (int32_t) func;
     } else {
       be_raise(vm, kTypeError, "Closure expected for callback type");
@@ -445,7 +462,7 @@ int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = null
     type_ok = type_ok || (ret == 0 && arg_type_len != 1);    // or NULL is accepted for an instance
     
     if (!type_ok) {
-      berry_log_P("Unexpected argument type '%c', expected '%s'", provided_type, arg_type);
+      berry_log_C("Unexpected argument type '%c', expected '%s'", provided_type, arg_type);
     }
     return ret;
   }
@@ -475,14 +492,14 @@ int32_t be_convert_single_elt(bvm *vm, int32_t idx, const char * arg_type = null
         // Stack: class_of_idx, class_of_target (or nil)
         if (class_found) {
           if (!be_isderived(vm, -2)) {
-            berry_log_P("Unexpected class type '%s', expected '%s'", be_classname(vm, idx), arg_type);
+            berry_log_C("Unexpected class type '%s', expected '%s'", be_classname(vm, idx), arg_type);
           }
         } else {
-          berry_log_P("Unable to find class '%s' (%d)", arg_type, arg_type_len);
+          berry_log_C("Unable to find class '%s' (%d)", arg_type, arg_type_len);
         }
         be_pop(vm, 2);
       } else if (arg_type[0] != '.') {
-        berry_log_P("Unexpected instance type '%s', expected '%s'", be_classname(vm, idx), arg_type);
+        berry_log_C("Unexpected instance type '%s', expected '%s'", be_classname(vm, idx), arg_type);
       }
 
       return ret;
diff --git a/tasmota/xdrv_52_3_berry_display.ino b/tasmota/xdrv_52_3_berry_display.ino
index ed930301d..7dc52031d 100644
--- a/tasmota/xdrv_52_3_berry_display.ino
+++ b/tasmota/xdrv_52_3_berry_display.ino
@@ -36,8 +36,8 @@ Renderer *Init_uDisplay(const char *desc);
 \*********************************************************************************************/
 extern "C" {
 
-  int be_disp_start(bvm *vm);
-  int be_disp_start(bvm *vm) {
+  int be_ntv_display_start(bvm *vm);
+  int be_ntv_display_start(bvm *vm) {
 #ifdef USE_UNIVERSAL_DISPLAY
     int32_t argc = be_top(vm); // Get the number of arguments
     if (argc >= 1 && be_isstring(vm, 1)) {
diff --git a/tasmota/xdrv_52_3_berry_leds.ino b/tasmota/xdrv_52_3_berry_leds.ino
index 5e7d95b77..1801f1260 100644
--- a/tasmota/xdrv_52_3_berry_leds.ino
+++ b/tasmota/xdrv_52_3_berry_leds.ino
@@ -28,16 +28,12 @@
 
 enum {
   ws2812_grb = 1,
-  ws2812_grbw = 2,
-  sk6812_grb = 3,
-  sk6812_grbw = 4,
+  sk6812_grbw = 2,
 
   neopixel_type_end
 };
 
 typedef NeoPixelBus<NeoGrbFeature, NeoEsp32RmtN800KbpsMethod> neopixel_ws2812_grb_t;
-typedef NeoPixelBus<NeoGrbwFeature, NeoEsp32RmtN800KbpsMethod> neopixel_ws2812_grbw_t;
-typedef NeoPixelBus<NeoGrbFeature, NeoEsp32RmtNSk6812Method> neopixel_sk6812_grb_t;
 typedef NeoPixelBus<NeoGrbwFeature, NeoEsp32RmtNSk6812Method> neopixel_sk6812_grbw_t;
 
 
@@ -124,10 +120,6 @@ extern "C" {
         switch (neopixel_type) {
           case ws2812_grb:    strip = new neopixel_ws2812_grb_t(leds, gpio, (NeoBusChannel) rmt);
             break;
-          case ws2812_grbw:   strip = new neopixel_ws2812_grbw_t(leds, gpio, (NeoBusChannel) rmt);
-            break;
-          case sk6812_grb:    strip = new neopixel_sk6812_grb_t(leds, gpio, (NeoBusChannel) rmt);
-           break;
           case sk6812_grbw:   strip = new neopixel_sk6812_grbw_t(leds, gpio, (NeoBusChannel) rmt);
            break;
         }
@@ -141,8 +133,6 @@ extern "C" {
         const void * s = be_get_neopixelbus(vm);    // raises an exception if pointer is invalid
         // initialize all possible variants
         neopixel_ws2812_grb_t * s_ws2812_grb = (leds_type == ws2812_grb) ? (neopixel_ws2812_grb_t*) s : nullptr;
-        neopixel_ws2812_grbw_t * s_ws2812_grbw = (leds_type == ws2812_grbw) ? (neopixel_ws2812_grbw_t*) s : nullptr;
-        neopixel_sk6812_grb_t * s_sk6812_grb = (leds_type == sk6812_grb) ? (neopixel_sk6812_grb_t*) s : nullptr;
         neopixel_sk6812_grbw_t * s_sk6812_grbw = (leds_type == sk6812_grbw) ? (neopixel_sk6812_grbw_t*) s : nullptr;
 
         be_pushnil(vm);     // push a default `nil` return value
@@ -150,46 +140,32 @@ extern "C" {
         switch (cmd) {
           case 1: // # 01 : begin        void -> void
             if (s_ws2812_grb)       s_ws2812_grb->Begin();
-            if (s_ws2812_grbw)      s_ws2812_grbw->Begin();
-            if (s_sk6812_grb)       s_sk6812_grb->Begin();
             if (s_sk6812_grbw)      s_sk6812_grbw->Begin();
             break;
           case 2: // # 02 : show         void -> void
             if (s_ws2812_grb)       s_ws2812_grb->Show();
-            if (s_ws2812_grbw)      s_ws2812_grbw->Show();
-            if (s_sk6812_grb)       s_sk6812_grb->Show();
             if (s_sk6812_grbw)      s_sk6812_grbw->Show();
             break;
           case 3: // # 03 : CanShow      void -> bool
             if (s_ws2812_grb)       be_pushbool(vm, s_ws2812_grb->CanShow());
-            if (s_ws2812_grbw)      be_pushbool(vm, s_ws2812_grbw->CanShow());
-            if (s_sk6812_grb)       be_pushbool(vm, s_sk6812_grb->CanShow());
             if (s_sk6812_grbw)      be_pushbool(vm, s_sk6812_grbw->CanShow());
             break;
           case 4: // # 04 : IsDirty      void -> bool
             if (s_ws2812_grb)       be_pushbool(vm, s_ws2812_grb->IsDirty());
-            if (s_ws2812_grbw)      be_pushbool(vm, s_ws2812_grbw->IsDirty());
-            if (s_sk6812_grb)       be_pushbool(vm, s_sk6812_grb->IsDirty());
             if (s_sk6812_grbw)      be_pushbool(vm, s_sk6812_grbw->IsDirty());
             break;
           case 5: // # 05 : Dirty        void -> void
             if (s_ws2812_grb)       s_ws2812_grb->Dirty();
-            if (s_ws2812_grbw)      s_ws2812_grbw->Dirty();
-            if (s_sk6812_grb)       s_sk6812_grb->Dirty();
             if (s_sk6812_grbw)      s_sk6812_grbw->Dirty();
             break;
           case 6: // # 06 : Pixels       void -> bytes() (mapped to the buffer)
             {
             size_t pixels_bytes;
             if (s_ws2812_grb)       pixels_bytes = s_ws2812_grb->PixelsSize();
-            if (s_ws2812_grbw)      pixels_bytes = s_ws2812_grbw->PixelsSize();
-            if (s_sk6812_grb)       pixels_bytes = s_sk6812_grb->PixelsSize();
             if (s_sk6812_grbw)      pixels_bytes = s_sk6812_grbw->PixelsSize();
 
             uint8_t * pixels;
             if (s_ws2812_grb)       pixels = s_ws2812_grb->Pixels();
-            if (s_ws2812_grbw)      pixels = s_ws2812_grbw->Pixels();
-            if (s_sk6812_grb)       pixels = s_sk6812_grb->Pixels();
             if (s_sk6812_grbw)      pixels = s_sk6812_grbw->Pixels();
             
             be_getbuiltin(vm, "bytes");
@@ -201,14 +177,10 @@ extern "C" {
             break;
           case 7: // # 07 : PixelSize    void -> int
             if (s_ws2812_grb)       be_pushint(vm, s_ws2812_grb->PixelSize());
-            if (s_ws2812_grbw)      be_pushint(vm, s_ws2812_grbw->PixelSize());
-            if (s_sk6812_grb)       be_pushint(vm, s_sk6812_grb->PixelSize());
             if (s_sk6812_grbw)      be_pushint(vm, s_sk6812_grbw->PixelSize());
             break;
           case 8: // # 08 : PixelCount   void -> int
             if (s_ws2812_grb)       be_pushint(vm, s_ws2812_grb->PixelCount());
-            if (s_ws2812_grbw)      be_pushint(vm, s_ws2812_grbw->PixelCount());
-            if (s_sk6812_grb)       be_pushint(vm, s_sk6812_grb->PixelCount());
             if (s_sk6812_grbw)      be_pushint(vm, s_sk6812_grbw->PixelCount());
             break;
           case 9: // # 09 : ClearTo      (color:??) -> void
@@ -219,8 +191,6 @@ extern "C" {
             uint8_t g = (rgbw & 0xFF00) >> 8;
             uint8_t b = (rgbw & 0xFF);
             if (s_ws2812_grb)       s_ws2812_grb->ClearTo(RgbColor(r, g, b));
-            if (s_ws2812_grbw)      s_ws2812_grbw->ClearTo(RgbwColor(r, g, b, 0));
-            if (s_sk6812_grb)       s_sk6812_grb->ClearTo(RgbColor(r, g, b));
             if (s_sk6812_grbw)      s_sk6812_grbw->ClearTo(RgbwColor(r, g, b, 0));
             }
             break;
@@ -233,8 +203,6 @@ extern "C" {
             uint8_t g = (rgbw & 0xFF00) >> 8;
             uint8_t b = (rgbw & 0xFF);
             if (s_ws2812_grb)       s_ws2812_grb->SetPixelColor(idx, RgbColor(r, g, b));
-            if (s_ws2812_grbw)      s_ws2812_grbw->SetPixelColor(idx, RgbwColor(r, g, b, 0));
-            if (s_sk6812_grb)       s_sk6812_grb->SetPixelColor(idx, RgbColor(r, g, b));
             if (s_sk6812_grbw)      s_sk6812_grbw->SetPixelColor(idx, RgbwColor(r, g, b, 0));
             }
             break;
@@ -247,43 +215,12 @@ extern "C" {
               RgbColor rgb = s_ws2812_grb->GetPixelColor(idx);
               be_pushint(vm, (rgb.R << 16) | (rgb.G << 8) | rgb.B); 
             }
-            if (s_ws2812_grbw) {
-              RgbwColor rgbw = s_ws2812_grbw->GetPixelColor(idx);
-              be_pushint(vm, (rgbw.W << 24) | (rgb.R << 16) | (rgb.G << 8) | rgb.B); 
-            }
-            if (s_sk6812_grb) {
-              RgbColor rgb = s_sk6812_grb->GetPixelColor(idx);
-              be_pushint(vm, (rgb.R << 16) | (rgb.G << 8) | rgb.B); 
-            }
             if (s_sk6812_grbw) {
               RgbwColor rgbw = s_sk6812_grbw->GetPixelColor(idx);
               be_pushint(vm, (rgbw.W << 24) | (rgb.R << 16) | (rgb.G << 8) | rgb.B); 
             }
             }
             break;
-          // case 20: // # 20 : RotateLeft   (rot:int [, first:int, last:int]) -> void
-          // case 21: // # 21 : RotateRight  (rot:int [, first:int, last:int]) -> void
-          // case 22: // # 22 : ShiftLeft    (rot:int [, first:int, last:int]) -> void
-          // case 23: // # 23 : ShiftRight   (rot:int [, first:int, last:int]) -> void
-          //   {
-          //   int32_t rot = be_toint(vm, 3);
-          //   int32_t first = -1;
-          //   int32_t last = -1;
-          //   if (argc >= 5) {
-          //     first = be_toint(vm, 4);
-          //     last = be_toint(vm, 5);
-          //   }
-          //   if (20 == cmd) {
-          //     if (first >= 0) { strip->RotateLeft(rot, first, last); } else { strip->RotateLeft(rot); };
-          //   } else if (21 == cmd) {
-          //     if (first >= 0) { strip->RotateRight(rot, first, last); } else { strip->RotateRight(rot); };
-          //   } else if (22 == cmd) {
-          //     if (first >= 0) { strip->ShiftLeft(rot, first, last); } else { strip->ShiftLeft(rot); };
-          //   } else if (23 == cmd) {
-          //     if (first >= 0) { strip->ShiftRight(rot, first, last); } else { strip->ShiftRight(rot); };
-          //   }
-          //   }
-          //   break;
           default:
             break;
         }
diff --git a/tasmota/xdrv_52_3_berry_lvgl.ino b/tasmota/xdrv_52_3_berry_lvgl.ino
index af435851b..39e7737ed 100644
--- a/tasmota/xdrv_52_3_berry_lvgl.ino
+++ b/tasmota/xdrv_52_3_berry_lvgl.ino
@@ -167,7 +167,7 @@ void be_check_arg_type(bvm *vm, int32_t arg_start, int32_t argc, const char * ar
 
   // check if we are missing arguments
   if (arg_type != nullptr && arg_type[arg_idx] != 0) {
-    berry_log_P("Missing arguments, remaining type '%s'", &arg_type[arg_idx]);
+    berry_log_C("Missing arguments, remaining type '%s'", &arg_type[arg_idx]);
   }
 }
 
@@ -404,6 +404,10 @@ extern "C" {
     be_return(vm);
   }
   
+  /*********************************************************************************************\
+   * Support for lv_fonts
+  \*********************************************************************************************/
+  // load font by name on file-system
   int lv0_load_font(bvm *vm) {
     int argc = be_top(vm);
     if (argc == 1 && be_isstring(vm, 1)) {
@@ -421,6 +425,10 @@ extern "C" {
     be_raise(vm, kTypeError, nullptr);
   }
 
+  /*********************************************************************************************\
+   * Support for Freetype fonts
+  \*********************************************************************************************/
+  // load freetype font by name in file-system
   int lv0_load_freetype_font(bvm *vm) {
 #ifdef USE_LVGL_FREETYPE
     int argc = be_top(vm);
@@ -448,261 +456,212 @@ extern "C" {
 #endif // USE_LVGL_FREETYPE
   }
 
-  int lv0_load_montserrat_font(bvm *vm) {
-    int argc = be_top(vm);
-    if (argc == 1 && be_isint(vm, 1)) {
-      const lv_font_t * font = nullptr;
-      int32_t   font_size = be_toindex(vm, 1);
+  /*********************************************************************************************\
+   * Support for embedded fonts in Flash
+  \*********************************************************************************************/
+  // We create tables for Font matching
+  // Size of `0` indicates end of table
+  typedef struct {
+    int16_t size;
+    const lv_font_t *font;
+  } lv_font_table_t;
 
-      switch (font_size) {
+  typedef struct {
+    const char * name;
+    const lv_font_table_t * table;
+  } lv_font_names_t;
 
-        #if LV_FONT_MONTSERRAT_8
-        case  8:
-          font = &lv_font_montserrat_8;
-          break;
-        #endif
+  // Montserrat Font
+  const lv_font_table_t lv_montserrat_fonts[] = {
+  #if LV_FONT_MONTSERRAT_8
+    {  8, &lv_font_montserrat_8 },
+  #endif
+  #if LV_FONT_MONTSERRAT_10
+    { 10, &lv_font_montserrat_10 },
+  #endif
+  #if LV_FONT_MONTSERRAT_12
+    { 12, &lv_font_montserrat_12 },
+  #endif
+  #if LV_FONT_MONTSERRAT_14
+    { 14, &lv_font_montserrat_14 },
+  #endif
+  #if LV_FONT_MONTSERRAT_16
+    { 16, &lv_font_montserrat_16 },
+  #endif
+  #if LV_FONT_MONTSERRAT_18
+    { 18, &lv_font_montserrat_18 },
+  #endif
+  #if LV_FONT_MONTSERRAT_20
+    { 20, &lv_font_montserrat_20 },
+  #endif
+  #if LV_FONT_MONTSERRAT_22
+    { 22, &lv_font_montserrat_22 },
+  #endif
+  #if LV_FONT_MONTSERRAT_24
+    { 24, &lv_font_montserrat_24 },
+  #endif
+  #if LV_FONT_MONTSERRAT_26
+    { 26, &lv_font_montserrat_26 },
+  #endif
+  #if LV_FONT_MONTSERRAT_28
+    { 28, &lv_font_montserrat_28 },
+  #endif
+  #if LV_FONT_MONTSERRAT_28_COMPRESSED
+    { 28, &lv_font_montserrat_28_compressed, },
+  #endif
+  #if LV_FONT_MONTSERRAT_30
+    { 30, &lv_font_montserrat_30 },
+  #endif
+  #if LV_FONT_MONTSERRAT_32
+    { 32, &lv_font_montserrat_32 },
+  #endif
+  #if LV_FONT_MONTSERRAT_34
+    { 34, &lv_font_montserrat_34 },
+  #endif
+  #if LV_FONT_MONTSERRAT_36
+    { 36, &lv_font_montserrat_36 },
+  #endif
+  #if LV_FONT_MONTSERRAT_38
+    { 38, &lv_font_montserrat_38 },
+  #endif
+  #if LV_FONT_MONTSERRAT_40
+    { 40, &lv_font_montserrat_40 },
+  #endif
+  #if LV_FONT_MONTSERRAT_42
+    { 42, &lv_font_montserrat_42 },
+  #endif
+  #if LV_FONT_MONTSERRAT_44
+    { 44, &lv_font_montserrat_44 },
+  #endif
+  #if LV_FONT_MONTSERRAT_46
+    { 46, &lv_font_montserrat_46 },
+  #endif
+  #if LV_FONT_MONTSERRAT_48
+    { 48, &lv_font_montserrat_48 },
+  #endif
+    { 0, nullptr}
+  };
 
-        #if LV_FONT_MONTSERRAT_10
-        case  10:
-          font = &lv_font_montserrat_10;
-          break;
-        #endif
+  // Seg7 Font
+  const lv_font_table_t lv_seg7_fonts[] = {
+    {  8, &seg7_8 },
+    { 10, &seg7_10 },
+    { 12, &seg7_12 },
+    { 14, &seg7_14 },
+    { 16, &seg7_16 },
+    { 18, &seg7_18 },
+    { 20, &seg7_20 },
+    { 24, &seg7_24 },
+    { 28, &seg7_28 },
+    { 36, &seg7_36 },
+    { 48, &seg7_48 },
+  };
 
-        #if LV_FONT_MONTSERRAT_12
-        case  12:
-          font = &lv_font_montserrat_12;
-          break;
-        #endif
+  // robotocondensed-latin1
+  const lv_font_table_t lv_robotocondensed_fonts[] = {
+#if ROBOTOCONDENSED_REGULAR_12_LATIN1
+    { 12, &robotocondensed_regular_12_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_14_LATIN1
+    { 14, &robotocondensed_regular_14_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_16_LATIN1
+    { 16, &robotocondensed_regular_16_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_20_LATIN1
+    { 20, &robotocondensed_regular_20_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_22_LATIN1
+    { 22, &robotocondensed_regular_22_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_24_LATIN1
+    { 24, &robotocondensed_regular_24_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_28_LATIN1
+    { 28, &robotocondensed_regular_28_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_32_LATIN1
+    { 32, &robotocondensed_regular_32_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_36_LATIN1
+    { 36, &robotocondensed_regular_36_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_38_LATIN1
+    { 38, &robotocondensed_regular_38_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_40_LATIN1
+    { 40, &robotocondensed_regular_40_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_44_LATIN1
+    { 44, &robotocondensed_regular_44_latin1 },
+#endif
+#if ROBOTOCONDENSED_REGULAR_48_LATIN1
+    { 48, &robotocondensed_regular_48_latin1 },
+#endif
+  };
 
-        #if LV_FONT_MONTSERRAT_14
-        case  14:
-          font = &lv_font_montserrat_14;
-          break;
-        #endif
+  // register all included fonts
+  const lv_font_names_t lv_embedded_fonts[] = {
+    { "montserrat", lv_montserrat_fonts },
+    { "seg7", lv_seg7_fonts },
+#ifdef USE_LVGL_OPENHASP
+    { "robotocondensed", lv_robotocondensed_fonts },
+#endif
+    { nullptr, nullptr}
+  };
 
-        #if LV_FONT_MONTSERRAT_16
-        case  16:
-          font = &lv_font_montserrat_16;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_18
-        case  18:
-          font = &lv_font_montserrat_18;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_20
-        case  20:
-          font = &lv_font_montserrat_20;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_22
-        case  22:
-          font = &lv_font_montserrat_22;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_24
-        case  24:
-          font = &lv_font_montserrat_24;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_26
-        case  26:
-          font = &lv_font_montserrat_26;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_28
-        case  28:
-          font = &lv_font_montserrat_28;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_30
-        case  30:
-          font = &lv_font_montserrat_30;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_32
-        case  32:
-          font = &lv_font_montserrat_32;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_34
-        case  34:
-          font = &lv_font_montserrat_34;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_36
-        case  36:
-          font = &lv_font_montserrat_36;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_38
-        case  38:
-          font = &lv_font_montserrat_38;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_40
-        case  40:
-          font = &lv_font_montserrat_40;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_42
-        case  42:
-          font = &lv_font_montserrat_42;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_44
-        case  44:
-          font = &lv_font_montserrat_44;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_46
-        case  46:
-          font = &lv_font_montserrat_46;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_48
-        case  48:
-          font = &lv_font_montserrat_48;
-          break;
-        #endif
-
-        #if LV_FONT_MONTSERRAT_28_COMPRESSED
-        case 28:
-          font = &lv_font_montserrat_28_compressed;
-          break;
-        #endif
-
-        default:
-          break;
-      }
-
-      if (font != nullptr) {
-        be_find_class(vm, "lv.lv_font");
-        be_pushcomptr(vm, (void*)font);
-        be_call(vm, 1);
-        be_pop(vm, 1);
-        be_return(vm);
-      } else {
-        be_return_nil(vm);
+  // If size is zero, it is read at arg 1
+  int lv_load_embedded_font(bvm *vm, const char * name, int16_t size) {
+    if (0 == size) {
+      if (be_top(vm) >= 1 && be_isint(vm, 1)) {
+        size = be_toindex(vm, 1);
       }
     }
-    be_raise(vm, kTypeError, nullptr);
+    if (name == nullptr || 0 == size) {
+      be_raise(vm, "value_error", "");
+    }
+    // first look for font
+    const lv_font_names_t * font_name_cursor = lv_embedded_fonts;
+    for (font_name_cursor = lv_embedded_fonts; font_name_cursor->name; font_name_cursor++) {
+      if (strcmp(name, font_name_cursor->name) == 0) break;   // found
+    }
+    if (font_name_cursor->name == nullptr) {
+      be_raisef(vm, "value_error", "unknown font '%s'", name);
+    }
+    // scan for font size
+    const lv_font_table_t * font_entry = font_name_cursor->table;
+    for (font_entry = font_name_cursor->table; font_entry->size; font_entry++) {
+      if (font_entry->size == size) break;    // found
+    }
+    if (font_entry->size == 0) {
+      be_raisef(vm, "value_error", "unknown font size '%s-%i'", name, size);
+    }
+    
+    be_find_class(vm, "lv.lv_font");
+    be_pushcomptr(vm, (void*)font_entry->font);
+    be_call(vm, 1);
+    be_pop(vm, 1);
+    be_return(vm);
+  }
+
+  int lv0_load_montserrat_font(bvm *vm) {
+    return lv_load_embedded_font(vm, "montserrat", 0);
   }
 
   int lv0_load_seg7_font(bvm *vm) {
-    int argc = be_top(vm);
-    if (argc == 1 && be_isint(vm, 1)) {
-      const lv_font_t * font = nullptr;
-      int32_t   font_size = be_toindex(vm, 1);
-
-      switch (font_size) {
-        case  8: font = &seg7_8;  break;
-        case 10: font = &seg7_10; break;
-        case 12: font = &seg7_12; break;
-        case 14: font = &seg7_14; break;
-        case 16: font = &seg7_16; break;
-        case 18: font = &seg7_18; break;
-        case 20: font = &seg7_20; break;
-        case 24: font = &seg7_24; break;
-        case 28: font = &seg7_28; break;
-        case 36: font = &seg7_36; break;
-        case 48: font = &seg7_48; break;
-        default: break;
-      }
-
-      if (font != nullptr) {
-        be_find_class(vm, "lv.lv_font");
-        be_pushcomptr(vm, (void*)font);
-        be_call(vm, 1);
-        be_pop(vm, 1);
-        be_return(vm);
-      } else {
-        be_return_nil(vm);
-      }
-    }
-    be_raise(vm, kTypeError, nullptr);
+    return lv_load_embedded_font(vm, "seg7", 0);
   }
 
   int lv0_load_robotocondensed_latin1_font(bvm *vm) {
 #ifdef USE_LVGL_OPENHASP
-    int argc = be_top(vm);
-    if (argc == 1 && be_isint(vm, 1)) {
-      const lv_font_t * font = nullptr;
-      int32_t   font_size = be_toindex(vm, 1);
-
-      switch (font_size) {
-#if ROBOTOCONDENSED_REGULAR_12_LATIN1
-        case 12: font = &robotocondensed_regular_12_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_14_LATIN1
-        case 14: font = &robotocondensed_regular_14_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_16_LATIN1
-        case 16: font = &robotocondensed_regular_16_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_20_LATIN1
-        case 20: font = &robotocondensed_regular_20_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_22_LATIN1
-        case 22: font = &robotocondensed_regular_22_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_24_LATIN1
-        case 24: font = &robotocondensed_regular_24_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_28_LATIN1
-        case 28: font = &robotocondensed_regular_28_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_32_LATIN1
-        case 32: font = &robotocondensed_regular_32_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_36_LATIN1
-        case 36: font = &robotocondensed_regular_36_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_38_LATIN1
-        case 38: font = &robotocondensed_regular_38_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_40_LATIN1
-        case 40: font = &robotocondensed_regular_40_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_44_LATIN1
-        case 44: font = &robotocondensed_regular_44_latin1; break;
-#endif
-#if ROBOTOCONDENSED_REGULAR_48_LATIN1
-        case 48: font = &robotocondensed_regular_48_latin1; break;
-#endif
-        default: break;
-      }
-
-      if (font != nullptr) {
-        be_find_class(vm, "lv.lv_font");
-        be_pushcomptr(vm, (void*)font);
-        be_call(vm, 1);
-        be_pop(vm, 1);
-        be_return(vm);
-      } else {
-        be_return_nil(vm);
-      }
-    }
+    return lv_load_embedded_font(vm, "robotocondensed", 0);
 #endif // USE_LVGL_OPENHASP
     be_raise(vm, kTypeError, nullptr);
   }
 
+  /*********************************************************************************************\
+   * Tasmota Logo
+  \*********************************************************************************************/
   #include "lvgl_berry/tasmota_logo_64_truecolor_alpha.h"
 
   void lv_img_set_tasmota_logo(lv_obj_t * img) {
@@ -818,7 +777,7 @@ extern "C" {
   int lv0_register_button_encoder(bvm *vm) {
     int32_t argc = be_top(vm); // Get the number of arguments
     bool inverted = false;
-    // berry_log_P("lv0_register_button_encoder argc=%d inverted=%d", argc, be_tobool(vm, 1));
+    // berry_log_C("lv0_register_button_encoder argc=%d inverted=%d", argc, be_tobool(vm, 1));
     if (argc >= 1) {
       inverted = be_tobool(vm, 1);    // get the inverted flag
     }
@@ -835,7 +794,7 @@ extern "C" {
     lvbe.btn[1].set_inverted(inverted);
     lvbe.btn[2].set_gpio(btn2);
     lvbe.btn[2].set_inverted(inverted);
-    berry_log_P(D_LOG_LVGL "Button Rotary encoder using GPIOs %d,%d,%d%s", btn0, btn1, btn2, inverted ? " (inverted)" : "");
+    berry_log_C(D_LOG_LVGL "Button Rotary encoder using GPIOs %d,%d,%d%s", btn0, btn1, btn2, inverted ? " (inverted)" : "");
 
     lv_indev_drv_init(&lvbe.indev_drv);
     lvbe.indev_drv.type = LV_INDEV_TYPE_ENCODER;
@@ -878,7 +837,7 @@ extern "C" {
         }
         bool state = lvbe.btn[i].clear_state_changed();
         data->state = state ? LV_INDEV_STATE_PR : LV_INDEV_STATE_REL;
-        // berry_log_P("Button event key %d state %d,%d", data->key, state, data->state);
+        // berry_log_C("Button event key %d state %d,%d", data->key, state, data->state);
         break;
       }
     }
@@ -956,11 +915,53 @@ extern "C" {
     if (!glue) { be_return_nil(vm); }
 
     char fname[32];
-    snprintf(fname, sizeof(fname), "/screenshot-%d.raw", Rtc.utc_time);
+    snprintf(fname, sizeof(fname), "/screenshot-%d.bmp", Rtc.utc_time);
     File f = dfsp->open(fname, "w");
     if (f) {
       glue->setScreenshotFile(&f);
 
+      uint32_t bmp_width = lv_disp_get_hor_res(nullptr);
+      uint32_t bmp_height = lv_disp_get_ver_res(nullptr);
+
+      // write BMP header
+      static const uint8_t bmp_sign[] = { 0x42, 0x4d };   // BM = Windows
+      f.write(bmp_sign, sizeof(bmp_sign));
+      size_t bmp_size = bmp_width * bmp_height * LV_COLOR_DEPTH / 8 + 0x44;
+      f.write((uint8_t*)&bmp_size, sizeof(bmp_size));
+      uint32_t zero = 0;
+      f.write((uint8_t*) &zero, sizeof(zero));  // reserved 4-bytes
+      uint32_t bmp_offset_to_pixels = 0x44;  // TODO
+      f.write((uint8_t*) &bmp_offset_to_pixels, sizeof(bmp_offset_to_pixels));
+
+      // DIB Header BITMAPINFOHEADER
+      size_t bmp_dib_header_size = 52;                    // BITMAPV2INFOHEADER
+      f.write((uint8_t*) &bmp_dib_header_size, sizeof(bmp_dib_header_size));
+
+      f.write((uint8_t*) &bmp_width, sizeof(bmp_width));
+      f.write((uint8_t*) &bmp_height, sizeof(bmp_height));
+
+      // rest of header
+      // BITMAPV2INFOHEADER = 52 bytes header, 40 bytes sub-header
+      static const uint8_t bmp_dib_header[] = {
+        0x01, 0x00,                       // planes
+          16, 0x00,                       // bits per pixel = 16
+        0x03, 0x00, 0x00, 0x00,           // compression = BI_BITFIELDS uncrompressed
+        0x00, 0x00, 0x00, 0x00,           // Image size, 0 is valid for BI_RGB (uncompressed) TODO
+        0x00, 0x00, 0x00, 0x00,           // X pixels per meter
+        0x00, 0x00, 0x00, 0x00,           // Y pixels per meter
+        0x00, 0x00, 0x00, 0x00,           // Colors in table
+        0x00, 0x00, 0x00, 0x00,           // Important color count
+
+        // RGB masks
+        0x00, 0xF8, 0x00, 0x00,           // Red channel mask
+        0xE0, 0x07, 0x00, 0x00,           // Green channel mask
+        0x1F, 0x00, 0x00, 0x00,           // Blue channel mask
+
+        0x00, 0x00,                       // Padding to align on 4 bytes boundary
+      };
+      f.write(bmp_dib_header, sizeof(bmp_dib_header));
+      // now we can write the pixels array
+
       // redraw screen
       lv_obj_invalidate(lv_scr_act());
       lv_refr_now(lv_disp_get_default());            
diff --git a/tasmota/xdrv_52_3_berry_tasmota.ino b/tasmota/xdrv_52_3_berry_tasmota.ino
index 667a8f7b2..cfc847e7a 100644
--- a/tasmota/xdrv_52_3_berry_tasmota.ino
+++ b/tasmota/xdrv_52_3_berry_tasmota.ino
@@ -1,5 +1,5 @@
 /*
-  xdrv_52_3_berry_native.ino - Berry scripting language, native fucnctions
+  xdrv_52_3_berry_tasmota.ino - Berry scripting language, native fucnctions
 
   Copyright (C) 2021 Stephan Hadinger, Berry language by Guan Wenliang https://github.com/Skiars/berry
 
@@ -24,6 +24,7 @@
 #include <Wire.h>
 
 const uint32_t BERRY_MAX_LOGS = 16;   // max number of print output recorded when outside of REPL, used to avoid infinite grow of logs
+const uint32_t BERRY_MAX_REPL_LOGS = 1024;   // max number of print output recorded when inside REPL
 
 /*********************************************************************************************\
  * Return C callback from index
@@ -91,6 +92,7 @@ extern "C" {
           retain = be_tobool(vm, 4);
         }
         if (!payload) { be_raise(vm, "value_error", "Empty payload"); }
+        be_pop(vm, be_top(vm));
         MqttPublishPayload(topic, payload, payload_len, retain);
         be_return_nil(vm); // Return
       }
@@ -121,7 +123,7 @@ extern "C" {
     int32_t top = be_top(vm); // Get the number of arguments
     if (top == 2 && be_isstring(vm, 2)) {  // only 1 argument of type string accepted
       const char * command = be_tostring(vm, 2);
-      be_pop(vm, 2);    // clear the stack before calling, because of re-entrant call to Berry in a Rule
+      be_pop(vm, top);    // clear the stack before calling, because of re-entrant call to Berry in a Rule
       ExecuteCommand(command, SRC_BERRY);
       be_return_nil(vm); // Return
     }
@@ -258,20 +260,25 @@ extern "C" {
     be_raise(vm, kTypeError, nullptr);
   }
 
+  static void l_push_time(bvm *vm, struct tm *t, const char *unparsed) {
+    be_newobject(vm, "map");
+    map_insert_int(vm, "year", t->tm_year + 1900);
+    map_insert_int(vm, "month", t->tm_mon + 1);
+    map_insert_int(vm, "day", t->tm_mday);
+    map_insert_int(vm, "hour", t->tm_hour);
+    map_insert_int(vm, "min", t->tm_min);
+    map_insert_int(vm, "sec", t->tm_sec);
+    map_insert_int(vm, "weekday", t->tm_wday);
+    if (unparsed) map_insert_str(vm, "unparsed", unparsed);
+    be_pop(vm, 1);
+  }
+
   int32_t l_time_dump(bvm *vm) {
     int32_t top = be_top(vm); // Get the number of arguments
     if (top == 2 && be_isint(vm, 2)) {
       time_t ts = be_toint(vm, 2);
       struct tm *t = gmtime(&ts);
-      be_newobject(vm, "map");
-      map_insert_int(vm, "year", t->tm_year + 1900);
-      map_insert_int(vm, "month", t->tm_mon + 1);
-      map_insert_int(vm, "day", t->tm_mday);
-      map_insert_int(vm, "hour", t->tm_hour);
-      map_insert_int(vm, "min", t->tm_min);
-      map_insert_int(vm, "sec", t->tm_sec);
-      map_insert_int(vm, "weekday", t->tm_wday);
-      be_pop(vm, 1);
+      l_push_time(vm, t, NULL);
       be_return(vm);
     }
     be_raise(vm, kTypeError, nullptr);
@@ -291,6 +298,23 @@ extern "C" {
     be_raise(vm, kTypeError, nullptr);
   }
 
+  int32_t l_strptime(bvm *vm) {
+    int32_t argc = be_top(vm); // Get the number of arguments
+    if (argc == 3 && be_isstring(vm, 2) && be_isstring(vm, 3)) {
+      const char * input = be_tostring(vm, 2);
+      const char * format = be_tostring(vm, 3);
+      struct tm t = {0};
+      char * ret = strptime(input, format, &t);
+      if (ret) {
+        l_push_time(vm, &t, ret);
+        be_return(vm);
+      } else {
+        be_return_nil(vm);
+      }
+    }
+    be_raise(vm, kTypeError, nullptr);
+  }
+
   // Berry: tasmota.delay(timer:int) -> nil
   //
   int32_t l_delay(struct bvm *vm);
@@ -389,6 +413,7 @@ extern "C" {
     int32_t top = be_top(vm); // Get the number of arguments
     if (top == 2 && be_isstring(vm, 2)) {
       const char *msg = be_tostring(vm, 2);
+      be_pop(vm, top);  // avoid Error be_top is non zero message
       ResponseAppend_P(PSTR("%s"), msg);
       be_return_nil(vm); // Return nil when something goes wrong
     }
@@ -401,6 +426,7 @@ extern "C" {
     int32_t top = be_top(vm); // Get the number of arguments
     if (top == 2 && be_isstring(vm, 2)) {
       const char *msg = be_tostring(vm, 2);
+      be_pop(vm, top);  // avoid Error be_top is non zero message
       WSContentSend_P(PSTR("%s"), msg);
       be_return_nil(vm); // Return nil when something goes wrong
     }
@@ -413,6 +439,7 @@ extern "C" {
     int32_t top = be_top(vm); // Get the number of arguments
     if (top == 2 && be_isstring(vm, 2)) {
       const char *msg = be_tostring(vm, 2);
+      be_pop(vm, top);  // avoid Error be_top is non zero message
       WSContentSend_PD(PSTR("%s"), msg);
       be_return_nil(vm); // Return nil when something goes wrong
     }
@@ -422,9 +449,14 @@ extern "C" {
   // get power
   int32_t l_getpower(bvm *vm);
   int32_t l_getpower(bvm *vm) {
+    power_t pow = TasmotaGlobal.power;
+    int32_t top = be_top(vm); // Get the number of arguments
+    if (top == 2 && be_isint(vm, 2)) {
+      pow = be_toint(vm, 2);
+    }
     be_newobject(vm, "list");
     for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
-      be_pushbool(vm, bitRead(TasmotaGlobal.power, i));
+      be_pushbool(vm, bitRead(pow, i));
       be_data_push(vm, -2);
       be_pop(vm, 1);
     }
@@ -439,6 +471,7 @@ extern "C" {
       int32_t idx = be_toint(vm, 2);
       bool power = be_tobool(vm, 3);
       if ((idx >= 0) && (idx < TasmotaGlobal.devices_present)) {
+        be_pop(vm, top);  // avoid Error be_top is non zero message
         ExecuteCommandPower(idx + 1, (power) ? POWER_ON : POWER_OFF, SRC_BERRY);
         be_pushbool(vm, power);
         be_return(vm); // Return
@@ -472,6 +505,7 @@ extern "C" {
     int32_t top = be_top(vm); // Get the number of arguments
     if (top == 2 && be_isint(vm, 2)) {
       int32_t index = be_toint(vm, 2);
+      be_pop(vm, top);  // avoid Error be_top is non zero message
       bool enabled = I2cEnabled(index);
       be_pushbool(vm, enabled);
       be_return(vm); // Return
@@ -575,16 +609,13 @@ extern "C" {
 void berry_log(const char * berry_buf);
 void berry_log(const char * berry_buf) {
   const char * pre_delimiter = nullptr;   // do we need to prepend a delimiter if no REPL command
-  if (!berry.repl_active) {
-    // if no REPL in flight, we limit the number of logs
-    if (berry.log.log.length() == 0) {
-      pre_delimiter = BERRY_CONSOLE_CMD_DELIMITER;
-    }
-    if (berry.log.log.length() >= BERRY_MAX_LOGS) {
-      berry.log.log.remove(berry.log.log.head());
-    }
+  size_t max_logs = berry.repl_active ? BERRY_MAX_REPL_LOGS : BERRY_MAX_LOGS;
+  if (berry.log.log.length() == 0) {
+    pre_delimiter = BERRY_CONSOLE_CMD_DELIMITER;
+  }
+  if (berry.log.log.length() >= BERRY_MAX_LOGS) {
+    berry.log.log.remove(berry.log.log.head());
   }
-  // AddLog(LOG_LEVEL_INFO, PSTR("[Add to log] %s"), berry_buf);
   berry.log.addString(berry_buf, pre_delimiter, "\n");
   AddLog(LOG_LEVEL_INFO, PSTR("%s"), berry_buf);
 }
@@ -605,17 +636,4 @@ extern "C" {
   }
 }
 
-
-void berry_log_P(const char * berry_buf, ...) {
-  // To save stack space support logging for max text length of 128 characters
-  char log_data[LOGSZ];
-
-  va_list arg;
-  va_start(arg, berry_buf);
-  uint32_t len = ext_vsnprintf_P(log_data, LOGSZ-3, berry_buf, arg);
-  va_end(arg);
-  if (len+3 > LOGSZ) { strcat(log_data, "..."); }  // Actual data is more
-  berry_log(log_data);
-}
-
 #endif  // USE_BERRY
diff --git a/tasmota/xdrv_52_3_berry_tasmota_global.ino b/tasmota/xdrv_52_3_berry_tasmota_global.ino
index affb2f19d..e5f3bad46 100644
--- a/tasmota/xdrv_52_3_berry_tasmota_global.ino
+++ b/tasmota/xdrv_52_3_berry_tasmota_global.ino
@@ -33,9 +33,10 @@ extern "C" {
 
   extern const be_ctypes_structure_t be_tasmota_global_struct = {
     sizeof(TasmotaGlobal),  /* size in bytes */
-    1,  /* number of elements */
+    2,  /* number of elements */
     nullptr,
     (const be_ctypes_structure_item_t[2]) {
+      { "devices_present", offsetof(TasmotaGlobal_t, devices_present), 0, 0, ctypes_u8, 0 },
       { "sleep", offsetof(TasmotaGlobal_t, sleep), 0, 0, ctypes_u8, 0 },
   }};
 
@@ -43,7 +44,7 @@ extern "C" {
     sizeof(TSettings),  /* size in bytes */
     1,  /* number of elements */
     nullptr,
-    (const be_ctypes_structure_item_t[2]) {
+    (const be_ctypes_structure_item_t[1]) {
       { "sleep", offsetof(TSettings, sleep), 0, 0, ctypes_u8, 0 },
   }};
 
diff --git a/tasmota/xdrv_52_3_berry_unishox.ino b/tasmota/xdrv_52_3_berry_unishox.ino
index a7664a960..c2ca1b5e7 100644
--- a/tasmota/xdrv_52_3_berry_unishox.ino
+++ b/tasmota/xdrv_52_3_berry_unishox.ino
@@ -35,8 +35,8 @@ extern Unishox compressor;
 \*********************************************************************************************/
 extern "C" {
 
-  int be_unishox_compress(bvm *vm);
-  int be_unishox_compress(bvm *vm) {
+  int be_ntv_unishox_compress(bvm *vm);
+  int be_ntv_unishox_compress(bvm *vm) {
     int32_t argc = be_top(vm); // Get the number of arguments
     if (argc == 1 && be_isstring(vm, 1)) {
       const char * s = be_tostring(vm, 1);
@@ -57,8 +57,8 @@ extern "C" {
     be_raise(vm, kTypeError, nullptr);
   }
 
-  int be_unishox_decompress(bvm *vm);
-  int be_unishox_decompress(bvm *vm) {
+  int be_ntv_unishox_decompress(bvm *vm);
+  int be_ntv_unishox_decompress(bvm *vm) {
     int32_t argc = be_top(vm); // Get the number of arguments
     if (argc == 1 && be_isbytes(vm, 1)) {
       size_t len;
diff --git a/tasmota/xdrv_52_3_berry_webclient.ino b/tasmota/xdrv_52_3_berry_webclient.ino
index b7b56a39e..5c1700ebf 100644
--- a/tasmota/xdrv_52_3_berry_webclient.ino
+++ b/tasmota/xdrv_52_3_berry_webclient.ino
@@ -17,6 +17,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+// also includes tcp_client
 
 #ifdef USE_BERRY
 
@@ -84,7 +85,6 @@ extern "C" {
   //
   int32_t wc_init(struct bvm *vm);
   int32_t wc_init(struct bvm *vm) {
-    // int32_t argc = be_top(vm); // Get the number of arguments
     WiFiClient * wcl = new WiFiClient();
     be_pushcomptr(vm, (void*) wcl);
     be_setmember(vm, 1, ".w");
@@ -96,6 +96,14 @@ extern "C" {
     be_return_nil(vm);
   }
 
+  int32_t wc_tcp_init(struct bvm *vm);
+  int32_t wc_tcp_init(struct bvm *vm) {
+    WiFiClient * wcl = new WiFiClient();
+    be_pushcomptr(vm, (void*) wcl);
+    be_setmember(vm, 1, ".w");
+    be_return_nil(vm);
+  }
+
   HTTPClientLight * wc_getclient(struct bvm *vm) {
     be_getmember(vm, 1, ".p");
     void *p = be_tocomptr(vm, -1);
@@ -123,6 +131,14 @@ extern "C" {
     be_return_nil(vm);
   }
 
+  int32_t wc_tcp_deinit(struct bvm *vm);
+  int32_t wc_tcp_deinit(struct bvm *vm) {
+    WiFiClient * wcl = wc_getwificlient(vm);
+    if (wcl != nullptr) { delete wcl; }
+    be_setmember(vm, 1, ".w");
+    be_return_nil(vm);
+  }
+
   // wc.url_encode(string) -> string
   int32_t wc_urlencode(struct bvm *vm);
   int32_t wc_urlencode(struct bvm *vm) {
@@ -151,6 +167,26 @@ extern "C" {
     be_return(vm);  /* return self */
   }
 
+  // tcp.connect(address:string, port:int [, timeout_ms:int]) -> bool
+  int32_t wc_tcp_connect(struct bvm *vm);
+  int32_t wc_tcp_connect(struct bvm *vm) {
+    int32_t argc = be_top(vm);
+    if (argc >= 3 && be_isstring(vm, 2) && be_isint(vm, 3)) {
+      WiFiClient * tcp = wc_getwificlient(vm);
+      const char * address = be_tostring(vm, 2);
+      int32_t port = be_toint(vm, 3);
+      int32_t timeout = USE_BERRY_WEBCLIENT_TIMEOUT;   // default timeout of 2 seconds
+      if (argc >= 4) {
+        timeout = be_toint(vm, 4);
+      }
+      // open connection
+      bool success = tcp->connect(address, port, timeout);
+      be_pushbool(vm, success);
+      be_return(vm);  /* return self */
+    }
+    be_raise(vm, "attribute_error", NULL);
+  }
+
   // wc.close(void) -> nil
   int32_t wc_close(struct bvm *vm);
   int32_t wc_close(struct bvm *vm) {
@@ -159,6 +195,23 @@ extern "C" {
     be_return_nil(vm);
   }
 
+  // tcp.close(void) -> nil
+  int32_t wc_tcp_close(struct bvm *vm);
+  int32_t wc_tcp_close(struct bvm *vm) {
+    WiFiClient * tcp = wc_getwificlient(vm);
+    tcp->stop();
+    be_return_nil(vm);
+  }
+
+  // tcp.available(void) -> int
+  int32_t wc_tcp_available(struct bvm *vm);
+  int32_t wc_tcp_available(struct bvm *vm) {
+    WiFiClient * tcp = wc_getwificlient(vm);
+    int32_t available = tcp->available();
+    be_pushint(vm, available);
+    be_return(vm);
+  }
+
   // wc.wc_set_timeouts([http_timeout_ms:int, tcp_timeout_ms:int]) -> self
   int32_t wc_set_timeouts(struct bvm *vm);
   int32_t wc_set_timeouts(struct bvm *vm) {
@@ -239,6 +292,65 @@ extern "C" {
     be_return(vm);  /* return code */
   }
 
+  // tcp.connected(void) -> bool
+  int32_t wc_tcp_connected(struct bvm *vm);
+  int32_t wc_tcp_connected(struct bvm *vm) {
+    WiFiClient * tcp = wc_getwificlient(vm);
+    be_pushbool(vm, tcp->connected());
+    be_return(vm);  /* return code */
+  }
+
+  // tcp.write(bytes | string) -> int
+  int32_t wc_tcp_write(struct bvm *vm);
+  int32_t wc_tcp_write(struct bvm *vm) {
+    int32_t argc = be_top(vm);
+    if (argc >= 2 && (be_isstring(vm, 2) || be_isbytes(vm, 2))) {
+      WiFiClient * tcp = wc_getwificlient(vm);
+      const char * buf = nullptr;
+      size_t buf_len = 0;
+      if (be_isstring(vm, 2)) {  // string
+        buf = be_tostring(vm, 2);
+        buf_len = strlen(buf);
+      } else { // bytes
+        buf = (const char*) be_tobytes(vm, 2, &buf_len);
+      }
+      size_t bw = tcp->write(buf, buf_len);
+      be_pushint(vm, bw);
+      be_return(vm);  /* return code */
+    }
+    be_raise(vm, kTypeError, nullptr);
+  }
+
+  // tcp.read() -> string
+  int32_t wc_tcp_read(struct bvm *vm);
+  int32_t wc_tcp_read(struct bvm *vm) {
+    WiFiClient * tcp = wc_getwificlient(vm);
+    int32_t btr = tcp->available();
+    if (btr <= 0) {
+      be_pushstring(vm, "");
+    } else {
+      char * buf = (char*) be_pushbuffer(vm, btr);
+      int32_t btr2 = tcp->read((uint8_t*) buf, btr);
+      be_pushnstring(vm, buf, btr2);
+    }
+    be_return(vm);  /* return code */
+  }
+
+  // tcp.readbytes() -> bytes
+  int32_t wc_tcp_readbytes(struct bvm *vm);
+  int32_t wc_tcp_readbytes(struct bvm *vm) {
+    WiFiClient * tcp = wc_getwificlient(vm);
+    int32_t btr = tcp->available();
+    if (btr <= 0) {
+      be_pushbytes(vm, nullptr, 0);
+    } else {
+      uint8_t * buf = (uint8_t*) be_pushbuffer(vm, btr);
+      int32_t btr2 = tcp->read(buf, btr);
+      be_pushbytes(vm, buf, btr2);
+    }
+    be_return(vm);  /* return code */
+  }
+
   void wc_errorCodeMessage(int32_t httpCode, uint32_t http_connect_time) {
     if (httpCode < 0) {
       if (httpCode <= -1000) {
diff --git a/tasmota/xdrv_52_7_berry_embedded.ino b/tasmota/xdrv_52_7_berry_embedded.ino
index a51409406..cbf933d07 100644
--- a/tasmota/xdrv_52_7_berry_embedded.ino
+++ b/tasmota/xdrv_52_7_berry_embedded.ino
@@ -31,8 +31,6 @@ const char berry_prog[] =
   // enable python syntax compatibility mode
   "import python_compat "
 #endif
-  // persistance module
-  "import persist "
 
 #ifdef USE_ENERGY_SENSOR
   "import energy "
diff --git a/tasmota/xdrv_52_9_berry.ino b/tasmota/xdrv_52_9_berry.ino
index e938c5bb4..84a4f698c 100644
--- a/tasmota/xdrv_52_9_berry.ino
+++ b/tasmota/xdrv_52_9_berry.ino
@@ -126,7 +126,6 @@ void BerryDumpErrorAndClear(bvm *vm, bool berry_console) {
   } else {
     be_dumpstack(vm);
   }
-  be_pop(vm, top);
 }
 
 // void callBerryMqttData(void) {
@@ -214,7 +213,7 @@ int32_t callBerryEventDispatcher(const char *type, const char *cmd, int32_t idx,
       be_pushstring(vm, type != nullptr ? type : "");
       be_pushstring(vm, cmd != nullptr ? cmd : "");
       be_pushint(vm, idx);
-      be_pushstring(vm, payload != nullptr ? payload : "{}");  // empty json
+      be_pushstring(vm, payload != nullptr ? payload : "");  // empty json
       BrTimeoutStart();
       if (data_len > 0) {
         be_pushbytes(vm, payload, data_len);    // if data_len is set, we also push raw bytes
@@ -226,6 +225,7 @@ int32_t callBerryEventDispatcher(const char *type, const char *cmd, int32_t idx,
       BrTimeoutReset();
       if (ret != 0) {
         BerryDumpErrorAndClear(vm, false);  // log in Tasmota console only
+        be_pop_all(berry.vm);             // clear Berry stack
         return ret;
       }
       be_pop(vm, 5);
@@ -332,17 +332,20 @@ void BerryInit(void) {
     ret_code1 = be_loadstring(berry.vm, berry_prog);
     if (ret_code1 != 0) {
       BerryDumpErrorAndClear(berry.vm, false);
+      be_pop_all(berry.vm);             // clear Berry stack
       break;
     }
     // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_BERRY "Berry code loaded, RAM used=%u"), be_gc_memcount(berry.vm));
     ret_code2 = be_pcall(berry.vm, 0);
     if (ret_code1 != 0) {
       BerryDumpErrorAndClear(berry.vm, false);
+      be_pop_all(berry.vm);             // clear Berry stack
       break;
     }
     // AddLog(LOG_LEVEL_DEBUG, PSTR(D_LOG_BERRY "Berry code ran, RAM used=%u"), be_gc_memcount(berry.vm));
     if (be_top(berry.vm) > 1) {
       BerryDumpErrorAndClear(berry.vm, false);
+      be_pop_all(berry.vm);             // clear Berry stack
     } else {
       be_pop(berry.vm, 1);
     }
@@ -387,6 +390,7 @@ void BrLoad(const char * script_name) {
     BrTimeoutStart();
     if (be_pcall(berry.vm, 1) != 0) {
       BerryDumpErrorAndClear(berry.vm, false);
+      be_pop_all(berry.vm);             // clear Berry stack
       return;
     }
     BrTimeoutReset();
@@ -492,6 +496,7 @@ void BrREPLRun(char * cmd) {
     }
     if (BE_EXCEPTION == ret_code) {
       BerryDumpErrorAndClear(berry.vm, true);
+      be_pop_all(berry.vm);             // clear Berry stack
       // be_dumpstack(berry.vm);
       // char exception_s[120];
       // ext_snprintf_P(exception_s, sizeof(exception_s), PSTR("%s: %s"), be_tostring(berry.vm, -2), be_tostring(berry.vm, -1));
@@ -695,7 +700,7 @@ void HandleBerryConsoleRefresh(void)
     WSContentFlush();
 
     for (auto & l: berry.log.log) {
-      _WSContentSend((char*) l);
+      _WSContentSend(l.getBuffer());
     }
 
     berry.log.reset();
@@ -811,8 +816,9 @@ bool Xdrv52(uint8_t function)
     case FUNC_EVERY_SECOND:
       callBerryEventDispatcher(PSTR("every_second"), nullptr, 0, nullptr);
       break;
-    // case FUNC_SET_POWER:
-    //   break;
+    case FUNC_SET_DEVICE_POWER:
+      result = callBerryEventDispatcher(PSTR("set_power_handler"), nullptr, XdrvMailbox.index, nullptr);
+      break;
 #ifdef USE_WEBSERVER
     case FUNC_WEB_ADD_CONSOLE_BUTTON:
       if (XdrvMailbox.index) {
diff --git a/tasmota/xdrv_60_shift595.ino b/tasmota/xdrv_60_shift595.ino
new file mode 100644
index 000000000..4e816fc7e
--- /dev/null
+++ b/tasmota/xdrv_60_shift595.ino
@@ -0,0 +1,119 @@
+/*
+  xdrv_60_shift595.ino - 74x595 shift register family support for Tasmota
+
+  Copyright (C) 2021  Jacek Ziółkowski
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef USE_SHIFT595
+
+#define XDRV_60           60
+
+const char kShift595Commands[] PROGMEM = "|" D_CMND_SHIFT595_DEVICE_COUNT ;
+void (* const Shift595Command[])(void) PROGMEM = { &CmndShift595Devices };
+
+struct Shift595 {
+  uint8_t pinSRCLK;
+  uint8_t pinRCLK;
+  uint8_t pinSER;
+  uint8_t pinOE;
+  uint8_t outputs;
+  uint8_t first;
+  bool connected = false;
+} *Shift595 = nullptr;
+
+void Shift595ConfigurePin(uint8_t pin, uint8_t value = 0) {
+  pinMode(pin, OUTPUT);
+  digitalWrite(pin, value);
+}
+
+void Shift595Init(void) {
+  if (PinUsed(GPIO_SHIFT595_SRCLK) && PinUsed(GPIO_SHIFT595_RCLK) && PinUsed(GPIO_SHIFT595_SER)) {
+    Shift595 = (struct Shift595*)calloc(1, sizeof(struct Shift595));
+    if (Shift595) {
+      Shift595->pinSRCLK = Pin(GPIO_SHIFT595_SRCLK);
+      Shift595->pinRCLK = Pin(GPIO_SHIFT595_RCLK);
+      Shift595->pinSER = Pin(GPIO_SHIFT595_SER);
+
+      Shift595ConfigurePin(Shift595->pinSRCLK);
+      Shift595ConfigurePin(Shift595->pinRCLK);
+      Shift595ConfigurePin(Shift595->pinSER);
+
+      if (PinUsed(GPIO_SHIFT595_OE)) {
+        Shift595->pinOE = Pin(GPIO_SHIFT595_OE);
+        Shift595ConfigurePin(Shift595->pinOE, 1);
+      }
+
+      Shift595->first = TasmotaGlobal.devices_present;
+      Shift595->outputs = Settings->shift595_device_count * 8;
+      TasmotaGlobal.devices_present += Shift595->outputs;
+      Shift595->connected = true;
+      AddLog(LOG_LEVEL_DEBUG, PSTR("595: Controlling relays POWER%d to POWER%d"), Shift595->first + 1, Shift595->first + Shift595->outputs);
+    }
+  }
+}
+
+void Shift595LatchPin(uint8_t pin) {
+  digitalWrite(pin, 1);
+  digitalWrite(pin, 0);
+}
+
+void Shift595SwitchRelay(void) {
+  if (Shift595 && Shift595->connected == true) {
+    for (uint32_t i = 0; i < Shift595->outputs; i++) {
+      uint8_t relay_state = bitRead(XdrvMailbox.index, Shift595->first + Shift595->outputs -1 -i);
+      digitalWrite(Shift595->pinSER, Settings->flag5.shift595_invert_outputs ? !relay_state : relay_state);
+      Shift595LatchPin(Shift595->pinSRCLK);
+    }
+
+    Shift595LatchPin(Shift595->pinRCLK);
+
+    if (PinUsed(GPIO_SHIFT595_OE)) {
+        digitalWrite(Shift595->pinOE, 0);
+    }
+  }
+}
+
+void CmndShift595Devices(void) {
+  if ((XdrvMailbox.payload > 0) && (XdrvMailbox.payload <= 3)) {
+    Settings->shift595_device_count = (1 == XdrvMailbox.payload) ? SHIFT595_DEVICE_COUNT : XdrvMailbox.payload;
+    TasmotaGlobal.restart_flag = 2;
+  }
+  ResponseCmndNumber(Settings->shift595_device_count);
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xdrv60(uint8_t function) {
+  bool result = false;
+
+  if (FUNC_PRE_INIT == function) {
+    Shift595Init();
+    } else if (Shift595) {
+      switch (function) {
+        case FUNC_SET_POWER:
+          Shift595SwitchRelay();
+          break;
+        case FUNC_COMMAND:
+          result = DecodeCommand(kShift595Commands, Shift595Command);
+          break;
+      }
+    }
+  return result;
+}
+
+#endif  // USE_SHIFT595
diff --git a/tasmota/xdrv_85_BLE_EQ3_TRV.ino b/tasmota/xdrv_85_BLE_EQ3_TRV.ino
index cfe3bb33d..d69368268 100644
--- a/tasmota/xdrv_85_BLE_EQ3_TRV.ino
+++ b/tasmota/xdrv_85_BLE_EQ3_TRV.ino
@@ -128,7 +128,6 @@ print("".join(pin))
 
 // for testing of BLE_ESP32, we remove xsns_62_MI_ESP32.ino completely, and instead add this modified xsns_52_ibeacon_BLE_ESP32.ino
 #if CONFIG_IDF_TARGET_ESP32
-#if ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(4, 0, 0)
 #ifdef USE_EQ3_ESP32
 #ifdef ESP32                       // ESP32 only. Use define USE_HM10 for ESP8266 support
 #ifdef USE_BLE_ESP32
@@ -226,7 +225,7 @@ uint8_t pairing = 0;
 
 #define EQ3_NUM_DEVICESLOTS 16
 eq3_device_tag EQ3Devices[EQ3_NUM_DEVICESLOTS];
-void *EQ3mutex = nullptr;
+SemaphoreHandle_t EQ3mutex = nullptr;
 
 int EQ3Period = 300;
 uint8_t EQ3OnlyAliased = 0;
@@ -1765,5 +1764,4 @@ bool Xdrv85(uint8_t function)
 #endif  // ESP32
 
 #endif
-#endif  // ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(4, 0, 0)
 #endif  // CONFIG_IDF_TARGET_ESP32
diff --git a/tasmota/xdrv_86_esp32_sonoff_spm.ino b/tasmota/xdrv_86_esp32_sonoff_spm.ino
index 808ada4c8..dc770c7e4 100644
--- a/tasmota/xdrv_86_esp32_sonoff_spm.ino
+++ b/tasmota/xdrv_86_esp32_sonoff_spm.ino
@@ -28,6 +28,8 @@
  * {"NAME":"Sonoff SPM (POC1)","GPIO":[1,1,1,1,3200,1,1,1,1,1,1,1,3232,1,1,1,0,1,1,1,0,1,1,1,0,0,0,0,544,1,1,32,1,0,0,1],"FLAG":0,"BASE":1}
  * Add ethernet support:
  * {"NAME":"Sonoff SPM (POC2)","GPIO":[1,0,1,0,3200,5536,0,0,1,1,1,0,3232,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,544,1,1,32,1,0,0,1],"FLAG":0,"BASE":1}
+ * Remove all user selectable GPIOs:
+ * {"NAME":"Sonoff SPM (POC2)","GPIO":[0,0,0,0,3200,5536,0,0,0,0,0,0,3232,0,5600,0,0,0,0,5568,0,0,0,0,0,0,0,0,544,0,0,32,0,0,0,0],"FLAG":0,"BASE":1}
  *
  * Things to know:
  * Bulk of the action is handled by ARM processors present in every unit communicating over modbus RS-485.
@@ -45,15 +47,21 @@
  * Tasmota POC2:
  * Ethernet support.
  * Gui optimized for energy display.
+ * Yellow led lights if no ARM connection can be made.
+ * Yellow led blinks 2 seconds if an ARM-ESP comms CRC error is detected.
+ * Supported commands:
+ *   SspmDisplay 0|1     - Select alternative GUI rotating display either all or powered on only
+ *   SspmIAmHere<relay>  - Blink ERROR in SPM-4Relay where relay resides
+ *   SspmScan            - Rescan ARM modbus taking around 20 seconds
+ *   SspmReset 1         - Reset ARM and restart ESP
  *
  * Todo:
  * Gui for Overload Protection entry (is handled by ARM processor).
  * Gui for Scheduling entry (is handled by ARM processor).
- * Yellow led functionality.
- * Interpretation of reset sequence on GPIO's 12-14.
+ * SPI master to ARM (ARM firmware upload from ESP using EasyFlash).
  *
  * Nice to have:
- * Support for all 32 SPM4Relay units equals 128 relays
+ * Support for all 32 SPM-4Relay units equals 128 relays (restricted due to internal Tasmota register use)
  *
  * GPIO's used:
  * GPIO00 - Bootmode / serial flash
@@ -61,9 +69,9 @@
  * GPIO03 - Serial console RX
  * GPIO04 - ARM processor TX (115200bps8N1)
  * GPIO05 - ETH POWER
- * GPIO12 - SPI MISO ARM pulsetrain code (input?)
- * GPIO13 - SPI CLK
- * GPIO14 - SPI CS ARM pulsetrain eoc (input?)
+ * GPIO12 - SPI MOSI ARM output (pin36 - PB15) - ESP input
+ * GPIO13 - SPI MISO ESP output - ARM input (pin35 - PB14)
+ * GPIO14 - SPI CLK ESP input (ARM pin34 - PB13)
  * GPIO15 - ARM reset (output) - 18ms low active 125ms after restart esp32
  * GPIO16 - ARM processor RX
  * GPIO17 - EMAC_CLK_OUT_180
@@ -116,6 +124,7 @@
 #define SSPM_FUNC_GET_ENERGY         24      // 0x18
 #define SSPM_FUNC_GET_LOG            26      // 0x1A
 #define SSPM_FUNC_ENERGY_PERIOD      27      // 0x1B
+#define SSPM_FUNC_RESET              28      // 0x1C - Remove device from eWelink and factory reset
 
 // Receive
 #define SSPM_FUNC_ENERGY_RESULT      6       // 0x06
@@ -125,6 +134,7 @@
 #define SSPM_FUNC_SCAN_DONE          25      // 0x19
 
 #define SSPM_GPIO_ARM_RESET          15
+#define SSPM_GPIO_LED_ERROR          33
 
 #define SSPM_MODULE_NAME_SIZE        12
 
@@ -175,6 +185,7 @@ typedef struct {
   uint8_t command_sequence;
   uint8_t mstate;
   uint8_t last_button;
+  uint8_t error_led_blinks;
   bool discovery_triggered;
 } TSspm;
 
@@ -427,7 +438,7 @@ void SSPMSendSetTime(void) {
   SspmBuffer[25] = time.second;
   SspmBuffer[26] = 0;
   SspmBuffer[27] = 0;
-  SspmBuffer[28] = 1 + (Rtc.time_timezone / 60);  // Not sure why the "1" is needed but it is in my case
+  SspmBuffer[28] = Rtc.time_timezone / 60;
   SspmBuffer[29] = abs(Rtc.time_timezone % 60);
   Sspm->command_sequence++;
   SspmBuffer[30] = Sspm->command_sequence;
@@ -667,9 +678,9 @@ void SSPMHandleReceivedData(void) {
         03           <- L4
         07 e5 0b 0d  <- End date (Today) 2021 nov 13
         07 e5 05 11  <- Start date       2021 may 17
-        00 05        <- 5kWh  (13/11 Today)
-        00 00        <- 0     (12/11 Yesterday)
-        00 04        <- 4kWh  (11/11 etc)
+        00 05        <- 0.05kWh  (13/11 Today)
+        00 00        <- 0        (12/11 Yesterday)
+        00 04        <- 0.04kWh  (11/11 etc)
         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
         00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
@@ -679,14 +690,14 @@ void SSPMHandleReceivedData(void) {
         42 67 46
         */
         {
-          uint32_t energy_today = 0;
-          uint32_t energy_yesterday = 0;
-          uint32_t energy_total = 0;
+          float energy_today = 0;
+          float energy_yesterday = 0;
+          float energy_total = 0;
           uint32_t entries = (Sspm->expected_bytes - 22) / 2;
 
           for (uint32_t i = 0; i < entries; i++) {
-            uint32_t today_energy = (SspmBuffer[41 + (i*2)] << 8) + SspmBuffer[42 + (i*2)];
-            if (28702 == today_energy) { today_energy = 0; }  // Unknown why sometimes 0x701E (=28702kWh) pops up
+            float today_energy = SspmBuffer[41 + (i*2)] + (float)SspmBuffer[42 + (i*2)] / 100;   // x.xxkWh
+            if (112.30 == today_energy) { today_energy = 0; }  // Unknown why sometimes 0x701E (=112.30kWh) pops up
             if (0 == i) { energy_today = today_energy; }
             if (1 == i) { energy_yesterday = today_energy; }
             energy_total += today_energy;
@@ -696,7 +707,7 @@ void SSPMHandleReceivedData(void) {
             if ((SspmBuffer[20] == Sspm->module[module][0]) && (SspmBuffer[21] == Sspm->module[module][1])) {
               Sspm->energy_today[module][channel] = energy_today;
               Sspm->energy_yesterday[module][channel] = energy_yesterday;
-              Sspm->energy_total[module][channel] = energy_total;  // xkWh
+              Sspm->energy_total[module][channel] = energy_total;  // x.xxkWh
               break;
             }
           }
@@ -705,7 +716,7 @@ void SSPMHandleReceivedData(void) {
         break;
       case SSPM_FUNC_GET_LOG:
         /* 0x1A
-        0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
+         0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
         AA 55 01 00 00 00 00 00 00 00 00 00 00 00 00 80 1a 01 3a 00 6b 7e 32 37 39 37 34 13 4b 35 36 37
         1e                            Number of log entries (1e = 30)
         07 e5 0b 06 0f 25 19 02 01 00 10 byte log entry
@@ -730,6 +741,10 @@ void SSPMHandleReceivedData(void) {
         07 e5 0b 06 0e 36 37 01 01 00
         ...
         07 e5 0b 06 0d 30 2d 03 00 01 09 89 fe
+
+        Error:
+        AA 55 01 00 00 00 00 00 00 00 00 00 00 00 00 80 1A 00 01 03 E5 45 EB
+                                                                |  |
         */
 
         break;
@@ -741,6 +756,12 @@ void SSPMHandleReceivedData(void) {
         AA 55 01 00 00 00 00 00 00 00 00 00 00 00 00 80 1b 00 11 [00] 8b 34 32 37 39 37 34 13 4b 35 36 37 [03] [00 00 00] f8 94 15   L4, kWh start period (0)
         */
 
+        break;
+      case SSPM_FUNC_RESET:
+        /* 0x1C
+        AA 55 01 00 00 00 00 00 00 00 00 00 00 00 00 80 1c 00 01 00 0b f9 e3
+        */
+//        TasmotaGlobal.restart_flag = 2;
         break;
     }
   } else {
@@ -879,6 +900,7 @@ void SSPMSerialInput(void) {
         if (crc_rcvd == crc_calc) {
           SSPMHandleReceivedData();
         } else {
+          Sspm->error_led_blinks = 20;
           AddLog(LOG_LEVEL_DEBUG, PSTR("SPM: CRC error"));
         }
         Sspm->serial_in_byte_counter = 0;
@@ -916,11 +938,14 @@ void SSPMInit(void) {
   pinMode(SSPM_GPIO_ARM_RESET, OUTPUT);
   digitalWrite(SSPM_GPIO_ARM_RESET, 1);
 
+  pinMode(SSPM_GPIO_LED_ERROR, OUTPUT);
+  digitalWrite(SSPM_GPIO_LED_ERROR, 0);
+
   if (0 == Settings->flag2.voltage_resolution) {
     Settings->flag2.voltage_resolution = 1;   // SPM has 2 decimals but this keeps the gui clean
     Settings->flag2.current_resolution = 2;   // SPM has 2 decimals
     Settings->flag2.wattage_resolution = 1;   // SPM has 2 decimals but this keeps the gui clean
-    Settings->flag2.energy_resolution = 0;    // SPM has no decimals on total energy
+    Settings->flag2.energy_resolution = 1;    // SPM has 2 decimals but this keeps the gui clean
   }
 
 #if CONFIG_IDF_TARGET_ESP32
@@ -949,11 +974,21 @@ void SSPMEvery100ms(void) {
     }
   }
 
+  if (Sspm->error_led_blinks) {
+    uint32_t state = 1;                        // Stay lit
+    if (Sspm->error_led_blinks < 255) {
+      Sspm->error_led_blinks--;
+      state = Sspm->error_led_blinks >> 1 &1;  // Blink every 0.4s
+    }
+    digitalWrite(SSPM_GPIO_LED_ERROR, state);
+  }
+
   // Fix race condition if the ARM doesn't respond
   if ((Sspm->mstate > SPM_NONE) && (Sspm->mstate < SPM_SEND_FUNC_UNITS)) {
     Sspm->counter++;
     if (Sspm->counter > 20) {
       Sspm->mstate = SPM_NONE;
+      Sspm->error_led_blinks = 255;
     }
   }
   switch (Sspm->mstate) {
@@ -1082,29 +1117,30 @@ bool SSPMButton(void) {
 /*********************************************************************************************/
 
 const uint16_t SSPM_SIZE = 128;
-const char kSSPMEnergyPhases[] PROGMEM = "%*_f</td><td>%*_f</td><td>%*_f</td><td>%*_f</td><td style='white-space:nowrap'>|[%*_f,%*_f,%*_f,%*_f]";
 
-char* SSPMEnergyFormat(char* result, float* input, uint32_t resolution, bool json) {
-  char layout[100];
-  GetTextIndexed(layout, sizeof(layout), json, kSSPMEnergyPhases);
-  ext_snprintf_P(result, SSPM_SIZE, layout, resolution, &input[0], resolution, &input[1], resolution, &input[2], resolution, &input[3]);
+char* SSPMEnergyFormat(char* result, float* input, uint32_t resolution, uint8_t* indirect, uint8_t offset, uint32_t count) {
+  result[0] = '\0';
+  for (uint32_t i = 0; i < count; i++) {
+    ext_snprintf_P(result, SSPM_SIZE, PSTR("%s<td>%*_f</td>"), result, resolution, &input[indirect[offset +i]]);
+  }
+  ext_snprintf_P(result, SSPM_SIZE, PSTR("%s<td style='white-space:nowrap'>"), result);
   return result;
 }
 
 const char HTTP_SSPM_VOLTAGE[] PROGMEM =
-  "{s}" D_VOLTAGE "</th><td>%s" D_UNIT_VOLT "{e}";  // {s} = <tr><th>, {m} = </th><td style='width:20px;white-space:nowrap'>, {e} = </td></tr>
+  "{s}" D_VOLTAGE "</th>%s" D_UNIT_VOLT "{e}";  // {s} = <tr><th>, {m} = </th><td style='width:20px;white-space:nowrap'>, {e} = </td></tr>
 const char HTTP_SSPM_CURRENT[] PROGMEM =
-  "{s}" D_CURRENT "</th><td>%s" D_UNIT_AMPERE "{e}";
+  "{s}" D_CURRENT "</th>%s" D_UNIT_AMPERE "{e}";
 const char HTTP_SSPM_POWER[] PROGMEM =
-  "{s}" D_POWERUSAGE_ACTIVE "</th><td>%s" D_UNIT_WATT "{e}";
+  "{s}" D_POWERUSAGE_ACTIVE "</th>%s" D_UNIT_WATT "{e}";
 const char HTTP_SSPM_POWER2[] PROGMEM =
-  "{s}" D_POWERUSAGE_APPARENT "</th><td>%s" D_UNIT_VA "{e}"
-  "{s}" D_POWERUSAGE_REACTIVE "</th><td>%s" D_UNIT_VAR "{e}"
-  "{s}" D_POWER_FACTOR "</th><td>%s{e}";
+  "{s}" D_POWERUSAGE_APPARENT "</th>%s" D_UNIT_VA "{e}"
+  "{s}" D_POWERUSAGE_REACTIVE "</th>%s" D_UNIT_VAR "{e}"
+  "{s}" D_POWER_FACTOR "</th>%s{e}";
 const char HTTP_SSPM_ENERGY[] PROGMEM =
-  "{s}" D_ENERGY_TODAY "</th><td>%s" D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_ENERGY_YESTERDAY "</th><td>%s" D_UNIT_KILOWATTHOUR "{e}"
-  "{s}" D_ENERGY_TOTAL "</th><td>%s" D_UNIT_KILOWATTHOUR "{e}";
+  "{s}" D_ENERGY_TODAY "</th>%s" D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_ENERGY_YESTERDAY "</th>%s" D_UNIT_KILOWATTHOUR "{e}"
+  "{s}" D_ENERGY_TOTAL "</th>%s" D_UNIT_KILOWATTHOUR "{e}";
 
 void SSPMEnergyShow(bool json) {
   if (!TasmotaGlobal.devices_present) { return; }  // Not ready yet
@@ -1112,18 +1148,18 @@ void SSPMEnergyShow(bool json) {
   if (json) {
     ResponseAppend_P(PSTR(",\"SPM\":{\"" D_JSON_ENERGY "\":["));
     for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
-      ResponseAppend_P(PSTR("%s%*_f"), (i>0)?",":"", -1, &Sspm->energy_total[i >>2][i &3]);
+      ResponseAppend_P(PSTR("%s%*_f"), (i>0)?",":"", Settings->flag2.energy_resolution, &Sspm->energy_total[i >>2][i &3]);
     }
 #ifdef SSPM_JSON_ENERGY_YESTERDAY
     ResponseAppend_P(PSTR("],\"" D_JSON_YESTERDAY "\":["));
     for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
-      ResponseAppend_P(PSTR("%s%*_f"), (i>0)?",":"", -1, &Sspm->energy_today[i >>2][i &3]);
+      ResponseAppend_P(PSTR("%s%*_f"), (i>0)?",":"", Settings->flag2.energy_resolution, &Sspm->energy_yesterday[i >>2][i &3]);
     }
 #endif
 #ifdef SSPM_JSON_ENERGY_TODAY
     ResponseAppend_P(PSTR("],\"" D_JSON_TODAY "\":["));
     for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
-      ResponseAppend_P(PSTR("%s%*_f"), (i>0)?",":"", -1, &Sspm->energy_yesterday[i >>2][i &3]);
+      ResponseAppend_P(PSTR("%s%*_f"), (i>0)?",":"", Settings->flag2.energy_resolution, &Sspm->energy_today[i >>2][i &3]);
     }
 #endif
     ResponseAppend_P(PSTR("],\"" D_JSON_ACTIVE_POWERUSAGE "\":["));
@@ -1152,30 +1188,50 @@ void SSPMEnergyShow(bool json) {
     }
     ResponseAppend_P(PSTR("]}"));
   } else {
-    Sspm->rotate++;
-    if (Sspm->rotate >= TasmotaGlobal.devices_present) {
-      Sspm->rotate = 0;
+    uint8_t relay[SSPM_MAX_MODULES * 4];
+    uint8_t indirect[SSPM_MAX_MODULES * 4];
+
+    uint32_t index = 0;
+    power_t power = TasmotaGlobal.power;
+    for (uint32_t i = 0; i < TasmotaGlobal.devices_present; i++) {
+      if ((0 == Settings->sbflag1.sspm_display) ||
+          ((1 == Settings->sbflag1.sspm_display) && (power >> i) &1)) {
+        relay[index] = i +1;
+        indirect[index] = i;
+        index++;
+      }
     }
-    uint32_t module = Sspm->rotate >> 2;
-    uint32_t relay_base = module * 4;
-    WSContentSend_P(PSTR("</table>{t}{s}")); // First column is empty ({t} = <table style='width:100%'>, {s} = <tr><th>)
-    for (uint32_t i = 1; i < 5; i++) {
-      WSContentSend_P(PSTR("</th><th style='width:60px;white-space:nowrap'>L%d"), relay_base +i);
+
+    if (index) {
+      uint32_t offset = 0;
+      if (index > 4) {
+        Sspm->rotate++;
+        if (Sspm->rotate >= ((index -1) >> 2) << 3) {
+          Sspm->rotate = 0;
+        }
+        offset = (Sspm->rotate >> 2) * 4;
+      }
+      uint32_t count = index - offset;
+      if (count > 4) { count = 4; }
+      WSContentSend_P(PSTR("</table>{t}{s}")); // First column is empty ({t} = <table style='width:100%'>, {s} = <tr><th>)
+      for (uint32_t i = 0; i < count; i++) {
+        WSContentSend_P(PSTR("</th><th style='width:60px;white-space:nowrap'>L%d"), relay[offset +i]);
+      }
+      WSContentSend_P(PSTR("</th><td>{e}"));   // Last column is units ({e} = </td></tr>)
+      char value_chr[SSPM_SIZE];
+      WSContentSend_PD(HTTP_SSPM_VOLTAGE, SSPMEnergyFormat(value_chr, Sspm->voltage[0], Settings->flag2.voltage_resolution, indirect, offset, count));
+      WSContentSend_PD(HTTP_SSPM_CURRENT, SSPMEnergyFormat(value_chr, Sspm->current[0], Settings->flag2.current_resolution, indirect, offset, count));
+      WSContentSend_PD(HTTP_SSPM_POWER,   SSPMEnergyFormat(value_chr, Sspm->active_power[0], Settings->flag2.wattage_resolution, indirect, offset, count));
+      char valu2_chr[SSPM_SIZE];
+      char valu3_chr[SSPM_SIZE];
+      WSContentSend_PD(HTTP_SSPM_POWER2,  SSPMEnergyFormat(value_chr, Sspm->apparent_power[0], Settings->flag2.wattage_resolution, indirect, offset, count),
+                                          SSPMEnergyFormat(valu2_chr, Sspm->reactive_power[0], Settings->flag2.wattage_resolution, indirect, offset, count),
+                                          SSPMEnergyFormat(valu3_chr, Sspm->power_factor[0], 2, indirect, offset, count));
+      WSContentSend_PD(HTTP_SSPM_ENERGY,  SSPMEnergyFormat(value_chr, Sspm->energy_today[0], Settings->flag2.energy_resolution, indirect, offset, count),
+                                          SSPMEnergyFormat(valu2_chr, Sspm->energy_yesterday[0], Settings->flag2.energy_resolution, indirect, offset, count),
+                                          SSPMEnergyFormat(valu3_chr, Sspm->energy_total[0], Settings->flag2.energy_resolution, indirect, offset, count));
+      WSContentSend_P(PSTR("</table>{t}"));    // {t} = <table style='width:100%'> - Define for next FUNC_WEB_SENSOR
     }
-    WSContentSend_P(PSTR("</th><td>{e}"));   // Last column is units ({e} = </td></tr>)
-    char value_chr[SSPM_SIZE];
-    WSContentSend_PD(HTTP_SSPM_VOLTAGE, SSPMEnergyFormat(value_chr, Sspm->voltage[module], Settings->flag2.voltage_resolution, json));
-    WSContentSend_PD(HTTP_SSPM_CURRENT, SSPMEnergyFormat(value_chr, Sspm->current[module], Settings->flag2.current_resolution, json));
-    WSContentSend_PD(HTTP_SSPM_POWER,   SSPMEnergyFormat(value_chr, Sspm->active_power[module], Settings->flag2.wattage_resolution, json));
-    char valu2_chr[SSPM_SIZE];
-    char valu3_chr[SSPM_SIZE];
-    WSContentSend_PD(HTTP_SSPM_POWER2,  SSPMEnergyFormat(value_chr, Sspm->apparent_power[module], Settings->flag2.wattage_resolution, json),
-                                        SSPMEnergyFormat(valu2_chr, Sspm->reactive_power[module], Settings->flag2.wattage_resolution, json),
-                                        SSPMEnergyFormat(valu3_chr, Sspm->power_factor[module], 2, json));
-    WSContentSend_PD(HTTP_SSPM_ENERGY,  SSPMEnergyFormat(value_chr, Sspm->energy_today[module], Settings->flag2.energy_resolution, json),
-                                        SSPMEnergyFormat(valu2_chr, Sspm->energy_yesterday[module], Settings->flag2.energy_resolution, json),
-                                        SSPMEnergyFormat(valu3_chr, Sspm->energy_total[module], Settings->flag2.energy_resolution, json));
-    WSContentSend_P(PSTR("</table>{t}"));    // {t} = <table style='width:100%'> - Define for next FUNC_WEB_SENSOR
   }
 }
 
@@ -1184,10 +1240,10 @@ void SSPMEnergyShow(bool json) {
 \*********************************************************************************************/
 
 const char kSSPMCommands[] PROGMEM = "SSPM|"  // Prefix
-  "Log|Energy|History|Scan|IamHere" ;
+  "Log|Energy|History|Scan|IamHere|Display|Reset" ;
 
 void (* const SSPMCommand[])(void) PROGMEM = {
-  &CmndSSPMLog, &CmndSSPMEnergy, &CmndSSPMEnergyHistory, &CmndSSPMScan, &CmndSSPMIamHere };
+  &CmndSSPMLog, &CmndSSPMEnergy, &CmndSSPMEnergyHistory, &CmndSSPMScan, &CmndSSPMIamHere, &CmndSSPMDisplay, &CmndSSPMReset };
 
 void CmndSSPMLog(void) {
   // Report 29 log entries
@@ -1216,12 +1272,32 @@ void CmndSSPMScan(void) {
 }
 
 void CmndSSPMIamHere(void) {
-  // Blink module COMM led containing relay
+  // Blink module ERROR led containing relay
   if ((XdrvMailbox.payload < 1) || (XdrvMailbox.payload > TasmotaGlobal.devices_present)) { XdrvMailbox.payload = 1; }
   SSPMSendIAmHere(XdrvMailbox.payload -1);
   ResponseCmndDone();
 }
 
+void CmndSSPMDisplay(void) {
+  // Select either all relays or only powered on relays
+  if ((XdrvMailbox.payload >= 0) && (XdrvMailbox.payload <= 1)) {
+    Settings->sbflag1.sspm_display = XdrvMailbox.payload;
+  }
+  ResponseCmndNumber(Settings->sbflag1.sspm_display);
+}
+
+void CmndSSPMReset(void) {
+  // Reset ARM and restart
+  if (1 == XdrvMailbox.payload) {
+    Sspm->mstate = SPM_NONE;
+    SSPMSendCmnd(SSPM_FUNC_RESET);
+    TasmotaGlobal.restart_flag = 3;
+    ResponseCmndChar(PSTR(D_JSON_RESET_AND_RESTARTING));
+  } else {
+    ResponseCmndChar(PSTR(D_JSON_ONE_TO_RESET));
+  }
+}
+
 /*********************************************************************************************\
  * Interface
 \*********************************************************************************************/
diff --git a/tasmota/xdsp_17_universal.ino b/tasmota/xdsp_17_universal.ino
index b80205029..a37d5af5e 100644
--- a/tasmota/xdsp_17_universal.ino
+++ b/tasmota/xdsp_17_universal.ino
@@ -55,7 +55,7 @@ void Core2DisplayDim(uint8_t dim);
 #ifndef DISP_DESC_FILE
 //#define DISP_DESC_FILE "/dispdesc.txt"
 #define DISP_DESC_FILE "/display.ini"
-#endif
+#endif // DISP_DESC_FILE
 
 /*********************************************************************************************/
 #ifdef DSP_ROM_DESC
@@ -95,7 +95,7 @@ int8_t cs;
         AddLog(LOG_LEVEL_INFO, PSTR("DSP: File descriptor used"));
       }
     }
-#endif
+#endif // USE_UFILESYS
 
 
 #ifdef USE_SCRIPT
@@ -212,8 +212,8 @@ int8_t cs;
         replacepin(&cp, Pin(GPIO_SPI_CLK, 1));
         replacepin(&cp, Pin(GPIO_SPI_MOSI, 1));
         replacepin(&cp, Pin(GPIO_SPI_DC, 1));
-        replacepin(&cp, Pin(GPIO_BACKLIGHT, 1));
-        replacepin(&cp, Pin(GPIO_OLED_RESET, 1));
+        replacepin(&cp, Pin(GPIO_BACKLIGHT));
+        replacepin(&cp, Pin(GPIO_OLED_RESET));
         replacepin(&cp, Pin(GPIO_SPI_MISO, 1));
       } else {
         // soft spi pins
@@ -280,9 +280,9 @@ int8_t cs;
       else FT5206_Touch_Init(Wire1);
 #else
       if (!wire_n) FT5206_Touch_Init(Wire);
-#endif
+#endif // ESP32
     }
-#endif
+#endif // USE_FT5206
 
 #ifdef USE_XPT2046
     cp = strstr(ddesc, ":TS,");
@@ -291,7 +291,7 @@ int8_t cs;
       uint8_t touch_cs = replacepin(&cp, Pin(GPIO_XPT2046_CS));
 	    XPT2046_Touch_Init(touch_cs);
     }
-#endif
+#endif // USE_XPT2046
 
     uint8_t inirot = Settings->display_rotate;
 
@@ -314,18 +314,18 @@ int8_t cs;
 #ifdef USE_M5STACK_CORE2
     renderer->SetPwrCB(Core2DisplayPower);
     renderer->SetDimCB(Core2DisplayDim);
-#endif
+#endif // USE_M5STACK_CORE2
 
     renderer->DisplayInit(DISPLAY_INIT_MODE, Settings->display_size, inirot, Settings->display_font);
 
     Settings->display_width = renderer->width();
     Settings->display_height = renderer->height();
-    
+
     ApplyDisplayDimmer();
 
 #ifdef SHOW_SPLASH
     renderer->Splash();
-#endif
+#endif // SHOW_SPLASH
 
     udisp_init_done = true;
     AddLog(LOG_LEVEL_INFO, PSTR("DSP: %s!"), renderer->devname());
diff --git a/tasmota/xlgt_07_lsc_mcsl.ino b/tasmota/xlgt_07_lsc_mcsl.ino
new file mode 100644
index 000000000..9e8ec00e6
--- /dev/null
+++ b/tasmota/xlgt_07_lsc_mcsl.ino
@@ -0,0 +1,258 @@
+/*
+  xlgt_07_lsc_mcsl.ino - GPE Multi color smart light support for Tasmota
+
+  Copyright (C) 2021  Theo Arends
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifdef USE_LIGHT
+#ifdef USE_LSC_MCSL
+/*********************************************************************************************\
+ * Golden Power Electronics Integrated Switching Power Supply with Built-in Controller
+ * GP-SW084-052 uses an ESP8285 (TYWE2S) and submicrocontroller controlling two wire RGB leds
+ * https://www.gp-electronic.com/product/integrated-switching-power-supply-with-built-in-controller/eugs/european-vertical-6w8-function.html
+ *
+ * Template:
+ * {"NAME":"LSC MC Lights","GPIO":[0,0,0,0,544,32,0,0,3840,0,3872,0,0,0],"FLAG":0,"BASE":18}
+ *
+ * NL: Action LSC Multi color smart lights
+ *
+ * Button usage:
+ * Single press = Power On / Off
+ * Double press = Cycle Colors
+ * Triple press = Cycle Effects
+ *
+ * HSBColor    Color
+ * ----------  -----------
+ *   1 .. 45   R   (Red)
+ *  46 .. 90   RG  (Yellow)
+ *  91 .. 135  G   (Green)
+ * 136 .. 179  GB  (Light Blue)
+ * 180 .. 224  B   (Blue)
+ * 225 .. 269  RB  (Purple)
+ * 270 .. 314  RGB (White)
+ * 315 .. 360      (Alternating)
+ *
+ * Dimmer      Effect
+ * ----------  ---------------------------
+ *   0 .. 12   Bright (Steady On)
+ *  13 .. 24   Gradually (Slow Fade)
+ *  25 .. 37   Star (Sequential)
+ *  38 .. 49   Flower (In Waves)
+ *  50 .. 62   Marquee (Chasing / Flash)
+ *  63 .. 74   Fireworks (Twinkle / Flash)
+ *  75 .. 87   Meteor
+ *  88 .. 100  Stream
+ *
+ * GPIO04 = Green led
+ * GPIO05 = Button
+ * GPIO12 = Data to submicrocontroller
+ * GPIO14 = Reset to submicrocontroller (26ms active high)
+\*********************************************************************************************/
+
+#define XLGT_07               7
+
+#define LSCMC_GPIO_DATA       12
+#define LSCMC_GPIO_RESET      14
+
+#define LSCMC_BIT_TIME        600   // us
+
+const uint16_t kLscMcData[] PROGMEM = {
+  //R     RG      G       GB      B       RB      RGB     RGBa
+  0x0F4D, 0x0745, 0x08B5, 0x0340, 0x0CB0, 0x04B8, 0x0B48, 0x0143,    // Bright (Steady on)
+  0x8FED, 0x87E5, 0x8815, 0x83E0, 0x8C10, 0x8418, 0x8BE8, 0x81E3,    // Gradually (Slow Fade)
+  0x70ED, 0x78E5, 0x7715, 0x7CE0, 0x7510, 0x7B18, 0x74E8, 0x7EE3,    // Star (Sequential)
+  0xCF92, 0xC79A, 0xC86A, 0xC39F, 0xCC6F, 0xC467, 0xCB97, 0xC19C,    // Flower (In Waves)
+  0x3093, 0x389A, 0x376A, 0x3C9F, 0x336F, 0x3B67, 0x3497, 0x3E9C,    // Marquee (Chasing / Flash)
+  0xB02D, 0xB825, 0xB7D5, 0xBC20, 0xB3D0, 0xBBD8, 0xB428, 0xBE23,    // Fireworks (Twinkle / Flash)
+  0x4F2D, 0x4725, 0x48D5, 0x4320, 0x4CD0, 0x44D8, 0x4B28, 0x4123,    // Meteor
+  0xEFAD, 0xE7A5, 0xE855, 0xE3A1, 0xEC50, 0xE458, 0xEBA8, 0xE1A3     // Stream
+};
+
+#include <Ticker.h>
+Ticker LscMcStartDelay;
+
+struct LSCMC {
+  uint32_t last_send;
+  uint8_t function;
+  uint8_t color;
+  uint8_t dimmer;
+  uint8_t power;
+  uint8_t scheme_offset;
+  uint8_t pin;
+} Lscmc;
+
+/*********************************************************************************************/
+
+void LscMcSend(void) {
+  Lscmc.function &= 0x7;
+  Lscmc.color &= 0x7;
+  uint16_t fc = pgm_read_word(kLscMcData + (8 * Lscmc.function) + Lscmc.color);
+
+  uint32_t data;
+  if (Lscmc.power) {
+    data = 0xC2FF0000 | fc;
+  } else {
+    data = Lscmc.last_send & 0xFF00FFFF;
+    data ^= 0x0000FF00;
+  }
+
+  if (data == Lscmc.last_send) { return; }
+
+  AddLog(LOG_LEVEL_DEBUG_MORE, PSTR("LSC: Function %d, Color %d, State %d, Send %08X"),
+    Lscmc.function, Lscmc.color, Lscmc.power, data);
+
+  Lscmc.last_send = data;
+
+  digitalWrite(Lscmc.pin, LOW);
+  delayMicroseconds(LSCMC_BIT_TIME * 15);
+  digitalWrite(Lscmc.pin, HIGH);
+  delayMicroseconds(LSCMC_BIT_TIME * 7 + (LSCMC_BIT_TIME / 2));
+  digitalWrite(Lscmc.pin, LOW);
+  delayMicroseconds(LSCMC_BIT_TIME);
+  digitalWrite(Lscmc.pin, HIGH);
+  bool last_bit = 0;
+  bool bit = 0;
+  uint32_t bit_mask = 0x80000000;
+  for (uint32_t i = 0; i < 32; i++) {
+    bit = (data & bit_mask);
+    if (bit != last_bit) {
+      delayMicroseconds(LSCMC_BIT_TIME * 3);  // Switch bit state
+    } else {
+      delayMicroseconds(LSCMC_BIT_TIME);
+    }
+    digitalWrite(Lscmc.pin, LOW);
+    delayMicroseconds(LSCMC_BIT_TIME);
+    digitalWrite(Lscmc.pin, HIGH);
+    last_bit = bit;
+    bit_mask >>= 1;
+  }
+}
+
+/*********************************************************************************************/
+
+bool LscMcSetChannelsFromFunc(void) {
+  // Use power for Off / On
+  uint8_t power = Light.power;
+  bool power_changed = (Lscmc.power != power);
+  Lscmc.power = power;
+
+  // Use dimmer for function
+  uint8_t dimmer = light_state.getDimmer();
+/*
+  dimmer = changeUIntScale(dimmer, 0, 100, 0, 3);
+  dimmer = changeUIntScale(dimmer, 0, 3, 0, 255);
+  bool dimmer_changed = (Lscmc.dimmer != dimmer);
+  Lscmc.dimmer= dimmer;
+*/
+  uint8_t function = changeUIntScale(dimmer, 0, 100, 0, 7);
+  bool function_changed = (Lscmc.function != function);
+  Lscmc.function = function;
+
+  uint16_t hue;
+  uint8_t sat;
+  LightGetHSB(&hue, &sat, nullptr);
+/*
+  // Use saturation for function (won't work as if sat = 0 this function is not called)
+  uint8_t function = changeUIntScale(sat, 0, 255, 0, 7);
+  bool function_changed = (Lscmc.function != function);
+  Lscmc.function = function;
+*/
+  // Use hue for color
+  uint8_t color = changeUIntScale(hue, 1, 359, 0, 7);
+  bool color_changed = (Lscmc.color != color);
+  Lscmc.color = color;
+
+//  AddLog(LOG_LEVEL_DEBUG, PSTR("LSC: Power %d, Hue %d = Color %d, Dimmer %d = Function %d"),
+//    Lscmc.power, hue, Lscmc.color, dimmer, Lscmc.function);
+
+  if (!power_changed && !function_changed && !color_changed) { return true; }
+
+  static bool first_call = true;
+  if (first_call) {
+    LscMcStartDelay.once_ms(900, LscMcSend);  // Allow startup time for microcontroller
+    first_call = false;
+  } else {
+    LscMcSend();
+  }
+
+  return true;
+}
+
+bool LscMcMultiButtonPressed(void) {
+  if (XdrvMailbox.index != 0) { return false; }  // button_index
+
+  char command[20];
+
+  uint32_t press_counter = XdrvMailbox.payload;
+  if (2 == press_counter) {         // Color rotate
+    uint32_t color = Lscmc.color +1;
+    if (color > 7) { color = 0; }
+    snprintf_P(command, sizeof(command), PSTR(D_CMND_HSBCOLOR " %d"), (color * (360 / 8)) + ((360 / 8) / 2));
+    ExecuteCommand(command, SRC_BUTTON);
+  } else if (3 == press_counter) {  // Function rotate
+    uint32_t function = Lscmc.function +1;
+    if (function > 7) { function = 0; }
+    snprintf_P(command, sizeof(command), PSTR(D_CMND_DIMMER " %d"), (function * (100 / 8)) + ((100 / 8) / 2));
+    ExecuteCommand(command, SRC_BUTTON);
+  }
+  return true;
+}
+
+void LscMcModuleSelected(void) {
+  if (!ValidTemplate(PSTR("LSC MC Lights"))) { return; }
+  if (!PinUsed(GPIO_OUTPUT_HI) || !PinUsed(GPIO_OUTPUT_LO)) { return; }
+
+  Lscmc.pin = Pin(GPIO_OUTPUT_HI);
+
+  uint32_t pin_reset = Pin(GPIO_OUTPUT_LO);
+  digitalWrite(pin_reset, HIGH);
+  delay(26);
+  digitalWrite(pin_reset, LOW);
+
+  Settings->flag.button_single = 0;           // SetOption13 - We need multi press detection
+  Settings->flag3.slider_dimmer_stay_on = 1;  // SetOption77 - We need dimmer to keep power on at 0
+
+  Lscmc.last_send = 0xC2FFEBA8;
+
+  TasmotaGlobal.light_type = LT_RGB;
+  TasmotaGlobal.light_driver = XLGT_07;
+//  AddLog(LOG_LEVEL_DEBUG, PSTR("LGT: LSC Multi Color Found"));
+}
+
+/*********************************************************************************************\
+ * Interface
+\*********************************************************************************************/
+
+bool Xlgt07(uint8_t function)
+{
+  bool result = false;
+
+  switch (function) {
+    case FUNC_SET_CHANNELS:
+      result = LscMcSetChannelsFromFunc();
+      break;
+    case FUNC_BUTTON_MULTI_PRESSED:
+      result = LscMcMultiButtonPressed();
+      break;
+    case FUNC_MODULE_INIT:
+      LscMcModuleSelected();
+      break;
+  }
+  return result;
+}
+
+#endif  // USE_LSC_MCSL
+#endif  // USE_LIGHT
\ No newline at end of file
diff --git a/tasmota/xsns_53_sml.ino b/tasmota/xsns_53_sml.ino
index 7674f5cf0..d001af112 100755
--- a/tasmota/xsns_53_sml.ino
+++ b/tasmota/xsns_53_sml.ino
@@ -1555,16 +1555,22 @@ void SML_Decode(uint8_t index) {
             double vdiff = meter_vars[ind - 1] - dvalues[dindex];
             dvalues[dindex] = meter_vars[ind - 1];
             double dres = (double)360000.0 * vdiff / ((double)dtime / 10000.0);
-#ifdef USE_SML_MEDIAN_FILTER
-            if (meter_desc_p[mindex].flag & 16) {
-              meter_vars[vindex] = sml_median(&sml_mf[vindex], dres);
-            } else {
-              meter_vars[vindex] = dres;
-            }
-#else
-            meter_vars[vindex] = dres;
-#endif
 
+            dvalid[vindex] += 1;
+
+            if (dvalid[vindex] >= 2) {
+              // differece is only valid after 2. calculation
+              dvalid[vindex] = 2;
+#ifdef USE_SML_MEDIAN_FILTER
+              if (meter_desc_p[mindex].flag & 16) {
+                meter_vars[vindex] = sml_median(&sml_mf[vindex], dres);
+              } else {
+                meter_vars[vindex] = dres;
+              }
+#else
+              meter_vars[vindex] = dres;
+#endif
+            }
             mp=strchr(mp,'@');
             if (mp) {
               mp++;
@@ -1573,7 +1579,7 @@ void SML_Decode(uint8_t index) {
               SML_Immediate_MQTT((const char*)mp, vindex, mindex);
             }
           }
-          dvalid[vindex] = 1;
+          //dvalid[vindex] = 1;
           dindex++;
         }
       } else if (*mp == 'h') {
@@ -2212,7 +2218,9 @@ uint8_t *script_meter;
 
 #ifdef SML_REPLACE_VARS
 
+#ifndef SML_SRCBSIZE
 #define SML_SRCBSIZE 256
+#endif
 
 uint32_t SML_getlinelen(char *lp) {
 uint32_t cnt;
@@ -2404,10 +2412,53 @@ dddef_exit:
             script_meter_desc[index].tsecs = strtol(lp, &lp, 10);
             if (*lp == ',') {
               lp++;
-              char txbuff[256];
+#if 1
+              // look ahead
+              uint16_t txlen = 0;
+              uint16_t tx_entries = 1;
+              char *txp = lp;
+              while (*txp) {
+                if (*txp == ',') tx_entries++;
+                if (*txp == SCRIPT_EOL) {
+                  if (tx_entries > 1) {
+                    if (*(txp - 1) != ',' ) {
+                      break;
+                    }
+                    // line ends with ,
+                  } else {
+                    // single entry
+                    break;
+                  }
+                }
+                txp++;
+                txlen++;
+              }
+              if (txlen) {
+                script_meter_desc[index].txmem = (char*)calloc(txlen + 2, 1);
+                if (script_meter_desc[index].txmem) {
+                  // now copy send blocks
+                  char *txp = lp;
+                  uint16_t tind = 0;
+                  for (uint32_t cnt = 0; cnt < txlen; cnt++) {
+                      if (*txp == SCRIPT_EOL) {
+                        txp++;
+                      } else {
+                        script_meter_desc[index].txmem[tind] = *txp++;
+                        tind++;
+                      }
+                  }
+                }
+                //AddLog(LOG_LEVEL_INFO, PSTR(">>> %s - %d"), script_meter_desc[index].txmem, txlen);
+                script_meter_desc[index].index = 0;
+                script_meter_desc[index].max_index = tx_entries;
+                sml_send_blocks++;
+                lp += txlen;
+              }
+#else
+              char txbuff[SML_SRCBSIZE];
               uint32_t txlen = 0, tx_entries = 1;
               for (uint32_t cnt = 0; cnt < sizeof(txbuff); cnt++) {
-                if (*lp == SCRIPT_EOL) {
+                if (*lp == SCRIPT_EOL && *(lp - 1) != ',' ) {
                   txbuff[cnt] = 0;
                   txlen = cnt;
                   break;
@@ -2424,6 +2475,7 @@ dddef_exit:
                 script_meter_desc[index].max_index = tx_entries;
                 sml_send_blocks++;
               }
+#endif
             }
           }
           if (*lp == SCRIPT_EOL) lp--;
diff --git a/tasmota/xsns_61_MI_NRF24.ino b/tasmota/xsns_61_MI_NRF24.ino
index 2dd3b90e4..f5f61e4e3 100644
--- a/tasmota/xsns_61_MI_NRF24.ino
+++ b/tasmota/xsns_61_MI_NRF24.ino
@@ -1438,7 +1438,7 @@ void MINRFhandleATCPacket(void){
   // AddLog(LOG_LEVEL_INFO,PSTR("NRF: ATC: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"),MINRF.buffer.raw[0],MINRF.buffer.raw[1],MINRF.buffer.raw[2],MINRF.buffer.raw[3],MINRF.buffer.raw[4],MINRF.buffer.raw[5],MINRF.buffer.raw[6],MINRF.buffer.raw[7],MINRF.buffer.raw[8],MINRF.buffer.raw[9],MINRF.buffer.raw[10],MINRF.buffer.raw[11]);
   if(_slot==0xff) return;
 
-  MIBLEsensors[_slot].temp = (float)(__builtin_bswap16(_packet->temp))/10.0f;
+  MIBLEsensors[_slot].temp = (float)(int16_t(__builtin_bswap16(_packet->temp)))/10.0f;
   MIBLEsensors[_slot].hum = (float)_packet->hum;
   MIBLEsensors[_slot].bat = _packet->batPer;
   MIBLEsensors[_slot].eventType.tempHum = 1;
diff --git a/tasmota/xsns_62_esp32_mi_ble.ino b/tasmota/xsns_62_esp32_mi_ble.ino
index 92fdf4de0..a1627cebe 100644
--- a/tasmota/xsns_62_esp32_mi_ble.ino
+++ b/tasmota/xsns_62_esp32_mi_ble.ino
@@ -2741,9 +2741,8 @@ void MI32ShowOneMISensor(){
             kMI32DeviceType[p->type-1],
             p->MAC[3], p->MAC[4], p->MAC[5]);
     }
-    char SensorTopic[60];
-    sprintf(SensorTopic, "tele/tasmota_ble/%s",
-      id);
+    char SensorTopic[TOPSZ];
+    GetTopic_P(SensorTopic, TELE, (char*)"tasmota_ble", id);
 
     MqttPublish(SensorTopic, Settings->flag.mqtt_sensor_retain);
     //AddLog(LOG_LEVEL_DEBUG,PSTR("M32: %s: show some %d %s"),D_CMND_MI32, MI32.mqttCurrentSlot, ResponseData());
@@ -2868,10 +2867,8 @@ void MI32DiscoveryOneMISensor(){
             p->MAC[3], p->MAC[4], p->MAC[5]);
     }
 
-    char SensorTopic[60];
-    sprintf(SensorTopic, "tele/tasmota_ble/%s",
-      id);
-
+    char SensorTopic[TOPSZ];
+    GetTopic_P(SensorTopic, TELE, (char*)"tasmota_ble", id);
 
     //int i = p->nextDiscoveryData*3;
     for (int i = 0; i < datacount*3; i += 3){
@@ -3063,7 +3060,7 @@ void MI32ShowTriggeredSensors(){
     #endif //USE_HOME_ASSISTANT
         MI32.option.MQTTType == 1
         ){
-        char SensorTopic[60];
+        char SensorTopic[TOPSZ];
         char idstr[32];
         const char *alias = BLE_ESP32::getAlias(p->MAC);
         const char *id = idstr;
@@ -3074,7 +3071,7 @@ void MI32ShowTriggeredSensors(){
                 kMI32DeviceType[p->type-1],
                 p->MAC[3], p->MAC[4], p->MAC[5]);
         }
-        snprintf_P(SensorTopic, sizeof(SensorTopic), PSTR("tele/tasmota_ble/%s"), id);
+        GetTopic_P(SensorTopic, TELE, (char*)"tasmota_ble", id);
         MqttPublish(SensorTopic, Settings->flag.mqtt_sensor_retain);
         AddLog(LOG_LEVEL_DEBUG, PSTR("M32: triggered %d %s"), sensor, ResponseData());
         XdrvRulesProcess(0);
diff --git a/tasmota/xsns_78_ezoo2.ino b/tasmota/xsns_78_ezoo2.ino
index ffeea4a86..81a40867e 100644
--- a/tasmota/xsns_78_ezoo2.ino
+++ b/tasmota/xsns_78_ezoo2.ino
@@ -39,7 +39,7 @@ struct EZOO2 : public EZOStruct {
     dtostrfd(O2, 2, str);
 
     if (json) {
-      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_O2 "\":%d}" ), name, str);
+      ResponseAppend_P(PSTR(",\"%s\":{\"" D_JSON_O2 "\":%s}" ), name, str);
 #ifdef USE_WEBSERVER
     }else {
       WSContentSend_PD(HTTP_SNS_O2, name, str);
diff --git a/tools/decode-status.py b/tools/decode-status.py
index f6d8a9b36..c234f8911 100755
--- a/tools/decode-status.py
+++ b/tools/decode-status.py
@@ -185,7 +185,9 @@ a_setoption = [[
     "(Web) Allow access without referer check",
     "(Energy) Show phase information",
     "(Debug) Show heap with logging timestamp",
-    "","","",
+    "(Tuya) Allow save dimmer = 0 receved by MCU",
+    "(TLS) Use fingerprint validation instead of CA based",
+    "(Shift595) Invert outputs of 74x595 shift registers",
     "","","","",
     "","","","",
     "","","",""
@@ -259,7 +261,7 @@ a_features = [[
     "USE_BM8563","USE_ENERGY_DUMMY","USE_AM2320","USE_T67XX",
     "USE_MCP2515","USE_TASMESH","USE_WIFI_RANGE_EXTENDER","USE_INFLUXDB",
     "USE_HRG15","USE_VINDRIKTNING","USE_SCD40","USE_HM330X",
-    "USE_HDC2010","","","",
+    "USE_HDC2010","USE_LSC_MCSL","USE_SONOFF_SPM","USE_SHIFT595",
     "","","","",
     "","","","",
     "","","",""
@@ -290,7 +292,7 @@ else:
         obj = json.load(fp)
 
 def StartDecode():
-    print ("\n*** decode-status.py v20211111 by Theo Arends and Jacek Ziolkowski ***")
+    print ("\n*** decode-status.py v20211205 by Theo Arends and Jacek Ziolkowski ***")
 
 #    print("Decoding\n{}".format(obj))