Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
# Changes in version 1.0.? (release date:??-??-2026)

- Update readActiwatchCount to handle behaviour upcoming data.table package release. #89

# Changes in version 1.0.7 (release date:26-11-2025)

- Parmay Matrix:
- Fixed minor bug in the conversion of accelerometer and gyroscope readings #82
- Correct documentation for header structure of bin files in readParmayMatrix #83
- Correct documentation for header structure of binary files in readParmayMatrix #83
- Update Parmay matrix website in README and readParmayMatrix function documentation #87
- Enhanced robustness when reading partially corrupted files, valid data packets are now processed, while only corrupted sections are skipped #88

Expand All @@ -22,7 +26,7 @@

- Fitbit: Fix bug preventing the loading of a sequence of json files. #76

- Add functions for reading Parmay Tech Matrix sensor (bin/BIN files) with accelerometer, gyroscope, temperature, and heart rate #70.
- Add functions for reading Parmay Tech Matrix sensor (BIN files) with accelerometer, gyroscope, temperature, and heart rate #70.

# Changes in version 1.0.3 (release date:07-03-2025)

Expand Down
2 changes: 1 addition & 1 deletion R/readActiwatchCount.R
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ readActiwatchCount = function(filename = NULL,
index = index + 1
}
}
D = data.table::fread(input = filename, header = FALSE, sep = ",",
D = data.table::fread(input = filename, sep = ",",
skip = index, quote = quote, data.table = FALSE)
colnames(D)[1:2] = c("counts", "light")
lastCol = ncol(D)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Brand | Device name | File extension | Data type | GGIRread function
Axivity Ltd https://axivity.com/ | AX3 and AX6 | .cwa | raw gravitational units |readAxivity
ActivInsights Ltd https://activinsights.com/ | GENEActiv Original and Sleep | .bin | raw gravitational units | readGENEActiv
Unilever Discover Ltd | Genea (no longer manufactured) | .bin | raw gravitational units | readGenea
Parmay Tech https://www.matrixwearable.net/ | Matrix | .bin, .BIN | raw gravitational units | readParmayMatrix
Parmay Tech https://www.matrixwearable.net/ | Matrix | .BIN | raw gravitational units | readParmayMatrix
ActiGraph | ??? | .csv | count data | readActigraphCount
Actiwatch | ??? | .csv and .awd | count data | readActiwatchCount
Actical | ??? | .csv | count data | readActicalCount
Expand Down
2 changes: 1 addition & 1 deletion man/readParmayMatrix.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
\references{
For more details on Matrix devices', see:
\url{https://www.matrixwearable.net/}
For additional details on Matrix bin/BIN files structure, please contact manufacturer:
For additional details on Matrix BIN files structure, please contact manufacturer:
\url{https://www.matrixwearable.net/#!/contact}
}
\seealso{
Expand Down
8 changes: 5 additions & 3 deletions tests/testthat/test_readActiwatchCount.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ test_that("Actiwatch csv is correctly read", {
})
test_that("Actiwatch awd is correctly read", {
file = system.file("testfiles/Actiwatch.AWD", package = "GGIRread")
D = readActiwatchCount(filename = file, timeformat = "%d-%b-%Y %H:%M:%S",
desiredtz = "Europe/Amsterdam")
expect_warning(D <- readActiwatchCount(filename = file, timeformat = "%d-%b-%Y %H:%M:%S",
desiredtz = "Europe/Amsterdam"),
regexp = "Detected 1 column names but the data has 3 columns*")
expect_equal(D$epochSize, 60)
expect_equal(format(D$startTime), "2009-10-01 17:00:00")
expect_equal(nrow(D$data), 329)
Expand All @@ -27,8 +28,9 @@ test_that("Actiwatch awd is correctly read", {

test_that("Actiwatch awd error correctly", {
file = system.file("testfiles/Actiwatch.AWD", package = "GGIRread")
expect_error(readActiwatchCount(filename = file,
expect_error(expect_warning(readActiwatchCount(filename = file,
timeformat = "%d-%m-%Y %H:%M:%S"),
regexp = "Detected 1 column names but the data has 3 columns*"),
regexp = "Time format*")

expect_error(readActiwatchCount(filename = "",
Expand Down
Loading