Skip to content

Commit

Permalink
WIP libticalcs: promote Nspire folder deletion to a top-level operati…
Browse files Browse the repository at this point in the history 
…on. Adjust test_ticalcs_2 and torture_ticalcs. Fixes debrouxl#84.

Signed-off-by: Lionel Debroux <[email protected]>
  • Loading branch information
@debrouxl
debrouxl committed Nov 13, 2023
1 parent 158753f commit 9a1f9b9
Show file tree
Hide file tree
Showing 12 changed files with 259 additions and 117 deletions.
12 changes: 10 additions & 2 deletions libticalcs/trunk/src/calc_00.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,12 @@ int noop_get_lab_equipment_data (CalcHandle* handle, CalcModel model, CalcLabEqu
return 0;
}

int noop_del_folder (CalcHandle* handle, VarRequest* vr)
{
(void)handle, (void)vr;
return 0;
}

extern const CalcFncts calc_00 =
{
CALC_NONE,
Expand Down Expand Up @@ -256,7 +262,8 @@ extern const CalcFncts calc_00 =
"", /* send_all_vars_backup */
"", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&noop_is_ready,
&noop_send_key,
&noop_execute,
Expand Down Expand Up @@ -287,5 +294,6 @@ extern const CalcFncts calc_00 =
&noop_send_all_vars_backup,
&noop_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};
24 changes: 16 additions & 8 deletions libticalcs/trunk/src/calc_73.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1670,7 +1670,8 @@ extern const CalcFncts calc_73 =
"", /* send_all_vars_backup */
"", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -1701,7 +1702,8 @@ extern const CalcFncts calc_73 =
&noop_send_all_vars_backup,
&noop_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_83p =
Expand Down Expand Up @@ -1744,7 +1746,8 @@ extern const CalcFncts calc_83p =
"", /* send_all_vars_backup */
"", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -1775,7 +1778,8 @@ extern const CalcFncts calc_83p =
&noop_send_all_vars_backup,
&noop_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_84p =
Expand Down Expand Up @@ -1818,7 +1822,8 @@ extern const CalcFncts calc_84p =
"", /* send_all_vars_backup */
"", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -1849,7 +1854,8 @@ extern const CalcFncts calc_84p =
&noop_send_all_vars_backup,
&noop_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_84pcse =
Expand Down Expand Up @@ -1892,7 +1898,8 @@ extern const CalcFncts calc_84pcse =
"", /* send_all_vars_backup */
"", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -1923,5 +1930,6 @@ extern const CalcFncts calc_84pcse =
&noop_send_all_vars_backup,
&noop_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};
42 changes: 28 additions & 14 deletions libticalcs/trunk/src/calc_84p.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2111,7 +2111,8 @@ extern const CalcFncts calc_84p_usb =
"2P", /* send_all_vars_backup */
"2P", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -2142,7 +2143,8 @@ extern const CalcFncts calc_84p_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_84pcse_usb =
Expand Down Expand Up @@ -2186,7 +2188,8 @@ extern const CalcFncts calc_84pcse_usb =
"2P", /* send_all_vars_backup */
"2P", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -2217,7 +2220,8 @@ extern const CalcFncts calc_84pcse_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_83pce_usb =
Expand Down Expand Up @@ -2261,7 +2265,8 @@ extern const CalcFncts calc_83pce_usb =
"2P", /* send_all_vars_backup */
"2P", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -2292,7 +2297,8 @@ extern const CalcFncts calc_83pce_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_84pce_usb =
Expand Down Expand Up @@ -2336,7 +2342,8 @@ extern const CalcFncts calc_84pce_usb =
"2P", /* send_all_vars_backup */
"2P", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -2367,7 +2374,8 @@ extern const CalcFncts calc_84pce_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_82a_usb =
Expand Down Expand Up @@ -2411,7 +2419,8 @@ extern const CalcFncts calc_82a_usb =
"2P", /* send_all_vars_backup */
"2P", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -2442,7 +2451,8 @@ extern const CalcFncts calc_82a_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_84pt_usb =
Expand Down Expand Up @@ -2486,7 +2496,8 @@ extern const CalcFncts calc_84pt_usb =
"2P", /* send_all_vars_backup */
"2P", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -2517,7 +2528,8 @@ extern const CalcFncts calc_84pt_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};

extern const CalcFncts calc_82aep_usb =
Expand Down Expand Up @@ -2561,7 +2573,8 @@ extern const CalcFncts calc_82aep_usb =
"2P", /* send_all_vars_backup */
"2P", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"", /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -2592,5 +2605,6 @@ extern const CalcFncts calc_82aep_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};
6 changes: 4 additions & 2 deletions libticalcs/trunk/src/calc_89t.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1433,7 +1433,8 @@ extern const CalcFncts calc_89t_usb =
"2P1L", /* send_all_vars_backup */
"2P1L", /* recv_all_vars_backup */
"", /* send_lab_equipment_data */
"" /* get_lab_equipment_data */ },
"", /* get_lab_equipment_data */
"", /* del_folder */ },
&is_ready,
&send_key,
&execute,
Expand Down Expand Up @@ -1464,5 +1465,6 @@ extern const CalcFncts calc_89t_usb =
&send_all_vars_backup,
&tixx_recv_all_vars_backup,
&noop_send_lab_equipment_data,
&noop_get_lab_equipment_data
&noop_get_lab_equipment_data,
&noop_del_folder,
};
Loading

0 comments on commit 9a1f9b9

Please sign in to comment.