Subversion Repositories HomeAutomation

Rev

Rev 1950 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | SVN | RSS feed

Rev 1950 Rev 1952
Line 35... Line 35...
35 
 
 35 
 
36 
  //Log(JSON.stringify(json_data));
 36 
  //Log(JSON.stringify(json_data));
37 
 
 37 
 
38 
  if (json_data.method == "MBB.GpsNmeaData")
 38 
  if (json_data.method == "MBB.GpsNmeaData")
39 
  {
 39 
  {
40 
    if (json_data.params.nmea.substr(0, 6) == "$GPGGA")
 40 
    if (Mbb_Clients[client_id])
41 
    {
 41 
    {
42 
      Mbb_Clients[client_id]["LastNmea"]["GGA"] = json_data.params.nmea;
 - 
 
43 
    }
 - 
 
44 
    else if (json_data.params.nmea.substr(0, 6) == "$GPRMC")
 42 
      if (json_data.params.nmea.substr(0, 6) == "$GPGGA")
45 
    {
 43 
      {
46 
      Mbb_Clients[client_id]["LastNmea"]["RMC"] = json_data.params.nmea;
 44 
        Mbb_Clients[client_id]["LastNmea"]["GGA"] = json_data.params.nmea;
47 
     
 - 
 
48 
      Mbb_Clients[client_id]["Position"] = _Mbb_NmeaToPosition(client_id);
 - 
 
49 
     
 45 
      }
50 
      for (var n = 0; n < Mbb_Susbscribers.length; n++)
 46 
      else if (json_data.params.nmea.substr(0, 6) == "$GPRMC")
51 
      {
 47 
      {
- 
 
 48 
        Mbb_Clients[client_id]["LastNmea"]["RMC"] = json_data.params.nmea;
- 
 
 49 
       
- 
 
 50 
        Mbb_Clients[client_id]["Position"] = _Mbb_NmeaToPosition(client_id);
- 
 
 51 
       
- 
 
 52 
        for (var n = 0; n < Mbb_Susbscribers.length; n++)
- 
 
 53 
        {
52 
        Mbb_Susbscribers[n]("position", Mbb_Clients[client_id]);
 54 
          Mbb_Susbscribers[n]("position", Mbb_Clients[client_id]);
- 
 
 55 
        }
- 
 
 56 
       
- 
 
 57 
        Mbb_Clients[client_id]["LastNmea"]["GGA"] = "";
- 
 
 58 
        Mbb_Clients[client_id]["LastNmea"]["RMC"] = "";
- 
 
 59 
        Mbb_Clients[client_id]["Position"] = false;
53 
      }
 60 
      }
54 
     
 61 
    }
55 
      Mbb_Clients[client_id]["LastNmea"]["GGA"] = "";
 62 
    else
56 
      Mbb_Clients[client_id]["LastNmea"]["RMC"] = "";
 63 
    {
57 
      Mbb_Clients[client_id]["Position"] = false;
 64 
      Log("Got data from unknown tracker!");
58 
    }
 65 
    }
59 
  }
 66 
  }
60 
  else /*if (json_data.method == "MBB.Connected")*/
 67 
  else if (json_data.method == "MBB.OnConnected")
61 
  {
 68 
  {
62 
    json_data = { "params" : { "Imei" : "004401700721448" } };
 69 
    json_data = { "params" : { "Imei" : "004401700721448" } }; // Temporary hack since we get corrupted data from the device
63 
   
 70 
   
64 
    Log("Client " + client_id + " has IMEI " + json_data.params.Imei);
 71 
    Log("Client " + client_id + " has IMEI " + json_data.params.Imei);
65 
   
 72 
   
66 
    Mbb_Clients[client_id]["Id"] = client_id;
 73 
    Mbb_Clients[client_id]["Id"] = client_id;
67 
    Mbb_Clients[client_id]["Info"] = json_data.params;
 74 
    Mbb_Clients[client_id]["Info"] = json_data.params;
Line 73... Line 80...
73 
    for (var n = 0; n < Mbb_Susbscribers.length; n++)
 80 
    for (var n = 0; n < Mbb_Susbscribers.length; n++)
74 
    {
 81 
    {
75 
      Mbb_Susbscribers[n]("connected", Mbb_Clients[client_id]);
 82 
      Mbb_Susbscribers[n]("connected", Mbb_Clients[client_id]);
76 
    }
 83 
    }
77 
  }
 84 
  }
78 
  /*else
 85 
  else
79 
  {
 86 
  {
80 
    Log("Got unknown data \"" + json_data + "\" from client " + client_id);
 87 
    Log("Got unknown data \"" + data + "\" from client " + client_id);
81 
  }*/
 88 
  }
82 
}
 89 
}
83 
 
 90 
 
84 
function Mbb_SendData(client_id, json_data)
 91 
function Mbb_SendData(client_id, json_data)
85 
{
 92 
{
86 
  return MbbExport_SendData(client_id, JSON.Stringify(json_data));
 93 
  return MbbExport_SendData(client_id, JSON.Stringify(json_data));