From 60718f5eaccadafdc0f6d0c0dfe674db11b6c4b0 Mon Sep 17 00:00:00 2001 From: Asbelos Date: Sat, 21 Aug 2021 13:17:14 +0100 Subject: [PATCH] int->int16_t to keep pedantic compilers happy --- RMFT2.cpp | 2 +- RMFT2.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RMFT2.cpp b/RMFT2.cpp index 07ba06e..f358a70 100644 --- a/RMFT2.cpp +++ b/RMFT2.cpp @@ -357,7 +357,7 @@ bool RMFT2::skipIfBlock() { -/* static */ void RMFT2::readLocoCallback(int cv) { +/* static */ void RMFT2::readLocoCallback(int16_t cv) { progtrackLocoId=cv; } diff --git a/RMFT2.h b/RMFT2.h index e69696d..0619828 100644 --- a/RMFT2.h +++ b/RMFT2.h @@ -65,18 +65,18 @@ enum OPCODE : byte {OPCODE_THROW,OPCODE_CLOSE, RMFT2(int progCounter); RMFT2(int route, uint16_t cab); ~RMFT2(); - static void readLocoCallback(int cv); + static void readLocoCallback(int16_t cv); static void emitWithrottleRouteList(Print* stream); static void createNewTask(int route, uint16_t cab); static void turnoutEvent(VPIN id, bool closed); private: - static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int p[]); - static bool parseSlash(Print * stream, byte & paramCount, int p[]) ; + static void ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16_t p[]); + static bool parseSlash(Print * stream, byte & paramCount, int16_t p[]) ; static void streamFlags(Print* stream); static void setFlag(VPIN id,byte onMask, byte OffMask=0); static bool getFlag(VPIN id,byte mask); static int locateRouteStart(int16_t _route); - static int progtrackLocoId; + static int16_t progtrackLocoId; static void doSignal(VPIN id,bool red, bool amber, bool green); static void emitRouteDescription(Print * stream, char type, int id, const FSH * description); static void emitWithrottleDescriptions(Print * stream);