X-Git-Url: http://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/914670fb145767f44f6bf62a3018e7bd057e2269..cab80ea900084cb4845523356a96b140e2a703a6:/src/libs/Pin.h

diff --git a/src/libs/Pin.h b/src/libs/Pin.h
dissimilarity index 74%
index a809b0ab..c3e781f8 100644
--- a/src/libs/Pin.h
+++ b/src/libs/Pin.h
@@ -1,64 +1,89 @@
-#ifndef PIN_H
-#define PIN_H
-
-#include <stdlib.h>
-#include "libs/LPC17xx/sLPC17xx.h" // smoothed mbed.h lib
-#include "libs/Kernel.h"
-#include "libs/utils.h"
-#include <string>
-
-class Pin{
-    public:
-        Pin(){ }
-
-        Pin* from_string(std::string value){
-            LPC_GPIO_TypeDef* gpios[5] ={LPC_GPIO0,LPC_GPIO1,LPC_GPIO2,LPC_GPIO3,LPC_GPIO4};
-            this->port_number =  atoi(value.substr(0,1).c_str());  
-            this->port = gpios[this->port_number]; 
-            this->inverting = ( value.find_first_of("!")!=string::npos ? true : false );
-            this->pin  = atoi( value.substr(2, value.size()-2-(this->inverting?1:0)).c_str() );
-            return this;
-        }
-
-        inline Pin*  as_output(){
-            this->port->FIODIR |= 1<<this->pin;
-            return this;
-        }  
-
-        inline Pin*  as_input(){
-            this->port->FIODIR &= ~(1<<this->pin);
-            return this;
-        }  
-
-        inline Pin* as_open_drain(){
-            if( this->port_number == 0 ){ LPC_PINCON->PINMODE_OD0 |= (1<<this->pin); }
-            if( this->port_number == 1 ){ LPC_PINCON->PINMODE_OD1 |= (1<<this->pin); }
-            if( this->port_number == 2 ){ LPC_PINCON->PINMODE_OD2 |= (1<<this->pin); }
-            if( this->port_number == 3 ){ LPC_PINCON->PINMODE_OD3 |= (1<<this->pin); }
-            if( this->port_number == 4 ){ LPC_PINCON->PINMODE_OD4 |= (1<<this->pin); }
-            return this;
-        }
-
-        inline bool get(){
-            return this->inverting ^ (( this->port->FIOPIN >> this->pin ) & 1);
-        }
-
-        inline void set(bool value){
-            value = this->inverting ^ value;
-            if( value ){
-                this->port->FIOSET = 1 << this->pin;
-            }else{
-                this->port->FIOCLR = 1 << this->pin;
-            }        
-        }
-
-        bool inverting; 
-        LPC_GPIO_TypeDef* port;
-        char port_number;
-        char pin; 
-};
-
-
-
-
-#endif
+#ifndef PIN_H
+#define PIN_H
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string>
+
+#include "libs/LPC17xx/sLPC17xx.h" // smoothed mbed.h lib
+#include "PinNames.h"
+
+namespace mbed {
+    class PwmOut;
+    class InterruptIn;
+}
+
+class Pin {
+    public:
+        Pin();
+
+        Pin* from_string(std::string value);
+
+        inline bool connected(){
+            return this->valid;
+        }
+
+        inline bool equals(const Pin& other) const {
+            return (this->pin == other.pin) && (this->port == other.port);
+        }
+
+        inline Pin* as_output(){
+            if (this->valid)
+                this->port->FIODIR |= 1<<this->pin;
+            return this;
+        }
+
+        inline Pin* as_input(){
+            if (this->valid)
+                this->port->FIODIR &= ~(1<<this->pin);
+            return this;
+        }
+
+        Pin* as_open_drain(void);
+
+        Pin* as_repeater(void);
+
+        Pin* pull_up(void);
+
+        Pin* pull_down(void);
+
+        Pin* pull_none(void);
+
+        inline bool get() const{
+            if (!this->valid) return false;
+            return this->inverting ^ (( this->port->FIOPIN >> this->pin ) & 1);
+        }
+
+        inline void set(bool value)
+        {
+            if (!this->valid) return;
+            if ( this->inverting ^ value )
+                this->port->FIOSET = 1 << this->pin;
+            else
+                this->port->FIOCLR = 1 << this->pin;
+        }
+
+        mbed::PwmOut *hardware_pwm();
+
+        mbed::InterruptIn *interrupt_pin();
+
+        bool is_inverting() const { return inverting; }
+        void set_inverting(bool f) { inverting= f; }
+
+        // these should be private, and use getters
+        LPC_GPIO_TypeDef* port;
+
+        unsigned char pin;
+        char port_number;
+
+    private:
+        struct {
+            bool inverting:1;
+            bool valid:1;
+        };
+};
+
+
+
+
+#endif