Brian Kechel / Mbed 2 deprecated eliminator

Dependencies:   mbed

Files at this revision

API Documentation at this revision

Comitter:
kechbs
Date:
Thu May 09 17:09:02 2019 +0000
Parent:
0:1d2b7ae1269a
Commit message:
test

Changed in this revision

charmap.h Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file
main.h Show annotated file Show diff for this revision Revisions of this file
--- a/charmap.h	Tue May 07 13:44:48 2019 +0000
+++ b/charmap.h	Thu May 09 17:09:02 2019 +0000
@@ -1,41 +1,42 @@
 
-const uint32_t  SegTable[15][3] = {
-        {0b00000000,0b00000000,0b00000000},     // all off
-        {0b00000000,0b00000011,0b00111111},     // 0
-        {0b00000000,0b00000000,0b00001100},     // 1
-        {0b00000000,0b00001101,0b00110111},     // 2
-        {0b00000000,0b00001100,0b00111111},     // 3
-        {0b00000000,0b00001110,0b00001100},     // 4
-        {0b00000000,0b00001110,0b00111011},     // 5
-        {0b00000000,0b00001111,0b00111011},     // 6
-        {0b00000000,0b00000000,0b00001111},     // 7
-        {0b00000000,0b00001111,0b00111111},     // 8
-        {0b00000000,0b00001110,0b00111111},     // 9  
-        {0b00000000,0b00001111,0b00001111},     // A
-        {0b00000000,0b00001111,0b00111111},     // B 
-        {0b00000000,0b00000011,0b00110011},     // C
-        {0b00000000,0b00000011,0b00111111},     // D
-        {0b00000000,0b00001111,0b00110011},     // E
-        {0b00000000,0b00001111,0b00000011},     // F
-        {0b00000000,0b00001011,0b00111011},     // G
-        {0b00000000,0b00001111,0b00001100},     // H
-        {0b00000000,0b00000000,0b00000000},     // I*
-        {0b00000000,0b00000000,0b00111100},     // J
-        {0b00000000,0b00000000,0b00000000},     // K*
-        {0b00000000,0b00000011,0b00110000},     // L
-        {0b00000000,0b00000000,0b00000000},     // M*
-        {0b00000000,0b00000000,0b00000000},     // N*
-        {0b00000000,0b00000011,0b00111111},     // O
-        {0b00000000,0b00001111,0b00000111},     // P
-        {0b00000000,0b00000000,0b00000000},     // Q*
-        {0b00000000,0b00000000,0b00000000},     // R*
-        {0b00000000,0b00001110,0b00111011},     // S
-        {0b00000000,0b00000000,0b00000000},     // T
-        {0b00000000,0b00000011,0b00111100},     // U
-        {0b00000000,0b00000000,0b00000000},     // V*
-        {0b00000000,0b00000000,0b00000000},     // W*
-        {0b00000000,0b00000000,0b00000000},     // X*
-        {0b00000000,0b00000000,0b00000000},     // Y*
-        {0b00000000,0b00000000,0b00000000}      // Z*
+const uint32_t  SegTable[40][3] = {
+        {0b00000000,0b00000000,0b00000000},     // all off  0
+        {0b00000000,0b00000011,0b00111111},     // 0        1
+        {0b00000000,0b00000000,0b00001100},     // 1        2
+        {0b00000000,0b00001101,0b00110111},     // 2        3
+        {0b00000000,0b00001100,0b00111111},     // 3        4
+        {0b00000000,0b00001110,0b00001100},     // 4        5
+        {0b00000000,0b00001110,0b00111011},     // 5        6
+        {0b00000000,0b00001111,0b00111011},     // 6        7
+        {0b00000000,0b00000000,0b00001111},     // 7        8
+        {0b00000000,0b00001111,0b00111111},     // 8        9
+        {0b00000000,0b00001110,0b00111111},     // 9        10
+        {0b00000000,0b00001111,0b00001111},     // A        11
+        
+        {0b00000000,0b00001111,0b00111111},     // B        12
+        {0b00000000,0b00000011,0b00110011},     // C        13
+        {0b00000000,0b00000011,0b00111111},     // D        14
+        {0b00000000,0b00001111,0b00110011},     // E        15
+        {0b00000000,0b00001111,0b00000011},     // F        16
+        {0b00000000,0b00001011,0b00111011},     // G        17
+        {0b00000000,0b00001111,0b00001100},     // H        18
+        {0b00000000,0b00000000,0b00000000},     // I*       19
+        {0b00000000,0b00000000,0b00111100},     // J        20
+        {0b00000000,0b00000000,0b00000000},     // K*       21
+        {0b00000000,0b00000011,0b00110000},     // L        22
+        {0b00000000,0b00000000,0b00000000},     // M*       23
+        {0b00000000,0b00000000,0b00000000},     // N*       24
+        {0b00000000,0b00000011,0b00111111},     // O        25
+        {0b00000000,0b00001111,0b00000111},     // P        26
+        {0b00000000,0b00000000,0b00000000},     // Q*       27
+        {0b00000000,0b00000000,0b00000000},     // R*       28
+        {0b00000000,0b00001110,0b00111011},     // S        29
+        {0b00000000,0b00000000,0b00000000},     // T        30
+        {0b00000000,0b00000011,0b00111100},     // U        31
+        {0b00000000,0b00000000,0b00000000},     // V*       32
+        {0b00000000,0b00000000,0b00000000},     // W*       33
+        {0b00000000,0b00000000,0b00000000},     // X*       34
+        {0b00000000,0b00000000,0b00000000},     // Y*       35
+        {0b00000000,0b00000000,0b00000000}      // Z*       36
        
 };
\ No newline at end of file
--- a/main.cpp	Tue May 07 13:44:48 2019 +0000
+++ b/main.cpp	Thu May 09 17:09:02 2019 +0000
@@ -1,12 +1,12 @@
 #include "main.h"
-#include "mbed.h"
+#include <mbed.h>
 #include "charmap.h"
+#include "stm32f70rb.h"
 
+#define USE_PLL_HSE_XTAL (1) /* Use external xtal */
 
 #define DIGIT_CONTROLLER_ID 0xA8
-//#define SLEEP_INTERVAL 0.5f
 #define SLEEP_INTERVAL 0.003f
-//#define SLEEP_INTERVAL 0
 
 #define D_ON 0x3F
 #define DISPLAYTIMEOUT 5
@@ -21,16 +21,18 @@
 //SPI spi(PA_7, PA_6, PA_5); // mosi, miso, sclk
 SPISlave device(PA_7, PA_6, PA_5, PA_15);
 //DigitalOut cs(PA_15);  //should be cs but seems to be CE_E maybe mislabel
-int spiDATA[3];
+int spiDATA[4];
+
+
 
 int main()
-{
-    digit_driver.frequency(400000);
+{ 
+    //RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+    //RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+    //RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+    //RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
     
-    //cs = 1;
-    //spi.frequency(976000);
-    //spi.format(8,0);
-    //cs = 0;
+    digit_driver.frequency(400000);
     
     char shutdown_reg[2];
     shutdown_reg[0] = 0x00;    
@@ -83,19 +85,17 @@
     
     int blinkRate = 50;
     
-   
-    
-        for (int j = 7; j >= 0; j--) {
-            
-            
-            for (int i = 9; i >= 0; i--) {
-                for (int x = 0; x <= 250; x++){
-                    segValDisplay(j, 3);
-                    segValDisplay(i, 2);
-                    wait(0.001);
-                }
-            } 
-        }
+    //***********  70 seccond count for PI Modual boot time ********************
+    for (int j = 7; j >= 0; j--) {
+        for (int i = 9; i >= 0; i--) {
+            for (int x = 0; x <= 250; x++){
+                segValDisplay(j, 3);
+                segValDisplay(i, 2);
+                wait(0.001);
+            }
+        } 
+    }
+    //**************************************************************************    
     
     while(1) {
         //Check if data exists on SPI BUSS 
@@ -121,8 +121,8 @@
                 dig_1 = 1; dig_2 = 1; dig_3 = 1;
             }else{
                 segValDisplay(spiDATA[0] ,1);
-                segValDisplay(11, 2);
-                segValDisplay(10, 3);
+                segValDisplay(18, 2);
+                segValDisplay(13, 3);
             }
             if (blinkRate <= 25) {
                 dig_1 = 1; dig_2 = 1; dig_3 = 1;
--- a/main.h	Tue May 07 13:44:48 2019 +0000
+++ b/main.h	Thu May 09 17:09:02 2019 +0000
@@ -1,3 +1,3 @@
-
+#include "mbed.h"
 
 void segValDisplay (int val, int dispNum);
\ No newline at end of file