diff options
| author | smcauliffe <smcauliffe> | 2007-07-23 10:20:38 +0000 |
|---|---|---|
| committer | smcauliffe <smcauliffe@cb376a5e-1013-0410-a455-b6b1f9ac8223> | 2007-07-23 10:20:38 +0000 |
| commit | ac5d4eee1e6aa2d4048b5845a427ed9beee8ca84 (patch) | |
| tree | 870a4bd33fab83b7842d427ca0b52cef442f27be | |
| parent | dcc30595fe027d595d7ae31200ce225c9e3e2ebd (diff) | |
| download | reprap-ac5d4eee1e6aa2d4048b5845a427ed9beee8ca84.tar.gz reprap-ac5d4eee1e6aa2d4048b5845a427ed9beee8ca84.zip | |
Fixed old style port references
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@759 cb376a5e-1013-0410-a455-b6b1f9ac8223
| -rw-r--r-- | branches/autoconf-firmware/devices/extruder_0/extruder2.c | 40 | ||||
| -rw-r--r-- | branches/autoconf-firmware/devices/extruder_1/extruder2.c | 40 |
2 files changed, 40 insertions, 40 deletions
diff --git a/branches/autoconf-firmware/devices/extruder_0/extruder2.c b/branches/autoconf-firmware/devices/extruder_0/extruder2.c index 92f90df3..2c2a0882 100644 --- a/branches/autoconf-firmware/devices/extruder_0/extruder2.c +++ b/branches/autoconf-firmware/devices/extruder_0/extruder2.c @@ -99,18 +99,18 @@ volatile static addressableInt currentPosition, seekPosition; void extruder_stop() { - PORTB4 = 0; - PORTB5 = 0; + RB4 = 0; + RB5 = 0; } void extruder_forward() { - PORTB5 = 0; - PORTB4 = 1; + RB5 = 0; + RB4 = 1; } void extruder_reverse() { - PORTB4 = 0; - PORTB5 = 1; + RB4 = 0; + RB5 = 1; } void heater_off() { @@ -130,7 +130,7 @@ void change_log() char changes, current; extrude_click = 0; material_click = 0; - current = PORTB1; // Store so it doesn't change half way through processing + current = RB1; // Store so it doesn't change half way through processing changes = lastPortB ^ current; if (changes) { @@ -141,7 +141,7 @@ void change_log() } lastPortB = current; - current = PORTA5; // Store so it doesn't change half way through processing + current = RA5; // Store so it doesn't change half way through processing changes = lastPortA ^ current; if (changes) { // Material detector changed @@ -167,26 +167,26 @@ void set_cooler(byte b) #else void extruder_stop() { - PORTB4 = 0; - PORTB5 = 0; + RB4 = 0; + RB5 = 0; } void extruder_forward() { - PORTB5 = 0; - PORTB4 = 1; + RB5 = 0; + RB4 = 1; } void extruder_reverse() { - PORTB4 = 0; - PORTB5 = 1; + RB4 = 0; + RB5 = 1; } void heater_off() { - PORTB0 = 0; + RB0 = 0; } void heater_on() { - PORTB0 = 1; + RB0 = 1; } #pragma save @@ -208,7 +208,7 @@ void change_log() } if (changes & 0x40) { // Material detector changed - if (!PORTB6 && seekNotify != 255) { //***AB Shouldn't this be (!(current & 0x40) && seekNotify != 255) + if (!RB6 && seekNotify != 255) { //***AB Shouldn't this be (!(current & 0x40) && seekNotify != 255) material_click = 1; } } @@ -272,7 +272,7 @@ void pwmSet() //{ // CCP1CON = BIN(00000000); // PR2 = 255; -// PORTB3 = 0; +// RB3 = 0; // CCPR1L = 0; //} //#pragma restore @@ -557,9 +557,9 @@ void processCommand() sendReply(); sendDataByte(CMD_ISEMPTY); #ifdef UNIVERSAL_PCB - sendDataByte(!PORTA5); + sendDataByte(!RA5); #else - sendDataByte(!PORTB6); + sendDataByte(!RB6); #endif endMessage(); break; diff --git a/branches/autoconf-firmware/devices/extruder_1/extruder2.c b/branches/autoconf-firmware/devices/extruder_1/extruder2.c index 3aa4d469..886ea9be 100644 --- a/branches/autoconf-firmware/devices/extruder_1/extruder2.c +++ b/branches/autoconf-firmware/devices/extruder_1/extruder2.c @@ -107,18 +107,18 @@ volatile static addressableInt currentPosition, seekPosition; void extruder_stop() { - PORTB4 = 0; - PORTB5 = 0; + RB4 = 0; + RB5 = 0; } void extruder_forward() { - PORTB5 = 0; - PORTB4 = 1; + RB5 = 0; + RB4 = 1; } void extruder_reverse() { - PORTB4 = 0; - PORTB5 = 1; + RB4 = 0; + RB5 = 1; } void heater_off() { @@ -138,7 +138,7 @@ void change_log() char changes, current; extrude_click = 0; material_click = 0; - current = PORTB1; // Store so it doesn't change half way through processing + current = RB1; // Store so it doesn't change half way through processing changes = lastPortB ^ current; if (changes) { @@ -149,7 +149,7 @@ void change_log() } lastPortB = current; - current = PORTA5; // Store so it doesn't change half way through processing + current = RA5; // Store so it doesn't change half way through processing changes = lastPortA ^ current; if (changes) { // Material detector changed @@ -175,26 +175,26 @@ void set_cooler(byte b) #else void extruder_stop() { - PORTB4 = 0; - PORTB5 = 0; + RB4 = 0; + RB5 = 0; } void extruder_forward() { - PORTB5 = 0; - PORTB4 = 1; + RB5 = 0; + RB4 = 1; } void extruder_reverse() { - PORTB4 = 0; - PORTB5 = 1; + RB4 = 0; + RB5 = 1; } void heater_off() { - PORTB0 = 0; + RB0 = 0; } void heater_on() { - PORTB0 = 1; + RB0 = 1; } #pragma save @@ -216,7 +216,7 @@ void change_log() } if (changes & 0x40) { // Material detector changed - if (!PORTB6 && seekNotify != 255) { //***AB Shouldn't this be (!(current & 0x40) && seekNotify != 255) + if (!RB6 && seekNotify != 255) { //***AB Shouldn't this be (!(current & 0x40) && seekNotify != 255) material_click = 1; } } @@ -282,7 +282,7 @@ void pwmSet() //{ // CCP1CON = BIN(00000000); // PR2 = 255; -// PORTB3 = 0; +// RB3 = 0; // CCPR1L = 0; //} //#pragma restore @@ -617,9 +617,9 @@ void processCommand() sendReply(); sendDataByte(CMD_ISEMPTY); #ifdef UNIVERSAL_PCB - sendDataByte(!PORTA5); + sendDataByte(!RA5); #else - sendDataByte(!PORTB6); + sendDataByte(!RB6); #endif endMessage(); break; |