Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

1.4 integrate with master #34

Draft
wants to merge 222 commits into
base: master
Choose a base branch
from
Draft

1.4 integrate with master #34

wants to merge 222 commits into from

Conversation

ChainReaction31
Copy link
Member

No description provided.

@theastrowolfe
remove Dex workaround for including external lib under javax
7334e28
@theastrowolfe
Merge remote-tracking branch 'origin' into sofwerx
b8b81df
@theastrowolfe
test adding jetty upon updating config
f16ff5a
@theastrowolfe
update to auto import vs manual import
ab72e6e
@theastrowolfe
test HTTP Server config and SOS config in sensorhub config
2deb144
@theastrowolfe
wip
ce7c4f0
@theastrowolfe
implement sensorhub http server and sos service
8745ab9
@theastrowolfe
add h2 support
9f644d3
@theastrowolfe
wip for adding video
65ad7a4
@theastrowolfe
alex defaulted quat orientation
dd98183
@theastrowolfe
remove old SOS options from settings
bcdaa94
@theastrowolfe
test new settings ui
151be07
@theastrowolfe
wip refactoring configs for sensorhubconfig
caeeb2c
@theastrowolfe
Merge branch 'master' into sofwerx
b8123bf
@theastrowolfe
wip storage
ed8162a
@theastrowolfe
wip storage not working
c174069
@theastrowolfe
fix typo in comment
e870748
@theastrowolfe
wip; post weekly tagup
f874b40
@theastrowolfe
refactor settings for different data pushing options, and troubleshoo…
be1567b 
…t h2 failure
@theastrowolfe
fix storage and stream storage config
48a8271
@theastrowolfe
cronjob
bb47d6b
@theastrowolfe
test using one config for each simple sensor
0fbb6a8
@theastrowolfe
test using one config only
b365ec0
@theastrowolfe
use one androidSensorsConfig
1be9277
@theastrowolfe
cronjob
9b8a9d5
@theastrowolfe
add methods for addStorageConfig and addSosServerConfig
4e71054
@theastrowolfe
add methods for addStorageConfig and addSosServerConfig
eaf279d
@theastrowolfe
comment out for testing
b7132ab
@theastrowolfe
example for receiving org.sofwerx.ogc.ACTION_SOS broadcast
8b198fd
@theastrowolfe
uncomment adding excluded outputs to storageConf and DataProviderConf
80ed54a
@ChainReaction31
[WIP] Update to add HTTPServerConfig to Main and SensorHubService
d0819a9
@ChainReaction31
Merge remote-tracking branch 'origin/master' into 1.4_integrate_with_…
d0a9051 
…master
@ChainReaction31
add things necessary for sos configuration and setup
f55c8c2
@ChainReaction31
fixes issue causing SOST clients to not be created
c1d2c51
@ChainReaction31
[WIP] going to reimplement SOS w/ IPC module to hopefully get the ful…
ffe10ce 
…l server/servlet working as it does in v1.4 branch
@ChainReaction31
[WIP] move SOS w/ IPC back. Currently won't start as expected.
83c530f
@ChainReaction31
SOS service and http server now start as expected
a8b4df3
@ChainReaction31
Update UI to account for push/store options
6465324 
Not yet implemented in MainActivity
@ChainReaction31
Update methods in MainActivity to reflect names of preferences properly
19bb6cf
@ChainReaction31
Add mock for Status View and add Camera Selection UI elements
333127d
@ChainReaction31
selecting other cameras works, though without properly orienting the …
9298828 
…preview for front facing sensors
@ChainReaction31
Force camera preview orientation to 90 degrees
2b1066d
@ChainReaction31
Add prompt for permissions
d13f286
@ChainReaction31
App Status screen will show basic status of modules
8f8dd8e
@ChainReaction31
improve status text alignment
cef1d89
@ChainReaction31
change status text to N/A when the hub has not been created or is oth…
4a1c47e 
…erwise null
@ChainReaction31
add back support for showing the ip address of the android device in …
3ee1dca 
…general preferences
@ChainReaction31
move back to using sosService instead of with IPC by default
77544bd
@ChainReaction31
start bringing in files from audio support branch
8d95960
@ChainReaction31
Merge branch 'audio_support' into 1.4_integrate_with_master
33e1f4e 
# Conflicts:
#	sensorhub-android-app/AndroidManifest.xml
#	sensorhub-android-app/res/values/strings.xml
#	sensorhub-android-app/res/xml/pref_sensors.xml
#	sensorhub-android-app/src/org/sensorhub/android/MainActivity.java
#	sensorhub-android-app/src/org/sensorhub/android/UserSettingsActivity.java
#	sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsConfig.java
#	sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsDriver.java
#	sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutput.java
@ChainReaction31
audio enabled and pushing data
76de183
@ChainReaction31
ask for recording permission for audio
a604d77
@ChainReaction31
allow user to choose to enable or disable hub and hub storage
92da675
@ChainReaction31
make starting modules automatic based on sensor options selected
d19bd1f
@ChainReaction31
Show a status message when no sensors are pushing remotely just to no…
4851005 
…tify that something is going on.
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@alexrobin alexrobin

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ChainReaction31 @theastrowolfe @alexrobin @nickgaray