diff --git a/DebugVarEdit.exe b/DebugVarEdit.exe index bcf632b..32fd47c 100644 Binary files a/DebugVarEdit.exe and b/DebugVarEdit.exe differ diff --git a/README.md b/README.md index c9ec221..09927bd 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ DebugVar_t dbg_vars[] = {\ {(uint8_t *)&ADC_sf[0][2], pt_int16, t_iq_none, t_iq_none, "ADC_sf02" }, \ {(uint8_t *)&ADC_sf[0][3], pt_int16, t_iq_none, t_iq_none, "ADC_sf03" }, \ {(uint8_t *)&Bender[0].KOhms, pt_uint16, t_iq, t_iq10, "Bend0.KOhm" }, \ -{(char *)&Bender[0].Times, pt_uint16, t_iq_none, t_iq_none, "Bend0.Time" }, \ +{(uint8_t *)&Bender[0].Times, pt_uint16, t_iq_none, t_iq_none, "Bend0.Time" }, \ }; ``` diff --git a/debug_tools.c b/debug_tools.c index ec7e97c..a0ae0c0 100644 --- a/debug_tools.c +++ b/debug_tools.c @@ -11,10 +11,10 @@ static int getDebugVar(DebugVar_t *var, int32_t *int_var, float *float_var); static int convertDebugVarToIQx(DebugVar_t *var, int32_t *ret_var); ///////////////////////////----EXAPLE-----////////////////////////////// -int var_numb = 1; ///< Ïðèìåð ïåðåìåííîé äëÿ îòëàäêè +int var_numb = 1; ///< Ïðèìåð ïåðåìåííîé äëÿ îòëàäêè DebugVarName_t var_name; ///< Èìÿ ïåðåìåííîé -int32_t return_var; ///< Ïåðåìåííàÿ äëÿ âîçâðàòà ðåçóëüòàòà -int32_t return_ll_var; ///< Âîçâðàùàåìîå çíà÷åíèå ñ íèæíåãî óðîâíÿ +int32_t return_var; ///< Ïåðåìåííàÿ äëÿ âîçâðàòà ðåçóëüòàòà +int32_t return_ll_var; ///< Âîçâðàùàåìîå çíà÷åíèå ñ íèæíåãî óðîâíÿ int result; ///< Ïåðåìåííàÿ ðåçóëüòàòà DateTime_t ext_date = {2025, 11, 07, 16, 50}; ///< Ïðèìåð âíåøíåé äàòû ñáîðêè @@ -37,7 +37,7 @@ void Debug_Test_Example(void) /** * @brief ×èòàåò ïåðåìåííóþ ïî èíäåêñó. * @param var_ind – èíäåêñ ïåðåìåííîé. - * @param return_32b – óêàçàòåëü äëÿ âîçâðàòà ðåçóëüòàòà. + * @param return_32b – óêàçàòåëü äëÿ âîçâðàòà ðåçóëüòàòà. * @return int – 0: óñïåõ, 1: îøèáêà. * @details Èñïîëüçóåòñÿ äëÿ ÷òåíèÿ çíà÷åíèé ïåðåìåííûõ ïî èõ èíäåêñó. */ @@ -88,7 +88,7 @@ int Debug_ReadVarName(int var_ind, DebugVarName_t name_ptr) /** * @brief ×èòàåò çíà÷åíèå ïåðåìåííîé îòëàäêè ñ íèæíåãî óðîâíÿ. - * @param return_32b – óêàçàòåëü íà ïåðåìåííóþ, êóäà çàïèñûâàåòñÿ ðåçóëüòàò. + * @param return_32b – óêàçàòåëü íà ïåðåìåííóþ, êóäà çàïèñûâàåòñÿ ðåçóëüòàò. * @return int – 0: óñïåõ, 1: îøèáêà, 2: íåäîïóñòèìûé àäðåñ. * @details Èñïîëüçóåò àäðåññ, ïåðåäàâàåìûé ñ òåðìèíàëêè äëÿ ïîëó÷åíèÿ çíà÷åíèÿ. */ @@ -154,7 +154,7 @@ int Debug_LowLevel_Initialize(DateTime_t* external_date) /////////////////////----INTERNAL FUNCTIONS-----//////////////////////// /** * @brief Ïðåîáðàçóåò òèï IQ ïåðåìåííîé â ÷èñëî áèòîâ äëÿ ñäâèãà(Q-ôàêòîð). - * @param t – òèï IQ (ïåðå÷èñëåíèå DebugVarIQType_t). + * @param t – òèï IQ (ïåðå÷èñëåíèå DebugVarIQType_t). * @return int – Q-ôàêòîð (íàïðèìåð, 24), 0: åñëè t_iq_none, -1: îøèáêà. * @details Ñîïîñòàâëÿåò òèï IQ ïåðåìåííîé ñ ñîîòâåòñòâóþùèì Q-çíà÷åíèåì. */ diff --git a/debug_tools.h b/debug_tools.h index 4b1b2a5..ac68d83 100644 --- a/debug_tools.h +++ b/debug_tools.h @@ -134,7 +134,7 @@ typedef long DebugValue_t; * @brief Ñòðóêòóðà äàòû è âðåìåíè. */ typedef struct { - uint16_t year; ///< Ãîä (íàïðèìåð, 2025) + uint16_t year; ///< Ãîä (íàïðèìåð, 2025) uint8_t month; ///< Ìåñÿö (1-12) uint8_t day; ///< Äåíü (1-31) uint8_t hour; ///< ×àñû (0-23) diff --git a/debug_vars_example.c b/debug_vars_example.c new file mode 100644 index 0000000..e76dbb8 --- /dev/null +++ b/debug_vars_example.c @@ -0,0 +1,23 @@ +#include "debug_tools.h" + + +// Инклюды Ð´Ð»Ñ Ð´Ð¾Ñтупа к переменным +#include "bender.h" + +// ЭкÑтерны Ð´Ð»Ñ Ð´Ð¾Ñтупа к переменным +extern int ADC0finishAddr; + + +// Определение маÑÑива Ñ ÑƒÐºÐ°Ð·Ð°Ñ‚ÐµÐ»Ñми на переменные Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸ +int DebugVar_Qnt = 5; +#pragma DATA_SECTION(dbg_vars,".dbgvar_info") +// pointer_type iq_type return_iq_type short_name +DebugVar_t dbg_vars[] = {\ +{(uint8_t *)&freqTerm, pt_float, t_iq_none, t_iq10, "freqT" }, \ +{(uint8_t *)&ADC_sf[0][0], pt_int16, t_iq_none, t_iq_none, "ADC_sf00" }, \ +{(uint8_t *)&ADC_sf[0][1], pt_int16, t_iq_none, t_iq_none, "ADC_sf01" }, \ +{(uint8_t *)&ADC_sf[0][2], pt_int16, t_iq_none, t_iq_none, "ADC_sf02" }, \ +{(uint8_t *)&ADC_sf[0][3], pt_int16, t_iq_none, t_iq_none, "ADC_sf03" }, \ +{(uint8_t *)&Bender[0].KOhms, pt_uint16, t_iq, t_iq10, "Bend0.KOhm" }, \ +{(uint8_t *)&Bender[0].Times, pt_uint16, t_iq_none, t_iq_none, "Bend0.Time" }, \ +};