ViewVC Help
View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing
root/truck/DashInterface/Display.cpp
(Generate patch)

Comparing DashInterface/Display.cpp (file contents):
Revision 26 by douglas, 2008-02-23T13:35:09-08:00 vs.
Revision 30 by douglas, 2008-02-28T17:01:10-08:00

# Line 4 | Line 4
4   //
5   // $Id$
6  
7 + #include <foreach.hpp>
8 +
9 + #include <iomanip>
10   #include <iostream>
11  
12   #include <fcntl.h>
# Line 11 | Line 14
14  
15   #include "Display.hpp"
16  
17 + extern bool debug;
18 +
19   static uint16_t GetCRC(uint8_t *buffer, size_t length)
20   {
21          static const uint16_t table[256] = {
22 <                0x00000,0x01189,0x02312,0x0329B,0x04624,0x057AD,0x06536,0x074BF,
23 <                0x08C48,0x09DC1,0x0AF5A,0x0BED3,0x0CA6C,0x0DBE5,0x0E97E,0x0F8F7,
24 <                0x01081,0x00108,0x03393,0x0221A,0x056A5,0x0472C,0x075B7,0x0643E,
25 <                0x09CC9,0x08D40,0x0BFDB,0x0AE52,0x0DAED,0x0CB64,0x0F9FF,0x0E876,
26 <                0x02102,0x0308B,0x00210,0x01399,0x06726,0x076AF,0x04434,0x055BD,
27 <                0x0AD4A,0x0BCC3,0x08E58,0x09FD1,0x0EB6E,0x0FAE7,0x0C87C,0x0D9F5,
28 <                0x03183,0x0200A,0x01291,0x00318,0x077A7,0x0662E,0x054B5,0x0453C,
29 <                0x0BDCB,0x0AC42,0x09ED9,0x08F50,0x0FBEF,0x0EA66,0x0D8FD,0x0C974,
30 <                0x04204,0x0538D,0x06116,0x0709F,0x00420,0x015A9,0x02732,0x036BB,
31 <                0x0CE4C,0x0DFC5,0x0ED5E,0x0FCD7,0x08868,0x099E1,0x0AB7A,0x0BAF3,
32 <                0x05285,0x0430C,0x07197,0x0601E,0x014A1,0x00528,0x037B3,0x0263A,
33 <                0x0DECD,0x0CF44,0x0FDDF,0x0EC56,0x098E9,0x08960,0x0BBFB,0x0AA72,
34 <                0x06306,0x0728F,0x04014,0x0519D,0x02522,0x034AB,0x00630,0x017B9,
35 <                0x0EF4E,0x0FEC7,0x0CC5C,0x0DDD5,0x0A96A,0x0B8E3,0x08A78,0x09BF1,
36 <                0x07387,0x0620E,0x05095,0x0411C,0x035A3,0x0242A,0x016B1,0x00738,
37 <                0x0FFCF,0x0EE46,0x0DCDD,0x0CD54,0x0B9EB,0x0A862,0x09AF9,0x08B70,
38 <                0x08408,0x09581,0x0A71A,0x0B693,0x0C22C,0x0D3A5,0x0E13E,0x0F0B7,
39 <                0x00840,0x019C9,0x02B52,0x03ADB,0x04E64,0x05FED,0x06D76,0x07CFF,
40 <                0x09489,0x08500,0x0B79B,0x0A612,0x0D2AD,0x0C324,0x0F1BF,0x0E036,
41 <                0x018C1,0x00948,0x03BD3,0x02A5A,0x05EE5,0x04F6C,0x07DF7,0x06C7E,
42 <                0x0A50A,0x0B483,0x08618,0x09791,0x0E32E,0x0F2A7,0x0C03C,0x0D1B5,
43 <                0x02942,0x038CB,0x00A50,0x01BD9,0x06F66,0x07EEF,0x04C74,0x05DFD,
44 <                0x0B58B,0x0A402,0x09699,0x08710,0x0F3AF,0x0E226,0x0D0BD,0x0C134,
45 <                0x039C3,0x0284A,0x01AD1,0x00B58,0x07FE7,0x06E6E,0x05CF5,0x04D7C,
46 <                0x0C60C,0x0D785,0x0E51E,0x0F497,0x08028,0x091A1,0x0A33A,0x0B2B3,
47 <                0x04A44,0x05BCD,0x06956,0x078DF,0x00C60,0x01DE9,0x02F72,0x03EFB,
48 <                0x0D68D,0x0C704,0x0F59F,0x0E416,0x090A9,0x08120,0x0B3BB,0x0A232,
49 <                0x05AC5,0x04B4C,0x079D7,0x0685E,0x01CE1,0x00D68,0x03FF3,0x02E7A,
50 <                0x0E70E,0x0F687,0x0C41C,0x0D595,0x0A12A,0x0B0A3,0x08238,0x093B1,
51 <                0x06B46,0x07ACF,0x04854,0x059DD,0x02D62,0x03CEB,0x00E70,0x01FF9,
52 <                0x0F78F,0x0E606,0x0D49D,0x0C514,0x0B1AB,0x0A022,0x092B9,0x08330,
53 <                0x07BC7,0x06A4E,0x058D5,0x0495C,0x03DE3,0x02C6A,0x01EF1,0x00F78,
22 >                0x00000, 0x01189, 0x02312, 0x0329b, 0x04624, 0x057ad, 0x06536, 0x074bf,
23 >                0x08C48, 0x09DC1, 0x0AF5A, 0x0BED3, 0x0CA6C, 0x0DBE5, 0x0E97E, 0x0F8F7,
24 >                0x01081, 0x00108, 0x03393, 0x0221a, 0x056a5, 0x0472c, 0x075b7, 0x0643e,
25 >                0x09CC9, 0x08D40, 0x0BFDB, 0x0AE52, 0x0DAED, 0x0CB64, 0x0F9FF, 0x0E876,
26 >                0x02102, 0x0308b, 0x00210, 0x01399, 0x06726, 0x076af, 0x04434, 0x055bd,
27 >                0x0AD4A, 0x0BCC3, 0x08E58, 0x09FD1, 0x0EB6E, 0x0FAE7, 0x0C87C, 0x0D9F5,
28 >                0x03183, 0x0200a, 0x01291, 0x00318, 0x077a7, 0x0662e, 0x054b5, 0x0453c,
29 >                0x0BDCB, 0x0AC42, 0x09ED9, 0x08F50, 0x0FBEF, 0x0EA66, 0x0D8FD, 0x0C974,
30 >                0x04204, 0x0538d, 0x06116, 0x0709f, 0x00420, 0x015a9, 0x02732, 0x036bb,
31 >                0x0ce4c, 0x0dfc5, 0x0ed5e, 0x0fcd7, 0x08868, 0x099e1, 0x0ab7a, 0x0baf3,
32 >                0x05285, 0x0430c, 0x07197, 0x0601e, 0x014a1, 0x00528, 0x037b3, 0x0263a,
33 >                0x0decd, 0x0cf44, 0x0fddf, 0x0ec56, 0x098e9, 0x08960, 0x0bbfb, 0x0aa72,
34 >                0x06306, 0x0728f, 0x04014, 0x0519d, 0x02522, 0x034ab, 0x00630, 0x017b9,
35 >                0x0EF4E, 0x0FEC7, 0x0CC5C, 0x0DDD5, 0x0A96A, 0x0B8E3, 0x08A78, 0x09BF1,
36 >                0x07387, 0x0620e, 0x05095, 0x0411c, 0x035a3, 0x0242a, 0x016b1, 0x00738,
37 >                0x0FFCF, 0x0EE46, 0x0DCDD, 0x0CD54, 0x0B9EB, 0x0A862, 0x09AF9, 0x08B70,
38 >                0x08408, 0x09581, 0x0a71a, 0x0b693, 0x0c22c, 0x0d3a5, 0x0e13e, 0x0f0b7,
39 >                0x00840, 0x019c9, 0x02b52, 0x03adb, 0x04e64, 0x05fed, 0x06d76, 0x07cff,
40 >                0x09489, 0x08500, 0x0b79b, 0x0a612, 0x0d2ad, 0x0c324, 0x0f1bf, 0x0e036,
41 >                0x018c1, 0x00948, 0x03bd3, 0x02a5a, 0x05ee5, 0x04f6c, 0x07df7, 0x06c7e,
42 >                0x0a50a, 0x0b483, 0x08618, 0x09791, 0x0e32e, 0x0f2a7, 0x0c03c, 0x0d1b5,
43 >                0x02942, 0x038cb, 0x00a50, 0x01bd9, 0x06f66, 0x07eef, 0x04c74, 0x05dfd,
44 >                0x0b58b, 0x0a402, 0x09699, 0x08710, 0x0f3af, 0x0e226, 0x0d0bd, 0x0c134,
45 >                0x039C3, 0x0284A, 0x01AD1, 0x00B58, 0x07FE7, 0x06E6E, 0x05CF5, 0x04D7C,
46 >                0x0c60c, 0x0d785, 0x0e51e, 0x0f497, 0x08028, 0x091a1, 0x0a33a, 0x0b2b3,
47 >                0x04a44, 0x05bcd, 0x06956, 0x078df, 0x00c60, 0x01de9, 0x02f72, 0x03efb,
48 >                0x0d68d, 0x0c704, 0x0f59f, 0x0e416, 0x090a9, 0x08120, 0x0b3bb, 0x0a232,
49 >                0x05AC5, 0x04B4C, 0x079D7, 0x0685E, 0x01CE1, 0x00D68, 0x03FF3, 0x02E7A,
50 >                0x0e70e, 0x0f687, 0x0c41c, 0x0d595, 0x0a12a, 0x0b0a3, 0x08238, 0x093b1,
51 >                0x06b46, 0x07acf, 0x04854, 0x059dd, 0x02d62, 0x03ceb, 0x00e70, 0x01ff9,
52 >                0x0f78f, 0x0e606, 0x0d49d, 0x0c514, 0x0b1ab, 0x0a022, 0x092b9, 0x08330,
53 >                0x07BC7, 0x06A4E, 0x058D5, 0x0495C, 0x03DE3, 0x02C6A, 0x01EF1, 0x00F78,
54          };
55          register uint16_t crc(0xffff);
56  
# Line 55 | Line 60 | static uint16_t GetCRC(uint8_t *buffer,
60          return ~crc;
61   }
62  
63 < Display::Packet::Packet(Display::Packet::Command command, const std::string &data) : command(command), length(data.size())
63 > Display::Packet::Packet(Display::Packet::Command command, uint8_t length, const uint8_t *data) : command(command), length(length)
64   {
65          if (length > sizeof (this->data))
66                  throw;
67  
68 <        ::memcpy(this->data, data.data(), length);
68 >        ::memcpy(this->data, data, length);
69  
70          crc = GetCRC(reinterpret_cast<uint8_t *>(this), length + 2);
71   }
72  
73 < void operator<<(int fd, const Display::Packet::Packet &packet)
73 > std::ostream &operator<<(std::ostream &output, const Display::Packet &packet)
74 > {
75 >        return output << _B("0x") << std::hex << std::setw(2) << std::setfill('0') << unsigned(packet.command) << std::dec << std::setw(0) << std::setfill(' ') << _B(" [") << packet.GetData() << ']';
76 > }
77 >
78 > void operator<<(int fd, const Display::Packet &packet)
79   {
80          if (packet.length != sizeof (packet.data))
81                  ::memcpy(const_cast<uint8_t *>(packet.data) + packet.length, &packet.crc, 2);
82  
83 +        if (debug)
84 +                std::cerr << _B("<< ") << packet << std::endl;
85 +
86          Posix::Write(fd, &packet, packet.length + 4);
87   }
88  
89 < void operator>>(int fd, Display::Packet::Packet &packet)
89 > void operator>>(int fd, Display::Packet &packet)
90   {
91          Posix::Read(fd, &packet, 2);
92          Posix::Read(fd, packet.data, packet.length);
93          Posix::Read(fd, &packet.crc, 2);
94  
95 <        std::printf("0x%02x\n%i\n", packet.command, packet.length);
96 <
84 <        std::cout << '[' << std::string((char*)(packet.data), size_t(packet.length)) << ']' << std::endl;
95 >        if (debug)
96 >                std::cerr << _B(">> ") << packet << std::endl;
97   }
98  
99   Display::Display(const std::string &device) : ucom(Posix::Open(device, O_RDWR | O_NOCTTY))
# Line 103 | Line 115 | Display::Display(const std::string &devi
115          Posix::CheckError(::tcsetattr(ucom, TCSANOW, &state));
116   }
117  
118 < bool Display::Ping(const std::string &data)
118 > Display::Packet Display::Communicate_(Display::Packet::Command command, uint8_t length, const uint8_t *data)
119   {
120 <        Packet packet(Packet::PingCommand, data), response;
120 >        Packet packet(command, length, data), response;
121  
122          ucom << packet;
123  
124 <        do
124 >        _forever
125          {
126                  ucom >> response;
127 +
128 +                if (packet.command | Packet::Response == response.command)
129 +                        return response;
130 +
131 +                switch (response.command)
132 +                {
133 +                case Packet::KeyActivity:
134 +                        keyActivity.push(response);
135 +
136 +                        break;
137 +                case Packet::FanSpeedReport:
138 +                case Packet::TemperatureSensorReport:
139 +                        break;
140 +                }
141          }
142 <        while (packet.command | Packet::Response != response.command);
142 > }
143 >
144 > bool Display::Ping(const std::string &data)
145 > {
146 >        return data == Communicate<const std::string &>(Packet::PingCommand, data).GetData();
147 > }
148  
149 <        return true;
149 > std::string Display::Version()
150 > {
151 >        return Communicate(Packet::GetHardwareAndFirmwareVersion).GetData();
152 > }
153 >
154 > void Display::Set(uint8_t column, uint8_t row, const std::string &data)
155 > {
156 >        Communicate(Packet::SendDataToLCD, column, row, data);
157   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines