/elec/propeller-clock : contents of src/time.h at revision 60

: (revision 60)

To get this branch, use:

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

/*
 * time.h
 *
 * Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
 *
 * This file is part of propeller-clock (hereafter referred to as "this
 * program"). See http://ed.am/dev/software/arduino/propeller-clock for more
 * information.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published
 * by the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
#ifndef _TIME_H_
#define _TIME_H_


class Time
{
public:

	/**
	 * Get singleton instance.
	 *
	 * @return instance
	 */
	static Time &get_instance();

	/**
	 * Get hours.
	 *
	 * @return hours, 0 to 23
	 */
	int get_hours();

	/**
	 * Get minutes.
	 *
	 * @return minutes, 0 to 59
	 */
	int get_minutes();

	/**
	 * Get seconds.
	 *
	 * @return seconds, 0 to 59
	 */
	int get_seconds();

	/**
	 * Update the time.
	 */
	void update();

protected:

	Time();

	/** hours */
	int _hours;

	/** minutes */
	int _minutes;

	/** seconds */
	int _seconds;

private:

	/** milliseconds at last update */
	unsigned long _last_millis;

	/** milliseconds carries over from last update */
	unsigned long _carry;

};


#endif _TIME_H_

58 by edam removed Bounce library and updated/fixed new code	1	/*
	2	* time.h
	3	*
	4	* Copyright (C) 2011 Tim Marston <tim@ed.am> and Dan Marston.
	5	*
	6	* This file is part of propeller-clock (hereafter referred to as "this
	7	* program"). See http://ed.am/dev/software/arduino/propeller-clock for more
	8	* information.
	9	*
	10	* This program is free software: you can redistribute it and/or modify
	11	* it under the terms of the GNU Lesser General Public License as published
	12	* by the Free Software Foundation, either version 3 of the License, or
	13	* (at your option) any later version.
	14	*
	15	* This program is distributed in the hope that it will be useful,
	16	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	17	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	18	* GNU Lesser General Public License for more details.
	19	*
	20	* You should have received a copy of the GNU Lesser General Public License
	21	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	22	*/
	23	#ifndef _TIME_H_
	24	#define _TIME_H_
	25
	26
56 by edam updated software to include drawing abstraction infrastructure	27	class Time
	28	{
	29	public:
	30
	31	/**
	32	* Get singleton instance.
	33	*
	34	* @return instance
	35	*/
	36	static Time &get_instance();
	37
	38	/**
	39	* Get hours.
	40	*
	41	* @return hours, 0 to 23
	42	*/
	43	int get_hours();
	44
	45	/**
	46	* Get minutes.
	47	*
	48	* @return minutes, 0 to 59
	49	*/
	50	int get_minutes();
	51
	52	/**
	53	* Get seconds.
	54	*
	55	* @return seconds, 0 to 59
	56	*/
	57	int get_seconds();
	58
	59	/**
	60	* Update the time.
	61	*/
	62	void update();
	63
	64	protected:
	65
	66	Time();
	67
	68	/** hours */
	69	int _hours;
	70
	71	/** minutes */
	72	int _minutes;
	73
	74	/** seconds */
	75	int _seconds;
	76
	77	private:
	78
	79	/** milliseconds at last update */
	80	unsigned long _last_millis;
	81
	82	/** milliseconds carries over from last update */
	83	unsigned long _carry;
	84
	85	};
58 by edam removed Bounce library and updated/fixed new code	86
	87
	88	#endif _TIME_H_