Skip to content

Commit 60989f5

Browse files
author
Jason Zhou
committed
upgrade pros & readme
1 parent 350df48 commit 60989f5

38 files changed

+537
-339
lines changed

‎[email protected]

-533 KB
Binary file not shown.

‎[email protected]

528 KB
Binary file not shown.

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ EXCLUDE_COLD_LIBRARIES:=
2727
IS_LIBRARY:=1
2828
# TODO: CHANGE THIS!
2929
LIBNAME:=Graphy
30-
VERSION:=1.1.0
30+
VERSION:=1.2.0
3131
# EXCLUDE_SRC_FROM_LIB= $(SRCDIR)/unpublishedfile.c
3232
# this line excludes opcontrol.c and similar files
3333
EXCLUDE_SRC_FROM_LIB+=$(foreach file, $(SRCDIR)/main,$(foreach cext,$(CEXTS),$(file).$(cext)) $(foreach cxxext,$(CXXEXTS),$(file).$(cxxext)))

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ while(true) {
5151
* @param title graph title
5252
* @param rate refresh rate
5353
*/
54-
AsyncGrapher(const std::string &title, const okapi::QTime &rate = 10 * okapi::millisecond);
54+
AsyncGrapher(const std::string &title, const uint rate);
5555
5656
/**
5757
* @brief Add new graph data type
@@ -74,14 +74,14 @@ void update(const std::string &name, double val);
7474
*
7575
* @param rate refresh rate
7676
*/
77-
void setRefreshRate(const okapi::QTime &rate);
77+
void setRefreshRate(const uint rate);
7878
7979
/**
8080
* @brief Get the current refresh rate
8181
*
8282
* @return refresh rate
8383
*/
84-
okapi::QTime getRefreshRate();
84+
uint getRefreshRate();
8585
```
8686

8787
## Contributing

‎common.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ library: $(LIBAR)
201201

202202
.PHONY: template
203203
template: clean-template $(LIBAR)
204-
$Dprosv5 c create-template . $(LIBNAME) $(VERSION) $(foreach file,$(TEMPLATE_FILES) $(LIBAR),--system "$(file)") --target v5 $(CREATE_TEMPLATE_FLAGS)
204+
$Dpros c create-template . $(LIBNAME) $(VERSION) $(foreach file,$(TEMPLATE_FILES) $(LIBAR),--system "$(file)") --target v5 $(CREATE_TEMPLATE_FLAGS)
205205
endif
206206

207207
# if project is a library source, compile the archive and link output.elf against the archive rather than source objects
@@ -280,7 +280,7 @@ $(VV)mkdir -p $(dir $(LDTIMEOBJ))
280280
@# The shell command $$(($$(date +%s)+($$(date +%-z)/100*3600))) fetches the current
281281
@# unix timestamp, and then adds the UTC timezone offset to account for time zones.
282282

283-
$(call test_output_2,Adding timestamp ,echo 'const int _PROS_COMPILE_TIMESTAMP_INT = $(shell echo $$(($$(date +%s)+($$(date +%-z)/100*3600)))); char const * const _PROS_COMPILE_TIMESTAMP = __DATE__ " " __TIME__; char const * const _PROS_COMPILE_DIRECTORY = "$(shell pwd | tail -c 23)";' | $(CC) -c -x c $(CFLAGS) $(EXTRA_CFLAGS) -o $(LDTIMEOBJ) -,$(OK_STRING))
283+
$(call test_output_2,Adding timestamp ,echo 'const int _PROS_COMPILE_TIMESTAMP_INT = $(shell echo $$(($$(date +%s)+($$(date +%-z)/100*3600)))); char const * const _PROS_COMPILE_TIMESTAMP = __DATE__ " " __TIME__; char const * const _PROS_COMPILE_DIRECTORY = "$(wildcard $(shell pwd | tail -c 23))";' | $(CC) -c -x c $(CFLAGS) $(EXTRA_CFLAGS) -o $(LDTIMEOBJ) -,$(OK_STRING))
284284
endef
285285

286286
# these rules are for build-compile-commands, which just print out sysroot information

‎firmware/libpros.a

145 KB
Binary file not shown.

‎include/api.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* This file should not be modified by users, since it gets replaced whenever
99
* a kernel upgrade occurs.
1010
*
11-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
11+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1212
* All rights reserved.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
@@ -40,9 +40,9 @@
4040
#endif /* __cplusplus */
4141

4242
#define PROS_VERSION_MAJOR 3
43-
#define PROS_VERSION_MINOR 7
44-
#define PROS_VERSION_PATCH 3
45-
#define PROS_VERSION_STRING "3.7.3"
43+
#define PROS_VERSION_MINOR 8
44+
#define PROS_VERSION_PATCH 0
45+
#define PROS_VERSION_STRING "3.8.0"
4646

4747
#include "pros/adi.h"
4848
#include "pros/colors.h"

‎include/pros/adi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* This file should not be modified by users, since it gets replaced whenever
99
* a kernel upgrade occurs.
1010
*
11-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
11+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1212
*
1313
* This Source Code Form is subject to the terms of the Mozilla Public
1414
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/adi.hpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* This file should not be modified by users, since it gets replaced whenever
99
* a kernel upgrade occurs.
1010
*
11-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
11+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1212
*
1313
* This Source Code Form is subject to the terms of the Mozilla Public
1414
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -494,10 +494,13 @@ class ADIEncoder : private ADIPort {
494494
* sensor with the removable cover side up, and the "bottom" wire from
495495
* the encoder sensor
496496
* \param reverse
497-
* If "true", the sensor will count in theopposite direction
497+
* If "true", the sensor will count in the opposite direction
498498
*/
499499
ADIEncoder(ext_adi_port_tuple_t port_tuple, bool reversed = false);
500500

501+
// Delete copy constructor to prevent a compilation error from the constructor above.
502+
ADIEncoder(ADIEncoder &) = delete;
503+
501504
/**
502505
* Sets the encoder value to zero.
503506
*

‎include/pros/api_legacy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* This file should not be modified by users, since it gets replaced whenever
1111
* a kernel upgrade occurs.
1212
*
13-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
13+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1414
* All rights reserved.
1515
*
1616
* This Source Code Form is subject to the terms of the Mozilla Public

‎include/pros/apix.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* This file should not be modified by users, since it gets replaced whenever
1313
* a kernel upgrade occurs.
1414
*
15-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
15+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1616
* All rights reserved.
1717
*
1818
* This Source Code Form is subject to the terms of the Mozilla Public

‎include/pros/distance.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/error.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* This file should not be modified by users, since it gets replaced whenever
77
* a kernel upgrade occurs.
88
*
9-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
9+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1010
*
1111
* This Source Code Form is subject to the terms of the Mozilla Public
1212
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/ext_adi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* This file should not be modified by users, since it gets replaced whenever
99
* a kernel upgrade occurs.
1010
*
11-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
11+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1212
*
1313
* This Source Code Form is subject to the terms of the Mozilla Public
1414
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/gps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/gps.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/imu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/imu.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/link.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/link.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2021, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/llemu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* This file should not be modified by users, since it gets replaced whenever
1414
* a kernel upgrade occurs.
1515
*
16-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
16+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1717
*
1818
* This Source Code Form is subject to the terms of the Mozilla Public
1919
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/llemu.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* This file should not be modified by users, since it gets replaced whenever
1414
* a kernel upgrade occurs.
1515
*
16-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
16+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1717
*
1818
* This Source Code Form is subject to the terms of the Mozilla Public
1919
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎include/pros/misc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* This file should not be modified by users, since it gets replaced whenever
1111
* a kernel upgrade occurs.
1212
*
13-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
13+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1414
* All rights reservered.
1515
*
1616
* This Source Code Form is subject to the terms of the Mozilla Public

‎include/pros/misc.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* This file should not be modified by users, since it gets replaced whenever
1111
* a kernel upgrade occurs.
1212
*
13-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
13+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1414
* All rights reservered.
1515
*
1616
* This Source Code Form is subject to the terms of the Mozilla Public

‎include/pros/motors.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* This file should not be modified by users, since it gets replaced whenever
1010
* a kernel upgrade occurs.
1111
*
12-
* Copyright (c) 2017-2022, Purdue University ACM SIGBots.
12+
* \copyright Copyright (c) 2017-2023, Purdue University ACM SIGBots.
1313
*
1414
* This Source Code Form is subject to the terms of the Mozilla Public
1515
* License, v. 2.0. If a copy of the MPL was not distributed with this

0 commit comments

Comments
 (0)