# Conflicts:
#	app/app.iml

consider time gap between phone and pump

# Conflicts:
#	app/src/main/AndroidManifest.xml

Support for broadcasting data to xDrip+

- add git hash to VersionName to have more details

minor improvements to alarm receiver

- add MedtronicCnlIntentService.POLL_GRACE_PERIOD_MS to regular repeat to avoid radio noise very 5 min.

- Display only the last lines in Log.
- Changes to try and stop dropped device polls.

Fix #52 (Thanks @rahim).
Updated to support latest Android studio.

some alarmmanager testing

add queue & timestamp to display the last 10 entries (needs to be adapted to TextView height)

Upload all new entries in a single HTTP request in a JSON array, rather than individual HTTP requests.

- Move the Nightscout upload to the MedtronicCnlIntentService, rather than firing from the MainActivity

Merge the Realm object CgmStatusEvent into PumpStatusEvent, since the data comes from the same Medtronic message, and allows us to make sure the commits are atomic.

- Add extra logging to the Contour Next Link communication object
- Fix crash when receiving an invalid response messages
- Change IntentService to use an WakefulBroadcastReceiver to ensure that pump communications fire appropriately when the device is sleeping
- Fixed some Realm state bugs

Add deviceName