I messed up the merge, so pushing it over to another repo so I don't lose it. Will tidy up and remove later

Dependencies:   BufferedSerial FatFileSystemCpp mbed

Committer:
JamieB
Date:
Thu Dec 15 06:05:30 2022 +0000
Revision:
85:0cc5931bb9ef
Parent:
9:7214e3c3e5f8
Child:
84:8094a1e64ecf
Push to somewhere else due to merge issue

Who changed what in which revision?

UserRevisionLine numberNew contents of line
AndyA 9:7214e3c3e5f8 1 #ifndef __frameclock_h__
AndyA 9:7214e3c3e5f8 2 #define __frameclock_h__
AndyA 9:7214e3c3e5f8 3
AndyA 9:7214e3c3e5f8 4 #include "LTCApp.h"
AndyA 9:7214e3c3e5f8 5
AndyA 9:7214e3c3e5f8 6 class frameclock
AndyA 9:7214e3c3e5f8 7 {
AndyA 9:7214e3c3e5f8 8 public:
AndyA 9:7214e3c3e5f8 9 frameclock();
AndyA 9:7214e3c3e5f8 10 frameclock(int hour, int minute, int second, int frame, int rate, bool drop);
AndyA 9:7214e3c3e5f8 11
AndyA 9:7214e3c3e5f8 12 void setMode(int rate, bool drop);
AndyA 9:7214e3c3e5f8 13 void setTime(int hour, int minute, int second, int frame);
AndyA 9:7214e3c3e5f8 14
AndyA 9:7214e3c3e5f8 15 inline void getTime(int *hour, int *minute, int *second, int *frame)
AndyA 9:7214e3c3e5f8 16 {
AndyA 9:7214e3c3e5f8 17 *hour = _hour;
AndyA 9:7214e3c3e5f8 18 *minute = _minute;
AndyA 9:7214e3c3e5f8 19 *second = _second;
AndyA 9:7214e3c3e5f8 20 *frame = _frame;
AndyA 9:7214e3c3e5f8 21 }
AndyA 9:7214e3c3e5f8 22
AndyA 9:7214e3c3e5f8 23 uint32_t getTimeMS() {
AndyA 9:7214e3c3e5f8 24 return (_hour*3600+_minute*60+_second)*1000 + (1000*_frame)/_rate;
AndyA 9:7214e3c3e5f8 25 }
AndyA 9:7214e3c3e5f8 26
AndyA 9:7214e3c3e5f8 27 void nextFrame();
AndyA 9:7214e3c3e5f8 28 inline int hours(){return _hour;}
AndyA 9:7214e3c3e5f8 29 inline int minutes(){return _minute;}
AndyA 9:7214e3c3e5f8 30 inline int seconds(){return _second;}
AndyA 9:7214e3c3e5f8 31 inline int frame() {return _frame;}
AndyA 9:7214e3c3e5f8 32
AndyA 9:7214e3c3e5f8 33 private:
AndyA 9:7214e3c3e5f8 34
AndyA 9:7214e3c3e5f8 35 int _hour;
AndyA 9:7214e3c3e5f8 36 int _minute;
AndyA 9:7214e3c3e5f8 37 int _second;
AndyA 9:7214e3c3e5f8 38 int _frame;
AndyA 9:7214e3c3e5f8 39 int _rate;
AndyA 9:7214e3c3e5f8 40 bool _drop;
AndyA 9:7214e3c3e5f8 41
AndyA 9:7214e3c3e5f8 42
AndyA 9:7214e3c3e5f8 43 };
AndyA 9:7214e3c3e5f8 44
AndyA 9:7214e3c3e5f8 45
AndyA 9:7214e3c3e5f8 46
AndyA 9:7214e3c3e5f8 47 #endif