modified: main.cpp

main.cpp

@@ -16,10 +16,11 @@
 // ADCドライバ
 ADC_Driver adcd;
 
+
 typedef union {
     uint16_t d;
     uint8_t  b[2];
-} WORD_t;
+} I2C_WORD_t;
 
 
 static void i2c_slave_handler(i2c_inst_t *i2c, i2c_slave_event_t event)
@@ -42,8 +43,8 @@ static void i2c_slave_handler(i2c_inst_t *i2c, i2c_slave_event_t event)
 
             }
             else if(ADRS2040U_cmd == ADRS2040_CMD_SET_RATE) {
-                WORD_t rate;
-                i2c_read_raw_blocking(i2c, rate.b, sizeof(WORD_t));
+                I2C_WORD_t rate;
+                i2c_read_raw_blocking(i2c, rate.b, sizeof(I2C_WORD_t));
                 DEBUG_PRINT("Rate = %d\n", rate.d * 10);
                 adcd.set_sample_rate(rate.d * 10);
                 ADRS2040U_cmd = ADRS2040_CMD_INVALID;
@@ -52,7 +53,7 @@ static void i2c_slave_handler(i2c_inst_t *i2c, i2c_slave_event_t event)
         
         // I2Cデータ要求
         case I2C_SLAVE_REQUEST:
-            WORD_t sdata;
+            I2C_WORD_t sdata;
             sdata.d = 0;
 
             if(ADRS2040U_cmd == ADRS2040_CMD_GET_COUNT) {
@@ -68,7 +69,7 @@ static void i2c_slave_handler(i2c_inst_t *i2c, i2c_slave_event_t event)
                     sdata.d = 0xFFFF;
                 }
             }
-            i2c_write_raw_blocking(i2c, sdata.b, sizeof(WORD_t));
+            i2c_write_raw_blocking(i2c, sdata.b, sizeof(I2C_WORD_t));
             ADRS2040U_cmd = ADRS2040_CMD_INVALID;
 
             break;