Merge pull request #220 from OpenLightingProject/revert-219-pins

nomis52 · nomis52 · commit 32f4bc46ab79 · 2015-10-11T11:21:07.000-07:00
Revert "Use harmony to configure the i/o pins"
diff --git a/boardcfg/number1/board_init.c b/boardcfg/number1/board_init.c
@@ -22,5 +22,13 @@
 #include "peripheral/ports/plib_ports.h"
 
 void Number1_PreAppHook() {
-  // Nothing to do
+  // We need to set the necessary ports to digital mode
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_8,
+                           PORTS_PIN_MODE_DIGITAL);  // U5 RX
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_9,
+                           PORTS_PIN_MODE_DIGITAL);  // TX En
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_10,
+                           PORTS_PIN_MODE_DIGITAL);  // RX En
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_14,
+                           PORTS_PIN_MODE_DIGITAL);  // U5 TX
 }
diff --git a/boardcfg/number8/board_init.c b/boardcfg/number8/board_init.c
@@ -22,5 +22,13 @@
 #include "peripheral/ports/plib_ports.h"
 
 void Number8_PreAppHook() {
-  // Nothing to do
+  // We need to set the necessary ports to digital mode
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_8,
+                           PORTS_PIN_MODE_DIGITAL);  // U5 RX
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_9,
+                           PORTS_PIN_MODE_DIGITAL);  // TX En
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_10,
+                           PORTS_PIN_MODE_DIGITAL);  // RX En
+  PLIB_PORTS_PinModeSelect(PORTS_ID_0, PORTS_ANALOG_PIN_14,
+                           PORTS_PIN_MODE_DIGITAL);  // U5 TX
 }
diff --git a/firmware/src/system_config/number1/number1.mhc b/firmware/src/system_config/number1/number1.mhc
@@ -228,7 +228,7 @@ CONFIG_USE_SYS_PORTS=y
 CONFIG_COMPONENT_PACKAGE="QFN"
 CONFIG_SYS_PORTS_CN=n
 CONFIG_USE_SYS_PORTS_CN_INTERRUPT=n
-CONFIG_SYS_PORT_ADPCFG=0xb8ff
+CONFIG_SYS_PORT_ADPCFG=0xffff
 CONFIG_SYS_PORT_CNEN=0x0
 CONFIG_SYS_PORT_CNPU=0x0
 #
diff --git a/firmware/src/system_config/number1/system_config.h b/firmware/src/system_config/number1/system_config.h
@@ -91,7 +91,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
 #define SYS_INT                     true
 
 /*** Ports System Service Configuration ***/
-#define SYS_PORT_AD1PCFG        ~0xb8ff
+#define SYS_PORT_AD1PCFG        ~0xffff
 #define SYS_PORT_CNPUE          0x0
 #define SYS_PORT_CNEN           0x0
 
diff --git a/firmware/src/system_config/number8/number8.mhc b/firmware/src/system_config/number8/number8.mhc
@@ -228,7 +228,7 @@ CONFIG_USE_SYS_PORTS=y
 CONFIG_COMPONENT_PACKAGE="QFN"
 CONFIG_SYS_PORTS_CN=n
 CONFIG_USE_SYS_PORTS_CN_INTERRUPT=n
-CONFIG_SYS_PORT_ADPCFG=0xb8ff
+CONFIG_SYS_PORT_ADPCFG=0xffff
 CONFIG_SYS_PORT_CNEN=0x0
 CONFIG_SYS_PORT_CNPU=0x0
 #
diff --git a/firmware/src/system_config/number8/system_config.h b/firmware/src/system_config/number8/system_config.h
@@ -91,7 +91,7 @@ SUBSTITUTE GOODS, TECHNOLOGY, SERVICES, OR ANY CLAIMS BY THIRD PARTIES
 #define SYS_INT                     true
 
 /*** Ports System Service Configuration ***/
-#define SYS_PORT_AD1PCFG        ~0xb8ff
+#define SYS_PORT_AD1PCFG        ~0xffff
 #define SYS_PORT_CNPUE          0x0
 #define SYS_PORT_CNEN           0x0
 

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ CONFIG_USE_SYS_PORTS=y`
`228`	`228`	`CONFIG_COMPONENT_PACKAGE="QFN"`
`229`	`229`	`CONFIG_SYS_PORTS_CN=n`
`230`	`230`	`CONFIG_USE_SYS_PORTS_CN_INTERRUPT=n`
`231`		`-CONFIG_SYS_PORT_ADPCFG=0xb8ff`
	`231`	`+CONFIG_SYS_PORT_ADPCFG=0xffff`
`232`	`232`	`CONFIG_SYS_PORT_CNEN=0x0`
`233`	`233`	`CONFIG_SYS_PORT_CNPU=0x0`
`234`	`234`	`#`