From 7bec778c9a59416e3214ac28a6bce29dd03c9c00 Mon Sep 17 00:00:00 2001
From: Nao Pross <naopross@thearcway.org>
Date: Fri, 4 May 2018 01:37:04 +0200
Subject: Update pin class to support input and output mode

Also, minor changes in uart1.tpp
---
 hal/pin.tpp | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 10 deletions(-)

(limited to 'hal/pin.tpp')

diff --git a/hal/pin.tpp b/hal/pin.tpp
index 4f6bd4a..c3c005f 100644
--- a/hal/pin.tpp
+++ b/hal/pin.tpp
@@ -7,24 +7,82 @@
 
 #include "pin.hpp"
 
-template<typename reg, unsigned bit>
-pin<reg, bit>::pin(reg *r)
+
+template<unsigned bit>
+template<typename latch_T, typename tris_T, typename port_T>
+pin<bit>::pin(latch_T *latch, tris_T *tris, port_T *port) :
+	_latch(reinterpret_cast<volatile uint8_t *>(latch)),
+	_tris(reinterpret_cast<volatile uint8_t *>(tris)),
+	_port(reinterpret_cast<volatile uint8_t *>(port))
 {
-	_register = r;
+	// default settings
+	set_mode(pin<bit>::mode::OUTPUT);
+	set(pin<bit>::state::OFF);
 }
 
 
-template<typename reg, unsigned bit>
-pin<reg, bit>::~pin()
+template<unsigned bit>
+pin<bit>::~pin()
 {
     
 }
 
-template<typename reg, unsigned bit>
-void pin<reg, bit>::set(bool v)
+
+template<unsigned bit>
+void pin<bit>::set_mode(unsigned m)
+{
+	if (m)
+		*_tris |= 1<<bit;
+	else
+		*_tris &= ~(1<<bit);
+}
+
+template<unsigned bit>
+void pin<bit>::set_mode(pin<bit>::mode m)
+{
+	set(static_cast<unsigned>(m));
+}
+
+template<unsigned bit>
+typename pin<bit>::state pin<bit>::read() const
+{
+	if (*_tris & (1<<bit))
+		return state::ON;
+	else
+		return state::OFF;
+}
+
+template<unsigned bit>
+void pin<bit>::set(unsigned s)
 {
-	if (v) 
-		*reinterpret_cast<volatile uint8_t *>(_register) |= 1<<bit;
+	if (s) 
+		*_latch |= 1<<bit;
 	else
-		*reinterpret_cast<volatile uint8_t *>(_register) &= ~(1<<bit);
+		*_latch &= ~(1<<bit);
+}
+
+template<unsigned bit>
+void pin<bit>::set(pin<bit>::state s)
+{
+	set(static_cast<unsigned>(s));
+}
+
+template<unsigned bit>
+void pin<bit>::toggle()
+{
+	*_latch ^= 1<<bit;
+}
+
+template<unsigned bit>
+bool pin<bit>::operator==(const pin<bit> &other) const
+{
+	return (_latch == other._latch 
+		&& _tris == other._tris 
+		&& _port == other._port);
+}
+
+template<unsigned bit>
+bool pin<bit>::operator!=(const pin<bit> &other) const
+{
+	return !(*this == other);
 }
\ No newline at end of file
-- 
cgit v1.2.1