Merge branch 'master' of https://github.com/SergeyShemet/SergObsidian
This commit is contained in:
80
.obsidian/workspace.json
vendored
80
.obsidian/workspace.json
vendored
@@ -4,21 +4,24 @@
|
||||
"type": "split",
|
||||
"children": [
|
||||
{
|
||||
"id": "6f267f61dfa5a7ac",
|
||||
"id": "b1afd552ee0aa86f",
|
||||
"type": "tabs",
|
||||
"children": [
|
||||
{
|
||||
"id": "9646dde68fa819a1",
|
||||
"id": "343836aed0394d03",
|
||||
"type": "leaf",
|
||||
"state": {
|
||||
"type": "markdown",
|
||||
"type": "canvas",
|
||||
"state": {
|
||||
"file": "conflict-files-obsidian-git.md",
|
||||
"mode": "source",
|
||||
"source": false
|
||||
"file": "PERSONAL PROJECTS/P2EP/cdRead.canvas",
|
||||
"viewState": {
|
||||
"x": 401.3031063027698,
|
||||
"y": -2181.884774735966,
|
||||
"zoom": -0.9999999999999999
|
||||
}
|
||||
},
|
||||
"icon": "lucide-file",
|
||||
"title": "conflict-files-obsidian-git"
|
||||
"icon": "lucide-layout-dashboard",
|
||||
"title": "cdRead"
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -78,7 +81,7 @@
|
||||
}
|
||||
],
|
||||
"direction": "horizontal",
|
||||
"width": 373.5
|
||||
"width": 314.5
|
||||
},
|
||||
"right": {
|
||||
"id": "5a12b65cf742d665",
|
||||
@@ -175,51 +178,52 @@
|
||||
"obsidian-git:Open Git source control": false
|
||||
}
|
||||
},
|
||||
"active": "9646dde68fa819a1",
|
||||
"active": "343836aed0394d03",
|
||||
"lastOpenFiles": [
|
||||
"conflict-files-obsidian-git.md",
|
||||
"PERSONAL PROJECTS/P2EP/cdRead.canvas",
|
||||
"My/Diet 1.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/CD_Execute_Reading.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/fade calculation.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code Gamepad code.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code logo show.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code - Load texture from SECTOR!.md",
|
||||
"WORK & PROJECTS/Mol/Code Chunks/TipTap Plugin.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Gamepad.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_800453e0 SystemEventManager.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80015674 Update Entity Stats.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/MakeSmallChar.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80015674 Update Entity Stats.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_800453e0 SystemEventManager.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80012df4 RenderInterface.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80011f2c InitInterfaceManager.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 IRQ.md",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/Untitled",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/fade calculation.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Gpu-DMA.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Ordering table.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 DMA.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 MDEC.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code IRQ handling.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Geometry Transformation Engine.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/LZSS C++ Lib.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code - Texture show from file.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code - modules load and exec.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code - Load texture from SECTOR!.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code texture load unpack show and fade.md",
|
||||
"PERSONAL PROJECTS/Persona 1/Script Format.md",
|
||||
"My/Diet 2.md",
|
||||
"WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/CD_Execute_Reading.md",
|
||||
"PERSONAL PROJECTS/P2EP/cdRead.canvas",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code logo show.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code Gamepad code.md",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/Разработка - ЭПИКИ.md",
|
||||
"WORK & PROJECTS/Mol/Code Chunks/TipTap Plugin.md",
|
||||
"WORK & PROJECTS/Mol/Code Chunks",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code IRQ handling.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PSX code inline asm.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Vblank.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Ordering table.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 IRQ.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 MDEC.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Gpu-DMA.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Geometry Transformation Engine.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS/PS1 Gamepad.md",
|
||||
"PERSONAL PROJECTS/PS1 DOCS",
|
||||
"PERSONAL PROJECTS/P2EP/pseudoCode",
|
||||
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СМК/КУ_Чек_лист_10_ошибок_УД_скачивание.pdf",
|
||||
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СМК",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Таблицы нумератора и документов.canvas",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/Схема связей юрлиц и адресов.canvas",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Архитектура редактора и генератора (Alfa + Mol).canvas",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Alfa cloud prod.canvas",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт.canvas",
|
||||
"My",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud",
|
||||
"Структура объектов испытаний.png",
|
||||
"Схема связей юрлиц и адресов.png",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Архитектура редактора и генератора (Alfa + Mol).canvas",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Таблицы нумератора и документов.canvas",
|
||||
"Структура объектов испытаний.png.0.pdnSave",
|
||||
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/АФ-01 Альбом форм.pdf",
|
||||
"WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Быстрый старт/Быстрый старт.canvas",
|
||||
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Alfa cloud prod.canvas",
|
||||
"WORK & PROJECTS/Ulab/Автобан/щебень 5-20.xlsx",
|
||||
"WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas",
|
||||
"P2EP/cdRead.canvas",
|
||||
|
||||
@@ -28,9 +28,29 @@
|
||||
{"id":"7118f94ce6d92aea","type":"text","text":"ReadCDEvent","x":-141,"y":-602,"width":250,"height":60},
|
||||
{"id":"f3b8eddd211ca742","type":"text","text":"????","x":494,"y":-817,"width":250,"height":60},
|
||||
{"id":"ee4bb15a8d7d0ea6","type":"text","text":"**RECTToVRAM**\n\nTEXTURE LOAD TO VRAM","x":1480,"y":-12,"width":250,"height":75,"color":"4"},
|
||||
{"id":"957682e7859ea3a3","x":-1020,"y":-2500,"width":250,"height":60,"type":"text","text":"main: 800247cc"},
|
||||
{"id":"4c9bce91e8bd5b4f","x":-1020,"y":-2380,"width":250,"height":60,"type":"text","text":"Load_Filetable: 800266ac"},
|
||||
{"id":"4d2ba119c0d1e47b","x":-620,"y":-2380,"width":250,"height":60,"type":"text","text":"CD_simple_file_LOAD"}
|
||||
|
||||
{"id":"4d2ba119c0d1e47b","type":"text","text":"CD_simple_file_LOAD\n800272d0","x":-620,"y":-2680,"width":250,"height":60},
|
||||
{"id":"a161300f3f688222","type":"text","text":"diskFile ID\ndest RAM addr","x":-280,"y":-2680,"width":250,"height":60},
|
||||
{"id":"90bcff3740d1c6d4","type":"text","text":"Images\nTims\nOverlays load\n….","x":-620,"y":-2960,"width":250,"height":123},
|
||||
{"id":"957682e7859ea3a3","type":"text","text":"main\n800247cc","x":-1020,"y":-2897,"width":250,"height":60},
|
||||
{"id":"4c9bce91e8bd5b4f","type":"text","text":"Load_Filetable\n800266ac\n","x":-1020,"y":-2760,"width":250,"height":80},
|
||||
{"id":"32f979c27473ed80","type":"text","text":"Overlay_simple_CD_read\n800272a8","x":-745,"y":-2360,"width":250,"height":60},
|
||||
{"id":"e53d787944b7d7c3","type":"text","text":"OverlayCDReadSimple\n8002724c\ninits CDread struct","x":-745,"y":-2200,"width":250,"height":100},
|
||||
{"id":"e47a1f791c7bc523","type":"text","text":"DsSectorSeek\n800271c0","x":-745,"y":-2030,"width":250,"height":60},
|
||||
{"id":"0d3e31b5e2953d14","type":"text","text":"DsPacket **PsyQ**\n80047274","x":-745,"y":-1880,"width":250,"height":60,"color":"4"},
|
||||
{"id":"31471a8b8a057842","type":"text","text":"CD_Read_Sector_Loop\n80026994","x":-155,"y":-2360,"width":250,"height":60},
|
||||
{"id":"d800843990cd590f","type":"text","text":"callback","x":-225,"y":-1880,"width":140,"height":60,"color":"1"},
|
||||
{"id":"3bcb63da988e9190","type":"text","text":"CD_execute_M1\n80026994","x":-155,"y":-2280,"width":250,"height":60},
|
||||
{"id":"1d7de093b91c0a67","type":"text","text":"CD_ExecuteReading\n800267ac","x":-154,"y":-2200,"width":250,"height":60},
|
||||
{"id":"9503dd7c071708d8","type":"text","text":"Waiting for dsPacket callback","x":-154,"y":-2120,"width":250,"height":60},
|
||||
{"id":"586fba15aac90ebf","type":"text","text":"CD_SectorRead\n800276c8\nReading without DsPacket?","x":260,"y":-2224,"width":250,"height":109},
|
||||
{"id":"9049c59dd26b282f","type":"text","text":"dsChangeStatusCallback\n800265b8","x":-280,"y":-1760,"width":250,"height":60},
|
||||
{"id":"c95911f86dd817c0","type":"text","text":"DsStartReadySystem **PsyQ** callback to","x":-280,"y":-1659,"width":250,"height":60,"color":"4"},
|
||||
{"id":"81dc0c99613e758a","type":"text","text":"DsDirectReading","x":-280,"y":-1545,"width":250,"height":60},
|
||||
{"id":"dfbc8f73393afe20","x":96,"y":-1755,"width":109,"height":50,"type":"text","text":"if end"},
|
||||
{"id":"5f40800197533337","type":"text","text":"Чтение сектора\nCdGetSector","x":-280,"y":-1440,"width":250,"height":60,"color":"4"},
|
||||
{"id":"4e8a8cafc2b20b69","type":"text","text":"DsCommand pause","x":260,"y":-1760,"width":250,"height":60},
|
||||
{"id":"2ca877da8ab11423","type":"text","text":"nullCdFlags","x":260,"y":-1670,"width":250,"height":60}
|
||||
],
|
||||
"edges":[
|
||||
{"id":"5ecaadef728e1c15","fromNode":"0faf880ce3d5728c","fromSide":"right","toNode":"f1b9d32f4231ce49","toSide":"left","color":"6"},
|
||||
@@ -66,6 +86,29 @@
|
||||
{"id":"e21b4efcb9c62fd5","fromNode":"c4a01a477d5732fc","fromSide":"right","toNode":"ee4bb15a8d7d0ea6","toSide":"left"},
|
||||
{"id":"079a759fdabbba92","fromNode":"6ae7a0619adc1889","fromSide":"bottom","toNode":"95602eb206b87c58","toSide":"top","label":"*file_struct, file_count"},
|
||||
{"id":"84f4f93f0a4db7fd","fromNode":"95602eb206b87c58","fromSide":"right","toNode":"42e975d2e486d316","toSide":"left"},
|
||||
{"id":"0b5abeb46804b847","fromNode":"42e975d2e486d316","fromSide":"right","toNode":"451813cea87889ca","toSide":"left","color":"3"}
|
||||
{"id":"0b5abeb46804b847","fromNode":"42e975d2e486d316","fromSide":"right","toNode":"451813cea87889ca","toSide":"left","color":"3"},
|
||||
{"id":"59a17e22575d2b23","fromNode":"90bcff3740d1c6d4","fromSide":"bottom","toNode":"4d2ba119c0d1e47b","toSide":"top","label":"file ID, dest RAM addr"},
|
||||
{"id":"e39b9031691d9cd9","fromNode":"957682e7859ea3a3","fromSide":"bottom","toNode":"4c9bce91e8bd5b4f","toSide":"top"},
|
||||
{"id":"51560f48b2ab7707","fromNode":"a161300f3f688222","fromSide":"left","toNode":"4d2ba119c0d1e47b","toSide":"right"},
|
||||
{"id":"28deb7447b17b38b","fromNode":"4d2ba119c0d1e47b","fromSide":"bottom","toNode":"32f979c27473ed80","toSide":"top","label":"calc sector, size & dest addr"},
|
||||
{"id":"3293aa56df732925","fromNode":"4c9bce91e8bd5b4f","fromSide":"bottom","toNode":"32f979c27473ed80","toSide":"top","label":"0x17, 0x1b88, FileTablePtr"},
|
||||
{"id":"b928a02b49d4c00f","fromNode":"32f979c27473ed80","fromSide":"bottom","toNode":"e53d787944b7d7c3","toSide":"top","label":"1"},
|
||||
{"id":"b9afe29ab9f5885e","fromNode":"e53d787944b7d7c3","fromSide":"bottom","toNode":"e47a1f791c7bc523","toSide":"top","label":"1"},
|
||||
{"id":"16865483a8937bdf","fromNode":"e47a1f791c7bc523","fromSide":"bottom","toNode":"0d3e31b5e2953d14","toSide":"top","label":"1"},
|
||||
{"id":"3dd934d2475a8d59","fromNode":"32f979c27473ed80","fromSide":"right","toNode":"31471a8b8a057842","toSide":"left","label":"2"},
|
||||
{"id":"6fbe979096524a52","fromNode":"0d3e31b5e2953d14","fromSide":"right","toNode":"d800843990cd590f","toSide":"left","label":"3. seek over"},
|
||||
{"id":"fd8e18707ad3ea5b","fromNode":"31471a8b8a057842","fromSide":"bottom","toNode":"3bcb63da988e9190","toSide":"top"},
|
||||
{"id":"b23f1ba49622ec96","fromNode":"3bcb63da988e9190","fromSide":"bottom","toNode":"1d7de093b91c0a67","toSide":"top"},
|
||||
{"id":"62d73b9f8ec6719f","fromNode":"9503dd7c071708d8","fromSide":"left","toNode":"31471a8b8a057842","toSide":"left","label":"Loop"},
|
||||
{"id":"04d3c8e6775d34bb","fromNode":"1d7de093b91c0a67","fromSide":"bottom","toNode":"9503dd7c071708d8","toSide":"top"},
|
||||
{"id":"8f54082f5c3e9c80","fromNode":"1d7de093b91c0a67","fromSide":"right","toNode":"586fba15aac90ebf","toSide":"left"},
|
||||
{"id":"4386c9f792fe1e8c","fromNode":"d800843990cd590f","fromSide":"bottom","toNode":"9049c59dd26b282f","toSide":"top"},
|
||||
{"id":"943d470eaec73c69","fromNode":"9049c59dd26b282f","fromSide":"bottom","toNode":"c95911f86dd817c0","toSide":"top"},
|
||||
{"id":"82e96686a5e0109e","fromNode":"c95911f86dd817c0","fromSide":"bottom","toNode":"81dc0c99613e758a","toSide":"top"},
|
||||
{"id":"15309903898a9c94","fromNode":"81dc0c99613e758a","fromSide":"bottom","toNode":"5f40800197533337","toSide":"top"},
|
||||
{"id":"e12f8cf44c628638","fromNode":"dfbc8f73393afe20","fromSide":"right","toNode":"4e8a8cafc2b20b69","toSide":"left"},
|
||||
{"id":"336b194d0ca3b008","fromNode":"9049c59dd26b282f","fromSide":"right","toNode":"dfbc8f73393afe20","toSide":"left"},
|
||||
{"id":"ef113c7cbbd3220e","fromNode":"81dc0c99613e758a","fromSide":"right","toNode":"dfbc8f73393afe20","toSide":"bottom"},
|
||||
{"id":"798405ab46936dcf","fromNode":"4e8a8cafc2b20b69","fromSide":"bottom","toNode":"2ca877da8ab11423","toSide":"top"}
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user