Get all examples working

Author: petabyt

CMakeLists.txt

@@ -7,6 +7,7 @@ option(PTP_STUFF "Include extra functions for debugging/testing" ON)
 option(PTP_DEFAULT_LOGGING "Include default log/panic/error implementation" ON)
 option(PTP_INCLUDE_CLI "Include CLI program" OFF)
 option(PTP_USE_LIBUSB "Use LibUSB backend on UNIX platforms" ON)
+option(PTP_INCLUDE_EXAMPLES "Include examples" ON)
 
 set(CAMLIB_CORE
     src/operations.c
@@ -62,3 +63,23 @@ if(PTP_INCLUDE_CLI)
     target_include_directories(camlib PUBLIC ${PROJECT_SOURCE_DIR}/src)
     target_link_libraries(camlib libcamlib ${LIBUSB_LIBRARIES} pcap)
 endif()
+
+macro(add_example exe_name source)
+    add_executable(${exe_name} ${source})
+    target_include_directories(${exe_name} PUBLIC ${PROJECT_SOURCE_DIR}/src)
+    target_link_libraries(${exe_name} libcamlib ${LIBUSB_LIBRARIES})
+endmacro()
+
+if(PTP_INCLUDE_EXAMPLES)
+    add_example(info examples/info.c)
+    add_example(optest examples/optest.c)
+    add_example(directprint examples/directprint.c)
+    add_example(eos examples/eos.c)
+    add_example(evtest examples/evtest.c)
+    add_example(live examples/live.c)
+    add_example(ml examples/ml.c)
+    add_example(pktest examples/pktest.c)
+    add_example(storage examples/storage.c)
+    add_example(usb examples/usb.c)
+    add_example(wifi examples/wifi.c)
+endif()

examples/bindtest.c

@@ -8,7 +8,7 @@
 
 int main() {
 	struct PtpRuntime r;
-	ptp_generic_init(&r);
+	ptp_init(&r);
 
 	struct PtpDeviceInfo di;
 
@@ -19,8 +19,9 @@ int main() {
 
 	ptp_open_session(&r);
 
-	struct UintArray *arr;
+	struct PtpArray *arr;
 	int rc = ptp_get_storage_ids(&r, &arr);
+	if (arr->length == 0) abort();
 	int id = arr->data[0];
 
 	struct PtpObjectInfo oi;
@@ -32,7 +33,7 @@ int main() {
 
 	ptp_close_session(&r);
 	ptp_device_close(&r);
-	ptp_generic_close(&r);
+	ptp_close(&r);
 
 	return 0;
 }

examples/directprint.c

@@ -6,7 +6,7 @@
 
 #include <camlib.h>
 
-/* Some snippets
+/* Some snippets, if you dare to run them:
 Show green on display:
 ptp_eos_evproc_run(&r, "UndisplayPhysicalScreen");
 ptp_eos_evproc_run(&r, "CreateColor %d %d %d", 0, 70, 0);
@@ -19,19 +19,8 @@ ptp_eos_evproc_run(&r, "writeaddr %d %d", 0x3780, 0x12345678);
 */
 
 int main() {
-#if 0
-	int length = 0;
-	extern char *canon_evproc_pack(int *length, char *string);
-	char *data = canon_evproc_pack(&length, "Printf 'asd'");
-	FILE *f = fopen("DUMP", "wb");
-	fwrite(data, 1, length, f);
-	fclose(f);
-	return 0;
-	
-#endif
-
 	struct PtpRuntime r;
-	ptp_generic_init(&r);
+	ptp_init(&r);
 
 	struct PtpDeviceInfo di;
 
@@ -53,9 +42,7 @@ int main() {
 	ptp_device_info_json(&di, (char*)r.data, r.data_length);
 	printf("%s\n", (char*)r.data);
 
-	struct PtpDevPropDesc desc;
-
-	ptp_get_prop_desc(&r, PTP_DPC_EOS_ImageFormat, &desc);
+	// ...
 
 	ptp_close_session(&r);
 	ptp_device_close(&r);

examples/eos.c

@@ -10,7 +10,7 @@
 struct PtpRuntime r;
 
 int main() {
-	ptp_generic_init(&r);
+	ptp_init(&r);
 
 	if (ptp_device_init(&r)) {
 		puts("Device connection error");

examples/evtest.c

@@ -7,7 +7,7 @@
 
 int main() {
 	struct PtpRuntime r;
-	ptp_generic_init(&r);
+	ptp_init(&r);
 
 	struct PtpDeviceInfo di;
 
@@ -25,7 +25,7 @@ int main() {
 
 	ptp_close_session(&r);
 	ptp_device_close(&r);
-	ptp_generic_close(&r);
+	ptp_close(&r);
 	return 0;
 }
 

examples/info.c

@@ -6,7 +6,7 @@
 
 int main() {
 	struct PtpRuntime r;
-	ptp_generic_init(&r);
+	ptp_init(&r);
 
 	struct PtpDeviceInfo di;
 

examples/live.c

@@ -1,14 +1,11 @@
 // Test Magic Lantern things
 #include <stdio.h>
 #include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <camlib.h>
 
 int main(int argc, char **argv) {
 	struct PtpRuntime r;
-	ptp_generic_init(&r);
+	ptp_init(&r);
 
 	struct PtpDeviceInfo di;
 
@@ -22,18 +19,9 @@ int main(int argc, char **argv) {
 	ptp_eos_set_remote_mode(&r, 1);
 	ptp_eos_set_event_mode(&r, 1);
 
-	// Generate JSON data in packet buffer because I'm too lazy
-	// to allocate a buffer (should be around 1-10kb of text)
-	int rc = ptp_get_device_info(&r, &di);
-	if (rc) return rc;
-	r.di = &di;
-	ptp_device_info_json(&di, (char*)r.data, r.data_length);
-	printf("%s\n", (char*)r.data);
-
-	char *input = "/home/daniel/Documents/magiclantern/modules/mlrust/mlrust.mo";
-
 	ptp_chdk_get_version(&r);
-	ptp_chdk_upload_file(&r, input, "B:/ML/MODULES/MLRUST.MO");
+	// Upload the file with varargs
+	ptp_chdk_upload_file(&r, argv[1], argv[2]);
 
 	ptp_close_session(&r);
 	ptp_device_close(&r);

examples/ml.c

@@ -22,7 +22,7 @@ void print_bytes(uint8_t *bytes, int n) {
 
 int main() {
 	struct PtpRuntime r;
-	ptp_generic_init(&r);
+	ptp_init(&r);
 
 	r.connection_type = PTP_IP;
 

examples/pktest.c

@@ -7,38 +7,42 @@
 #include <camlib.h>
 
 int main() {
-	struct PtpRuntime r;
-	ptp_generic_init(&r);
+	struct PtpRuntime *r = ptp_new(0);
 
 	struct PtpDeviceInfo di;
 
-	if (ptp_device_init(&r)) {
+	if (ptp_device_init(r)) {
 		puts("Device connection error");
-		return 0;
+		goto cleanup;
 	}
 
-	ptp_open_session(&r);
+	ptp_open_session(r);
 
-	struct UintArray *arr;
-	int rc = ptp_get_storage_ids(&r, &arr);
+	struct PtpArray *arr;
+	int rc = ptp_get_storage_ids(r, &arr);
+	if (arr->length == 0) {
+		puts("No storage devices found.");
+		goto exit;
+	}
 	int id = arr->data[0];
 
-	rc = ptp_get_object_handles(&r, id, PTP_OF_JPEG, 0, &arr);
-	arr = ptp_dup_uint_array(arr);
+	rc = ptp_get_object_handles(r, id, PTP_OF_JPEG, 0, &arr);
 
 	for (int i = 0; i < arr->length; i++) {
 		struct PtpObjectInfo oi;
-		ptp_get_object_info(&r, arr->data[i], &oi);
+		ptp_get_object_info(r, arr->data[i], &oi);
 
 		printf("Filename: %s\n", oi.filename);
 		printf("File size: %u\n", oi.compressed_size);
 	}
 
 	free(arr);
 
-	ptp_close_session(&r);
-	ptp_device_close(&r);
-	ptp_generic_close(&r);
+	exit:;
+	ptp_close_session(r);
+	ptp_device_close(r);
+	cleanup:;
+	ptp_close(r);
 	return 0;
 }