18:06 < jtanx> now... to do some work on this gui
21:15 -!- jtanx [
[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 24.0/20130910160258]"]
+--- Day changed Sun Oct 06 2013
+11:17 < jtanx> slight problem: http://i.imgur.com/D28SHaQ.png
+11:17 < jtanx> 100% cpu usage on idle
+11:18 < jtanx> that memory usage too doesn't look too healthy
+11:18 < sam_moore> Damn
+11:20 < jtanx> I also probably figured out why valgrind crashes with the --trace-origins option - not enough memory on my system :P
+11:30 < jtanx> It's probably because in read data all the cases except one have a sleep in them
+11:31 < sam_moore> I'd say so
+11:31 < sam_moore> There are like 8 threads
+11:31 < sam_moore> We don't need 8 threads
+11:39 < sam_moore> Are you in G19?
+11:39 < jtanx> no
+11:40 < sam_moore> Alright
+11:40 < sam_moore> I suppose I should do some work on this
+11:40 < sam_moore> CITS3003 is funner though
+11:40 < sam_moore> I'll look into the performance issues
+11:41 < jtanx> hehe
+11:42 < sam_moore> My "Incident" with UWA IS is now Moderate Priority
+11:42 < sam_moore> It's been assigned!
+11:42 < sam_moore> I suppose I should wait for this guy to email me and say "What the hell are you on about?"
+11:42 < sam_moore> (Re: Using Pheme)
+11:42 < sam_moore> They classified it as a "Request for service"
+11:43 < sam_moore> Which I suppose is true, except they don't really have to do anything
+11:43 < jtanx> o.o
+11:44 < jtanx> I hope it goes through
+11:44 < sam_moore> Yes, no one's going to do a user management system
+11:44 < jtanx> Yep
+11:44 < sam_moore> When people complain they have nothing to do though...
+11:44 < sam_moore> That's like a semester of work right there
+12:40 < sam_moore> um... that image you linked
+12:40 < sam_moore> That's not actually running on the BeagleBone is it?
+12:40 < sam_moore> Because on the BeagleBone
+12:40 < sam_moore> It's like 0.7%
+12:41 < sam_moore> Actually 0.3% CPU 1.1% memory
+12:50 < jtanx> no
+12:50 < jtanx> that's because there's a conditional #ifdef
+12:50 < jtanx> beaglebone to sleep
+12:50 < jtanx> I got that condition around the wrong way
+12:50 < jtanx> Initially I thought you wanted to test the absolute maximum sampling rate on the BBB
+12:53 < jtanx> I just updated the repo to really remove that pwm array reference
+12:54 < jtanx> (about the cpu) It's because of this: https://github.com/szmoore/MCTX3420/blob/master/server/sensor.c#L257
+12:55 < jtanx> That ifdef should be removed anyway, just put in an unconditional sleep for 0.1s
+12:55 < jtanx> then remove the individual sleeps from each sensor case
+13:17 < sam_moore> Sure
+13:17 < sam_moore> Light has been shed on the PWM thing
+13:18 < sam_moore> They are using some RC circuit which I believe averages out the PWM to give you a constant signal
+13:18 < sam_moore> I thought it was some kind of IC that took a PWM input
+13:21 < jtanx> oh ok
+13:22 < jtanx> yeah that's what I thought too
+13:22 < jtanx> so no dac I guess
+13:22 < jtanx> (dac ic that is)
+13:24 < sam_moore> I have my doubts that electronics will be able to make this custom DAC
+13:24 < sam_moore> And of course, no DAC means no Pressure control
+13:24 < sam_moore> But oh well
+13:24 < jtanx> ^_^
+13:24 < jtanx> homebrew DAC
+13:25 < jtanx> how will this ever be calibrated
+13:26 < sam_moore> We should probably include a calibration routine in software
+13:27 < sam_moore> I'm looking a bit more into the RT linux stuff
+13:27 < sam_moore> It doesn't look too crazy
+13:27 < sam_moore> Our program pretty much looks the same
+13:27 < sam_moore> With a function at initialisation to set it's priority and stuff
+13:27 < sam_moore> But otherwise, you just use usleep, sleep, pthreads, everything as normal
+13:28 < jtanx> ok
+13:28 < jtanx> as long as it works on the bbb I guess
+13:30 < sam_moore> I think I should port from gettimeofday to clock_gettime too
+13:35 < sam_moore> https://rt.wiki.kernel.org/index.php/RT_PREEMPT_HOWTO
+13:35 < sam_moore> I'll compile us a kernel and see if it works
+14:09 < sam_moore> Yeah, it looks like RT Linux won't work on the BBB
+14:09 < sam_moore> Oh well
+14:17 < jtanx> damn
+15:34 < Callum> Hey guys, sorry i havent been in touch lately. done a bit of work on dilatometer but its not quite complete. Uploaded what iv done but i got a test i tomorrow i should go study for now
+16:29 < jtanx> hahaha
+16:30 < jtanx> interactive sbd
+16:31 < jtanx> hmm dialatometer
+16:45 < jtanx> Justin's idea with the system diagram was pretty good
+16:55 < jtanx> test run: https://mctx.us.to:8043/test/
+16:55 < jtanx> no links yet
+16:55 < jtanx> no descriptions either
+16:55 < jtanx> logout when you're done
+16:55 < jtanx> no auth so type anything you want in login field
+17:24 < Callum> looks pretty good
+18:12 < jtanx> I stuffed up /etc/fstab and now the root filesystem is readonly :(
+18:19 < jtanx> ...and I just wasted time booting off ubuntu 7.04, which doesn't support ext4...
+18:43 -!- Callum_ is now known as Callum
+19:30 < jtanx> I've just enabled personal webspace for everyone
+19:30 < jtanx> check your emails for details
+19:52 < jtanx> :(
+21:11 < sam_moore> Cool
+21:11 < sam_moore> Sorry, I'm trying to finish CITS3003
+21:25 < jtanx> Yep no problem
+21:38 < jtanx> nice: http://cssmenumaker.com
+22:09 < jtanx> weird, getting http 500 when trying to access our github repo
+23:16 -!- jtanx [
[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 24.0/20130910160258]"]
+--- Day changed Mon Oct 07 2013
+12:47 < callum> you guys in g19?
+18:44 < jtanx> ha, you can clone a wiki
+18:45 < jtanx> git clone https://github.com/szmoore/MCTX3420.wiki.git
+20:50 < sam_moore> Yeah, I know
+20:51 < sam_moore> I don't really think it's great to be relying on the BeagleBone to serve all these additional requirements
+20:51 < jtanx> Yeah, probably not
+20:52 < jtanx> I've just been playing around with django for my CITS2232 project
+20:52 < jtanx> it's like a python based cms
+20:53 < sam_moore> That might work
+20:53 < jtanx> It's actually not too bad
+20:53 < jtanx> but incredibly annoying to learn how to use
+20:53 < jtanx> it's got its own inbuilt user system
+20:54 < sam_moore> How could we query it from our server though?
+20:54 < jtanx> as in?
+20:54 < jtanx> you can still query directly from the browser
+20:54 < jtanx> from django itself
+20:54 < jtanx> I'm definitely sure there's a json parsing library
+20:55 < jtanx> (python at least should have one)
+20:56 < sam_moore> As in, if we want to "login"
+20:56 < sam_moore> How do we authenticate?
+20:57 < sam_moore> From within the FastCGI process
+20:57 < jtanx> Okay, there's two approaches I guess
+20:58 < jtanx> if you want to continue to use fastcgi to login I guess you could get django to figure out
+20:58 < jtanx> who's logged in
+20:58 < jtanx> If you use django's login system
+20:58 < jtanx> hmm
+21:00 < jtanx> but one thing I haven't done yet is how do you prevent concurrent access in django
+21:01 < jtanx> but say this:
+21:01 < sam_moore> I think binding to an LDAP server is pretty standard for this sort of thing
+21:01 < sam_moore> I think Django can even let you bind to LDAP for using it
+21:01 < jtanx> probably
+21:01 < jtanx> I think class2go was built using django
+21:01 < jtanx> if you've ever used that crappy website
+21:02 < jtanx> say for the fastcgi process we revert to
+21:02 < jtanx> /api/control?lock
+21:02 < jtanx> /api/control?unlock
+21:02 < jtanx> etc
+21:02 < jtanx> but /api/control is only visible to django
+21:02 < sam_moore> Ah, I see
+21:02 < sam_moore> Um...
+21:02 < jtanx> then django can query it
+21:02 < jtanx> and conditionally return the control key?
+21:03 < jtanx> i dunno
+21:03 < sam_moore> I'd be slightly nervous about adding additional systems that have to work together though
+21:03 < jtanx> yeah
+21:03 < jtanx> that's the problem
+21:03 < sam_moore> I mean, if it works, it's fine
+21:03 < sam_moore> If it breaks, suddenly anyone (or noone) can access the real underlying hardware
+21:03 < jtanx> Yeah
+21:04 < jtanx> especially if someone screws up the server config
+21:04 < sam_moore> I think I'd prefer to stick with the current login handler
+21:04 < sam_moore> There's some flexibility with how you actually do the authentication
+21:04 < jtanx> Sure
+21:06 < jtanx> I'm just thinking, how would we implement the 'admin' features
+21:06 < jtanx> you'd then have to have some sort of list distinguishing normal users from admins
+21:06 < jtanx> unless you hardcode admins?...
+21:07 < sam_moore> With LDAP you can store admin as a user field and check it
+21:08 < sam_moore> With /etc/shadow, have 2 files
+21:08 < sam_moore> One for admin, one for regular users
+21:08 < sam_moore> (When I say /etc/shadow I just mean the style of auth, not necessarily actually using *the* /etc/shadow)
+21:08 < sam_moore> In fact
+21:09 < sam_moore> We could possibly do a minimalist user management with python cgi and a custom /etc/shadow style file
+21:10 < jtanx> say what
+21:11 < jtanx> so use the python cgi to modify it
+21:11 < sam_moore> Yeah
+21:11 < jtanx> our c fastcgi to read
+21:11 < sam_moore> Yes
+21:11 < jtanx> that could work
+21:11 < jtanx> have a look at flask
+21:11 < sam_moore> It's also probably possible to easily do a lot of the things Adam wanted
+21:12 < jtanx> flask is like the simpler version of django
+21:12 < sam_moore> At least, you can get python cgi to send emails to people with a temporary password and ask them to change it
+21:12 < jtanx> i think I still have an example too
+21:15 < sam_moore> If you want and it doesn't require rewriting large parts of the FastCGI process
+21:15 < sam_moore> Personally I don't think I have the time
+21:16 < jtanx> well if it's completely separate from the fastcgi process
+21:16 < sam_moore> Sure
+21:17 < jtanx> hmm
+21:18 < sam_moore> Just a simple CGI script might do the job though
+21:18 < jtanx> yeah
+21:18 < jtanx> except nginx doesn't have normal cgi
+21:19 < sam_moore> Wat
+21:19 < jtanx> only fastcgi
+21:19 < sam_moore> Damn
+21:19 < sam_moore> And I guess apache2 only has normal cgi and not fastcgi?
+21:19 < jtanx> there may be mod_fastcgi
+21:19 < jtanx> but
+21:19 < jtanx> before we get ahead of ourselves
+21:20 < jtanx> okay no, nginx doesn't have fastcgi
+21:20 < jtanx> sorry cgi*
+21:20 < jtanx> we could do it in php
+21:21 < jtanx> urgh
+21:21 < sam_moore> urgh indeed...
+21:21 < sam_moore> I dunno
+21:22 < sam_moore> We *did* tell Adam that we wouldn
+21:22 < sam_moore> 't be able to do the user management system
+21:22 < jtanx> haha
+21:23 < sam_moore> I really think getting our program to interface with an LDAP server is reasonable
+21:23 < jtanx> yeah
+21:23 < sam_moore> Ok, I need to fix CITS3003 some more
+22:46 -!- jtanx [
[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 24.0/20130910160258]"]
+22:53 < jtanx> brainspark: we can probably use django to proxy api requests
+22:53 < jtanx> so it goes like this: user <-> django <-> server api
+22:54 < jtanx> then you don't even have to expose the server api at all
+22:54 < jtanx> although if I ever end up trying this I don't know
+22:55 < jtanx> (by expose I mean that django can conditionally pass on the results from queries to the api)
+22:55 < jtanx> but yeah, it's probably best to leave it how it is right now
+22:55 < jtanx> as I doubt I have the time to implement this
+23:10 < jtanx> it would definitely add overhead too
+23:40 -!- jtanx [
[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 24.0/20130910160258]"]
+--- Day changed Tue Oct 08 2013
+21:16 -!- jtanx [
[email protected]] has quit ["ChatZilla 0.9.90.1 [Firefox 24.0/20130910160258]"]
{
if (cookie[0] == '\0')
{
- FCGI_RejectJSON(&context, "Please login.");
+ FCGI_RejectJSONEx(&context, STATUS_UNAUTHORIZED, "Please login.");
continue;
}
char dn[BUFSIZ];
// On a simple LDAP server:
- int len = sprintf(dn, "uid=%s,%s", user, g_options.ldap_base_dn);
+ //int len = sprintf(dn, "uid=%s,%s", user, g_options.ldap_base_dn);
// At UWA (hooray)
- //char * user_type = (user[0] != '0') : "Students" ? "Staff";
- //int len = sprintf(dn, "cn=%s,ou=%s", user, user_type, g_options.ldap_dn_base);
+ char * user_type = "Students";
+ if (user[0] == '0')
+ user_type = "Staff";
+ int len = sprintf(dn, "cn=%s,ou=%s,%s", user, user_type, g_options.ldap_base_dn);
if (len >= BUFSIZ)
pin_test="0"
# Set to the URI to use authentication
-auth_uri="ldap://192.168.1.1"
-#auth_uri="/etc/shadow"
+#auth_uri="ldap://192.168.1.1"
+#auth_uri="ldaps://ldap.pheme.uwa.edu.au" #UWA
+auth_uri="/etc/shadow"
# Set to the dn of the LDAP server
-ldap_base_dn="ou=People,dc=daedalus"
+#ldap_base_dn="ou=People,dc=daedalus" # Testing
+ldap_base_dn="ou=Users,ou=UWA,dc=uwads,dc=uwa,dc=edu,dc=au" #UWA
## OPTIONS TO BE PASSED TO SERVER; DO NOT EDIT
# TODO: Can tell spawn-fcgi to run the program as an unprivelaged user?
# But first will have to work out how to set PWM/GPIO as unprivelaged user
fails=0
-while [ $fails -lt 10 ]; do
+while [ $fails -lt 1 ]; do
spawn-fcgi -p9005 -n -- ./server $parameters
error=$?
if [ "$error" == "0" ]; then
/** Array of sensor threshold structures defining the safety values of each sensor**/
const SensorThreshold thresholds[NUMSENSORS]= {
//Max Safety, Min safety, Max warning, Min warning
- {1,-1,1,-1}, // ANALOG_TEST0
- {500,0,499,0}, // ANALOG_TEST1
- {5000,0,5000,0}, // ANALOG_REALTEST
- {5,-5,4,-4}, // ANALOG_FAIL0
- {1,0,1,0}, // DIGITAL_TEST0
- {1,0,1,0}, // DIGITAL_TEST1
- {1,0,1,0}, // DIGITAL_REALTEST
- {1,0,1,0} // DIGITAL_FAIL0
+ {5000,0,5000,0},
+ {5000,0,5000,0},
+ {5000,0,5000,0},
+ {5000,0,5000,0},
+ {5000,0,5000,0},
+ {5000,0,5000,0},
+ {5000,0,5000,0},
+ {5000,0,5000,0},
+ {1, 1, 1, 1}
};
/** Human readable names for the sensors **/
const char * g_sensor_names[NUMSENSORS] = {
- "analog_test0", "analog_test1",
- "analog_realtest", "analog_fail0",
- "digital_test0", "digital_test1",
- "digital_realtest", "digital_fail0"
+ "strain0",
+ "strain1",
+ "strain2",
+ "strain3",
+ "pressure0",
+ "pressure1",
+ "pressure_feedback",
+ "microphone",
+ "enclosure"
};
/**
Data_Init(&(g_sensors[i].data_file));
}
- // Get the required ADCs
- ADC_Export(0);
- // GPIO1_28 used as a pulse for sampling
- //GPIO_Export(GPIO1_28);
- // GPIO0_30 toggled during sampling
- //GPIO_Export(GPIO0_30);
+
+ // Get the required ADCs
+ ADC_Export(ADC0); // Strain gauges x 4
+ ADC_Export(ADC1); // Pressure sensor 1
+ ADC_Export(ADC2); // Pressure sensor 2
+ // ADC3 still unused (!?)
+ ADC_Export(ADC4); // Pressure regulator feedback(?) signal
+ ADC_Export(ADC5); // Microphone
+
+ // Get GPIO pins //TODO: Confirm pins used with Electronics Team
+ GPIO_Export(GPIO0_30); // Mux A (strain 1)
+ GPIO_Set(GPIO0_30, false);
+ GPIO_Export(GPIO1_28); // Mux B (strain 2)
+ GPIO_Set(GPIO1_28, false);
+ GPIO_Export(GPIO0_31); // Mux C (strain 3)
+ GPIO_Set(GPIO0_31, false);
+ GPIO_Export(GPIO1_16); // Mux D (strain 4)
+ GPIO_Set(GPIO1_16, false);
+
+ GPIO_Export(GPIO0_31); // Enclosure switch
}
/**
{
if( value > thresholds[id].max_error || value < thresholds[id].min_error)
{
- Log(LOGERR, "Sensor %s at %f is above or below its safety value of %f or %f\n", value, g_sensor_names[id],thresholds[id].max_error, thresholds[id].min_error);
+ Log(LOGERR, "Sensor %s at %f is above or below its safety value of %f or %f\n", g_sensor_names[id],value, thresholds[id].max_error, thresholds[id].min_error);
//new function that stops actuators?
//Control_SetMode(CONTROL_EMERGENCY, NULL)
}
else if( value > thresholds[id].max_warn || value < thresholds[id].min_warn)
{
- Log(LOGWARN, "Sensor %s at %f is above or below its warning value of %f or %f\n", value, g_sensor_names[id],thresholds[id].max_warn, thresholds[id].min_warn);
+ Log(LOGWARN, "Sensor %s at %f is above or below its warning value of %f or %f\n", g_sensor_names[id],value,thresholds[id].max_warn, thresholds[id].min_warn);
}
}
bool Sensor_Read(Sensor * s, DataPoint * d)
{
+
+
+ static bool result = true;
+
+ //TODO: Remove this, code should be refactored to not use so many threads
+ // Although... if it works, it works...
+ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
+ pthread_mutex_lock(&mutex); //TODO: Reduce the critical section
+
+ usleep(10);
+
// Set time stamp
struct timeval t;
gettimeofday(&t, NULL);
- d->time_stamp = TIMEVAL_DIFF(t, *Control_GetStartTime());
-
- static bool result = true;
-
+ d->time_stamp = TIMEVAL_DIFF(t, *Control_GetStartTime());
// Read value based on Sensor Id
+ int value; bool success = true;
+ //TODO: Can probably do this nicer than a switch (define a function pointer for each sensor)
+ // Can probably make the whole sensor thing a lot nicer with a linked list of sensors...
+ // (Then to add more sensors to the software, someone just writes an appropriate read function and calls Sensor_Add(...) at init)
+ // (I will do this. Don't do it before I get a chance, I don't trust you :P)
switch (s->id)
{
- case 2:
- {
- static bool set = false;
- int raw_adc = 0;
- //GPIO_Set(GPIO0_30, true);
- ADC_Read(ADC0, &raw_adc);
- d->value = (double)raw_adc; //ADC #0 on the Beaglebone
- //Log(LOGDEBUG, "Got value %f from ADC0", d->value);
- //GPIO_Set(GPIO0_30, false);
- set = !set;
- //GPIO_Set(GPIO1_28, set);
-
- usleep(100000);
-
- break;
- }
-
- default:
- d->value = rand() % 2;
- usleep(1000000);
+ //TODO: Strain gauges should have their own critical section, rest of sensors probably don't need to be in a critical section
+ case STRAIN0:
+ success &= GPIO_Set(GPIO0_30, true);
+ success &= ADC_Read(ADC0, &value);
+ success &= GPIO_Set(GPIO0_30, false);
+ if (!success)
+ Fatal("Error reading strain gauge 0");
break;
-
-
- case ANALOG_TEST0:
- {
- d->value = (double)(rand() % 100) / 100;
+ case STRAIN1:
+ success &= GPIO_Set(GPIO1_28, true);
+ success &= ADC_Read(ADC0, &value);
+ success &= GPIO_Set(GPIO1_28, false);
+ if (!success)
+ Fatal("Error reading strain gauge 1");
break;
- }
- case ANALOG_TEST1:
- {
- static int count = 0;
- count %= 500;
- d->value = count++;
+ case STRAIN2:
+ success &= GPIO_Set(GPIO0_31, true);
+ success &= ADC_Read(ADC0, &value);
+ success &= GPIO_Set(GPIO0_31, false);
+ case STRAIN3:
+ success &= GPIO_Set(GPIO1_16, true);
+ success &= ADC_Read(ADC0, &value);
+ success &= GPIO_Set(GPIO1_16, false);
+ if (!success)
+ Fatal("Error reading strain gauge 2");
+ break;
+ case PRESSURE0:
+ success &= ADC_Read(ADC1, &value);
break;
- }
-
- case ANALOG_FAIL0:
- d->value = 0;
- //d->value = (double)(rand() % 6) * -( rand() % 2) / ( rand() % 100 + 1);
- //Gives a value between -5 and 5
+ case PRESSURE1:
+ success &= ADC_Read(ADC5, &value);
break;
- case DIGITAL_TEST0:
- d->value = t.tv_sec % 2;
-
+ case PRESSURE_FEEDBACK:
+ success &= ADC_Read(ADC4, &value);
break;
- case DIGITAL_TEST1:
- d->value = (t.tv_sec+1)%2;
+ case MICROPHONE:
+ success &= ADC_Read(ADC2, &value);
break;
- case DIGITAL_REALTEST:
+ case ENCLOSURE:
{
- d->value = 0; //d->value must be something... valgrind...
- // Can pass pin as argument, just using 20 as an example here
- // Although since pins will be fixed, can just define it here if we need to
- //d->value = pinRead(20); //Pin 20 on the Beaglebone
+ bool why_do_i_need_to_do_this = false;
+ success &= GPIO_Read(GPIO0_31, &why_do_i_need_to_do_this);
+ value = (int)why_do_i_need_to_do_this;
break;
}
- case DIGITAL_FAIL0:
- if( rand() % 100 > 98)
- d->value = 2;
- d->value = rand() % 2;
- //Gives 0 or 1 or a 2 every 1/100 times
+ case DILATOMETER:
+ {
+ // Will definitely cause issues included in the same critical section as ADC reads
+ // (since it will be the longest sensor to sample, everything else will have to keep waiting on it)
+ value = 0;
break;
- //default:
- // Fatal("Unknown sensor id: %d", s->id);
- // break;
+ }
+
}
+
+ d->value = (double)(value); //TODO: Calibration? Or do calibration in GUI
+
+ pthread_mutex_unlock(&mutex); //TODO: Reduce the critical section
// Perform sanity check based on Sensor's ID and the DataPoint
#ifdef _BBB
//Not all cases have usleep, easiest here.
- usleep(1000000);
+ //TODO: May want to add a control option to adjust the sampling rate for each sensor?
+ // Also, we can get a more accurate sampling rate if instead of a fixed sleep, we calculate how long to sleep each time.
+ usleep(100000);
#endif
- return result;
+
+ /*
+ if (success)
+ Log(LOGDEBUG, "Successfully read sensor %d (for once)", s->id);
+ else
+ Log(LOGDEBUG, "Failed to read sensor %d (again)", s->id);
+ */
+ return result && success;
}
/**
#include "data.h"
+
+
/** Number of sensors **/
-#define NUMSENSORS 8
+#define NUMSENSORS 10
/** Sensor ids - there should be correspondence with the names in g_sensor_names **/
typedef enum SensorId
{
- ANALOG_TEST0,
- ANALOG_TEST1,
- ANALOG_REALTEST,
- ANALOG_FAIL0,
- DIGITAL_TEST0,
- DIGITAL_TEST1,
- DIGITAL_REALTEST,
- DIGITAL_FAIL0
+ STRAIN0,
+ STRAIN1,
+ STRAIN2,
+ STRAIN3,
+ PRESSURE0,
+ PRESSURE1,
+ PRESSURE_FEEDBACK,
+ MICROPHONE,
+ ENCLOSURE,
+ DILATOMETER
} SensorId;
+
+
/** Human readable names for the sensors **/
extern const char * g_sensor_names[NUMSENSORS];
pthread_t thread;
/** Most recently recorded data **/
DataPoint newest_data;
+
+
} Sensor;
// Structure to define the warning and error thresholds of the sensors
frame = cvQueryFrame(capture);
if( frame == NULL)
return 0; //error
- //cvSaveImage("../web/images/test.JPG",frame,p);
- jpg = cvEncodeImage(".jpg", frame,p);
+ cvSaveImage("../web/images/test.JPG",frame,p);
+ //jpg = cvEncodeImage(".jpg", frame,p);
/*pass buf to client, write to file on client*/
//fwrite(jpg->data.ptr,1,jpg->rows*jpg->cols, fp);
//cvWaitKey(0);
cvReleaseImageHeader(&frame);
- cvReleaseMat(&jpg);
+ //cvReleaseMat(&jpg);
//fclose( fp);
return 1;
}
if( capture == NULL)
return -1;
+ cvSetCaptureProperty (capture, CV_CAP_PROP_FOURCC, 'MJPEG');
+
while(1)
{
if( !storeFrame( capture))
return -1;
+ printf("enter to continue");
+ getchar();
//sleep(1); //for now just to make the camera take 1 shot a second, as that's all my camera seems to be able to take/save (camera or function causing this? is 1 second per frame enough?)
}
#!/bin/bash
-valgrind --leak-check=full --show-reachable=yes ./server
+. parameters
+valgrind ./server $parameters
box-shadow: 0 0 0.25em #AAAAAA;
}
+.plot {
+ box-sizing: border-box;
+ width: 850px;
+ height: 450px;
+ padding: 20px 15px 15px 15px;
+ margin: 15px auto 30px auto;
+ border: 1px solid #ddd;
+ background: #fff;
+ background: linear-gradient(#f6f6f6 0, #fff 50px);
+ background: -o-linear-gradient(#f6f6f6 0, #fff 50px);
+ background: -ms-linear-gradient(#f6f6f6 0, #fff 50px);
+ background: -moz-linear-gradient(#f6f6f6 0, #fff 50px);
+ background: -webkit-linear-gradient(#f6f6f6 0, #fff 50px);
+ box-shadow: 0 3px 10px rgba(0,0,0,0.15);
+ -o-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+ -ms-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+ -moz-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+ -webkit-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+ font-size:20px;
+}
+
/** Hack **/
.clear {
clear: both;
#login-container #result {
clear: both;
-}
\ No newline at end of file
+}
git.ucc.asn.au / matches / MCTX3420.git / commitdiff
UCC git Repository :: git.ucc.asn.au