Mirrors/Maixduino
2
0
Fork 0
mirror of https://github.com/sipeed/Maixduino.git synced 2026-03-03 09:04:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

min max macros and Wire fixes

Browse Source
This commit is contained in:
UT2UH
2020-11-11 13:29:58 +02:00
parent 1376ced183
commit 2fe52b570e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cores/arduino/wiring_constants.h
View File

@@ -65,11 +65,11 @@ enum BitOrder {
#endif // abs
#ifndef min
#define min(a,b) ((a)<(b)?(a):(b))
#define min(a,b) (((a)<(b))?(a):(b))
#endif // min
#ifndef max
#define max(a,b) ((a)>(b)?(a):(b))
#define max(a,b) (((a)>(b))?(a):(b))
#endif // max
#define abs(x) ((x)>0?(x):-(x))

6
libraries/Wire/src/Wire.cpp
View File

@@ -56,7 +56,8 @@ TwoWire::begin(uint8_t sda, uint8_t scl, uint32_t frequency)
is_master_mode = true;
delete i2c_tx_buff, i2c_rx_buff;
delete i2c_tx_buff;
delete i2c_rx_buff;
i2c_tx_buff = new RingBuffer();
i2c_rx_buff = new RingBuffer();
@@ -88,7 +89,8 @@ TwoWire::begin(uint16_t slave_address, uint8_t sda, uint8_t scl)
plic_irq_register((plic_irq_t)(IRQN_I2C0_INTERRUPT + _i2c_num), maix_i2c_slave_irq, this);
plic_irq_enable((plic_irq_t)(IRQN_I2C0_INTERRUPT + _i2c_num));
delete i2c_tx_buff, i2c_rx_buff;
delete i2c_tx_buff;
delete i2c_rx_buff;
i2c_tx_buff = new RingBuffer();
i2c_rx_buff = new RingBuffer();