/elec/propeller-clock : revision 86

To get this branch, use:

bzr branch
http://bzr.ed.am/elec/propeller-clock

« back to all changes in this revision

Viewing changes to src/utility/serstream

Committer: Tim Marston
Date: 2012-05-17 22:49:36 UTC
Revision ID: tim@ed.am-20120517224936-0wgyem932dlq5bs4

various tweaks, a (failed) attempt to fix text reset bug and added TODO

files added:
src/TODO

src/common.cc

src/common.h

src/modes

src/modes/digital_clock.cc

src/modes/digital_clock.h

src/modes/info_mode.cc

src/modes/info_mode.h

src/modes/settings_mode.cc

src/modes/settings_mode.h

src/nvram.h

src/text.cc

src/text.h

src/text_renderer.cc

src/text_renderer.h

src/util/PString.cpp

src/util/PString.h

test/rtc-test

test/rtc-test/Makefile

test/rtc-test/rtc-ds1307.ino

test/rtc-test/util

test/rtc-test/util/DS1307.cpp

test/rtc-test/util/DS1307.h

files removed:
src/drawer.cc

src/drawer.h

src/major_mode.h

src/minor_mode.cc

src/minor_mode.h

src/mode_switcher.cc

src/mode_switcher.h

src/utility

src/utility/Jamfile

src/utility/Makefile

src/utility/README.md

src/utility/StandardCplusplus.h

src/utility/algorithm

src/utility/algorithm.cpp

src/utility/associative_base

src/utility/associative_base.cpp

src/utility/basic_definitions

src/utility/bitset

src/utility/bitset.cpp

src/utility/cassert

src/utility/cctype

src/utility/cerrno

src/utility/cfloat

src/utility/char_traits

src/utility/char_traits.cpp

src/utility/climits

src/utility/clocale

src/utility/cmath

src/utility/complex

src/utility/complex.cpp

src/utility/csetjmp

src/utility/csignal

src/utility/cstdarg

src/utility/cstddef

src/utility/cstdio

src/utility/cstdlib

src/utility/cstring

src/utility/ctime

src/utility/cwchar

src/utility/cwctype

src/utility/del_op.cpp

src/utility/del_opnt.cpp

src/utility/del_opv.cpp

src/utility/del_opvnt.cpp

src/utility/deque

src/utility/deque.cpp

src/utility/eh_alloc.cpp

src/utility/eh_globals.cpp

src/utility/exception

src/utility/exception.cpp

src/utility/fstream

src/utility/fstream.cpp

src/utility/func_exception

src/utility/func_exception.cpp

src/utility/functional

src/utility/iomanip

src/utility/iomanip.cpp

src/utility/ios

src/utility/ios.cpp

src/utility/iosfwd

src/utility/iostream

src/utility/iostream.cpp

src/utility/istream

src/utility/istream.cpp

src/utility/istream_helpers

src/utility/iterator

src/utility/iterator.cpp

src/utility/iterator_base

src/utility/limits

src/utility/limits.cpp

src/utility/list

src/utility/list.cpp

src/utility/locale

src/utility/locale.cpp

src/utility/map

src/utility/map.cpp

src/utility/memory

src/utility/new

src/utility/new_handler.cpp

src/utility/new_op.cpp

src/utility/new_opnt.cpp

src/utility/new_opv.cpp

src/utility/new_opvnt.cpp

src/utility/numeric

src/utility/numeric.cpp

src/utility/ostream

src/utility/ostream.cpp

src/utility/ostream_helpers

src/utility/queue

src/utility/queue.cpp

src/utility/serstream

src/utility/set

src/utility/set.cpp

src/utility/sstream

src/utility/sstream.cpp

src/utility/stack

src/utility/stack.cpp

src/utility/stdexcept

src/utility/stdexcept.cpp

src/utility/streambuf

src/utility/streambuf.cpp

src/utility/string

src/utility/string.cpp

src/utility/string_iostream

src/utility/support

src/utility/support.cpp

src/utility/system_configuration.h

src/utility/type_traits

src/utility/typeinfo

src/utility/typeinfo.cpp

src/utility/uartbuf

src/utility/unwind-cxx.h

src/utility/utility.cpp

src/utility/utility.h

src/utility/valarray

src/utility/valarray.cpp

src/utility/vector

src/utility/vector.cpp

files renamed:
src/analogue_clock_mode.cc => src/modes/analogue_clock.cc

src/analogue_clock_mode.h => src/modes/analogue_clock.h

src/test_mode.cc => src/modes/test_pattern.cc

src/test_mode.h => src/modes/test_pattern.h

src/propeller-clock.ino => src/propeller-clock.cc

files modified:
.bzrignore

arduino.mk

electronics-information

notes

project/propeller-clock.sch

src/Makefile

src/button.cc

src/button.h

src/config.h

src/time.cc

src/time.h

Show diffs side-by-side

added added

removed removed

src/utility/serstream

* serstream

* Implementation of input/output streams for the Arduino serial classes

* Created on: 2 Jan 2011

* Author: Andy Brown

* http://andybrown.me.uk/ws/terms-and-conditions

#ifndef __810370EC_AD69_4ef7_91F5_B1AA16F14712

#define __810370EC_AD69_4ef7_91F5_B1AA16F14712

#include <basic_definitions>

//#include <stl_config.h>

#include <iosfwd>

#include <ios>

#include <istream>

#include <ostream>

#include <iostream>

#include <HardwareSerial.h>

namespace std

{

* basic_serialbuf implements an unbuffered basic_streambuf as a backing buffer

* for the IO classes

template <class charT, class traits, class Tserial>

class basic_serialbuf : public basic_streambuf<charT,traits>

{

public:

* Types used here

typedef charT char_type;

typedef typename traits::int_type int_type;

* constructor - wraps an existing Tserial class instance

explicit basic_serialbuf(Tserial& serial_,ios_base::openmode which_ = ios_base::in | ios_base::out)

: _serial(serial_)

{

basic_streambuf<charT,traits>::openedFor = which_;

}

* Required to maintain the chain

virtual ~basic_serialbuf() { }

* Get a reference to the wrapped object

Tserial& serial() { return _serial; }

protected:

* Get how many bytes available

virtual int showmanyc(){

return _serial.available();

}

* Read up to n chars

virtual streamsize xsgetn(char_type* c, streamsize n) {

streamsize i = 0;

char_type data;

while((data=_serial.read())!=-1 && i < n ) {

c[i] = data;

++i;

}

return i;

}

* Write up to n chars

virtual streamsize xsputn(const char_type* s, streamsize n){

//_serial.print("[PUT ");

//_serial.print(n);

100

//_serial.print("] ");

101

for(streamsize i=0;i<n;i++)

102

{

103

char_type c = s[i];

104

if ( c == '\n' )

105

_serial.print('\r');

106

_serial.print(c);

107

}

108

109

return n;

110

}

111

112

113

* write a single char

114

115

116

virtual int_type overflow (int_type c = traits::eof()) {

117

if(!traits::eq_int_type(c,traits::eof()))

118

{

119

//_serial.print("[OF]");

120

if ( (char_type)c == '\n' )

121

_serial.print('\r');

122

_serial.print((char_type)c);

123

b'\t\t\t}'

124

return traits::not_eof(c);

125

}

126

127

128

129

* peek at a char where possible

130

131

132

virtual int_type underflow(){

133

if(_serial.available())

134

return _serial.peek();

135

else

136

return traits::eof();

137

}

138

139

140

* Read a char where possible

141

142

143

virtual int_type uflow(){

144

if(_serial.available())

145

return _serial.read();

146

else

147

return traits::eof();

148

}

149

150

151

* Our wrapped arduino class

152

153

154

Tserial& _serial;

155

};

156

157

158

159

* Input stream

160

161

162

template <class charT, class traits, class Tserial> class basic_iserialstream

163

: public basic_istream<charT,traits>

164

{

165

public:

166

167

168

* Types used here

169

170

171

typedef charT char_type;

172

173

174

* Constructor - default the serial object to #1

175

* Mega users can explicity initialise with one of

176

* the others

177

178

179

explicit basic_iserialstream(Tserial& serial_)

180

: basic_ios<charT, traits>(&sb), basic_istream<charT,traits>(&sb), sb(serial_,ios_base::in)

181

{

182

}

183

184

185

* Required to maintain the chain

186

187

188

virtual ~basic_iserialstream() { }

189

190

191

* Initialise the baud rate

192

193

194

void begin(long speed_) {

195

sb.serial().begin(speed_);

196

sb.serial().println(__FUNCTION__);

197

}

198

199

200

* The wrapped object

201

202

203

private:

204

basic_serialbuf<charT,traits,Tserial> sb;

205

};

206

207

208

209

* Output stream

210

211

212

template <class charT, class traits, class Tserial> class basic_oserialstream

213

: public basic_ostream<charT,traits>

214

{

215

public:

216

217

218

* Types used here

219

220

221

typedef charT char_type;

222

223

224

* Constructor - default the serial object to #1

225

* Mega users can explicity initialise with one of

226

* the others

227

228

229

explicit basic_oserialstream(Tserial& serial_)

230

: basic_ios<charT, traits>(&sb), basic_ostream<charT,traits>(&sb), sb(serial_,ios_base::out)

231

{

232

}

233

234

235

* Required to maintain the chain

236

237

238

virtual ~basic_oserialstream() { }

239

240

241

* Initialise the baud rate

242

243

244

void begin(long speed_) {

245

sb.serial().begin(speed_);

246

}

247

248

249

* The wrapped object

250

251

252

private:

253

basic_serialbuf<charT,traits,Tserial> sb;

254

};

255

256

257

258

* Input/output stream

259

260

261

template <class charT, class traits, class Tserial> class basic_ioserialstream

262

: public basic_iostream<charT,traits>

263

{

264

public:

265

266

267

* Types used here

268

269

270

typedef charT char_type;

271

272

273

* Constructor - default the serial object to #1

274

* Mega users can explicity initialise with one of

275

* the others

276

277

278

explicit basic_ioserialstream(Tserial& serial_)

279

: basic_ios<charT, traits>(&sb), basic_iostream<charT,traits>(&sb), sb(serial_,ios_base::in | ios_base::out)

280

{

281

}

282

283

284

* Required to maintain the chain

285

286

287

virtual ~basic_ioserialstream(){ }

288

289

290

* Initialise the baud rate

291

292

293

void begin(long speed_) {

294

sb.serial().begin(speed_);

295

}

296

297

298

* The wrapped object

299

300

301

private:

302

basic_serialbuf<charT, traits, Tserial> sb;

303

};

304

305

306

307

}

308

309

#endif

Older »