| *** tpb has joined #timvideos | 00:00 | |
| mithro | seaLne: did you sign up for the champion program? | 01:41 |
|---|---|---|
| *** thaytan_ has joined #timvideos | 04:14 | |
| seaLne | mithro: yes | 07:00 |
| mithro | seaLne: I have a fix for the Makefile issue | 07:03 |
| seaLne | which issue? | 07:06 |
| mithro | mithro: seaLne: 'make firmware' first then 'make gateware' | 07:07 |
| seaLne | ah | 07:07 |
| seaLne | i'm just up so was going to work on the readme after some coffee | 07:07 |
| seaLne | what is the "firmware"? the name isn't too obvious? | 07:10 |
| mithro | seaLne: will explain in a sec | 07:10 |
| seaLne | for the lm32? | 07:10 |
| mithro | seaLne: let me finish replying to the people on hackaday and upload this patch :) | 07:11 |
| seaLne | np :) | 07:11 |
| mithro | seaLne: HackADay replying done I think | 07:23 |
| mithro | http://hackaday.com/2015/10/02/numato-opsis-fpga-based-open-video-platform/ - :-) | 07:24 |
| tpb | Title: Numato Opsis: FPGA-based open video platform | Hackaday (at hackaday.com) | 07:24 |
| seaLne | good explanations, you also seem to have got off quite lightly for hackaday comments :) | 07:33 |
| mithro | seaLne: It is the weekend, the professional trolls are sleeping :) | 07:35 |
| seaLne | hmm weird doing make gateware without firmware first is now not giving an error (after make clean) | 07:55 |
| seaLne | ah clean doesn't seem to actually clean build/misoc/software/include/generated/ | 08:02 |
| *** CarlFK has quit IRC | 08:19 | |
| seaLne | mithro: what do you think of these changes? https://github.com/sealne/HDMI2USB-misoc-firmware/tree/master/scripts | 08:28 |
| tpb | Title: HDMI2USB-misoc-firmware/scripts at master · sealne/HDMI2USB-misoc-firmware · GitHub (at github.com) | 08:28 |
| seaLne | split it up a bit and added the make lm32-firmware | 08:28 |
| seaLne | going to also add a test to setup-env.sh about /opt/Xilinx/14.7/ISE_DS/settings64.sh | 08:29 |
| *** CarlFK has joined #timvideos | 08:44 | |
| *** ChanServ sets mode: +v CarlFK | 08:44 | |
| *** miselin has quit IRC | 08:52 | |
| seaLne | https://github.com/timvideos/HDMI2USB-misoc-firmware/pull/85 | 08:56 |
| tpb | Title: expand bootstrap README and add test for /opt/Xilinx/14.7/ISE_DS/settings64.sh by sealne · Pull Request #85 · timvideos/HDMI2USB-misoc-firmware · GitHub (at github.com) | 08:56 |
| mithro | seaLne: see https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/83 :-P | 08:57 |
| tpb | Title: Travis should check that `make clean` actually cleans up all the files which are created. · Issue #83 · timvideos/HDMI2USB-misoc-firmware · GitHub (at github.com) | 08:57 |
| seaLne | bah | 08:57 |
| seaLne | well that was my first attempt at using github, only used normal git servers before | 09:00 |
| mithro | seaLne: Pull request generally looks good! | 09:07 |
| mithro | seaLne: I added two small comments | 09:07 |
| seaLne | just seen them | 09:07 |
| mithro | seaLne: if you make the fixes I requested and then force push to the same branch you sent the pull request from, then it will update the pull request | 09:07 |
| seaLne | done | 09:13 |
| tumbleweed | oh, before I forget, some more feedback from pyconza: | 09:21 |
| mithro | seaLne: Do you know how to use "git rebase --interactive" to rewrite history and fix your older commit messages? | 09:21 |
| tumbleweed | we had a few machines that had HDMI ports that didn't seem to be useable. I think they may have been Optimus (connected to the nvidia GPU, not the intel one in use) | 09:22 |
| tumbleweed | they'd see the atlys, but not be able to output anything | 09:22 |
| tumbleweed | CarlFK: did you see any? | 09:22 |
| seaLne | mithro: let me have a look | 09:24 |
| mithro | seaLne: You almost got it right | 09:31 |
| mithro | seaLne: at the end, instead of doing a merge you should do a force push effectively wiping out the old commits | 09:32 |
| * seaLne is now a bit lost | 09:34 | |
| seaLne | let me read some more | 09:35 |
| mithro | seaLne: Have you used gitk before? | 09:35 |
| seaLne | no | 09:35 |
| seaLne | also my git usage has been fairly basic | 09:35 |
| mithro | seaLne: I recommend installing it and starting it up - it's a great way to visualize what you just did | 09:35 |
| seaLne | so i should be able to remove the extras with git rebase i think? but i'm a bit stuck with "Cannot rebase: You have unstaged changes" and a bit scared of messing it up more | 09:44 |
| seaLne | it does feel like it would be a lot simpler to start again but that would be cheating | 09:45 |
| mithro | seaLne: okay | 09:45 |
| mithro | seaLne: first thing is - do a "git status" and show me what you have there | 09:46 |
| seaLne | modified: scripts/README.md | 09:46 |
| mithro | seaLne: you can use "git diff" to see what changes you have | 09:47 |
| seaLne | yeah, which seems to show it compared to before i started | 09:47 |
| mithro | seaLne: does it say anything about being in the middle of a rebase? | 09:48 |
| seaLne | no, previously i tried git rebase --abort and git reset HEAD which probably messed things up more | 09:49 |
| mithro | seaLne: okay | 09:50 |
| mithro | seaLne: which branch are you on - still master? | 09:50 |
| seaLne | yes | 09:50 |
| seaLne | sorry for all the newbie problems | 09:50 |
| mithro | seaLne: great! So, now you just need master to point at the result of the rebase you did earlier | 09:50 |
| mithro | seaLne: to do that | 09:51 |
| mithro | seaLne: do a "git reset --hard 2dc1a10afceb1a5cca83306c07c67f466fc33c69" | 09:51 |
| seaLne | aha | 09:51 |
| seaLne | that looks better now | 09:52 |
| mithro | seaLne: Now, when you tried to push to your repo it probably said something like "can't push, need to merge" | 09:52 |
| mithro | seaLne: and you did a "git merge origin/master" which created that merge commit that you can see at the end of your commit | 09:53 |
| mithro | seaLne: this one -> https://github.com/sealne/HDMI2USB-misoc-firmware/commit/8195f4cd17ef552cc86207a9c2a1dedddf05395a | 09:53 |
| seaLne | my last push didn't seem to complain. i had just done "git push" | 09:53 |
| seaLne | (i haven't done anything yet since the reset) | 09:54 |
| mithro | seaLne: If you try a "git push origin master" now I think it will complain? | 09:56 |
| seaLne | yeah | 09:57 |
| seaLne | ! [rejected] master -> master (non-fast-forward) | 09:57 |
| *** travis-ci has joined #timvideos | 09:58 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/travis-makefile-fix#1] (d48baa1): The build failed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83433957) | 09:58 |
| *** travis-ci has left #timvideos | 09:58 | |
| *** travis-ci has joined #timvideos | 09:59 | |
| travis-ci | [timvideos/HDMI2USB-misoc-firmware/travis-makefile-fix#180] (946ee71): The build passed. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83429548) | 09:59 |
| *** travis-ci has left #timvideos | 09:59 | |
| mithro | seaLne: So what git is complaining about is that if you push your master into the remote repository it is going to cause a bunch of commits to "disappear" | 10:00 |
| mithro | seaLne: which is normally bad | 10:01 |
| seaLne | which is this case we want? | 10:01 |
| seaLne | in | 10:01 |
| mithro | seaLne: but in this case, you have deliberately use git rebase to "rewrite history" | 10:01 |
| mithro | seaLne: with git, a commit is dependent on it's contents - so when you changed things the commits become different | 10:02 |
| mithro | seaLne: Git doesn't know that your new rewritten commits are related to those old commits, so it doesn't think what you are about to do is a good idea :) | 10:03 |
| seaLne | heh | 10:03 |
| mithro | seaLne: but we can tell git that we know better (and potentially shoot ourselves in the foot if you aren't careful) | 10:03 |
| mithro | seaLne: "git push origin master --force" | 10:04 |
| mithro | seaLne: then git will look at you strangely and go "oh well, I'll do as you ask" making the old commits disappear and the new commits effectively take their place | 10:05 |
| seaLne | thanks, looks fixed now | 10:05 |
| mithro | seaLne: Now if we look at https://github.com/timvideos/HDMI2USB-misoc-firmware/pull/85/commits | 10:06 |
| tpb | Title: Expand bootstrap README and add test for /opt/Xilinx/14.7/ISE_DS/settings64.sh by sealne · Pull Request #85 · timvideos/HDMI2USB-misoc-firmware · GitHub (at github.com) | 10:06 |
| mithro | seaLne: we see only your 3 commits | 10:06 |
| mithro | seaLne: and its like you did everything perfectly the first time :-P | 10:06 |
| seaLne | heh | 10:06 |
| mithro | seaLne: Time travel with git ;) | 10:06 |
| mithro | seaLne: you have to be careful with this type of workflow, as you can potentially delete your work | 10:08 |
| seaLne | yeah | 10:10 |
| mithro | seaLne: git keeps a thing called the "reflog" which can be used to rescue stuff in a git repo | 10:11 |
| seaLne | so the problem was that i didn't properly finish the rebasing editing messages and fixup before pushing? | 10:11 |
| mithro | seaLne: the problem is when you finished doing the rebase, you merged the commits from your old branch | 10:12 |
| seaLne | yeah | 10:13 |
| seaLne | what should i have done after git rebase -i HEAD~10 | 10:14 |
| mithro | seaLne: "git push origin master --force" probably | 10:16 |
| seaLne | without force suceded though | 10:16 |
| seaLne | i had just done git push | 10:16 |
| mithro | seaLne: between the "git rebase -i HEAD~10" and "git push" you ran a "git merge origin/master" or similar command | 10:17 |
| seaLne | not entirely sure, thanks for the mini tutorial | 10:18 |
| mithro | seaLne: I'm sure you ran some type of "git merge" command between your rebase and push because that is really the only way you get that merge commit you pushed | 10:19 |
| mithro | seaLne: It takes a while to get use to doing rebase stuff | 10:25 |
| mithro | seaLne: I think this pull request is probably good to merge then | 10:27 |
| seaLne | \o/ | 10:30 |
| mithro | seaLne: want to take a look at my pull request and see what you think? | 10:33 |
| mithro | seaLne: https://github.com/timvideos/HDMI2USB-misoc-firmware/pull/84 | 10:34 |
| seaLne | is gateware a misoc name for it? its a bit unclear to me when i first looked what it was | 10:37 |
| mithro | seaLne: well, things get a bit confusing when you have a softcore on your FPGA | 10:38 |
| mithro | seaLne: so we call what is loaded onto the FPGA the "gateware" | 10:38 |
| mithro | seaLne: because it is basically what configured the "gates" of the FPGA (Field Programmable *Gate* Array) | 10:39 |
| seaLne | ah, never made that connection | 10:39 |
| seaLne | the stuff in #84 though looks good | 10:39 |
| mithro | seaLne: Just need to wait for Travis to report I haven't broken anything, then I'll merge that | 10:41 |
| mithro | seaLne: Got time to take a wack at a bug? | 10:42 |
| seaLne | maybe, need to sort some stuff in the garden | 10:44 |
| mithro | seaLne: If you want to continue hacking on infrastructure it would be good to look at https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/83 | 10:45 |
| tpb | Title: Travis should check that `make clean` actually cleans up all the files which are created. · Issue #83 · timvideos/HDMI2USB-misoc-firmware · GitHub (at github.com) | 10:45 |
| seaLne | so there is more needed than your make clean fix? | 10:46 |
| seaLne | ah sorry thats a test | 10:46 |
| mithro | seaLne: If you want to get your hands dirty on actually hacking on some code which runs on the FPGA / softcore - https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/80 or https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/81 | 10:46 |
| tpb | Title: Support resetting an input without resetting the output · Issue #80 · timvideos/HDMI2USB-misoc-firmware · GitHub (at github.com) | 10:47 |
| mithro | seaLne: yeah - a test which I'm pretty sure we'll fail at the moment :P | 10:47 |
| seaLne | i'll have a poke in a few hours | 10:47 |
| mithro | seaLne: Do you know C? | 10:50 |
| *** travis-ci has joined #timvideos | 10:51 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/travis-makefile-fix#2] (cce3d42): The build was fixed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83435621) | 10:51 |
| *** travis-ci has left #timvideos | 10:51 | |
| seaLne | i can read it a bit, i'm not really a programer | 10:52 |
| seaLne | done some basic c/c++ stuff before | 10:52 |
| mithro | seaLne: okay - the C code we use is pretty basic but occasionally does something tricky | 10:55 |
| mithro | seaLne: plenty of things which can be done to improve our infrastructure if you prefer that | 10:57 |
| mithro | seaLne: https://github.com/timvideos/HDMI2USB-misoc-firmware/issues?q=is%3Aopen+is%3Aissue+label%3Alevel-infastructure :-) | 10:58 |
| tpb | Title: Issues · timvideos/HDMI2USB-misoc-firmware · GitHub (at github.com) | 10:58 |
| mithro | seaLne: Thanks for your help so far! You are now 1 of 6 contributors to the firmware! :) | 11:10 |
| mithro | well, I'm going to get some dinner | 11:22 |
| mithro | bblr! | 11:22 |
| *** travis-ci has joined #timvideos | 11:24 | |
| travis-ci | [timvideos/HDMI2USB-misoc-firmware/travis-makefile-fix#187] (cce3d42): The build passed. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83436249) | 11:24 |
| *** travis-ci has left #timvideos | 11:24 | |
| *** travis-ci has joined #timvideos | 11:41 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/travis-makefile-fix#4] (da32723): The build was fixed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83437077) | 11:41 |
| *** travis-ci has left #timvideos | 11:41 | |
| *** travis-ci has joined #timvideos | 12:15 | |
| travis-ci | [mithro/HDMI2USB-misoc-firmware/travis-makefile-fix#3] (83e70bb): The build was fixed. (https://travis-ci.org/mithro/HDMI2USB-misoc-firmware/builds/83436562) | 12:15 |
| *** travis-ci has left #timvideos | 12:15 | |
| *** travis-ci has joined #timvideos | 12:32 | |
| travis-ci | [timvideos/HDMI2USB-misoc-firmware/master#186] (a457961): The build passed. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83436210) | 12:32 |
| *** travis-ci has left #timvideos | 12:32 | |
| mithro | _florent_: Those "videos" that you linked are pretty cool | 12:51 |
| mithro | _florent_: The asciinema.org looks pretty cool too! | 12:52 |
| _florent_ | yes, asciinema is really fine | 12:52 |
| mithro | Everyone should checkout -> https://asciinema.org | 12:53 |
| tpb | Title: asciinema - Record and share your terminal sessions, the right way (at asciinema.org) | 12:53 |
| mithro | _florent_: so how does the second video actually work? | 12:53 |
| mithro | _florent_: the Ethernet sim one? | 12:53 |
| _florent_ | the soc is running in simulation with lwip on the lm32 and I'm pinging it | 12:54 |
| *** travis-ci has joined #timvideos | 12:54 | |
| travis-ci | [timvideos/HDMI2USB-misoc-firmware/travis-makefile-fix#189] (83e70bb): The build passed. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83436511) | 12:54 |
| *** travis-ci has left #timvideos | 12:54 | |
| mithro | lwip? | 12:54 |
| _florent_ | tcp/ip software stack | 12:54 |
| mithro | _florent_: the lm32 is running in qemu, how is the ethernet hardware being simulated? | 12:55 |
| _florent_ | in the video the soc is: lm32 + sdram + ethernet + uart simulated with verilator | 12:56 |
| mithro | _florent_: oh! | 12:56 |
| _florent_ | lm32 is not running with qemu | 12:56 |
| _florent_ | it's simulated | 12:56 |
| _florent_ | but since verilator is very fast, it is able to simulate the soc at ~1Mhz | 12:56 |
| _florent_ | wich is already fast for a simulation | 12:57 |
| _florent_ | and in fact usable to develop software | 12:57 |
| mithro | _florent_: yeah - that should be fast enough to do any of the stuff I was suggesting | 12:57 |
| seaLne | which videos are you refering to? | 13:07 |
| mithro | https://github.com/timvideos/HDMI2USB-misoc-firmware/issues/86 | 13:07 |
| tpb | Title: Get lm32 firmware running under qemu to enable testing without hardware · Issue #86 · timvideos/HDMI2USB-misoc-firmware · GitHub (at github.com) | 13:07 |
| mithro | https://asciinema.org/a/17175 | 13:07 |
| tpb | Title: asciicast:17175 - asciinema (at asciinema.org) | 13:07 |
| mithro | https://asciinema.org/a/18224 | 13:07 |
| tpb | Title: asciicast:18224 - asciinema (at asciinema.org) | 13:07 |
| seaLne | ah, thanks | 13:07 |
| *** rohitksingh has joined #timvideos | 14:41 | |
| *** travis-ci has joined #timvideos | 14:54 | |
| travis-ci | [timvideos/HDMI2USB-misoc-firmware/travis-makefile-fix#191] (da32723): The build has errored. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83437087) | 14:54 |
| *** travis-ci has left #timvideos | 14:54 | |
| *** rohitksingh has quit IRC | 14:58 | |
| *** rohitksingh has joined #timvideos | 15:12 | |
| *** 7GHABBZAL has joined #timvideos | 15:23 | |
| 7GHABBZAL | [timvideos/HDMI2USB-misoc-firmware/travis-makefile-fix#191] (da32723): The build passed. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83437087) | 15:23 |
| *** 7GHABBZAL has left #timvideos | 15:23 | |
| *** CarlFK has quit IRC | 16:15 | |
| *** travis-ci has joined #timvideos | 16:34 | |
| travis-ci | [timvideos/HDMI2USB-misoc-firmware/master#193] (6da250e): The build passed. (https://travis-ci.org/timvideos/HDMI2USB-misoc-firmware/builds/83461753) | 16:34 |
| *** travis-ci has left #timvideos | 16:34 | |
| *** rohitksingh has quit IRC | 17:28 | |
| seaLne | can i cause travis to fail a build with return 1? | 17:32 |
| *** rohitksingh has joined #timvideos | 17:42 | |
| seaLne | hmm ok that isn't quite right | 17:46 |
| seaLne | missing pipe | 17:53 |
| seaLne | mithro: make clean check seems to be pretty much working now i think | 18:50 |
| *** rohitksingh has quit IRC | 20:44 | |
| *** CarlFK has joined #timvideos | 22:03 | |
| *** ChanServ sets mode: +v CarlFK | 22:03 | |
Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!