Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
devsaurus
commit
315d1a1696
|
|
@ -0,0 +1,7 @@
|
|||
## Contributing
|
||||
|
||||
Thank you everyone for contributing to this project.
|
||||
|
||||
Pull requests for new features and major fixes should be opened against the `dev` branch.
|
||||
|
||||
*Note that the `pre_build` bin in the dev branch is never up-to-date.*
|
||||
|
|
@ -92,7 +92,7 @@ build pre_build bin.
|
|||
<td>6</td><td>GPIO12</td><td></td><td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>7</td><td>GPIO13</td<td></td><td></td>
|
||||
<td>7</td><td>GPIO13</td><td></td><td></td>
|
||||
</tr>
|
||||
</table>
|
||||
#### [*] D0(GPIO16) can only be used as gpio read/write. no interrupt supported. no pwm/i2c/ow supported.
|
||||
|
|
@ -383,9 +383,9 @@ They'll be available as `u8g.<font_name>` in Lua.
|
|||
####Control a WS2812 based light strip
|
||||
```lua
|
||||
-- set the color of one LED on GPIO2 to red
|
||||
ws2812.write(4, string.char(0, 255, 0))
|
||||
ws2812.writergb(4, string.char(255, 0, 0))
|
||||
-- set the color of 10 LEDs on GPIO0 to blue
|
||||
ws2812.write(3, string.char(0, 0, 255):rep(10))
|
||||
ws2812.writergb(3, string.char(0, 0, 255):rep(10))
|
||||
-- first LED green, second LED white
|
||||
ws2812.write(4, string.char(255, 0, 0, 255, 255, 255))
|
||||
ws2812.writergb(4, string.char(0, 255, 0, 255, 255, 255))
|
||||
```
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@
|
|||
#define LUA_USE_MODULES_BIT
|
||||
#define LUA_USE_MODULES_U8G
|
||||
#define LUA_USE_MODULES_MQTT
|
||||
// #define LUA_USE_MODULES_WS2812 // TODO: put this device specific module to device driver section.
|
||||
#define LUA_USE_MODULES_WS2812 // TODO: put this device specific module to device driver section.
|
||||
#endif /* LUA_USE_MODULES */
|
||||
|
||||
// TODO: put device specific module to device driver section.
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ static int file_seek (lua_State *L)
|
|||
long offset = luaL_optlong(L, 2, 0);
|
||||
op = fs_seek(file_fd, offset, mode[op]);
|
||||
if (op)
|
||||
lua_pushboolean(L, 1); /* error */
|
||||
lua_pushnil(L); /* error */
|
||||
else
|
||||
lua_pushinteger(L, fs_tell(file_fd));
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -8,47 +8,56 @@
|
|||
* from user Markus Gritsch.
|
||||
* I just put this code into its own module and pushed into a forked repo,
|
||||
* to easily create a pull request. Thanks to Markus Gritsch for the code.
|
||||
*
|
||||
*/
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// -- This WS2812 code must be compiled with -O2 to get the timing right.
|
||||
// -- This WS2812 code must be compiled with -O2 to get the timing right. Read this:
|
||||
// -- http://wp.josh.com/2014/05/13/ws2812-neopixels-are-not-so-finicky-once-you-get-to-know-them/
|
||||
// The ICACHE_FLASH_ATTR is there to trick the compiler and get the very first pulse width correct.
|
||||
// -- The ICACHE_FLASH_ATTR is there to trick the compiler and get the very first pulse width correct.
|
||||
static void ICACHE_FLASH_ATTR send_ws_0(uint8_t gpio) {
|
||||
uint8_t i;
|
||||
i = 4;
|
||||
while (i--)
|
||||
GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1 << gpio);
|
||||
i = 9;
|
||||
while (i--)
|
||||
GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1 << gpio);
|
||||
i = 4; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1 << gpio);
|
||||
i = 9; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1 << gpio);
|
||||
}
|
||||
|
||||
static void ICACHE_FLASH_ATTR send_ws_1(uint8_t gpio) {
|
||||
uint8_t i;
|
||||
i = 8;
|
||||
while (i--)
|
||||
GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1 << gpio);
|
||||
i = 6;
|
||||
while (i--)
|
||||
GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1 << gpio);
|
||||
i = 8; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TS_ADDRESS, 1 << gpio);
|
||||
i = 6; while (i--) GPIO_REG_WRITE(GPIO_OUT_W1TC_ADDRESS, 1 << gpio);
|
||||
}
|
||||
|
||||
// Lua: ws2812.write(pin, "string")
|
||||
// Byte triples in the string are interpreted as G R B values.
|
||||
// ws2812.write(4, string.char(0, 255, 0)) uses GPIO2 and sets the first LED red.
|
||||
// Byte triples in the string are interpreted as R G B values and sent to the hardware as G R B.
|
||||
// ws2812.write(4, string.char(255, 0, 0)) uses GPIO2 and sets the first LED red.
|
||||
// ws2812.write(3, string.char(0, 0, 255):rep(10)) uses GPIO0 and sets ten LEDs blue.
|
||||
// ws2812.write(4, string.char(255, 0, 0, 255, 255, 255)) first LED green, second LED white.
|
||||
static int ICACHE_FLASH_ATTR ws2812_write(lua_State* L) {
|
||||
// ws2812.write(4, string.char(0, 255, 0, 255, 255, 255)) first LED green, second LED white.
|
||||
static int ICACHE_FLASH_ATTR ws2812_writergb(lua_State* L)
|
||||
{
|
||||
const uint8_t pin = luaL_checkinteger(L, 1);
|
||||
size_t length;
|
||||
const char *buffer = luaL_checklstring(L, 2, &length);
|
||||
char *buffer = (char *)luaL_checklstring(L, 2, &length); // Cast away the constness.
|
||||
|
||||
// Initialize the output pin:
|
||||
platform_gpio_mode(pin, PLATFORM_GPIO_OUTPUT, PLATFORM_GPIO_FLOAT);
|
||||
platform_gpio_write(pin, 0);
|
||||
os_delay_us(10);
|
||||
|
||||
// Ignore incomplete Byte triples at the end of buffer:
|
||||
length -= length % 3;
|
||||
|
||||
// Rearrange R G B values to G R B order needed by WS2812 LEDs:
|
||||
size_t i;
|
||||
for (i = 0; i < length; i += 3) {
|
||||
const char r = buffer[i];
|
||||
const char g = buffer[i + 1];
|
||||
buffer[i] = g;
|
||||
buffer[i + 1] = r;
|
||||
}
|
||||
|
||||
// Do not remove these:
|
||||
os_delay_us(1);
|
||||
os_delay_us(1);
|
||||
|
||||
// Send the buffer:
|
||||
os_intr_lock();
|
||||
const char * const end = buffer + length;
|
||||
while (buffer != end) {
|
||||
|
|
@ -68,7 +77,7 @@ static int ICACHE_FLASH_ATTR ws2812_write(lua_State* L) {
|
|||
#include "lrodefs.h"
|
||||
const LUA_REG_TYPE ws2812_map[] =
|
||||
{
|
||||
{ LSTRKEY( "write" ), LFUNCVAL( ws2812_write )},
|
||||
{ LSTRKEY( "writergb" ), LFUNCVAL( ws2812_writergb )},
|
||||
{ LNILKEY, LNILVAL}
|
||||
};
|
||||
|
||||
|
|
@ -77,6 +86,3 @@ LUALIB_API int luaopen_ws2812(lua_State *L) {
|
|||
LREGISTER(L, "ws2812", ws2812_map);
|
||||
return 1;
|
||||
}
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
---
|
||||
-- @description Shows how to read 8 GPIO pins/buttons via I2C with the MCP23008 I/O expander.
|
||||
-- Tested on NodeMCU 0.9.5 build 20150213.
|
||||
-- @circuit
|
||||
-- Connect GPIO0 of the ESP8266-01 module to the SCL pin of the MCP23008.
|
||||
-- Connect GPIO2 of the ESP8266-01 module to the SDA pin of the MCP23008.
|
||||
-- Use 3.3V for VCC.
|
||||
-- Connect switches or buttons to the GPIOs of the MCP23008 and GND.
|
||||
-- Connect two 4.7k pull-up resistors on SDA and SCL
|
||||
-- We will enable the internal pull up resistors for the GPIOS of the MCP23008.
|
||||
-- @author Miguel (AllAboutEE)
|
||||
-- GitHub: https://github.com/AllAboutEE
|
||||
-- YouTube: https://www.youtube.com/user/AllAboutEE
|
||||
-- Website: http://AllAboutEE.com
|
||||
---------------------------------------------------------------------------------------------
|
||||
|
||||
require ("mcp23008")
|
||||
|
||||
-- ESP-01 GPIO Mapping as per GPIO Table in https://github.com/nodemcu/nodemcu-firmware
|
||||
gpio0, gpio2 = 3, 4
|
||||
|
||||
-- Setup the MCP23008
|
||||
mcp23008.begin(0x0,gpio2,gpio0,i2c.SLOW)
|
||||
|
||||
mcp23008.writeIODIR(0xff)
|
||||
mcp23008.writeGPPU(0xff)
|
||||
|
||||
---
|
||||
-- @name showButtons
|
||||
-- @description Shows the state of each GPIO pin
|
||||
-- @return void
|
||||
---------------------------------------------------------
|
||||
function showButtons()
|
||||
|
||||
local gpio = mcp23008.readGPIO() -- read the GPIO/buttons states
|
||||
|
||||
-- get/extract the state of one pin at a time
|
||||
for pin=0,7 do
|
||||
|
||||
local pinState = bit.band(bit.rshift(gpio,pin),0x1) -- extract one pin state
|
||||
|
||||
-- change to string state (HIGH, LOW) instead of 1 or 0 respectively
|
||||
if(pinState == mcp23008.HIGH) then
|
||||
pinState = "HIGH"
|
||||
else
|
||||
pinState = "LOW"
|
||||
end
|
||||
|
||||
print("Pin ".. pin .. ": ".. pinState)
|
||||
end
|
||||
print("\r\n")
|
||||
end
|
||||
|
||||
tmr.alarm(0,2000,1,showButtons) -- run showButtons() every 2 seconds
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
---
|
||||
-- @description Shows control of 8 GPIO pins/LEDs via I2C with the MCP23008 I/O expander.
|
||||
-- Tested on odeMCU 0.9.5 build 20150213.
|
||||
-- @date March 02, 2015
|
||||
-- @circuit Connect 8 LEDs withs resistors to the GPIO pins of the MCP23008.
|
||||
-- Connect GPIO0 of the ESP8266-01 module to the SCL pin of the MCP23008.
|
||||
-- Connect GPIO2 of the ESP8266-01 module to the SDA pin of the MCP23008.
|
||||
-- Connect two 4.7k pull-up resistors on SDA and SCL
|
||||
-- Use 3.3V for VCC.
|
||||
-- @author Miguel (AllAboutEE)
|
||||
-- GitHub: https://github.com/AllAboutEE
|
||||
-- Working Example Video: https://www.youtube.com/watch?v=KphAJMZZed0
|
||||
-- Website: http://AllAboutEE.com
|
||||
---------------------------------------------------------------------------------------------
|
||||
|
||||
require ("mcp23008")
|
||||
|
||||
-- ESP-01 GPIO Mapping as per GPIO Table in https://github.com/nodemcu/nodemcu-firmware
|
||||
gpio0, gpio2 = 3, 4
|
||||
|
||||
-- Setup MCP23008
|
||||
mcp23008.begin(0x0,gpio2,gpio0,i2c.SLOW)
|
||||
|
||||
mcp23008.writeIODIR(0x00) -- make all GPIO pins as outputs
|
||||
mcp23008.writeGPIO(0x00) -- make all GIPO pins off/low
|
||||
|
||||
---
|
||||
-- @name count()
|
||||
-- @description Reads the value from the GPIO register, increases the read value by 1
|
||||
-- and writes it back so the LEDs will display a binary count up to 255 or 0xFF in hex.
|
||||
local function count()
|
||||
|
||||
local gpio = 0x00
|
||||
|
||||
gpio = mcp23008.readGPIO()
|
||||
|
||||
if(gpio<0xff) then
|
||||
mcp23008.writeGPIO(gpio+1)
|
||||
else
|
||||
mcp23008.writeGPIO(0x00)
|
||||
end
|
||||
|
||||
end
|
||||
-- Run count() every 100ms
|
||||
tmr.alarm(0,100,1,count)
|
||||
|
|
@ -29,11 +29,11 @@ function startServer()
|
|||
print("===Now, logon and input LUA.====")
|
||||
end
|
||||
|
||||
tmr.alarm(1000, 1, function()
|
||||
tmr.alarm(1, 1000, 1, function()
|
||||
if wifi.sta.getip()=="0.0.0.0" then
|
||||
print("Connect AP, Waiting...")
|
||||
else
|
||||
startServer()
|
||||
tmr.stop()
|
||||
tmr.stop(1)
|
||||
end
|
||||
end)
|
||||
|
|
|
|||
|
|
@ -62,17 +62,17 @@ function M.read(pin)
|
|||
|
||||
--DHT data acquired, process.
|
||||
for i = 1, 16, 1 do
|
||||
if (bitStream[i] > 4) then
|
||||
if (bitStream[i] > 3) then
|
||||
humidity = humidity + 2 ^ (16 - i)
|
||||
end
|
||||
end
|
||||
for i = 1, 16, 1 do
|
||||
if (bitStream[i + 16] > 4) then
|
||||
if (bitStream[i + 16] > 3) then
|
||||
temperature = temperature + 2 ^ (16 - i)
|
||||
end
|
||||
end
|
||||
for i = 1, 8, 1 do
|
||||
if (bitStream[i + 32] > 4) then
|
||||
if (bitStream[i + 32] > 3) then
|
||||
checksum = checksum + 2 ^ (8 - i)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,162 @@
|
|||
---
|
||||
-- @description Expands the ESP8266's GPIO to 8 more I/O pins via I2C with the MCP23008 I/O Expander
|
||||
-- MCP23008 Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21919e.pdf
|
||||
-- Tested on NodeMCU 0.9.5 build 20150213.
|
||||
-- @date March 02, 2015
|
||||
-- @author Miguel
|
||||
-- GitHub: https://github.com/AllAboutEE
|
||||
-- YouTube: https://www.youtube.com/user/AllAboutEE
|
||||
-- Website: http://AllAboutEE.com
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
local moduleName = ...
|
||||
local M = {}
|
||||
_G[moduleName] = M
|
||||
|
||||
-- Constant device address.
|
||||
local MCP23008_ADDRESS = 0x20
|
||||
|
||||
-- Registers' address as defined in the MCP23008's datashseet
|
||||
local MCP23008_IODIR = 0x00
|
||||
local MCP23008_IPOL = 0x01
|
||||
local MCP23008_GPINTEN = 0x02
|
||||
local MCP23008_DEFVAL = 0x03
|
||||
local MCP23008_INTCON = 0x04
|
||||
local MCP23008_IOCON = 0x05
|
||||
local MCP23008_GPPU = 0x06
|
||||
local MCP23008_INTF = 0x07
|
||||
local MCP23008_INTCAP = 0x08
|
||||
local MCP23008_GPIO = 0x09
|
||||
local MCP23008_OLAT = 0x0A
|
||||
|
||||
-- Default value for i2c communication
|
||||
local id = 0
|
||||
|
||||
-- pin modes for I/O direction
|
||||
M.INPUT = 1
|
||||
M.OUTPUT = 0
|
||||
|
||||
-- pin states for I/O i.e. on/off
|
||||
M.HIGH = 1
|
||||
M.LOW = 0
|
||||
|
||||
-- Weak pull-up resistor state
|
||||
M.ENABLE = 1
|
||||
M.DISABLE = 0
|
||||
|
||||
|
||||
---
|
||||
-- @name write
|
||||
-- @description Writes one byte to a register
|
||||
-- @param registerAddress The register where we'll write data
|
||||
-- @param data The data to write to the register
|
||||
-- @return void
|
||||
----------------------------------------------------------
|
||||
local function write(registerAddress, data)
|
||||
i2c.start(id)
|
||||
i2c.address(id,MCP23008_ADDRESS,i2c.TRANSMITTER) -- send MCP's address and write bit
|
||||
i2c.write(id,registerAddress)
|
||||
i2c.write(id,data)
|
||||
i2c.stop(id)
|
||||
end
|
||||
|
||||
---
|
||||
-- @name read
|
||||
-- @description Reads the value of a regsiter
|
||||
-- @param registerAddress The reigster address from which to read
|
||||
-- @return The byte stored in the register
|
||||
----------------------------------------------------------
|
||||
local function read(registerAddress)
|
||||
-- Tell the MCP which register you want to read from
|
||||
i2c.start(id)
|
||||
i2c.address(id,MCP23008_ADDRESS,i2c.TRANSMITTER) -- send MCP's address and write bit
|
||||
i2c.write(id,registerAddress)
|
||||
i2c.stop(id)
|
||||
i2c.start(id)
|
||||
-- Read the data form the register
|
||||
i2c.address(id,MCP23008_ADDRESS,i2c.RECEIVER) -- send the MCP's address and read bit
|
||||
local data = 0x00
|
||||
data = i2c.read(id,1) -- we expect only one byte of data
|
||||
i2c.stop(id)
|
||||
|
||||
return string.byte(data) -- i2c.read returns a string so we convert to it's int value
|
||||
end
|
||||
|
||||
---
|
||||
--! @name begin
|
||||
--! @description Sets the MCP23008 device address's last three bits.
|
||||
-- Note: The address is defined as binary 0100[A2][A1][A0] where
|
||||
-- A2, A1, and A0 are defined by the connection of the pins,
|
||||
-- e.g. if the pins are connected all to GND then the paramter address
|
||||
-- will need to be 0x0.
|
||||
-- @param address The 3 least significant bits (LSB) of the address
|
||||
-- @param pinSDA The pin to use for SDA
|
||||
-- @param pinSCL The pin to use for SCL
|
||||
-- @param speed The speed of the I2C signal
|
||||
-- @return void
|
||||
---------------------------------------------------------------------------
|
||||
function M.begin(address,pinSDA,pinSCL,speed)
|
||||
MCP23008_ADDRESS = bit.bor(MCP23008_ADDRESS,address)
|
||||
i2c.setup(id,pinSDA,pinSCL,speed)
|
||||
end
|
||||
|
||||
---
|
||||
-- @name writeGPIO
|
||||
-- @description Writes a byte of data to the GPIO register
|
||||
-- @param dataByte The byte of data to write
|
||||
-- @return void
|
||||
----------------------------------------------------------
|
||||
function M.writeGPIO(dataByte)
|
||||
write(MCP23008_GPIO,dataByte)
|
||||
end
|
||||
|
||||
---
|
||||
-- @name readGPIO
|
||||
-- @description reads a byte of data from the GPIO register
|
||||
-- @return One byte of data
|
||||
----------------------------------------------------------
|
||||
function M.readGPIO()
|
||||
return read(MCP23008_GPIO)
|
||||
end
|
||||
|
||||
---
|
||||
-- @name writeIODIR
|
||||
-- @description Writes one byte of data to the IODIR register
|
||||
-- @param dataByte The byte of data to write
|
||||
-- @return void
|
||||
----------------------------------------------------------
|
||||
function M.writeIODIR(dataByte)
|
||||
write(MCP23008_IODIR,dataByte)
|
||||
end
|
||||
|
||||
---
|
||||
-- @name readIODIR
|
||||
-- @description Reads a byte from the IODIR register
|
||||
-- @return The byte of data in IODIR
|
||||
----------------------------------------------------------
|
||||
function M.readIODIR()
|
||||
return read(MCP23008_IODIR)
|
||||
end
|
||||
|
||||
---
|
||||
-- @name writeGPPU The byte to write to the GPPU
|
||||
-- @description Writes a byte of data to the
|
||||
-- PULL-UP RESISTOR CONFIGURATION (GPPU)REGISTER
|
||||
-- @param databyte the value to write to the GPPU register.
|
||||
-- each bit in this byte is assigned to an individual GPIO pin
|
||||
-- @return void
|
||||
----------------------------------------------------------------
|
||||
function M.writeGPPU(dataByte)
|
||||
write(MCP23008_GPPU,dataByte)
|
||||
end
|
||||
|
||||
---
|
||||
-- @name readGPPU
|
||||
-- @description Reads the GPPU (Pull-UP resistors register) byte
|
||||
-- @return The GPPU byte i.e. state of all internal pull-up resistors
|
||||
-------------------------------------------------------------------
|
||||
function M.readGPPU()
|
||||
return read(MCP23008_GPPU)
|
||||
end
|
||||
|
||||
return M
|
||||
Loading…
Reference in New Issue