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
82e126eb
Commit
82e126eb
authored
Feb 04, 2015
by
devsaurus
Browse files
Merge branch 'master' into dev
parents
1740841e
9f0b1678
Changes
103
Hide whitespace changes
Inline
Side-by-side
app/u8glib/u8g_virtual_screen.c
0 → 100644
View file @
82e126eb
/*
u8g_virtual_screen.c
Universal 8bit Graphics Library
Copyright (c) 2012, olikraus@gmail.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this list
of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or other
materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "u8g.h"
struct
_u8g_vs_t
{
u8g_uint_t
x
;
u8g_uint_t
y
;
u8g_t
*
u8g
;
};
typedef
struct
_u8g_vs_t
u8g_vs_t
;
#define U8g_VS_MAX 4
uint8_t
u8g_vs_cnt
=
0
;
u8g_vs_t
u8g_vs_list
[
U8g_VS_MAX
];
uint8_t
u8g_vs_current
;
u8g_uint_t
u8g_vs_width
;
u8g_uint_t
u8g_vs_height
;
uint8_t
u8g_dev_vs_fn
(
u8g_t
*
u8g
,
u8g_dev_t
*
dev
,
uint8_t
msg
,
void
*
arg
)
{
switch
(
msg
)
{
default:
{
uint8_t
i
;
for
(
i
=
0
;
i
<
u8g_vs_cnt
;
i
++
)
{
u8g_call_dev_fn
(
u8g_vs_list
[
i
].
u8g
,
u8g_vs_list
[
i
].
u8g
->
dev
,
msg
,
arg
);
}
}
return
1
;
case
U8G_DEV_MSG_PAGE_FIRST
:
u8g_vs_current
=
0
;
if
(
u8g_vs_cnt
!=
0
)
return
u8g_call_dev_fn
(
u8g_vs_list
[
u8g_vs_current
].
u8g
,
u8g_vs_list
[
u8g_vs_current
].
u8g
->
dev
,
msg
,
arg
);
return
0
;
case
U8G_DEV_MSG_PAGE_NEXT
:
{
uint8_t
ret
=
0
;
if
(
u8g_vs_cnt
!=
0
)
ret
=
u8g_call_dev_fn
(
u8g_vs_list
[
u8g_vs_current
].
u8g
,
u8g_vs_list
[
u8g_vs_current
].
u8g
->
dev
,
msg
,
arg
);
if
(
ret
!=
0
)
return
ret
;
u8g_vs_current
++
;
/* next device */
if
(
u8g_vs_current
>=
u8g_vs_cnt
)
/* reached end? */
return
0
;
return
u8g_call_dev_fn
(
u8g_vs_list
[
u8g_vs_current
].
u8g
,
u8g_vs_list
[
u8g_vs_current
].
u8g
->
dev
,
U8G_DEV_MSG_PAGE_FIRST
,
arg
);
}
return
0
;
case
U8G_DEV_MSG_GET_WIDTH
:
*
((
u8g_uint_t
*
)
arg
)
=
u8g_vs_width
;
break
;
case
U8G_DEV_MSG_GET_HEIGHT
:
*
((
u8g_uint_t
*
)
arg
)
=
u8g_vs_height
;
break
;
case
U8G_DEV_MSG_GET_PAGE_BOX
:
if
(
u8g_vs_current
<
u8g_vs_cnt
)
{
u8g_call_dev_fn
(
u8g_vs_list
[
u8g_vs_current
].
u8g
,
u8g_vs_list
[
u8g_vs_current
].
u8g
->
dev
,
msg
,
arg
);
((
u8g_box_t
*
)
arg
)
->
x0
+=
u8g_vs_list
[
u8g_vs_current
].
x
;
((
u8g_box_t
*
)
arg
)
->
x1
+=
u8g_vs_list
[
u8g_vs_current
].
x
;
((
u8g_box_t
*
)
arg
)
->
y0
+=
u8g_vs_list
[
u8g_vs_current
].
y
;
((
u8g_box_t
*
)
arg
)
->
y1
+=
u8g_vs_list
[
u8g_vs_current
].
y
;
}
else
{
((
u8g_box_t
*
)
arg
)
->
x0
=
0
;
((
u8g_box_t
*
)
arg
)
->
x1
=
0
;
((
u8g_box_t
*
)
arg
)
->
y0
=
0
;
((
u8g_box_t
*
)
arg
)
->
y1
=
0
;
}
return
1
;
case
U8G_DEV_MSG_SET_PIXEL
:
case
U8G_DEV_MSG_SET_8PIXEL
:
if
(
u8g_vs_current
<
u8g_vs_cnt
)
{
((
u8g_dev_arg_pixel_t
*
)
arg
)
->
x
-=
u8g_vs_list
[
u8g_vs_current
].
x
;
((
u8g_dev_arg_pixel_t
*
)
arg
)
->
y
-=
u8g_vs_list
[
u8g_vs_current
].
y
;
return
u8g_call_dev_fn
(
u8g_vs_list
[
u8g_vs_current
].
u8g
,
u8g_vs_list
[
u8g_vs_current
].
u8g
->
dev
,
msg
,
arg
);
}
break
;
}
return
1
;
}
u8g_dev_t
u8g_dev_vs
=
{
u8g_dev_vs_fn
,
NULL
,
NULL
};
void
u8g_SetVirtualScreenDimension
(
u8g_t
*
vs_u8g
,
u8g_uint_t
width
,
u8g_uint_t
height
)
{
if
(
vs_u8g
->
dev
!=
&
u8g_dev_vs
)
return
;
/* abort if there is no a virtual screen device */
u8g_vs_width
=
width
;
u8g_vs_height
=
height
;
}
uint8_t
u8g_AddToVirtualScreen
(
u8g_t
*
vs_u8g
,
u8g_uint_t
x
,
u8g_uint_t
y
,
u8g_t
*
child_u8g
)
{
if
(
vs_u8g
->
dev
!=
&
u8g_dev_vs
)
return
0
;
/* abort if there is no a virtual screen device */
if
(
u8g_vs_cnt
>=
U8g_VS_MAX
)
return
0
;
/* maximum number of child u8g's reached */
u8g_vs_list
[
u8g_vs_cnt
].
u8g
=
child_u8g
;
u8g_vs_list
[
u8g_vs_cnt
].
x
=
x
;
u8g_vs_list
[
u8g_vs_cnt
].
y
=
y
;
u8g_vs_cnt
++
;
return
1
;
}
ld/eagle.app.v6.ld
View file @
82e126eb
...
@@ -5,7 +5,7 @@ MEMORY
...
@@ -5,7 +5,7 @@ MEMORY
dport0_0_seg : org = 0x3FF00000, len = 0x10
dport0_0_seg : org = 0x3FF00000, len = 0x10
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
dram0_0_seg : org = 0x3FFE8000, len = 0x14000
iram1_0_seg : org = 0x40100000, len = 0x8000
iram1_0_seg : org = 0x40100000, len = 0x8000
irom0_0_seg : org = 0x40210000, len = 0x5
1
000
irom0_0_seg : org = 0x40210000, len = 0x5
2
000
}
}
PHDRS
PHDRS
...
@@ -72,6 +72,10 @@ SECTIONS
...
@@ -72,6 +72,10 @@ SECTIONS
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
*(.irom0.literal .irom.literal .irom.text.literal .irom0.text .irom.text)
*(.literal.* .text.*)
*(.literal.* .text.*)
*(.rodata2.text)
*(.rodata2.text)
/* put font data into irom0 */
*(.font_data.*)
_irom0_text_end = ABSOLUTE(.);
_irom0_text_end = ABSOLUTE(.);
_flash_used_end = ABSOLUTE(.);
_flash_used_end = ABSOLUTE(.);
} >irom0_0_seg :irom0_0_phdr
} >irom0_0_seg :irom0_0_phdr
...
...
lua_examples/graphics_test.lua
0 → 100644
View file @
82e126eb
-- setup I2c and connect display
function
init_i2c_display
()
sda
=
5
scl
=
6
sla
=
0x3c
i2c
.
setup
(
0
,
sda
,
scl
,
i2c
.
SLOW
)
disp
=
u8g
.
ssd1306_128x64_i2c
(
sla
)
end
-- graphic test components
function
prepare
()
disp
:
setFont
(
u8g
.
font_6x10
)
disp
:
setFontRefHeightExtendedText
()
disp
:
setDefaultForegroundColor
()
disp
:
setFontPosTop
()
end
function
box_frame
(
a
)
disp
:
drawStr
(
0
,
0
,
"drawBox"
)
disp
:
drawBox
(
5
,
10
,
20
,
10
)
disp
:
drawBox
(
10
+
a
,
15
,
30
,
7
)
disp
:
drawStr
(
0
,
30
,
"drawFrame"
)
disp
:
drawFrame
(
5
,
10
+
30
,
20
,
10
)
disp
:
drawFrame
(
10
+
a
,
15
+
30
,
30
,
7
)
end
function
disc_circle
(
a
)
disp
:
drawStr
(
0
,
0
,
"drawDisc"
)
disp
:
drawDisc
(
10
,
18
,
9
)
disp
:
drawDisc
(
24
+
a
,
16
,
7
)
disp
:
drawStr
(
0
,
30
,
"drawCircle"
)
disp
:
drawCircle
(
10
,
18
+
30
,
9
)
disp
:
drawCircle
(
24
+
a
,
16
+
30
,
7
)
end
function
r_frame
(
a
)
disp
:
drawStr
(
0
,
0
,
"drawRFrame/Box"
)
disp
:
drawRFrame
(
5
,
10
,
40
,
30
,
a
+
1
)
disp
:
drawRBox
(
50
,
10
,
25
,
40
,
a
+
1
)
end
function
stringtest
(
a
)
disp
:
drawStr
(
30
+
a
,
31
,
" 0"
)
disp
:
drawStr90
(
30
,
31
+
a
,
" 90"
)
disp
:
drawStr180
(
30
-
a
,
31
,
" 180"
)
disp
:
drawStr270
(
30
,
31
-
a
,
" 270"
)
end
function
line
(
a
)
disp
:
drawStr
(
0
,
0
,
"drawLine"
)
disp
:
drawLine
(
7
+
a
,
10
,
40
,
55
)
disp
:
drawLine
(
7
+
a
*
2
,
10
,
60
,
55
)
disp
:
drawLine
(
7
+
a
*
3
,
10
,
80
,
55
)
disp
:
drawLine
(
7
+
a
*
4
,
10
,
100
,
55
)
end
function
triangle
(
a
)
local
offset
=
a
disp
:
drawStr
(
0
,
0
,
"drawTriangle"
)
disp
:
drawTriangle
(
14
,
7
,
45
,
30
,
10
,
40
)
disp
:
drawTriangle
(
14
+
offset
,
7
-
offset
,
45
+
offset
,
30
-
offset
,
57
+
offset
,
10
-
offset
)
disp
:
drawTriangle
(
57
+
offset
*
2
,
10
,
45
+
offset
*
2
,
30
,
86
+
offset
*
2
,
53
)
disp
:
drawTriangle
(
10
+
offset
,
40
+
offset
,
45
+
offset
,
30
+
offset
,
86
+
offset
,
53
+
offset
)
end
function
ascii_1
()
local
x
,
y
,
s
disp
:
drawStr
(
0
,
0
,
"ASCII page 1"
)
for
y
=
0
,
5
,
1
do
for
x
=
0
,
15
,
1
do
s
=
y
*
16
+
x
+
32
disp
:
drawStr
(
x
*
7
,
y
*
10
+
10
,
string.char
(
s
))
end
end
end
function
ascii_2
()
local
x
,
y
,
s
disp
:
drawStr
(
0
,
0
,
"ASCII page 2"
)
for
y
=
0
,
5
,
1
do
for
x
=
0
,
15
,
1
do
s
=
y
*
16
+
x
+
160
disp
:
drawStr
(
x
*
7
,
y
*
10
+
10
,
string.char
(
s
))
end
end
end
-- the draw() routine
function
draw
(
draw_state
)
local
component
=
bit
.
rshift
(
draw_state
,
3
)
prepare
()
if
(
component
==
0
)
then
box_frame
(
bit
.
band
(
draw_state
,
7
))
elseif
(
component
==
1
)
then
disc_circle
(
bit
.
band
(
draw_state
,
7
))
elseif
(
component
==
2
)
then
r_frame
(
bit
.
band
(
draw_state
,
7
))
elseif
(
component
==
3
)
then
stringtest
(
bit
.
band
(
draw_state
,
7
))
elseif
(
component
==
4
)
then
line
(
bit
.
band
(
draw_state
,
7
))
elseif
(
component
==
5
)
then
triangle
(
bit
.
band
(
draw_state
,
7
))
elseif
(
component
==
6
)
then
ascii_1
()
elseif
(
component
==
7
)
then
ascii_2
()
end
end
function
graphics_test
()
init_i2c_display
()
print
(
"--- Starting Graphics Test ---"
)
-- cycle through all components
local
draw_state
for
draw_state
=
0
,
7
+
7
*
8
,
1
do
disp
:
firstPage
()
repeat
draw
(
draw_state
)
until
disp
:
nextPage
()
==
false
--print(node.heap())
-- re-trigger Watchdog!
tmr
.
wdclr
()
end
print
(
"--- Graphics Test done ---"
)
end
graphics_test
()
Prev
1
2
3
4
5
6
Next
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