fixes for pinWakeCallback, incorrect return types for rfduino_ calls, and max sketch size

RFduino · RFduino · commit 569f5a939445 · 2014-01-07T12:11:33.000-07:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,11 @@
 CHANGELOG
 
+v 1.6.1
+  - Fixed issue with not being able to call RFduinoBLE.end() / 
+    RFduino_systemReset() from pinWakeCallback
+  - corrected return types from uint32_t to void for rfduino_ functions
+  - Corrected maximum sketch size.  The last 4 flash pages are reserved,
+
 v 1.6
   - Added getDeviceId() to return the unique id for each device
     (see DeviceInfo sketch)
diff --git a/boards.txt b/boards.txt
@@ -18,5 +18,5 @@ RFduino.upload.tool=RFDLoader
 RFduino.upload.protocol=
 
 # sizer will not run if this is not defined
-# 132KB
-RFduino.upload.maximum_size=135168
+# 128KB
+RFduino.upload.maximum_size=131072
diff --git a/variants/RFduino/libRFduino.a b/variants/RFduino/libRFduino.a
diff --git a/variants/RFduino/libRFduino.h b/variants/RFduino/libRFduino.h
@@ -102,11 +102,13 @@ extern void RFduino_systemOff(void);
  */
 extern float RFduino_temperature(int scale);
 
-uint32_t rfduino_ppi_channel_assign(uint8_t channel_num, const volatile void * event_endpoint, const volatile void * task_endpoint);
-uint32_t rfduino_ppi_channel_unassign(uint8_t channel_num);
+void rfduino_ppi_channel_assign(uint8_t channel_num, const volatile void * event_endpoint, const volatile void * task_endpoint);
+void rfduino_ppi_channel_unassign(uint8_t channel_num);
 
-uint32_t rfduino_nvic_enableirq(uint8_t irq_num);
-uint32_t rfduino_nvic_disableirq(uint8_t irq_num);
+void rfduino_nvic_enableirq(uint8_t irq_num);
+void rfduino_nvic_disableirq(uint8_t irq_num);
+
+void rfduino_nvic_setpriority(uint8_t irq_num, uint32_t priority);
 
 // 1 if the BLE radio is active (or about to become active), 0 if not
 extern volatile int RFduinoBLE_radioActive;
diff --git a/variants/RFduino/linker_scripts/gcc/RFduino.ld b/variants/RFduino/linker_scripts/gcc/RFduino.ld
@@ -31,7 +31,7 @@ SEARCH_DIR(.)
 /* Memory Spaces Definitions */
 MEMORY
 {
-  rom (rx) : ORIGIN = 0x1F000, LENGTH = 132K
+  rom (rx) : ORIGIN = 0x1F000, LENGTH = 128K
   ram (rwx) : ORIGIN = 0x20002000, LENGTH = 8K
 }
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ SEARCH_DIR(.)`
`31`	`31`	`/* Memory Spaces Definitions */`
`32`	`32`	`MEMORY`
`33`	`33`	`{`
`34`		`- rom (rx) : ORIGIN = 0x1F000, LENGTH = 132K`
	`34`	`+ rom (rx) : ORIGIN = 0x1F000, LENGTH = 128K`
`35`	`35`	`ram (rwx) : ORIGIN = 0x20002000, LENGTH = 8K`
`36`	`36`	`}`
`37`	`37`