MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-02 15:02:56 +01:00
Code Releases Wiki Activity
447 Commits 90 Branches 232 Tags 93 MiB
716bbc7b78
Commit Graph

335 Commits

Author SHA1 Message Date
Andreas Shimokawa
c98716d469 Morpheuz support: Fix 3.1 compatibility 2015-06-07 21:49:05 +02:00
cpfeiffer
ba76f64bf6 Disable context menu while busy and add "Disconnect" to context menu 2015-06-07 15:31:42 +02:00
cpfeiffer
ab97b544f0 Some cleanup + actually remember event time and kind for throttling 2015-06-06 23:59:53 +02:00
cpfeiffer
f5a569610f Wrap DeviceSupport instances. 
The wrapper provides support for busy-checking and throttling
(sometimes I get multiple events of the same kind within milli seconds
and the Mi Band vibrates 20 times)
 2015-06-06 23:54:34 +02:00
cpfeiffer
f6d5767276 Remove reference to PebbleIOThread from BluetoothCommunicationService 
Let PebbleSupport do this instead.
 2015-06-06 23:24:00 +02:00
cpfeiffer
3fe9195d0d Avoid warning in unsetDynamicState() 2015-06-06 23:13:26 +02:00
cpfeiffer
020d8d74d6 Added "Fetch Activity Data" to the context menu. 
With some kind of progress reporting during the fetching #45
 2015-06-06 19:39:04 +02:00
cpfeiffer
9e4e50be47 Initial work on synchronizing activity data with feedback. 
A device now has a busy flag (set during synchronization). While busy,
no other communication with the device shall occur (TODO)

Refactors the non-bluetooth actions a bit  #45

Next step: make use of the busy state in ControlCenter (show
a busy cursor) and in BluetoothCommunicationService (to not call other
operations while busy)
 2015-06-06 00:40:16 +02:00
cpfeiffer
2f0d00d645 avoid WITHOUT ROWID when not running at least lollipop #62 2015-06-06 00:10:38 +02:00
cpfeiffer
1e89b12b15 Avoid creating lots of SimpleDateFormat instances 2015-06-05 23:09:28 +02:00
cpfeiffer
dea4ee82a1 Merge branch 'db_refactoring_proposal' 2015-06-05 21:57:55 +02:00
cpfeiffer
c4096e6d3c Add daniele's db optimization the WITHOUT ROWID 
closes #62
 2015-06-05 21:46:56 +02:00
Andreas Shimokawa
b12a3e74cd MorpheuzSupport: remove limit of 54 samples. Morpheuz 3.1 supports 60 2015-06-05 20:26:11 +02:00
Andreas Shimokawa
baecc20742 SleepMonitorActivity: Rotate annotation text for better readability 2015-06-05 19:59:58 +02:00
Andreas Shimokawa
813a02d5c7 Unify SleepMonitor with code from PR #59. Thanks Daniele! 2015-06-05 19:32:09 +02:00
cpfeiffer
2f1908e480 Make sure to always close the database 2015-06-04 23:45:46 +02:00
Daniele Gobbetti
fc374881c5 Get rid of the unused ID in the DB, this could help in: 
* reducing the used space
* reducing the time needed for inserts
 2015-06-04 21:37:48 +02:00
Carsten Pfeiffer
7ad38c5e1a Merge pull request #61 from danielegobbetti/fix_data_in_the_future 
Do not iterate over the whole buffer, but only on the effectively use…
 2015-06-04 21:15:52 +02:00
Daniele Gobbetti
a1ff9aab21 Do not iterate over the whole buffer, but only on the effectively used part. 
This should fix the "data in the future" issue
 2015-06-04 18:56:35 +02:00
Andreas Shimokawa
7d86396e30 Support CM 12.1 Music App 2015-06-02 21:48:21 +02:00
Daniele Gobbetti
406f9ab90d Do not allocate the buffer if there's no data available. 
Perhaps could fix the "data in the future" issue
 2015-06-02 18:33:12 +02:00
Daniele Gobbetti
9e2d32c33f Fixed timestamp conversion for DB, added local variables to make the code clearer 2015-06-01 22:20:28 +02:00
Daniele Gobbetti
ea97a902d1 *unchecked* Storing activity values in the DB. 2015-06-01 22:20:28 +02:00
Daniele Gobbetti
8b268a676c Refactoring of the data ingestion method. 
* no more ByteBuffer, but a fixed size byte array that gets flushed everytime it's needed
* log of activity data to a separate file (no DB integration yet)
* the size of the buffer must be a multiple of 3 (1 minute of data = 3 bytes) and 20 (the normal size of the chunks we get from the device)
* better logging and more comments in code
 2015-06-01 22:20:22 +02:00
cpfeiffer
5d950dc407 Fix reconnection after connection loss 
Well, obviously we must not ignore connection state changes even if they
come with an error code.

Unfortunately the API docs are a bit terse in that respect.
 2015-06-01 21:47:02 +02:00
cpfeiffer
7f89f4bb57 Some fixes regarding device initialization, should avoid disconnects 
Avoid repeated initializations and device info requests. Fix unsetting
of dynamic state (e.g. battery info) when initialized.
 2015-06-01 21:47:02 +02:00
Daniele Gobbetti
f60903699e Delete MiBandSupport.java.orig 
I believe it was committed by mistake (perhaps a merge conflict?) It's out of date in any case.
 2015-06-01 21:47:02 +02:00
cpfeiffer
11884d8073 Improve logging 2015-06-01 21:47:02 +02:00
cpfeiffer
75b9fe4c4d ignore connection state changes with status != GATT_SUCCESS 
And add logging. Maybe this helps with #57
 2015-06-01 21:47:02 +02:00
Daniele Gobbetti
228e922ce7 forgotten refactor of a variable 2015-06-01 21:47:01 +02:00
Daniele Gobbetti
e4076dc725 Ingesting the activity data the right way, but they are still being thrown away afterwards. 2015-06-01 21:47:01 +02:00
cpfeiffer
92caed5af4 Some cleanup 2015-06-01 21:47:01 +02:00
cpfeiffer
a7792f6b72 improve some log statements 2015-06-01 21:47:01 +02:00
cpfeiffer
637b43e892 Also wait for descriptor reads and writes 
(not just characteristic reads/writes)

This fixes initialization of notification characteristics
(activity, sensor data, battery, ...)
 2015-06-01 21:47:01 +02:00
cpfeiffer
f004b7b11c WIP for fetching activity data 
This probably affects #44 and #45

Thanks go to Daniele Gobbetti <daniele@gobbetti.name>!
 2015-06-01 21:47:01 +02:00
Andreas Shimokawa
6ea9537d38 Start sleep activity with context menu (long press on a device) 
This allows to see sleep data even if devices are not connected.
 2015-06-01 16:57:45 +02:00
Andreas Shimokawa
81b1d1d28d Pebble: Put WeatherNeat test in separate file 2015-05-30 22:24:53 +02:00
Andreas Shimokawa
603d31a59e add some constants to GBActivitySample 2015-05-30 21:52:29 +02:00
Andreas Shimokawa
41207516b1 Move BluetoothChangeReceiver to externalevents 2015-05-30 21:40:42 +02:00
Andreas Shimokawa
900b3f3833 use ORDER BY timestamp in SQL statement 
Also optimize imports...
 2015-05-30 17:40:23 +02:00
Andreas Shimokawa
e79f4523c3 Add SQLite database support for activity data 
This is now used for morpheuz data and the SleepMonitorActivity
 2015-05-30 17:28:03 +02:00
Andreas Shimokawa
08fbbb9152 SleepMonitor: draw colored bars instead of a graph 
red = awake
yellow = light sleep
greep = deep sleep
 2015-05-27 00:59:05 +02:00
Andreas Shimokawa
8366af736c Pebble: Fix firmware installation when all 8 app slots are in use 
We were trying to get a free slot when installing a firmware which is not neccessary.
This should also fix firmware installation in recovery (#54)
 2015-05-25 01:26:27 +02:00
Carsten Pfeiffer
6fb6b5c164 Merge pull request #55 from danielegobbetti/master 
Use constants instead of hardcoded values
 2015-05-24 23:16:52 +02:00
cpfeiffer
8a26ce9d67 Pull evaluateGBDeviceCommand() and handle* methods up 
Otherwise, MiSupport can't use 'em
 2015-05-23 00:54:14 +02:00
cpfeiffer
4518e8819d Make file-logging configurable 2015-05-23 00:45:12 +02:00
cpfeiffer
880dc7b3a4 Improve BLE gatt handling 
- close() the gatt instance when explicitly disconnecting
- create a new gatt instance when explicitly connecting

Unfortunately I still appear to get spontaneous disconnects after some
notifications.
 2015-05-22 23:18:29 +02:00
Andreas Shimokawa
f54927624b Move non Pebble specific code from PebbleIoThread to AbstractBTDeviceSupport 2015-05-22 20:20:33 +02:00
Andreas Shimokawa
8309234784 Pebble: fix wrong calculation of timestamp. 2015-05-21 18:57:34 +02:00
Daniele Gobbetti
7e2545f9b4 Use constants instead of hardcoded values 2015-05-21 18:19:07 +02:00
Andreas Shimokawa
68b76aa5c5 Pebble: Get Morpheuz sleep data visualize through SleepMonitorActivity 
This very very experimental, and needs a complete overhaul.
But it is a start ;)
 2015-05-21 18:17:39 +02:00
Andreas Shimokawa
1c5d6de3ad Pebble: fix App installation 2015-05-18 23:14:32 +02:00
Andreas Shimokawa
50c7206cf6 Pebble: implement reboot 2015-05-18 22:40:39 +02:00
Andreas Shimokawa
c4f7fc1531 Start App on Pebble when tapping it AppManager 2015-05-18 22:20:01 +02:00
Andreas Shimokawa
c37cacf43d Remove id and index from GBDeviceApp in favor of UUIDs 2015-05-18 20:56:19 +02:00
cpfeiffer
d1d3e758d9 Support configurable notifications. Closes #53 
To close #29, we need to have a bit more configuration options than
just the number of vibrations. E.g.
- duration
- pause
- LED flashing (again, number of flashes, duration and pause, but also
  the colour and maybe which LEDs)

Also implements reboot-functionality for Mi Band.
 2015-05-17 22:57:37 +02:00
cpfeiffer
14a05c3383 Initial support for rebooting the device 
(via the Debug activity)
Attention: no safety-confirmation dialog yet!
 2015-05-17 21:58:08 +02:00
cpfeiffer
9819819b92 Create the wait-latch before running the action, and only if neeeded 
Otherwise the result handler might be called before the wait-latch
has been created, leading to a deadlock of the thread.

Also: only wait for read- and write actions, but not for wait-actions.
 2015-05-17 21:55:02 +02:00
Andreas Shimokawa
55400817b4 Pebble: experiment with extensible notifications 
This allows lot more flexible notifications including custom actions (replys, etc)

When used without actions it could serve as a simple replacement for the current notifications.
The main showstopper is that I do not know how to assign icons (mail, chat) to these.
Unfortunately I ended up in recovery when playing around with unknown parameters trial&error style.
 2015-05-15 21:34:38 +02:00
Andreas Shimokawa
2b98620ee0 Mi Band: Prepare preferences for vibration count, use number as input type for numeric field 2015-05-14 13:04:21 +02:00
cpfeiffer
562840a7c5 Actually call the new generic notification handler 2015-05-14 00:04:54 +02:00
Andreas Shimokawa
80eb386dd8 fix DebugActivity, was broken since we translated it :/ 2015-05-13 23:21:49 +02:00
cpfeiffer
d2bcccaeef Use logback-android for logging to external storage 
(no WRITE_EXTERNAL_STORAGE permission necessary!)
 2015-05-13 23:15:20 +02:00
cpfeiffer
27d725853f Add extra handler for generic notifications 
(instead of misusing onSMS handler). Pebble still does that,
but not everybody has to.

Small step for #53
 2015-05-13 21:55:22 +02:00
Andreas Shimokawa
c81e28c030 simplify code 2015-05-12 20:32:34 +02:00
Andreas Shimokawa
1b2f20160a fix some lint warnings, mostly simplifications 2015-05-12 20:09:35 +02:00
Andreas Shimokawa
f8341918ee compile fix 2015-05-12 11:12:53 +02:00
Andreas Shimokawa
7540a3955b Pebble: experiment with launching watchapps from Gadgetbridge 2015-05-12 11:06:22 +02:00
cpfeiffer
9a26769c3e Search & replace: use slf4j for logging instead of Logcat directly 
For a start, use android-logger as backend. Needs a better configuration
but no time right now.

For file-logging we will use logback as slf4j-implementation.
 2015-05-12 06:33:37 +02:00
Andreas Shimokawa
6fab01a3c2 Pebble: experimenting with more generic application message encoding 2015-05-11 23:30:38 +02:00
cpfeiffer
87512149a5 This should fix pebble-pairing on bt+btle devices #33 2015-05-11 00:50:18 +02:00
cpfeiffer
84d1e95767 Fix removal of async runnable to stop pairing after 60s (#3) 2015-05-10 23:14:32 +02:00
cpfeiffer
b25da80656 Stop discovery when attempting to pair #33 2015-05-10 21:35:31 +02:00
cpfeiffer
095ada8e5d Attempt to improve Pebble bonding when bonding fails #33 2015-05-10 21:32:41 +02:00
cpfeiffer
be52724fdd Also commit leftover 2015-05-10 21:19:24 +02:00
cpfeiffer
61e8d88de4 Rename constant 2015-05-10 21:13:05 +02:00
cpfeiffer
bd2d5fd608 Ensure that device list is refreshed when changing MAC address 
(the set-summary preference change listener overwrote our own
listener)
 2015-05-10 21:12:10 +02:00
Andreas Shimokawa
c8feea9f37 Refreshing device list when paired devices change now works. 
I was using LocalBroadcastManager.... :/
 2015-05-10 17:05:24 +02:00
Andreas Shimokawa
0d77a5ac05 Try to refresh device list if BluetoothDevice.ACTION_BOND_STATE_CHANGED is received. 
On my Android 4.4 device, this does not work however (no Intents arrive)
 2015-05-10 16:56:09 +02:00
Andreas Shimokawa
f101926186 Pebble: No pairing activity, just call createBond() and finish discovery activity 2015-05-10 16:27:31 +02:00
Andreas Shimokawa
a70426d84d Display found Pebbles in DiscoveryActivity 2015-05-10 15:52:19 +02:00
Andreas Shimokawa
1443c8088c Change default for Pebble Notification Intents back to "when screen off" 
Conversations accepted our PR, so we will continue to get these intents.
The option cann still turned off, in that case Conversations' notifications are
picked up by our generic notification support.
 2015-05-10 15:07:28 +02:00
Andreas Shimokawa
7f5b495480 Move Mi Band MAC address setting to Mi Band Settings 2015-05-10 13:08:28 +02:00
Andreas Shimokawa
e78c912be3 Only sync time on time/timezone changes if appropriate option is set. 2015-05-10 11:21:16 +02:00
cpfeiffer
86119a877a Slight refactoring, add some Logging 2015-05-10 00:18:42 +02:00
cpfeiffer
39d84831ed Unset dynamic device state (like battery level, etc.) when disconnected 2015-05-10 00:05:29 +02:00
cpfeiffer
1a7c3c42e4 Do both BT and BTLE discovery (one after another) #33 2015-05-09 23:54:47 +02:00
cpfeiffer
60210e069c Fix validity check with gender and type 2015-05-09 23:13:47 +02:00
Andreas Shimokawa
6f162c593b Pebble message intent notifications default to "never" now 
If these get turned on, Conversations notifications will be handled through Pebble message intents and get filtered out from generic notifcation handling.
 2015-05-08 12:50:42 +02:00
Andreas Shimokawa
c999c52501 convert sequence of ifs to switch 2015-05-08 11:18:06 +02:00
cpfeiffer
b2518ff927 Discovery + pairing now works 
User info is asked on demand before starting the actual pairing.
When no (valid) user info is given, dummy user infor will be  used instead.
 2015-05-07 23:52:44 +02:00
Andreas Shimokawa
157deff237 Send current time to device if time/timezone changes. Closes #51. 2015-05-07 23:46:18 +02:00
cpfeiffer
1604ae2c22 #33 only start discovery activity when bt is enabled 2015-05-07 22:15:53 +02:00
cpfeiffer
a23690c8e1 Initial support for Mi Band specific settings 
(User info for now).

TODO: We need to have that information *before* starting a connect
 2015-05-07 01:32:17 +02:00
Andreas Shimokawa
8b75440867 Pebble: feed WeatherNeat with bogus data (testing) 
This is completely useless, but it is the first time I could successfully send
data to a watchface.
 2015-05-06 23:47:58 +02:00
cpfeiffer
0c039b8a46 Start discovery activity automatically when no devices available (#33) 2015-05-06 22:59:31 +02:00
cpfeiffer
0629d6aa5d Small improvements to discovery, only scan for 1min #33 2015-05-06 22:59:00 +02:00
Andreas Shimokawa
33db0bf890 Pebble: handle DATALOG and PHONEVERSION endpoints directly in protocol 
This allows to remove all protocol inspection in PebbleIoThread
 2015-05-06 11:43:01 +02:00
cpfeiffer
7b02548427 Clear task stack after discovery (#33) 2015-05-06 00:17:28 +02:00
cpfeiffer
50034e0bfe Request battery info in initialize() 2015-05-05 23:25:54 +02:00
Andreas Shimokawa
3e85efa898 Display battery level if known. Should work on Miband, untested. 2015-05-05 22:52:25 +02:00
Andreas Shimokawa
9efcd8974d Add GBDeviceCommandSendBytes for generic pre encoded commands that are meant to be send to a device directly 
This is useful for Debugging. We can now send answers to data from the Device directly
int he procol implementation without messing with code in the GBDEviceIoThread's implementation.

This commit also adds test code for interaction with WeatherNeat (so far nothing works though)
 2015-05-05 14:41:10 +02:00
Andreas Shimokawa
d09b5442cf Put FW/HW info inside its own TextView to cleanup the device list 2015-05-05 11:16:57 +02:00
cpfeiffer
cf12c78a64 Ensure that discovery doesn't display duplicates (#33) 2015-05-05 01:08:30 +02:00
cpfeiffer
9df661bd96 Initial (ugly) support for device discovery and pairing (#3) 2015-05-05 00:48:54 +02:00
Andreas Shimokawa
e859ece7c6 Add Support for notifications send to Pebble from 3rd party applications 
This enables support for Conversations without using generic notificaion support.
Other applications could also work partly but are untested.

This commit also changes the SettingsActivity to use Comboboxes instead of two
Checkboxes for each notification source.
 2015-05-04 01:03:56 +02:00
Andreas Shimokawa
93b463c47e update German translation 2015-05-01 10:08:24 +02:00
cpfeiffer
3e79269d43 #46 add missing GBApplication 2015-05-01 09:36:33 +02:00
Andreas Shimokawa
f143c9ec54 androidstudio vs. eclipse :/ 2015-05-01 01:49:43 +02:00
cpfeiffer
8b3b4d0882 #46 make all strings localizable 2015-05-01 01:26:30 +02:00
Andreas Shimokawa
75b9d0e833 simplyfy SettingsActiviy code 2015-05-01 00:56:16 +02:00
Andreas Shimokawa
e65c492792 Pebble: display progressbar during installation of apps/firmware 2015-04-29 00:21:02 +02:00
Andreas Shimokawa
01e96f9c8d Pebble: Bugfix for beeing stuck while waiting for a slot, when none is available 2015-04-28 23:35:12 +02:00
Andreas Shimokawa
31b01d860f Pebble: notification cleanups 
- remove notification update code from PebbleIoThread (is in generic code now)
- use a separate notification for app/firmware installation
 2015-04-28 21:59:53 +02:00
cpfeiffer
5a458611e2 Set the time during initialization. Necessary for steps tracking. 
Also see #31
 2015-04-27 21:43:57 +02:00
cpfeiffer
8e25c03350 display connection state in notification area 2015-04-27 21:19:09 +02:00
Andreas Shimokawa
462f9f028f Pebble: do not call setReceiversEnableState() from PebbleIoThread anymore, handling had been moved to generic code 2015-04-27 01:24:42 +02:00
Andreas Shimokawa
2eb62ebff3 Pebble: Speed up app/firmware installation by sending 2000 bytes at once instead of 512. Closes #22. 2015-04-27 01:15:03 +02:00
Andreas Shimokawa
c06ef3d260 Pebble: try to shut up datalog, which might cause battery drain on the watch 2015-04-26 01:43:24 +02:00
Andreas Shimokawa
613ff1fc91 Pebble: corrections to PebbleIoThreads, better logging 2015-04-26 00:54:41 +02:00
cpfeiffer
0377a751b0 be even more robust #35 2015-04-25 23:49:07 +02:00
cpfeiffer
1772076b62 Log service creation and destruction 2015-04-25 23:49:07 +02:00
Andreas Shimokawa
442ae6499a Pebble: Better logging and hexdump for short packages to endpoint 6778 2015-04-25 23:13:22 +02:00
cpfeiffer
c773181da3 Request and display device info (connection state and firmware version) 
- request device info initially (connection state)
- request device info (firmware) when connected

This also fixes the wrong connection state being displayed on
orientation change.
 2015-04-24 23:09:35 +02:00
cpfeiffer
274e8591dc Initialize the BTLE device after the services are discovered. 
This hopefully helps with the MI Band automatically disconnecting.
 2015-04-24 22:21:35 +02:00
Daniele Gobbetti
98696ce9e2 Implement setting the time on the miband. 
It works from the debug activity, since I am not sure about the value of
the ts argument, it always sets the current time.
 2015-04-23 14:11:57 +02:00
cpfeiffer
cf681a089a Add the device if it's not in the list yet. 2015-04-22 20:38:05 +02:00
cpfeiffer
1ff1c20056 Some more logging 2015-04-22 20:38:04 +02:00
Andreas Shimokawa
ab2f5a73a8 Quick fix for crash when connecting to a Miband with invalid address in settings. 2015-04-21 22:35:11 +02:00
cpfeiffer
06d8488792 #15 log as info, not error 2015-04-20 23:45:34 +02:00
Andreas Shimokawa
b391128a56 Merge branch 'master' of https://github.com/Freeyourgadget/Gadgetbridge 2015-04-20 23:39:02 +02:00
Andreas Shimokawa
661ed9c612 Pebble: When opening a firmware print for which HW revision it is. 2015-04-20 23:38:00 +02:00
cpfeiffer
1e3ba57b03 fix unpaired MI devices disappearing from view (#15) 2015-04-20 23:25:46 +02:00
cpfeiffer
f6208f1031 fix warning 2015-04-20 22:44:22 +02:00
Andreas Shimokawa
33d86de923 move external receivers to externalevents/ directory 2015-04-20 22:39:35 +02:00
cpfeiffer
93b18d0d0b log when receivers are enabled/disabled 2015-04-20 22:04:14 +02:00
cpfeiffer
515c456605 #15 keep the broadcast receivers enabled when device uses autoconnect 2015-04-20 22:02:06 +02:00
cpfeiffer
4bdeabf4ea set deviceSupport to null after disposing it 2015-04-20 21:45:52 +02:00
Andreas Shimokawa
5487dfd348 Pebble app installation: Only enable install button when device is connected, for firmware also check hardware revision 2015-04-20 20:49:14 +02:00
Andreas Shimokawa
412c771d59 fix crash 2015-04-20 20:48:52 +02:00
Andreas Shimokawa
a12a76313c do not append Miband to device list if it has already been added as the connected device before 2015-04-20 19:32:12 +02:00
Andreas Shimokawa
16ea52e83c add hardware revision string to GBDevice, get and display HW Revision from Pebble 2015-04-20 12:48:32 +02:00
Andreas Shimokawa
fbbc808ca8 Make GBDevice parcable to make passing it via Intents more convinient 2015-04-20 11:58:59 +02:00
Andreas Shimokawa
cd0139cd7c add isConnecting() method to GBDevice 2015-04-20 10:50:30 +02:00
cpfeiffer
4a1a1d59be battery info hooked in, dummy for pebble 2015-04-19 22:31:09 +02:00
cpfeiffer
686ed312d6 #15 properly return firmware version 2015-04-19 22:23:53 +02:00
cpfeiffer
2dcd95a1f5 #15 support for reading firmware version and battery info 2015-04-19 22:20:47 +02:00
cpfeiffer
28272714aa remove whitespace 2015-04-19 21:50:01 +02:00
cpfeiffer
54784100b8 use isConnected() rather than getState() == CONNECTED 
because getState() == INITIALIZED implies CONNECTED
 2015-04-19 15:56:32 +02:00
Andreas Shimokawa
95d656d345 reformat code with androidstudio :P 2015-04-19 15:27:16 +02:00