From 1d2ba2f71deaa8001cd530b1ed46cd12d50bdc65 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Sun, 8 Feb 2026 18:02:50 +0100 Subject: [PATCH] Make code compile for OBP60 v2.0 again --- lib/obp60task/OBP60Hardware.h | 2 +- lib/obp60task/OBP60Keypad.h | 2 +- lib/obp60task/obp60task.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/obp60task/OBP60Hardware.h b/lib/obp60task/OBP60Hardware.h index 8768e0f..6d038d3 100644 --- a/lib/obp60task/OBP60Hardware.h +++ b/lib/obp60task/OBP60Hardware.h @@ -1,7 +1,7 @@ // General hardware definitions // CAN and RS485 bus pin definitions see obp60task.h -#ifdef HARDWARE_V21 +#if defined HARDWARE_V20 || HARDWARE_V21 // Direction pin for RS485 NMEA0183 #define OBP_DIRECTION_PIN 18 // I2C diff --git a/lib/obp60task/OBP60Keypad.h b/lib/obp60task/OBP60Keypad.h index eafe3a2..d669ccb 100644 --- a/lib/obp60task/OBP60Keypad.h +++ b/lib/obp60task/OBP60Keypad.h @@ -58,7 +58,7 @@ void initKeys(CommonData &commonData) { commonData.keydata[5].h = height; } - #ifdef HARDWARE_V21 + #if defined HARDWARE_V20 || HARDWARE_V21 // Keypad functions for original OBP60 hardware int readKeypad(GwLog* logger, uint thSensitivity, bool use_syspage) { diff --git a/lib/obp60task/obp60task.cpp b/lib/obp60task/obp60task.cpp index cc825fa..84bc572 100644 --- a/lib/obp60task/obp60task.cpp +++ b/lib/obp60task/obp60task.cpp @@ -332,7 +332,7 @@ void OBP60Task(GwApi *api){ // return; GwLog *logger=api->getLogger(); GwConfigHandler *config=api->getConfig(); -#ifdef HARDWARE_V21 +#if defined HARDWARE_V20 || HARDWARE_V21 startLedTask(api); #endif PageList allPages; @@ -341,7 +341,7 @@ void OBP60Task(GwApi *api){ commonData.logger=logger; commonData.config=config; -#ifdef HARDWARE_V21 +#if defined HARDWARE_V20 || HARDWARE_V21 // Keyboard coordinates for page footer initKeys(commonData); #endif