Merge branch 'main' into develop/nasu
by nassan 10 months 2 weeks
Merge branch 'main' into develop/nasu

# Conflicts:
# hardware/components/LiPoPower/LiPoPower.kicad_pcb
# hardware/components/LiPoPower/LiPoPower.kicad_sch
# hardware/modules/IGN/IGN.kicad_pcb
# hardware/modules/IGN/IGN.kicad_pro
# hardware/modules/IGN/IGN.kicad_sch
# hardware/modules/MissionOrderFile/MissionOrderFile/MissionBus/IF1.kicad_sch
778560df
Merge pull request #22 from wasa-rockoon/develop/s...
by KeisukeSuganuma 10 months 2 weeks
Merge pull request #22 from wasa-rockoon/develop/suganuma

GPSコンポーネント追加/Mission発注基板作成完了
fc14290c
発注基板修正完了
by KeisukeSuganuma 10 months 2 weeks
d023abfa
Merge pull request #23 from wasa-rockoon/feature/R...
by KeisukeSuganuma 10 months 3 weeks
Merge pull request #23 from wasa-rockoon/feature/RCS

RCS基板作成
e39bfb3e
RCS関連コンポーネント修正
by KeisukeSuganuma 10 months 3 weeks
16076694
発注基板完成
by KeisukeSuganuma 10 months 3 weeks
b4e1cf2a
Merge branch 'feature/MissionCore' into develop/su...
by KeisukeSuganuma 10 months 3 weeks
Merge branch 'feature/MissionCore' into develop/suganuma
70fced91
MissionBusモジュール修正
by KeisukeSuganuma 10 months 3 weeks
368f5410
発注基板Trackerモジュール追加
by KeisukeSuganuma 10 months 3 weeks
21a1e43e
Merge branch 'feature/Tracker' into develop/suganu...
by KeisukeSuganuma 10 months 3 weeks
Merge branch 'feature/Tracker' into develop/suganuma

# Conflicts:
# hardware/components/LiPoPower/LiPoPower.kicad_sch
# hardware/modules/Tracker/ESP32Core.kicad_sch
# hardware/modules/Tracker/GPSActive.kicad_sch
# hardware/modules/Tracker/LiPoPower.kicad_sch
# hardware/modules/Tracker/LoRa.kicad_sch
# hardware/modules/Tracker/Logger.kicad_sch
# hardware/modules/Tracker/Pressure.kicad_sch
# hardware/modules/Tracker/Tracker.kicad_pcb
# hardware/modules/Tracker/Tracker.kicad_pro
# hardware/modules/Tracker/Tracker.kicad_sch
# hardware/modules/Tracker/fp-lib-table
# hardware/modules/Tracker/sym-lib-table
# src/modules/Tracker/INA226_Arduino_IDE/INA226_arduino_IDE/INA226_arduino_IDE.ino
243d6bef
Report a bug