diff --git a/Dessins/Avions/avions.png b/Dessins/Avions/avions.png new file mode 100644 index 0000000..62fd98a Binary files /dev/null and b/Dessins/Avions/avions.png differ diff --git a/Sources/build-cg/map b/Sources/build-cg/map index 0caf49c..31da0cd 100644 --- a/Sources/build-cg/map +++ b/Sources/build-cg/map @@ -155,7 +155,7 @@ LOAD build-cg/assets/img/heure.png.o LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a 0x0000000000300000 _brom = 0x300000 - 0x00000000000b89bc _srom = (((SIZEOF (.text) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) + 0x00000000000b89c4 _srom = (((SIZEOF (.text) + SIZEOF (.rodata)) + SIZEOF (.gint.drivers)) + SIZEOF (.gint.blocks)) .text 0x0000000000300000 0x3d08 *(.pretext.entry) @@ -385,49 +385,49 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a *(.gint.drivers.6) 0x0000000000303f04 _edrv = . -.rodata 0x0000000000303f04 0xb4ac0 +.rodata 0x0000000000303f04 0xb4ac8 *(.rodata.4) *(.rodata .rodata.*) .rodata.str1.4 - 0x0000000000303f04 0x7d8 build-cg/src/main.o - .rodata 0x00000000003046dc 0x5cd8 build-cg/assets/img/cockpit.png.o - 0x00000000003046dc _img_cockpit - 0x000000000030a3b4 _img_cockpit_end - .rodata 0x000000000030a3b4 0xadd50 build-cg/assets/img/heure.png.o - 0x000000000030a3b4 _img_heure - 0x00000000003b8104 _img_heure_end - .rodata 0x00000000003b8104 0x18 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(topti.c.o) + 0x0000000000303f04 0x7e0 build-cg/src/main.o + .rodata 0x00000000003046e4 0x5cd8 build-cg/assets/img/cockpit.png.o + 0x00000000003046e4 _img_cockpit + 0x000000000030a3bc _img_cockpit_end + .rodata 0x000000000030a3bc 0xadd50 build-cg/assets/img/heure.png.o + 0x000000000030a3bc _img_heure + 0x00000000003b810c _img_heure_end + .rodata 0x00000000003b810c 0x18 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(topti.c.o) .rodata.str1.4 - 0x00000000003b811c 0x31 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(stdio.c.o) - *fill* 0x00000000003b814d 0x3 - .rodata 0x00000000003b8150 0x49c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(font8x9.png.o) - 0x00000000003b8150 _gint_font8x9 - 0x00000000003b85ec _gint_font8x9_end + 0x00000000003b8124 0x31 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(stdio.c.o) + *fill* 0x00000000003b8155 0x3 + .rodata 0x00000000003b8158 0x49c /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(font8x9.png.o) + 0x00000000003b8158 _gint_font8x9 + 0x00000000003b85f4 _gint_font8x9_end .rodata.str1.4 - 0x00000000003b85ec 0x7 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(r61524.c.o) - *fill* 0x00000000003b85f3 0x1 + 0x00000000003b85f4 0x7 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(r61524.c.o) + *fill* 0x00000000003b85fb 0x1 .rodata.str1.4 - 0x00000000003b85f4 0x288 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(exch.c.o) + 0x00000000003b85fc 0x288 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(exch.c.o) 0x28c (size before relaxing) .rodata.str1.4 - 0x00000000003b887c 0x6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(keysc.c.o) - *fill* 0x00000000003b8882 0x2 + 0x00000000003b8884 0x6 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(keysc.c.o) + *fill* 0x00000000003b888a 0x2 .rodata.str1.4 - 0x00000000003b8884 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(tmu.c.o) - .rodata 0x00000000003b8888 0x30 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(dma.c.o) + 0x00000000003b888c 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(tmu.c.o) + .rodata 0x00000000003b8890 0x30 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(dma.c.o) .rodata.str1.4 - 0x00000000003b88b8 0x5 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(dma.c.o) - *fill* 0x00000000003b88bd 0x3 + 0x00000000003b88c0 0x5 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(dma.c.o) + *fill* 0x00000000003b88c5 0x3 .rodata.str1.4 - 0x00000000003b88c0 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(cpg.c.o) - .rodata 0x00000000003b88c4 0x100 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) - 0x00000000003b88c4 ___clz_tab + 0x00000000003b88c8 0x4 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(cpg.c.o) + .rodata 0x00000000003b88cc 0x100 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a(_clz.o) + 0x00000000003b88cc ___clz_tab -.rela.dyn 0x00000000003b89c4 0x0 - .rela.text 0x00000000003b89c4 0x0 build-cg/src/main.o +.rela.dyn 0x00000000003b89cc 0x0 + .rela.text 0x00000000003b89cc 0x0 build-cg/src/main.o .rela.pretext.entry - 0x00000000003b89c4 0x0 build-cg/src/main.o - .rela.pretext 0x00000000003b89c4 0x0 build-cg/src/main.o + 0x00000000003b89cc 0x0 build-cg/src/main.o + .rela.pretext 0x00000000003b89cc 0x0 build-cg/src/main.o 0x0000000008102000 . = ORIGIN (ram) .bss 0x0000000008102000 0x150 @@ -476,8 +476,8 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a *fill* 0x0000000008102144 0xc 0x0000000000000150 _sbss = SIZEOF (.bss) -.data 0x0000000008102150 0x80 load address 0x00000000003b89c4 - 0x00000000003b89c4 _ldata = LOADADDR (.data) +.data 0x0000000008102150 0x80 load address 0x00000000003b89cc + 0x00000000003b89cc _ldata = LOADADDR (.data) 0x0000000008102150 _rdata = . *(.data .data.*) .data 0x0000000008102150 0x0 build-cg/src/main.o @@ -526,29 +526,29 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a 0x00000000081021d0 . = ALIGN (0x10) *fill* 0x00000000081021cc 0x4 -.data.4 0x00000000081021d0 0x0 load address 0x00000000003b8a44 +.data.4 0x00000000081021d0 0x0 load address 0x00000000003b8a4c *(.data.4) 0x00000000081021d0 . = ALIGN (0x10) 0x0000000000000080 _sdata = (SIZEOF (.data) + SIZEOF (.data.4)) 0x00000000e5200000 . = ORIGIN (ilram) -.ilram 0x00000000e5200000 0x20 load address 0x00000000003b8a44 - 0x00000000003b8a44 _lilram = LOADADDR (.ilram) +.ilram 0x00000000e5200000 0x20 load address 0x00000000003b8a4c + 0x00000000003b8a4c _lilram = LOADADDR (.ilram) 0x00000000e5200000 _rilram = . *(.ilram) .ilram 0x00000000e5200000 0x20 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(memset.c.o) 0x00000000e5200020 . = ALIGN (0x10) 0x00000000e5007000 . = ORIGIN (xram) -.xram 0x00000000e5007000 0x0 load address 0x00000000003b8a64 - 0x00000000003b8a64 _lxram = LOADADDR (.xram) +.xram 0x00000000e5007000 0x0 load address 0x00000000003b8a6c + 0x00000000003b8a6c _lxram = LOADADDR (.xram) 0x00000000e5007000 _rxram = . *(.xram) 0x00000000e5007000 . = ALIGN (0x10) 0x00000000e5017000 . = ORIGIN (yram) -.yram 0x00000000e5017000 0x0 load address 0x00000000003b8a64 - 0x00000000003b8a64 _lyram = LOADADDR (.yram) +.yram 0x00000000e5017000 0x0 load address 0x00000000003b8a6c + 0x00000000003b8a6c _lyram = LOADADDR (.yram) 0x00000000e5017000 _ryram = . *(.yram) 0x00000000e5017000 . = ALIGN (0x10) @@ -558,8 +558,8 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a 0x000000008c15ff00 _gint_vbr = (ORIGIN (vbr) - 0x100) 0x000000008c161400 . = ORIGIN (rram) -.gint.data 0x000000008c161400 0xe0 load address 0x00000000003b8a64 - 0x00000000003b8a64 _lgdata = LOADADDR (.gint.data) +.gint.data 0x000000008c161400 0xe0 load address 0x00000000003b8a6c + 0x00000000003b8a6c _lgdata = LOADADDR (.gint.data) 0x000000008c161400 _rgdata = . *(.gint.data .gint.data.*) .gint.data 0x000000008c161400 0x8 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(r61524.c.o) @@ -577,7 +577,7 @@ LOAD /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgcc.a *fill* 0x000000008c1614d8 0x8 0x00000000000000e0 _sgdata = SIZEOF (.gint.data) -.gint.bss 0x000000008c1614e0 0x300 load address 0x00000000003b8b44 +.gint.bss 0x000000008c1614e0 0x300 load address 0x00000000003b8b4c *(.gint.bss .gint.bss.*) .gint.bss 0x000000008c1614e0 0x8 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(r61524.c.o) .gint.bss 0x000000008c1614e8 0x40 /Users/antoine/gcc/sh3eb-elf-2.32-8.3.0/lib/gcc/sh3eb-elf/8.3.0/libgint-cg.a(hardware.c.o) diff --git a/Sources/build-cg/src/main.o b/Sources/build-cg/src/main.o index 6f7f406..94d43f6 100644 Binary files a/Sources/build-cg/src/main.o and b/Sources/build-cg/src/main.o differ diff --git a/Sources/src/main.c b/Sources/src/main.c index 33a8e22..1eed22c 100644 --- a/Sources/src/main.c +++ b/Sources/src/main.c @@ -1,13 +1,13 @@ -//----- -// Nom du projet : Fly Simulator -// Version : - dev - -// Dernière modification le : 23 juillet 2019 -//----- +/* + Nom du projet : Fly Simulator + Version : - dev - + Dernière modification le : 23 octobre 2019 +*/ /* ----------- */ /* - IMPORTS - */ -/* ---------- - - */ +/* ----------- */ + #include #include #include @@ -47,7 +47,7 @@ int main (void) int key = 0;//variables diverses dclear(C_WHITE); - dtext(1, 1, "Choix de la langue", C_RED, C_NONE); + dtext(1, 1, "-== Choix de la langue ==-", C_RED, C_NONE); dtext(1, 12, " 1. Francais", C_BLUE, C_NONE); dtext(1, 23, " 2. Anglais", C_BLACK, C_NONE); dupdate(); @@ -74,7 +74,6 @@ int main (void) void communication(int *com_id, int *id, const int langue) { - //faire un choix de la langue Français / Anglais const char *avion = "Cessna 172", *immat = "F-GUXF", *immat_courte = "F-XF", *aipt_depart = "Caen", *aipt_arrivee = "Le Havre", *freq_cont = "117.15", *freq_arrivee = "122.80", *passagers = "4";//données de l'avion et de son trajet char *comm_1[2] = {"%s tour, %s. Bonjour.", "%s tower, %s. Good morning."},