Easy way to sync changes between v0.3 and v0.4 halcogen.dils - SFUSatClub/obc-firmware GitHub Wiki

Using the Halcogen GUI, make modifications to either one of platform-obc-v0.3/halcogen.dil or platform-obc-v0.4/halcogen.dil

For example, say platform-obc-v0.4/halcogen.dil is modified and we want the same changes made to platform-obc-v0.3/halcogen.dil

1. First create the diff

   git diff -- *.dil > dil_diff
   

2. Apply the diff to the other halcogen.dil

   patch -p1 platform-obc-v0.3\halcogen.dil .\dil_diff
   

3. Double check changes to make sure it worked right (it should)

   git diff -- *.dil
   

4. Make further modifications using the Halcogen GUI as needed