mirror of
https://github.com/esphome/esphome.git
synced 2025-09-01 10:52:19 +01:00
Fork some base libraries (#758)
* Fork some base libraries * Update ESPAsyncWebServer
This commit is contained in:
@@ -1,35 +0,0 @@
|
||||
--- .pio/libdeps/livingroom8266/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h 2019-06-25 11:14:33.000000000 +0200
|
||||
+++ .pio/libdeps/livingroom8266/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h.2 2019-06-25 11:14:40.000000000 +0200
|
||||
@@ -195,7 +195,12 @@
|
||||
_i2sBufDesc[indexDesc].sub_sof = 0;
|
||||
_i2sBufDesc[indexDesc].datalen = blockSize;
|
||||
_i2sBufDesc[indexDesc].blocksize = blockSize;
|
||||
- _i2sBufDesc[indexDesc].buf_ptr = (uint32_t)is2Buffer;
|
||||
+ union {
|
||||
+ uint8_t *ptr;
|
||||
+ uint32_t value;
|
||||
+ } ptr;
|
||||
+ ptr.ptr = is2Buffer;
|
||||
+ _i2sBufDesc[indexDesc].buf_ptr = ptr.value;
|
||||
_i2sBufDesc[indexDesc].unused = 0;
|
||||
_i2sBufDesc[indexDesc].next_link_ptr = (uint32_t)&(_i2sBufDesc[indexDesc + 1]);
|
||||
|
||||
@@ -361,12 +366,15 @@
|
||||
|
||||
case NeoDmaState_Sending:
|
||||
{
|
||||
- slc_queue_item* finished_item = (slc_queue_item*)SLCRXEDA;
|
||||
-
|
||||
+ union {
|
||||
+ slc_queue_item *ptr;
|
||||
+ uint32_t value;
|
||||
+ } ptr;
|
||||
+ ptr.value = SLCRXEDA;
|
||||
// the data block had actual data sent
|
||||
// point last state block to first state block thus
|
||||
// just looping and not sending the data blocks
|
||||
- (finished_item + 1)->next_link_ptr = (uint32_t)(finished_item);
|
||||
+ (ptr.ptr + 1)->next_link_ptr = ptr.value;
|
||||
|
||||
s_this->_dmaState = NeoDmaState_Zeroing;
|
||||
}
|
@@ -126,7 +126,6 @@ def lint_executable_bit(fname):
|
||||
|
||||
@lint_content_find_check('\t', exclude=[
|
||||
'esphome/dashboard/static/ace.js', 'esphome/dashboard/static/ext-searchbox.js',
|
||||
'script/.neopixelbus.patch',
|
||||
])
|
||||
def lint_tabs(fname):
|
||||
return "File contains tab character. Please convert tabs to spaces."
|
||||
|
@@ -6,9 +6,6 @@ cd "$(dirname "$0")/.."
|
||||
if [[ ! -e ".gcc-flags.json" ]]; then
|
||||
pio init --ide atom
|
||||
fi
|
||||
if ! patch -R -p0 -s -f --dry-run <script/.neopixelbus.patch; then
|
||||
patch -p0 < script/.neopixelbus.patch
|
||||
fi
|
||||
|
||||
set -x
|
||||
|
||||
|
Reference in New Issue
Block a user