Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for broken I2C functionality on x41 chips #843

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Fix for broken I2C functionality on x41 chips #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions avr/libraries/Wire/src/SoftI2CMaster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,14 @@
__asm__ __volatile__ (" ret");
// 7 cycles for call and return
#else
uint8_t temp = 0;
__asm__ __volatile__
(
" ldi r25, %[DELAY] ; load delay constant ; 4C \n\t"
"_Lidelay: \n\t"
" dec r25 ; decrement counter ; 4C + xC \n\t"
" brne _Lidelay ; 5C+(x-1)2C + xC\n\t"
" ret ; 9C+(x-1)2C + xC = 7C + xC"
:"+d" ((uint8_t) temp) : [DELAY] "M" I2C_DELAY_COUNTER);
: : [DELAY] "M" I2C_DELAY_COUNTER : "r25");
// 7 cycles + 3 times x cycles
#endif
}
Expand Down Expand Up @@ -435,7 +434,7 @@
" nop \n\t "
" sbi %[SCLDDR],%[SCLPIN] ; force SCL low so SCL = H is short\n\t"
" ret \n\t"
" ; + 4 = 17C + 2X for acknowldge bit"

Check failure on line 437 in avr/libraries/Wire/src/SoftI2CMaster.h

View workflow job for this annotation

GitHub Actions / spellcheck 

acknowldge ==> acknowledge
::
[SCLDDR] "I" (SCL_DDR), [SCLPIN] "I" (SCL_PIN), [SCLIN] "I" (SCL_IN),
[SDADDR] "I" (SDA_DDR), [SDAPIN] "I" (SDA_PIN), [SDAIN] "I" (SDA_IN));
Expand Down
4 changes: 2 additions & 2 deletions avr/libraries/Wire/src/SoftWire.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ class SoftWire : public Stream
beginTransmission(address);
// the maximum size of internal address is 3 bytes
if (isize > 3) {
isize = 3;
isize = 3;
}
// write internal register address - most significant byte first
while (isize-- > 0)
write((uint8_t)(iaddress >> (isize*8)));
write((uint8_t)(iaddress >> (isize*8)));
endTransmission(false);
}
// clamp to buffer length
Expand Down
9 changes: 4 additions & 5 deletions avr/libraries/Wire/src/Wire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -732,10 +732,9 @@
return value;
}
#else // Implementations for slave only mode
void TwoWire::begin(int address) {
begin((uint8_t)address);
void TwoWire::begin(uint8_t address) {
TinyWireS.begin((uint8_t)address, 0);
}

// must be called in slave onRequest event callback
size_t TwoWire::write(uint8_t data) {
size_t numBytes = 0;
Expand Down Expand Up @@ -814,15 +813,15 @@
/* END MASTER ONLY METHODS */

/* BEGIN SLAVE ONLY METHODS */
#if defined(SLAVE_MASTER_ONLY) || defined(WIRE_BOTH)
#if defined(WIRE_SLAVE_ONLY) || defined(WIRE_BOTH)

void TwoWire::onReceive( void (*function)(size_t)) {
TinyWireS.onReceive(function);
}
void TwoWire::onReceive( void (*function)(int)) {
// arduino api compatibility fixer:
// really hope size parameter will not exceed 2^31 :)
static_assert(sizeof(int) == sizeof(size_t), "something is wrong in Arduino kingdom");
static_assert(sizeof(int) == sizeof(size_t), "something is wrong in the Arduino kingdom");
TinyWireS.onReceive(reinterpret_cast<void(*)(size_t)>(function));
}
// sets function called on slave read
Expand Down
10 changes: 5 additions & 5 deletions avr/variants/tinyx41_cw/pins_arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,13 +292,13 @@ anyway) and instead just use TOCPMCOE bits to control whether PWM is output */
* a markedly inferior software TWI master implementation if that is requested.
*---------------------------------------------------------------------------*/

/* Hardware I2C slave */
#define SCL PIN_PA6
/* Used by hardware I2C slave and software I2C master */
#define SCL PIN_PA4
#define SCL_PORT (PORTA)
#define SCL_PIN (6)
#define SDA PIN_PA4
#define SCL_PIN (4)
#define SDA PIN_PA6
#define SDA_PORT (PORTA)
#define SDA_PIN (4)
#define SDA_PIN (6)

/* Hardware SPI */
#if defined(SET_REMAP) && SET_REMAP > 1
Expand Down
10 changes: 5 additions & 5 deletions avr/variants/tinyx41_legacy/pins_arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,13 @@ anyway) and instead just use TOCPMCOE bits to control whether PWM is output */
* a markedly inferior software TWI master implementation if that is requested.
*---------------------------------------------------------------------------*/

/* Hardware I2C slave */
#define SCL PIN_PA6
/* Used by hardware I2C slave and software I2C master */
#define SCL PIN_PA4
#define SCL_PORT (PORTA)
#define SCL_PIN (6)
#define SDA PIN_PA4
#define SCL_PIN (4)
#define SDA PIN_PA6
#define SDA_PORT (PORTA)
#define SDA_PIN (4)
#define SDA_PIN (6)

/* Hardware SPI */
#if defined(SET_REMAP) && SET_REMAP > 1
Expand Down
Loading