Revision 3:8487ffc7b69c, committed 2017-08-22

Comitter:

Komazawa_sun

Date:

Tue Aug 22 04:39:31 2017 +0000

Parent:

2:dbb9a7fe426b

Commit message:

year

Changed in this revision

diff -r dbb9a7fe426b -r 8487ffc7b69c GammaPool.cpp
--- a/GammaPool.cpp	Fri Aug 18 07:35:25 2017 +0000
+++ b/GammaPool.cpp	Tue Aug 22 04:39:31 2017 +0000
@@ -30,6 +30,16 @@
     data_index[20] = ar.r.min_limit;
     data_index[21] = ar.l.max_limit;
     data_index[22] = ar.l.min_limit;
+    a.r.pwm = data_index[23];
+    a.r.fire1 = data_index[24];
+    a.r.fire2 = data_index[25];
+    a.l.pwm = data_index[26];
+    a.l.fire1 = data_index[27];
+    a.l.fire2 = data_index[28];
+    a.k.pwm = data_index[29];
+    a.k.fire = data_index[30];          
+    a.sao_call1 = data_index[31];
+    a.sao_call2 = data_index[32];        
 }
         
 void GammaPool::reset(){

diff -r dbb9a7fe426b -r 8487ffc7b69c GammaPool.h
--- a/GammaPool.h	Fri Aug 18 07:35:25 2017 +0000
+++ b/GammaPool.h	Tue Aug 22 04:39:31 2017 +0000
@@ -90,7 +90,7 @@
         }; //apper_body_return
         i2c_johanshin_return ar;
 
-        int data_index[23];
+        int data_index[33];
 };
 
 

diff -r dbb9a7fe426b -r 8487ffc7b69c GammaTransporter.cpp
--- a/GammaTransporter.cpp	Fri Aug 18 07:35:25 2017 +0000
+++ b/GammaTransporter.cpp	Tue Aug 22 04:39:31 2017 +0000
@@ -28,6 +28,11 @@
     return no_error;
 }
 
+void GammaTransporter::write(int index_num, int data)
+{
+    pool.data_index[index_num] = data;
+}   
+
 int GammaTransporter::read(int index_num)
 {
     return pool.data_index[index_num];

diff -r dbb9a7fe426b -r 8487ffc7b69c GammaTransporter.h
--- a/GammaTransporter.h	Fri Aug 18 07:35:25 2017 +0000
+++ b/GammaTransporter.h	Tue Aug 22 04:39:31 2017 +0000
@@ -31,6 +31,7 @@
         GammaTransporter();
     
         virtual bool set();
+        virtual void write(int index_num, int data);
         virtual int read(int index_num);
         virtual void reset();