продолжаем работу по наполнению меню

PROJECT/app/journal.h

@@ -130,6 +130,16 @@ typedef struct{
     CPU_INT32U card_bonus;
 }SolarCountersRecord;
 
+/// ñòðóêòóðà çàïèñè ñ÷åò÷èêîâ î ñîëÿðèè â îäíîì ðåæèìå
+typedef struct{
+  /// ÷èñëî çàïóñêîâ
+  CPU_INT32U runs;
+  // äåíüãè ñ êàðò
+  CPU_INT32U card_money;
+  // áîíóñà ñ êàðò
+  CPU_INT32U card_bonus;
+}AbonentCountersRecord;
+
 /// структура всех счетчиков для солярия
 typedef struct{
     /// счетчики по соляриям и режимам
@@ -140,6 +150,10 @@ typedef struct{
     SolarCountersRecord solar_m[SOLAR_MODES_COUNT];
     /// счетчики теста по режимам
     SolarCountersRecord solar_m_test[SOLAR_MODES_COUNT];
+
+    /// ñ÷åò÷èêè ïî àáîíåìåíòàì
+    AbonentCountersRecord abonement[5];
+
     /// отработанное время коллатен+макси по соляриям
     CPU_INT32U collaten_time[CHANNELS_NUM];
     /// отработанное время ультрафиолет+макси по соляриям
@@ -150,6 +164,8 @@ typedef struct{
     CPU_INT32U cash_money;
     /// денег по карте
     CPU_INT32U card_money;
+    /// äåíåã ïî àáîíåìåíòàì
+    CPU_INT32U abonement_money;
     /// количество купюр
     CPU_INT32U bill_count;
     /// количество уборок

PROJECT/data/datadesc.c

@@ -5027,11 +5027,114 @@ TDataDescStruct const AbonementMoneyDesc = {
   3000
 };
 
+/*************************************
+  Èíäåêñ àáîíåìåíòà
+*************************************/
+
+TRangeValueULONG const AbonementIndexRange = {0, 4};
+CPU_INT08U const AbonementIndex_str0[] = "ÑÅÐÅÁÐßÍÍÛÉ";
+CPU_INT08U const AbonementIndex_str1[] = "ÇÎËÎÒÎÉ";
+CPU_INT08U const AbonementIndex_str2[] = "ÏËÀÒÈÍÎÂÛÉ";
+CPU_INT08U const AbonementIndex_str3[] = "ÀËÌÀÇÍÛÉ";
+CPU_INT08U const AbonementIndex_str4[] = "ÈÒÎÃÎ";
+CPU_INT08U const *AbonementIndexList[] = {AbonementIndex_str0, AbonementIndex_str1, AbonementIndex_str2, AbonementIndex_str3, AbonementIndex_str4};
+
+TDataDescStruct const AbonementCounterIndexDesc = {
+  DATA_DESC_EDIT,          // òèï äåñêðèïòîðà
+  DATA_TYPE_ULONG,         // òèï ïàðàìåòðà
+  DATA_LOC_RAM,            // ðàñïîëîæåíèå ïàðàìåòðà
+  DATA_NO_ARRAY,           // ïðèçíàê ìàññèâà
+  0,                       // ðàçìåð ìàññèâà
+  0,                       // óêàçàòåëü íà äåñêðèïòîð èíäåêñà ìàññèâà
+  &abonement_index,            // óêàçàòåëü íà ïåðåìåííóþ èëè àäðåñ FRAM
+  (void*)&AbonementIndexRange,                    // óêàçàòåëü íà ãðàíèöû ïàðàìåòðà
+  NULL,                    // ôóíêöèÿ ïî èçìåíåíèþ
+  0,                       // ñìåùåíèå ìåæäó ýëåìåíòàìè â ìàññèâå
+  AbonementIndexName,        // óêàçàòåëü íà ñòðîêó íàçâàíèÿ ïàðàìåòðà
+  DATA_IS_INDEX,           // ïðèçíàê èíäåêñíîãî ïàðàìåòðà (ñïèñîê ñòðîê)
+  AbonementIndexList,        // óêàçàòåëü íà ñïèñîê ñòðîê äëÿ èíäåêñíîãî ïàðàìåòðà
+  DATA_INIT_ENABLE,
+  0                           
+};
+char const AbonementCounterIndexDescId[] = "AbonementCounterIndexDesc";
+
+/*************************************
+  Äåíüãè
+*************************************/
+
+TDataDescStruct const CounterMoneyAbonementDesc = {
+  DATA_DESC_VIEW,           // òèï äåñêðèïòîðà
+  DATA_TYPE_ULONG,          // òèï ïàðàìåòðà
+  DATA_LOC_FRAM,            // ðàñïîëîæåíèå ïàðàìåòðà
+  DATA_IS_ARRAY,            // ïðèçíàê ìàññèâà
+  4,                        // ðàçìåð ìàññèâà
+  &AbonementCounterIndexDesc,                     // óêàçàòåëü íà äåñêðèïòîð èíäåêñà ìàññèâà
+  (void*)offsetof(TFramMap, solar_counters.abonement[0].card_money),            // óêàçàòåëü íà ïåðåìåííóþ èëè àäðåñ FRAM
+  NULL,                     // óêàçàòåëü íà ãðàíèöû ïàðàìåòðà
+  NULL,                     // ôóíêöèÿ ïî èçìåíåíèþ
+  sizeof(AbonentCountersRecord),                        // ñìåùåíèå ìåæäó ýëåìåíòàìè â ìàññèâå
+  AbonementMoneyName,             // óêàçàòåëü íà ñòðîêó íàçâàíèÿ ïàðàìåòðà
+  DATA_NO_INDEX,            // ïðèçíàê èíäåêñíîãî ïàðàìåòðà (ñïèñîê ñòðîê)
+  NULL,                     // óêàçàòåëü íà ñïèñîê ñòðîê äëÿ èíäåêñíîãî ïàðàìåòðà
+  DATA_INIT_DISABLE,
+  0                           
+};
+char const CounterMoneyAbonementDescId[] = "CounterMoneyAbonementDesc";
+
+/*************************************
+  Áîíóñû
+*************************************/
+
+CPU_INT08U const AbonementBonusName[] = "Áîíóñû";
+
+TDataDescStruct const CounterBonusAbonementDesc = {
+  DATA_DESC_VIEW,           // òèï äåñêðèïòîðà
+  DATA_TYPE_ULONG,          // òèï ïàðàìåòðà
+  DATA_LOC_FRAM,            // ðàñïîëîæåíèå ïàðàìåòðà
+  DATA_IS_ARRAY,            // ïðèçíàê ìàññèâà
+  4,                        // ðàçìåð ìàññèâà
+  &AbonementCounterIndexDesc,                     // óêàçàòåëü íà äåñêðèïòîð èíäåêñà ìàññèâà
+  (void*)offsetof(TFramMap, solar_counters.abonement[0].card_bonus),            // óêàçàòåëü íà ïåðåìåííóþ èëè àäðåñ FRAM
+  NULL,                     // óêàçàòåëü íà ãðàíèöû ïàðàìåòðà
+  NULL,                     // ôóíêöèÿ ïî èçìåíåíèþ
+  sizeof(AbonentCountersRecord),                        // ñìåùåíèå ìåæäó ýëåìåíòàìè â ìàññèâå
+  AbonementBonusName,             // óêàçàòåëü íà ñòðîêó íàçâàíèÿ ïàðàìåòðà
+  DATA_NO_INDEX,            // ïðèçíàê èíäåêñíîãî ïàðàìåòðà (ñïèñîê ñòðîê)
+  NULL,                     // óêàçàòåëü íà ñïèñîê ñòðîê äëÿ èíäåêñíîãî ïàðàìåòðà
+  DATA_INIT_DISABLE,
+  0                           
+};
+char const CounterBonusAbonementDescId[] = "CounterBonusAbonementDesc";
+
+/*************************************
+  Êîëè÷åñòâî çàïóñêîâ
+*************************************/
+
+CPU_INT08U const AbonementRunsName[] = "Êîë-âî";
+
+TDataDescStruct const CounterRunsAbonementDesc = {
+  DATA_DESC_VIEW,           // òèï äåñêðèïòîðà
+  DATA_TYPE_ULONG,          // òèï ïàðàìåòðà
+  DATA_LOC_FRAM,            // ðàñïîëîæåíèå ïàðàìåòðà
+  DATA_IS_ARRAY,            // ïðèçíàê ìàññèâà
+  4,                        // ðàçìåð ìàññèâà
+  &AbonementCounterIndexDesc,                     // óêàçàòåëü íà äåñêðèïòîð èíäåêñà ìàññèâà
+  (void*)offsetof(TFramMap, solar_counters.abonement[0].runs),            // óêàçàòåëü íà ïåðåìåííóþ èëè àäðåñ FRAM
+  NULL,                     // óêàçàòåëü íà ãðàíèöû ïàðàìåòðà
+  NULL,                     // ôóíêöèÿ ïî èçìåíåíèþ
+  sizeof(AbonentCountersRecord),                        // ñìåùåíèå ìåæäó ýëåìåíòàìè â ìàññèâå
+  AbonementRunsName,             // óêàçàòåëü íà ñòðîêó íàçâàíèÿ ïàðàìåòðà
+  DATA_NO_INDEX,            // ïðèçíàê èíäåêñíîãî ïàðàìåòðà (ñïèñîê ñòðîê)
+  NULL,                     // óêàçàòåëü íà ñïèñîê ñòðîê äëÿ èíäåêñíîãî ïàðàìåòðà
+  DATA_INIT_DISABLE,
+  0                           
+};
+char const CounterRunsAbonementDescId[] = "CounterRunsAbonementDesc";
+
 /*************************************
   Áîíóñû
 *************************************/
 TRangeValueULONG const AbonementBonusRange = {0, 99999};
-CPU_INT08U const AbonementBonusName[] = "Áîíóñû";
 
 TDataDescStruct const AbonementBonusDesc = {
   DATA_DESC_EDIT,           // òèï äåñêðèïòîðà
@@ -6580,6 +6683,30 @@ TDataDescStruct const CounterCardMoneyDesc = {
 };
 char const CounterCardMoneyDescId[] = "CounterCardMoneyDesc";
 
+/*************************************
+  C÷åò÷èê äåíåã ïî àáîíåìåíòàì
+*************************************/
+CPU_INT08U const CounterAbonementMoneyName[] = "ÊÀÐÒ.,ðóá.";
+
+TDataDescStruct const CounterAbonementMoneyDesc = {
+  DATA_DESC_VIEW,           // òèï äåñêðèïòîðà
+  DATA_TYPE_RUB_CENT,          // òèï ïàðàìåòðà
+  DATA_LOC_FRAM,            // ðàñïîëîæåíèå ïàðàìåòðà
+  DATA_NO_ARRAY,            // ïðèçíàê ìàññèâà
+  0,                        // ðàçìåð ìàññèâà
+  NULL,                     // óêàçàòåëü íà äåñêðèïòîð èíäåêñà ìàññèâà
+  (void*)offsetof(TFramMap, solar_counters.abonement_money),            // óêàçàòåëü íà ïåðåìåííóþ èëè àäðåñ FRAM
+  NULL,                     // óêàçàòåëü íà ãðàíèöû ïàðàìåòðà
+  NULL,                     // ôóíêöèÿ ïî èçìåíåíèþ
+  0,                        // ñìåùåíèå ìåæäó ýëåìåíòàìè â ìàññèâå
+  CounterAbonementMoneyName,             // óêàçàòåëü íà ñòðîêó íàçâàíèÿ ïàðàìåòðà
+  DATA_NO_INDEX,            // ïðèçíàê èíäåêñíîãî ïàðàìåòðà (ñïèñîê ñòðîê)
+  NULL,                     // óêàçàòåëü íà ñïèñîê ñòðîê äëÿ èíäåêñíîãî ïàðàìåòðà
+  DATA_INIT_DISABLE,
+  0                           
+};
+char const CounterAbonementMoneyDescId[] = "CounterAbonementMoneyDesc";
+
 /*************************************
   Âêëþ÷åíèå îáùåãî äîñòóïà ïî ïàðîëþ
 *************************************/

PROJECT/data/datadesc.h

@@ -323,6 +323,7 @@ extern TDataDescStruct const CounterUFTimeDesc;
 extern TDataDescStruct const CounterCommonMoneyDesc;
 extern TDataDescStruct const CounterCashMoneyDesc;
 extern TDataDescStruct const CounterCardMoneyDesc;
+extern TDataDescStruct const CounterAbonementMoneyDesc;
 extern TDataDescStruct const SolarCurrentPricePerMinuteDesc;
 extern TDataDescStruct const SolarCurrentPricePerMinuteForViewDesc;
 extern TDataDescStruct const ScoreColumnDesc;
@@ -366,6 +367,9 @@ extern TDataDescStruct const AbonementIndexDesc;
 extern TDataDescStruct const AbonementMoneyDesc;
 extern TDataDescStruct const AbonementBonusDesc;
 extern TDataDescStruct const AbonementBestBeforeDesc;
+extern TDataDescStruct const CounterMoneyAbonementDesc;
+extern TDataDescStruct const CounterBonusAbonementDesc;
+extern TDataDescStruct const CounterRunsAbonementDesc;
 
 extern void CheckVladPasswords(void);
 

PROJECT/drivers/mfrc522/mfrc522data.c

@@ -2,6 +2,7 @@
 #include <includes.h>
 
 #include "rfid-spi.h"
+#include "time.h"
 
 mifaredata_t mifare_card_data;
 

PROJECT/menu/menudesc.c

@@ -3276,6 +3276,47 @@ void OnEnterSolarChannelsCountersMenu(void)
 const TMenuLineArray arr_SolarChannelsCountersArray[] = {&line_SolarChannelsCountersMenu_0, &line_SolarChannelsCountersMenu_6, &line_SolarChannelsCountersMenu_7, &line_SolarChannelsCountersMenu_1, &line_SolarChannelsCountersMenu_2, &line_SolarChannelsCountersMenu_3, &line_SolarChannelsCountersMenu_4, &line_SolarChannelsCountersMenu_5, NULL};
 const TMenuPanel SolarChannelsCountersPanel[] = {arr_SolarChannelsCountersArray, OnEnterSolarChannelsCountersMenu, 8, MENU_PANEL_STANDARD};
 
+/***********************************
+  ÌÅÍÞ ñ÷åò÷èêîâ ïî àáîíåìåíòàì
+***********************************/
+const CPU_INT08U str_AbonementCounters_0[] = "ÑÁÐÎÑ Ñ×ÅÒ×ÈÊÎÂ";
+
+const TMenuLine line_AbonementsCountersMenu_0 = {
+  MENU_LINE_SHOW_DESC,                 // òèï ïóíêòà ìåíþ
+  MENU_FIXED_LINE|MENU_INDEX_LINE,                // äîï. ôëàãè  
+  (void*)&AbonementIndexDesc,       // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
+  NULL                            // ïàíåëü äëÿ ïåðåõîäà
+};
+
+const TMenuLine line_AbonementsCountersMenu_1 = {
+  MENU_LINE_SHOW_DESC,               // òèï ïóíêòà ìåíþ
+  0,                              // äîï. ôëàãè  
+  (void*)&CounterMoneyAbonementDesc,       // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
+  NULL                            // ïàíåëü äëÿ ïåðåõîäà
+};
+
+const TMenuLine line_AbonementsCountersMenu_2 = {
+  MENU_LINE_SHOW_DESC,               // òèï ïóíêòà ìåíþ
+  0,                              // äîï. ôëàãè  
+  (void*)&CounterRunsAbonementDesc,       // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
+  NULL                            // ïàíåëü äëÿ ïåðåõîäà
+};
+
+const TMenuLine line_AbonementsCountersMenu_3 = {
+  MENU_LINE_SHOW_DESC,               // òèï ïóíêòà ìåíþ
+  0,                              // äîï. ôëàãè  
+  (void*)&CounterBonusAbonementDesc,       // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
+  NULL                            // ïàíåëü äëÿ ïåðåõîäà
+};
+
+void OnEnterAbonementCountersMenu(void)
+{
+//    abonement_index = 0;
+}
+
+const TMenuLineArray arr_AbonementCountersArray[] = {&line_AbonementsCountersMenu_0, &line_AbonementsCountersMenu_1, &line_AbonementsCountersMenu_2, &line_AbonementsCountersMenu_3, NULL};
+const TMenuPanel AbonementCountersPanel[] = {arr_AbonementCountersArray, OnEnterAbonementCountersMenu, 5, MENU_PANEL_STANDARD};
+
 /***********************************
   ÌÅÍÞ Ñ×ÅÒ×ÈÊΠÏÎ ÂÐÅÌÅÍÈ ÍÀÐÀÁÎÒÊÈ ËÀÌÏ
 ***********************************/
@@ -3392,8 +3433,15 @@ const TMenuLine line_SolarCommonCountersMenu_3 = {
   NULL                            // ïàíåëü äëÿ ïåðåõîäà
 };
 
-const TMenuLineArray arr_SolarCommonCountersArray[] = {&line_SolarCommonCountersMenu_0, &line_SolarCommonCountersMenu_1, &line_SolarCommonCountersMenu_2, &line_SolarCommonCountersMenu_3, NULL};
+const TMenuLine line_SolarCommonCountersMenu_4 = {
-const TMenuPanel SolarCommonCountersPanel[] = {arr_SolarCommonCountersArray, NULL, 4, MENU_PANEL_STANDARD};
+  MENU_LINE_SHOW_DESC,               // òèï ïóíêòà ìåíþ
+  0,                              // äîï. ôëàãè  
+  (void*)&CounterAbonementMoneyDesc,       // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
+  NULL                            // ïàíåëü äëÿ ïåðåõîäà
+};
+
+const TMenuLineArray arr_SolarCommonCountersArray[] = {&line_SolarCommonCountersMenu_0, &line_SolarCommonCountersMenu_1, &line_SolarCommonCountersMenu_2, &line_SolarCommonCountersMenu_3, &line_SolarCommonCountersMenu_4, NULL};
+const TMenuPanel SolarCommonCountersPanel[] = {arr_SolarCommonCountersArray, NULL, 5, MENU_PANEL_STANDARD};
 
 /***********************************
   ÌÅÍÞ ÏÐÎÑÌÎÒÐ ÑÒÀÒÈÑÒÈÊÈ
@@ -3403,6 +3451,7 @@ const CPU_INT08U str_CommonStatMenu_1[] = "
 const CPU_INT08U str_CommonStatMenu_2[] = "Ïî ðåæèìàì";
 const CPU_INT08U str_CommonStatMenu_3[] = "Íàðàáîòêà";
 const CPU_INT08U str_CommonStatMenu_4[] = "Äåíüãè";
+const CPU_INT08U str_CommonStatMenu_5[] = "Àáîìåìåíòû";
 
 const TMenuLine line_StatMenu_0 = {
   MENU_LINE_STRING,               // òèï ïóíêòà ìåíþ
@@ -3439,8 +3488,15 @@ const TMenuLine line_StatMenu_4 = {
   (void*)SolarCommonCountersPanel                            // ïàíåëü äëÿ ïåðåõîäà
 };
 
-const TMenuLineArray arr_StatMenuArray[] = {&line_StatMenu_0, &line_StatMenu_1, &line_StatMenu_2, &line_StatMenu_3, &line_StatMenu_4, NULL};
+const TMenuLine line_StatMenu_5 = {
-const TMenuPanel CommStatMenuPanel[] = {arr_StatMenuArray, NULL, 5, MENU_PANEL_STANDARD};
+  MENU_LINE_GOTO_MENU,               // òèï ïóíêòà ìåíþ
+  0,                              // äîï. ôëàãè  
+  (void*)str_CommonStatMenu_5,       // óêàçàòåëü íà òåêñòîâóþ ñòðîêó èëè äåñêðèïòîð
+  (void*)AbonementCountersPanel                            // ïàíåëü äëÿ ïåðåõîäà
+};
+
+const TMenuLineArray arr_StatMenuArray[] = {&line_StatMenu_0, &line_StatMenu_1, &line_StatMenu_2, &line_StatMenu_3, &line_StatMenu_4, &line_StatMenu_5, NULL};
+const TMenuPanel CommStatMenuPanel[] = {arr_StatMenuArray, NULL, 6, MENU_PANEL_STANDARD};
 
 
 /***********************************

settings/sk-mlpc2368.Solarium_Vlad.cspy.bat

@@ -25,7 +25,7 @@ if not "%~1" == "" goto debugFile
 
 @echo on 
 
-"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
+"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
 
 @echo off 
 goto end 
@@ -34,7 +34,7 @@ goto end
 
 @echo on 
 
-"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
+"C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" "--debug_file=%~1" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
 
 @echo off 
 :end

settings/sk-mlpc2368.Solarium_Vlad.cspy.ps1

@@ -23,9 +23,9 @@
 
 if ($debugfile -eq "")
 {
-& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
+& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
 }
 else
 {
-& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\git_work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
+& "C:\Program Files\IAR Systems\Embedded Workbench 9.0\common\bin\cspybat" -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.general.xcl" --debug_file=$debugfile --backend -f "C:\work\solarium.vlad\settings\sk-mlpc2368.Solarium_Vlad.driver.xcl" 
 }

settings/sk-mlpc2368.Solarium_Vlad.general.xcl

@@ -2,7 +2,7 @@
 
 "C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armJLINK.dll" 
 
-"C:\git_work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out" 
+"C:\work\solarium.vlad\Solarium Vlad\Exe\sk_mlpc2368.out" 
 
 --plugin="C:\Program Files\IAR Systems\Embedded Workbench 9.0\arm\bin\armbat.dll"