Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use of NimBLE, to keep BLE and WiFi connected at the same time #24

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
114 changes: 6 additions & 108 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,108 +1,6 @@

# Created by https://www.gitignore.io/api/clion+all,platformio,visualstudiocode
# Edit at https://www.gitignore.io/?templates=clion+all,platformio,visualstudiocode

### CLion+all ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/modules.xml
# .idea/*.iml
# .idea/modules

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### CLion+all Patch ###
# Ignores the whole .idea folder and all .iml files
# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360

.idea/

# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023

*.iml
modules.xml
.idea/misc.xml
*.ipr

### PlatformIO ###
.pioenvs
.piolibdeps
.clang_complete
.gcc-flags.json
CMakeListsPrivate.txt
CMakeLists.txt
cmake-build-debug

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json

### VisualStudioCode Patch ###
# Ignore all local history of files
.history

# End of https://www.gitignore.io/api/clion+all,platformio,visualstudiocode
#
secrets.h
.pio
.vscode/.browse.c_cpp.db*
.vscode/c_cpp_properties.json
.vscode/extensions.json
.vscode/launch.json
.vscode/ipch
1 change: 0 additions & 1 deletion .pio/build/project.checksum

This file was deleted.

13 changes: 13 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,17 @@
# esp32-keyble
## changes in this fork
Changes in this fork compared to https://github.com/lumokitho/
* <a href="https://github.com/h2zero/NimBLE-Arduino">NimBLE</a> is used as bluetooth stack. With this, both WiFi and BLE can be active at the same time
* some smaller changes in the eQ3 library to improve stability (see <a href="https://github.com/lumokitho/esp32-keyble/issues/2">here</a> and <a href="https://github.com/lumokitho/esp32-keyble/issues/3">here</a>)
* in file `main.cpp`
* WiFi is kept active
* BLE connection to the keylock is kept active. Doing so, the keylock stays very responsive, but drains more battery
* use of a hardware button connected to GPIO is commented out, because it constantly triggered if no button was connected to the GPIO
* Libraries "ArduinoJson", "AutoConnect", "PageBuilder", and "PubSubClient" are no longer saved as copies in folder "lib", but latest versions are retrieved from GitHub
* esp32 partition table `partitions_ble.csv` was removed (was no longer valid) and replaced with `min_spiffs.csv` (because of size of the firmware)

## original description

ESP32 port of the keyble library
working, with some additions!

Expand Down
9 changes: 0 additions & 9 deletions lib/ArduinoJson/.clang-format

This file was deleted.

1 change: 0 additions & 1 deletion lib/ArduinoJson/.gitattributes

This file was deleted.

16 changes: 0 additions & 16 deletions lib/ArduinoJson/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions lib/ArduinoJson/.mbedignore

This file was deleted.

1 change: 0 additions & 1 deletion lib/ArduinoJson/.piopm

This file was deleted.

1 change: 0 additions & 1 deletion lib/ArduinoJson/.prettierignore

This file was deleted.

5 changes: 0 additions & 5 deletions lib/ArduinoJson/ArduinoJson.h

This file was deleted.

Loading