Commit Graph

830 Commits (f7b71c1f9641dfb2b91843d667ba3c5ad0f74ab2)

Author SHA1 Message Date
Julien Pivotto 21d59b23c1 Allow QKSMS notifications to be handled as a generic notification if SMS notification mode is set to "never"
This makes it possible to use the "Open on Phone" and individial dismiss feature with QKSMS.
2015-09-13 22:51:05 +02:00
Andreas Shimokawa 95e22a4e32 Pebble: Allow stopping apps though PebbleKit messages (also in the API) 2015-09-13 21:44:26 +02:00
Andreas Shimokawa 6fff4fb7ba Pebble: support byte arrays for Appmessages (including PebbleKit ones) 2015-09-13 18:37:59 +02:00
Andreas Shimokawa 9a32be97cb Pebble: work towards PebbleKit support #106
- Untested features have to be turned on.
- We will accept data from any source.
- One way, we do not send out replies.

This already works with the minimalistic sports demo from the sdk
2015-09-13 18:20:15 +02:00
Andreas Shimokawa d3dbde6917 Some refactoring:
- Put Pebble icon ID constants in its own class
- remove ICON_ and COLOR_ prefixes from constants
2015-09-13 15:21:07 +02:00
Andreas Shimokawa 04086a3b4c Merge pull request #122 from roidelapluie/colors
Pebble: Support Colors in notifications
2015-09-13 14:58:05 +02:00
Julien Pivotto 1027336591 Pebble: Support colors in 3.x notifications (Pebble Time)
* Generic notifications are still red
* Colors are in a separated static class

Closes #120.
2015-09-13 14:54:43 +02:00
Julien Pivotto eafb795874 Fix a small typo in gadgetbridge.model.ServiceCommand 2015-09-13 14:26:55 +02:00
Andreas Shimokawa a73beceb44 Map a few more apps to NotificationKind 2015-09-13 13:48:21 +02:00
Andreas Shimokawa 4f80844016 noficicaion_kind -> notificationKind 2015-09-13 13:38:11 +02:00
Andreas Shimokawa 44d8294f8c Pebble: use Hipchat icon for chat notifications on FW 3.x 2015-09-13 13:32:18 +02:00
Andreas Shimokawa a85c04c02a Pebble: use constant for icons where possible 2015-09-13 12:55:10 +02:00
Julien Pivotto d50a82d495 Pebble: Set application icons for generic notifications
Closes #116.
2015-09-13 00:39:53 +02:00
Andreas Shimokawa 637539861d Merge pull request #115 from roidelapluie/notifications
Pebble: Use generic icon for generic notification instead of SMS icon on FW 3.x

This also adds a lot of constants for a bunch of icon IDs
2015-09-12 23:14:58 +02:00
Julien Pivotto 986e7e0450 Improve Pebble Time notifications icons
* Add a list of icons in the source code
* Generic notification now use the correct icon instead of the SMS icon
2015-09-12 22:14:36 +02:00
Andreas Shimokawa 914d1b9625 Make notification blacklist actually working 2015-09-12 00:19:36 +02:00
Andreas Shimokawa 03b9f02b2c Pebble: allow launching internal Golf and Sports App if untested features are enabled
This is completely useless for now, but since it is there on every Pebble, I want to be able to launch it.
2015-09-10 23:07:42 +02:00
Andreas Shimokawa 0ad758fbca WIP blacklist activity (currently does nothing except listing apps) 2015-09-10 13:48:54 +02:00
cpfeiffer 80d15573af Avoid tiny window where a gatt callback of an operation could be unset 2015-09-10 00:00:52 +02:00
cpfeiffer c23905070c Some more logging improvelets 2015-09-09 23:39:57 +02:00
cpfeiffer 22a9ff1819 Log when no listener is registered for a characteristic change 2015-09-09 23:23:38 +02:00
cpfeiffer e80a3cc591 Log the number of samples being flushed #91 2015-09-09 22:33:06 +02:00
cpfeiffer e0ccb6bf84 Log the date/time that we sync to the Mi Band #91 2015-09-09 21:53:28 +02:00
cpfeiffer d9d222ca9b Tiny logging improvement 2015-09-09 21:15:29 +02:00
cpfeiffer bddf6c8909 Also log the number of rows (samples) returned by the query #91 2015-09-09 20:52:04 +02:00
cpfeiffer 2dec5574cc Log the where condition of the samples query #91 2015-09-09 20:49:17 +02:00
cpfeiffer e34c5614d7 Bail out hard if we get negative steps from the database #91
We don't add them to the db for sure.
2015-09-09 20:46:50 +02:00
Andreas Shimokawa 7f331a1bb1 Pebble: play around with timeline pins 2015-09-08 14:15:46 +02:00
cpfeiffer 518b1ee6f4 Merge branch 'master' into live-activity-data 2015-09-07 21:41:02 +02:00
Daniele Gobbetti 6c28b50f52 allow the transfer of activity data without clearing MiBand's memory 2015-09-07 12:06:56 +02:00
cpfeiffer 1711a7a731 Merge branch 'master' into live-activity-data 2015-09-06 00:46:50 +02:00
cpfeiffer fbd23c2d4c Some layout improvements (#30) 2015-09-06 00:03:56 +02:00
cpfeiffer bc3c0760d0 More WIP with live activity charts 2015-09-05 23:05:57 +02:00
Andreas Shimokawa 02cc8ba455 Allow K9 Mail notifications to be handled as a generic notification if K9 Mail notification mode is set to "never"
This makes it possible to use the "Open on Phone" and individial dismiss feature with K9 Mail.
2015-09-05 21:32:46 +02:00
Andreas Shimokawa a839f07496 Pebble: use proper icon for "Open on Phone" on Pebble Time 2015-09-05 21:00:18 +02:00
Andreas Shimokawa 1a1277fa3d Pebble: Fix "Open on Phone" on OG Pebble (no more error display) 2015-09-05 20:40:12 +02:00
cpfeiffer 5f993c0049 Merge branch 'master' into live-activity-data 2015-09-05 00:15:49 +02:00
cpfeiffer 69b64ed4b6 More logging for time/timezone changes
(trying to find an explanation for #91)
2015-09-05 00:14:09 +02:00
cpfeiffer 8f4e933e30 More WIP on live activity:
- keep screen on while live activity is visible
- hide the date bar (prev&forward buttons)
- live activity chart is still nowhere near usable
2015-09-04 21:55:29 +02:00
cpfeiffer 9a1f4875fc Temporary backup with live activity 2015-09-03 23:20:47 +02:00
cpfeiffer 05ee6e46c6 Display battery label in RED when battery is LOW #40 2015-09-02 23:49:48 +02:00
cpfeiffer 42420e676b More WIP: displays live activity data 2015-09-02 23:49:06 +02:00
Andreas Shimokawa e4a72a83ee Ignore QKSMS generic noticfication to prevent duplicate SMS notifications
Closes #108
2015-09-02 22:54:20 +02:00
Andreas Shimokawa ab29736a50 Pebble: Implement "Open on Phone" function for generic notifications
TODO:
- search a better icon for the Pebble Time
- send a reply to the OG Pebble to prevent the error message from popping up
2015-09-02 22:43:22 +02:00
Daniele Gobbetti b6cbb5d6be read initial value of live steps data when enabling notification 2015-09-02 16:36:20 +02:00
cpfeiffer ab8982e7f2 WIP: support for live display of activity data 2015-09-02 08:02:26 +02:00
cpfeiffer 536b2bd8a0 Another translatable string 2015-09-01 23:56:14 +02:00
cpfeiffer da5df5621e Use MEDIUMINT for steps per day (no effect, not used, and ignored by sqlite) 2015-09-01 23:11:22 +02:00
cpfeiffer 4b4c6d1a6b Do not accept negative step/intensity values in the db
(Ignore and log those requests instead)
2015-09-01 22:53:47 +02:00
cpfeiffer c5db816cd1 Pass shorts along to avoid implicit signed conversion. 2015-09-01 22:53:20 +02:00
cpfeiffer c49c795b1d Actually remove that implicit "current date" handling
We now manage days explicitly in the UI.
2015-09-01 22:43:31 +02:00
cpfeiffer d791054e42 Fix getLast24Hours() -- take end time into account 2015-09-01 22:37:20 +02:00
cpfeiffer a6d18e599b Tiny simplification and extract string 2015-09-01 22:34:04 +02:00
cpfeiffer 917801f223 Use the correct date for displaying steps #91 2015-09-01 22:13:30 +02:00
Andreas Shimokawa fd789c445e Allow dismissal of individual (generic) notification
Implemented for Pebble and Pebble Time #103
2015-09-01 22:00:11 +02:00
cpfeiffer 5c2bd1e8df Avoid code duplication by reusing logMessageContent() 2015-09-01 21:26:51 +02:00
Andreas Shimokawa 46171e4ab8 Some preparations for interactive notifications 2015-08-31 22:27:25 +02:00
Andreas Shimokawa 2da717ea4c set visibility of service notification to public again 2015-08-31 21:29:00 +02:00
Daniele Gobbetti ee3ca5998e Fail early when opening a pebble file.
Fixes #102

We could also use a whitelist approach instead, but we can't be sure that the user installs a file with .fw extension, hence i preferred to only avoid loading files which are known to be of the wrong type.
2015-08-31 17:41:09 +02:00
Daniele Gobbetti 9360b81ef3 Don't add new limitlines, clean the existing one before (it could be optimized further by reusing the existing one, probably) 2015-08-31 17:41:09 +02:00
Daniele Gobbetti 249ff5bf94 Let the user change date also on the Week steps chart 2015-08-31 17:41:09 +02:00
Andreas Shimokawa face7cceea probable close #104 2015-08-31 17:31:32 +02:00
Andreas Shimokawa 95b65265b4 remove eventClass field from GBDeviceEvent, use instanceof instead 2015-08-31 17:25:58 +02:00
cpfeiffer 50960277dd Localized some firmware update texts and added some toasts on finish 2015-08-30 21:56:45 +02:00
cpfeiffer 41d8bcf634 Make firmware and app installation a bit more user friendly #30 2015-08-30 00:21:51 +02:00
cpfeiffer 530116976c Only call super.onCharacteristicChanged() when not handling it here 2015-08-29 20:48:33 +02:00
cpfeiffer 25ddc20f89 Fix testcases with sdk 23: don't call Notificaton API during local tests 2015-08-29 20:39:34 +02:00
Andreas Shimokawa 13300fcb5d finally fix build with SDK 23 2015-08-29 11:31:48 +02:00
Daniele Gobbetti 26792717d4 Add showing when the device wasn't worn by the user 2015-08-28 14:58:30 +02:00
Daniele Gobbetti fb5ebeacb6 Light colors for the graphs.
Closes #99
2015-08-28 14:58:30 +02:00
cpfeiffer 086bb8aa4a Also parcel the battery level threshold 2015-08-28 13:53:16 +02:00
cpfeiffer ff989390f9 Fix the remaining TODO #101 2015-08-28 13:49:36 +02:00
Daniele Gobbetti 2f1aa45445 Merge remote-tracking branch 'origin/master' into low_battery_notification 2015-08-28 10:40:46 +02:00
Daniele Gobbetti cbea0feb9e Centralize the calendar conversion to/from byte array take 2.
Move to an independent class.
2015-08-28 10:40:25 +02:00
Andreas Shimokawa 2ca8e149ee Pebble: support "dismiss all" action also on Pebble Time/FW 3.x notifications
This is done through a workaround, now we just label it as a generic action and reply properly to the invocation from the Pebble.
Fixes #86
2015-08-27 18:01:19 +02:00
Andreas Shimokawa 44c7f99c58 GBDeviceProtocol::decodeResponse() now returns an array GBDeviceEvents
This allowed to remove some ugly hacks from pebble code,  when encoding a
response in a GBDeviceEventSendBytes  and at the same time trying to notify
generic code via another GBDeviceEnvent.
2015-08-27 15:02:29 +02:00
Daniele Gobbetti 3a6e433fb3 Merge remote-tracking branch 'origin/master' into low_battery_notification 2015-08-27 13:12:29 +02:00
Daniele Gobbetti 677e0808bf Centralize the calendar conversion to/from byte array. 2015-08-27 13:12:09 +02:00
Daniele Gobbetti 7923e153e6 Moved the enum to standalone in the model package. 2015-08-27 11:50:31 +02:00
Andreas Shimokawa 027e6fe8c3 Pebble: add more Datalogging endpoint debug output 2015-08-26 23:17:32 +02:00
Daniele Gobbetti 3356a4b066 Merge remote-tracking branch 'origin/master' into low_battery_notification
Conflicts:
	app/src/main/res/values/strings.xml
2015-08-26 15:46:33 +02:00
cpfeiffer e1c02cc373 Prevent charts date in the future, documentation and cleanup 2015-08-25 22:45:07 +02:00
cpfeiffer b4e34db1d2 Faster animation 2015-08-25 01:03:58 +02:00
cpfeiffer 0bb3188bc8 Start and end dates now work properly across charts
They are now managed by the Activity, because the fragments
may be created and destroyed at any time and hece cannot
synchronize their date-state all the time.

Open issue: moving across the borders (first day with data,
current day)
2015-08-25 00:54:16 +02:00
cpfeiffer e47ebb8f09 Improvements to charts
- backward and forward buttons work better
- buttons only refresh the current fragment now
- activity shows fragment-specific titles
2015-08-25 00:33:37 +02:00
Daniele Gobbetti 6ebc727f97 Merge remote-tracking branch 'origin/master' into low_battery_notification
Conflicts:
	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/GB.java
2015-08-24 17:48:17 +02:00
cpfeiffer 070876db06 Allow disconnecting when device is connecting
Also require "initialized" state for "find device"
2015-08-24 13:19:17 +02:00
cpfeiffer ba670bbb50 More testing work: with a new test for finding the device 2015-08-23 00:54:51 +02:00
cpfeiffer 6f7de96461 Fix find device (wrong EXTRA_ constant used) 2015-08-22 12:38:35 +02:00
cpfeiffer 77cad5c47f Initial support for testing the DeviceCommunicationService
Lots of support classes to enable local testing, without
a device or an emulator.
2015-08-22 01:09:56 +02:00
Andreas Shimokawa cedd95186f Pebble: revert changes commited accidentially 2015-08-22 00:29:52 +02:00
Andreas Shimokawa 1150ad2b8d Pebble: Support taking Pebble Time screenshots. Closes #97. 2015-08-22 00:14:14 +02:00
Daniele Gobbetti dcc988139f Merge remote-tracking branch 'origin/master' into low_battery_notification 2015-08-21 17:34:11 +02:00
Andreas Shimokawa 12337836bc bump version, update CHANGELOG.md 2015-08-21 16:06:23 +02:00
Daniele Gobbetti df417e5c6c Fix bug regarding setting wear location.
Closes #95
2015-08-21 15:23:48 +02:00
Andreas Shimokawa 6e80978998 Pebble: Add generic method for Blobdb endpoint for deduplicating code. 2015-08-21 14:29:12 +02:00
Andreas Shimokawa 2b0acd649b Pebble: close TCP socket when disconnecting from emulator. Prevents hang. 2015-08-21 13:19:46 +02:00
Daniele Gobbetti eb39ce9367 Further improvements:
- append a string on the control center when the device is charging
- battery status string is no more, welcome battery state enum
- the notification will not be shown when the device is charging, even if the level is below threshold
2015-08-21 08:41:57 +02:00
cpfeiffer a1cb246e27 Add and use a "client interface" for the actions of the service
Previously, the DeviceCommunicationService was invoked directly,
via
Intent intent = new Intent(foo, bar);
intent.setExtra(EXTRA_BAZ, baz);
startService(...);

and this was scattered throughout GadgetBridge.
Now there is a "frontend" available, so that you can call
the service more easily, like
GBApplication.deviceService().connect();

For a start, this client interface (DeviceService) actually
implements the same interface (EventHandler) as the receiving side
(DeviceSupport). This may change in the future.

This will also make testing much easier, because we can use
this client interface to invoke the test service as well.
2015-08-21 01:03:57 +02:00
Andreas Shimokawa faaa04b670 App Installation: various improvements
- make FwAppInstallerActivity wait for a completely initialized device
- check basalt/aplite compatibility with pbw to be installed and report intead of crashing
- fix crash when trying to install pbw with all app slots full
2015-08-20 18:55:22 +02:00
Daniele Gobbetti 0d8adeb7f9 Some refinements:
- only show the bigtext notification if the device has set extended battery info
- custom icon for the low battery notification (with license information)
- show device name in the notification
- set the notification to high priority
- the battery threshold is now set in GBDevice
2015-08-19 17:36:53 +02:00
Daniele Gobbetti 57a85e63b0 Merge remote-tracking branch 'origin/master' into low_battery_notification 2015-08-19 17:30:33 +02:00
Andreas Shimokawa d2173d37ce forgot to commit this also 2015-08-19 01:46:18 +02:00
Andreas Shimokawa e8e631fb49 Pebble: encode flags in metadata, this could not work on real devices 2015-08-19 01:42:13 +02:00
cpfeiffer 5a4f8fb56f Last commit accidentally called the wrong get*Samples method 2015-08-19 01:06:46 +02:00
Andreas Shimokawa a7796ecbc6 Pebble: Emulator support
NOTE:
- supports aplite and basalt emulator
- needs recompilation of Gadgetbridge with INTERNET permission

TODO:
- fix disconnect issues
- emulator special packet support
- string localization
- ...
2015-08-19 00:06:15 +02:00
Daniele Gobbetti c3e395818f Adding support for battery events using GBDeviceEvent.
- show notification on low battery (closes #40)
- Miband specific: add date of last charge and number of charges
2015-08-18 17:37:51 +02:00
cpfeiffer 121baa19ec Move AbstractSerialDeviceSupport et al from bt package into serial package 2015-08-18 01:26:15 +02:00
cpfeiffer 99293d4ee5 Also extracted firmware update to separate operation 2015-08-18 00:52:02 +02:00
cpfeiffer dbb92b55bc Make the Operations classes BLE-generic 2015-08-18 00:31:40 +02:00
Andreas Shimokawa c0323339e8 Pebble: set UTC time and offset on FW 3.x 2015-08-18 00:13:55 +02:00
cpfeiffer 33b598ce5c First part of extracting parts out of MiBandSupport
Extract Activity Data fetching into distinct 'operation' class.

Fix a few small things wrt transaction-local GattCallbacks along the way.
2015-08-18 00:11:53 +02:00
cpfeiffer 585a888ecb Improved javadoc 2015-08-18 00:11:51 +02:00
Andreas Shimokawa 0c872a920e Pebble: always set token to -1 before waiting for a new one
This could fix potential problems with app installation
2015-08-17 22:50:46 +02:00
cpfeiffer e6a0c35f73 Extract checksum implementations into separate class CheckSums 2015-08-17 22:43:42 +02:00
cpfeiffer 9dc945a406 Don't throttle events for Pebble
And actually do busy-filtering for Mi and Pebble
2015-08-17 21:30:37 +02:00
Andreas Shimokawa 6fede31bdf Pebble: make watchapp installation available on FW 3.x without the need for setting an option 2015-08-17 18:07:47 +02:00
cpfeiffer 9dd2f039f2 Rename AbstractBTDeviceSupport to AbstractSerialDeviceSupport
That way it also fits devices connected via TCP/IP for example.
2015-08-17 16:30:12 +02:00
Andreas Shimokawa 8fee88a1ba Pebble: use SMS/EMAIL icons for notifications on FW 3.X 2015-08-17 13:57:01 +02:00
Andreas Shimokawa e704357728 Pebble: set HW revision to "dvt" for basalt emulator 2015-08-17 13:19:15 +02:00
Andreas Shimokawa c8c882c3d1 Pebble: Support removing apps on FW 3.X (metadata) 2015-08-17 13:07:34 +02:00
Andreas Shimokawa f0924716fc Pebble: when reading app fetch uuid, do not switch to little endian too early 2015-08-17 12:55:17 +02:00
Andreas Shimokawa 0d0b3a87e1 Pebble: on FW 3.x always assume success for installation and do no wait for 2.x packets 2015-08-17 12:43:38 +02:00
cpfeiffer bcf42f8022 Finally, the prev and next buttons do something (#79)
Far from perfect, but a start.
2015-08-17 02:22:16 +02:00
cpfeiffer 964994972b Fix for pebble sample provider switching without quitting gb) 2015-08-16 23:30:16 +02:00
cpfeiffer 27a9eb8a07 Only repaint chart when activity is still alive
(fixes error message when synchronizing in the charts activity and then
switching orientation)
2015-08-16 23:27:18 +02:00
cpfeiffer 0bd65e050c Make intensity also always positive #91
I never experienced such values, but others apparently do...
2015-08-16 23:18:32 +02:00
Andreas Shimokawa 48f5931043 PebbleProtocol: add missing assignment 2015-08-16 13:13:53 +02:00
Andreas Shimokawa 6af0bb2754 Pebble: Do not hardcode icon id for metadata installation, properly acknowledge app fetch requests 2015-08-16 11:33:32 +02:00
Andreas Shimokawa a4f5524f6e Pebble: blindly implement missing parts for app installation on FW 3.x
This is expected to fail and needs to be enable in preferences (untested features).
2015-08-16 00:32:36 +02:00
cpfeiffer 567f27b0f4 Some initial fixes found by static analysis #92 2015-08-16 00:17:16 +02:00
Andreas Shimokawa c69bf1b0af Pebble: always use 2.x notification on FW 2.x except for K9
FW 2.x notifications enables the "dismiss all" action, but for K9 we would loose
the mail icon. So K9 still needs the force option.
2015-08-15 22:38:10 +02:00
cpfeiffer a66a3a15c2 Fix remaining byte parameter in the API for steps.
Maybe this was the reason for #91 (negative steps)

This could happen making at least 3 steps per second.
2015-08-15 00:23:13 +02:00
cpfeiffer ecc483f027 Remove now unused class 2015-08-14 23:50:21 +02:00
cpfeiffer d0229847e7 onFirmwareVersionReq() is no more
- version information is now provided implicitly by device initialization
- ACTION_REQUEST_VERSIONINFO is now ACTION_REQUEST_DEVICEINFO and it will
  return the current device state of the service without asking any DeviceSupport
  instance.
- ACTION_CONNECT now implicitly answers with a device update intent if it
  IS already connected.
2015-08-14 23:37:47 +02:00
Andreas Shimokawa f659e34efc Pebble: do not use platform dir for pbz(firmware) files, even basalt has its files in / for fw files 2015-08-14 17:32:06 +02:00
Andreas Shimokawa f5fbb08696 Pebble: remove unneccessary device update intent (this is done in generic code) 2015-08-14 13:46:37 +02:00
Andreas Shimokawa e28d6fa7cb Pebble: try to install app metadata on FW 3.x (untested) 2015-08-14 12:51:30 +02:00
cpfeiffer 2e3de0cd0f Always send out the current state of GBDevice when asking for version
In a second step, request the version from the device (and send updated
values then)

RequestVersionInfo is either a misnomer or misused, depending on your view.
It is actually used by activities to get the current state of thde device.

We now provide this as quickly as possible, with the drawback of sometimes
sending results twice.
2015-08-14 00:29:05 +02:00
cpfeiffer eec7fae288 Attempting to fix some connection problems after getting disconnected 2015-08-14 00:23:01 +02:00
Andreas Shimokawa 749fbe5ecc Pebble: fix crash with emply pbw cache 2015-08-13 10:06:32 +02:00
Andreas Shimokawa 6ed54484a6 Pebble: only fill app list in AppManager with cached apps once in onCreate()
This is important for FW 3.x testing, since the REFRESH intent
will never arrive and we want to see cached watchapps
2015-08-11 14:16:08 +02:00
Andreas Shimokawa e43fed2e7e Pebble: various preparations for FW 3.x support
- Implement encodeAppStart() for FW 3.x
- List cached PBWs in AppManager (currently only UUID)
2015-08-11 13:55:35 +02:00
Andreas Shimokawa 13260416f3 Pebble: decode app fetch requests for debugging purposes 2015-08-11 13:21:29 +02:00
Andreas Shimokawa 151f5b8e12 Pebble: Choose binaries from basalt/ inside .pbw files for Pebble Time
PBW installation is still unsupported on FW 3.x, these are just preparations
2015-08-11 12:47:23 +02:00
Andreas Shimokawa 5a8c9a9180 Pebble: cache installed pbw files on sdcard if force untested option is set
This will be needed for FW 3.x on demand installations.
2015-08-11 12:04:45 +02:00
Andreas Shimokawa 0be251e83d Pebble: if untested features option is enabled use Gadgetbridge sample provider insted of Morpheuz 2015-08-11 11:21:10 +02:00
Andreas Shimokawa 5884684cad Pebble: add option to enable untested features.
Bad things incoming ;)
2015-08-11 11:15:44 +02:00
Daniele Gobbetti 7bf45d9b9f Merge branch 'master' of https://github.com/Freeyourgadget/Gadgetbridge 2015-08-10 11:24:51 +02:00
Daniele Gobbetti b6d3317b2d First step for GBDeviceEvents support:
- change fw handling to GBDeviceEvent
- misuse the hw version for showing the MiBand device name (there is still no option to set a custom name)
2015-08-10 10:35:55 +02:00
Daniele Gobbetti fd5a620091 re-add support for NO_RESPONSE write characteristic 2015-08-10 09:20:06 +02:00
Andreas Shimokawa d983d7a5c4 Pebble: answer pings from the watch 2015-08-09 21:42:27 +02:00
Andreas Shimokawa 27f88e484d Make ControlCenter only ask for version details after device is initialized
This allows removal of a workaround which allowed ACTION_REQUEST_VERSIONINFO
to be used in connected state (instead of initialized state)
2015-08-07 22:07:48 +02:00
Daniele Gobbetti fe11e6d306 Some BTLE cleanup:
- the BASE_UUID is shared between all BTLE devices, not miband specific. So are the UUID DESCRIPTORS. Hence these have been moved to AbstractBTLEDeviceSupport
- the gatt-characteristic-property-constants used previously in MiBandNotifyAction are also general, and exposed by the gatt subsystem, hence the specific action has been dropped moving the logic to the NotifyAction class
 - the logic for checking the gatt-characteristic-property-constants has been extended also to the ReadAction and WriteAction class, this way we won't try to read (or write)  a characteristic that isn't readable (or writeable)
2015-08-07 16:59:52 +02:00
Andreas Shimokawa 6125594703 Various changes related to INITIALZED device state
Due to a bug in DeviceCommunicationService.isConnected(), devices using the
INITIALIZED state only worked when they had useAutoConnect set to true (Mi Band)

Now setting devices to INITIALIZED state to allow any action send to
DeviceCommunicationService is mandatory. As an exception only
REQUEST_VERSIONINFO will be also be allowed for CONNECTED state.

This also fixes a problem when notifications came in on the Pebble with 3.x
FW before we actually knew it was FW 3.x (INITZALIZED state on the Pebble
now implies that we know the FW version)
2015-08-07 13:24:54 +02:00
cpfeiffer 9004a8b0c1 Experimental: ACTION_START is now optional -- ACTION_CONNECT is sufficient 2015-08-06 23:17:41 +02:00
cpfeiffer f4cb798977 Extract a method for easier reuse if necessary 2015-08-06 22:24:44 +02:00
cpfeiffer 64298fc9af Small improvements for the install activity #30
Now starts the service if not already running
2015-08-06 21:35:00 +02:00
cpfeiffer 2a2eae068a Improvements to the install activity #30
- made it independent of Mi fw and Pebble fw + app classes
- automatically connect to the last used device
- some other small fixes/improvements
2015-08-06 02:17:38 +02:00
cpfeiffer 8dee55198e Don't (always) leak the file descriptor.
It's still very much possible to leak the descriptor (when an exception occurs
somewhere in between or anything else goes wrong). So maybe the whole thing
should be redesigned to be independent of files.
2015-08-06 00:45:07 +02:00
cpfeiffer b7223c7e86 Initial support for transaction-local GattCallbacks (not used yet)
So that we won't have to mix everything in MiBandSupport
2015-08-05 23:26:09 +02:00
Daniele Gobbetti 495a8cc650 Reorder the lines in the MiBandService class.
No functional changes, just clarity enhanchement.
2015-08-05 17:32:02 +02:00
Daniele Gobbetti 65fc6f6866 Adapt the Firmware installer activity to the new FirmwareHelper 2015-08-05 17:31:11 +02:00
cpfeiffer e92c9dbbb5 Better check for fw version major (#30) 2015-08-04 23:08:40 +02:00
cpfeiffer 910d9ef398 Make firmware reading a bit more failsafe #30 2015-08-04 23:02:36 +02:00
cpfeiffer bdc9e70e6e Attempt to fix reconnection problems after being away from the Mi Band
*untested*
2015-08-04 22:03:10 +02:00
cpfeiffer c407ed1a76 Last refactoring for now: BluetoothCommunicationService
- rename to DeviceCommunicationService
- move all bluetooth related bits into separate DeviceSupportFactory
  class
2015-08-04 01:01:14 +02:00
cpfeiffer db4261e02b More refactoring: new service/devices package and service/bt package 2015-08-03 23:51:53 +02:00
cpfeiffer 7c597b325a Big refactoring: move classes and packages around to get a better structure
- model package contains mostly shared interfaces (UI+service), not named GB*
- impl package contains implementations of those interfaces, named GB*
  the impl classes should not be used by the service (not completely done)
- the service classes should mostly use classes inside the service and deviceevents
  packages (tbd)

Every device now has two packages:
- devices/[device name] for UI related functionality
- service[device name] for lowlevel communication
2015-08-03 23:09:49 +02:00
Daniele Gobbetti afc4c9efaa Added some javadocs 2015-08-03 18:35:58 +02:00
Daniele Gobbetti c798cd00fe Prevent tearing of the barchart values over other graph elements 2015-08-03 18:34:58 +02:00
cpfeiffer 802f48011d Refactoring of database access
- the db is now exclusively locked for one thread
- the charts read from the db and analyze data in a background thread

+ some small cleanups
2015-08-03 01:21:44 +02:00
cpfeiffer 9ca595a5cb Some javadocs 2015-08-02 00:12:21 +02:00
Daniele Gobbetti 46ee5a5499 Send the wear location (left hand / right hand) to the MiBand. 2015-07-31 16:19:32 +02:00
Daniele Gobbetti 69ddead8fb Reorder the COMMAND_ constants so that they are in numerical order 2015-07-31 16:19:03 +02:00
Daniele Gobbetti 5b3510fade Update the firmware-update notification based on the feedback we get from the band. 2015-07-31 16:18:09 +02:00
Daniele Gobbetti 2208d5088b Remove the timeout and handle the messages that the band sends back to acknowledge its status.
This should make the firmware transfer much more reliable and hopefully release-ready.
2015-07-31 12:30:42 +02:00
Daniele Gobbetti fbbc2afda4 Add a timeout of 1 second before rebooting after firmware update. 2015-07-31 11:28:03 +02:00
Andreas Shimokawa 0eeb5a6479 PebbleGadgetBridgeSampleProvider: properly override getID() 2015-07-29 23:28:10 +02:00
Daniele Gobbetti 878afd79df Allow the user to set the target number of steps for each day (fitness goal), both in the sharedpreferences and in the MiBand.
The value is then used in the graphs.

#31 #44
2015-07-29 18:49:16 +02:00
Daniele Gobbetti 27669761bf Fix potential race condition when counted steps are above the daily target.
Also added a few comments wrt the labels and the values of the pie chart.
2015-07-29 18:07:35 +02:00
Daniele Gobbetti c05cfc775e New chart showing the steps done today and in the last week.
#31 #44
2015-07-29 16:30:19 +02:00
Andreas Shimokawa f51ffcf16f Use animated upload icon for installation progress notification
Also fix a bug which caused the main gadgetbridge service notification to be reused for the installation notification
2015-07-28 23:10:21 +02:00
Daniele Gobbetti 1bef702485 Send the progress updates from the actual BT transfer, which is where most of the time is spent. 2015-07-28 22:38:52 +02:00
Daniele Gobbetti 23f752dc20 New firmware tested. 2015-07-28 22:03:53 +02:00
Daniele Gobbetti 14f754306d Use a single queue for the whole firmware transfer.
At the moment the progress bar code is not useful because the FW preparation is almost instantly done, and is the BT transfer that takes time.

The transfer happens when the getQueue method is called, and there is no progress info that I can find.
2015-07-28 19:15:25 +02:00
Andreas Shimokawa 732f26823b move installer progressbar from PebbleIoThread to GB and use that for Mi Band fw installation 2015-07-28 18:44:54 +02:00
Andreas Shimokawa 9f591ef8b5 Refactoring: Merge Pebble app/fw installer activity and Miband firmware update Activity 2015-07-28 17:30:20 +02:00
Andreas Shimokawa c3853c7735 Merge remote-tracking branch 'origin/firmware_update' 2015-07-28 16:21:57 +02:00
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