Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
708cc5c
[MP-2]: Added button for Create Maneuvers, fixed some UI
Pesterenan Feb 17, 2023
b1604f9
[MP-2]: Created button for Create Maneuvers Panel
Pesterenan Feb 22, 2023
97b790c
[MP-2]: Making liftoff button get back to telemetry jpanel
Pesterenan Feb 22, 2023
76ccd00
[MP-2]: Incremented patch version for bugfix
Pesterenan Feb 22, 2023
62faec0
Merge branch 'dev' of https://www.github.com/Pesterenan/MechPeste-Jav…
Pesterenan Mar 9, 2023
0dd3108
Merge branch 'dev' into MP-2
Pesterenan Apr 21, 2023
b17afbd
[MP-2]: Created Panel and Functionality
Pesterenan Apr 21, 2023
7f8f4a8
[MP-2]: Added event listeners for maneuver buttons
Pesterenan May 2, 2023
cc7ff55
[MP-2]: Began implementing Rendezvous code
Pesterenan May 3, 2023
24355e6
[MP-2]: Unified Create and Run Maneuver JPanels
Pesterenan May 10, 2023
7ac6768
[MP-2]: Saving current changes to MechPeste
Pesterenan Sep 20, 2023
f46bb3b
-- First implementation of auto-docking
Pesterenan Sep 23, 2023
33d9b73
-- Managed to debug on Neovim
Pesterenan Sep 29, 2023
672dab2
-- Changed how ControlePID works
Pesterenan Oct 4, 2023
8133220
[Docking]: Finally have a working docking script?
Pesterenan Oct 14, 2023
6338059
[Docking]: Working 1st and 2nd docking stage
Pesterenan Oct 20, 2023
c8902d8
[Docking]: We have a docking script!
Pesterenan Nov 10, 2023
a16771c
[Docking]: Implement docking into MechPeste
Pesterenan Nov 21, 2023
1736411
[Docking]: Organize docking code
Pesterenan Nov 22, 2023
cd60595
[Docking]: Implement maneuvering around target
Pesterenan Nov 22, 2023
99b7cee
[Landing]: Fix landing speed calculation
Pesterenan Nov 25, 2023
3b2d0d7
[Maven]: Implement Maven project manager
Pesterenan Dec 4, 2023
823770e
[Maven]: Configure project to use Maven to deploy new versions
Pesterenan Dec 4, 2023
3181dc3
[Maven]: Add version checker using Maven
Pesterenan Dec 4, 2023
321c12e
[Maven]: Update version display code, README file
Pesterenan Dec 5, 2023
0c4aff6
Merge branch 'dev' into maven-managed
Pesterenan Dec 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 51 additions & 7 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,13 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="module" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="src/com/pesterenan/resources/krpc-java-0.5.2.jar"/>
<classpathentry kind="lib" path="src/com/pesterenan/resources/javatuples-1.2.jar"/>
<classpathentry kind="lib" path="src/com/pesterenan/resources/protobuf-java-3.22.1.jar"/>
<classpathentry kind="output" path="bin"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ local.properties
.loadpath
.metadata
workspace.xml
settings.json
settings.json
target/
6 changes: 6 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
<filteredResources>
Expand Down
2 changes: 1 addition & 1 deletion .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
encoding//src/main/java=UTF-8
5 changes: 5 additions & 0 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
22 changes: 22 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,3 +73,25 @@ texto e também a velocidade máxima que o rover pode alcançar.

A velocidade mínima permitida é de 3m/s. Clique em Pilotar e ele comecará a se
mover para o alvo, desviando dos obstáculos à frente.

### Desenvolvimento do MechPeste com Maven

Agora o MechPeste tem como base o gerenciador de dependências Maven. Para poder instalar a biblioteca
do KRPC no entanto, como não está disponível no repositório público do Maven, é necessário fazer o download
e instalar a biblioteca KRPC em sua versão 0.5.2 com o seguinte comando:

``` bash
mvn install:install-file \
-Dfile=<CAMINHO_DO_DOWNLOAD>\krpc-java-0.5.2.jar \
-DgroupId=io.github.krpc \
-DartifactId=krpc-java \
-Dversion=0.5.2 \
-Dpackaging=jar \
```
Substitua `<CAMINHO_DO_DOWNLOAD>` pela pasta onde está o arquivo do KRPC. Isso instalará essa biblioteca
no seu repositório local.

Agora você poderá usar comandos do Maven para instalar e construir a aplicação:
```bash
mvn clean install package
```
89 changes: 89 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.pesterenan</groupId>
<artifactId>MechPeste</artifactId>
<version>0.7.0</version>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<archive>
<manifest>
<mainClass>com.pesterenan.MechPeste</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<configuration>
<archive>
<manifest>
<mainClass>com.pesterenan.MechPeste</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<finalName>MechPeste-${project.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>3.3.9</version>
</dependency>
<dependency>
<groupId>io.github.krpc</groupId>
<artifactId>krpc-java</artifactId>
<version>0.5.2</version>
</dependency>
<dependency>
<groupId>org.javatuples</groupId>
<artifactId>javatuples</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>3.22.1</version>
</dependency>
</dependencies>

</project>
Binary file removed src/com/pesterenan/resources/javatuples-1.2.jar
Binary file not shown.
Binary file not shown.
141 changes: 0 additions & 141 deletions src/com/pesterenan/utils/Navigation.java

This file was deleted.

Loading