i2c fix. RFDLoader 32-bit.

RFduino · RFduino · commit 46031de6192a · 2013-12-20T09:23:44.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,10 @@
 CHANGELOG
 
+v 1.5.1
+  - Added support for OSX (contributed by nitsky)
+  - RFDLoader now supports 32-bit and 64-bit osx snow leopard through mavericks
+  - fix for i2c not working when BLE stack is active
+
 v 1.5
   - Added support for Flash Memory.  See the RFduinoNonBLE flash example
     sketches for use.  More documentation is also available in
diff --git a/RFDLoader b/RFDLoader
diff --git a/libraries/Wire/Wire.cpp b/libraries/Wire/Wire.cpp
@@ -183,9 +183,7 @@ bool TwoWire::twi_master_init(void)
     twi->PSELSCL = SCL_pin_number;
     twi->PSELSDA = SDA_pin_number;
     twi->FREQUENCY = TWI_FREQUENCY_FREQUENCY_K100 << TWI_FREQUENCY_FREQUENCY_Pos;
-    NRF_PPI->CH[7].EEP = (uint32_t)&twi->EVENTS_BB;
-    NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_SUSPEND;
-    NRF_PPI->CHENCLR = PPI_CHENCLR_CH7_Msk;
+    rfduino_ppi_channel_unassign(7);
     twi->ENABLE = TWI_ENABLE_ENABLE_Enabled << TWI_ENABLE_ENABLE_Pos;
 
     return twi_master_clear_bus();
@@ -204,13 +202,12 @@ uint8_t TwoWire::twi_master_read(uint8_t *data, uint8_t data_length, uint8_t iss
 
     if ((data_length == 1) && (issue_stop_condition == 1))
     {
-		NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_STOP;
+        rfduino_ppi_channel_assign(7, &twi->EVENTS_BB, &twi->TASKS_STOP);
     }
     else
     {
-        NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_SUSPEND;
+        rfduino_ppi_channel_assign(7, &twi->EVENTS_BB, &twi->TASKS_SUSPEND);
     }
-    NRF_PPI->CHENSET = PPI_CHENSET_CH7_Msk;
     twi->TASKS_STARTRX = 1;
     while(true)
     {
@@ -233,7 +230,7 @@ uint8_t TwoWire::twi_master_read(uint8_t *data, uint8_t data_length, uint8_t iss
         {
             if (issue_stop_condition == 1)
 			{
-				NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_STOP;
+        rfduino_ppi_channel_assign(7, &twi->EVENTS_BB, &twi->TASKS_STOP);
 			}
         }
 
@@ -252,7 +249,7 @@ uint8_t TwoWire::twi_master_read(uint8_t *data, uint8_t data_length, uint8_t iss
 		twi->EVENTS_STOPPED = 0;
 	}
 
-    NRF_PPI->CHENCLR = PPI_CHENCLR_CH7_Msk;
+    rfduino_ppi_channel_unassign(7);
     return bytes_received;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -183,9 +183,7 @@ bool TwoWire::twi_master_init(void)`
`183`	`183`	`twi->PSELSCL = SCL_pin_number;`
`184`	`184`	`twi->PSELSDA = SDA_pin_number;`
`185`	`185`	`twi->FREQUENCY = TWI_FREQUENCY_FREQUENCY_K100 << TWI_FREQUENCY_FREQUENCY_Pos;`
`186`		`- NRF_PPI->CH[7].EEP = (uint32_t)&twi->EVENTS_BB;`
`187`		`- NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_SUSPEND;`
`188`		`- NRF_PPI->CHENCLR = PPI_CHENCLR_CH7_Msk;`
	`186`	`+ rfduino_ppi_channel_unassign(7);`
`189`	`187`	`twi->ENABLE = TWI_ENABLE_ENABLE_Enabled << TWI_ENABLE_ENABLE_Pos;`
`190`	`188`
`191`	`189`	`return twi_master_clear_bus();`
`@@ -204,13 +202,12 @@ uint8_t TwoWire::twi_master_read(uint8_t *data, uint8_t data_length, uint8_t iss`
`204`	`202`
`205`	`203`	`if ((data_length == 1) && (issue_stop_condition == 1))`
`206`	`204`	`{`
`207`		`- NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_STOP;`
	`205`	`+ rfduino_ppi_channel_assign(7, &twi->EVENTS_BB, &twi->TASKS_STOP);`
`208`	`206`	`}`
`209`	`207`	`else`
`210`	`208`	`{`
`211`		`- NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_SUSPEND;`
	`209`	`+ rfduino_ppi_channel_assign(7, &twi->EVENTS_BB, &twi->TASKS_SUSPEND);`
`212`	`210`	`}`
`213`		`- NRF_PPI->CHENSET = PPI_CHENSET_CH7_Msk;`
`214`	`211`	`twi->TASKS_STARTRX = 1;`
`215`	`212`	`while(true)`
`216`	`213`	`{`
`@@ -233,7 +230,7 @@ uint8_t TwoWire::twi_master_read(uint8_t *data, uint8_t data_length, uint8_t iss`
`233`	`230`	`{`
`234`	`231`	`if (issue_stop_condition == 1)`
`235`	`232`	`{`
`236`		`- NRF_PPI->CH[7].TEP = (uint32_t)&twi->TASKS_STOP;`
	`233`	`+ rfduino_ppi_channel_assign(7, &twi->EVENTS_BB, &twi->TASKS_STOP);`
`237`	`234`	`}`
`238`	`235`	`}`
`239`	`236`
`@@ -252,7 +249,7 @@ uint8_t TwoWire::twi_master_read(uint8_t *data, uint8_t data_length, uint8_t iss`
`252`	`249`	`twi->EVENTS_STOPPED = 0;`
`253`	`250`	`}`
`254`	`251`
`255`		`- NRF_PPI->CHENCLR = PPI_CHENCLR_CH7_Msk;`
	`252`	`+ rfduino_ppi_channel_unassign(7);`
`256`	`253`	`return bytes_received;`
`257`	`254`	`}`
`258`	`255`