thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

better handling for ifdefs

This commit is contained in:
andreas 2021-11-08 20:40:37 +01:00
parent 7c68747bd2
commit 7e348431b0
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hardware/GwHardware.h
View File

@ -36,7 +36,8 @@
#define GWLED_PIN GPIO_NUM_27 #define GWLED_PIN GPIO_NUM_27
//brightness 0...255 //brightness 0...255
#define GWLED_BRIGHTNESS 64 #define GWLED_BRIGHTNESS 64
#elif BOARD_M5ATOM_CANUNIT #endif
#ifdef BOARD_M5ATOM_CANUNIT
#define ESP32_CAN_TX_PIN GPIO_NUM_26 #define ESP32_CAN_TX_PIN GPIO_NUM_26
#define ESP32_CAN_RX_PIN GPIO_NUM_32 #define ESP32_CAN_RX_PIN GPIO_NUM_32
#define GWBUTTON_PIN GPIO_NUM_39 #define GWBUTTON_PIN GPIO_NUM_39
@ -52,10 +53,12 @@
#define GWLED_PIN GPIO_NUM_27 #define GWLED_PIN GPIO_NUM_27
//brightness 0...255 //brightness 0...255
#define GWLED_BRIGHTNESS 64 #define GWLED_BRIGHTNESS 64
#elif BOARD_M5STICK_CANUNIT #endif
#ifdef BOARD_M5STICK_CANUNIT
#define ESP32_CAN_TX_PIN GPIO_NUM_32 #define ESP32_CAN_TX_PIN GPIO_NUM_32
#define ESP32_CAN_RX_PIN GPIO_NUM_33 #define ESP32_CAN_RX_PIN GPIO_NUM_33
#elif BOARD_HOMBERGER #endif
#ifdef BOARD_HOMBERGER
#define ESP32_CAN_TX_PIN GPIO_NUM_5 #define ESP32_CAN_TX_PIN GPIO_NUM_5
#define ESP32_CAN_RX_PIN GPIO_NUM_4 #define ESP32_CAN_RX_PIN GPIO_NUM_4
//serial input only //serial input only
@ -66,9 +69,6 @@
#define GWBUTTON_ACTIVE LOW #define GWBUTTON_ACTIVE LOW
//if GWBUTTON_PULLUPDOWN we enable a pulup/pulldown //if GWBUTTON_PULLUPDOWN we enable a pulup/pulldown
#define GWBUTTON_PULLUPDOWN #define GWBUTTON_PULLUPDOWN
#else
#endif #endif
#endif #endif

6
src/main.cpp
View File

@ -17,10 +17,12 @@
#ifdef GWRELEASEVERSION #ifdef GWRELEASEVERSION
#define VERSION GWSTRINGIFY(GWRELEASEVERSION) #define VERSION GWSTRINGIFY(GWRELEASEVERSION)
#define LOGLEVEL GwLog::ERROR #define LOGLEVEL GwLog::ERROR
#elif GWDEVVERSION #endif
#ifdef GWDEVVERSION
#define VERSION GWSTRINGIFY(GWDEVVERSION) #define VERSION GWSTRINGIFY(GWDEVVERSION)
#define LOGLEVEL GwLog::DEBUG #define LOGLEVEL GwLog::DEBUG
#else #endif
#ifndef VERSION
#define VERSION "0.7.0" #define VERSION "0.7.0"
#define LOGLEVEL GwLog::DEBUG #define LOGLEVEL GwLog::DEBUG
#endif #endif