Merge pull request #486 from ut-issl/feature/add_i2c_read_write_function

I2Cのread/write関数追加
ut-issl · Feb 23, 2023 · 6b1060e · 6b1060e
2 parents 180a628 + c660a92
commit 6b1060e
Show file tree

Hide file tree

Showing 10 changed files with 361 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,6 +20,7 @@ set(C2A_SRCS
   Drivers/Protocol/eb90_frame_for_driver_super.c
   Drivers/Protocol/eb90_packet_for_driver_super.c
   Drivers/Super/driver_super.c
+  IfWrapper/Common/i2c_common.c
   # System/AnomalyLogger/anomaly_logger.c    # deprecated. 使いたい場合は， user 側でビルドターゲットに入れる．
   System/ApplicationManager/app_info.c
   System/ApplicationManager/app_manager.c

diff --git a/Examples/2nd_obc_user/src/src_user/IfWrapper/CMakeLists.txt b/Examples/2nd_obc_user/src/src_user/IfWrapper/CMakeLists.txt
@@ -12,12 +12,14 @@ if(USE_SILS_MOCKUP)
 
   #target_sources(${PROJECT_NAME} PRIVATE
   list(APPEND C2A_SRCS
+    SilsMockup/i2c_sils.c
     SilsMockup/uart_sils.c
     SilsMockup/wdt_sils.c
   )
 else()
   #target_sources(${PROJECT_NAME} PUBLIC
   list(APPEND C2A_SRCS
+    Sils/i2c_sils.cpp  
     Sils/uart_sils.cpp
     Sils/wdt_sils.cpp
   )

diff --git a/Examples/2nd_obc_user/src/src_user/IfWrapper/Sils/i2c_sils.cpp b/Examples/2nd_obc_user/src/src_user/IfWrapper/Sils/i2c_sils.cpp
@@ -0,0 +1,47 @@
+#pragma section REPRO
+#include <src_core/IfWrapper/i2c.h>
+
+int I2C_init(void* my_i2c_v)
+{
+  (void)my_i2c_v;
+  return 0;
+}
+
+int I2C_rx(void* my_i2c_v, void* data_v, int buffer_size)
+{
+  (void*)my_i2c_v;
+  (void*)data_v;
+  (void)buffer_size;
+  return 0;
+}
+
+int I2C_tx(void* my_i2c_v, void* data_v, int data_size)
+{
+  (void*)my_i2c_v;
+  (void*)data_v;
+  (void)data_size;
+  return 0;
+}
+
+int I2C_reopen(void* my_i2c_v, int reason)
+{
+  (void*)my_i2c_v;
+  (void)reason;
+  return 0;
+}
+
+void I2C_set_stop_flag(void* my_i2c_v, const unsigned char stop_flag)
+{
+  (void*)my_i2c_v;
+  (void)stop_flag;
+  return;
+}
+
+void I2C_set_rx_length(void* my_i2c_v, const uint32_t rx_length)
+{
+  (void*)my_i2c_v;
+  (void)rx_length;
+  return;
+}
+
+#pragma section
diff --git a/Examples/2nd_obc_user/src/src_user/IfWrapper/SilsMockup/i2c_sils.c b/Examples/2nd_obc_user/src/src_user/IfWrapper/SilsMockup/i2c_sils.c
@@ -0,0 +1,47 @@
+#pragma section REPRO
+#include <src_core/IfWrapper/i2c.h>
+
+int I2C_init(void* my_i2c_v)
+{
+  (void)my_i2c_v;
+  return 0;
+}
+
+int I2C_rx(void* my_i2c_v, void* data_v, int buffer_size)
+{
+  (void)my_i2c_v;
+  (void)data_v;
+  (void)buffer_size;
+  return 0;
+}
+
+int I2C_tx(void* my_i2c_v, void* data_v, int data_size)
+{
+  (void)my_i2c_v;
+  (void)data_v;
+  (void)data_size;
+  return 0;
+}
+
+int I2C_reopen(void* my_i2c_v, int reason)
+{
+  (void)my_i2c_v;
+  (void)reason;
+  return 0;
+}
+
+void I2C_set_stop_flag(void* my_i2c_v, const unsigned char stop_flag)
+{
+  (void)my_i2c_v;
+  (void)stop_flag;
+  return;
+}
+
+void I2C_set_rx_length(void* my_i2c_v, const uint32_t rx_length)
+{
+  (void)my_i2c_v;
+  (void)rx_length;
+  return;
+}
+
+#pragma section
diff --git a/Examples/minimum_user/src/src_user/IfWrapper/CMakeLists.txt b/Examples/minimum_user/src/src_user/IfWrapper/CMakeLists.txt
@@ -13,13 +13,15 @@ if(USE_SILS_MOCKUP)
   #target_sources(${PROJECT_NAME} PRIVATE
   list(APPEND C2A_SRCS
     SilsMockup/ccsds_sils.c
+    SilsMockup/i2c_sils.c
     SilsMockup/uart_sils.c
     SilsMockup/wdt_sils.c
   )
 else()
   #target_sources(${PROJECT_NAME} PUBLIC
   list(APPEND C2A_SRCS
     Sils/ccsds_sils.cpp
+    Sils/i2c_sils.cpp
     Sils/uart_sils.cpp
     Sils/wdt_sils.cpp
   )

diff --git a/Examples/minimum_user/src/src_user/IfWrapper/Sils/i2c_sils.cpp b/Examples/minimum_user/src/src_user/IfWrapper/Sils/i2c_sils.cpp
@@ -0,0 +1,47 @@
+#pragma section REPRO
+#include <src_core/IfWrapper/i2c.h>
+
+int I2C_init(void* my_i2c_v)
+{
+  (void)my_i2c_v;
+  return 0;
+}
+
+int I2C_rx(void* my_i2c_v, void* data_v, int buffer_size)
+{
+  (void*)my_i2c_v;
+  (void*)data_v;
+  (void)buffer_size;
+  return 0;
+}
+
+int I2C_tx(void* my_i2c_v, void* data_v, int data_size)
+{
+  (void*)my_i2c_v;
+  (void*)data_v;
+  (void)data_size;
+  return 0;
+}
+
+int I2C_reopen(void* my_i2c_v, int reason)
+{
+  (void*)my_i2c_v;
+  (void)reason;
+  return 0;
+}
+
+void I2C_set_stop_flag(void* my_i2c_v, const unsigned char stop_flag)
+{
+  (void*)my_i2c_v;
+  (void)stop_flag;
+  return;
+}
+
+void I2C_set_rx_length(void* my_i2c_v, const uint32_t rx_length)
+{
+  (void*)my_i2c_v;
+  (void)rx_length;
+  return;
+}
+
+#pragma section
diff --git a/Examples/minimum_user/src/src_user/IfWrapper/SilsMockup/i2c_sils.c b/Examples/minimum_user/src/src_user/IfWrapper/SilsMockup/i2c_sils.c
@@ -0,0 +1,47 @@
+#pragma section REPRO
+#include <src_core/IfWrapper/i2c.h>
+
+int I2C_init(void* my_i2c_v)
+{
+  (void)my_i2c_v;
+  return 0;
+}
+
+int I2C_rx(void* my_i2c_v, void* data_v, int buffer_size)
+{
+  (void)my_i2c_v;
+  (void)data_v;
+  (void)buffer_size;
+  return 0;
+}
+
+int I2C_tx(void* my_i2c_v, void* data_v, int data_size)
+{
+  (void)my_i2c_v;
+  (void)data_v;
+  (void)data_size;
+  return 0;
+}
+
+int I2C_reopen(void* my_i2c_v, int reason)
+{
+  (void)my_i2c_v;
+  (void)reason;
+  return 0;
+}
+
+void I2C_set_stop_flag(void* my_i2c_v, const unsigned char stop_flag)
+{
+  (void)my_i2c_v;
+  (void)stop_flag;
+  return;
+}
+
+void I2C_set_rx_length(void* my_i2c_v, const uint32_t rx_length)
+{
+  (void)my_i2c_v;
+  (void)rx_length;
+  return;
+}
+
+#pragma section
diff --git a/IfWrapper/Common/i2c_common.c b/IfWrapper/Common/i2c_common.c
@@ -0,0 +1,107 @@
+#pragma section REPRO
+/**
+ * @file
+ * @brief I2C 通信関連の一般 IO 以外の公開関数
+ * @note  レジスタの読み書き等，ハードウェアに依存しない関数群を定義する
+ */
+
+#include "i2c_common.h"
+#include "../../Library/endian.h"
+#include <string.h>
+
+/**
+ * @brief I2C_Config 構造体にて指定されたデバイスのレジスタへ書き込む
+ * @param[in] p_super  : DriverSuper 構造体へのポインタ
+ * @param[in] stream   : 使用する stream_config の番号
+ * @param[in] p_i2c_config : 対象とする I2C_Config 構造体へのポインタ
+ * @param[in] register_address : 書き込むレジスタのアドレス
+ * @param[in] data_v   : 書き込むデータを格納している場所のポインタ
+ * @param[in] data_len : 書き込むデータの長さ．1 or 2 [byte] のみ指定可
+ * @retval DS_ERR_CODE (DS_send_general_cmd の返り値)
+ */
+static DS_ERR_CODE I2C_write_bytes_(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config,
+                                    uint8_t register_address, void* data_v, uint8_t data_len);
+
+/**
+ * @brief I2C_Config 構造体にて指定されたデバイスのレジスタへ読み込む
+ * @param[in] p_super  : DriverSuper 構造体へのポインタ
+ * @param[in] stream   : 使用する stream_config の番号
+ * @param[in] p_i2c_config : 対象とする I2C_Config 構造体へのポインタ
+ * @param[in] register_address : 読み込むレジスタのアドレス
+ * @param[out] data_v  : データ格納先へのポインタ
+ * @param[in] buffer_size : 読み込むデータの長さ．
+ * @retval DS_ERR_CODE
+ */
+static DS_ERR_CODE I2C_read_bytes_(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config,
+                                   uint8_t register_address, void* data_v, uint8_t buffer_size);
+
+DS_ERR_CODE I2C_write_byte(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config, uint8_t register_address, uint8_t data)
+{
+  return I2C_write_bytes_(p_super, stream, p_i2c_config, register_address, &data, sizeof(data));
+}
+
+DS_ERR_CODE I2C_write_2bytes(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config, uint8_t register_address, uint16_t data)
+{
+  return I2C_write_bytes_(p_super, stream, p_i2c_config, register_address, &data, sizeof(data));
+}
+
+static DS_ERR_CODE I2C_write_bytes_(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config,
+                                    uint8_t register_address, void* data_v, uint8_t data_len)
+{
+  uint8_t tx_data[sizeof(register_address) + sizeof(uint16_t)];
+  DS_StreamConfig* stream_config = &(p_super->stream_config[stream]);
+
+  tx_data[0] = register_address;
+  ENDIAN_memcpy(tx_data + sizeof(register_address), data_v, data_len);
+  I2C_set_stop_flag(p_i2c_config, 1);
+  DSSC_set_tx_frame(stream_config, tx_data);
+  DSSC_set_tx_frame_size(stream_config, sizeof(register_address) + data_len);
+
+  return DS_send_general_cmd(p_super, stream);
+}
+
+DS_ERR_CODE I2C_read_byte(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config,
+                          uint8_t register_address, uint8_t* data)
+{
+  return I2C_read_bytes_(p_super, stream, p_i2c_config, register_address, data, sizeof(*data));
+}
+
+DS_ERR_CODE I2C_read_2bytes(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config,
+                            uint8_t register_address, uint16_t* data)
+{
+  return I2C_read_bytes_(p_super, stream, p_i2c_config, register_address, data, sizeof(*data));
+}
+
+static DS_ERR_CODE I2C_read_bytes_(DriverSuper* p_super, uint8_t stream, I2C_Config* p_i2c_config,
+                                   uint8_t register_address, void* data_v, uint8_t buffer_size)
+{
+  DS_ERR_CODE ret = DS_ERR_CODE_OK;
+  const uint8_t* rx_data;
+  DS_StreamConfig* stream_config = &(p_super->stream_config[stream]);
+
+  // read setting
+  DSSC_set_rx_frame_size(stream_config, buffer_size);
+  I2C_set_rx_length(p_i2c_config, buffer_size);
+  DS_clear_rx_buffer(p_super);
+  // send
+  I2C_set_stop_flag(p_i2c_config, 0);
+  DSSC_set_tx_frame(stream_config, &register_address);
+  DSSC_set_tx_frame_size(stream_config, sizeof(register_address));
+  ret = DS_send_req_tlm_cmd(p_super, stream);
+  if (ret != DS_ERR_CODE_OK) return ret;
+  // read
+  I2C_set_stop_flag(p_i2c_config, 1);
+  ret = DS_receive(p_super);
+  if (ret != DS_ERR_CODE_OK) return ret;
+  if (DSSC_get_rec_status(stream_config)->status_code != DS_STREAM_REC_STATUS_FIXED_FRAME)
+  {
+    return DS_ERR_CODE_ERR;
+  }
+
+  rx_data = DSSC_get_rx_frame(stream_config);
+  ENDIAN_memcpy(data_v, rx_data, buffer_size);
+
+  return ret;
+}
+
+#pragma section