Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
10e96a3b
Commit
10e96a3b
authored
Jun 13, 2017
by
devsaurus
Browse files
fix travis build
parent
a8ff8f05
Changes
5
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
10e96a3b
...
...
@@ -13,7 +13,7 @@ install:
-
export PATH=$PWD/tools/toolchains/esp8266/bin:$PWD/tools/toolchains/esp32/bin:$PATH
script
:
-
export BUILD_DATE=$(date +%Y%m%d)
-
env BUILD_DIR_BASE=build/float make MORE_CFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
-
env BUILD_DIR_BASE=build/integer make MORE_CFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
-
env BUILD_DIR_BASE=
`pwd`/
build/float make MORE_CFLAGS="-DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
-
env BUILD_DIR_BASE=
`pwd`/
build/integer make MORE_CFLAGS="-DLUA_NUMBER_INTEGRAL -DBUILD_DATE='\"'$BUILD_DATE'\"'" defconfig all
# http://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
#- if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then bash "$TRAVIS_BUILD_DIR"/tools/pr-build.sh; fi
components/modules/Kconfig
View file @
10e96a3b
...
...
@@ -160,7 +160,7 @@ config LUA_MODULE_U8G2
help
Includes the u8g2 module.
source "
..
/components/u8g2/u8g2.kconfig"
source "
$PROJECT_PATH
/components/u8g2/u8g2.kconfig"
config LUA_MODULE_WIFI
bool "WiFi module"
...
...
components/u8g2/u8g2.kconfig
View file @
10e96a3b
...
...
@@ -105,7 +105,7 @@ config U8G2_I2C_UC1611_EA_DOGXL240
menuconfig U8G2_COMM_SPI
bool "SPI"
select LUA_MODULE_SPI
default "
n
"
default "
y
"
config U8G2_SPI_IST3020_ERC19264
depends on U8G2_COMM_SPI
...
...
@@ -315,7 +315,7 @@ menu "Fonts"
config U8G2_FONT_SELECTION
depends on LUA_MODULE_U8G2
string "Font list"
default "font_6x10_tf"
default "font_6x10_tf
,font_unifont_t_symbols
"
help
Enter a comma-separated list of fonts.
...
...
tools/u8g2_config_displays.pl
View file @
10e96a3b
...
...
@@ -13,8 +13,7 @@ while (<STDIN>) {
}
if
(
@i2c_displays
>
0
||
@spi_displays
>
0
)
{
print
<<
'
HEADER
';
print
<<
'
HEADER
';
#ifndef _U8G2_DISPLAYS_H
#define _U8G2_DISPLAYS_H
...
...
@@ -23,20 +22,19 @@ if (@i2c_displays > 0 || @spi_displays > 0) {
HEADER
print
("
#define U8G2_DISPLAY_TABLE_I2C
\\\n
");
foreach
my
$display
(
@i2c_displays
)
{
print
("
U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_
${display}
_f,
$display
)
\\\n
");
}
print
("
\n
");
print
("
#define U8G2_DISPLAY_TABLE_I2C
\\\n
");
foreach
my
$display
(
@i2c_displays
)
{
print
("
U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_
${display}
_f,
$display
)
\\\n
");
}
print
("
\n
");
print
("
#define U8G2_DISPLAY_TABLE_SPI
\\\n
");
foreach
my
$display
(
@spi_displays
)
{
print
("
U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_
${display}
_f,
$display
)
\\\n
");
}
print
("
\n
");
print
("
#define U8G2_DISPLAY_TABLE_SPI
\\\n
");
foreach
my
$display
(
@spi_displays
)
{
print
("
U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_
${display}
_f,
$display
)
\\\n
");
}
print
("
\n
");
print
<<
'
FOOTER
';
print
<<
'
FOOTER
';
#endif /* _U8G2_DISPLAYS_H */
FOOTER
}
tools/u8g2_config_fonts.pl
View file @
10e96a3b
...
...
@@ -10,8 +10,7 @@ while (<STDIN>) {
}
}
if
(
@font_selection
>
0
)
{
print
<<
'
HEADER
';
print
<<
'
HEADER
';
#ifndef _U8G2_FONTS_H
#define _U8G2_FONTS_H
...
...
@@ -21,13 +20,12 @@ if (@font_selection > 0) {
#define U8G2_FONT_TABLE \
HEADER
foreach
my
$font
(
@font_selection
)
{
print
("
U8G2_FONT_TABLE_ENTRY(
$font
)
\\\n
");
}
foreach
my
$font
(
@font_selection
)
{
print
("
U8G2_FONT_TABLE_ENTRY(
$font
)
\\\n
");
}
print
<<
'
FOOTER
';
print
<<
'
FOOTER
';
#endif /* _U8G2_FONTS_H */
FOOTER
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment