From d44b969b5e0d453e0c0e29cafc098a018fc1719a Mon Sep 17 00:00:00 2001 From: Nadeflore Date: Wed, 25 Jan 2017 21:38:40 +0100 Subject: [PATCH] Fix compilation errors with newer compiler --- acrealio/CardDispenser.cpp | 4 +++- acrealio/Ddr.cpp | 4 +++- acrealio/IoBoard.cpp | 4 +++- acrealio/LedBoard.cpp | 4 +++- acrealio/Reader.cpp | 4 +++- acrealio/SL015M.cpp | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/acrealio/CardDispenser.cpp b/acrealio/CardDispenser.cpp index 2f7b45f..363f0d6 100644 --- a/acrealio/CardDispenser.cpp +++ b/acrealio/CardDispenser.cpp @@ -5,7 +5,9 @@ //contructor CardDispenser::CardDispenser(char* rCode) { - setVersion((byte[]) {0x04, 0x00, 0x00, 0x01}, 0x00, (byte[]) {0x00, 0x00, 0x07}, rCode); + byte rType[] = {0x04, 0x00, 0x00, 0x01}; + byte rVersion[] = {0x00, 0x00, 0x07}; + setVersion(rType , 0x00, rVersion, rCode); } void CardDispenser::init() diff --git a/acrealio/Ddr.cpp b/acrealio/Ddr.cpp index f54c574..8ceb6ac 100644 --- a/acrealio/Ddr.cpp +++ b/acrealio/Ddr.cpp @@ -5,7 +5,9 @@ //contructor Ddr::Ddr() { - setVersion((byte[]) {0x04, 0x02, 0x00, 0x00}, 0x00, (byte[]) {0x01, 0x01, 0x00}, "HDXS"); + byte rType[] = {0x04, 0x02, 0x00, 0x00}; + byte rVersion[] = {0x01, 0x01, 0x00}; + setVersion(rType, 0x00, rVersion, "HDXS"); } void Ddr::init() diff --git a/acrealio/IoBoard.cpp b/acrealio/IoBoard.cpp index fa9307d..0424aaf 100644 --- a/acrealio/IoBoard.cpp +++ b/acrealio/IoBoard.cpp @@ -6,7 +6,9 @@ byte lightPin[] = {LT_START, LT_A, LT_B, LT_C, LT_D, LT_FXL, LT_FXR}; //contructor IoBoard::IoBoard(char* rCode) { - setVersion((byte[]) {0x09, 0x06, 0x00, 0x00}, 0x00, (byte[]) {0x01, 0x01, 0x00}, rCode); + byte rType[] = {0x09, 0x06, 0x00, 0x00}; + byte rVersion[] = {0x01, 0x01, 0x00}; + setVersion(rType, 0x00, rVersion, rCode); //pins for pushbuttons diff --git a/acrealio/LedBoard.cpp b/acrealio/LedBoard.cpp index 2016088..e33757b 100644 --- a/acrealio/LedBoard.cpp +++ b/acrealio/LedBoard.cpp @@ -5,7 +5,9 @@ //contructor LedBoard::LedBoard(char* rCode) { - setVersion((byte[]) {0x04, 0x01, 0x00, 0x00}, 0x00, (byte[]) {0x01, 0x00, 0x00}, rCode); + byte rType[] = {0x04, 0x01, 0x00, 0x00}; + byte rVersion[] = {0x01, 0x00, 0x00}; + setVersion(rType, 0x00, rVersion, rCode); } void LedBoard::init() diff --git a/acrealio/Reader.cpp b/acrealio/Reader.cpp index f7a2cd5..30886a5 100644 --- a/acrealio/Reader.cpp +++ b/acrealio/Reader.cpp @@ -13,7 +13,9 @@ Reader::Reader() //cmd61 is used to specify behaviour on command 0x61 void Reader::setrCode(char* rCode, byte cmd61_s) { - setVersion((byte[]) {0x03, 0x00, 0x00, 0x00}, 0x00, (byte[]) {0x01, 0x06, 0x00}, rCode); + byte rType[] = {0x03, 0x00, 0x00, 0x00}; + byte rVersion[] = {0x01, 0x06, 0x00}; + setVersion(rType, 0x00, rVersion, rCode); cmd61 = cmd61_s; } diff --git a/acrealio/SL015M.cpp b/acrealio/SL015M.cpp index 2fbad24..d51e186 100644 --- a/acrealio/SL015M.cpp +++ b/acrealio/SL015M.cpp @@ -115,7 +115,7 @@ void SL015M::update() } } -boolean SL015M::isCardPresent() +byte SL015M::isCardPresent() { return card; }