Revision 23:698bf2100743, committed 2016-09-22

Comitter:

inkiiin

Date:

Thu Sep 22 17:50:06 2016 +0000

Parent:

22:fa0181712d9c

Commit message:

modifyed version of F746_GUI library for use with F469i-DISCO

Changed in this revision

diff -r fa0181712d9c -r 698bf2100743 F469_GUI.hpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/F469_GUI.hpp	Thu Sep 22 17:50:06 2016 +0000
@@ -0,0 +1,22 @@
+//--------------------------------------------------------------
+//  F746-DISCO の GUI 用のインクルード文とそれらを使うための
+//  using 宣言をまとめたもの
+//  Include statements for F746-DISCO GUI and using directive
+//
+//  2016/08/15, Copyright (c) 2016 MIKAMI, Naoki
+//  2016/09/21, modifyed for use whith F469I-DISCO Axel Karch
+//
+//--------------------------------------------------------------
+
+#include "mbed.h"
+#ifndef __STM32F469xx_H
+#error Platform is not F469I-DISCOVERY
+#endif
+
+#include "BlinkLabel.hpp"
+#include "ButtonGroup.hpp"
+#include "NumericLabel.hpp"
+#include "ResetButton.hpp"
+#include "SeekbarGroup.hpp"
+
+using namespace Mikami;

diff -r fa0181712d9c -r 698bf2100743 F746_GUI.hpp
--- a/F746_GUI.hpp	Wed Aug 17 06:17:30 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-//--------------------------------------------------------------
-//  F746-DISCO の GUI 用のインクルード文とそれらを使うための
-//  using 宣言をまとめたもの
-//  Include statements for F746-DISCO GUI and using directive
-//
-//  2016/08/15, Copyright (c) 2016 MIKAMI, Naoki
-//--------------------------------------------------------------
-
-#include "mbed.h"
-#ifndef __STM32F746xx_H
-#error Platform is not F746NG-DISCOVERY
-#endif
-
-#include "BlinkLabel.hpp"
-#include "ButtonGroup.hpp"
-#include "NumericLabel.hpp"
-#include "ResetButton.hpp"
-#include "SeekbarGroup.hpp"
-
-using namespace Mikami;

diff -r fa0181712d9c -r 698bf2100743 GuiBase.cpp
--- a/GuiBase.cpp	Wed Aug 17 06:17:30 2016 +0000
+++ b/GuiBase.cpp	Thu Sep 22 17:50:06 2016 +0000
@@ -34,8 +34,8 @@
         return (bool)(state_.touchDetected);
     }
 
-    LCD_DISCO_F746NG GuiBase::lcd_;
-    TS_DISCO_F746NG GuiBase::ts_;
+    LCD_DISCO_F469NI GuiBase::lcd_;
+    TS_DISCO_F469NI GuiBase::ts_;
 
     TS_StateTypeDef GuiBase::state_;
 

diff -r fa0181712d9c -r 698bf2100743 GuiBase.hpp
--- a/GuiBase.hpp	Wed Aug 17 06:17:30 2016 +0000
+++ b/GuiBase.hpp	Thu Sep 22 17:50:06 2016 +0000
@@ -9,16 +9,16 @@
 
 #include "mbed.h"
 #include <string>
-#include "TS_DISCO_F746NG.h"
-#include "LCD_DISCO_F746NG.h"
+#include "TS_DISCO_F469NI.h"
+#include "LCD_DISCO_F469NI.h"
 
 namespace Mikami
 {
     class GuiBase
     {
     public:                    
-        static LCD_DISCO_F746NG* GetLcdPtr() { return &lcd_; }
-        static TS_DISCO_F746NG* GetTsPtr() { return &ts_; }
+        static LCD_DISCO_F469NI* GetLcdPtr() { return &lcd_; }
+        static TS_DISCO_F469NI* GetTsPtr() { return &ts_; }
 
         // If panel touched, return true
         static bool PanelTouched();
@@ -30,8 +30,8 @@
                ENUM_INACTIVE = 0xD0003538, ENUM_INACTIVE_TEXT = 0xFF808080};
 
     protected:
-        static LCD_DISCO_F746NG lcd_;  // for LCD display
-        static TS_DISCO_F746NG ts_;    // for touch pannel
+        static LCD_DISCO_F469NI lcd_;  // for LCD display
+        static TS_DISCO_F469NI ts_;    // for touch pannel
 
         static TS_StateTypeDef state_;
         static bool multiTouch_;