From 0b3578b0c08c3fa57b4cd78064de5c30ddbd1846 Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Tue, 12 Nov 2024 20:12:06 +0900 Subject: [PATCH 1/9] add wdt_timer_setting --- .../aocs/aobc_command_definitions.h | 5 +- .../aocs/aobc_telemetry_buffer.c | 163 ++++++++--------- .../aocs/aobc_telemetry_buffer.h | 4 +- .../aocs/aobc_telemetry_data_definitions.h | 5 +- .../aocs/aobc_telemetry_definitions.h | 4 +- .../tlm_cmd/block_command_definitions.h | 2 +- .../src_user/tlm_cmd/command_definitions.c | 4 +- .../src_user/tlm_cmd/command_definitions.h | 9 +- .../src_user/tlm_cmd/telemetry_definitions.c | 77 ++++---- .../src_user/tlm_cmd/telemetry_definitions.h | 2 +- .../CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv | 8 +- .../TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv | 2 +- .../calced_data/SAMPLE_MOBC_TLM_DB_HK.csv | 164 +++++++++--------- .../tlm_cmd/block_command_definitions.h | 2 +- .../src_user/tlm_cmd/command_definitions.c | 4 +- .../src_user/tlm_cmd/command_definitions.h | 3 +- .../src_user/tlm_cmd/telemetry_definitions.c | 65 +++---- .../src_user/tlm_cmd/telemetry_definitions.h | 2 +- .../CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv | 2 +- .../TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv | 2 +- .../SAMPLE_AOBC_TLM_DB_AOBC_HK.csv | 160 ++++++++--------- system/watchdog_timer/watchdog_timer.c | 15 ++ system/watchdog_timer/watchdog_timer.h | 1 + 23 files changed, 366 insertions(+), 339 deletions(-) diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h index 5642e52e7..5215e06b5 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 - * db commit hash: e1e6b79acd85523f04266f1c08b7a3b89e5b6e05 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC @@ -139,6 +139,7 @@ typedef enum AOBC_Cmd_CODE_WDT_DISABLE = 0x0102, //!< WDT無効化 AOBC_Cmd_CODE_WDT_STOP_CLEAR = 0x0103, //!< WDTのカウンタクリアを止める＝リセット実行 AOBC_Cmd_CODE_WDT_START_CLEAR = 0x0104, //!< WDTのカウンタクリアを開始する + AOBC_Cmd_CODE_WDT_SET_TIMER = 0x0105, //!< WDTの監視周期を変更 (監視周期[ms]) AOBC_Cmd_CODE_MAX } AOBC_CMD_CODE; diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c index 8f7dba072..c29436d15 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c @@ -5,8 +5,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 - * db commit hash: e1e6b79acd85523f04266f1c08b7a3b89e5b6e05 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC @@ -361,85 +361,86 @@ static CDS_ERR_CODE AOBC_analyze_tlm_aobc_hk_(const CommonTlmPacket* packet, AOB temp_u8 >>= 0; temp_u8 &= 0x3f; aobc_driver->tlm_data.aobc_hk.dummy_data0 = temp_u8; - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_blk_ptr), &(f[148]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_cmd_ptr), &(f[150]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_regd_time), &(f[151]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_regd_id), &(f[155]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counter_total), &(f[157]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_high), &(f[161]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_middle), &(f[163]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_low), &(f[165]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_el), &(f[167]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_eh), &(f[169]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.group), &(f[171]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.local), &(f[172]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.err_level), &(f[176]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.time.total_cycle), &(f[177]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.time.step), &(f[181]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.note), &(f[182]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.group), &(f[186]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.local), &(f[187]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.time.total_cycle), &(f[191]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.time.step), &(f[195]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.note), &(f[196]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.eh.log_table.respond_counter), &(f[198]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.git_rev_core), &(f[202]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.git_rev_user), &(f[206]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_blk_ptr), &(f[210]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_cmd_ptr), &(f[211]), 1); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_regd_time), &(f[212]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_regd_id), &(f[216]), 2); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data1), &(f[218]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data2), &(f[222]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data3), &(f[226]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data4), &(f[230]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data5), &(f[234]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data6), &(f[238]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data7), &(f[242]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data8), &(f[246]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data9), &(f[250]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data10), &(f[254]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data11), &(f[258]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data12), &(f[262]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data13), &(f[266]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data14), &(f[270]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data15), &(f[274]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data16), &(f[278]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data17), &(f[282]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data18), &(f[286]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data19), &(f[290]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data20), &(f[294]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data21), &(f[298]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data22), &(f[302]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data23), &(f[306]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data24), &(f[310]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data25), &(f[314]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data26), &(f[318]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data27), &(f[322]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data28), &(f[326]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data29), &(f[330]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data30), &(f[334]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data31), &(f[338]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data32), &(f[342]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data33), &(f[346]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data34), &(f[350]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data35), &(f[354]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data36), &(f[358]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data37), &(f[362]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data38), &(f[366]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data39), &(f[370]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data40), &(f[374]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data41), &(f[378]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data42), &(f[382]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data43), &(f[386]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data44), &(f[390]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data45), &(f[394]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data46), &(f[398]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data47), &(f[402]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data48), &(f[406]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data49), &(f[410]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data50), &(f[414]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data51), &(f[418]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.wdt.timer), &(f[148]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_blk_ptr), &(f[152]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_cmd_ptr), &(f[154]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_regd_time), &(f[155]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.obc.bct_regd_id), &(f[159]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counter_total), &(f[161]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_high), &(f[165]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_middle), &(f[167]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_low), &(f[169]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_el), &(f[171]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.statistics.record_counters_eh), &(f[173]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.group), &(f[175]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.local), &(f[176]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.err_level), &(f[180]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.time.total_cycle), &(f[181]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.time.step), &(f[185]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_event.note), &(f[186]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.group), &(f[190]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.local), &(f[191]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.time.total_cycle), &(f[195]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.time.step), &(f[199]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.el.latest_high_event.note), &(f[200]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.eh.log_table.respond_counter), &(f[202]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.git_rev_core), &(f[206]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.git_rev_user), &(f[210]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_blk_ptr), &(f[214]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_cmd_ptr), &(f[215]), 1); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_regd_time), &(f[216]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.bct_regd_id), &(f[220]), 2); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data1), &(f[222]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data2), &(f[226]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data3), &(f[230]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data4), &(f[234]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data5), &(f[238]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data6), &(f[242]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data7), &(f[246]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data8), &(f[250]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data9), &(f[254]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data10), &(f[258]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data11), &(f[262]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data12), &(f[266]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data13), &(f[270]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data14), &(f[274]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data15), &(f[278]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data16), &(f[282]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data17), &(f[286]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data18), &(f[290]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data19), &(f[294]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data20), &(f[298]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data21), &(f[302]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data22), &(f[306]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data23), &(f[310]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data24), &(f[314]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data25), &(f[318]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data26), &(f[322]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data27), &(f[326]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data28), &(f[330]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data29), &(f[334]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data30), &(f[338]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data31), &(f[342]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data32), &(f[346]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data33), &(f[350]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data34), &(f[354]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data35), &(f[358]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data36), &(f[362]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data37), &(f[366]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data38), &(f[370]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data39), &(f[374]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data40), &(f[378]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data41), &(f[382]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data42), &(f[386]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data43), &(f[390]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data44), &(f[394]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data45), &(f[398]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data46), &(f[402]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data47), &(f[406]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data48), &(f[410]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data49), &(f[414]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data50), &(f[418]), 4); + ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data51), &(f[422]), 4); // TODO: ビットフィールドをつかっている系は，様々なパターンがあり得るので，今後，バグが出ないか注視する // ワーニング回避 diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h index 9a8279050..f6cd95a01 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 - * db commit hash: e1e6b79acd85523f04266f1c08b7a3b89e5b6e05 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h index 41915f8fc..0d1d5dd79 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 - * db commit hash: e1e6b79acd85523f04266f1c08b7a3b89e5b6e05 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC @@ -301,6 +301,7 @@ typedef struct { uint8_t is_enable; uint8_t is_clear_enable; + uint32_t timer; } wdt; uint8_t dummy_data0; struct diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h index afacdfaa3..7a6f89f26 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 - * db commit hash: e1e6b79acd85523f04266f1c08b7a3b89e5b6e05 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC diff --git a/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h b/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h index e09a877bd..c7d36a715 100644 --- a/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h +++ b/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: a6ac3f58e1422615904c43d389e64877 + * CSV files MD5: 03076efb966c0f746783e116ba4fe38a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/mobc/src/src_user/tlm_cmd/command_definitions.c b/examples/mobc/src/src_user/tlm_cmd/command_definitions.c index 546cbf8bc..d40610304 100644 --- a/examples/mobc/src/src_user/tlm_cmd/command_definitions.c +++ b/examples/mobc/src/src_user/tlm_cmd/command_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: a6ac3f58e1422615904c43d389e64877 + * CSV files MD5: 03076efb966c0f746783e116ba4fe38a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] @@ -193,6 +193,7 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS]) cmd_table[Cmd_CODE_WDT_DISABLE].cmd_func = Cmd_WDT_DISABLE; cmd_table[Cmd_CODE_WDT_STOP_CLEAR].cmd_func = Cmd_WDT_STOP_CLEAR; cmd_table[Cmd_CODE_WDT_START_CLEAR].cmd_func = Cmd_WDT_START_CLEAR; + cmd_table[Cmd_CODE_WDT_SET_TIMER].cmd_func = Cmd_WDT_SET_TIMER; cmd_table[Cmd_CODE_UART_TEST_INIT_CSRV].cmd_func = Cmd_UART_TEST_INIT_CSRV; cmd_table[Cmd_CODE_UART_TEST_UPDATE].cmd_func = Cmd_UART_TEST_UPDATE; cmd_table[Cmd_CODE_UART_TEST_SEND_TEST].cmd_func = Cmd_UART_TEST_SEND_TEST; @@ -420,6 +421,7 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS]) cmd_table[Cmd_CODE_CSRV_GS_SET_FARM_PW].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE; cmd_table[Cmd_CODE_CSRV_GS_SET_INFO].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE; cmd_table[Cmd_CODE_CSRV_GS_CCSDS_SET_RATE].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE; + cmd_table[Cmd_CODE_WDT_SET_TIMER].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE; cmd_table[Cmd_CODE_UART_TEST_SEND_TEST].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE; cmd_table[Cmd_CODE_UTIL_CMD_ADD].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE; cmd_table[Cmd_CODE_UTIL_CMD_ADD].param_size_infos[0].packed_info.bit.second = CA_PARAM_SIZE_TYPE_4BYTE; diff --git a/examples/mobc/src/src_user/tlm_cmd/command_definitions.h b/examples/mobc/src/src_user/tlm_cmd/command_definitions.h index fad4e0176..a2842e7c1 100644 --- a/examples/mobc/src/src_user/tlm_cmd/command_definitions.h +++ b/examples/mobc/src/src_user/tlm_cmd/command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: a6ac3f58e1422615904c43d389e64877 + * CSV files MD5: 03076efb966c0f746783e116ba4fe38a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] @@ -191,9 +191,10 @@ typedef enum Cmd_CODE_WDT_DISABLE = 0x010B, //!< WDT無効化 Cmd_CODE_WDT_STOP_CLEAR = 0x010C, //!< WDTのカウンタクリアを止める＝リセット実行 Cmd_CODE_WDT_START_CLEAR = 0x010D, //!< WDTのカウンタクリアを開始する - Cmd_CODE_UART_TEST_INIT_CSRV = 0x010E, //!< CSRV 初期化 - Cmd_CODE_UART_TEST_UPDATE = 0x010F, //!< Driver update - Cmd_CODE_UART_TEST_SEND_TEST = 0x0110, //!< Driver send test + Cmd_CODE_WDT_SET_TIMER = 0x010E, //!< WDTの監視周期を変更 (監視周期[ms]) + Cmd_CODE_UART_TEST_INIT_CSRV = 0x010F, //!< CSRV 初期化 + Cmd_CODE_UART_TEST_UPDATE = 0x0110, //!< Driver update + Cmd_CODE_UART_TEST_SEND_TEST = 0x0111, //!< Driver send test Cmd_CODE_UTIL_CMD_ADD = 0x03E0, //!< 汎用コマンドのバッファに指定サイズのデータを入れる Cmd_CODE_UTIL_CMD_SEND = 0x03E1, //!< 引数のCHに汎用コマンドのバッファにあるデータを送信する Cmd_CODE_UTIL_CMD_RESET = 0x03E2, //!< 汎用コマンドのバッファをクリアする diff --git a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c index 8240f8115..1842466bd 100644 --- a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c +++ b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: a6ac3f58e1422615904c43d389e64877 + * CSV files MD5: 03076efb966c0f746783e116ba4fe38a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] @@ -4136,7 +4136,7 @@ static TF_TLM_FUNC_ACK Tlm_GS_(uint8_t* packet, uint16_t* len, uint16_t max_len) static TF_TLM_FUNC_ACK Tlm_HK_(uint8_t* packet, uint16_t* len, uint16_t max_len) { - if (428 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; + if (432 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; #ifndef BUILD_SETTINGS_FAST_BUILD TF_copy_u32(&packet[26], TMGR_get_master_clock().mode_cycle); @@ -4189,41 +4189,41 @@ static TF_TLM_FUNC_ACK Tlm_HK_(uint8_t* packet, uint16_t* len, uint16_t max_len) TF_copy_u16(&packet[154], (uint16_t)(PL_is_empty(&(PH_tl_cmd_list[TLCD_ID_FROM_GS_FOR_MISSION])) ? 0 : CCP_get_id((const CommonCmdPacket*)(PL_get_head(&(PH_tl_cmd_list[TLCD_ID_FROM_GS_FOR_MISSION]))->packet)))); TF_copy_u8(&packet[156], (uint8_t)(((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].stop_on_error << 7 & 0x80) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].lockout << 6 & 0x40) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].stop_on_error << 5 & 0x20) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].lockout << 4 & 0x10) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].stop_on_error << 3 & 0x08) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].lockout << 2 & 0x04) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS_FOR_MISSION].stop_on_error << 1 & 0x02) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS_FOR_MISSION].lockout & 0x01) )); TF_copy_u8(&packet[157], (uint8_t)((wdt_config->is_wdt_enable << 7 & 0x80) | (wdt_config->is_clear_enable << 6 & 0x40) | 0x00)); - TF_copy_u16(&packet[158], block_command_table->pos.block); - TF_copy_u8(&packet[160], (uint8_t)(block_command_table->pos.cmd)); - TF_copy_u32(&packet[161], ((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); - TF_copy_u16(&packet[165], (uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); - TF_copy_u32(&packet[167], event_logger->statistics.record_counter_total); - TF_copy_u16(&packet[171], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH]); - TF_copy_u16(&packet[173], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE]); - TF_copy_u16(&packet[175], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW]); - TF_copy_u16(&packet[177], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL]); - TF_copy_u16(&packet[179], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH]); - TF_copy_u8(&packet[181], (uint8_t)event_logger->latest_event.group); - TF_copy_u32(&packet[182], event_logger->latest_event.local); - TF_copy_u8(&packet[186], (uint8_t)event_logger->latest_event.err_level); - TF_copy_u32(&packet[187], event_logger->latest_event.time.total_cycle); - TF_copy_u8(&packet[191], (uint8_t)event_logger->latest_event.time.step); - TF_copy_u32(&packet[192], event_logger->latest_event.note); - TF_copy_u8(&packet[196], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->group); - TF_copy_u32(&packet[197], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->local); - TF_copy_u32(&packet[201], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.total_cycle); - TF_copy_u8(&packet[205], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.step); - TF_copy_u16(&packet[206], (uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->note); - TF_copy_u32(&packet[208], event_handler->log_table.respond_counter); - TF_copy_u16(&packet[212], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].cmd_code)); - TF_copy_u8(&packet[214], (uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].status)); - TF_copy_u16(&packet[215], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].exec_counter)); - TF_copy_i8(&packet[217], (int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_sts)); - TF_copy_u32(&packet[218], divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_time.total_cycle); - TF_copy_u16(&packet[222], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].cmd_code)); - TF_copy_u8(&packet[224], (uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].status)); - TF_copy_u16(&packet[225], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].exec_counter)); - TF_copy_i8(&packet[227], (int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_sts)); - TF_copy_u32(&packet[228], divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_time.total_cycle); - TF_copy_u32(&packet[232], GIT_REV_CORE_SHORT); - TF_copy_u32(&packet[236], GIT_REV_USER_SHORT); - TF_copy_u32(&packet[240], 0); + TF_copy_u32(&packet[158], (uint32_t)wdt_config->timer_setting); + TF_copy_u16(&packet[162], block_command_table->pos.block); + TF_copy_u8(&packet[164], (uint8_t)(block_command_table->pos.cmd)); + TF_copy_u32(&packet[165], ((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); + TF_copy_u16(&packet[169], (uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); + TF_copy_u32(&packet[171], event_logger->statistics.record_counter_total); + TF_copy_u16(&packet[175], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH]); + TF_copy_u16(&packet[177], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE]); + TF_copy_u16(&packet[179], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW]); + TF_copy_u16(&packet[181], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL]); + TF_copy_u16(&packet[183], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH]); + TF_copy_u8(&packet[185], (uint8_t)event_logger->latest_event.group); + TF_copy_u32(&packet[186], event_logger->latest_event.local); + TF_copy_u8(&packet[190], (uint8_t)event_logger->latest_event.err_level); + TF_copy_u32(&packet[191], event_logger->latest_event.time.total_cycle); + TF_copy_u8(&packet[195], (uint8_t)event_logger->latest_event.time.step); + TF_copy_u32(&packet[196], event_logger->latest_event.note); + TF_copy_u8(&packet[200], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->group); + TF_copy_u32(&packet[201], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->local); + TF_copy_u32(&packet[205], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.total_cycle); + TF_copy_u8(&packet[209], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.step); + TF_copy_u16(&packet[210], (uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->note); + TF_copy_u32(&packet[212], event_handler->log_table.respond_counter); + TF_copy_u16(&packet[216], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].cmd_code)); + TF_copy_u8(&packet[218], (uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].status)); + TF_copy_u16(&packet[219], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].exec_counter)); + TF_copy_i8(&packet[221], (int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_sts)); + TF_copy_u32(&packet[222], divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_time.total_cycle); + TF_copy_u16(&packet[226], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].cmd_code)); + TF_copy_u8(&packet[228], (uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].status)); + TF_copy_u16(&packet[229], (uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].exec_counter)); + TF_copy_i8(&packet[231], (int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_sts)); + TF_copy_u32(&packet[232], divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_time.total_cycle); + TF_copy_u32(&packet[236], GIT_REV_CORE_SHORT); + TF_copy_u32(&packet[240], GIT_REV_USER_SHORT); TF_copy_u32(&packet[244], 0); TF_copy_u32(&packet[248], 0); TF_copy_u32(&packet[252], 0); @@ -4270,9 +4270,10 @@ static TF_TLM_FUNC_ACK Tlm_HK_(uint8_t* packet, uint16_t* len, uint16_t max_len) TF_copy_u32(&packet[416], 0); TF_copy_u32(&packet[420], 0); TF_copy_u32(&packet[424], 0); + TF_copy_u32(&packet[428], 0); #endif - *len = 428; + *len = 432; return TF_TLM_FUNC_ACK_SUCCESS; } diff --git a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h index 2ef0f473a..f9131e0e5 100644 --- a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h +++ b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: a6ac3f58e1422615904c43d389e64877 + * CSV files MD5: 03076efb966c0f746783e116ba4fe38a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv b/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv index b15f2ffca..1bcfc1a51 100644 --- a/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv +++ b/examples/mobc/tlm-cmd-db/CMD_DB/SAMPLE_MOBC_CMD_DB_CMD_DB.csv @@ -196,10 +196,11 @@ Comment,,,,,Type,Description,Type,Description,Type,Description,Type,Description, ,WDT_DISABLE,OBC,0x010B,0,,,,,,,,,,,,,,,WDT無効化, ,WDT_STOP_CLEAR,OBC,0x010C,0,,,,,,,,,,,,,danger,,WDTのカウンタクリアを止める＝リセット実行, ,WDT_START_CLEAR,OBC,0x010D,0,,,,,,,,,,,,,,,WDTのカウンタクリアを開始する, +,WDT_SET_TIMER,OBC,0x010E,1,uint32_t,監視周期,,,,,,,,,,,,,WDTの監視周期を変更,監視周期[ms] **,UART TESTコマンド,,,,,,,,,,,,,,,,,,, -,UART_TEST_INIT_CSRV,OBC,0x010E,0,,,,,,,,,,,,,,,CSRV 初期化, -,UART_TEST_UPDATE,OBC,0x010F,0,,,,,,,,,,,,,,,Driver update, -,UART_TEST_SEND_TEST,OBC,0x0110,1,uint8_t,id,,,,,,,,,,,,,Driver send test, +,UART_TEST_INIT_CSRV,OBC,0x010F,0,,,,,,,,,,,,,,,CSRV 初期化, +,UART_TEST_UPDATE,OBC,0x0110,0,,,,,,,,,,,,,,,Driver update, +,UART_TEST_SEND_TEST,OBC,0x0111,1,uint8_t,id,,,,,,,,,,,,,Driver send test, **,,,,,,,,,,,,,,,,,,,, * POWER,,,,,,,,,,,,,,,,,,,, **,,,,,,,,,,,,,,,,,,,, @@ -997,4 +998,3 @@ Comment,,,,,Type,Description,Type,Description,Type,Description,Type,Description, ,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,, diff --git a/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv index 329e78246..ccb28a226 100644 --- a/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv +++ b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv @@ -80,6 +80,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,WDT.IS_ENABLE,uint8_t,(uint8_t)((wdt_config->is_wdt_enable << 7 & 0x80) | (wdt_config->is_clear_enable << 6 & 0x40) | 0x00),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,WDT.IS_CLEAR_ENABLE,||,||,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,DUMMY_DATA0,||,||,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),6,NONE,,,,,,,,, +,WDT.TIMER,uint32_t,(uint32_t)wdt_config->timer_setting,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,OBC.BCT_BLK_PTR,uint16_t,block_command_table->pos.block,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT ブロックポインタ, ,OBC.BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT コマンドポインタ, ,OBC.BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに… @@ -497,4 +498,3 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,, diff --git a/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv index 25d742c4b..9231df647 100644 --- a/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv +++ b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv @@ -80,88 +80,88 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,WDT.IS_ENABLE,uint8_t,(uint8_t)((wdt_config->is_wdt_enable << 7 & 0x80) | (wdt_config->is_clear_enable << 6 & 0x40) | 0x00),PACKET,157,0,1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,WDT.IS_CLEAR_ENABLE,,,PACKET,157,1,1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,DUMMY_DATA0,,,PACKET,157,2,6,NONE,,,,,,,,, -,OBC.BCT_BLK_PTR,uint16_t,block_command_table->pos.block,PACKET,158,0,16,NONE,,,,,,,,BCT ブロックポインタ, -,OBC.BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,160,0,8,NONE,,,,,,,,BCT コマンドポインタ, -,OBC.BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,161,0,32,NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに… -,OBC.BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,165,0,16,NONE,,,,,,,,BCT 登録コマンドID,変数指定が大変なことに… -,EL.STATISTICS.RECORD_COUNTER_TOTAL,uint32_t,event_logger->statistics.record_counter_total,PACKET,167,0,32,NONE,,,,,,,,, -,EL.STATISTICS.RECORD_COUNTERS_HIGH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH],PACKET,171,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_MIDDLE,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE],PACKET,173,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_LOW,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW],PACKET,175,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_EL,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL],PACKET,177,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_EH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH],PACKET,179,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.LATEST_EVENT.GROUP,uint8_t,(uint8_t)event_logger->latest_event.group,PACKET,181,0,8,NONE,,,,,,,,, -,EL.LATEST_EVENT.LOCAL,uint32_t,event_logger->latest_event.local,PACKET,182,0,32,NONE,,,,,,,,, -,EL.LATEST_EVENT.ERR_LEVEL,uint8_t,(uint8_t)event_logger->latest_event.err_level,PACKET,186,0,8,STATUS,,,,,,,0=HIGH@@ 1=MIDDLE@@ 2=LOW@@ 3=EL@@ 4=EH@@ *=N/A,, -,EL.LATEST_EVENT.TIME.TOTAL_CYCLE,uint32_t,event_logger->latest_event.time.total_cycle,PACKET,187,0,32,NONE,,,,,,,,, -,EL.LATEST_EVENT.TIME.STEP,uint8_t,(uint8_t)event_logger->latest_event.time.step,PACKET,191,0,8,NONE,,,,,,,,, -,EL.LATEST_EVENT.NOTE,uint32_t,event_logger->latest_event.note,PACKET,192,0,32,NONE,,,,,,,,,u8にしてもよい -,EL.LATEST_HIGH_EVENT.GROUP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->group,PACKET,196,0,8,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.LOCAL,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->local,PACKET,197,0,32,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.TIME.TOTAL_CYCLE,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.total_cycle,PACKET,201,0,32,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.TIME.STEP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.step,PACKET,205,0,8,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.NOTE,uint16_t,(uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->note,PACKET,206,0,16,NONE,,,,,,,,,u8にしてもよい -,EH.LOG_TABLE.RESPOND_COUNTER,uint32_t,event_handler->log_table.respond_counter,PACKET,208,0,32,NONE,,,,,,,,, -,DCU.EXEC_LOGS0.CMD_CODE,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].cmd_code),PACKET,212,0,16,HEX,,,,,,,,, -,DCU.EXEC_LOGS0.STATUS,uint8_t,(uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].status),PACKET,214,0,8,STATUS,,,,,,,0=FINISHED@@ 1=PROGRESS@@ 2=ABORTED_BY_ERR@@ 3=ABORTED_BY_CMD@@ *=N/A,, -,DCU.EXEC_LOGS0.EXEC_COUNTER,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].exec_counter),PACKET,215,0,16,NONE,,,,,,,,, -,DCU.EXEC_LOGS0.LAST_EXEC_STS,int8_t,(int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_sts),PACKET,217,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT@@ *=ERR,, -,DCU.EXEC_LOGS0.LAST_EXEC_TIME.TOTAL_CYCLE,uint32_t,divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_time.total_cycle,PACKET,218,0,32,NONE,,,,,,,,, -,DCU.EXEC_LOGS1.CMD_CODE,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].cmd_code),PACKET,222,0,16,HEX,,,,,,,,, -,DCU.EXEC_LOGS1.STATUS,uint8_t,(uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].status),PACKET,224,0,8,STATUS,,,,,,,0=FINISHED@@ 1=PROGRESS@@ 2=ABORTED_BY_ERR@@ 3=ABORTED_BY_CMD@@ *=N/A,, -,DCU.EXEC_LOGS1.EXEC_COUNTER,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].exec_counter),PACKET,225,0,16,NONE,,,,,,,,, -,DCU.EXEC_LOGS1.LAST_EXEC_STS,int8_t,(int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_sts),PACKET,227,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT@@ *=ERR,, -,DCU.EXEC_LOGS1.LAST_EXEC_TIME.TOTAL_CYCLE,uint32_t,divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_time.total_cycle,PACKET,228,0,32,NONE,,,,,,,,, -,GIT_REV_CORE,uint32_t,GIT_REV_CORE_SHORT,PACKET,232,0,32,HEX,,,,,,,,, -,GIT_REV_USER,uint32_t,GIT_REV_USER_SHORT,PACKET,236,0,32,HEX,,,,,,,,, -,DUMMY_DATA1,uint32_t,0,PACKET,240,0,32,NONE,,,,,,,,, -,DUMMY_DATA2,uint32_t,0,PACKET,244,0,32,NONE,,,,,,,,, -,DUMMY_DATA3,uint32_t,0,PACKET,248,0,32,NONE,,,,,,,,, -,DUMMY_DATA4,uint32_t,0,PACKET,252,0,32,NONE,,,,,,,,, -,DUMMY_DATA5,uint32_t,0,PACKET,256,0,32,NONE,,,,,,,,, -,DUMMY_DATA6,uint32_t,0,PACKET,260,0,32,NONE,,,,,,,,, -,DUMMY_DATA7,uint32_t,0,PACKET,264,0,32,NONE,,,,,,,,, -,DUMMY_DATA8,uint32_t,0,PACKET,268,0,32,NONE,,,,,,,,, -,DUMMY_DATA9,uint32_t,0,PACKET,272,0,32,NONE,,,,,,,,, -,DUMMY_DATA10,uint32_t,0,PACKET,276,0,32,NONE,,,,,,,,, -,DUMMY_DATA11,uint32_t,0,PACKET,280,0,32,NONE,,,,,,,,, -,DUMMY_DATA12,uint32_t,0,PACKET,284,0,32,NONE,,,,,,,,, -,DUMMY_DATA13,uint32_t,0,PACKET,288,0,32,NONE,,,,,,,,, -,DUMMY_DATA14,uint32_t,0,PACKET,292,0,32,NONE,,,,,,,,, -,DUMMY_DATA15,uint32_t,0,PACKET,296,0,32,NONE,,,,,,,,, -,DUMMY_DATA16,uint32_t,0,PACKET,300,0,32,NONE,,,,,,,,, -,DUMMY_DATA17,uint32_t,0,PACKET,304,0,32,NONE,,,,,,,,, -,DUMMY_DATA18,uint32_t,0,PACKET,308,0,32,NONE,,,,,,,,, -,DUMMY_DATA19,uint32_t,0,PACKET,312,0,32,NONE,,,,,,,,, -,DUMMY_DATA20,uint32_t,0,PACKET,316,0,32,NONE,,,,,,,,, -,DUMMY_DATA21,uint32_t,0,PACKET,320,0,32,NONE,,,,,,,,, -,DUMMY_DATA22,uint32_t,0,PACKET,324,0,32,NONE,,,,,,,,, -,DUMMY_DATA23,uint32_t,0,PACKET,328,0,32,NONE,,,,,,,,, -,DUMMY_DATA24,uint32_t,0,PACKET,332,0,32,NONE,,,,,,,,, -,DUMMY_DATA25,uint32_t,0,PACKET,336,0,32,NONE,,,,,,,,, -,DUMMY_DATA26,uint32_t,0,PACKET,340,0,32,NONE,,,,,,,,, -,DUMMY_DATA27,uint32_t,0,PACKET,344,0,32,NONE,,,,,,,,, -,DUMMY_DATA28,uint32_t,0,PACKET,348,0,32,NONE,,,,,,,,, -,DUMMY_DATA29,uint32_t,0,PACKET,352,0,32,NONE,,,,,,,,, -,DUMMY_DATA30,uint32_t,0,PACKET,356,0,32,NONE,,,,,,,,, -,DUMMY_DATA31,uint32_t,0,PACKET,360,0,32,NONE,,,,,,,,, -,DUMMY_DATA32,uint32_t,0,PACKET,364,0,32,NONE,,,,,,,,, -,DUMMY_DATA33,uint32_t,0,PACKET,368,0,32,NONE,,,,,,,,, -,DUMMY_DATA34,uint32_t,0,PACKET,372,0,32,NONE,,,,,,,,, -,DUMMY_DATA35,uint32_t,0,PACKET,376,0,32,NONE,,,,,,,,, -,DUMMY_DATA36,uint32_t,0,PACKET,380,0,32,NONE,,,,,,,,, -,DUMMY_DATA37,uint32_t,0,PACKET,384,0,32,NONE,,,,,,,,, -,DUMMY_DATA38,uint32_t,0,PACKET,388,0,32,NONE,,,,,,,,, -,DUMMY_DATA39,uint32_t,0,PACKET,392,0,32,NONE,,,,,,,,, -,DUMMY_DATA40,uint32_t,0,PACKET,396,0,32,NONE,,,,,,,,, -,DUMMY_DATA41,uint32_t,0,PACKET,400,0,32,NONE,,,,,,,,, -,DUMMY_DATA42,uint32_t,0,PACKET,404,0,32,NONE,,,,,,,,, -,DUMMY_DATA43,uint32_t,0,PACKET,408,0,32,NONE,,,,,,,,, -,DUMMY_DATA44,uint32_t,0,PACKET,412,0,32,NONE,,,,,,,,, -,DUMMY_DATA45,uint32_t,0,PACKET,416,0,32,NONE,,,,,,,,, -,DUMMY_DATA46,uint32_t,0,PACKET,420,0,32,NONE,,,,,,,,, -,DUMMY_DATA47,uint32_t,0,PACKET,424,0,32,NONE,,,,,,,,, -,,,,,,,,,,,,,,,,, +,WDT.TIMER,uint32_t,(uint32_t)wdt_config->timer_setting,PACKET,158,0,32,NONE,,,,,,,,, +,OBC.BCT_BLK_PTR,uint16_t,block_command_table->pos.block,PACKET,162,0,16,NONE,,,,,,,,BCT ブロックポインタ, +,OBC.BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,164,0,8,NONE,,,,,,,,BCT コマンドポインタ, +,OBC.BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,165,0,32,NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに… +,OBC.BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,169,0,16,NONE,,,,,,,,BCT 登録コマンドID,変数指定が大変なことに… +,EL.STATISTICS.RECORD_COUNTER_TOTAL,uint32_t,event_logger->statistics.record_counter_total,PACKET,171,0,32,NONE,,,,,,,,, +,EL.STATISTICS.RECORD_COUNTERS_HIGH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH],PACKET,175,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_MIDDLE,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE],PACKET,177,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_LOW,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW],PACKET,179,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_EL,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL],PACKET,181,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_EH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH],PACKET,183,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.LATEST_EVENT.GROUP,uint8_t,(uint8_t)event_logger->latest_event.group,PACKET,185,0,8,NONE,,,,,,,,, +,EL.LATEST_EVENT.LOCAL,uint32_t,event_logger->latest_event.local,PACKET,186,0,32,NONE,,,,,,,,, +,EL.LATEST_EVENT.ERR_LEVEL,uint8_t,(uint8_t)event_logger->latest_event.err_level,PACKET,190,0,8,STATUS,,,,,,,0=HIGH@@ 1=MIDDLE@@ 2=LOW@@ 3=EL@@ 4=EH@@ *=N/A,, +,EL.LATEST_EVENT.TIME.TOTAL_CYCLE,uint32_t,event_logger->latest_event.time.total_cycle,PACKET,191,0,32,NONE,,,,,,,,, +,EL.LATEST_EVENT.TIME.STEP,uint8_t,(uint8_t)event_logger->latest_event.time.step,PACKET,195,0,8,NONE,,,,,,,,, +,EL.LATEST_EVENT.NOTE,uint32_t,event_logger->latest_event.note,PACKET,196,0,32,NONE,,,,,,,,,u8にしてもよい +,EL.LATEST_HIGH_EVENT.GROUP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->group,PACKET,200,0,8,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.LOCAL,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->local,PACKET,201,0,32,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.TIME.TOTAL_CYCLE,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.total_cycle,PACKET,205,0,32,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.TIME.STEP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.step,PACKET,209,0,8,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.NOTE,uint16_t,(uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->note,PACKET,210,0,16,NONE,,,,,,,,,u8にしてもよい +,EH.LOG_TABLE.RESPOND_COUNTER,uint32_t,event_handler->log_table.respond_counter,PACKET,212,0,32,NONE,,,,,,,,, +,DCU.EXEC_LOGS0.CMD_CODE,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].cmd_code),PACKET,216,0,16,HEX,,,,,,,,, +,DCU.EXEC_LOGS0.STATUS,uint8_t,(uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].status),PACKET,218,0,8,STATUS,,,,,,,0=FINISHED@@ 1=PROGRESS@@ 2=ABORTED_BY_ERR@@ 3=ABORTED_BY_CMD@@ *=N/A,, +,DCU.EXEC_LOGS0.EXEC_COUNTER,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].exec_counter),PACKET,219,0,16,NONE,,,,,,,,, +,DCU.EXEC_LOGS0.LAST_EXEC_STS,int8_t,(int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_sts),PACKET,221,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT@@ *=ERR,, +,DCU.EXEC_LOGS0.LAST_EXEC_TIME.TOTAL_CYCLE,uint32_t,divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[0]].last_exec_time.total_cycle,PACKET,222,0,32,NONE,,,,,,,,, +,DCU.EXEC_LOGS1.CMD_CODE,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].cmd_code),PACKET,226,0,16,HEX,,,,,,,,, +,DCU.EXEC_LOGS1.STATUS,uint8_t,(uint8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].status),PACKET,228,0,8,STATUS,,,,,,,0=FINISHED@@ 1=PROGRESS@@ 2=ABORTED_BY_ERR@@ 3=ABORTED_BY_CMD@@ *=N/A,, +,DCU.EXEC_LOGS1.EXEC_COUNTER,uint16_t,(uint16_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].exec_counter),PACKET,229,0,16,NONE,,,,,,,,, +,DCU.EXEC_LOGS1.LAST_EXEC_STS,int8_t,(int8_t)(divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_sts),PACKET,231,0,8,STATUS,,,,,,,0=SUC@@ 1=LEN@@ 2=PRM@@ 3=CNT@@ 4=NDF@@ 5=RUT@@ 6=FMT@@ *=ERR,, +,DCU.EXEC_LOGS1.LAST_EXEC_TIME.TOTAL_CYCLE,uint32_t,divided_cmd_utility->exec_logs[divided_cmd_utility->exec_log_order[1]].last_exec_time.total_cycle,PACKET,232,0,32,NONE,,,,,,,,, +,GIT_REV_CORE,uint32_t,GIT_REV_CORE_SHORT,PACKET,236,0,32,HEX,,,,,,,,, +,GIT_REV_USER,uint32_t,GIT_REV_USER_SHORT,PACKET,240,0,32,HEX,,,,,,,,, +,DUMMY_DATA1,uint32_t,0,PACKET,244,0,32,NONE,,,,,,,,, +,DUMMY_DATA2,uint32_t,0,PACKET,248,0,32,NONE,,,,,,,,, +,DUMMY_DATA3,uint32_t,0,PACKET,252,0,32,NONE,,,,,,,,, +,DUMMY_DATA4,uint32_t,0,PACKET,256,0,32,NONE,,,,,,,,, +,DUMMY_DATA5,uint32_t,0,PACKET,260,0,32,NONE,,,,,,,,, +,DUMMY_DATA6,uint32_t,0,PACKET,264,0,32,NONE,,,,,,,,, +,DUMMY_DATA7,uint32_t,0,PACKET,268,0,32,NONE,,,,,,,,, +,DUMMY_DATA8,uint32_t,0,PACKET,272,0,32,NONE,,,,,,,,, +,DUMMY_DATA9,uint32_t,0,PACKET,276,0,32,NONE,,,,,,,,, +,DUMMY_DATA10,uint32_t,0,PACKET,280,0,32,NONE,,,,,,,,, +,DUMMY_DATA11,uint32_t,0,PACKET,284,0,32,NONE,,,,,,,,, +,DUMMY_DATA12,uint32_t,0,PACKET,288,0,32,NONE,,,,,,,,, +,DUMMY_DATA13,uint32_t,0,PACKET,292,0,32,NONE,,,,,,,,, +,DUMMY_DATA14,uint32_t,0,PACKET,296,0,32,NONE,,,,,,,,, +,DUMMY_DATA15,uint32_t,0,PACKET,300,0,32,NONE,,,,,,,,, +,DUMMY_DATA16,uint32_t,0,PACKET,304,0,32,NONE,,,,,,,,, +,DUMMY_DATA17,uint32_t,0,PACKET,308,0,32,NONE,,,,,,,,, +,DUMMY_DATA18,uint32_t,0,PACKET,312,0,32,NONE,,,,,,,,, +,DUMMY_DATA19,uint32_t,0,PACKET,316,0,32,NONE,,,,,,,,, +,DUMMY_DATA20,uint32_t,0,PACKET,320,0,32,NONE,,,,,,,,, +,DUMMY_DATA21,uint32_t,0,PACKET,324,0,32,NONE,,,,,,,,, +,DUMMY_DATA22,uint32_t,0,PACKET,328,0,32,NONE,,,,,,,,, +,DUMMY_DATA23,uint32_t,0,PACKET,332,0,32,NONE,,,,,,,,, +,DUMMY_DATA24,uint32_t,0,PACKET,336,0,32,NONE,,,,,,,,, +,DUMMY_DATA25,uint32_t,0,PACKET,340,0,32,NONE,,,,,,,,, +,DUMMY_DATA26,uint32_t,0,PACKET,344,0,32,NONE,,,,,,,,, +,DUMMY_DATA27,uint32_t,0,PACKET,348,0,32,NONE,,,,,,,,, +,DUMMY_DATA28,uint32_t,0,PACKET,352,0,32,NONE,,,,,,,,, +,DUMMY_DATA29,uint32_t,0,PACKET,356,0,32,NONE,,,,,,,,, +,DUMMY_DATA30,uint32_t,0,PACKET,360,0,32,NONE,,,,,,,,, +,DUMMY_DATA31,uint32_t,0,PACKET,364,0,32,NONE,,,,,,,,, +,DUMMY_DATA32,uint32_t,0,PACKET,368,0,32,NONE,,,,,,,,, +,DUMMY_DATA33,uint32_t,0,PACKET,372,0,32,NONE,,,,,,,,, +,DUMMY_DATA34,uint32_t,0,PACKET,376,0,32,NONE,,,,,,,,, +,DUMMY_DATA35,uint32_t,0,PACKET,380,0,32,NONE,,,,,,,,, +,DUMMY_DATA36,uint32_t,0,PACKET,384,0,32,NONE,,,,,,,,, +,DUMMY_DATA37,uint32_t,0,PACKET,388,0,32,NONE,,,,,,,,, +,DUMMY_DATA38,uint32_t,0,PACKET,392,0,32,NONE,,,,,,,,, +,DUMMY_DATA39,uint32_t,0,PACKET,396,0,32,NONE,,,,,,,,, +,DUMMY_DATA40,uint32_t,0,PACKET,400,0,32,NONE,,,,,,,,, +,DUMMY_DATA41,uint32_t,0,PACKET,404,0,32,NONE,,,,,,,,, +,DUMMY_DATA42,uint32_t,0,PACKET,408,0,32,NONE,,,,,,,,, +,DUMMY_DATA43,uint32_t,0,PACKET,412,0,32,NONE,,,,,,,,, +,DUMMY_DATA44,uint32_t,0,PACKET,416,0,32,NONE,,,,,,,,, +,DUMMY_DATA45,uint32_t,0,PACKET,420,0,32,NONE,,,,,,,,, +,DUMMY_DATA46,uint32_t,0,PACKET,424,0,32,NONE,,,,,,,,, +,DUMMY_DATA47,uint32_t,0,PACKET,428,0,32,NONE,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, diff --git a/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h index 075278f0a..23fa261dc 100644 --- a/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h +++ b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/subobc/src/src_user/tlm_cmd/command_definitions.c b/examples/subobc/src/src_user/tlm_cmd/command_definitions.c index 23cf5a536..0c285395c 100644 --- a/examples/subobc/src/src_user/tlm_cmd/command_definitions.c +++ b/examples/subobc/src/src_user/tlm_cmd/command_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] @@ -135,6 +135,7 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS]) cmd_table[Cmd_CODE_WDT_DISABLE].cmd_func = Cmd_WDT_DISABLE; cmd_table[Cmd_CODE_WDT_STOP_CLEAR].cmd_func = Cmd_WDT_STOP_CLEAR; cmd_table[Cmd_CODE_WDT_START_CLEAR].cmd_func = Cmd_WDT_START_CLEAR; + cmd_table[Cmd_CODE_WDT_SET_TIMER].cmd_func = Cmd_WDT_SET_TIMER; cmd_table[Cmd_CODE_TMGR_SET_TIME].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE; cmd_table[Cmd_CODE_TMGR_UPDATE_UNIXTIME].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_8BYTE; @@ -268,6 +269,7 @@ void CA_load_cmd_table(CA_CmdInfo cmd_table[CA_MAX_CMDS]) cmd_table[Cmd_CODE_CA_REGISTER_CMD].param_size_infos[1].packed_info.bit.first = CA_PARAM_SIZE_TYPE_RAW; cmd_table[Cmd_CODE_TF_SET_PAGE_FOR_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE; cmd_table[Cmd_CODE_CA_SET_PAGE_FOR_TLM].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_1BYTE; + cmd_table[Cmd_CODE_WDT_SET_TIMER].param_size_infos[0].packed_info.bit.first = CA_PARAM_SIZE_TYPE_4BYTE; } #pragma section diff --git a/examples/subobc/src/src_user/tlm_cmd/command_definitions.h b/examples/subobc/src/src_user/tlm_cmd/command_definitions.h index 8375783b8..c236bf66c 100644 --- a/examples/subobc/src/src_user/tlm_cmd/command_definitions.h +++ b/examples/subobc/src/src_user/tlm_cmd/command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] @@ -133,6 +133,7 @@ typedef enum Cmd_CODE_WDT_DISABLE = 0x0102, //!< WDT無効化 Cmd_CODE_WDT_STOP_CLEAR = 0x0103, //!< WDTのカウンタクリアを止める＝リセット実行 Cmd_CODE_WDT_START_CLEAR = 0x0104, //!< WDTのカウンタクリアを開始する + Cmd_CODE_WDT_SET_TIMER = 0x0105, //!< WDTの監視周期を変更 (監視周期[ms]) Cmd_CODE_MAX } CMD_CODE; diff --git a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c index cf896b325..082033837 100644 --- a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c +++ b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] @@ -122,7 +122,7 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_AOBC_(uint8_t* packet, uint16_t* len, uint16_t m static TF_TLM_FUNC_ACK Tlm_AOBC_HK_(uint8_t* packet, uint16_t* len, uint16_t max_len) { - if (422 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; + if (426 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; #ifndef BUILD_SETTINGS_FAST_BUILD TF_copy_u32(&packet[26], TMGR_get_master_clock().mode_cycle); @@ -169,35 +169,35 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_HK_(uint8_t* packet, uint16_t* len, uint16_t max TF_copy_u8(&packet[145], (uint8_t)(PL_count_active_nodes(&PH_tl_cmd_list[TLCD_ID_DEPLOY_TLM]))); TF_copy_u8(&packet[146], (uint8_t)(((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].stop_on_error << 7 & 0x80) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_FROM_GS].lockout << 6 & 0x40) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].stop_on_error << 5 & 0x20) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_BC].lockout << 4 & 0x10) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].stop_on_error << 3 & 0x08) | ((uint8_t)timeline_command_dispatcher->dispatcher[TLCD_ID_DEPLOY_TLM].lockout << 2 & 0x04) | (0 << 1 & 0x02) | (0 & 0x01) )); TF_copy_u8(&packet[147], (uint8_t)((wdt_config->is_wdt_enable << 7 & 0x80) | (wdt_config->is_clear_enable << 6 & 0x40) | 0x00)); - TF_copy_u16(&packet[148], block_command_table->pos.block); - TF_copy_u8(&packet[150], (uint8_t)(block_command_table->pos.cmd)); - TF_copy_u32(&packet[151], ((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); - TF_copy_u16(&packet[155], (uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); - TF_copy_u32(&packet[157], event_logger->statistics.record_counter_total); - TF_copy_u16(&packet[161], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH]); - TF_copy_u16(&packet[163], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE]); - TF_copy_u16(&packet[165], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW]); - TF_copy_u16(&packet[167], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL]); - TF_copy_u16(&packet[169], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH]); - TF_copy_u8(&packet[171], (uint8_t)event_logger->latest_event.group); - TF_copy_u32(&packet[172], event_logger->latest_event.local); - TF_copy_u8(&packet[176], (uint8_t)event_logger->latest_event.err_level); - TF_copy_u32(&packet[177], event_logger->latest_event.time.total_cycle); - TF_copy_u8(&packet[181], (uint8_t)event_logger->latest_event.time.step); - TF_copy_u32(&packet[182], event_logger->latest_event.note); - TF_copy_u8(&packet[186], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->group); - TF_copy_u32(&packet[187], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->local); - TF_copy_u32(&packet[191], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.total_cycle); - TF_copy_u8(&packet[195], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.step); - TF_copy_u16(&packet[196], (uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->note); - TF_copy_u32(&packet[198], event_handler->log_table.respond_counter); - TF_copy_u32(&packet[202], GIT_REV_CORE_SHORT); - TF_copy_u32(&packet[206], GIT_REV_USER_SHORT); - TF_copy_u8(&packet[210], (uint8_t)(block_command_table->pos.block)); - TF_copy_u8(&packet[211], (uint8_t)(block_command_table->pos.cmd)); - TF_copy_u32(&packet[212], ((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); - TF_copy_u16(&packet[216], (uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); - TF_copy_u32(&packet[218], 0); + TF_copy_u32(&packet[148], (uint32_t)wdt_config->timer_setting); + TF_copy_u16(&packet[152], block_command_table->pos.block); + TF_copy_u8(&packet[154], (uint8_t)(block_command_table->pos.cmd)); + TF_copy_u32(&packet[155], ((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); + TF_copy_u16(&packet[159], (uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); + TF_copy_u32(&packet[161], event_logger->statistics.record_counter_total); + TF_copy_u16(&packet[165], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH]); + TF_copy_u16(&packet[167], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE]); + TF_copy_u16(&packet[169], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW]); + TF_copy_u16(&packet[171], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL]); + TF_copy_u16(&packet[173], (uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH]); + TF_copy_u8(&packet[175], (uint8_t)event_logger->latest_event.group); + TF_copy_u32(&packet[176], event_logger->latest_event.local); + TF_copy_u8(&packet[180], (uint8_t)event_logger->latest_event.err_level); + TF_copy_u32(&packet[181], event_logger->latest_event.time.total_cycle); + TF_copy_u8(&packet[185], (uint8_t)event_logger->latest_event.time.step); + TF_copy_u32(&packet[186], event_logger->latest_event.note); + TF_copy_u8(&packet[190], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->group); + TF_copy_u32(&packet[191], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->local); + TF_copy_u32(&packet[195], EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.total_cycle); + TF_copy_u8(&packet[199], (uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->time.step); + TF_copy_u16(&packet[200], (uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH, 0)->note); + TF_copy_u32(&packet[202], event_handler->log_table.respond_counter); + TF_copy_u32(&packet[206], GIT_REV_CORE_SHORT); + TF_copy_u32(&packet[210], GIT_REV_USER_SHORT); + TF_copy_u8(&packet[214], (uint8_t)(block_command_table->pos.block)); + TF_copy_u8(&packet[215], (uint8_t)(block_command_table->pos.cmd)); + TF_copy_u32(&packet[216], ((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); + TF_copy_u16(&packet[220], (uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block, (uint8_t)(block_command_table->pos.cmd-1)))); TF_copy_u32(&packet[222], 0); TF_copy_u32(&packet[226], 0); TF_copy_u32(&packet[230], 0); @@ -248,9 +248,10 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_HK_(uint8_t* packet, uint16_t* len, uint16_t max TF_copy_u32(&packet[410], 0); TF_copy_u32(&packet[414], 0); TF_copy_u32(&packet[418], 0); + TF_copy_u32(&packet[422], 0); #endif - *len = 422; + *len = 426; return TF_TLM_FUNC_ACK_SUCCESS; } diff --git a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h index cd47482d9..cdd566b71 100644 --- a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h +++ b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 0e38aad788fca6fba1d44684152ac1a2 + * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv b/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv index 28b2320f9..2cdc10ac7 100644 --- a/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv +++ b/examples/subobc/tlm-cmd-db/CMD_DB/SAMPLE_AOBC_CMD_DB_CMD_DB.csv @@ -131,6 +131,7 @@ Comment,,,,,Type,Description,Type,Description,Type,Description,Type,Description, ,WDT_DISABLE,OBC,0x0102,0,,,,,,,,,,,,,,,WDT無効化, ,WDT_STOP_CLEAR,OBC,0x0103,0,,,,,,,,,,,,,danger,,WDTのカウンタクリアを止める＝リセット実行, ,WDT_START_CLEAR,OBC,0x0104,0,,,,,,,,,,,,,,,WDTのカウンタクリアを開始する, +,WDT_SET_TIMER,OBC,0x0105,1,uint32_t,監視周期,,,,,,,,,,,,,WDTの監視周期を変更,監視周期[ms] **,,,,,,,,,,,,,,,,,,,, * POWER,,,,,,,,,,,,,,,,,,,, **,,,,,,,,,,,,,,,,,,,, @@ -997,4 +998,3 @@ Comment,,,,,Type,Description,Type,Description,Type,Description,Type,Description, ,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,,,,, diff --git a/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv index 4955c9cc6..53c6d847a 100644 --- a/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv +++ b/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv @@ -74,6 +74,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,WDT.IS_ENABLE,uint8_t,(uint8_t)((wdt_config->is_wdt_enable << 7 & 0x80) | (wdt_config->is_clear_enable << 6 & 0x40) | 0x00),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,WDT.IS_CLEAR_ENABLE,||,||,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,DUMMY_DATA0,||,||,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),6,NONE,,,,,,,,, +,WDT.TIMER,uint32_t,(uint32_t)wdt_config->timer_setting,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,OBC.BCT_BLK_PTR,uint16_t,block_command_table->pos.block,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT ブロックポインタ, ,OBC.BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT コマンドポインタ, ,OBC.BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに… @@ -497,4 +498,3 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, -,,,,,,,,,,,,,,,,, diff --git a/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv index 507d0d508..5a5264f51 100644 --- a/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv +++ b/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv @@ -74,86 +74,86 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,WDT.IS_ENABLE,uint8_t,(uint8_t)((wdt_config->is_wdt_enable << 7 & 0x80) | (wdt_config->is_clear_enable << 6 & 0x40) | 0x00),PACKET,147,0,1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,WDT.IS_CLEAR_ENABLE,,,PACKET,147,1,1,STATUS,,,,,,,0=DIS@@ 1=ENA,, ,DUMMY_DATA0,,,PACKET,147,2,6,NONE,,,,,,,,, -,OBC.BCT_BLK_PTR,uint16_t,block_command_table->pos.block,PACKET,148,0,16,NONE,,,,,,,,BCT ブロックポインタ, -,OBC.BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,150,0,8,NONE,,,,,,,,BCT コマンドポインタ, -,OBC.BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,151,0,32,NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに… -,OBC.BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,155,0,16,NONE,,,,,,,,BCT 登録コマンドID,変数指定が大変なことに… -,EL.STATISTICS.RECORD_COUNTER_TOTAL,uint32_t,event_logger->statistics.record_counter_total,PACKET,157,0,32,NONE,,,,,,,,, -,EL.STATISTICS.RECORD_COUNTERS_HIGH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH],PACKET,161,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_MIDDLE,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE],PACKET,163,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_LOW,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW],PACKET,165,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_EL,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL],PACKET,167,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.STATISTICS.RECORD_COUNTERS_EH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH],PACKET,169,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 -,EL.LATEST_EVENT.GROUP,uint8_t,(uint8_t)event_logger->latest_event.group,PACKET,171,0,8,NONE,,,,,,,,, -,EL.LATEST_EVENT.LOCAL,uint32_t,event_logger->latest_event.local,PACKET,172,0,32,NONE,,,,,,,,, -,EL.LATEST_EVENT.ERR_LEVEL,uint8_t,(uint8_t)event_logger->latest_event.err_level,PACKET,176,0,8,STATUS,,,,,,,0=HIGH@@ 1=MIDDLE@@ 2=LOW@@ 3=EL@@ 4=EH@@ *=N/A,, -,EL.LATEST_EVENT.TIME.TOTAL_CYCLE,uint32_t,event_logger->latest_event.time.total_cycle,PACKET,177,0,32,NONE,,,,,,,,, -,EL.LATEST_EVENT.TIME.STEP,uint8_t,(uint8_t)event_logger->latest_event.time.step,PACKET,181,0,8,NONE,,,,,,,,, -,EL.LATEST_EVENT.NOTE,uint32_t,event_logger->latest_event.note,PACKET,182,0,32,NONE,,,,,,,,,u8にしてもよい -,EL.LATEST_HIGH_EVENT.GROUP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->group,PACKET,186,0,8,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.LOCAL,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->local,PACKET,187,0,32,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.TIME.TOTAL_CYCLE,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.total_cycle,PACKET,191,0,32,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.TIME.STEP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.step,PACKET,195,0,8,NONE,,,,,,,,, -,EL.LATEST_HIGH_EVENT.NOTE,uint16_t,(uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->note,PACKET,196,0,16,NONE,,,,,,,,,u8にしてもよい -,EH.LOG_TABLE.RESPOND_COUNTER,uint32_t,event_handler->log_table.respond_counter,PACKET,198,0,32,NONE,,,,,,,,, -,GIT_REV_CORE,uint32_t,GIT_REV_CORE_SHORT,PACKET,202,0,32,HEX,,,,,,,,, -,GIT_REV_USER,uint32_t,GIT_REV_USER_SHORT,PACKET,206,0,32,HEX,,,,,,,,, -,BCT_BLK_PTR,uint8_t,(uint8_t)(block_command_table->pos.block),PACKET,210,0,8,NONE,,,,,,,,BCT ブロックポインタ, -,BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,211,0,8,NONE,,,,,,,,BCT コマンドポインタ, -,BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,212,0,32,NONE,,,,,,,,BCT 登録コマンド時刻, -,BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,216,0,16,NONE,,,,,,,,BCT 登録コマンドID, -,DUMMY_DATA1,uint32_t,0,PACKET,218,0,32,NONE,,,,,,,,, -,DUMMY_DATA2,uint32_t,0,PACKET,222,0,32,NONE,,,,,,,,, -,DUMMY_DATA3,uint32_t,0,PACKET,226,0,32,NONE,,,,,,,,, -,DUMMY_DATA4,uint32_t,0,PACKET,230,0,32,NONE,,,,,,,,, -,DUMMY_DATA5,uint32_t,0,PACKET,234,0,32,NONE,,,,,,,,, -,DUMMY_DATA6,uint32_t,0,PACKET,238,0,32,NONE,,,,,,,,, -,DUMMY_DATA7,uint32_t,0,PACKET,242,0,32,NONE,,,,,,,,, -,DUMMY_DATA8,uint32_t,0,PACKET,246,0,32,NONE,,,,,,,,, -,DUMMY_DATA9,uint32_t,0,PACKET,250,0,32,NONE,,,,,,,,, -,DUMMY_DATA10,uint32_t,0,PACKET,254,0,32,NONE,,,,,,,,, -,DUMMY_DATA11,uint32_t,0,PACKET,258,0,32,NONE,,,,,,,,, -,DUMMY_DATA12,uint32_t,0,PACKET,262,0,32,NONE,,,,,,,,, -,DUMMY_DATA13,uint32_t,0,PACKET,266,0,32,NONE,,,,,,,,, -,DUMMY_DATA14,uint32_t,0,PACKET,270,0,32,NONE,,,,,,,,, -,DUMMY_DATA15,uint32_t,0,PACKET,274,0,32,NONE,,,,,,,,, -,DUMMY_DATA16,uint32_t,0,PACKET,278,0,32,NONE,,,,,,,,, -,DUMMY_DATA17,uint32_t,0,PACKET,282,0,32,NONE,,,,,,,,, -,DUMMY_DATA18,uint32_t,0,PACKET,286,0,32,NONE,,,,,,,,, -,DUMMY_DATA19,uint32_t,0,PACKET,290,0,32,NONE,,,,,,,,, -,DUMMY_DATA20,uint32_t,0,PACKET,294,0,32,NONE,,,,,,,,, -,DUMMY_DATA21,uint32_t,0,PACKET,298,0,32,NONE,,,,,,,,, -,DUMMY_DATA22,uint32_t,0,PACKET,302,0,32,NONE,,,,,,,,, -,DUMMY_DATA23,uint32_t,0,PACKET,306,0,32,NONE,,,,,,,,, -,DUMMY_DATA24,uint32_t,0,PACKET,310,0,32,NONE,,,,,,,,, -,DUMMY_DATA25,uint32_t,0,PACKET,314,0,32,NONE,,,,,,,,, -,DUMMY_DATA26,uint32_t,0,PACKET,318,0,32,NONE,,,,,,,,, -,DUMMY_DATA27,uint32_t,0,PACKET,322,0,32,NONE,,,,,,,,, -,DUMMY_DATA28,uint32_t,0,PACKET,326,0,32,NONE,,,,,,,,, -,DUMMY_DATA29,uint32_t,0,PACKET,330,0,32,NONE,,,,,,,,, -,DUMMY_DATA30,uint32_t,0,PACKET,334,0,32,NONE,,,,,,,,, -,DUMMY_DATA31,uint32_t,0,PACKET,338,0,32,NONE,,,,,,,,, -,DUMMY_DATA32,uint32_t,0,PACKET,342,0,32,NONE,,,,,,,,, -,DUMMY_DATA33,uint32_t,0,PACKET,346,0,32,NONE,,,,,,,,, -,DUMMY_DATA34,uint32_t,0,PACKET,350,0,32,NONE,,,,,,,,, -,DUMMY_DATA35,uint32_t,0,PACKET,354,0,32,NONE,,,,,,,,, -,DUMMY_DATA36,uint32_t,0,PACKET,358,0,32,NONE,,,,,,,,, -,DUMMY_DATA37,uint32_t,0,PACKET,362,0,32,NONE,,,,,,,,, -,DUMMY_DATA38,uint32_t,0,PACKET,366,0,32,NONE,,,,,,,,, -,DUMMY_DATA39,uint32_t,0,PACKET,370,0,32,NONE,,,,,,,,, -,DUMMY_DATA40,uint32_t,0,PACKET,374,0,32,NONE,,,,,,,,, -,DUMMY_DATA41,uint32_t,0,PACKET,378,0,32,NONE,,,,,,,,, -,DUMMY_DATA42,uint32_t,0,PACKET,382,0,32,NONE,,,,,,,,, -,DUMMY_DATA43,uint32_t,0,PACKET,386,0,32,NONE,,,,,,,,, -,DUMMY_DATA44,uint32_t,0,PACKET,390,0,32,NONE,,,,,,,,, -,DUMMY_DATA45,uint32_t,0,PACKET,394,0,32,NONE,,,,,,,,, -,DUMMY_DATA46,uint32_t,0,PACKET,398,0,32,NONE,,,,,,,,, -,DUMMY_DATA47,uint32_t,0,PACKET,402,0,32,NONE,,,,,,,,, -,DUMMY_DATA48,uint32_t,0,PACKET,406,0,32,NONE,,,,,,,,, -,DUMMY_DATA49,uint32_t,0,PACKET,410,0,32,NONE,,,,,,,,, -,DUMMY_DATA50,uint32_t,0,PACKET,414,0,32,NONE,,,,,,,,, -,DUMMY_DATA51,uint32_t,0,PACKET,418,0,32,NONE,,,,,,,,, -,,,,,,,,,,,,,,,,, +,WDT.TIMER,uint32_t,(uint32_t)wdt_config->timer_setting,PACKET,148,0,32,NONE,,,,,,,,, +,OBC.BCT_BLK_PTR,uint16_t,block_command_table->pos.block,PACKET,152,0,16,NONE,,,,,,,,BCT ブロックポインタ, +,OBC.BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,154,0,8,NONE,,,,,,,,BCT コマンドポインタ, +,OBC.BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,155,0,32,NONE,,,,,,,,BCT 登録コマンド時刻,変数指定が大変なことに… +,OBC.BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,159,0,16,NONE,,,,,,,,BCT 登録コマンドID,変数指定が大変なことに… +,EL.STATISTICS.RECORD_COUNTER_TOTAL,uint32_t,event_logger->statistics.record_counter_total,PACKET,161,0,32,NONE,,,,,,,,, +,EL.STATISTICS.RECORD_COUNTERS_HIGH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_HIGH],PACKET,165,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_MIDDLE,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_MIDDLE],PACKET,167,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_LOW,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_LOW],PACKET,169,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_EL,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EL],PACKET,171,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.STATISTICS.RECORD_COUNTERS_EH,uint16_t,(uint16_t)event_logger->statistics.record_counters[EL_ERROR_LEVEL_EH],PACKET,173,0,16,NONE,,,,,,,,,データサイズ減らすためにu16 +,EL.LATEST_EVENT.GROUP,uint8_t,(uint8_t)event_logger->latest_event.group,PACKET,175,0,8,NONE,,,,,,,,, +,EL.LATEST_EVENT.LOCAL,uint32_t,event_logger->latest_event.local,PACKET,176,0,32,NONE,,,,,,,,, +,EL.LATEST_EVENT.ERR_LEVEL,uint8_t,(uint8_t)event_logger->latest_event.err_level,PACKET,180,0,8,STATUS,,,,,,,0=HIGH@@ 1=MIDDLE@@ 2=LOW@@ 3=EL@@ 4=EH@@ *=N/A,, +,EL.LATEST_EVENT.TIME.TOTAL_CYCLE,uint32_t,event_logger->latest_event.time.total_cycle,PACKET,181,0,32,NONE,,,,,,,,, +,EL.LATEST_EVENT.TIME.STEP,uint8_t,(uint8_t)event_logger->latest_event.time.step,PACKET,185,0,8,NONE,,,,,,,,, +,EL.LATEST_EVENT.NOTE,uint32_t,event_logger->latest_event.note,PACKET,186,0,32,NONE,,,,,,,,,u8にしてもよい +,EL.LATEST_HIGH_EVENT.GROUP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->group,PACKET,190,0,8,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.LOCAL,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->local,PACKET,191,0,32,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.TIME.TOTAL_CYCLE,uint32_t,EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.total_cycle,PACKET,195,0,32,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.TIME.STEP,uint8_t,(uint8_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->time.step,PACKET,199,0,8,NONE,,,,,,,,, +,EL.LATEST_HIGH_EVENT.NOTE,uint16_t,(uint16_t)EL_get_the_nth_tlog_from_the_latest(EL_ERROR_LEVEL_HIGH@@ 0)->note,PACKET,200,0,16,NONE,,,,,,,,,u8にしてもよい +,EH.LOG_TABLE.RESPOND_COUNTER,uint32_t,event_handler->log_table.respond_counter,PACKET,202,0,32,NONE,,,,,,,,, +,GIT_REV_CORE,uint32_t,GIT_REV_CORE_SHORT,PACKET,206,0,32,HEX,,,,,,,,, +,GIT_REV_USER,uint32_t,GIT_REV_USER_SHORT,PACKET,210,0,32,HEX,,,,,,,,, +,BCT_BLK_PTR,uint8_t,(uint8_t)(block_command_table->pos.block),PACKET,214,0,8,NONE,,,,,,,,BCT ブロックポインタ, +,BCT_CMD_PTR,uint8_t,(uint8_t)(block_command_table->pos.cmd),PACKET,215,0,8,NONE,,,,,,,,BCT コマンドポインタ, +,BCT_REGD_TIME,uint32_t,((block_command_table->pos.cmd == 0) ? 0 : (uint32_t)BCT_get_ti(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,216,0,32,NONE,,,,,,,,BCT 登録コマンド時刻, +,BCT_REGD_ID,uint16_t,(uint16_t)((block_command_table->pos.cmd == 0) ? 0 : BCT_get_id(block_command_table->pos.block@@ (uint8_t)(block_command_table->pos.cmd-1))),PACKET,220,0,16,NONE,,,,,,,,BCT 登録コマンドID, +,DUMMY_DATA1,uint32_t,0,PACKET,222,0,32,NONE,,,,,,,,, +,DUMMY_DATA2,uint32_t,0,PACKET,226,0,32,NONE,,,,,,,,, +,DUMMY_DATA3,uint32_t,0,PACKET,230,0,32,NONE,,,,,,,,, +,DUMMY_DATA4,uint32_t,0,PACKET,234,0,32,NONE,,,,,,,,, +,DUMMY_DATA5,uint32_t,0,PACKET,238,0,32,NONE,,,,,,,,, +,DUMMY_DATA6,uint32_t,0,PACKET,242,0,32,NONE,,,,,,,,, +,DUMMY_DATA7,uint32_t,0,PACKET,246,0,32,NONE,,,,,,,,, +,DUMMY_DATA8,uint32_t,0,PACKET,250,0,32,NONE,,,,,,,,, +,DUMMY_DATA9,uint32_t,0,PACKET,254,0,32,NONE,,,,,,,,, +,DUMMY_DATA10,uint32_t,0,PACKET,258,0,32,NONE,,,,,,,,, +,DUMMY_DATA11,uint32_t,0,PACKET,262,0,32,NONE,,,,,,,,, +,DUMMY_DATA12,uint32_t,0,PACKET,266,0,32,NONE,,,,,,,,, +,DUMMY_DATA13,uint32_t,0,PACKET,270,0,32,NONE,,,,,,,,, +,DUMMY_DATA14,uint32_t,0,PACKET,274,0,32,NONE,,,,,,,,, +,DUMMY_DATA15,uint32_t,0,PACKET,278,0,32,NONE,,,,,,,,, +,DUMMY_DATA16,uint32_t,0,PACKET,282,0,32,NONE,,,,,,,,, +,DUMMY_DATA17,uint32_t,0,PACKET,286,0,32,NONE,,,,,,,,, +,DUMMY_DATA18,uint32_t,0,PACKET,290,0,32,NONE,,,,,,,,, +,DUMMY_DATA19,uint32_t,0,PACKET,294,0,32,NONE,,,,,,,,, +,DUMMY_DATA20,uint32_t,0,PACKET,298,0,32,NONE,,,,,,,,, +,DUMMY_DATA21,uint32_t,0,PACKET,302,0,32,NONE,,,,,,,,, +,DUMMY_DATA22,uint32_t,0,PACKET,306,0,32,NONE,,,,,,,,, +,DUMMY_DATA23,uint32_t,0,PACKET,310,0,32,NONE,,,,,,,,, +,DUMMY_DATA24,uint32_t,0,PACKET,314,0,32,NONE,,,,,,,,, +,DUMMY_DATA25,uint32_t,0,PACKET,318,0,32,NONE,,,,,,,,, +,DUMMY_DATA26,uint32_t,0,PACKET,322,0,32,NONE,,,,,,,,, +,DUMMY_DATA27,uint32_t,0,PACKET,326,0,32,NONE,,,,,,,,, +,DUMMY_DATA28,uint32_t,0,PACKET,330,0,32,NONE,,,,,,,,, +,DUMMY_DATA29,uint32_t,0,PACKET,334,0,32,NONE,,,,,,,,, +,DUMMY_DATA30,uint32_t,0,PACKET,338,0,32,NONE,,,,,,,,, +,DUMMY_DATA31,uint32_t,0,PACKET,342,0,32,NONE,,,,,,,,, +,DUMMY_DATA32,uint32_t,0,PACKET,346,0,32,NONE,,,,,,,,, +,DUMMY_DATA33,uint32_t,0,PACKET,350,0,32,NONE,,,,,,,,, +,DUMMY_DATA34,uint32_t,0,PACKET,354,0,32,NONE,,,,,,,,, +,DUMMY_DATA35,uint32_t,0,PACKET,358,0,32,NONE,,,,,,,,, +,DUMMY_DATA36,uint32_t,0,PACKET,362,0,32,NONE,,,,,,,,, +,DUMMY_DATA37,uint32_t,0,PACKET,366,0,32,NONE,,,,,,,,, +,DUMMY_DATA38,uint32_t,0,PACKET,370,0,32,NONE,,,,,,,,, +,DUMMY_DATA39,uint32_t,0,PACKET,374,0,32,NONE,,,,,,,,, +,DUMMY_DATA40,uint32_t,0,PACKET,378,0,32,NONE,,,,,,,,, +,DUMMY_DATA41,uint32_t,0,PACKET,382,0,32,NONE,,,,,,,,, +,DUMMY_DATA42,uint32_t,0,PACKET,386,0,32,NONE,,,,,,,,, +,DUMMY_DATA43,uint32_t,0,PACKET,390,0,32,NONE,,,,,,,,, +,DUMMY_DATA44,uint32_t,0,PACKET,394,0,32,NONE,,,,,,,,, +,DUMMY_DATA45,uint32_t,0,PACKET,398,0,32,NONE,,,,,,,,, +,DUMMY_DATA46,uint32_t,0,PACKET,402,0,32,NONE,,,,,,,,, +,DUMMY_DATA47,uint32_t,0,PACKET,406,0,32,NONE,,,,,,,,, +,DUMMY_DATA48,uint32_t,0,PACKET,410,0,32,NONE,,,,,,,,, +,DUMMY_DATA49,uint32_t,0,PACKET,414,0,32,NONE,,,,,,,,, +,DUMMY_DATA50,uint32_t,0,PACKET,418,0,32,NONE,,,,,,,,, +,DUMMY_DATA51,uint32_t,0,PACKET,422,0,32,NONE,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, diff --git a/system/watchdog_timer/watchdog_timer.c b/system/watchdog_timer/watchdog_timer.c index fb4e3b0dd..dc535e8ae 100644 --- a/system/watchdog_timer/watchdog_timer.c +++ b/system/watchdog_timer/watchdog_timer.c @@ -102,6 +102,21 @@ CCP_CmdRet Cmd_WDT_START_CLEAR(const CommonCmdPacket* packet) return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS); } +CCP_CmdRet Cmd_WDT_SET_TIMER(const CommonCmdPacket* packet) +{ + uint32_t timer; + int ret; + (void)packet; + timer = *(uint32_t*)CCP_get_4byte_param_from_packet(packet, 0); + ret = WDT_set_timer((void*)&wdt_config_, timer); + Printf("WDT timer set to %d\n", (uint32_t)wdt_config->timer_setting); + if (ret != 0) + { + return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT); + } + return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS); +} + #pragma section // ### // !!!!! this line should not delete!!! diff --git a/system/watchdog_timer/watchdog_timer.h b/system/watchdog_timer/watchdog_timer.h index bcc00f5af..dfad7309c 100644 --- a/system/watchdog_timer/watchdog_timer.h +++ b/system/watchdog_timer/watchdog_timer.h @@ -36,5 +36,6 @@ CCP_CmdRet Cmd_WDT_ENABLE(const CommonCmdPacket* packet); CCP_CmdRet Cmd_WDT_DISABLE(const CommonCmdPacket* packet); CCP_CmdRet Cmd_WDT_STOP_CLEAR(const CommonCmdPacket* packet); CCP_CmdRet Cmd_WDT_START_CLEAR(const CommonCmdPacket* packet); +CCP_CmdRet Cmd_WDT_SET_TIMER(const CommonCmdPacket* packet); #endif From edeb9544af42011634de4174652f8a7be68efd10 Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Wed, 13 Nov 2024 15:16:26 +0900 Subject: [PATCH 2/9] add pytest --- .../src_core/system/watchdog_timer/test_watchdog_timer.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py b/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py index d476e3d9d..bc2fc6d80 100644 --- a/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py +++ b/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py @@ -55,6 +55,13 @@ def test_wdt_at_sils(): assert tlm_HK["HK.WDT.IS_ENABLE"] == "ENA" assert tlm_HK["HK.WDT.IS_CLEAR_ENABLE"] == "ENA" + wings.util.send_cmd_and_confirm( + ope, c2a_enum.Cmd_CODE_WDT_SET_TIMER, (1000, ), c2a_enum.Tlm_CODE_HK + ) + tlm_HK = wings.util.generate_and_receive_tlm( + ope, c2a_enum.Cmd_CODE_TG_GENERATE_RT_TLM, c2a_enum.Tlm_CODE_HK + ) + assert tlm_HK["HK.WDT.TIMER"] == 1000 @pytest.mark.real def test_wdt_at_real(): From 86262ed2db69b0334fd96d9330fd9272c34a9dbe Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Wed, 13 Nov 2024 15:18:51 +0900 Subject: [PATCH 3/9] fix --- .../test/src_core/system/watchdog_timer/test_watchdog_timer.py | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py b/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py index bc2fc6d80..6ab23b5cc 100644 --- a/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py +++ b/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py @@ -63,6 +63,7 @@ def test_wdt_at_sils(): ) assert tlm_HK["HK.WDT.TIMER"] == 1000 + @pytest.mark.real def test_wdt_at_real(): pass From 01e231676105cab4624cb8afeeb4157d1acb9589 Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Wed, 13 Nov 2024 15:22:11 +0900 Subject: [PATCH 4/9] fix --- .../test/src_core/system/watchdog_timer/test_watchdog_timer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py b/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py index 6ab23b5cc..639f47290 100644 --- a/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py +++ b/examples/mobc/src/src_user/test/src_core/system/watchdog_timer/test_watchdog_timer.py @@ -56,7 +56,7 @@ def test_wdt_at_sils(): assert tlm_HK["HK.WDT.IS_CLEAR_ENABLE"] == "ENA" wings.util.send_cmd_and_confirm( - ope, c2a_enum.Cmd_CODE_WDT_SET_TIMER, (1000, ), c2a_enum.Tlm_CODE_HK + ope, c2a_enum.Cmd_CODE_WDT_SET_TIMER, (1000,), c2a_enum.Tlm_CODE_HK ) tlm_HK = wings.util.generate_and_receive_tlm( ope, c2a_enum.Cmd_CODE_TG_GENERATE_RT_TLM, c2a_enum.Tlm_CODE_HK From 410aed19f95bf9ea02c8dfa19f9196e1f17401ad Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Fri, 15 Nov 2024 18:00:52 +0900 Subject: [PATCH 5/9] ret_err_code Co-authored-by: Ryo Suzumoto --- system/watchdog_timer/watchdog_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/watchdog_timer/watchdog_timer.c b/system/watchdog_timer/watchdog_timer.c index dc535e8ae..3ca53bf9c 100644 --- a/system/watchdog_timer/watchdog_timer.c +++ b/system/watchdog_timer/watchdog_timer.c @@ -112,7 +112,7 @@ CCP_CmdRet Cmd_WDT_SET_TIMER(const CommonCmdPacket* packet) Printf("WDT timer set to %d\n", (uint32_t)wdt_config->timer_setting); if (ret != 0) { - return CCP_make_cmd_ret_without_err_code(CCP_EXEC_ILLEGAL_CONTEXT); + return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_CONTEXT, (uint32_t)ret); } return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS); } From 75b9e3e928f6ab9df2369b2e53b83320f6cca7f9 Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Fri, 15 Nov 2024 18:01:34 +0900 Subject: [PATCH 6/9] CCP_get_param_from_packet Co-authored-by: Ryo Suzumoto --- system/watchdog_timer/watchdog_timer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/system/watchdog_timer/watchdog_timer.c b/system/watchdog_timer/watchdog_timer.c index 3ca53bf9c..cd628368f 100644 --- a/system/watchdog_timer/watchdog_timer.c +++ b/system/watchdog_timer/watchdog_timer.c @@ -104,11 +104,9 @@ CCP_CmdRet Cmd_WDT_START_CLEAR(const CommonCmdPacket* packet) CCP_CmdRet Cmd_WDT_SET_TIMER(const CommonCmdPacket* packet) { - uint32_t timer; - int ret; (void)packet; - timer = *(uint32_t*)CCP_get_4byte_param_from_packet(packet, 0); - ret = WDT_set_timer((void*)&wdt_config_, timer); + uint32_t timer = CCP_get_param_from_packet(packet, 0, uint32_t ); + int ret = WDT_set_timer((void*)&wdt_config_, timer); Printf("WDT timer set to %d\n", (uint32_t)wdt_config->timer_setting); if (ret != 0) { From d3d74851c7541df7a35691b7588ee5f29c40a8c6 Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Fri, 15 Nov 2024 18:03:32 +0900 Subject: [PATCH 7/9] delete Printf --- system/watchdog_timer/watchdog_timer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/watchdog_timer/watchdog_timer.c b/system/watchdog_timer/watchdog_timer.c index cd628368f..3d2b68d69 100644 --- a/system/watchdog_timer/watchdog_timer.c +++ b/system/watchdog_timer/watchdog_timer.c @@ -105,13 +105,15 @@ CCP_CmdRet Cmd_WDT_START_CLEAR(const CommonCmdPacket* packet) CCP_CmdRet Cmd_WDT_SET_TIMER(const CommonCmdPacket* packet) { (void)packet; + uint32_t timer = CCP_get_param_from_packet(packet, 0, uint32_t ); int ret = WDT_set_timer((void*)&wdt_config_, timer); - Printf("WDT timer set to %d\n", (uint32_t)wdt_config->timer_setting); + if (ret != 0) { return CCP_make_cmd_ret(CCP_EXEC_ILLEGAL_CONTEXT, (uint32_t)ret); } + return CCP_make_cmd_ret_without_err_code(CCP_EXEC_SUCCESS); } From 2ee4ca01ac9e153ad5671146ac9f5f72919b471d Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Fri, 15 Nov 2024 20:24:12 +0900 Subject: [PATCH 8/9] delete (void)packet --- system/watchdog_timer/watchdog_timer.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/system/watchdog_timer/watchdog_timer.c b/system/watchdog_timer/watchdog_timer.c index 3d2b68d69..fed47881e 100644 --- a/system/watchdog_timer/watchdog_timer.c +++ b/system/watchdog_timer/watchdog_timer.c @@ -104,8 +104,6 @@ CCP_CmdRet Cmd_WDT_START_CLEAR(const CommonCmdPacket* packet) CCP_CmdRet Cmd_WDT_SET_TIMER(const CommonCmdPacket* packet) { - (void)packet; - uint32_t timer = CCP_get_param_from_packet(packet, 0, uint32_t ); int ret = WDT_set_timer((void*)&wdt_config_, timer); From 4eb84aba99a4883cd698962829623a97719f336a Mon Sep 17 00:00:00 2001 From: 771-8bit Date: Fri, 15 Nov 2024 20:38:30 +0900 Subject: [PATCH 9/9] delete dummy tlm --- .../component_driver/aocs/aobc_command_definitions.h | 4 ++-- .../src_user/component_driver/aocs/aobc_telemetry_buffer.c | 5 ++--- .../src_user/component_driver/aocs/aobc_telemetry_buffer.h | 4 ++-- .../aocs/aobc_telemetry_data_definitions.h | 5 ++--- .../component_driver/aocs/aobc_telemetry_definitions.h | 4 ++-- .../mobc/src/src_user/tlm_cmd/block_command_definitions.h | 2 +- examples/mobc/src/src_user/tlm_cmd/command_definitions.c | 2 +- examples/mobc/src/src_user/tlm_cmd/command_definitions.h | 2 +- examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c | 7 +++---- examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h | 2 +- examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv | 2 +- .../TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv | 2 +- .../src/src_user/tlm_cmd/block_command_definitions.h | 2 +- examples/subobc/src/src_user/tlm_cmd/command_definitions.c | 2 +- examples/subobc/src/src_user/tlm_cmd/command_definitions.h | 2 +- .../subobc/src/src_user/tlm_cmd/telemetry_definitions.c | 7 +++---- .../subobc/src/src_user/tlm_cmd/telemetry_definitions.h | 2 +- .../tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv | 2 +- .../TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv | 2 +- 19 files changed, 28 insertions(+), 32 deletions(-) diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h index 5215e06b5..f6e3e67d1 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_command_definitions.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 - * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd + * db commit hash: 2ee4ca01ac9e153ad5671146ac9f5f72919b471d * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c index c29436d15..eaa44f193 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.c @@ -5,8 +5,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 - * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd + * db commit hash: 2ee4ca01ac9e153ad5671146ac9f5f72919b471d * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC @@ -440,7 +440,6 @@ static CDS_ERR_CODE AOBC_analyze_tlm_aobc_hk_(const CommonTlmPacket* packet, AOB ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data48), &(f[410]), 4); ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data49), &(f[414]), 4); ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data50), &(f[418]), 4); - ENDIAN_memcpy(&(aobc_driver->tlm_data.aobc_hk.dummy_data51), &(f[422]), 4); // TODO: ビットフィールドをつかっている系は，様々なパターンがあり得るので，今後，バグが出ないか注視する // ワーニング回避 diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h index f6cd95a01..b7927e011 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_buffer.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 - * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd + * db commit hash: 2ee4ca01ac9e153ad5671146ac9f5f72919b471d * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h index 0d1d5dd79..16209f7b8 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_data_definitions.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 - * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd + * db commit hash: 2ee4ca01ac9e153ad5671146ac9f5f72919b471d * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC @@ -402,7 +402,6 @@ typedef struct uint32_t dummy_data48; uint32_t dummy_data49; uint32_t dummy_data50; - uint32_t dummy_data51; } aobc_hk; } AOBC_TlmData; diff --git a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h index 7a6f89f26..995eb8b7c 100644 --- a/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h +++ b/examples/mobc/src/src_user/component_driver/aocs/aobc_telemetry_definitions.h @@ -4,8 +4,8 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 - * db commit hash: caa8d4ca59a37460e7ef348bd58ee8a95bfd092c + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd + * db commit hash: 2ee4ca01ac9e153ad5671146ac9f5f72919b471d * @note コード生成パラメータ: * name: AOBC * db_prefix: SAMPLE_AOBC diff --git a/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h b/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h index c7d36a715..085cedd2b 100644 --- a/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h +++ b/examples/mobc/src/src_user/tlm_cmd/block_command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 03076efb966c0f746783e116ba4fe38a + * CSV files MD5: 21799e92eda843366bac3e516838b31a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/mobc/src/src_user/tlm_cmd/command_definitions.c b/examples/mobc/src/src_user/tlm_cmd/command_definitions.c index d40610304..9356d1eab 100644 --- a/examples/mobc/src/src_user/tlm_cmd/command_definitions.c +++ b/examples/mobc/src/src_user/tlm_cmd/command_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 03076efb966c0f746783e116ba4fe38a + * CSV files MD5: 21799e92eda843366bac3e516838b31a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/mobc/src/src_user/tlm_cmd/command_definitions.h b/examples/mobc/src/src_user/tlm_cmd/command_definitions.h index a2842e7c1..75dde5d17 100644 --- a/examples/mobc/src/src_user/tlm_cmd/command_definitions.h +++ b/examples/mobc/src/src_user/tlm_cmd/command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 03076efb966c0f746783e116ba4fe38a + * CSV files MD5: 21799e92eda843366bac3e516838b31a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c index 1842466bd..36419f27e 100644 --- a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c +++ b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 03076efb966c0f746783e116ba4fe38a + * CSV files MD5: 21799e92eda843366bac3e516838b31a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] @@ -4136,7 +4136,7 @@ static TF_TLM_FUNC_ACK Tlm_GS_(uint8_t* packet, uint16_t* len, uint16_t max_len) static TF_TLM_FUNC_ACK Tlm_HK_(uint8_t* packet, uint16_t* len, uint16_t max_len) { - if (432 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; + if (428 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; #ifndef BUILD_SETTINGS_FAST_BUILD TF_copy_u32(&packet[26], TMGR_get_master_clock().mode_cycle); @@ -4270,10 +4270,9 @@ static TF_TLM_FUNC_ACK Tlm_HK_(uint8_t* packet, uint16_t* len, uint16_t max_len) TF_copy_u32(&packet[416], 0); TF_copy_u32(&packet[420], 0); TF_copy_u32(&packet[424], 0); - TF_copy_u32(&packet[428], 0); #endif - *len = 432; + *len = 428; return TF_TLM_FUNC_ACK_SUCCESS; } diff --git a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h index f9131e0e5..509889f8a 100644 --- a/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h +++ b/examples/mobc/src/src_user/tlm_cmd/telemetry_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: 03076efb966c0f746783e116ba4fe38a + * CSV files MD5: 21799e92eda843366bac3e516838b31a * @note コード生成パラメータ: * db_prefix: SAMPLE_MOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv index ccb28a226..396af3cac 100644 --- a/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv +++ b/examples/mobc/tlm-cmd-db/TLM_DB/SAMPLE_MOBC_TLM_DB_HK.csv @@ -161,7 +161,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,DUMMY_DATA44,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,DUMMY_DATA45,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,DUMMY_DATA46,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DUMMY_DATA47,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, diff --git a/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv index 9231df647..ee9b54276 100644 --- a/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv +++ b/examples/mobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_MOBC_TLM_DB_HK.csv @@ -161,7 +161,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,DUMMY_DATA44,uint32_t,0,PACKET,416,0,32,NONE,,,,,,,,, ,DUMMY_DATA45,uint32_t,0,PACKET,420,0,32,NONE,,,,,,,,, ,DUMMY_DATA46,uint32_t,0,PACKET,424,0,32,NONE,,,,,,,,, -,DUMMY_DATA47,uint32_t,0,PACKET,428,0,32,NONE,,,,,,,,, +,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, diff --git a/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h index 23fa261dc..9fee90457 100644 --- a/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h +++ b/examples/subobc/src/src_user/tlm_cmd/block_command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/subobc/src/src_user/tlm_cmd/command_definitions.c b/examples/subobc/src/src_user/tlm_cmd/command_definitions.c index 0c285395c..22918f295 100644 --- a/examples/subobc/src/src_user/tlm_cmd/command_definitions.c +++ b/examples/subobc/src/src_user/tlm_cmd/command_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/subobc/src/src_user/tlm_cmd/command_definitions.h b/examples/subobc/src/src_user/tlm_cmd/command_definitions.h index c236bf66c..dde0d411f 100644 --- a/examples/subobc/src/src_user/tlm_cmd/command_definitions.h +++ b/examples/subobc/src/src_user/tlm_cmd/command_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c index 082033837..af1afe66a 100644 --- a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c +++ b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.c @@ -5,7 +5,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] @@ -122,7 +122,7 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_AOBC_(uint8_t* packet, uint16_t* len, uint16_t m static TF_TLM_FUNC_ACK Tlm_AOBC_HK_(uint8_t* packet, uint16_t* len, uint16_t max_len) { - if (426 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; + if (422 > max_len) return TF_TLM_FUNC_ACK_TOO_SHORT_LEN; #ifndef BUILD_SETTINGS_FAST_BUILD TF_copy_u32(&packet[26], TMGR_get_master_clock().mode_cycle); @@ -248,10 +248,9 @@ static TF_TLM_FUNC_ACK Tlm_AOBC_HK_(uint8_t* packet, uint16_t* len, uint16_t max TF_copy_u32(&packet[410], 0); TF_copy_u32(&packet[414], 0); TF_copy_u32(&packet[418], 0); - TF_copy_u32(&packet[422], 0); #endif - *len = 426; + *len = 422; return TF_TLM_FUNC_ACK_SUCCESS; } diff --git a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h index cdd566b71..6180d6b58 100644 --- a/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h +++ b/examples/subobc/src/src_user/tlm_cmd/telemetry_definitions.h @@ -4,7 +4,7 @@ * @note このコードは自動生成されています！ * @note コード生成元 tlm-cmd-db: * repository: github.com/arkedge/c2a-core.git - * CSV files MD5: c3bd02684f15db9b881c871cd79547d3 + * CSV files MD5: 6fb2d9b01a6f9efc3034e56bce3bf2fd * @note コード生成パラメータ: * db_prefix: SAMPLE_AOBC * tlm_id_range: [0x00, 0x100] diff --git a/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv index 53c6d847a..7725281ac 100644 --- a/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv +++ b/examples/subobc/tlm-cmd-db/TLM_DB/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv @@ -153,7 +153,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,DUMMY_DATA48,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,DUMMY_DATA49,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, ,DUMMY_DATA50,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, -,DUMMY_DATA51,uint32_t,0,PACKET,=R[-1]C+INT((R[-1]C[1]+R[-1]C[2])/8),=MOD((R[-1]C+R[-1]C[1])@@8),=IF(OR(EXACT(RC[-5]@@"uint8_t")@@EXACT(RC[-5]@@"int8_t"))@@8@@IF(OR(EXACT(RC[-5]@@"uint16_t")@@EXACT(RC[-5]@@"int16_t"))@@16@@IF(OR(EXACT(RC[-5]@@"uint32_t")@@EXACT(RC[-5]@@"int32_t")@@EXACT(RC[-5]@@"float"))@@32@@IF(EXACT(RC[-5]@@"double")@@64)))),NONE,,,,,,,,, +,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, diff --git a/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv b/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv index 5a5264f51..25f421324 100644 --- a/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv +++ b/examples/subobc/tlm-cmd-db/TLM_DB/calced_data/SAMPLE_AOBC_TLM_DB_AOBC_HK.csv @@ -153,7 +153,7 @@ Comment,TLM Entry,Onboard Software Info.,,Extraction Info.,,,,Conversion Info.,, ,DUMMY_DATA48,uint32_t,0,PACKET,410,0,32,NONE,,,,,,,,, ,DUMMY_DATA49,uint32_t,0,PACKET,414,0,32,NONE,,,,,,,,, ,DUMMY_DATA50,uint32_t,0,PACKET,418,0,32,NONE,,,,,,,,, -,DUMMY_DATA51,uint32_t,0,PACKET,422,0,32,NONE,,,,,,,,, +,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,,