1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-14 14:09:28 +01:00
Commit Graph

541 Commits

Author SHA1 Message Date
cpfeiffer
858c962dd0 Refactoring #45
- add some device and db independent model interfaces for activity samples
- use these model interfaces where possible
- chart activity does not do device dependent rendering anymore and uses
  normalized values for all devices
- initial interface for daily summaries
2015-07-28 00:05:05 +02:00
Andreas Shimokawa
91b8d7789d Pebble: improvemnts for upcoming Gadgetbridge Pebble watchapp 2015-07-27 23:21:06 +02:00
Andreas Shimokawa
dbbcf20bbc reformat code 2015-07-25 21:52:52 +02:00
Daniele Gobbetti
47cbf68c37 Merge remote-tracking branch 'upstream/master' into firmware_update 2015-07-25 21:36:46 +02:00
Daniele Gobbetti
8f840df5f6 Set GB notification visibility to public.
This way on android 5 the status of the connection is shown also on the lockscreen even if the user chose to hide sensible content of the notifications.
2015-07-25 21:14:18 +02:00
cpfeiffer
716bbc7b78 Avoid NPE when fetching activity data:
java.lang.NullPointerException: Attempt to write to field 'int nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport$ActivityStruct.activityDataHolderProgress' on a null object reference
        at nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport.flushActivityDataHolder(MiBandSupport.java:748)
        at nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport.handleActivityNotif(MiBandSupport.java:689)
        at nodomain.freeyourgadget.gadgetbridge.miband.MiBandSupport.onCharacteristicChanged(MiBandSupport.java:583)
        at nodomain.freeyourgadget.gadgetbridge.btle.BtLEQueue$2.onCharacteristicChanged(BtLEQueue.java:369)
2015-07-25 00:09:24 +02:00
cpfeiffer
a1f60aab91 Fix logging configuration
Make sure to not invoke any logging before it is properly configured.
2015-07-25 00:09:24 +02:00
Andreas Shimokawa
49cc4ec9d6 Pebble: for 3.x notification, do not zero parent UUID
instead reuse the same reandom UUID again.
2015-07-24 09:33:20 +02:00
Andreas Shimokawa
91cc19befe Pebble: spoof a newer application version (3.x) 2015-07-24 01:34:50 +02:00
Daniele Gobbetti
f16a96e9b2 Initial support for upgrading firmware of the MiBand.
This release seems to be working quite well with respect to the firmware upgrading itself. The user facing part needs more work.

In order to update the firmware one has to:
- open a file ending with .fw
- switch from the firmware upgrade activity to the main one
- connect to the miband
- return to the firmware upgrade activity
- press the "install" button (that became active when the device connection was established)

Caveats:
There are almost no check wrt. the integrity of the firmware files.
2015-07-23 17:14:51 +02:00
Andreas Shimokawa
268e658e6f rename ACTION_INSTALL_PEBBLEAPP to ACTION_INSTALL 2015-07-23 12:09:01 +02:00
Andreas Shimokawa
5c26b2281f Pebble: try to support notification dismissal on the Pebble Time (completely untested) 2015-07-22 20:53:18 +02:00
cpfeiffer
34dde2eb64 Eek 2015-07-21 22:30:11 +02:00
cpfeiffer
383a300566 Remove superfluous field 2015-07-21 22:29:29 +02:00
cpfeiffer
76fcbfcb52 Move activity data values into a separate struct (#45)
- saves some memory
- allows us to show the toast for the first chunk only
2015-07-21 22:27:15 +02:00
Andreas Shimokawa
b3a04f7afb Pebble: more length calculation fixes for 3.x notifications with actions 2015-07-21 22:05:25 +02:00
Andreas Shimokawa
6c1e41b4ec Pebble: fix some totaly obvious length calculation errors for actionable 3.x notifications 2015-07-21 21:56:11 +02:00
cpfeiffer
3662f32dbf Remove duplicated constants 2015-07-21 21:42:04 +02:00
cpfeiffer
3590c7c853 Remove inadvertently re-added busy-state handling 2015-07-21 21:40:06 +02:00
Andreas Shimokawa
3c35f94a7e Pebble: enable dismiss action on FW 3.x if force option is set
NOTES:
- Might break notifications altogehter (can't test)
- Cannot work because we do not interpret the response yet.
2015-07-21 21:32:05 +02:00
cpfeiffer
1f2b0329c5 Misc improvelets (#45) 2015-07-21 21:24:35 +02:00
Andreas Shimokawa
c9ab10e7e8 Pebble: commit missing PebbleProtocol changes for experimental notification dismissal 2015-07-21 01:33:13 +02:00
Andreas Shimokawa
74e1598bf7 Pebble: add experimental and incomplete support for dismissing 2.x notifications
Currently this dismisses all notifications on the Phone-
2015-07-21 01:27:05 +02:00
cpfeiffer
0f6491a11d More WIP: sync from the charts activity
Also add preliminary buttons to go forward/backward in time.
2015-07-21 00:06:20 +02:00
cpfeiffer
13d2c2166c Let DeviceCoordinator decide which activity to launch on click 2015-07-20 23:57:01 +02:00
cpfeiffer
184e0f2dea New dependency to format durations (and use that where applicable) 2015-07-20 23:14:08 +02:00
cpfeiffer
4aa80c149c Add some code to set the Mi Band latency 2015-07-20 21:43:23 +02:00
cpfeiffer
5d121e6e8f Fix a pointer aliasing issue, add some constants, remove invalid "checkpointing" 2015-07-20 21:41:18 +02:00
Daniele Gobbetti
d967411d70 Add a toast to let the user know about the progress of the transfer. 2015-07-19 16:16:58 +02:00
Daniele Gobbetti
6953086c99 Allow setting alarms once for the next day.
(cherry picked from commit 417ea02)
2015-07-19 15:58:30 +02:00
Daniele Gobbetti
7f7cea75c1 Spare some complexity by letting the writer change the status to non-busy.
Before the code looked for the values written to the device with another method.
2015-07-19 15:52:27 +02:00
Andreas Shimokawa
f847d834af Pebble: always force 3.x notifications on FW 3.x 2015-07-19 00:26:43 +02:00
Andreas Shimokawa
e6bc406d98 Fix funny typo :D
Thanks to @girlwithnoname for spotting
2015-07-18 23:38:59 +02:00
Andreas Shimokawa
095c70d469 Pebble: preparations for WIP Gadgetbridge Pebble App 2015-07-15 00:33:44 +02:00
cpfeiffer
d498bd976a Work in progress #45
Comparison between Light Sleep and Deep Sleep.
(Currently wrong, needs more analysis)
2015-07-14 00:29:32 +02:00
cpfeiffer
b1e2671bec limit maximum intensity to 180 for now... maybe make this configurable #45 2015-07-13 21:55:52 +02:00
cpfeiffer
04e628b2d1 Separate fragments for all activity kinds and just sleep #45 2015-07-13 21:54:46 +02:00
cpfeiffer
8b44f90bb6 Some more refactorings to support different charts 2015-07-12 23:42:23 +02:00
cpfeiffer
f53a037d7f Use query instead of rawQuery 2015-07-12 21:50:09 +02:00
cpfeiffer
623e4724c2 Slightly better text when no data available 2015-07-12 21:48:48 +02:00
cpfeiffer
6553558947 Experimental code for an activity sync problem. Commented out for now. #45
@daniele do you have an idea what this byte equence on the control point
characteristic could mean (and why the transfer stops then)?
2015-07-12 00:02:51 +02:00
cpfeiffer
b516ceda01 Support for displaying Toasts from non-ui threads 2015-07-11 21:49:51 +02:00
cpfeiffer
be45f7fe0c check if table exists before dropping 2015-07-11 21:16:07 +02:00
cpfeiffer
a6e26e5ddc Cleanup, use fragment based charts (WIP #45)
Known issue: scrolling a zoomed-in chart interferes with swiping to the
next/previous chart (so far there's just one, but...)
Workaround: Swipe down and then left or right in one go, this will let
you scroll the zoomed chart
2015-07-11 00:03:41 +02:00
cpfeiffer
7c61bbb2be Logging to find the cause for seldom device state/notification mismatch 2015-07-10 21:35:28 +02:00
cpfeiffer
40be935abd Better time format for action logging 2015-07-10 21:02:03 +02:00
cpfeiffer
8b54c6e5c4 New incremental, cumulative database upgrades and downgrades 2015-07-10 00:31:45 +02:00
cpfeiffer
cc549a6c49 Basic database import and export (to external storage)
(In the Debug Activity)
2015-07-08 23:11:23 +02:00
Andreas Shimokawa
cdd26a43d2 Do not allow alarm to start alarm activity from a long press on a Pebble 2015-07-05 00:41:06 +02:00
cpfeiffer
f36caafc54 Fixed syncing activity data (#45)
Bytes 1-6 represent the date/time, so we should not try to check for this.
Thanks a lot, Daniele!
2015-07-04 22:22:59 +02:00
cpfeiffer
580b86f41b Add creation timestamps to BtLEActions and transactions in debug output
(I think I still sometimes get "old" notifications)
2015-07-03 21:58:13 +02:00
Andreas Shimokawa
dfea2cbcc1 fix find device which started alarm activity 2015-06-30 21:18:27 +02:00
Andreas Shimokawa
b25d771ee9 reformat code 2015-06-30 12:09:29 +02:00
Andreas Shimokawa
594bf8c45b Merge pull request #81 from Freeyourgadget/set-alarm-tomerge
Set alarms on device (miband)
2015-06-30 09:43:51 +02:00
Daniele Gobbetti
3068d687bf Adressed some of the observations made re the last commits. 2015-06-30 06:40:46 +02:00
Daniele Gobbetti
371a7bb4af Get rid of the Checkedtextview because they weren't in line with the our style 2015-06-30 06:40:46 +02:00
Daniele Gobbetti
900511760c further improvements:
- the day of week are evenly spread across the screen in the alarms detail activity
- the alarms are stored in a single shared preference (as a set) NB: you'll have to reset your alarms if you used a previous version (and also manually clean the shared preferences, but this is not needed)
- the list of alarms gets correctly updated after editing a specific alarm
- the actionbar back button saves the alarm status, the device back button doesn't. I'm not sure if it's a bug or a feature :)
2015-06-30 06:40:46 +02:00
Daniele Gobbetti
109b2bef4d add a Toast to confirm the transfer of the alarm or to warn if the transfer wasn't possible. 2015-06-30 06:40:46 +02:00
Daniele Gobbetti
dc3ed1659c use parcelable for passing alarms around 2015-06-30 06:40:46 +02:00
Daniele Gobbetti
764dd70e45 low hanging fruits:
- add break after case
- center vertically the smart wakeup checkbox
2015-06-30 06:40:46 +02:00
Daniele Gobbetti
1caca1439a Initial implementation of setting alarms to the Mi Band.
The code basically works, but there a lot of things to fix / improve.
* The alarms are stored to and read from the Shared Preferences, but there is no persistence within the app (basically they are read and stored at every access)
* The alarm list is not updated when coming back from the alarm detail view (probably related to the point above), but the actual alarm is
* The alarms preference names is sometimes built by concatenating strings, which is not really safe
* There is no check in the alarm constructor whether the stored string is a valid alarm representation
* Even though only 3 alarms can be stored on the device, we could have more in the app and let the user choose which to sync
* In the alarm detail view XML some material* drawables are used, it's possible that these break on android version < 5
* ...
2015-06-30 06:40:14 +02:00
cpfeiffer
ef2bbf13c7 Close stream on error and log exception 2015-06-29 22:38:37 +02:00
Andreas Shimokawa
27e611c583 add share action to screenshots in notification
Now you can brag with your pebble watchfaces and send them straight to Conversations.
2015-06-27 18:09:49 +02:00
Andreas Shimokawa
c16510003c Open image viewer when tapping on screenshot 2015-06-27 00:21:30 +02:00
Andreas Shimokawa
44636748e7 Show screenshot in notification in successful 2015-06-26 23:17:31 +02:00
Andreas Shimokawa
a73d8b7f0a Pebble: save screenshots as 1bit Windows 3.x BMP
TODO:
- user feedback
- support Pebble Time
2015-06-25 23:34:50 +02:00
Andreas Shimokawa
d0178686d8 Pebble: support for taking screenshots (do not get displayed/written anywhere yet) 2015-06-24 23:55:51 +02:00
Andreas Shimokawa
07d59322bd Pebble: Preparations for taking screenshots
This commit also includes some cleanups and removal of unused code/strings
2015-06-24 00:23:38 +02:00
cpfeiffer
4b241ca9eb Initial work on supporting multiple charts.
- one fragment per chart screen
- common chart code should move to fragment baseclass and the host
  Activity (ChartsActivity)

Currently it's not used, change ControlCenter to invoke ChartsActivity
instead of SleepChartActivity to test it.

WIP for #79
2015-06-23 23:03:05 +02:00
Andreas Shimokawa
5ae812c854 add GBDeviceProtocol again 2015-06-23 14:20:13 +02:00
Andreas Shimokawa
73da7fff0a Refactoring: rename GBDeviceCommand to GBDeviceEvent 2015-06-23 11:54:33 +02:00
Andreas Shimokawa
c2582e1e1f Not not display useless menu items when device is not connected
Also remove "fetch activity data" from pebble context menu, which currently does nothing

Closes #75
2015-06-22 22:16:19 +02:00
Andreas Shimokawa
1bd32b713a Pebble: implement encodeFindDevice() by simulating a call 2015-06-21 23:53:23 +02:00
cpfeiffer
39db968e34 Forgot to rename that method, too (#42) 2015-06-21 20:59:36 +02:00
cpfeiffer
23d91ac79e Support for finding a lost device (closes #42) 2015-06-21 19:46:02 +02:00
cpfeiffer
c7b4f295a1 Support for vibration profiles, configurable for notifications
Configurable for sms, k9, incoming calls, pebble messages, generic
notifications.

Color is unfortunately not configurable so far, see #37

Closes #29

Currently provided profiles are
- staccato
- short
- medium
- long
- waterdrop
- ring
- alarm clock
2015-06-21 19:46:01 +02:00
cpfeiffer
f105bbbde3 Avoid crash when getExternelDir() returns null (huh!) 2015-06-21 19:44:56 +02:00
cpfeiffer
1fb20926b3 Fix previous commit, disable LimitLines for this release 2015-06-21 19:43:45 +02:00
Andreas Shimokawa
b1973994f0 Sleep Monitor: Disable anotations for now (produces unreadable output on some devices) 2015-06-21 16:39:03 +02:00
Andreas Shimokawa
2458e55865 Pebble: add encodeSimpleMessage() for encoding 1 byte messages to endpoints 2015-06-19 23:54:31 +02:00
Andreas Shimokawa
7e1700250f Pebble: add dev option to force latest notification protocol usage
When enabled it forces to use 3.x notifications on FW 3.x (2.x notifcations on FW 2.x)
When disabled 2.x notification on FW 2.x and 1.x notifications on FW 2.x are used (which is recommended)

This allows Pebble Time users to do further tests.
2015-06-19 12:34:33 +02:00
cpfeiffer
e562fa9870 Light sleep and deep sleep was mixed up. Corrected graphs again. #45
Use dashed limit lines, still not perfect.
2015-06-19 01:14:58 +02:00
cpfeiffer
f9e5ab5fc1 Some more refinements to sleep display (#45):
- display the recorded level of deep sleep rather than a constant
  (I hope this works for morpheuz, too!?)
- give light sleep a minimum value, because it's sometimes 0 for Mi Band
2015-06-19 00:20:38 +02:00
cpfeiffer
03fa05756e As a test, draw limit lines for sleep/activity changes.
Unfortunately it looks like the labels for it don't get rendered ;-(
2015-06-18 23:41:54 +02:00
cpfeiffer
83079b0456 Stub for device notification changes 2015-06-18 23:07:22 +02:00
Daniele Gobbetti
cb3be26349 Do something when we receive a CharacteristicChanged message
on the UUID_CHARACTERISTIC_BATTERY characteristic.

This is a first try at addressing #71

Please note that this will probably not work at this point, but it's
worth a try. To make it work probably we have to tell the device to
send updates, and we don't know how to do it.
2015-06-18 22:17:41 +02:00
Andreas Shimokawa
1801a679c5 Pebble: fix FW 3.x detection 2015-06-18 18:39:32 +02:00
Andreas Shimokawa
bffd7f332f remove SleepChartActivityOld, as the new one is usable now ;) 2015-06-17 08:18:24 +02:00
cpfeiffer
a5ae7acc63 Improved sleep chart #45
- use just one data set, because multiple data sets is not supported
  by MPAndroidChart (the way we need it)

Now there is hardly any space between the bars anymore

Also:
- allow scaling x and y axis independently via pinch gesture
- set fixed y max value (1.0) so that the display is stable and
  independent of the actual available data
- (at least temporarily) display y labels
2015-06-17 07:03:50 +02:00
cpfeiffer
8709b95a95 Use a single data set instead of one per activity kind
The reason is that multiple data sets will always be grouped.
If we add null values to fix the grouping issue, we will still have
space between the bars.
2015-06-17 07:03:50 +02:00
Andreas Shimokawa
a07aed62ad Pebble: Experiment with 3.x compatible notifications
This will most probably not work, but please test if you can ;)
2015-06-16 23:15:51 +02:00
Andreas Shimokawa
70c021e92c SleepChartActivity: Make light sleep color brighter 2015-06-13 20:47:36 +02:00
Andreas Shimokawa
73187431b2 Use old Sleep Monitor Activity for Pebble/Morpheuz
The new one does not look good with Morpheuz data yet (samples every 10 minutes)
2015-06-13 20:37:53 +02:00
Andreas Shimokawa
d2f7169de4 Really, I see no reason to look up a string for a preference key in an xml file
If we have to use a key to lookup the string for the key, we can just use that key as the preference key.
2015-06-13 01:12:08 +02:00
Andreas Shimokawa
56d314d054 Reformat code and optimize imports 2015-06-13 00:32:48 +02:00
Andreas Shimokawa
ad4f708140 Send 2.x style notifications when on FW 3.x (on FW 2.x else use 1.x style notifications)
This could improve #24. Unfortunally I cannot test it since I have no Pebble Time.
2015-06-13 00:26:55 +02:00
Daniele Gobbetti
ac7e21be48 Remove the activity log debug file.
This partially reverts commit 8b268a676c
2015-06-12 22:30:14 +02:00
Daniele Gobbetti
376f9c53a0 Fix crash on startup
Fixed a typo that was causing a force close on database creation.
2015-06-12 21:26:11 +02:00
Daniele Gobbetti
75de3b21e1 Use colors that are easier on the eyes
Changed the colors of the Deep-/Light Sleep and Activity datasets.
* Deep sleep has been used as basic color,
* Light sleep is a color that is monochromatically analogous
* Activity is a color triadic to the basic one
2015-06-12 11:17:44 +02:00
cpfeiffer
8aef92026c A new sleep chart based on MPAndroidChart 45
- supports zooming an panning
- displays labels for all x-values (= time of day)
- fix deep vs. light sleep constants
- increase activity data buffer size for Mi Band
2015-06-11 23:37:00 +02:00
Andreas Shimokawa
9051e10aad switch constants for deep sleep and light sleep to match native miband data 2015-06-11 23:00:59 +02:00
Andreas Shimokawa
dfcad94c2c Pebble: Make firmware installation possible from recovery (Closes #54)
Also make HW revision displayable for Pebble Time.
2015-06-11 20:40:31 +02:00
cpfeiffer
d0b9914770 Keep the db open while adding samples 2015-06-09 21:05:44 +02:00
cpfeiffer
e78e79a9a9 Added missing returns.. 2015-06-08 23:31:12 +02:00
Andreas Shimokawa
efac912929 Pebble: Fix error when reinstalling apps, useful for upgrading/downgrading
Fixes #65
2015-06-08 22:38:58 +02:00
Andreas Shimokawa
4f8a7ea64d Misuse device_candidate_item insead of device_item for AppManager 2015-06-07 22:02:40 +02:00
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