Diff: main.cpp

Revision:

5:95590a89eb9f

Parent:

4:cd1ed9d15ef4

Child:

6:f72e87d03ab0

--- a/main.cpp	Mon Sep 19 13:08:27 2016 +0000
+++ b/main.cpp	Sat Sep 24 14:51:57 2016 +0000
@@ -22,7 +22,7 @@
 int main() {
     SPI spi(PB_15, PB_14, PB_13);
     spi.format(8, 0);
-    spi.frequency(100000000);
+//    spi.frequency(100000000);
     pc.attach(receive, Serial::RxIrq);
     timer.start(); // 経過時間デバッグ用
     
@@ -31,21 +31,25 @@
         scan++;
         if(scan == 17) {
             SER = 0; // 点灯
-            scan = 0;
-        } else if(scan == 1) {
+            scan = 1;
+        } else if(scan == 2) {
             SER = 1; // 消灯
         }
-        for(int i=0; i<8; i++) spi.write(0x00000001 << scroll%8);
-        if(scan == 16) scroll++;
-        if(scroll > 8*8-1) scroll = 0;
+        for(int i=0; i<4; i++){
+            spi.write(0b00000001);
+            spi.write(0b00000010);
+        }
         
         RCK = 0;
         CLK = 0;
         G = 1; // 消灯
         RCK = 1;
         CLK = 1;
+        while(timer.read_us()<99) { // この時間ぶん暗くする
+            wait_us(10);
+        }
         G = BUTTON; // ボタン押すと点灯
-        while(timer.read_us()<100*500) {
+        while(timer.read_us()<100) { // 100*2500でゆっくり
             wait_us(10);
         }
 //        pc.printf("%f\r\n", timer.read());