Commit 967c084c authored by Notice B.V.'s avatar Notice B.V.

Merge branch 'development' into 'master'

Fixed error 29 bits handling - version 004

See merge request !3
parents bcaad628 41de5026
...@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License ...@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define VERSION "003" #define VERSION "004"
#define SERIAL_BPS 115200 #define SERIAL_BPS 115200
...@@ -205,7 +205,7 @@ void storeFrame(CAN_frame_t &frame) ...@@ -205,7 +205,7 @@ void storeFrame(CAN_frame_t &frame)
{ // free data is < 0x700 { // free data is < 0x700
storeFreeframe(frame, 0); storeFreeframe(frame, 0);
} }
else if (frame.MsgID < 0x800) else
{ // iso-tp data is < 0x800 { // iso-tp data is < 0x800
storeIsotpframe(frame, 0); storeIsotpframe(frame, 0);
} }
...@@ -279,7 +279,7 @@ void processCommand() ...@@ -279,7 +279,7 @@ void processCommand()
// request an ISO-TP frame *********************************************** // request an ISO-TP frame ***********************************************
case 'i': case 'i':
if (command.id >= 0x700 && command.id <= 0x7ff) if (command.id >= 0x700)
{ {
requestIsotp(command.id, command.requestLength, command.request, bus); requestIsotp(command.id, command.requestLength, command.request, bus);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment