아직 익숙하지 않아서 그런데
git는 svn 에서 처럼 repo browser 등에서 편하게 옮기는 법이 없는 듯..
콘솔에서 다 명령어 칠거면 tortoiseGIT 이런게 필요 없자나.. ㅠㅠ
아무튼 파일을 옮기는건 git mv를 통해서 가능
빈 디렉토리는 옮길수 없고,
git 콘솔에서(git bash 등) git mv를 하고 나서
git commit을 하면 끝
그리고 정리가 끝난 이후에 끝난 녀석만 origin에 push 하면 된다.
| git status -s (0) | 2018.08.14 |
|---|---|
| git mv 와 log (0) | 2018.08.14 |
| 우분투에서 GIT 사용방법 (2) | 2018.04.24 |
| svn 로그 수정 pre-revprop-change (0) | 2017.12.20 |
| svn externals commit 제외하기 (0) | 2017.12.10 |
회사에서 쓰니 좋긴한데.. 사양이 좀 높네?
[링크 : http://dejavuqa.tistory.com/7]
그래도 라즈베리에서도 되는거 같긴한데.. 나중에 깔아볼까?
[링크 : https://about.gitlab.com/]
[링크 : https://about.gitlab.com/installation/#raspberry-pi-2]
| github 의 README.md 에 이미지 넣기 (0) | 2024.12.31 |
|---|---|
| gitlab 백업하기 (0) | 2019.03.23 |
| gitlab wiki (2) | 2019.01.28 |
| git push rejected by remote protected branch (2) | 2018.09.04 |
| 네이버 지도 화면상 출력되는 영역 얻기 (0) | 2018.09.10 |
|---|---|
| 네이버 지도 자동으로 크기 조절하기 (0) | 2018.08.30 |
| 네이버 맵 API - 인증 실패 (0) | 2018.08.28 |
| 네이버 맵 API 에러 Uncaught ReferenceError: naver is not defined (0) | 2018.08.28 |
| 네이버 맵 API (0) | 2018.08.22 |
아래처럼 하면 설정파일이 생성된다는데
거기에 rompath를 찾아가면 되다고..
cd ~/.mame && mame -cc gedit ~/.mame/mame.ini |
[링크 : http://www.upubuntu.com/2012/10/how-to-install-mame-multiple-arcade.html]
+
pi@raspberrypi:~/.mame $ ls -al total 16 drwxr-xr-x 3 pi pi 4096 May 18 06:38 . drwxr-xr-x 32 pi pi 4096 May 18 06:38 .. drwxr-xr-x 2 pi pi 4096 May 18 06:38 cfg -rw-r--r-- 1 pi pi 1694 May 18 06:38 ui.ini pi@raspberrypi:~/.mame $ mame -cc pi@raspberrypi:~/.mame $ ls -al total 32 drwxr-xr-x 3 pi pi 4096 May 18 06:39 . drwxr-xr-x 32 pi pi 4096 May 18 06:38 .. drwxr-xr-x 2 pi pi 4096 May 18 06:38 cfg -rw-r--r-- 1 pi pi 9277 May 18 06:39 mame.ini -rw-r--r-- 1 pi pi 249 May 18 06:39 plugin.ini -rw-r--r-- 1 pi pi 1691 May 18 06:39 ui.ini |
경로 설정은 그래도 상단에 있네?
$ cat mame.ini # # CORE CONFIGURATION OPTIONS # readconfig 1 writeconfig 0 # # CORE SEARCH PATH OPTIONS # homepath . rompath $HOME/mame/roms;/usr/local/share/games/mame/roms;/usr/share/games/mame/roms hashpath /usr/share/games/mame/hash samplepath $HOME/mame/samples;/usr/local/share/games/mame/samples;/usr/share/games/mame/samples artpath $HOME/mame/artwork;/usr/local/share/games/mame/artwork;/usr/share/games/mame/artwork ctrlrpath /usr/share/games/mame/ctrlr inipath $HOME/.mame;/etc/mame fontpath /usr/share/games/mame/fonts cheatpath $HOME/mame/cheat;/usr/local/share/games/mame/cheat;/usr/share/games/mame/cheat crosshairpath $HOME/mame/crosshair;/usr/local/share/games/mame/crosshair;/usr/share/games/mame/crosshair pluginspath /usr/share/games/mame/plugins languagepath /usr/share/games/mame/language swpath software # # CORE OUTPUT DIRECTORY OPTIONS # cfg_directory $HOME/.mame/cfg nvram_directory $HOME/.mame/nvram input_directory $HOME/.mame/inp state_directory $HOME/.mame/sta snapshot_directory $HOME/.mame/snap diff_directory $HOME/.mame/diff comment_directory $HOME/.mame/comments # # CORE STATE/PLAYBACK OPTIONS # state autosave 0 playback record record_timecode 0 exit_after_playback 0 mngwrite aviwrite wavwrite snapname %g/%i snapsize auto snapview internal snapbilinear 1 statename %g burnin 0 # # CORE PERFORMANCE OPTIONS # autoframeskip 0 frameskip 0 seconds_to_run 0 throttle 1 sleep 1 speed 1.0 refreshspeed 0 # # CORE RENDER OPTIONS # keepaspect 1 unevenstretch 1 unevenstretchx 0 unevenstretchy 0 autostretchxy 0 intoverscan 0 intscalex 0 intscaley 0 # # CORE ROTATION OPTIONS # rotate 1 ror 0 rol 0 autoror 0 autorol 0 flipx 0 flipy 0 # # CORE ARTWORK OPTIONS # artwork_crop 0 use_backdrops 1 use_overlays 1 use_bezels 1 use_cpanels 1 use_marquees 1 # # CORE SCREEN OPTIONS # brightness 1.0 contrast 1.0 gamma 1.0 pause_brightness 0.65 effect none # # CORE VECTOR OPTIONS # beam_width_min 1.0 beam_width_max 1.0 beam_intensity_weight 0 flicker 0 # # CORE SOUND OPTIONS # samplerate 48000 samples 1 volume 0 # # CORE INPUT OPTIONS # coin_lockout 1 ctrlr mouse 1 joystick 1 lightgun 0 multikeyboard 0 multimouse 0 steadykey 0 ui_active 0 offscreen_reload 0 joystick_map auto joystick_deadzone 0.3 joystick_saturation 0.85 natural 0 joystick_contradictory 0 coin_impulse 0 # # CORE INPUT AUTOMATIC ENABLE OPTIONS # paddle_device keyboard adstick_device keyboard pedal_device keyboard dial_device keyboard trackball_device keyboard lightgun_device keyboard positional_device keyboard mouse_device mouse # # CORE DEBUGGING OPTIONS # verbose 0 log 0 oslog 0 debug 0 update_in_pause 0 debugscript # # CORE COMM OPTIONS # comm_localhost 0.0.0.0 comm_localport 15112 comm_remotehost 127.0.0.1 comm_remoteport 15112 # # CORE MISC OPTIONS # drc 1 drc_use_c 0 drc_log_uml 0 drc_log_native 0 bios cheat 0 skip_gameinfo 0 uifont default ui cabinet ramsize confirm_quit 0 ui_mouse 1 autoboot_command autoboot_delay 0 autoboot_script console 0 plugins 1 plugin noplugin language English # # HTTP SERVER OPTIONS # http 0 http_port 8080 http_root web # # OSD KEYBOARD MAPPING OPTIONS # uimodekey INSERT # # OSD FONT OPTIONS # uifontprovider auto # # OSD OUTPUT OPTIONS # output auto # # OSD INPUT OPTIONS # keyboardprovider auto mouseprovider auto lightgunprovider auto joystickprovider auto # # OSD DEBUGGING OPTIONS # debugger auto debugger_font auto debugger_font_size 0 watchdog 0 # # OSD PERFORMANCE OPTIONS # numprocessors auto bench 0 # # OSD VIDEO OPTIONS # video opengl numscreens 1 window 0 maximize 1 waitvsync 0 syncrefresh 0 monitorprovider auto # # OSD PER-WINDOW VIDEO OPTIONS # screen auto aspect auto resolution auto view auto screen0 auto aspect0 auto resolution0 auto view0 auto screen1 auto aspect1 auto resolution1 auto view1 auto screen2 auto aspect2 auto resolution2 auto view2 auto screen3 auto aspect3 auto resolution3 auto view3 auto # # OSD FULL SCREEN OPTIONS # switchres 0 # # OSD ACCELERATED VIDEO OPTIONS # filter 1 prescale 1 # # OpenGL-SPECIFIC OPTIONS # gl_forcepow2texture 0 gl_notexturerect 0 gl_vbo 1 gl_pbo 1 gl_glsl 0 gl_glsl_filter 1 glsl_shader_mame0 none glsl_shader_mame1 none glsl_shader_mame2 none glsl_shader_mame3 none glsl_shader_mame4 none glsl_shader_mame5 none glsl_shader_mame6 none glsl_shader_mame7 none glsl_shader_mame8 none glsl_shader_mame9 none glsl_shader_screen0 none glsl_shader_screen1 none glsl_shader_screen2 none glsl_shader_screen3 none glsl_shader_screen4 none glsl_shader_screen5 none glsl_shader_screen6 none glsl_shader_screen7 none glsl_shader_screen8 none glsl_shader_screen9 none # # OSD SOUND OPTIONS # sound auto audio_latency 2 # # PORTAUDIO OPTIONS # pa_api none pa_device none pa_latency 0 # # BGFX POST-PROCESSING OPTIONS # bgfx_path /usr/share/games/mame/bgfx bgfx_backend auto bgfx_debug 0 bgfx_screen_chains default bgfx_shadow_mask slot-mask.png bgfx_avi_name auto # # SDL PERFORMANCE OPTIONS # sdlvideofps 0 # # SDL VIDEO OPTIONS # centerh 1 centerv 1 scalemode none # # SDL FULL SCREEN OPTIONS # useallheads 0 # # SDL KEYBOARD MAPPING # keymap 0 keymap_file keymap.dat # # SDL JOYSTICK MAPPING # joy_idx1 auto joy_idx2 auto joy_idx3 auto joy_idx4 auto joy_idx5 auto joy_idx6 auto joy_idx7 auto joy_idx8 auto sixaxis 0 # # SDL MOUSE MAPPING # mouse_index1 auto mouse_index2 auto mouse_index3 auto mouse_index4 auto mouse_index5 auto mouse_index6 auto mouse_index7 auto mouse_index8 auto # # SDL KEYBOARD MAPPING # keyb_idx1 auto keyb_idx2 auto keyb_idx3 auto keyb_idx4 auto keyb_idx5 auto keyb_idx6 auto keyb_idx7 auto keyb_idx8 auto # # SDL LOWLEVEL DRIVER OPTIONS # videodriver auto renderdriver auto audiodriver auto gl_lib auto |
| retropie pstree 그리고 fbcp (0) | 2018.05.18 |
|---|---|
| 레트로 파이 coin select GPIO로 연결하기 (0) | 2018.05.16 |
| retropie spi lcd (0) | 2018.05.16 |
| relcabox / retropie 블루투스 연결 (0) | 2018.03.07 |
| MAME 조이스틱 설정 (0) | 2018.03.03 |
xorg 없이 emulationstation이 직접 실행되서 /dev/fb0 으로 쓰는거 같은데..
$ pstree systemd─┬─agetty ├─avahi-daemon───avahi-daemon ├─cron ├─dbus-daemon ├─dhcpcd ├─fbcp─┬─{HCEC Notify} │ ├─{HDispmanx Notif} │ ├─{HTV Notify} │ └─{VCHIQ completio} ├─login───bash───bash───emulationstatio───emulationstatio───emulationstatio─┬─sh───bash───retroarch─┬─{HCEC Notify} │ │ ├─{HDispmanx Notif} │ │ ├─{HTV Notify} │ │ ├─{VCHIQ completio} │ │ └─3*[{retroarch}] │ ├─{HCEC Notify} │ ├─{HDispmanx Notif} │ ├─{HTV Notify} │ ├─{VCHIQ completio} │ └─{emulationstatio} ├─rsyslogd─┬─{in:imklog} │ ├─{in:imuxsock} │ └─{rs:main Q:Reg} ├─smbd─┬─cleanupd │ ├─lpqd │ └─smbd-notifyd ├─sshd───sshd───sshd───bash───pstree ├─systemd───(sd-pam) ├─systemd-journal ├─systemd-logind ├─systemd-timesyn───{sd-resolve} ├─systemd-udevd └─thd
|
어디서 언듯 보기에 emulationstation 자체가 openGL로 그린다고 된걸 본거 같은데
고민을 해보니.. SPI LCD에는 openGL 가속이 안될게 뻔하니 fbcp 외에는 답이 없는걸려나?
[링크 : https://www.reddit.com/r/raspberry_pi/comments/2syad9/emulation_station_on_35_inch_gpio_display/]
| ubunutu mame (0) | 2018.05.18 |
|---|---|
| 레트로 파이 coin select GPIO로 연결하기 (0) | 2018.05.16 |
| retropie spi lcd (0) | 2018.05.16 |
| relcabox / retropie 블루투스 연결 (0) | 2018.03.07 |
| MAME 조이스틱 설정 (0) | 2018.03.03 |
음.. 일단 설정파일은 찾았는데
저 숫자가 GPIO 기준인가?
$ sudo nano /etc/modprobe.d/mk_arcade_joystick_rpi.conf options mk_arcade_joystick_rpi map=5 gpio=2,3,4,17,9,10,22,27,11,24,23,25 |
[링크 : http://www.toad.es/setup/]
[링크 : https://retropie.org.uk/docs/RetroArch-Configuration/]
| ubunutu mame (0) | 2018.05.18 |
|---|---|
| retropie pstree 그리고 fbcp (0) | 2018.05.18 |
| retropie spi lcd (0) | 2018.05.16 |
| relcabox / retropie 블루투스 연결 (0) | 2018.03.07 |
| MAME 조이스틱 설정 (0) | 2018.03.03 |
fbcp는 필수고
waveshare에서 제품을 사용하면 con2fbmap 를 사용하지 않아도 된다 인가?
$ sudo apt-get install cmake $ git clone https://github.com/tasanakorn/rpi-fbcp $ cd rpi-fbcp/ $ mkdir build $ cd build/ $ cmake .. $ make $ sudo install fbcp /usr/local/bin/fbcp |
[링크 : https://retropie.org.uk/forum/topic/295/retropie-and-waveshare-32b/3]
[링크 : https://sudomod.com/forum/viewtopic.php?t=2312]
con2fbmap은 con(console)을 FB로 연결해주는 것인 듯?
console 1이니까 TTY1 을 FB1에 연결하라는 건가?
$ sudo apt-get install fbset $ con2fbmap 1 1 |
# Map console 1 to framebuffer 1, login screen will show up on the display
[링크 : https://wiki.up-community.org/TFT_Display_HATs#Console_con2fbmap]
+
2018.05.18
retropie 설치하고
fbcp 설치하고 하니 나오긴 한데.. 기분인가.. 딜레이가 좀 있는 느낌
(emulation station만 보는 중)
[링크 : https://retropie.org.uk/forum/topic/4157/guide-retropie-3-5-inch-rpi-lcd-v3-0-no-brand/2]
| retropie pstree 그리고 fbcp (0) | 2018.05.18 |
|---|---|
| 레트로 파이 coin select GPIO로 연결하기 (0) | 2018.05.16 |
| relcabox / retropie 블루투스 연결 (0) | 2018.03.07 |
| MAME 조이스틱 설정 (0) | 2018.03.03 |
| 어트랙트 모드 (0) | 2018.02.27 |
일단.. iptime은 죄가 없었고..
내 무지가 바로 죄.. ㅠㅠ
일단 임시로 설정 바꾸니 잘~된다.
default gate가 eth0로 되어있다 보니 생긴 문제..
$ route Kernel IP routing table Destination Gateway Genmask Flags Metric Ref Use Iface default 192.168.10.1 0.0.0.0 UG 100 0 0 eth0 125.177.70.133 192.168.10.1 255.255.255.255 UGH 0 0 0 eth0 link-local * 255.255.0.0 U 1000 0 0 eth0 192.168.10.0 * 255.255.255.0 U 100 0 0 eth0 192.168.219.1 * 255.255.255.255 UH 0 0 0 ppp0 $ sudo route add default gw 192.168.219.1 ppp0 $ route Kernel IP routing table Destination Gateway Genmask Flags Metric Ref Use Iface default 192.168.219.1 0.0.0.0 UG 0 0 0 ppp0 default 192.168.10.1 0.0.0.0 UG 100 0 0 eth0 125.177.70.133 192.168.10.1 255.255.255.255 UGH 0 0 0 eth0 link-local * 255.255.0.0 U 1000 0 0 eth0 192.168.10.0 * 255.255.255.0 U 100 0 0 eth0 192.168.219.1 * 255.255.255.255 UH 0 0 0 ppp0 |
| iptime vpn 제약? (0) | 2018.05.12 |
|---|---|
| rpi vpn client 설치 및 설정! (0) | 2018.05.12 |
| ssh tunnel proxy (0) | 2019.09.20 |
|---|---|
| ssh remote port forwarding (0) | 2019.01.28 |
| rpi vpn client (0) | 2018.05.11 |
| scp: ambiguous target 에러 (0) | 2016.09.21 |
| sshpass를 이용한 scp 암호 자동 입력 (0) | 2016.09.19 |
공유기 성능에 따라 VPN 통신속도 1MB/s 정도로 제한되기도 한다고
[링크 : https://www.clien.net/service/board/kin/10024149]
PPTP설정시
1723/all
47/gre 설정이 되어야 한다는데
GRE는 머지?
[링크 : https://livingmethod.wordpress.com/2015/03/19/iptime-공유기에서-내부-pptp서버-운영하기/]
GRE 메카니즘을 쓰는데 프로토콜로서 정해지는게 아닌거 같은데 머지?
PPTP uses an enhanced GRE (Generic Routing Encapsulation) mechanism to provide a flow- and congestion-controlled encapsulated datagram service for carrying PPP packets. |
[링크 : https://tools.ietf.org/html/rfc2637]
+
일단 중요한건 이게 아니라..
설정이 잘못된건지 모르겠지만
VPN을 통해서 접속하고 포트 포워딩을 통해 80번 포트나 22번 포트를 돌려줘도 외부에서 접속이 되지 않는다.
접속 설정 문제인지, iptime VPN의 제한인진 확인필요
+
2018.05.14
EFM에 문의해보니 원격지 게이트웨이 문제인 것 같다고.
[링크 : http://iptime.com/iptime/?page_id=174&nType=...=]
다시 설정해서 route 목록을 확인해봐야겠다.
Routing Once you have connected to your VPN, you should be able to interact with anything available on the VPN server. To access anything on the remote network, you need to add a new route to your routing table. Note: Depending on your configuration, you may need to re-add the routing information every time you connect to your VPN. For more information on how to add routes, you can read this article which has many more examples: PPTP Routing Howto Split Tunneling Packets with a destination of your VPN's network should be routed through the VPN interface (usually ppp0). To do this, you create the route: # ip route add 192.168.10.0/24 dev ppp0 This will route all the traffic with a destination of 192.168.10.* through your VPN's interface, (ppp0). Route All Traffic It may be desirable to route all traffic through your VPN connection. You can do this by running: # ip route add default dev ppp0 |
[링크 : https://wiki.archlinux.org/index.php/PPTP_Client]
+
버전이 낮아서 버그가 있다 보니 그런건가..
100일 정도 리부팅 안하고 써서 맛이 간건가..
일단 한번 접속하고 끊으면 안 붙는 문제는 수정 된것 같으나
default remote gateway 문제인지 포트포워딩으로 접속이 안된다.
$ route Kernel IP routing table Destination Gateway Genmask Flags Metric Ref Use Iface default 192.168.10.1 0.0.0.0 UG 100 0 0 eth0 125.177.70.133 192.168.10.1 255.255.255.255 UGH 0 0 0 eth0 link-local * 255.255.0.0 U 1000 0 0 eth0 192.168.10.0 * 255.255.255.0 U 100 0 0 eth0 192.168.219.1 * 255.255.255.255 UH 0 0 0 ppp0 $ sudo poff SARANG $ route Kernel IP routing table Destination Gateway Genmask Flags Metric Ref Use Iface default 192.168.10.1 0.0.0.0 UG 100 0 0 eth0 125.177.70.133 192.168.10.1 255.255.255.255 UGH 0 0 0 eth0 link-local * 255.255.0.0 U 1000 0 0 eth0 192.168.10.0 * 255.255.255.0 U 100 0 0 eth0 |
| VPN / 웹서버 설정 (0) | 2018.05.14 |
|---|---|
| rpi vpn client 설치 및 설정! (0) | 2018.05.12 |
|
