Skip to content

Commit

Permalink
V0.81 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@spadival
spadival committed Mar 23, 2016
1 parent 80da9b9 commit 52f6275
Show file tree
Hide file tree
Showing 13 changed files with 71 additions and 67 deletions.
Binary file added jni/hu_aad.o
View file
Binary file not shown.
Binary file added jni/hu_aap.o
View file
Binary file not shown.
Binary file added jni/hu_ssl.o
View file
Binary file not shown.
Binary file added jni/hu_usb.o
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion jni/hu_uti.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

// #define UTILS_INCLUDED

// #define NDEBUG // Ensure debug stuff
#define NDEBUG // Ensure debug stuff

#define hu_STATE_INITIAL 0
#define hu_STATE_STARTIN 1
Expand Down
Binary file added jni/hu_uti.o
View file
Binary file not shown.
Binary file added mazda/Release/AndroidAuto_V0.81.zip
View file
Binary file not shown.
Binary file modified mazda/Release/config/androidauto/data_persist/dev/bin/headunit
View file
Binary file not shown.
37 changes: 23 additions & 14 deletions mazda/Release/config/androidauto/jci/gui/apps/_androidauto/js/_androidautoApp.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,13 @@ _androidautoApp.prototype._StartContextReady = function ()
function androidauto() {

ws = new WebSocket('ws://localhost:9999/');

debugTxt = '';

var credits = document.getElementsByClassName("TemplateWithStatusLeft AndroidAutoTmplt")[0];

$('#'+credits.id).children().fadeIn().delay(3000).fadeOut();

ws.onopen = function() {
ws.send("export LD_LIBRARY_PATH=/data_persist/dev/androidauto/custlib:/jci/lib:/jci/opera/3rdpartylibs/freetype:/usr/lib/imx-mm/audio-codec:/usr/lib/imx-mm/parser:/data_persist/dev/lib: \n");
ws.send("echo 3 > /proc/sys/vm/drop_caches \n");
Expand All @@ -100,29 +106,32 @@ function androidauto() {
/com/xse/service/AudioManagement/AudioApplication \
com.xsembedded.ServiceProvider.Request \
string:'requestAudioFocus' \
string:'{\"sessionId\":13,\"requestType\":\"request\"}'")
ws.send("headunit \n");
string:'{\"sessionId\":13,\"requestType\":\"request\"}' \n")
ws.send("taskset 0x00000003 headunit \n");
// On Ubuntu
// ws.send("export TERM=xterm \n");
// ws.send("export DISPLAY=:0.0 \n");
// ws.send("headunit & \n");
};


ws.onmessage = function(event) {
var psconsole = $('#aaStatusText');
psconsole.focus();
psconsole.append(event.data + '\n');

if(psconsole.length)
psconsole.scrollTop(psconsole[0].scrollHeight - psconsole.height());
if ( event.data == "Starting Android Auto...") {
$("#AndroidAutoTmplt1").hide();
}
debugTxt = debugTxt + event.data + '\n';

if ( event.data == "END ") {
$("#AndroidAutoTmplt1").show();
var psconsole = $('#aaStatusText');
psconsole.focus();
psconsole.append(debugTxt);

if(psconsole.length)
psconsole.scrollTop(psconsole[0].scrollHeight - psconsole.height());

var credits = document.getElementsByClassName("TemplateWithStatusLeft AndroidAutoTmplt")[0];

$('#'+credits.id).children().fadeIn();
}
};
};
}

_androidautoApp.prototype._StartContextOut = function ()
Expand All @@ -134,7 +143,7 @@ _androidautoApp.prototype._StartContextOut = function ()
/com/xse/service/AudioManagement/AudioApplication \
com.xsembedded.ServiceProvider.Request \
string:'audioActive' \
string:'{\"sessionId\":13,\"playing\": false}'");
string:'{\"sessionId\":13,\"playing\": false}' \n");
ws.close();
};

Expand Down
2 changes: 1 addition & 1 deletion ...config/androidauto/jci/gui/apps/_androidauto/templates/AndroidAuto/js/AndroidAutoTmplt.js
View file

Large diffs are not rendered by default.

Binary file added mazda/headunit
View file
Binary file not shown.
97 changes: 46 additions & 51 deletions mazda/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,7 @@ static int gst_pipeline_init(gst_app_t *app)

g_signal_connect(app->src, "enough-data", G_CALLBACK(stop_feed), app);


aud_pipeline = gst_parse_launch("appsrc name=audsrc ! audio/x-raw-int, signed=true, endianness=1234, depth=16, width=16, rate=48000, channels=2 ! alsasink ",&error);
aud_pipeline = gst_parse_launch("appsrc name=audsrc is-live=true block=false max-latency=1000000 ! audio/x-raw-int, signed=true, endianness=1234, depth=16, width=16, rate=48000, channels=2 ! alsasink ",&error);

if (error != NULL) {
printf("could not construct pipeline: %s\n", error->message);
Expand All @@ -256,7 +255,7 @@ static int gst_pipeline_init(gst_app_t *app)
gst_app_src_set_stream_type((GstAppSrc *)aud_src, GST_APP_STREAM_TYPE_STREAM);


au1_pipeline = gst_parse_launch("appsrc name=au1src ! audio/x-raw-int, signed=true, endianness=1234, depth=16, width=16, rate=16000, channels=1 ! alsasink ",&error);
au1_pipeline = gst_parse_launch("appsrc name=au1src is-live=true block=false max-latency=1000000 ! audio/x-raw-int, signed=true, endianness=1234, depth=16, width=16, rate=16000, channels=1 ! alsasink ",&error);

if (error != NULL) {
printf("could not construct pipeline: %s\n", error->message);
Expand Down Expand Up @@ -616,6 +615,9 @@ gboolean commander_poll_event(gpointer data)
ssize_t size;
gst_app_t *app = (gst_app_t *)data;
struct timespec tp;
uint8_t *cmd_buf = NULL;
int cmd_size = 0;

sigset_t sigmask;
struct pollfd fds[1];
int ret;
Expand Down Expand Up @@ -652,59 +654,50 @@ gboolean commander_poll_event(gpointer data)

switch (event[i].code) {
case KEY_UP:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 10000000000 +tp.tv_nsec,cd_up1,3);
queueSend(0,AA_CH_TOU, cd_up1, sizeof(cd_up1), FALSE);
cmd_buf = cd_up1;
cmd_size = sizeof(cd_up1);
break;

case KEY_DOWN:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 10000000000 +tp.tv_nsec,cd_down1,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_down1, sizeof(cd_down1));
cmd_buf = cd_down1;
cmd_size = sizeof(cd_down1);
break;

case KEY_LEFT:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 10000000000 +tp.tv_nsec,cd_left1,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_left1, sizeof(cd_left1));
cmd_buf = cd_left1;
cmd_size = sizeof(cd_left1);
break;

case KEY_RIGHT:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_right1+3,0);
buf = cd_right1;
len = sizeof(cd_right1);
cmd_buf = cd_right1;
cmd_size = sizeof(cd_right1);
break;

case KEY_N:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_lefturn+3,0);
buf = cd_lefturn;
len = sizeof(cd_lefturn);
cmd_buf = cd_lefturn;
cmd_size = sizeof(cd_lefturn);
break;

case KEY_M:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_rightturn+3,0);
buf = cd_rightturn;
len = sizeof(cd_rightturn);
cmd_buf = cd_rightturn;
cmd_size = sizeof(cd_rightturn);
break;

case KEY_ENTER:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_enter1,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_enter1, sizeof(cd_enter1));
cmd_buf = cd_enter1;
cmd_size = sizeof(cd_enter1);
break;

case KEY_BACKSPACE:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_back1,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_back1, sizeof(cd_back1));
cmd_buf = cd_back1;
cmd_size = sizeof(cd_back1);
break;
}

if (buf != NULL) {
ret = hu_aap_enc_send (0, AA_CH_TOU, NULL, 0);
if (cmd_buf != NULL) {
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec, cmd_buf + 3,0);
queueSend(0,AA_CH_TOU, cmd_buf, cmd_size, FALSE);

if (ret < 0) {
printf("send_aa_cmd_thread(): hu_aap_enc_send() failed with (%d)\n", ret);
Expand All @@ -717,41 +710,43 @@ gboolean commander_poll_event(gpointer data)
if (event[i].type == EV_KEY && event[i].value == 0) {
switch (event[i].code) {
case KEY_UP:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_up2,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_up2, sizeof(cd_up2));
cmd_buf = cd_up2;
cmd_size = sizeof(cd_up2);
break;

case KEY_DOWN:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_down2,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_down2, sizeof(cd_down2));
cmd_buf = cd_down2;
cmd_size = sizeof(cd_down2);
break;

case KEY_LEFT:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_left2,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_left2, sizeof(cd_left2));
cmd_buf = cd_left2;
cmd_size = sizeof(cd_left2);
break;

case KEY_RIGHT:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_right2,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_right2, sizeof(cd_right2));
cmd_buf = cd_right2;
cmd_size = sizeof(cd_right2);
break;

case KEY_ENTER:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_enter2,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_enter2, sizeof(cd_enter2));
cmd_buf = cd_enter2;
cmd_size = sizeof(cd_enter2);
break;

case KEY_BACKSPACE:
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec,cd_back2,3);
hu_aap_enc_send (0,AA_CH_TOU, cd_back2, sizeof(cd_back2));
cmd_buf = cd_back2;
cmd_size = sizeof(cd_back2);
break;
}

if (cmd_buf != NULL) {
clock_gettime(CLOCK_REALTIME, &tp);
varint_encode(tp.tv_sec * 1000000000 +tp.tv_nsec, cmd_buf + 3,0);
if (ret < 0) {
printf("send_aa_cmd_thread(): hu_aap_enc_send() failed with (%d)\n", ret);
}
}
}
}
}
Expand All @@ -763,7 +758,7 @@ gboolean commander_poll_event(gpointer data)
static void * input_thread(void *app) {

while (touch_poll_event(app)) {
//commander_poll_event(app);
commander_poll_event(app);
ms_sleep(100);
}
}
Expand Down
Binary file added mazda/main.o
View file
Binary file not shown.

0 comments on commit 52f6275

Please sign in to comment.