Merge remote-tracking branch 'origin/master'

This commit is contained in:
norbert-walter 2024-01-28 16:55:09 +01:00
commit da3fdaad3d
3 changed files with 5 additions and 3 deletions

View File

@ -72,6 +72,6 @@
#define NUM_BACKLIGHT_LED 6 // Numebr of Backlight LEDs #define NUM_BACKLIGHT_LED 6 // Numebr of Backlight LEDs
#define OBP_BACKLIGHT_LED 15 // GPIO port #define OBP_BACKLIGHT_LED 15 // GPIO port
// Power Rail // Power Rail
#define OBP_POWER_50 5 #define OBP_POWER_50 5 // 5.0V power rail

View File

@ -12,11 +12,13 @@
#define NUM_ANALOG_INPUTS 20 #define NUM_ANALOG_INPUTS 20
// Multi Function Display OBP60 V2.0 // Multi Function Display OBP60 V2.0
/*
static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48; static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
#define BUILTIN_LED LED_BUILTIN // backward compatibility #define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN #define LED_BUILTIN LED_BUILTIN
#define RGB_BUILTIN LED_BUILTIN #define RGB_BUILTIN LED_BUILTIN
#define RGB_BRIGHTNESS 64 #define RGB_BRIGHTNESS 64
*/
#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) #define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1)
#define digitalPinToInterrupt(p) (((p)<48)?(p):-1) #define digitalPinToInterrupt(p) (((p)<48)?(p):-1)

View File

@ -1,7 +1,7 @@
<?php <?php
$allowed=array( $allowed=array(
'user'=> array('wellenvogel'), 'user'=> array('wellenvogel','norbert-walter'),
'repo'=> array('esp32-nmea2000') 'repo'=> array('esp32-nmea2000','esp32-nmea2000-obp60')
); );