Diff: DeviceISACS.c

Revision:

173:7f938afb0447

Parent:

167:bedc0a9d559a

Child:

177:672ef279c8e0

diff -r ef7bf1663645 -r 7f938afb0447 DeviceISACS.c
--- a/DeviceISACS.c	Fri Jun 17 13:54:50 2016 +0000
+++ b/DeviceISACS.c	Sun Jun 19 03:54:35 2016 +0000
@@ -102,7 +102,7 @@
   }
 }
 
-int32_t isacsInputCodeToVoltage(uint32_t code) {
+int32_t isacsInput(uint32_t code) {
   int32_t c1, c2;
   for (uint8_t i = 1; i < device.isacs.input.settings.transfer.points; i++) {
     c1 = device.isacs.input.settings.transfer.code[i - 1];
@@ -120,7 +120,7 @@
   return device.isacs.input.settings.transfer.voltage[device.isacs.input.settings.transfer.points - 1];  
 }
 
-int32_t isacsOutputVoltageToCode(uint32_t voltage) {
+int32_t isacsOutput(uint32_t voltage) {
   int32_t v1, v2;
   for (uint8_t i = 1; i < device.isacs.output.settings.transfer.points; i++) {
     v1 = device.isacs.output.settings.transfer.voltage[i - 1];
@@ -207,7 +207,7 @@
 */
 
 void isacsProcess(void) {
-  device.isacs.input.state.voltage = isacsInputCodeToVoltage(device.controller.SSP.in[4]);
+  device.isacs.input.state.voltage = isacsInput(device.controller.SSP.in[4]);
   device.isacs.input.state.sum += device.isacs.input.state.voltage;
   if (device.measurement.counter == 31) {
     device.isacs.input.state.average = device.isacs.input.state.sum >> 5;
@@ -216,7 +216,7 @@
     if (device.isacs.regulator.state.enabled) {
       device.isacs.regulator.state.error = device.isacs.regulator.state.reference - device.isacs.input.state.average;
       device.isacs.output.state.voltage += device.isacs.regulator.state.error * device.isacs.regulator.state.scale;
-      device.controller.SSP.out[0] = isacsOutputVoltageToCode(device.isacs.output.state.voltage);
+      device.controller.SSP.out[0] = isacsOutput(device.isacs.output.state.voltage);
     }
   }
 }
\ No newline at end of file