/elec/propeller-clock : revision 38

To get this branch, use:

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

« back to all changes in this revision

Viewing changes to project/propeller-clock.sch

Committer: edam
Date: 2012-01-26 00:08:14 UTC
Revision ID: edam@waxworlds.org-20120126000814-tcoazbkb84e0s1wl

abstracted turning leds on/off to cope with PNP-inverted pin 4 and fixed warnings

files added:
src/util/Bounce.cpp

src/util/Bounce.h

files removed:
arduino.mk

src/analogue_clock_mode.cc

src/analogue_clock_mode.h

src/button.cc

src/button.h

src/config.h

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/test_mode.cc

src/test_mode.h

src/time.cc

src/time.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

test/fan-test/Makefile

test/phantom-button-presses

test/phantom-button-presses/Makefile

test/phantom-button-presses/main.ino

files modified:
electronics-information

notes

project/propeller-clock.sch

src/Makefile

src/propeller-clock.ino

test/led-test/Makefile

Show diffs side-by-side

added added

removed removed

project/propeller-clock.sch

EESchema Schematic File Version 2 date Wed 22 Feb 2012 21:59:27 GMT

EESchema Schematic File Version 2 date Wed 18 Jan 2012 23:22:28 GMT

LIBS:power

LIBS:device

LIBS:transistors

encoding utf-8

Sheet 1 1

Title ""

Date "22 feb 2012"

Date "18 jan 2012"

Rev ""

Comp ""

Comment1 ""

Comment3 ""

Comment4 ""

$EndDescr

Connection ~ 8000 2400

Connection ~ 8000 2900

Wire Wire Line

8850 1850 1750 1850

Wire Wire Line

1750 1850 1750 4900

Wire Wire Line

4400 1850 4400 4850

Wire Wire Line

1850 5400 5100 5400

Wire Wire Line

2150 4850 2150 4700

Wire Wire Line

2150 4700 1750 4700

Connection ~ 1750 4700

Wire Wire Line

1750 5100 1750 5550

Wire Wire Line

9550 5400 5250 5400

Connection ~ 8750 5550

Wire Wire Line

2400 4200 2700 4200

Wire Wire Line

2400 4000 2500 4000

Connection ~ 2500 2000

Wire Wire Line

2600 5550 2600 3900

Connection ~ 4300 2000

Wire Wire Line

4050 4450 4200 4450

Wire Wire Line

4200 4450 4200 3550

Wire Wire Line

4200 3550 2700 3550

Wire Wire Line

2700 3550 2700 4200

Connection ~ 4400 1850

Wire Wire Line

4400 4850 3550 4850

Wire Wire Line

4950 4350 5250 4350

Wire Wire Line

4950 4150 5400 4150

Wire Wire Line

4950 3950 5500 3950

Wire Wire Line

1800 2050 8400 2050

Connection ~ 2100 2050

Wire Wire Line

8900 1900 2950 1900

Wire Wire Line

4050 4250 4150 4250

Wire Wire Line

4150 4250 4150 3600

Wire Wire Line

4150 3600 2750 3600

Wire Wire Line

2750 3600 2750 4100

Wire Wire Line

2750 4100 1900 4100

Wire Wire Line

4300 2050 4300 4550

Wire Wire Line

4300 4550 3550 4550

Wire Wire Line

4950 4450 5100 4450

Wire Wire Line

4950 4250 5350 4250

Wire Wire Line

4950 4050 5450 4050

Wire Wire Line

4950 3850 5550 3850

Connection ~ 3700 5550

Wire Wire Line

3700 5550 3700 4750

Wire Wire Line

3700 4750 3550 4750

Wire Wire Line

3550 3950 4000 3950

Wire Wire Line

3550 3750 3900 3750

Connection ~ 2950 5550

Wire Wire Line

8900 5550 2200 5550

Wire Wire Line

2200 5550 2200 3900

Wire Wire Line

2200 3900 1900 3900

Wire Wire Line

5250 5400 5250 4350

Wire Wire Line

6900 5550 6900 2350

Wire Wire Line

5100 4450 5100 5000

Wire Wire Line

5100 5000 2800 5000

Wire Wire Line

2800 5100 2950 5100

100

Connection ~ 6900 5550

101

Wire Wire Line

102

8400 2050 8400 3400

103

Wire Wire Line

104

8400 3800 8400 5150

105

Wire Wire Line

106

5250 5400 8900 5400

107

Wire Wire Line

108

2800 4900 2950 4900

109

Wire Wire Line

110

5600 2700 4000 2700

111

Wire Wire Line

112

4000 2700 4000 3950

113

Wire Wire Line

114

5600 3400 3900 3400

115

Wire Wire Line

116

3900 3400 3900 3750

117

Wire Wire Line

118

5600 5150 5400 5150

119

Wire Wire Line

120

5400 5150 5400 4150

121

Wire Wire Line

122

5600 4450 5500 4450

123

Wire Wire Line

124

5500 4450 5500 3950

125

Connection ~ 8400 4450

126

Wire Wire Line

127

8400 4450 8200 4450

128

Wire Wire Line

129

7700 5150 7500 5150

130

Wire Wire Line

131

7700 4450 7500 4450

132

Wire Wire Line

133

6300 5150 6100 5150

134

Wire Wire Line

135

6300 4450 6100 4450

136

Wire Wire Line

137

6100 3750 6300 3750

138

Wire Wire Line

139

6100 3050 6300 3050

140

Wire Wire Line

141

6100 2350 6300 2350

142

Connection ~ 6900 4800

143

Wire Wire Line

144

6700 4800 7100 4800

145

Connection ~ 6900 4100

146

Wire Wire Line

147

6700 4100 7100 4100

148

Connection ~ 6900 3400

149

Wire Wire Line

150

6900 3400 6700 3400

151

Connection ~ 6900 2700

152

Wire Wire Line

153

6900 2700 6700 2700

154

Wire Wire Line

155

6900 2350 6700 2350

156

Wire Wire Line

157

6900 3050 6700 3050

158

Connection ~ 6900 3050

159

Wire Wire Line

160

6900 3750 6700 3750

161

Connection ~ 6900 3750

162

Connection ~ 6900 4450

163

Connection ~ 6900 5150

164

Wire Wire Line

165

7100 4450 6700 4450

166

Wire Wire Line

167

6300 2700 6100 2700

168

Wire Wire Line

169

6300 3400 6100 3400

170

Wire Wire Line

171

6300 4100 6100 4100

172

Wire Wire Line

173

6100 4800 6300 4800

174

Wire Wire Line

175

7700 4100 7500 4100

176

Wire Wire Line

177

7500 4800 7700 4800

178

Wire Wire Line

179

8400 5150 8200 5150

180

Wire Wire Line

181

8200 4800 8400 4800

182

Connection ~ 8400 4800

183

Wire Wire Line

184

8200 4100 8400 4100

185

Connection ~ 8400 4100

186

Wire Wire Line

187

5550 3850 5550 4100

188

Wire Wire Line

189

5550 4100 5600 4100

190

Wire Wire Line

191

5450 4050 5450 4800

192

Wire Wire Line

193

5450 4800 5600 4800

194

Wire Wire Line

195

3950 3050 3950 3850

196

Wire Wire Line

197

3950 3050 5600 3050

198

Wire Wire Line

199

4050 2350 4050 4050

200

Wire Wire Line

201

4050 2350 5600 2350

202

Wire Wire Line

203

7100 5150 6700 5150

204

Wire Wire Line

205

5350 4250 5350 2150

206

Wire Wire Line

207

5350 2150 8000 2150

208

Wire Wire Line

209

8000 2150 8000 3600

210

Wire Wire Line

211

8000 3600 8100 3600

212

Wire Wire Line

213

2950 4900 2950 1900

214

Wire Wire Line

215

2950 5100 2950 5550

216

Wire Wire Line

217

1900 4000 2100 4000

218

Wire Wire Line

219

4050 4050 3550 4050

220

Wire Wire Line

221

3950 3850 3550 3850

222

Wire Wire Line

223

4950 3750 5600 3750

224

Wire Wire Line

3550 3850 3950 3850

Wire Wire Line

3550 4050 4050 4050

Wire Wire Line

8100 3600 8000 3600

100

Wire Wire Line

101

8000 2400 8000 2150

102

Wire Wire Line

103

8000 3600 8000 2900

104

Wire Wire Line

105

8000 2150 5350 2150

106

Wire Wire Line

107

5350 2150 5350 4250

108

Wire Wire Line

109

6700 5150 7100 5150

110

Wire Wire Line

111

5600 2350 4050 2350

112

Wire Wire Line

113

4050 2350 4050 4050

114

Wire Wire Line

115

5600 3050 3950 3050

116

Wire Wire Line

117

3950 3050 3950 3850

118

Wire Wire Line

119

5600 4800 5450 4800

120

Wire Wire Line

121

5450 4800 5450 4050

122

Wire Wire Line

123

5600 4100 5550 4100

124

Wire Wire Line

125

5550 4100 5550 3850

126

Connection ~ 8400 4100

127

Wire Wire Line

128

8400 4100 8200 4100

129

Connection ~ 8400 4800

130

Wire Wire Line

131

8200 4800 8400 4800

132

Wire Wire Line

133

8200 5150 8400 5150

134

Wire Wire Line

135

7500 4800 7700 4800

136

Wire Wire Line

137

7700 4100 7500 4100

138

Wire Wire Line

139

6100 4800 6300 4800

140

Wire Wire Line

141

6300 4100 6100 4100

142

Wire Wire Line

143

6300 3400 6100 3400

144

Wire Wire Line

145

6300 2700 6100 2700

146

Wire Wire Line

147

6700 4450 7100 4450

148

Connection ~ 6900 5150

149

Connection ~ 6900 4450

150

Connection ~ 6900 3750

151

Wire Wire Line

152

6900 3750 6700 3750

153

Connection ~ 6900 3050

154

Wire Wire Line

155

6900 3050 6700 3050

156

Wire Wire Line

157

6700 2350 6900 2350

158

Wire Wire Line

159

6700 2700 6900 2700

160

Connection ~ 6900 2700

161

Wire Wire Line

162

6900 3400 6700 3400

163

Connection ~ 6900 3400

164

Wire Wire Line

165

7100 4100 6700 4100

166

Connection ~ 6900 4100

167

Wire Wire Line

168

7100 4800 6700 4800

169

Connection ~ 6900 4800

170

Wire Wire Line

171

6100 2350 6300 2350

172

Wire Wire Line

173

6100 3050 6300 3050

174

Wire Wire Line

175

6100 3750 6300 3750

176

Wire Wire Line

177

6300 4450 6100 4450

178

Wire Wire Line

179

6300 5150 6100 5150

180

Wire Wire Line

181

7700 4450 7500 4450

182

Wire Wire Line

183

7700 5150 7500 5150

184

Wire Wire Line

185

8400 4450 8200 4450

186

Connection ~ 8400 4450

187

Wire Wire Line

188

5500 3950 5500 4450

189

Wire Wire Line

190

5500 4450 5600 4450

191

Wire Wire Line

192

5400 4150 5400 5150

193

Wire Wire Line

194

5400 5150 5600 5150

195

Wire Wire Line

196

3900 3400 3900 3750

197

Wire Wire Line

198

3900 3400 5600 3400

199

Wire Wire Line

200

4000 2700 4000 3950

201

Wire Wire Line

202

4000 2700 5600 2700

203

Wire Wire Line

204

8400 5150 8400 3800

205

Wire Wire Line

206

8400 3350 8400 2000

207

Connection ~ 6900 5550

208

Wire Wire Line

209

6900 2350 6900 5550

210

Wire Wire Line

211

5250 4350 5250 5400

212

Wire Wire Line

213

3900 3750 3550 3750

214

Wire Wire Line

215

4000 3950 3550 3950

216

Wire Wire Line

217

3550 4750 3700 4750

218

Wire Wire Line

219

3700 4750 3700 5550

220

Connection ~ 3700 5550

221

Wire Wire Line

222

5550 3850 4950 3850

223

Wire Wire Line

224

5450 4050 4950 4050

225

Wire Wire Line

226

5350 4250 4950 4250

227

Wire Wire Line

228

4950 4450 5100 4450

229

Wire Wire Line

230

3550 4550 4300 4550

231

Wire Wire Line

232

2750 3600 2750 4100

233

Wire Wire Line

234

2750 3600 4150 3600

235

Wire Wire Line

236

4150 3600 4150 4250

237

Wire Wire Line

238

4150 4250 4050 4250

239

Wire Wire Line

240

2600 3900 2400 3900

241

Wire Wire Line

242

2750 4100 2400 4100

243

Wire Wire Line

244

1750 5100 1650 5100

245

Wire Wire Line

246

1750 4900 1650 4900

247

Connection ~ 8750 1850

248

Wire Wire Line

249

9550 1850 9350 1850

250

Connection ~ 2600 5550

251

Wire Wire Line

252

1650 5000 1850 5000

253

Wire Wire Line

254

1850 5000 1850 5400

255

Wire Wire Line

256

5100 4450 5100 5400

257

Wire Wire Line

258

2150 5550 2150 5250

259

Connection ~ 2150 5550

260

Wire Wire Line

261

1750 5550 9550 5550

262

Wire Wire Line

263

8750 1950 8750 1850

264

Wire Wire Line

265

8750 2350 8750 5550

266

Wire Wire Line

267

4300 4550 4300 2000

268

Wire Wire Line

269

2500 4000 2500 2000

270

Wire Wire Line

271

8400 2000 2000 2000

272

$Comp

273

L R R15

274

U 1 1 4F4564B8

275

P 8000 2650

276

F 0 "R15" V 8080 2650 50 0000 C CNN

277

F 1 "1kΩ" V 8000 2650 50 0000 C CNN

278

1 8000 2650

279

1 0 0 -1

280

$EndComp

281

$Comp

282

L R R14

283

U 1 1 4F29A7FD

284

P 9100 1850

285

F 0 "R14" V 9180 1850 50 0000 C CNN

286

F 1 "2Ω" V 9100 1850 50 0000 C CNN

287

1 9100 1850

288

0 1 1 0

289

$EndComp

290

$Comp

291

L DIODE D14

292

U 1 1 4F21DDBD

293

P 2150 5050

294

F 0 "D14" H 2150 5150 40 0000 C CNN

295

F 1 "DIODE" H 2150 4950 40 0000 C CNN

296

1 2150 5050

297

0 -1 -1 0

298

$EndComp

299

$Comp

300

L C C1

301

U 1 1 4F21DDAE

302

P 8750 2150

303

F 0 "C1" H 8800 2250 50 0000 L CNN

304

F 1 "1000μF" H 8800 2050 50 0000 L CNN

305

1 8750 2150

306

1 0 0 -1

307

$EndComp

308

Text Label 9650 5650 0 60 ~ 0

225

5500 3950 4950 3950

226

Wire Wire Line

227

5400 4150 4950 4150

228

Wire Wire Line

229

5250 4350 4950 4350

230

Wire Wire Line

231

3550 4850 4400 4850

232

Wire Wire Line

233

4400 4850 4400 1900

234

Connection ~ 4400 1900

235

Wire Wire Line

236

1900 4200 2700 4200

237

Wire Wire Line

238

2700 4200 2700 3550

239

Wire Wire Line

240

2700 3550 4200 3550

241

Wire Wire Line

242

4200 3550 4200 4450

243

Wire Wire Line

244

4200 4450 4050 4450

245

Wire Wire Line

246

2100 4000 2100 2050

247

Connection ~ 4300 2050

248

Text Label 8100 5700 0 60 ~ 0

309

249

GND

310

Text Label 8500 1800 0 60 ~ 0

250

Text Label 8500 1850 0 60 ~ 0

311

251

12V

312

Text Label 2100 2100 0 60 ~ 0

252

Text Label 1900 2000 0 60 ~ 0

313

253

314

254

$Comp

315

L CONN_2 P2

255

L CONN_2 P?

316

256

U 1 1 4F171D25

317

257

P 3700 4350

318

F 0 "P2" V 3650 4350 40 0000 C CNN

319

F 1 "A4 & A5" V 3750 4350 40 0000 C CNN

258

F 0 "P?" V 3650 4350 40 0000 C CNN

259

F 1 "CONN_2" V 3750 4350 40 0000 C CNN

320

260

1 3700 4350

321

261

-1 0 0 1

322

262

$EndComp

323

Text Label 3350 5050 0 60 ~ 0

263

Text Label 3350 5150 0 60 ~ 0

324

264

Arduino serial port end

325

265

$Comp

326

L CONN_7 P1

266

L CONN_7 P?

327

267

U 1 1 4F171901

328

P 2050 4100

329

F 0 "P1" V 2020 4100 60 0000 C CNN

330

F 1 "DS1307 RTC" V 2120 4100 60 0000 C CNN

331

1 2050 4100

268

P 1550 4100

269

F 0 "P?" V 1520 4100 60 0000 C CNN

270

F 1 "CONN_7" V 1620 4100 60 0000 C CNN

271

1 1550 4100

332

272

-1 0 0 1

333

273

$EndComp

334

274

$Comp

343

283

$Comp

344

284

L CONN_1 BTN1

345

285

U 1 1 4ED8EB0A

346

P 9700 5400

347

F 0 "BTN1" H 9780 5400 40 0000 L CNN

348

F 1 "CONN_1" H 9700 5455 30 0001 C CNN

349

1 9700 5400

286

P 9050 5400

287

F 0 "BTN1" H 9130 5400 40 0000 L CNN

288

F 1 "CONN_1" H 9050 5455 30 0001 C CNN

289

1 9050 5400

350

290

1 0 0 -1

351

291

$EndComp

352

292

$Comp

353

293

L CONN_3 C3

354

294

U 1 1 4ED8E986

355

P 1300 5000

356

F 0 "C3" V 1250 5000 50 0000 C CNN

357

F 1 "FAN" V 1350 5000 40 0000 C CNN

358

1 1300 5000

295

P 2450 5000

296

F 0 "C3" V 2400 5000 50 0000 C CNN

297

F 1 "FAN" V 2500 5000 40 0000 C CNN

298

1 2450 5000

359

299

-1 0 0 1

360

300

$EndComp

361

301

$Comp

362

302

L GND #PWR2

363

303

U 1 1 4ED8E8D1

364

P 9550 5550

365

F 0 "#PWR2" H 9550 5550 30 0001 C CNN

366

F 1 "GND" H 9550 5480 30 0001 C CNN

367

1 9550 5550

304

P 8900 5550

305

F 0 "#PWR2" H 8900 5550 30 0001 C CNN

306

F 1 "GND" H 8900 5480 30 0001 C CNN

307

1 8900 5550

368

308

1 0 0 -1

369

309

$EndComp

370

310

$Comp

371

311

L +12V #PWR1

372

312

U 1 1 4ED8E83F

373

P 9550 1850

374

F 0 "#PWR1" H 9550 1800 20 0001 C CNN

375

F 1 "+12V" H 9550 1950 30 0000 C CNN

376

1 9550 1850

313

P 8900 1900

314

F 0 "#PWR1" H 8900 1850 20 0001 C CNN

315

F 1 "+12V" H 8900 2000 30 0000 C CNN

316

1 8900 1900

377

317

0 1 1 0

378

318

$EndComp

379

319

$Comp

Older »