Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-09 08:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Work on Field Editor, Improve capitalization of classes

Browse Source
This commit is contained in:
Michael Mikovsky
2025-04-04 14:15:30 -06:00
parent a371f2f449
commit eaa14adbd9
56 changed files with 849 additions and 733 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/ridgebotics/ridgescout/utility/BuiltByteParser.java
+5 -6
View File
@@ -1,10 +1,9 @@
package com.ridgebotics.ridgescout.utility;
import static com.ridgebotics.ridgescout.utility.fileEditor.lengthHeaderBytes;
import static com.ridgebotics.ridgescout.utility.FileEditor.lengthHeaderBytes;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
public class BuiltByteParser {
public static final Integer boolType = 0;
@@ -86,7 +85,7 @@ public class BuiltByteParser {
int curIndex = 0;
while(true){
// Log.i("t", String.valueOf(curIndex));
final int length = fileEditor.fromBytes(fileEditor.getByteBlock(bytes, curIndex, curIndex+lengthHeaderBytes), lengthHeaderBytes);
final int length = FileEditor.fromBytes(FileEditor.getByteBlock(bytes, curIndex, curIndex+lengthHeaderBytes), lengthHeaderBytes);
final int type = bytes[curIndex+lengthHeaderBytes] & 0xFF;
if(length == 0){
@@ -97,7 +96,7 @@ public class BuiltByteParser {
final byte[] block;
try {
block = fileEditor.getByteBlock(bytes, curIndex + lengthHeaderBytes + 1, curIndex + length + lengthHeaderBytes + 1);
block = FileEditor.getByteBlock(bytes, curIndex + lengthHeaderBytes + 1, curIndex + length + lengthHeaderBytes + 1);
} catch(Exception e){
throw new byteParsingExeption("Array out of bounds");
}
@@ -110,7 +109,7 @@ public class BuiltByteParser {
break;
case 1:
intObject io = new intObject();
io.num = fileEditor.fromBytes(block, length);
io.num = FileEditor.fromBytes(block, length);
objects.add(io);
break;
case 2:
@@ -150,7 +149,7 @@ public class BuiltByteParser {
break;
case 5:
longObject lo = new longObject();
lo.num = fileEditor.fromBytesLong(block, length);
lo.num = FileEditor.fromBytesLong(block, length);
objects.add(lo);
break;
default:
app/src/main/java/com/ridgebotics/ridgescout/utility/ByteBuilder.java
+4 -4
View File
@@ -1,6 +1,6 @@
package com.ridgebotics.ridgescout.utility;
import static com.ridgebotics.ridgescout.utility.fileEditor.lengthHeaderBytes;
import static com.ridgebotics.ridgescout.utility.FileEditor.lengthHeaderBytes;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -58,7 +58,7 @@ public class ByteBuilder {
public byte getType(){return int_id;}
public int length(){return precision;}
public byte[] build(){
return fileEditor.toBytes(num, precision);
return FileEditor.toBytes(num, precision);
}
}
private int getLeastBytePrecision(int num){
@@ -162,7 +162,7 @@ public class ByteBuilder {
public byte getType(){return long_id;}
public int length(){return precision;}
public byte[] build(){
return fileEditor.toBytes(num, precision);
return FileEditor.toBytes(num, precision);
}
}
private int getLeastBytePrecision(long num){
@@ -225,7 +225,7 @@ public class ByteBuilder {
for(byteType bt : bytesToBuild){
byte[] blockLength = fileEditor.toBytes(bt.length(), lengthHeaderBytes + 1);
byte[] blockLength = FileEditor.toBytes(bt.length(), lengthHeaderBytes + 1);
for(int i = 0; i < lengthHeaderBytes; i++) {
bytes[bytesFilled] = blockLength[i];
app/src/main/java/com/ridgebotics/ridgescout/utility/DataManager.java
+20 -21
View File
@@ -1,11 +1,10 @@
package com.ridgebotics.ridgescout.utility;
import com.ridgebotics.ridgescout.scoutingData.fields;
import com.ridgebotics.ridgescout.scoutingData.transfer.transferType;
import com.ridgebotics.ridgescout.scoutingData.Fields;
import com.ridgebotics.ridgescout.scoutingData.transfer.TransferType;
import com.ridgebotics.ridgescout.types.frcEvent;
import com.ridgebotics.ridgescout.types.input.inputType;
import com.ridgebotics.ridgescout.types.input.FieldType;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -19,11 +18,11 @@ public class DataManager {
if(evcode.equals("unset")) return;
event = frcEvent.decode(fileEditor.readFile(evcode + ".eventdata"));
event = frcEvent.decode(FileEditor.readFile(evcode + ".eventdata"));
if(event == null) {
AlertManager.addSimpleError("Failed to load event!");
settingsManager.setEVCode("unset");
SettingsManager.setEVCode("unset");
evcode = "unset";
}else{
AlertManager.toast("Reloaded event!");
@@ -32,30 +31,30 @@ public class DataManager {
}
public static String getevcode() {
return settingsManager.getEVCode();
return SettingsManager.getEVCode();
}
public static inputType[][] match_values;
public static inputType[] match_latest_values;
public static transferType[][] match_transferValues;
public static FieldType[][] match_values;
public static FieldType[] match_latest_values;
public static TransferType[][] match_transferValues;
public static void reload_match_fields(){
try {
match_values = fields.load(fields.matchFieldsFilename);
match_values = Fields.load(Fields.matchFieldsFilename);
match_latest_values = match_values[match_values.length - 1];
match_transferValues = transferType.get_transfer_values(match_values);
match_transferValues = TransferType.get_transfer_values(match_values);
} catch (Exception e){
AlertManager.error("Error reading match fields", e);
}
}
public static inputType[][] pit_values;
public static inputType[] pit_latest_values;
public static transferType[][] pit_transferValues;
public static FieldType[][] pit_values;
public static FieldType[] pit_latest_values;
public static TransferType[][] pit_transferValues;
public static void reload_pit_fields(){
try {
pit_values = fields.load(fields.pitsFieldsFilename);
pit_values = Fields.load(Fields.pitsFieldsFilename);
pit_latest_values = pit_values[pit_values.length-1];
pit_transferValues = transferType.get_transfer_values(pit_values);
pit_transferValues = TransferType.get_transfer_values(pit_values);
} catch (Exception e){
AlertManager.error("Error reading pit fields", e);
}
@@ -63,8 +62,8 @@ public class DataManager {
public static List<String> rescout_list = new ArrayList<>();
public static void reload_rescout_list(){
if(!fileEditor.fileExist(evcode + ".rescout")) {rescout_list = new ArrayList<>(); return;}
byte[] file = fileEditor.readFile(evcode + ".rescout");
if(!FileEditor.fileExist(evcode + ".rescout")) {rescout_list = new ArrayList<>(); return;}
byte[] file = FileEditor.readFile(evcode + ".rescout");
if(file == null) {rescout_list = new ArrayList<>(); return;}
try {
@@ -80,13 +79,13 @@ public class DataManager {
public static void save_rescout_list() {
try {
if(rescout_list.size() == 0){
fileEditor.deleteFile(evcode + ".rescout");
FileEditor.deleteFile(evcode + ".rescout");
return;
}
ByteBuilder bb = new ByteBuilder();
bb.addStringArray(rescout_list.toArray(new String[0]));
fileEditor.writeFile(evcode + ".rescout", bb.build());
FileEditor.writeFile(evcode + ".rescout", bb.build());
} catch (Exception e){
AlertManager.error("Error saving scout fields", e);
}
app/src/main/java/com/ridgebotics/ridgescout/utility/fileEditor.java → app/src/main/java/com/ridgebotics/ridgescout/utility/FileEditor.java
+11 -17
View File
@@ -1,8 +1,6 @@
package com.ridgebotics.ridgescout.utility;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import com.ridgebotics.ridgescout.types.frcEvent;
import com.ridgebotics.ridgescout.types.frcTeam;
@@ -17,21 +15,17 @@ import java.io.IOException;
import java.nio.BufferOverflowException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.TimeZone;
import java.util.zip.DataFormatException;
import java.util.zip.Deflater;
import java.util.zip.Inflater;
public final class fileEditor {
public final class FileEditor {
public final static String baseDir = "/data/data/com.ridgebotics.ridgescout/";
public static final byte internalDataVersion = 0x01;
public static final int maxCompressedBlockSize = 4096;
@@ -142,18 +136,18 @@ public final class fileEditor {
public static byte[] blockCompress(byte[] inputData) {
List<byte[]> compiledData = new ArrayList<>();
for(int i=0;i<Math.ceil((double) inputData.length / fileEditor.maxCompressedBlockSize);i++){
final int start = i*fileEditor.maxCompressedBlockSize;
int end = ((i+1)*fileEditor.maxCompressedBlockSize);
for(int i = 0; i<Math.ceil((double) inputData.length / FileEditor.maxCompressedBlockSize); i++){
final int start = i* FileEditor.maxCompressedBlockSize;
int end = ((i+1)* FileEditor.maxCompressedBlockSize);
if(end > inputData.length) {
end = inputData.length;
}
byte[] dataBlock = fileEditor.getByteBlock(inputData, start, end);
byte[] dataBlock = FileEditor.getByteBlock(inputData, start, end);
final byte[] compressedBlock = fileEditor.compress(dataBlock);
final byte[] compressedBlock = FileEditor.compress(dataBlock);
compiledData.add(fileEditor.toBytes(compressedBlock.length, 2));
compiledData.add(FileEditor.toBytes(compressedBlock.length, 2));
compiledData.add(compressedBlock);
}
return combineByteArrays(compiledData);
@@ -164,11 +158,11 @@ public final class fileEditor {
int curIndex = 0;
while (curIndex < data.length) {
final int blockLength = fileEditor.fromBytes(fileEditor.getByteBlock(data, curIndex, curIndex + 2), 2);
final int blockLength = FileEditor.fromBytes(FileEditor.getByteBlock(data, curIndex, curIndex + 2), 2);
uncompressedData.add(
decompress(
fileEditor.getByteBlock(data, curIndex + 2, curIndex + blockLength + 2)
FileEditor.getByteBlock(data, curIndex + 2, curIndex + blockLength + 2)
)
);
@@ -324,8 +318,8 @@ public final class fileEditor {
public static boolean setEvent(frcEvent event){
final String filename = (event.eventCode + ".eventdata");
if(settingsManager.getEVCode().equals("unset")){
settingsManager.setEVCode(event.eventCode);
if(SettingsManager.getEVCode().equals("unset")){
SettingsManager.setEVCode(event.eventCode);
}
return writeFile(filename, event.encode());
app/src/main/java/com/ridgebotics/ridgescout/utility/settingsManager.java → app/src/main/java/com/ridgebotics/ridgescout/utility/SettingsManager.java
+1 -2
View File
@@ -2,12 +2,11 @@ package com.ridgebotics.ridgescout.utility;
import android.content.SharedPreferences;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
public class settingsManager {
public class SettingsManager {
public static SharedPreferences prefs;
public static SharedPreferences.Editor editor;