|
@@ -1,12 +1,11 @@
|
|
|
//language.c
|
|
|
#include "language.h"
|
|
|
-#include <inttypes.h>
|
|
|
#include <avr/pgmspace.h>
|
|
|
#include "bootapp.h"
|
|
|
|
|
|
|
|
|
// Currectly active language selection.
|
|
|
-unsigned char lang_selected = 0;
|
|
|
+uint8_t lang_selected = 0;
|
|
|
|
|
|
#if (LANG_MODE == 0) //primary language only
|
|
|
#else //(LANG_MODE == 0)
|
|
@@ -19,12 +18,12 @@ typedef struct
|
|
|
{
|
|
|
struct
|
|
|
{
|
|
|
- uint32_t magic;
|
|
|
- uint16_t size;
|
|
|
- uint16_t count;
|
|
|
- uint16_t checksum;
|
|
|
- uint16_t reserved0;
|
|
|
- uint32_t reserved1;
|
|
|
+ uint32_t magic; //+0
|
|
|
+ uint16_t size; //+4
|
|
|
+ uint16_t count; //+6
|
|
|
+ uint16_t checksum; //+8
|
|
|
+ uint16_t reserved0; //+10
|
|
|
+ uint32_t reserved1; //+12
|
|
|
} header;
|
|
|
uint16_t table[];
|
|
|
} lang_table_t;
|
|
@@ -57,7 +56,13 @@ const char* lang_get_sec_lang_str(const char* s)
|
|
|
return (const char*)((char*)_lang_table + ui); //return calculated pointer
|
|
|
}
|
|
|
|
|
|
-const char* lang_select(unsigned char lang)
|
|
|
+const char* lang_get_sec_lang_str_by_id(uint16_t id)
|
|
|
+{
|
|
|
+ uint16_t ui = ((((uint16_t)&_SEC_LANG) + 0x00ff) & 0xff00); //table pointer
|
|
|
+ return ui + pgm_read_word(((uint16_t*)(ui + 16 + id * 2))); //read relative offset and return calculated pointer
|
|
|
+}
|
|
|
+
|
|
|
+const char* lang_select(uint8_t lang)
|
|
|
{
|
|
|
#if (LANG_MODE == 0) //primary language only
|
|
|
return 0;
|
|
@@ -77,7 +82,7 @@ const char* lang_select(unsigned char lang)
|
|
|
#endif //(LANG_MODE == 0)
|
|
|
}
|
|
|
|
|
|
-unsigned char lang_get_count()
|
|
|
+uint8_t lang_get_count()
|
|
|
{
|
|
|
uint16_t ui = (uint16_t)&_SEC_LANG; //pointer to _SEC_LANG reserved space
|
|
|
ui += 0x00ff; //add 1 page
|
|
@@ -87,11 +92,40 @@ unsigned char lang_get_count()
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-const char* lang_get_name(unsigned char lang)
|
|
|
+const char* lang_get_name(uint8_t lang)
|
|
|
{
|
|
|
if (lang == 0) return MSG_LANGUAGE_NAME + 2;
|
|
|
return lang_get_sec_lang_str(MSG_LANGUAGE_NAME);
|
|
|
}
|
|
|
|
|
|
+#ifdef DEBUG_SEC_LANG
|
|
|
+uint16_t lang_print_sec_lang(FILE* out)
|
|
|
+{
|
|
|
+ printf_P(_n("&_SEC_LANG = 0x%04x\n"), &_SEC_LANG);
|
|
|
+ printf_P(_n("sizeof(_SEC_LANG) = 0x%04x\n"), sizeof(_SEC_LANG));
|
|
|
+ uint16_t ptr_lang_table0 = ((uint16_t)(&_SEC_LANG) + 0xff) & 0xff00;
|
|
|
+ printf_P(_n("&_lang_table0 = 0x%04x\n"), ptr_lang_table0);
|
|
|
+ uint32_t _lt_magic = pgm_read_dword(((uint32_t*)(ptr_lang_table0 + 0)));
|
|
|
+ uint16_t _lt_size = pgm_read_word(((uint16_t*)(ptr_lang_table0 + 4)));
|
|
|
+ uint16_t _lt_count = pgm_read_word(((uint16_t*)(ptr_lang_table0 + 6)));
|
|
|
+ uint16_t _lt_chsum = pgm_read_word(((uint16_t*)(ptr_lang_table0 + 8)));
|
|
|
+ uint16_t _lt_resv0 = pgm_read_word(((uint16_t*)(ptr_lang_table0 + 10)));
|
|
|
+ uint32_t _lt_resv1 = pgm_read_dword(((uint32_t*)(ptr_lang_table0 + 12)));
|
|
|
+ printf_P(_n(" _lt_magic = 0x%08lx %S\n"), _lt_magic, (_lt_magic==0x4bb45aa5)?_n("OK"):_n("NA"));
|
|
|
+ printf_P(_n(" _lt_size = 0x%04x (%d)\n"), _lt_size, _lt_size);
|
|
|
+ printf_P(_n(" _lt_count = 0x%04x (%d)\n"), _lt_count, _lt_count);
|
|
|
+ printf_P(_n(" _lt_chsum = 0x%04x\n"), _lt_chsum);
|
|
|
+ printf_P(_n(" _lt_resv0 = 0x%04x\n"), _lt_resv0);
|
|
|
+ printf_P(_n(" _lt_resv1 = 0x%08lx\n"), _lt_resv1);
|
|
|
+ if (_lt_magic != 0x4bb45aa5) return 0;
|
|
|
+ puts_P(_n(" strings:\n"));
|
|
|
+ uint16_t ui = ((((uint16_t)&_SEC_LANG) + 0x00ff) & 0xff00); //table pointer
|
|
|
+ for (ui = 0; ui < _lt_count; ui++)
|
|
|
+ fprintf_P(out, _n(" %3d %S\n"), ui, lang_get_sec_lang_str_by_id(ui));
|
|
|
+ return _lt_count;
|
|
|
+}
|
|
|
+#endif //DEBUG_SEC_LANG
|
|
|
+
|
|
|
+
|
|
|
const char MSG_LANGUAGE_NAME[] PROGMEM_I1 = ISTR("English"); ////c=0 r=0
|
|
|
|