diff --git a/Etape_1.uvguix.boujon b/Etape_1.uvguix.boujon index 73b9316..8a1b828 100644 --- a/Etape_1.uvguix.boujon +++ b/Etape_1.uvguix.boujon @@ -1822,7 +1822,7 @@ Build 979 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000452E9656C960000000000000002000653696D756CE90452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000452E9656C960000000000000002000653696D756CE90452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3563,7 +3563,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020000002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020000002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3606,9 +3606,9 @@ 0 .\Principale.asm - 0 - 57 - 87 + 5 + 61 + 95 1 0 diff --git a/Etape_1.uvoptx b/Etape_1.uvoptx index e3cbc2d..606323b 100644 --- a/Etape_1.uvoptx +++ b/Etape_1.uvoptx @@ -418,9 +418,9 @@ 0 0 - 85 + 89 1 -
134222592
+
134222604
0 0 0 @@ -429,7 +429,7 @@ 1 .\Principale.asm - \\Reel_Etape0\Principale.asm\85 + \\Reel_Etape0\Principale.asm\89 diff --git a/Listings/Reel_Etape0.map b/Listings/Reel_Etape0.map index 8c2daec..da0c2b5 100644 --- a/Listings/Reel_Etape0.map +++ b/Listings/Reel_Etape0.map @@ -268,10 +268,10 @@ Image Symbol Table i.__scatterload_copy 0x080012b0 Section 14 handlers.o(i.__scatterload_copy) i.__scatterload_null 0x080012be Section 2 handlers.o(i.__scatterload_null) i.__scatterload_zeroinit 0x080012c0 Section 14 handlers.o(i.__scatterload_zeroinit) - moncode 0x080012d0 Section 68 principale.o(moncode) + moncode 0x080012d0 Section 92 principale.o(moncode) Eteint_LED 0x080012d1 Thumb Code 22 principale.o(moncode) Allume_LED 0x080012e7 Thumb Code 22 principale.o(moncode) - moncode 0x08001314 Section 200 foncasm.o(moncode) + moncode 0x0800132c Section 200 foncasm.o(moncode) .data 0x20000000 Section 19 initialisation.o(.data) .data 0x20000014 Section 24 fonctiontimer.o(.data) incre 0x20000024 Data 4 fonctiontimer.o(.data) @@ -415,11 +415,11 @@ Image Symbol Table __scatterload_copy 0x080012b1 Thumb Code 14 handlers.o(i.__scatterload_copy) __scatterload_null 0x080012bf Thumb Code 2 handlers.o(i.__scatterload_null) __scatterload_zeroinit 0x080012c1 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - main 0x080012fd Thumb Code 20 principale.o(moncode) - Envoie192Boucle 0x08001315 Thumb Code 108 foncasm.o(moncode) - Envoie96Dot 0x08001381 Thumb Code 78 foncasm.o(moncode) - Region$$Table$$Base 0x080013dc Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x080013fc Number 0 anon$$obj.o(Region$$Table) + main 0x080012fd Thumb Code 40 principale.o(moncode) + Envoie192Boucle 0x0800132d Thumb Code 108 foncasm.o(moncode) + Envoie96Dot 0x08001399 Thumb Code 78 foncasm.o(moncode) + Region$$Table$$Base 0x080013f4 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08001414 Number 0 anon$$obj.o(Region$$Table) PrtSurImage 0x20000000 Data 4 initialisation.o(.data) BarretEnCours 0x20000004 Data 4 initialisation.o(.data) DataSend 0x20000008 Data 1 initialisation.o(.data) @@ -440,9 +440,9 @@ Memory Map of the image Image Entry point : 0x08000151 - Load Region LR_IROM1 (Base: 0x08000000, Size: 0x0000148c, Max: 0x00040000, ABSOLUTE) + Load Region LR_IROM1 (Base: 0x08000000, Size: 0x000014a4, Max: 0x00040000, ABSOLUTE) - Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000013fc, Max: 0x00040000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00001414, Max: 0x00040000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -502,20 +502,20 @@ Memory Map of the image 0x080012be 0x080012be 0x00000002 Code RO 492 i.__scatterload_null mc_w.l(handlers.o) 0x080012c0 0x080012c0 0x0000000e Code RO 493 i.__scatterload_zeroinit mc_w.l(handlers.o) 0x080012ce 0x080012ce 0x00000002 PAD - 0x080012d0 0x080012d0 0x00000044 Code RO 2 moncode principale.o - 0x08001314 0x08001314 0x000000c8 Code RO 331 moncode Matos.lib(foncasm.o) - 0x080013dc 0x080013dc 0x00000020 Data RO 489 Region$$Table anon$$obj.o + 0x080012d0 0x080012d0 0x0000005c Code RO 2 moncode principale.o + 0x0800132c 0x0800132c 0x000000c8 Code RO 331 moncode Matos.lib(foncasm.o) + 0x080013f4 0x080013f4 0x00000020 Data RO 489 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080013fc, Size: 0x00000490, Max: 0x00010000, ABSOLUTE) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08001414, Size: 0x00000490, Max: 0x00010000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x080013fc 0x00000013 Data RW 97 .data Matos.lib(initialisation.o) - 0x20000013 0x0800140f 0x00000001 PAD - 0x20000014 0x08001410 0x00000018 Data RW 229 .data Matos.lib(fonctiontimer.o) - 0x2000002c 0x08001428 0x00000060 Data RW 321 .data Matos.lib(warning.o) - 0x2000008c 0x08001488 0x00000004 Data RW 407 .data Matos.lib(timer_systick_1.o) + 0x20000000 0x08001414 0x00000013 Data RW 97 .data Matos.lib(initialisation.o) + 0x20000013 0x08001427 0x00000001 PAD + 0x20000014 0x08001428 0x00000018 Data RW 229 .data Matos.lib(fonctiontimer.o) + 0x2000002c 0x08001440 0x00000060 Data RW 321 .data Matos.lib(warning.o) + 0x2000008c 0x080014a0 0x00000004 Data RW 407 .data Matos.lib(timer_systick_1.o) 0x20000090 - 0x00000400 Zero RW 10 STACK startup_stm32f10x_cl.o @@ -526,12 +526,12 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 68 4 0 0 0 424 principale.o + 92 8 0 0 0 432 principale.o 36 8 336 0 1024 800 startup_stm32f10x_cl.o 396 32 0 0 0 6481 system_stm32f10x_1.o ---------------------------------------------------------------------- - 500 44 368 0 1024 7705 Object Totals + 524 48 368 0 1024 7713 Object Totals 0 0 32 0 0 0 (incl. Generated) 0 0 0 0 0 0 (incl. Padding) @@ -594,15 +594,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 4748 386 368 144 1024 245324 Grand Totals - 4748 386 368 144 1024 245324 ELF Image Totals - 4748 386 368 144 0 0 ROM Totals + 4772 390 368 144 1024 245332 Grand Totals + 4772 390 368 144 1024 245332 ELF Image Totals + 4772 390 368 144 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 5116 ( 5.00kB) + Total RO Size (Code + RO Data) 5140 ( 5.02kB) Total RW Size (RW Data + ZI Data) 1168 ( 1.14kB) - Total ROM Size (Code + RO Data + RW Data) 5260 ( 5.14kB) + Total ROM Size (Code + RO Data + RW Data) 5284 ( 5.16kB) ============================================================================== diff --git a/Listings/principale.lst b/Listings/principale.lst index 08262fa..cfa016b 100644 --- a/Listings/principale.lst +++ b/Listings/principale.lst @@ -165,7 +165,7 @@ ARM Macro Assembler Page 3 47 00000000 48 00000000 E92D 1001 PUSH {R12,R0} ;On stocke R12 dans R0 - 49 00000004 F8DF C038 LDR R12,=GPIOBASEB ;On recupère l'a + 49 00000004 F8DF C04C LDR R12,=GPIOBASEB ;On recupère l'a dresse de base 50 00000008 F44F 6580 MOV R5,#(0x01 << 10) ;1 décalé de 1 0 dans R5 @@ -199,7 +199,7 @@ ARM Macro Assembler Page 3 ARM Macro Assembler Page 4 - 65 0000001A F8DF C024 LDR R12,=GPIOBASEB ;On recupère l'a + 65 0000001A F8DF C038 LDR R12,=GPIOBASEB ;On recupère l'a dresse de base 66 0000001E F44F 6580 MOV R5,#(0x01 << 10) ;1 décalé de 1 0 dans R5 @@ -232,20 +232,38 @@ ARM Macro Assembler Page 4 84 0000002C F04F 0000 MOV R0,#0 ; 85 00000030 F7FF FFFE BL Init_Cible ; 86 00000034 Boucle - 87 00000034 F7FF FFFE BL Allume_LED - 88 00000038 F7FF FFFE BL Eteint_LED - 89 0000003C E7FA B Boucle - 90 0000003E - 91 0000003E E7FE B . ; boucle inifinie t + 87 00000034 F8DF C020 LDR R12,=GPIOBASEA ;On récup l'adre + sse du GPIOA + 88 00000038 F8DC 0008 LDR R0,[R12,#OffsetInput] ;On charg + e sa valeur avec l' + OffsetInput + 89 0000003C F400 7080 AND R0, R0, #(0x01 << 8) ;R0 est ma + squé pour n'avoir q + ue le bit de l'offs + et input + 90 00000040 F5B0 7F80 CMP R0, #(0x01 << 8) + ;On compare R0 à 1 + 91 00000044 D102 BNE T_Oui ;On allume + 92 00000046 F7FF FFFE BL Eteint_LED ;Sinon on éteint + 93 0000004A E7F3 B Boucle ;On reboucle + 94 0000004C + 95 0000004C T_Oui + 96 0000004C F7FF FFFE BL Allume_LED + 97 00000050 E7F0 B Boucle + 98 00000052 + 99 00000052 E7FE B . ; boucle inifinie t erminale... - 92 00000040 - 93 00000040 - 94 00000040 - 95 00000040 - 96 00000040 ENDP - 97 00000040 - 98 00000040 END + 100 00000054 ENDP + 101 00000054 + 102 00000054 END 40010C00 + 40010800 + + + +ARM Macro Assembler Page 5 + + Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw ork --depend=.\objects\principale.d -o.\objects\principale.o -I.\RTE\Device\STM 32F107VC -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Co @@ -281,7 +299,7 @@ Symbol: Allume_LED Definitions At line 62 in file Principale.asm Uses - At line 87 in file Principale.asm + At line 96 in file Principale.asm Comment: Allume_LED used once Boucle 00000034 @@ -289,16 +307,25 @@ Symbol: Boucle Definitions At line 86 in file Principale.asm Uses - At line 89 in file Principale.asm -Comment: Boucle used once + At line 93 in file Principale.asm + At line 97 in file Principale.asm + Eteint_LED 00000000 Symbol: Eteint_LED Definitions At line 46 in file Principale.asm Uses - At line 88 in file Principale.asm + At line 92 in file Principale.asm Comment: Eteint_LED used once +T_Oui 0000004C + +Symbol: T_Oui + Definitions + At line 95 in file Principale.asm + Uses + At line 91 in file Principale.asm +Comment: T_Oui used once main 0000002C Symbol: main @@ -315,7 +342,7 @@ Symbol: moncode Uses None Comment: moncode unused -5 symbols +6 symbols @@ -328,8 +355,8 @@ Symbol: GPIOBASEA Definitions At line 24 in file REG_UTILES.inc Uses - None -Comment: GPIOBASEA unused + At line 87 in file Principale.asm +Comment: GPIOBASEA used once GPIOBASEB 40010C00 Symbol: GPIOBASEB @@ -415,8 +442,8 @@ Symbol: OffsetInput Definitions At line 27 in file REG_UTILES.inc Uses - None -Comment: OffsetInput unused + At line 88 in file Principale.asm +Comment: OffsetInput used once OffsetOutput 0000000C Symbol: OffsetOutput @@ -511,4 +538,4 @@ Symbol: |Lib$$Request$$armlib| None Comment: |Lib$$Request$$armlib| unused 2 symbols -364 symbols in table +365 symbols in table diff --git a/Objects/Etape_1_Réel.dep b/Objects/Etape_1_Réel.dep index 1d0e091..e570614 100644 --- a/Objects/Etape_1_Réel.dep +++ b/Objects/Etape_1_Réel.dep @@ -1,6 +1,6 @@ Dependencies for Project 'Etape_1', Target 'Réel': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Principale.asm)(0x640EF96C)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F107VC -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_CL SETA 1" --pd "_RTE_ SETA 1" --pd "STM32F10X_CL SETA 1" --list .\listings\principale.lst --xref -o .\objects\principale.o --depend .\objects\principale.d) +F (.\Principale.asm)(0x640F050F)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F107VC -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_CL SETA 1" --pd "_RTE_ SETA 1" --pd "STM32F10X_CL SETA 1" --list .\listings\principale.lst --xref -o .\objects\principale.o --depend .\objects\principale.d) I (REG_UTILES.inc)(0x640EE4CF) F (.\FonctionEtape.asm)(0x640EE738)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F107VC -I.\RTE\_R_el -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_CL SETA 1" --pd "_RTE_ SETA 1" --pd "STM32F10X_CL SETA 1" --list .\listings\fonctionetape.lst --xref -o .\objects\fonctionetape.o --depend .\objects\fonctionetape.d) I (REG_UTILES.inc)(0x640EE4CF) diff --git a/Objects/Reel_Etape0.axf b/Objects/Reel_Etape0.axf index a8915ce..f8eb736 100644 Binary files a/Objects/Reel_Etape0.axf and b/Objects/Reel_Etape0.axf differ diff --git a/Objects/Reel_Etape0.build_log.htm b/Objects/Reel_Etape0.build_log.htm index 57e4820..7d19967 100644 --- a/Objects/Reel_Etape0.build_log.htm +++ b/Objects/Reel_Etape0.build_log.htm @@ -26,8 +26,14 @@ Project File Date: 03/13/2023

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Build target 'Réel' +Rebuild target 'Réel' Note: source file 'RTE\Device\STM32F107VC\system_stm32f10x.c' - object file renamed from '.\Objects\system_stm32f10x.o' to '.\Objects\system_stm32f10x_1.o'. +assembling FonctionEtape.asm... +assembling Principale.asm... +assembling startup_stm32f10x_cl.s... +compiling system_stm32f10x.c... +linking... +Program Size: Code=4772 RO-data=368 RW-data=144 ZI-data=1024 ".\Objects\Reel_Etape0.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -59,7 +65,7 @@ Package Vendor: Keil Source file: Device\Source\system_stm32f10x.c Source file: Device\Source\ARM\startup_stm32f10x_cl.s Source file: Device\Source\ARM\STM32F1xx_OPT.s -Build Time Elapsed: 00:00:00 +Build Time Elapsed: 00:00:01 diff --git a/Objects/Reel_Etape0.htm b/Objects/Reel_Etape0.htm index 94882ec..e5dec1b 100644 --- a/Objects/Reel_Etape0.htm +++ b/Objects/Reel_Etape0.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\Objects\Reel_Etape0.axf]

Static Call Graph for image .\Objects\Reel_Etape0.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Mar 13 11:22:38 2023 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Mar 13 12:12:17 2023

Maximum Stack Usage = 168 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

@@ -648,12 +648,12 @@ Global Symbols

__scatterload_zeroinit (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED) -

main (Thumb, 20 bytes, Stack size 0 bytes, principale.o(moncode)) +

main (Thumb, 40 bytes, Stack size 0 bytes, principale.o(moncode))

[Stack]

  • Max Depth = 168
  • Call Chain = main ⇒ Init_Cible ⇒ Init_Timer1 ⇒ __aeabi_dmul ⇒ _double_epilogue ⇒ _double_round

[Calls]
  • >>   Init_Cible -
  • >>   Allume_LED -
  • >>   Eteint_LED +
  • >>   Allume_LED +
  • >>   Eteint_LED

[Address Reference Count : 1]
  • entry9a.o(.ARM.Collect$$$$0000000B)
@@ -670,11 +670,11 @@ Global Symbols

Local Symbols

-

Eteint_LED (Thumb, 22 bytes, Stack size 0 bytes, principale.o(moncode)) +

Eteint_LED (Thumb, 22 bytes, Stack size 0 bytes, principale.o(moncode))

[Called By]

  • >>   main
-

Allume_LED (Thumb, 22 bytes, Stack size 0 bytes, principale.o(moncode)) +

Allume_LED (Thumb, 22 bytes, Stack size 0 bytes, principale.o(moncode))

[Called By]

  • >>   main
diff --git a/Objects/principale.o b/Objects/principale.o index 9fe9b60..0ccb892 100644 Binary files a/Objects/principale.o and b/Objects/principale.o differ diff --git a/Objects/system_stm32f10x_1.o b/Objects/system_stm32f10x_1.o index 1136263..5236ae0 100644 Binary files a/Objects/system_stm32f10x_1.o and b/Objects/system_stm32f10x_1.o differ diff --git a/Principale.asm b/Principale.asm index 04b4893..47385d1 100644 --- a/Principale.asm +++ b/Principale.asm @@ -84,15 +84,19 @@ main PROC MOV R0,#0; BL Init_Cible; Boucle + LDR R12,=GPIOBASEA ;On récup l'adresse du GPIOA + LDR R0,[R12,#OffsetInput] ;On charge sa valeur avec l'OffsetInput + AND R0, R0, #(0x01 << 8) ;R0 est masqué pour n'avoir que le bit de l'offset input + CMP R0, #(0x01 << 8) ;On compare R0 à 1 + BNE T_Oui ;On allume + BL Eteint_LED ;Sinon on éteint + B Boucle ;On reboucle + +T_Oui BL Allume_LED - BL Eteint_LED B Boucle B . ; boucle inifinie terminale... - - - - ENDP END