Revision 2:e6fc24fbd86c, committed 2017-10-31

Comitter:

Faberge

Date:

Tue Oct 31 14:46:28 2017 +0000

Parent:

1:a6d179a9ffbb

Commit message:

Update

Changed in this revision

diff -r a6d179a9ffbb -r e6fc24fbd86c Widgets/Widget.cpp
--- a/Widgets/Widget.cpp	Tue Oct 31 14:39:54 2017 +0000
+++ b/Widgets/Widget.cpp	Tue Oct 31 14:46:28 2017 +0000
@@ -19,7 +19,6 @@
 
 Display Widget :: LCD;
 TouchScreen Widget :: TS;
-WidgetTimer Widget :: timer;
 
 bool Widget :: isTouched()
 {

diff -r a6d179a9ffbb -r e6fc24fbd86c Widgets/Widget.h
--- a/Widgets/Widget.h	Tue Oct 31 14:39:54 2017 +0000
+++ b/Widgets/Widget.h	Tue Oct 31 14:46:28 2017 +0000
@@ -20,7 +20,6 @@
 
 #include "LCD_F469.h"
 #include "TS_F469.h"
-#include "WidgetTimer.h"
 
 class Widget
 {    
@@ -43,7 +42,6 @@
         
         static Display LCD;
         static TouchScreen TS;
-        static WidgetTimer timer;
         
     public:
         virtual ~Widget() = 0;

diff -r a6d179a9ffbb -r e6fc24fbd86c Widgets/WidgetTimer.cpp
--- a/Widgets/WidgetTimer.cpp	Tue Oct 31 14:39:54 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/*
- * Timer.cpp
- * 
- * Copyright 2017 Faberge@TsarTeam
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- * 
- */
- 
-#include "WidgetTimer.h"
-
- 
\ No newline at end of file

diff -r a6d179a9ffbb -r e6fc24fbd86c Widgets/WidgetTimer.h
--- a/Widgets/WidgetTimer.h	Tue Oct 31 14:39:54 2017 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
- * Timer.h
- * 
- * Copyright 2017 Faberge@TsarTeam
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 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 General Public License for more details.
- * 
- */
- 
-#ifndef WIDTIMER_H
-#define WIDTIMER_H
- 
-#include "stm32f4xx_hal.h"
-
-class WidgetTimer
-{
-    public:
-        uint32_t getTicks() {return HAL_GetTick();}
-    
-    private:
-        uint16_t value;
-        
-};
-
-#endif

diff -r a6d179a9ffbb -r e6fc24fbd86c main.cpp
--- a/main.cpp	Tue Oct 31 14:39:54 2017 +0000
+++ b/main.cpp	Tue Oct 31 14:46:28 2017 +0000
@@ -24,6 +24,7 @@
     
     /* Dummy screen */
     Screen scr(LCD_COLOR_BLACK);
+    /* Program state */
     int state = NEW_TEXT_SCREEN;
     
     while(1)