diff --git a/controls/.gitignore b/controls/.gitignore
deleted file mode 100644
index 8b19222b04b8afacb65b2cf3b41651efc7b162e0..0000000000000000000000000000000000000000
--- a/controls/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.asv
-*.autosave
\ No newline at end of file
diff --git a/controls/model/IMU_prototype.mdl b/controls/model/IMU_prototype.mdl
index 0719120da90753a997289c717475134c7fd8b8eb..26f8dfe330d2d394f0907001dd9a2f2d7ac57720 100644
--- a/controls/model/IMU_prototype.mdl
+++ b/controls/model/IMU_prototype.mdl
@@ -1,16 +1,26 @@
Model {
Name "IMU_prototype"
- Version 8.5
- MdlSubVersion 0
+ Version 8.8
SavedCharacterEncoding "windows-1252"
GraphicalInterface {
NumRootInports 0
NumRootOutports 0
ParameterArgumentNames ""
- ComputedModelVersion "1.7"
+ ComputedModelVersion "1.9"
NumModelReferences 0
NumTestPointedSignals 0
+ NumProvidedFunctions 0
+ NumRequiredFunctions 0
+ NumResetEvents 0
+ HasInitializeEvent 0
+ HasTerminateEvent 0
+ IsExportFunctionModel 0
}
+ LogicAnalyzerGraphicalSettings ""
+ LogicAnalyzerPlugin "on"
+ LogicAnalyzerSignalOrdering ""
+ DiagnosticSuppressor "on"
+ SuppressorTable "22 serialization::archive 11 0 3 0 0 0 8 0"
ScopeRefreshTime 0.035000
OverrideScopeRefreshTime on
DisableAllScopes on
@@ -20,6 +30,7 @@ Model {
MinMaxOverflowArchiveMode "Overwrite"
FPTRunName "Run 1"
MaxMDLFileLineLength 120
+ LastSavedArchitecture "win64"
Object {
$PropName "BdWindowsInfo"
$ObjectID 1
@@ -29,7 +40,7 @@ Model {
$ObjectID 2
$ClassName "Simulink.WindowInfo"
IsActive [1]
- Location [750.0, 139.0, 1062.0, 703.0]
+ Location [-8.0, -8.0, 1936.0, 1056.0]
Object {
$PropName "ModelBrowserInfo"
$ObjectID 3
@@ -38,7 +49,7 @@ Model {
DockPosition "Left"
Width [50]
Height [50]
- Filter [8]
+ Filter [9]
}
Object {
$PropName "ExplorerBarInfo"
@@ -51,23 +62,46 @@ Model {
$ObjectID 5
$ClassName "Simulink.EditorInfo"
IsActive [1]
- ViewObjType "SimulinkTopLevel"
- LoadSaveID "0"
- Extents [1028.0, 548.0]
- ZoomFactor [1.0]
- Offset [-12.68749862909317, -115.07500931620598]
+ ViewObjType "SimulinkSubsys"
+ LoadSaveID "20"
+ Extents [1755.0, 876.0]
+ ZoomFactor [1.5]
+ Offset [-45.247619047619196, -6.2261904761904816]
}
+ Object {
+ $PropName "DockComponentsInfo"
+ $ObjectID 6
+ $ClassName "Simulink.DockComponentInfo"
+ Type "GLUE2:PropertyInspector"
+ ID "Property Inspector"
+ Visible [0]
+ CreateCallback ""
+ UserData ""
+ Floating [0]
+ DockPosition "Right"
+ Width [640]
+ Height [480]
+ }
+ WindowState "AAAA/wAAAAD9AAAAAgAAAAAAAAC9AAAB+PwCAAAAA/sAAAAWAEQAbwBjAGsAVwBpAGQAZwBlAHQAMwEAAAAxAAAB+AAAA"
+ "AAAAAAA+wAAABYARABvAGMAawBXAGkAZABnAGUAdAA0AAAAAAD/////AAAAAAAAAAD7AAAAUgBHAEwAVQBFADIAIAB0AHIAZQBlACAAYwBvAG0Ac"
+ "ABvAG4AZQBuAHQALwBHAEwAVQBFADIAIAB0AHIAZQBlACAAYwBvAG0AcABvAG4AZQBuAHQAAAAAAP////8AAABfAP///wAAAAEAAAAAAAAAAPwCA"
+ "AAAAfsAAABUAEcATABVAEUAMgA6AFAAcgBvAHAAZQByAHQAeQBJAG4AcwBwAGUAYwB0AG8AcgAvAFAAcgBvAHAAZQByAHQAeQAgAEkAbgBzAHAAZ"
+ "QBjAHQAbwByAAAAAAD/////AAAAJwD///8AAAeAAAADogAAAAEAAAACAAAAAQAAAAL8AAAAAQAAAAIAAAAP/////wAAAAAA/////wAAAAAAAAAA/"
+ "////wEAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/"
+ "////wEAAAB5/////wAAAAAAAAAA/////wEAAADa/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wEAAAFT/////wAAAAAAAAAA/"
+ "////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wEAAAMr/////wAAAAAAAAAA/"
+ "////wEAAANa/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA"
}
}
Created "Wed Nov 16 14:00:52 2016"
Creator "m87rich"
UpdateHistory "UpdateHistoryNever"
ModifiedByFormat "%<Auto>"
- LastModifiedBy "m87rich"
+ LastModifiedBy "Andy"
ModifiedDateFormat "%<Auto>"
- LastModifiedDate "Wed Nov 16 14:55:39 2016"
- RTWModifiedTimeStamp 401208787
- ModelVersionFormat "1.%<AutoIncrement:7>"
+ LastModifiedDate "Fri Nov 18 17:01:30 2016"
+ RTWModifiedTimeStamp 401389289
+ ModelVersionFormat "1.%<AutoIncrement:9>"
ConfigurationManager "none"
SampleTimeColors off
SampleTimeAnnotations off
@@ -75,6 +109,10 @@ Model {
WideLines off
ShowLineDimensions off
ShowPortDataTypes off
+ ShowEditTimeErrors on
+ ShowEditTimeWarnings on
+ ShowEditTimeAdvisorChecks off
+ ShowPortUnits off
ShowDesignRanges off
ShowLoopsOnError on
IgnoreBidirectionalLines off
@@ -83,8 +121,10 @@ Model {
ShowSignalResolutionIcons on
ShowViewerIcons on
SortedOrder off
+ VariantCondition off
ExecutionContextIcon off
ShowLinearizationAnnotations on
+ ShowVisualizeInsertedRTB on
ShowMarkup on
BlockNameDataTip off
BlockParametersDataTip off
@@ -92,6 +132,7 @@ Model {
ToolBar on
StatusBar on
BrowserShowLibraryLinks off
+ FunctionConnectors off
BrowserLookUnderMasks off
SimulationMode "normal"
PauseTimes "5"
@@ -108,10 +149,10 @@ Model {
TryForcingSFcnDF off
Object {
$PropName "DataLoggingOverride"
- $ObjectID 6
+ $ObjectID 7
$ClassName "Simulink.SimulationData.ModelLoggingInfo"
model_ "IMU_prototype"
- overrideMode_ [0U]
+ overrideMode_ [0.0]
Array {
Type "Cell"
Dimension 1
@@ -125,27 +166,6 @@ Model {
PropName "logAsSpecifiedByModelsSSIDs_"
}
}
- RecordCoverage off
- CovPath "/"
- CovSaveName "covdata"
- CovMetricSettings "dw"
- CovNameIncrementing off
- CovHtmlReporting on
- CovForceBlockReductionOff on
- CovEnableCumulative on
- covSaveCumulativeToWorkspaceVar on
- CovSaveSingleToWorkspaceVar on
- CovCumulativeVarName "covCumulativeData"
- CovCumulativeReport off
- CovReportOnPause on
- CovModelRefEnable "Off"
- CovExternalEMLEnable off
- CovSFcnEnable on
- CovBoundaryAbsTol 0.000010
- CovBoundaryRelTol 0.010000
- CovUseTimeInterval off
- CovStartTime 0
- CovStopTime 0
ExtModeBatchMode off
ExtModeEnableFloating on
ExtModeTrigType "manual"
@@ -173,14 +193,18 @@ Model {
Type "Handle"
Dimension 1
Simulink.ConfigSet {
- $ObjectID 7
- Version "1.15.0"
+ $ObjectID 8
+ Version "1.16.5"
+ DisabledProps []
+ Description ""
Array {
Type "Handle"
- Dimension 8
+ Dimension 9
Simulink.SolverCC {
- $ObjectID 8
- Version "1.15.0"
+ $ObjectID 9
+ Version "1.16.5"
+ DisabledProps []
+ Description ""
StartTime "0.0"
StopTime "1"
AbsTol "auto"
@@ -197,7 +221,7 @@ Model {
MinStep "auto"
MaxConsecutiveMinStep "1"
RelTol "1e-3"
- SolverMode "Auto"
+ EnableMultiTasking on
EnableConcurrentExecution off
ConcurrentTasks off
Solver "ode45"
@@ -207,15 +231,20 @@ Model {
ZeroCrossControl "UseLocalSettings"
ZeroCrossAlgorithm "Nonadaptive"
AlgebraicLoopSolver "TrustRegion"
+ SolverInfoToggleStatus off
+ IsAutoAppliedInSIP off
SolverResetMethod "Fast"
PositivePriorityOrder off
AutoInsertRateTranBlk off
SampleTimeConstraint "Unconstrained"
InsertRTBMode "Whenever possible"
+ SampleTimeProperty []
}
Simulink.DataIOCC {
- $ObjectID 9
- Version "1.15.0"
+ $ObjectID 10
+ Version "1.16.5"
+ DisabledProps []
+ Description ""
Decimation "1"
ExternalInput "[t, u]"
FinalStateName "xFinal"
@@ -234,6 +263,8 @@ Model {
DSMLogging on
InspectSignalLogs off
VisualizeSimOutput on
+ StreamToWorkspace off
+ StreamVariableName "streamout"
SaveTime on
ReturnWorkspaceOutputs off
StateSaveName "xout"
@@ -245,10 +276,13 @@ Model {
OutputTimes "[]"
ReturnWorkspaceOutputsName "out"
Refine "1"
+ LoggingToFile off
+ LoggingFileName "out.mat"
+ LoggingIntervals "[-inf, inf]"
}
Simulink.OptimizationCC {
- $ObjectID 10
- Version "1.15.0"
+ $ObjectID 11
+ Version "1.16.5"
Array {
Type "Cell"
Dimension 8
@@ -262,10 +296,11 @@ Model {
Cell "UseSpecifiedMinMax"
PropName "DisabledProps"
}
+ Description ""
BlockReduction on
BooleanDataType on
ConditionallyExecuteInputs on
- InlineParams off
+ DefaultParameterBehavior "Tunable"
UseDivisionForNetSlopeComputation "off"
UseFloatMulNetSlope off
DefaultUnderspecifiedDataType "double"
@@ -277,6 +312,7 @@ Model {
CachingGlobalReferences off
GlobalBufferReuse on
StrengthReduction off
+ AdvancedOptControl ""
ExpressionFolding on
BooleansAsBitfields off
BitfieldContainerType "uint_T"
@@ -296,7 +332,6 @@ Model {
NoFixptDivByZeroProtection off
EfficientFloat2IntCast off
EfficientMapNaN2IntZero on
- OptimizeModelRefInitCode off
LifeSpan "inf"
MaxStackSize "Inherit from target"
BufferReusableBoundary on
@@ -304,8 +339,15 @@ Model {
AccelVerboseBuild off
}
Simulink.DebuggingCC {
- $ObjectID 11
- Version "1.15.0"
+ $ObjectID 12
+ Version "1.16.5"
+ Array {
+ Type "Cell"
+ Dimension 1
+ Cell "UseOnlyExistingSharedCode"
+ PropName "DisabledProps"
+ }
+ Description ""
RTPrefix "error"
ConsistencyChecking "none"
ArrayBoundsChecking "none"
@@ -332,7 +374,6 @@ Model {
IgnoredZcDiagnostic "warning"
SolverPrmCheckMsg "none"
InheritedTsInSrcMsg "warning"
- DiscreteInheritContinuousMsg "warning"
MultiTaskDSMMsg "error"
MultiTaskCondExecSysMsg "error"
MultiTaskRateTransMsg "error"
@@ -354,17 +395,20 @@ Model {
UnnecessaryDatatypeConvMsg "none"
VectorMatrixConversionMsg "none"
InvalidFcnCallConnMsg "error"
- FcnCallInpInsideContextMsg "EnableAllAsError"
+ FcnCallInpInsideContextMsg "error"
SignalLabelMismatchMsg "none"
UnconnectedInputMsg "warning"
UnconnectedOutputMsg "warning"
UnconnectedLineMsg "warning"
+ UseOnlyExistingSharedCode "error"
SFcnCompatibilityMsg "none"
FrameProcessingCompatibilityMsg "error"
UniqueDataStoreMsg "none"
BusObjectLabelMismatch "warning"
RootOutportRequireBusObject "warning"
AssertControl "UseLocalSettings"
+ AllowSymbolicDim on
+ RowMajorDimensionSupport off
ModelReferenceIOMsg "none"
ModelReferenceMultiInstanceNormalModeStructChecksumCheck "error"
ModelReferenceVersionMismatchMessage "none"
@@ -380,21 +424,33 @@ Model {
StrictBusMsg "ErrorLevel1"
BusNameAdapt "WarnAndRepair"
NonBusSignalsTreatedAsBus "none"
+ SymbolicDimMinMaxWarning "warning"
+ LossOfSymbolicDimsSimulationWarning "warning"
+ LossOfSymbolicDimsCodeGenerationWarning "error"
BlockIODiagnostic "none"
SFUnusedDataAndEventsDiag "warning"
SFUnexpectedBacktrackingDiag "warning"
SFInvalidInputDataAccessInChartInitDiag "warning"
SFNoUnconditionalDefaultTransitionDiag "warning"
SFTransitionOutsideNaturalParentDiag "warning"
- SFUnconditionalTransitionShadowingDiag "warning"
+ SFUnreachableExecutionPathDiag "warning"
SFUndirectedBroadcastEventsDiag "warning"
SFTransitionActionBeforeConditionDiag "warning"
SFOutputUsedAsStateInMooreChartDiag "error"
+ SFTemporalDelaySmallerThanSampleTimeDiag "warning"
+ SFSelfTransitionDiag "warning"
+ SFExecutionAtInitializationDiag "none"
+ SFMachineParentedDataDiag "warning"
IntegerSaturationMsg "warning"
+ AllowedUnitSystems "all"
+ UnitsInconsistencyMsg "warning"
+ AllowAutomaticUnitConversions on
}
Simulink.HardwareCC {
- $ObjectID 12
- Version "1.15.0"
+ $ObjectID 13
+ Version "1.16.5"
+ DisabledProps []
+ Description ""
ProdBitPerChar 8
ProdBitPerShort 16
ProdBitPerInt 32
@@ -403,6 +459,8 @@ Model {
ProdBitPerFloat 32
ProdBitPerDouble 64
ProdBitPerPointer 32
+ ProdBitPerSizeT 32
+ ProdBitPerPtrDiffT 32
ProdLargestAtomicInteger "Char"
ProdLargestAtomicFloat "None"
ProdIntDivRoundTo "Undefined"
@@ -419,6 +477,8 @@ Model {
TargetBitPerFloat 32
TargetBitPerDouble 64
TargetBitPerPointer 32
+ TargetBitPerSizeT 32
+ TargetBitPerPtrDiffT 32
TargetLargestAtomicInteger "Char"
TargetLargestAtomicFloat "None"
TargetShiftRightIntArith on
@@ -431,26 +491,44 @@ Model {
TargetHWDeviceType "Specified"
TargetUnknown off
ProdEqTarget on
+ UseEmbeddedCoderFeatures on
+ UseSimulinkCoderFeatures on
}
Simulink.ModelReferenceCC {
- $ObjectID 13
- Version "1.15.0"
+ $ObjectID 14
+ Version "1.16.5"
+ DisabledProps []
+ Description ""
UpdateModelReferenceTargets "IfOutOfDateOrStructuralChange"
+ EnableRefExpFcnMdlSchedulingChecks on
CheckModelReferenceTargetMessage "error"
EnableParallelModelReferenceBuilds off
ParallelModelReferenceErrorOnInvalidPool on
ParallelModelReferenceMATLABWorkerInit "None"
ModelReferenceNumInstancesAllowed "Multi"
PropagateVarSize "Infer from blocks in model"
+ ModelDependencies ""
ModelReferencePassRootInputsByReference on
ModelReferenceMinAlgLoopOccurrences off
PropagateSignalLabelsOutOfModel off
SupportModelReferenceSimTargetCustomCode off
}
Simulink.SFSimCC {
- $ObjectID 14
- Version "1.15.0"
- SFSimOverflowDetection on
+ $ObjectID 15
+ Version "1.16.5"
+ DisabledProps []
+ Description ""
+ SimCustomSourceCode ""
+ SimCustomHeaderCode ""
+ SimCustomInitializer ""
+ SimCustomTerminator ""
+ SimReservedNameArray []
+ SimUserSources ""
+ SimUserIncludeDirs ""
+ SimUserLibraries ""
+ SimUserDefines ""
+ SimCustomCompilerFlags ""
+ SimCustomLinkerFlags ""
SFSimEcho on
SimCtrlC on
SimIntegrity on
@@ -458,11 +536,14 @@ Model {
SimParseCustomCode on
SimBuildMode "sf_incremental_build"
SimGenImportedTypeDefs off
+ ModelFunctionsGlobalVisibility "on"
+ CompileTimeRecursionLimit 50
+ EnableRuntimeRecursion on
}
Simulink.RTWCC {
$BackupClass "Simulink.RTWCC"
- $ObjectID 15
- Version "1.15.0"
+ $ObjectID 16
+ Version "1.16.5"
Array {
Type "Cell"
Dimension 16
@@ -485,6 +566,7 @@ Model {
PropName "DisabledProps"
}
SystemTargetFile "grt.tlc"
+ HardwareBoard "None"
TLCOptions ""
GenCodeOnly off
MakeCommand "make_rtw"
@@ -498,6 +580,7 @@ Model {
SaveLog off
RTWVerbose on
RetainRTWFile off
+ RTWBuildHooks []
ProfileTLC off
TLCDebug off
TLCCoverage off
@@ -509,10 +592,13 @@ Model {
CustomInclude ""
CustomSource ""
CustomLibrary ""
+ CustomDefine ""
+ CustomLAPACKCallback ""
CustomInitializer ""
CustomTerminator ""
Toolchain "Automatically locate an installed toolchain"
BuildConfiguration "Faster Builds"
+ CustomToolchainOptions []
IncludeHyperlinkInReport off
LaunchReport off
PortableWordSizes off
@@ -534,6 +620,7 @@ Model {
GenerateCodeReplacementReport off
GenerateMissedCodeReplacementReport off
RTWCompilerOptimization "off"
+ ObjectivePriorities []
RTWCustomCompilerOptimizations ""
CheckMdlBeforeBuild "Off"
SharedConstantsCachingThreshold 1024
@@ -541,11 +628,11 @@ Model {
Type "Handle"
Dimension 2
Simulink.CodeAppCC {
- $ObjectID 16
- Version "1.15.0"
+ $ObjectID 17
+ Version "1.16.5"
Array {
Type "Cell"
- Dimension 24
+ Dimension 26
Cell "IgnoreCustomStorageClasses"
Cell "ParameterTuningSideEffectCode"
Cell "IgnoreTestpoints"
@@ -570,8 +657,12 @@ Model {
Cell "CustomSymbolStrMacro"
Cell "CustomSymbolStrUtil"
Cell "ReqsInCode"
+ Cell "CustomSymbolStrModelFcn"
+ Cell "CustomUserTokenString"
PropName "DisabledProps"
}
+ Description ""
+ Comment ""
ForceParamTrailComments off
GenerateComments on
CommentStyle "Auto"
@@ -593,31 +684,39 @@ Model {
CustomSymbolStrType "$N$R$M_T"
CustomSymbolStrField "$N$M"
CustomSymbolStrFcn "$R$N$M$F"
+ CustomSymbolStrModelFcn "$R$N"
CustomSymbolStrFcnArg "rt$I$N$M"
CustomSymbolStrBlkIO "rtb_$N$M"
CustomSymbolStrTmpVar "$N$M"
CustomSymbolStrMacro "$R$N$M"
CustomSymbolStrUtil "$N$C"
+ CustomUserTokenString ""
+ CustomCommentsFcn ""
DefineNamingRule "None"
+ DefineNamingFcn ""
ParamNamingRule "None"
+ ParamNamingFcn ""
SignalNamingRule "None"
+ SignalNamingFcn ""
InsertBlockDesc off
InsertPolySpaceComments off
SimulinkBlockComments on
MATLABSourceComments off
EnableCustomComments off
+ InternalIdentifierFile ""
InternalIdentifier "Shortened"
InlinedPrmAccess "Literals"
ReqsInCode off
UseSimReservedNames off
+ ReservedNameArray []
}
Simulink.GRTTargetCC {
$BackupClass "Simulink.TargetCC"
- $ObjectID 17
- Version "1.15.0"
+ $ObjectID 18
+ Version "1.16.5"
Array {
Type "Cell"
- Dimension 13
+ Dimension 16
Cell "GeneratePreprocessorConditionals"
Cell "IncludeMdlTerminateFcn"
Cell "SuppressErrorStatus"
@@ -631,8 +730,12 @@ Model {
Cell "SupportAbsoluteTime"
Cell "SupportContinuousTime"
Cell "SupportNonInlinedSFcns"
+ Cell "ExistingSharedCode"
+ Cell "RemoveDisableFunc"
+ Cell "RemoveResetFunc"
PropName "DisabledProps"
}
+ Description ""
TargetFcnLib "ansi_tfl_table_tmw.mat"
TargetLibSuffix ""
TargetPreCompLibLocation ""
@@ -645,6 +748,7 @@ Model {
MultiwordLength 2048
GenerateFullHeader on
InferredTypesCompatibility off
+ ExistingSharedCode ""
GenerateSampleERTMain off
GenerateTestInterfaces off
ModelReferenceCompliant on
@@ -669,6 +773,8 @@ Model {
PurelyIntegerCode off
SupportContinuousTime on
SupportNonInlinedSFcns on
+ RemoveDisableFunc off
+ RemoveResetFunc off
SupportVariableSizeSignals off
ParenthesesLevel "Nominal"
CastingMode "Nominal"
@@ -676,9 +782,12 @@ Model {
ModelStepFunctionPrototypeControlCompliant off
CPPClassGenCompliant on
AutosarCompliant off
+ MDXCompliant off
GRTInterface off
GenerateAllocFcn off
+ UseToolchainInfoCompliant on
GenerateSharedConstants on
+ CoderGroups []
UseMalloc off
ExtMode off
ExtModeStaticAlloc off
@@ -686,6 +795,7 @@ Model {
ExtModeStaticAllocSize 1000000
ExtModeTransport 0
ExtModeMexFile "ext_comm"
+ ExtModeMexArgs ""
ExtModeIntrfLevel "Level1"
RTWCAPISignals off
RTWCAPIParams off
@@ -697,9 +807,49 @@ Model {
PropName "Components"
}
}
+ SlCovCC.ConfigComp {
+ $ObjectID 19
+ Version "1.16.5"
+ DisabledProps []
+ Description "Simulink Coverage Configuration Component"
+ Name "Simulink Coverage"
+ CovEnable off
+ CovScope "EntireSystem"
+ CovIncludeTopModel on
+ RecordCoverage off
+ CovPath "/"
+ CovSaveName "covdata"
+ CovCompData ""
+ CovMetricSettings "dw"
+ CovFilter ""
+ CovHTMLOptions ""
+ CovNameIncrementing off
+ CovHtmlReporting on
+ CovForceBlockReductionOff on
+ CovEnableCumulative on
+ CovSaveCumulativeToWorkspaceVar on
+ CovSaveSingleToWorkspaceVar on
+ CovCumulativeVarName "covCumulativeData"
+ CovCumulativeReport off
+ CovSaveOutputData on
+ CovOutputDir "slcov_output/$ModelName$"
+ CovDataFileName "$ModelName$_cvdata"
+ CovShowResultsExplorer on
+ CovReportOnPause on
+ CovModelRefEnable "off"
+ CovModelRefExcluded ""
+ CovExternalEMLEnable off
+ CovSFcnEnable on
+ CovBoundaryAbsTol 1e-05
+ CovBoundaryRelTol 0.01
+ CovUseTimeInterval off
+ CovStartTime 0
+ CovStopTime 0
+ }
PropName "Components"
}
Name "Configuration"
+ ExtraOptions ""
CurrentDlgPage "Solver"
ConfigPrmDlgPosition [ 228, 112, 1308, 752 ]
}
@@ -707,11 +857,11 @@ Model {
}
Simulink.ConfigSet {
$PropName "ActiveConfigurationSet"
- $ObjectID 7
+ $ObjectID 8
}
Object {
$PropName "DataTransfer"
- $ObjectID 18
+ $ObjectID 20
$ClassName "Simulink.GlobalDataTransfer"
DefaultTransitionBetweenSyncTasks "Ensure deterministic transfer (maximum delay)"
DefaultTransitionBetweenAsyncTasks "Ensure data integrity only"
@@ -754,7 +904,7 @@ Model {
MaskDefaults {
SelfModifiable "off"
IconFrame "on"
- IconOpaque "on"
+ IconOpaque "opaque"
RunInitForIconRedraw "off"
IconRotate "none"
PortRotate "default"
@@ -802,6 +952,7 @@ Model {
OutDataTypeStr "Inherit: auto"
LockScale off
BusOutputAsStruct off
+ Unit "inherit"
PortDimensions "-1"
VarSizeSig "Inherit"
SampleTime "-1"
@@ -819,11 +970,13 @@ Model {
OutDataTypeStr "Inherit: auto"
LockScale off
BusOutputAsStruct off
+ Unit "inherit"
PortDimensions "-1"
VarSizeSig "Inherit"
SampleTime "-1"
SignalType "auto"
SamplingMode "auto"
+ EnsureOutportIsVirtual off
SourceOfInitialOutputValue "Dialog"
OutputWhenDisabled "held"
InitialOutput "[]"
@@ -847,28 +1000,11 @@ Model {
FunctionName "system"
SFunctionModules "''"
PortCounts "[]"
- SFunctionDeploymentMode off
- EnableBusSupport off
}
Block {
BlockType Scope
- ModelBased off
- TickLabels "OneTimeTick"
- ZoomMode "on"
- Grid "on"
- ShowLegends off
- TimeRange "auto"
- YMin "-5"
- YMax "5"
- SaveToWorkspace off
- SaveName "ScopeData"
- DataFormat "Array"
- LimitDataPoints on
- MaxDataPoints "5000"
- Decimation "1"
- SampleInput off
- SampleTime "-1"
- ScrollMode off
+ DefaultConfigurationName "Simulink.scopes.TimeScopeBlockCfg"
+ Floating off
}
Block {
BlockType SubSystem
@@ -878,7 +1014,6 @@ Model {
TreatAsAtomicUnit off
MinAlgLoopOccurrences off
PropExecContextOutsideSubsystem off
- CheckFcnCallInpInsideContextMsg off
SystemSampleTime "-1"
RTWSystemCode "Auto"
RTWFcnNameOpts "Auto"
@@ -897,8 +1032,9 @@ Model {
Opaque off
MaskHideContents off
SFBlockType "NONE"
- Variant off
GeneratePreprocessorConditionals off
+ PropagateVariantConditions off
+ TreatAsGroupedWhenPropagatingVariantConditions on
ContentPreviewEnabled off
IsWebBlock off
}
@@ -928,8 +1064,8 @@ Model {
}
System {
Name "IMU_prototype"
- Location [750, 139, 1812, 842]
- Open on
+ Location [-8, -8, 1928, 1048]
+ Open off
ModelBrowserVisibility off
ModelBrowserWidth 200
ScreenColor "white"
@@ -940,7 +1076,7 @@ Model {
TiledPaperMargins [0.500000, 0.500000, 0.500000, 0.500000]
TiledPageScale 1
ShowPageBoundaries off
- ZoomFactor "100"
+ ZoomFactor "250"
ReportName "simulink-default.rpt"
SIDHighWatermark "33"
Block {
@@ -960,10 +1096,11 @@ Model {
Position [365, 81, 550, 174]
ZOrder 20
RequestExecContextInheritance off
+ Variant off
System {
Name "IMU"
- Location [750, 139, 1812, 842]
- Open off
+ Location [-8, -8, 1928, 1048]
+ Open on
ModelBrowserVisibility off
ModelBrowserWidth 200
ScreenColor "white"
@@ -974,10 +1111,10 @@ Model {
TiledPaperMargins [0.500000, 0.500000, 0.500000, 0.500000]
TiledPageScale 1
ShowPageBoundaries off
- ZoomFactor "100"
+ ZoomFactor "150"
Block {
BlockType Inport
- Name "dv"
+ Name "B_vo_dot"
SID "21"
Position [110, 173, 140, 187]
ZOrder 17
@@ -985,7 +1122,7 @@ Model {
}
Block {
BlockType Inport
- Name "v"
+ Name "B_vo"
SID "29"
Position [110, 208, 140, 222]
ZOrder 25
@@ -994,7 +1131,7 @@ Model {
}
Block {
BlockType Inport
- Name "Omega"
+ Name "B_Omega"
SID "30"
Position [110, 243, 140, 257]
ZOrder 26
@@ -1003,7 +1140,7 @@ Model {
}
Block {
BlockType Inport
- Name "g"
+ Name "B_Fg"
SID "31"
Position [110, 278, 140, 292]
ZOrder 27
@@ -1014,14 +1151,14 @@ Model {
BlockType Ground
Name "Ground"
SID "27"
- Position [500, 460, 520, 480]
+ Position [500, 365, 520, 385]
ZOrder 23
}
Block {
BlockType Ground
Name "Ground1"
SID "28"
- Position [500, 30, 520, 50]
+ Position [500, 120, 520, 140]
ZOrder 24
}
Block {
@@ -1037,6 +1174,7 @@ Model {
TreatAsAtomicUnit on
RequestExecContextInheritance off
SFBlockType "MATLAB Function"
+ Variant off
System {
Name "MATLAB Function"
Location [223, 338, 826, 833]
@@ -1052,10 +1190,10 @@ Model {
TiledPageScale 1
ShowPageBoundaries off
ZoomFactor "100"
- SIDHighWatermark "23"
+ SIDHighWatermark "26"
Block {
BlockType Inport
- Name "dv"
+ Name "B_vo_dot"
SID "1::1"
Position [20, 101, 40, 119]
ZOrder -1
@@ -1063,7 +1201,7 @@ Model {
}
Block {
BlockType Inport
- Name "v"
+ Name "B_vo"
SID "1::22"
Position [20, 136, 40, 154]
ZOrder 13
@@ -1072,7 +1210,7 @@ Model {
}
Block {
BlockType Inport
- Name "Omega"
+ Name "B_Omega"
SID "1::19"
Position [20, 171, 40, 189]
ZOrder 10
@@ -1081,7 +1219,7 @@ Model {
}
Block {
BlockType Inport
- Name "g"
+ Name "B_Fg"
SID "1::20"
Position [20, 206, 40, 224]
ZOrder 11
@@ -1100,23 +1238,25 @@ Model {
Block {
BlockType Demux
Name " Demux "
- SID "1::17"
+ SID "1::25"
Ports [1, 1]
Position [270, 230, 320, 270]
- ZOrder 8
+ ZOrder 16
Outputs "1"
}
Block {
BlockType S-Function
Name " SFunction "
- SID "1::16"
+ SID "1::24"
Tag "Stateflow S-Function IMU_prototype 2"
Ports [5, 3]
- Position [180, 105, 230, 225]
- ZOrder 7
+ Position [180, 100, 230, 220]
+ ZOrder 15
FunctionName "sf_sfun"
PortCounts "[5 3]"
- EnableBusSupport on
+ SFunctionDeploymentMode off
+ EnableBusSupport off
+ SFcnIsStateOwnerBlock off
Port {
PortNumber 2
Name "accel_reading"
@@ -1133,9 +1273,9 @@ Model {
Block {
BlockType Terminator
Name " Terminator "
- SID "1::18"
+ SID "1::26"
Position [460, 241, 480, 259]
- ZOrder 9
+ ZOrder 17
}
Block {
BlockType Outport
@@ -1155,35 +1295,35 @@ Model {
IconDisplay "Port number"
}
Line {
- ZOrder 43
- SrcBlock "dv"
+ ZOrder 52
+ SrcBlock "B_vo_dot"
SrcPort 1
DstBlock " SFunction "
DstPort 1
}
Line {
- ZOrder 44
- SrcBlock "v"
+ ZOrder 53
+ SrcBlock "B_vo"
SrcPort 1
DstBlock " SFunction "
DstPort 2
}
Line {
- ZOrder 45
- SrcBlock "Omega"
+ ZOrder 54
+ SrcBlock "B_Omega"
SrcPort 1
DstBlock " SFunction "
DstPort 3
}
Line {
- ZOrder 46
- SrcBlock "g"
+ ZOrder 55
+ SrcBlock "B_Fg"
SrcPort 1
DstBlock " SFunction "
DstPort 4
}
Line {
- ZOrder 47
+ ZOrder 56
SrcBlock "r_oc"
SrcPort 1
DstBlock " SFunction "
@@ -1191,7 +1331,7 @@ Model {
}
Line {
Name "accel_reading"
- ZOrder 48
+ ZOrder 57
Labels [0, 0]
SrcBlock " SFunction "
SrcPort 2
@@ -1200,7 +1340,7 @@ Model {
}
Line {
Name "gyro_reading"
- ZOrder 49
+ ZOrder 58
Labels [0, 0]
SrcBlock " SFunction "
SrcPort 3
@@ -1208,16 +1348,17 @@ Model {
DstPort 1
}
Line {
- ZOrder 50
+ ZOrder 59
SrcBlock " Demux "
SrcPort 1
DstBlock " Terminator "
DstPort 1
}
Line {
- ZOrder 51
+ ZOrder 60
SrcBlock " SFunction "
SrcPort 1
+ Points [20, 0]
DstBlock " Demux "
DstPort 1
}
@@ -1337,7 +1478,7 @@ Model {
BlockType Constant
Name "r_oc"
SID "32"
- Position [95, 307, 160, 333]
+ Position [30, 307, 95, 333]
ZOrder 28
Value "zeros(3,1)"
}
@@ -1462,28 +1603,28 @@ Model {
}
Line {
ZOrder 56
- SrcBlock "dv"
+ SrcBlock "B_vo_dot"
SrcPort 1
DstBlock "MATLAB Function"
DstPort 1
}
Line {
ZOrder 57
- SrcBlock "v"
+ SrcBlock "B_vo"
SrcPort 1
DstBlock "MATLAB Function"
DstPort 2
}
Line {
ZOrder 58
- SrcBlock "Omega"
+ SrcBlock "B_Omega"
SrcPort 1
DstBlock "MATLAB Function"
DstPort 3
}
Line {
ZOrder 59
- SrcBlock "g"
+ SrcBlock "B_Fg"
SrcPort 1
DstBlock "MATLAB Function"
DstPort 4
@@ -1504,24 +1645,13 @@ Model {
Ports [1]
Position [635, 134, 665, 166]
ZOrder 3
- Floating off
- Location [1, 55, 1921, 1029]
- Open off
+ ScopeSpecificationString "C++SS(StrPVP('Location','[1, 55, 1921, 1029]'),StrPVP('Open','off'),MxPVP('AxesTitles'"
+ ",24,'struct(''axes1'',''%<SignalLabel>'')'),MxPVP('ScopeGraphics',28,'struct(''FigureColor'',''[0.5 0.5 0.5]'','"
+ "'AxesColor'',''[0 0 0]'',''AxesTickColor'',''[1 1 1]'',''LineColors'',''[1 1 0;1 0 1;0 1 1;1 0 0;0 1 0;0 0 1]'',"
+ "''LineStyles'',''-|-|-|-|-|-'',''LineWidths'',''[0.5 0.5 0.5 0.5 0.5 0.5]'',''MarkerStyles'',''none|none|none|no"
+ "ne|none|none'')'),StrPVP('LimitDataPoints','on'),StrPVP('DataFormat','Array'),StrPVP('Decimation','1'),StrPVP('B"
+ "lockParamSampleInput','off'))"
NumInputPorts "1"
- List {
- ListType AxesTitles
- axes1 "%<SignalLabel>"
- }
- List {
- ListType ScopeGraphics
- FigureColor "[0.5 0.5 0.5]"
- AxesColor "[0 0 0]"
- AxesTickColor "[1 1 1]"
- LineColors "[1 1 0;1 0 1;0 1 1;1 0 0;0 1 0;0 0 1]"
- LineStyles "-|-|-|-|-|-"
- LineWidths "[0.5 0.5 0.5 0.5 0.5 0.5]"
- MarkerStyles "none|none|none|none|none|none"
- }
}
Block {
BlockType Scope
@@ -1530,25 +1660,13 @@ Model {
Ports [1]
Position [590, 89, 620, 121]
ZOrder 13
- Floating off
- Location [188, 365, 512, 604]
- Open off
+ ScopeSpecificationString "C++SS(StrPVP('Location','[188, 365, 512, 604]'),StrPVP('Open','off'),MxPVP('AxesTitles"
+ "',24,'struct(''axes1'',''%<SignalLabel>'')'),MxPVP('ScopeGraphics',28,'struct(''FigureColor'',''[0.5 0.5 0.5]'',"
+ "''AxesColor'',''[0 0 0]'',''AxesTickColor'',''[1 1 1]'',''LineColors'',''[1 1 0;1 0 1;0 1 1;1 0 0;0 1 0;0 0 1]''"
+ ",''LineStyles'',''-|-|-|-|-|-'',''LineWidths'',''[0.5 0.5 0.5 0.5 0.5 0.5]'',''MarkerStyles'',''none|none|none|n"
+ "one|none|none'')'),StrPVP('SaveName','ScopeData1'),StrPVP('LimitDataPoints','on'),StrPVP('DataFormat','Array'),S"
+ "trPVP('Decimation','1'),StrPVP('BlockParamSampleInput','off'))"
NumInputPorts "1"
- List {
- ListType AxesTitles
- axes1 "%<SignalLabel>"
- }
- List {
- ListType ScopeGraphics
- FigureColor "[0.5 0.5 0.5]"
- AxesColor "[0 0 0]"
- AxesTickColor "[1 1 1]"
- LineColors "[1 1 0;1 0 1;0 1 1;1 0 0;0 1 0;0 0 1]"
- LineStyles "-|-|-|-|-|-"
- LineWidths "[0.5 0.5 0.5 0.5 0.5 0.5]"
- MarkerStyles "none|none|none|none|none|none"
- }
- SaveName "ScopeData1"
}
Line {
ZOrder 55
@@ -1603,7 +1721,7 @@ Model {
}
#Finite State Machines
#
-# Stateflow 80000005
+# Stateflow 80000010
#
#
Stateflow {
@@ -1612,32 +1730,32 @@ Stateflow {
name "IMU_prototype"
created "16-Nov-2016 14:11:28"
isLibrary 0
+ sfVersion 80000010
firstTarget 14
- sfVersion 80000005
}
chart {
id 2
+ machine 1
name "IMU/MATLAB Function"
windowPosition [422 539.941 189 413]
viewLimits [0 156.75 0 153.75]
screen [1 1 3600 1200 1.180555555555556]
treeNode [0 3 0 0]
- firstTransition 12
- firstJunction 11
viewObj 2
visible 1
- machine 1
subviewS {
}
ssIdHighWaterMark 10
decomposition CLUSTER_CHART
type EML_CHART
- firstData 4
chartFileNumber 2
disableImplicitCasting 1
eml {
name "fcn"
}
+ firstData 4
+ firstTransition 12
+ firstJunction 11
}
state {
id 3
@@ -1653,17 +1771,16 @@ Stateflow {
decomposition CLUSTER_STATE
eml {
isEML 1
- script "function [accel_reading,gyro_reading] = fcn(dv,v,Omega,g,r_oc)\n%#codegen\n\na = dv + cross(Omega"
- ",v) ; % body frame acceleration \n\naccel_reading = a - g ; % accelerometer reading (ideal)\n\ngyro_reading = Om"
- "ega ; % gyroscope reading (ideal) \n\nend\n\n"
+ script "function [accel_reading,gyro_reading] = fcn(B_vo_dot, B_vo, B_Omega, B_Fg, r_oc)\n%#codegen\n\na "
+ "= B_vo_dot + cross(B_Omega,B_vo) ; % body frame acceleration \n\naccel_reading = a - B_Fg ; % accelerometer read"
+ "ing (ideal)\n\ngyro_reading = B_Omega ; % gyroscope reading (ideal) \n\nend\n\n"
editorLayout "100 M4x1[10 5 700 500]"
}
}
data {
id 4
ssIdNumber 4
- name "dv"
- linkNode [2 0 5]
+ name "B_vo_dot"
scope INPUT_DATA
machine 1
props {
@@ -1675,14 +1792,17 @@ Stateflow {
primitive SF_DOUBLE_TYPE
}
complexity SF_COMPLEX_INHERITED
+ unit {
+ name "inherit"
+ }
}
dataType "Inherit: Same as Simulink"
+ linkNode [2 0 5]
}
data {
id 5
ssIdNumber 9
- name "v"
- linkNode [2 4 6]
+ name "B_vo"
scope INPUT_DATA
machine 1
props {
@@ -1697,14 +1817,17 @@ Stateflow {
}
complexity SF_COMPLEX_INHERITED
frame SF_FRAME_INHERITED
+ unit {
+ name "inherit"
+ }
}
dataType "Inherit: Same as Simulink"
+ linkNode [2 4 6]
}
data {
id 6
ssIdNumber 5
name "accel_reading"
- linkNode [2 5 7]
scope OUTPUT_DATA
machine 1
props {
@@ -1717,14 +1840,17 @@ Stateflow {
}
complexity SF_COMPLEX_INHERITED
frame SF_FRAME_NO
+ unit {
+ name "inherit"
+ }
}
dataType "Inherit: Same as Simulink"
+ linkNode [2 5 7]
}
data {
id 7
ssIdNumber 6
- name "Omega"
- linkNode [2 6 8]
+ name "B_Omega"
scope INPUT_DATA
machine 1
props {
@@ -1739,14 +1865,17 @@ Stateflow {
}
complexity SF_COMPLEX_INHERITED
frame SF_FRAME_INHERITED
+ unit {
+ name "inherit"
+ }
}
dataType "Inherit: Same as Simulink"
+ linkNode [2 6 8]
}
data {
id 8
ssIdNumber 7
- name "g"
- linkNode [2 7 9]
+ name "B_Fg"
scope INPUT_DATA
machine 1
props {
@@ -1761,14 +1890,17 @@ Stateflow {
}
complexity SF_COMPLEX_INHERITED
frame SF_FRAME_INHERITED
+ unit {
+ name "inherit"
+ }
}
dataType "Inherit: Same as Simulink"
+ linkNode [2 7 9]
}
data {
id 9
ssIdNumber 8
name "gyro_reading"
- linkNode [2 8 10]
scope OUTPUT_DATA
machine 1
props {
@@ -1783,14 +1915,17 @@ Stateflow {
}
complexity SF_COMPLEX_INHERITED
frame SF_FRAME_NO
+ unit {
+ name "inherit"
+ }
}
dataType "Inherit: Same as Simulink"
+ linkNode [2 8 10]
}
data {
id 10
ssIdNumber 10
name "r_oc"
- linkNode [2 9 0]
scope INPUT_DATA
machine 1
props {
@@ -1805,17 +1940,21 @@ Stateflow {
}
complexity SF_COMPLEX_INHERITED
frame SF_FRAME_INHERITED
+ unit {
+ name "inherit"
+ }
}
dataType "Inherit: Same as Simulink"
+ linkNode [2 9 0]
}
junction {
id 11
position [23.5747 49.5747 7]
chart 2
- linkNode [2 0 0]
subviewer 2
ssIdNumber 3
type CONNECTIVE_JUNCTION
+ linkNode [2 0 0]
}
transition {
id 12
@@ -1831,7 +1970,6 @@ Stateflow {
}
midPoint [23.5747 24.9468]
chart 2
- linkNode [2 0 0]
dataLimits [21.175 25.975 14.625 42.575]
subviewer 2
drawStyle SMART
@@ -1840,18 +1978,19 @@ Stateflow {
}
executionOrder 1
ssIdNumber 2
+ linkNode [2 0 0]
}
instance {
id 13
- name "IMU/MATLAB Function"
machine 1
+ name "IMU/MATLAB Function"
chart 2
}
target {
id 14
+ machine 1
name "sfun"
description "Default Simulink S-Function Target."
- machine 1
linkNode [1 0 0]
}
}
diff --git a/controls/model/Quadcopter_Model_R2016_A.slx b/controls/model/Quadcopter_Model_R2016_A.slx
index ba27b2ffc033c00f52f0c6e36bf5f5103a5a0cc8..e56ae611672d6f2cf70f76ef4d71b90fd7275d25 100644
Binary files a/controls/model/Quadcopter_Model_R2016_A.slx and b/controls/model/Quadcopter_Model_R2016_A.slx differ
diff --git a/controls/model/Quadcopter_Model_R2016_B.slx b/controls/model/Quadcopter_Model_R2016_B.slx
index c7ee0501767fe470aaab62b89642b7db668dcc78..4812672f099ed6c33607593fffb21a57fe1099b1 100644
Binary files a/controls/model/Quadcopter_Model_R2016_B.slx and b/controls/model/Quadcopter_Model_R2016_B.slx differ
diff --git a/groundStation/Makefile b/groundStation/Makefile
index 9123a2455fe5743716377865f398de713d0cef6e..50c78782e80cb912a6eb2f42906b7c363e774a06 100644
--- a/groundStation/Makefile
+++ b/groundStation/Makefile
@@ -3,8 +3,8 @@
# Generic Variables
GCC=gcc
GXX=g++
-CFLAGS= -Wall -Wpedantic -Wextra -Werror -std=c99 -g -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-unused-but-set-variable
-CXXFLAGS= -Wall -Wpedantic -Wextra -Werror -Wno-reorder -Wno-unused-variable -std=c++0x -g
+CFLAGS= -Wall -pedantic -Wextra -Werror -std=gnu99 -g -Wno-unused-parameter -Wno-unused-variable -Wno-unused-function -Wno-unused-but-set-variable
+CXXFLAGS= -Wall -pedantic -Wextra -Werror -Wno-reorder -Wno-unused-variable -std=c++0x -g
INCLUDES = $(foreach dir, $(INCDIR), -I$(dir))
INCDIR=inc src/vrpn src/vrpn/quat src/vrpn/build $(BESRCDIR) $(CLISRCDIR) $(FESRCDIR)
LIBS= -lpthread -lbluetooth -lvrpn -lquat -Lsrc/vrpn/build -Lsrc/vrpn/build/quat
diff --git a/groundStation/README.md b/groundStation/README.md
index 65413c06e55bfe543adade1f58ad1c3341c3f221..a54b1f43611542c3792549e51f1509bc187a5428 100644
--- a/groundStation/README.md
+++ b/groundStation/README.md
@@ -20,3 +20,44 @@ If you wish to change the way the backend communicates to the quad and vice vers
This provides a list of environment variables which you can set and use for your computer or time of use.
Because the backend must be ran with sudo privledges, you will need to preserve the env. vars. with sudo rights.
Hence the "-E" flag.
+
+## Modifying
+See MODIFYING for the software architecture/organization and how to add new functionality.
+
+## Using
+First, the backend daemon must be running. Run the backend with ./BackEnd. Note
+the environment variables in config.h, especially the backend socket path. The backend
+requires root for bluetooth, but can run as a normal user with TCP, as long as the
+socket path is writable by the user.
+
+Once the backend is running, various CLI tools can be used to view the state of the
+quad and send commands. Each of these tools is given as the first argument
+to the CLI program, for example, to monitor the quad, use `cli monitor`. Note that
+the backend socket environment variable must be set to the same value as it
+was for the backend. The CLI program also supports busybox-style symbolic links.
+For example, if there is a symlink named `monitor` that points to the `cli` binary,
+running the `monitor` program will effectively run `cli monitor`.
+
+The names of the binaries is subject to change.
+
+### Example
+In one terminal or screen, run the backend:
+
+`UCART_SOCKET=./ucart.socket ./BackEnd`
+
+This will activate the quad and the backend, and the backend will be available for
+connections from the frontend tools. One useful tool is the monitor. In another
+terminal window, run the monitor forever:
+
+`UCART_SOCKET=./ucart.socket ./cli monitor -f`
+
+This will begin a periodic monitoring that updates 10 times per second.
+
+Finally, in a third window, export the socket path:
+
+`export UCART_SOCKET=./ucart.socket`
+
+and then run any other tools to modify the quad, for example modifying PID constants:
+
+`./cli setpid --pitch -p 1.000`
+
diff --git a/groundStation/src/backend/backend.c b/groundStation/src/backend/backend.c
index 6cb684e0bb3a9e97f4802ba449fef244e236f44a..8b523c2749b0b9c929242b74af45c912a1cfa3d0 100644
--- a/groundStation/src/backend/backend.c
+++ b/groundStation/src/backend/backend.c
@@ -40,6 +40,9 @@
#define CMD_MAX_LENGTH 1024
#define MAX_HASH_SIZE 50
+/* Backend-internal command magics */
+#define TD_MAGIC "TRACKERDATA"
+
// function prototypes
void readAndPrint(void);
void sendVrpnPacket(struct ucart_vrpn_TrackerData *);
@@ -267,6 +270,7 @@ int main(int argc, char **argv)
}
}
} else if (get_client_index(fd) > -1) {
+ /* It is a socket to a frontend */
client_recv(fd);
}
}
@@ -625,7 +629,40 @@ static void client_recv(int fd) {
printf("Client(%d) : '%s'\n",fd, buffer);
unsigned char * packet;
if(formatCommand(buffer, &packet) == -1) {
- printf("Could not recognize command '%s'\n", buffer);
+ /* buffer was not a quad command, handling internally to
+ * backend instead of forwarding to quad
+ */
+ if (strncmp(buffer, TD_MAGIC, strlen(TD_MAGIC)) == 0) {
+ /* Request for tracker data */
+ struct ucart_vrpn_TrackerData td;
+ if (tracker == NULL) {
+ char * dummy = TD_MAGIC " 1.0 2.0 3.0 4.0 5.0 6.0\n";
+ write(fd, dummy, strlen(dummy));
+ }else if (ucart_vrpn_tracker_getData(tracker, &td)) {
+ write(fd, TD_MAGIC " ERROR\n", strlen(TD_MAGIC " ERROR\n"));
+ } else {
+ /* more than sufficient buffer */
+ char buffer[2048];
+ /* Map VRPN XYZ to Height Lat Long (right now it's
+ * a guess). Format is Height Lat Long P R Y */
+ if (snprintf(buffer,
+ 2048,
+ TD_MAGIC " %lf %lf %lf %lf %lf %lf\n",
+ td.z,
+ td.y,
+ td.x,
+ td.pitch,
+ td.roll,
+ td.yaw) >= 2048) {
+
+ /* Output longer than buffer */
+ warnx("Increase format buffer size, output was too long!");
+ write(fd, TD_MAGIC " ERROR\n", strlen(TD_MAGIC " ERROR\n"));
+ }
+ write(fd, buffer, strlen(buffer));
+ }
+ }
+
} else {
if(clientAddPendResponses(fd, packet) == -1) {
warnx("Ran out of room! Consider increasing CLIENT_MAX_PENDING_RESPONSES!");
diff --git a/groundStation/src/cli/cli.h b/groundStation/src/cli/cli.h
index 2951fd8d4c648038ab5fb94f7d261ad6e73ecfba..f4c2fe3f4783b9b4a4dd1e3482cdf3034cbaf269 100644
--- a/groundStation/src/cli/cli.h
+++ b/groundStation/src/cli/cli.h
@@ -2,29 +2,29 @@
#define __CLI_H
#include "cli_monitor.h"
-// #include "cli_setpid.h"
+#include "cli_setpid.h"
#include "cli_getpid.h"
// #include "cli_getimu.h"
enum CommandNameIds{
CMD_MONITOR,
- CMD_SETPID,
CMD_GETPID,
+ CMD_SETPID,
CMD_GETIMU,
MAX_COMMANDS
};
typedef int (*cli_function_ptr)(struct backend_conn *, int, char **);
-static cli_function_ptr cli_functions[2] = {
+static cli_function_ptr cli_functions[] = {
&cli_monitor,
- &cli_getpid
- // &cli_setpid,
- // &cli_getimu
+ &cli_getpid,
+ &cli_setpid
+ //&cli_getimu
};
static char* commandNames[MAX_COMMANDS] = {
"monitor",
- "getPid",
- "setPid",
+ "getpid",
+ "setpid",
"getImu"
};
diff --git a/groundStation/src/cli/cli_getpid.c b/groundStation/src/cli/cli_getpid.c
index 55fadb4a3cfe37dad8b46d708d4b04ae16b2a2f0..bb887ca24242fb05f4a22710becf248cdb6f8f62 100644
--- a/groundStation/src/cli/cli_getpid.c
+++ b/groundStation/src/cli/cli_getpid.c
@@ -7,12 +7,20 @@
int cli_getpid(struct backend_conn * conn, int argc, char **argv) {
int c;
static int getRoll = 0, getPitch = 0, getYaw = 0, getAll = 0;
+ static int getRollV = 0, getPitchV = 0, getYawV = 0;
+ static int getHeight = 0, getLat = 0, getLong = 0;
struct frontend_pid_data pid_data;
static struct option long_options[] = {
/* These options don’t set a flag. We distinguish them by their indices. */
{"roll", no_argument, &getRoll, 1},
{"pitch", no_argument, &getPitch, 1},
{"yaw", no_argument, &getYaw, 1},
+ {"rollv", no_argument, &getYawV, 1},
+ {"pitchv", no_argument, &getYawV, 1},
+ {"yawv", no_argument, &getYawV, 1},
+ {"height", no_argument, &getHeight, 1},
+ {"lat", no_argument, &getLat, 1},
+ {"long", no_argument, &getLong, 1},
{0, 0, 0, 0}
};
@@ -34,33 +42,33 @@ int cli_getpid(struct backend_conn * conn, int argc, char **argv) {
int result;
if(getAll) {
- pid_data.pid = ROLL;
+ pid_data.controller = PID_ROLL;
if ((result = getValues(conn, &pid_data))) {
return result;
}
- pid_data.pid = PITCH;
+ pid_data.controller = PID_PITCH;
if ((result = getValues(conn, &pid_data))) {
return result;
}
- pid_data.pid = YAW;
+ pid_data.controller = PID_YAW;
if ((result = getValues(conn, &pid_data))) {
return result;
}
} else {
if(getPitch) {
- pid_data.pid = PITCH;
+ pid_data.controller = PID_PITCH;
if ((result = getValues(conn, &pid_data))) {
return result;
}
}
if(getRoll) {
- pid_data.pid = ROLL;
+ pid_data.controller = PID_ROLL;
if ((result = getValues(conn, &pid_data))) {
return result;
}
}
if(getYaw) {
- pid_data.pid = YAW;
+ pid_data.controller = PID_YAW;
if ((result = getValues(conn, &pid_data))) {
return result;
}
@@ -77,16 +85,16 @@ int getValues(struct backend_conn * conn, struct frontend_pid_data * pid_data) {
return 0;
- switch(pid_data->pid) {
- case PITCH :
+ switch(pid_data->controller) {
+ case PID_PITCH :
printf("Pitch Constants: P = %f\tI = %f\tD = %f\n",
pid_data->p, pid_data->i, pid_data->d);
break;
- case ROLL :
+ case PID_ROLL :
printf("Roll Constants: P = %f\tI = %f\tD = %f\n",
pid_data->p, pid_data->i, pid_data->d);
break;
- case YAW :
+ case PID_YAW :
printf("Yaw Constants: P = %f\tI = %f\tD = %f\n",
pid_data->p, pid_data->i, pid_data->d);
break;
@@ -94,4 +102,4 @@ int getValues(struct backend_conn * conn, struct frontend_pid_data * pid_data) {
break;
}
return 0;
-}
\ No newline at end of file
+}
diff --git a/groundStation/src/cli/cli_monitor.c b/groundStation/src/cli/cli_monitor.c
index 7ce0d3314e65609c5d016d0922ef577917a4879e..4494e65b08320fb4831a733ff83d2bc53e803ae0 100644
--- a/groundStation/src/cli/cli_monitor.c
+++ b/groundStation/src/cli/cli_monitor.c
@@ -5,49 +5,62 @@
#include <getopt.h>
#include <time.h>
#include <unistd.h>
+#include <err.h>
#include "cli_monitor.h"
-
-static void timespec_diff(struct timespec *start, struct timespec *result);
+#include "frontend_tracker.h"
int cli_monitor(struct backend_conn * conn, int argc, char **argv) {
int c, result;
- int timeFlag = 0;
+ int countFlag = 0;
+
+ int count, rate = 10;
+ int forever = 0;
- static struct timespec startTime;
- static struct timespec elapsedTime;
- static struct timespec lastChecked;
- static int nsecs, rate = 10;
- while ((c = getopt(argc, argv, "t:r:")) != -1) {
+ while ((c = getopt(argc, argv, "fc:r:")) != -1) {
switch(c) {
- case 't' :
- nsecs = atoi(optarg);
- timeFlag = 1;
+ case 'c' :
+ count = atoi(optarg);
+ countFlag = 1;
break;
case 'r' :
rate = atoi(optarg) + 1;
break;
+ case 'f' :
+ forever = 1;
+ break;
default :
break;
}
}
- if(timeFlag) {
- clock_gettime(CLOCK_REALTIME, &startTime);
- clock_gettime(CLOCK_REALTIME, &lastChecked);
- while((result = monitor(conn)) == 0) {
- timespec_diff(&startTime, &elapsedTime);
- if(elapsedTime.tv_sec > nsecs) {
- break;
+ if (forever) {
+ for (;;) {
+ struct timespec req;
+ if (rate == 1) {
+ req.tv_sec = 1;
+ req.tv_nsec = 0;
+ } else {
+ req.tv_sec = 0;
+ req.tv_nsec = 1000000000 / rate;
}
- while(1) {
- timespec_diff(&lastChecked, &elapsedTime);
- if(elapsedTime.tv_nsec >= (long) ((SECOND_IN_NANO * 2) / rate)) {
- clock_gettime(CLOCK_REALTIME, &lastChecked);
- break;
- }
+ nanosleep(&req, NULL);
+ monitor(conn);
+ }
+ } else if (countFlag) {
+ for (int i = 0; i < count; i++) {
+ result = monitor(conn);
+
+ struct timespec req;
+ if (rate == 1) {
+ req.tv_sec = 1;
+ req.tv_nsec = 0;
+ } else {
+ req.tv_sec = 0;
+ req.tv_nsec = 1000000000 / rate;
}
+ nanosleep(&req, NULL);
}
} else {
return monitor(conn);
@@ -57,29 +70,33 @@ int cli_monitor(struct backend_conn * conn, int argc, char **argv) {
}
int monitor(struct backend_conn * conn) {
- static char * line = "monitor\n";
- printf("monitoring\n");
- int size;
- if((size = ucart_backendWrite(conn, line)) < 0 ) {
- return 1;
+ /* Get tracker data */
+ struct frontend_tracker_data td;
+ if (frontend_track(conn, &td)) {
+ errx(1, "Error reading tracker data");
}
- //TODO : HANDLE RETURN DATA
+ /* TODO: Get PID constants and status */
+ /* It might be a good idea to only read the pid constants
+ * every few seconds, so count iterations and only do it if
+ * this is every (rate * 2 or 3) pass through the loop
+ */
+
+ /* Print stuff on screen */
+ /* Assuming a tab width of 8 columns */
+ printf("\033[2J");
+ printf("STATUS: NA\n");
+ printf("CTRLR :\tP\tR\tY\tP_V\tR_V\tY_V\tH\tLAT\tLON\n");
+ printf(" P :\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\n",
+ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ printf(" I :\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\n",
+ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ printf(" D :\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\n",
+ 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0);
+ printf("PosAtt:\tH\tLAT\tLON\tP\tR\tY\n");
+ printf(" :\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\t%6.3lf\n",
+ td.height, td.lateral, td.longitudinal,
+ td.pitch, td.roll, td.yaw);
return 0;
}
-
-static void timespec_diff(struct timespec *start, struct timespec *result)
-{
- struct timespec stop;
- clock_gettime(CLOCK_REALTIME, &stop);
- if ((stop.tv_nsec - start->tv_nsec) < 0) {
- result->tv_sec = stop.tv_sec - start->tv_sec - 1;
- result->tv_nsec = stop.tv_nsec - start->tv_nsec + 1000000000;
- } else {
- result->tv_sec = stop.tv_sec - start->tv_sec;
- result->tv_nsec = stop.tv_nsec - start->tv_nsec;
- }
-
- return;
-}
\ No newline at end of file
diff --git a/groundStation/src/cli/cli_setpid.h b/groundStation/src/cli/cli_setpid.h
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..87fb0a4f40e91ed704972bd17e4859991d91641b 100644
--- a/groundStation/src/cli/cli_setpid.h
+++ b/groundStation/src/cli/cli_setpid.h
@@ -0,0 +1,8 @@
+#ifndef _CLI_SETPID_H
+#define _CLI_SETPID_H
+
+#include "frontend_setpid.h"
+
+int cli_setpid(struct backend_conn * conn, int argc, char ** argv);
+
+#endif
diff --git a/groundStation/src/frontend/frontend_getpid.c b/groundStation/src/frontend/frontend_getpid.c
index 0b25ec270988a066ef8633187cb52ad13ed24c8c..fbde309c3169e4d2429f5c3cd06c7674709491a8 100644
--- a/groundStation/src/frontend/frontend_getpid.c
+++ b/groundStation/src/frontend/frontend_getpid.c
@@ -10,7 +10,7 @@
* Example:
*
* struct frontend_pid_data pid_data;
- * pid_data.pid = PITCH;
+ * pid_data.pid = PID_PITCH;
* if (frontend_getpid(conn, &pid_data)) {
* error
* } else {
@@ -23,14 +23,14 @@ int frontend_getpid(
struct backend_conn * conn, struct frontend_pid_data * pid_data) {
char line[100] = "";
- switch (pid_data->pid) {
- case PITCH :
+ switch (pid_data->controller) {
+ case PID_PITCH :
strncpy(line, "getpitchp\ngetpitchd\n", 20);
break;
- case ROLL :
+ case PID_ROLL :
strncpy(line, "getrollp\ngetrolld\n", 18);
break;
- case YAW :
+ case PID_YAW :
strncpy(line, "getyawp\ngetyawd\n", 17);
break;
default :
@@ -43,4 +43,4 @@ int frontend_getpid(
}
return 0;
-}
\ No newline at end of file
+}
diff --git a/groundStation/src/frontend/frontend_setpid.c b/groundStation/src/frontend/frontend_setpid.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a25d8e3c068ebcd8d121dac7469f86cc6d8a8c6
--- /dev/null
+++ b/groundStation/src/frontend/frontend_setpid.c
@@ -0,0 +1,65 @@
+#include <err.h>
+#include <stdio.h>
+
+#include "frontend_setpid.h"
+#include "pid_common.h"
+#include "frontend_common.h"
+
+int frontend_setpid(
+ struct backend_conn * conn,
+ struct frontend_pid_data * pid_data,
+ int mask)
+{
+ if (conn == NULL) {
+ return -1;
+ }
+
+ char * controller;
+ switch (pid_data->controller) {
+ case PID_PITCH:
+ controller = "pitch";
+ break;
+ case PID_ROLL:
+ controller = "roll";
+ break;
+ case PID_YAW:
+ controller = "yaw";
+ break;
+ /* What is the "throttle" pid constant? */
+ default:
+ warnx("Unsupported PID constant");
+ return -1;
+ }
+
+ char buffer[2048];
+ /* Set the P, I, and D */
+ if (mask & SET_P) {
+ if (snprintf(buffer, 2048,
+ "set%sp %f\n",
+ controller,
+ pid_data->p) >= 2048) {
+ errx(0, "Buffer to small to format!");
+ }
+ ucart_backendWrite(conn, buffer);
+ }
+ if (mask & SET_I) {
+ if (snprintf(buffer, 2048,
+ "set%si %f\n",
+ controller,
+ pid_data->i) >= 2048) {
+ errx(0, "Buffer to small to format!");
+ }
+ ucart_backendWrite(conn, buffer);
+ }
+ if (mask & SET_D) {
+ if (snprintf(buffer, 2048,
+ "set%sd %f\n",
+ controller,
+ pid_data->d) >= 2048) {
+ errx(0, "Buffer to small to format!");
+ }
+ ucart_backendWrite(conn, buffer);
+ }
+
+ return 0;
+}
diff --git a/groundStation/src/frontend/frontend_setpid.h b/groundStation/src/frontend/frontend_setpid.h
new file mode 100644
index 0000000000000000000000000000000000000000..f1deb5d3d91568939d5bd44ffab07f082a290233
--- /dev/null
+++ b/groundStation/src/frontend/frontend_setpid.h
@@ -0,0 +1,17 @@
+#ifndef _FRONTEND_SETPID_H
+#define _FRONTEND_SETPID_H
+
+#include "pid_common.h"
+#include "frontend_common.h"
+
+int frontend_setpid(
+ struct backend_conn * conn,
+ struct frontend_pid_data * pid_data,
+ int mask);
+
+#define SET_P 0x01
+#define SET_I 0x02
+#define SET_D 0x04
+#define SET_ALL (SET_P | SET_I | SET_D)
+
+#endif
diff --git a/groundStation/src/frontend/frontend_tracker.c b/groundStation/src/frontend/frontend_tracker.c
new file mode 100644
index 0000000000000000000000000000000000000000..94597b63c66d96c4d5197dd94edf138b38a956a2
--- /dev/null
+++ b/groundStation/src/frontend/frontend_tracker.c
@@ -0,0 +1,42 @@
+#include <err.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "frontend_tracker.h"
+
+#define MAGIC "TRACKERDATA"
+
+int frontend_track(
+ struct backend_conn * conn,
+ struct frontend_tracker_data * data)
+{
+ ucart_backendWrite(conn, MAGIC "\n");
+
+ char * line;
+ for (;;) {
+ line = ucart_backendGetline(conn);
+ if (line == NULL) {
+ warnx("Line not returned from backend");
+ return 1;
+ }
+
+ if (strncmp(line, MAGIC, strlen(MAGIC)) == 0) {
+ break;
+ }
+ }
+
+ if (strncmp(line, MAGIC " ERROR", strlen(MAGIC " ERROR")) == 0) {
+ warnx("Backend returned an error: %s", strstr(line, "ERROR"));
+ return 1;
+ }
+
+ /* Line format: Height Lat Long Pitch Roll Yaw */
+ sscanf(line, MAGIC " %lf %lf %lf %lf %lf %lf ",
+ &data->height,
+ &data->lateral,
+ &data->longitudinal,
+ &data->pitch,
+ &data->roll,
+ &data->yaw);
+ return 0;
+}
diff --git a/groundStation/src/frontend/frontend_tracker.h b/groundStation/src/frontend/frontend_tracker.h
new file mode 100644
index 0000000000000000000000000000000000000000..5fa82487cafb8650a4f990ef9fed0c4ea4154405
--- /dev/null
+++ b/groundStation/src/frontend/frontend_tracker.h
@@ -0,0 +1,27 @@
+#ifndef _FRONTEND_TRACKER_H
+#define _FRONTEND_TRACKER_H
+
+#include "frontend_common.h"
+
+/* Struct containing pos/att data */
+struct frontend_tracker_data {
+ double height;
+ double lateral;
+ double longitudinal;
+ double pitch;
+ double roll;
+ double yaw;
+};
+
+/* Get pos/att data from the tracking system
+ *
+ * conn: IN Connection to quad
+ * data: OUT Data is written to this struct
+ *
+ * Returns 0 on success, nonzero on error
+ *
+ */
+int frontend_track(struct backend_conn * conn,
+ struct frontend_tracker_data *data);
+
+#endif
diff --git a/groundStation/src/frontend/pid_common.h b/groundStation/src/frontend/pid_common.h
index c1dac6535d7f6a5f219da61bce7b7a17d247d963..efa24df4a2b018b1a3b353a109cd29a044647a13 100644
--- a/groundStation/src/frontend/pid_common.h
+++ b/groundStation/src/frontend/pid_common.h
@@ -1,15 +1,21 @@
#ifndef PID_COMMON_H
#define PID_COMMON_H
-enum frontend_pid {
- PITCH,
- ROLL,
- YAW,
- NUM_PIDS
+enum pid_controller {
+ PID_PITCH,
+ PID_ROLL,
+ PID_YAW,
+ PID_PITCH_VELOCITY,
+ PID_ROLL_VELOCITY,
+ PID_YAW_VELOCITY,
+ PID_HEIGHT, /* Z */
+ PID_LAT, /* X */
+ PID_LONG, /* Y */
+ PID_NUM_PIDS
};
struct frontend_pid_data {
- enum frontend_pid pid;
+ enum pid_controller controller;
float p;
float i;
diff --git a/website/.gitignore b/website/.gitignore
index 70355aacfc0edec357c54124801c4cfe64b377d6..e5d0254d0bd444bbc69f6ba4626b945b2bd724ab 100644
--- a/website/.gitignore
+++ b/website/.gitignore
@@ -1,117 +1,10 @@
-#### joe made this: http://goel.io/joe
+output/
+PASSWORD
+lib/python2.7/site-packages/
+pelicanconf.pyc
+*.pyc
+lib/
+bin/
+include/
+pip-selfcheck.json
-#####=== Jekyll ===#####
-
-_site/
-.sass-cache/
-
-#####=== Sass ===#####
-
-.sass-cache
-*.css.map
-
-#####=== OSX ===#####
-.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-# Thumbnails
-._*
-
-# Files that might appear on external disk
-.Spotlight-V100
-.Trashes
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
-
-#####=== Windows ===#####
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Windows Installer files
-*.cab
-*.msi
-*.msm
-*.msp
-
-# Windows shortcuts
-*.lnk
-
-#####=== Linux ===#####
-*~
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-#####=== JetBrains ===#####
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
-
-*.iml
-
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-
-# Bundler
-.bundle
-vendor
-
-Gemfile.lock
-PASSWORD
\ No newline at end of file
diff --git a/website/Gemfile b/website/Gemfile
deleted file mode 100644
index eceae0670b18004b824b60413608ce34f7b7547c..0000000000000000000000000000000000000000
--- a/website/Gemfile
+++ /dev/null
@@ -1,4 +0,0 @@
-# A sample Gemfile
-source "https://rubygems.org"
-
-gem "jekyll"
diff --git a/website/LICENSE b/website/LICENSE
deleted file mode 100644
index 9cecc1d4669ee8af2ca727a5d8cde10cd8b2d7cc..0000000000000000000000000000000000000000
--- a/website/LICENSE
+++ /dev/null
@@ -1,674 +0,0 @@
- GNU GENERAL PUBLIC LICENSE
- Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
- The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works. By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users. We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors. You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
- To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights. Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received. You must make sure that they, too, receive
-or can get the source code. And you must show them these terms so they
-know their rights.
-
- Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
- For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software. For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
- Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so. This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software. The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable. Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products. If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
- Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary. To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- TERMS AND CONDITIONS
-
- 0. Definitions.
-
- "This License" refers to version 3 of the GNU General Public License.
-
- "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
- "The Program" refers to any copyrightable work licensed under this
-License. Each licensee is addressed as "you". "Licensees" and
-"recipients" may be individuals or organizations.
-
- To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy. The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
- A "covered work" means either the unmodified Program or a work based
-on the Program.
-
- To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy. Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
- To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies. Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
- An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License. If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
- 1. Source Code.
-
- The "source code" for a work means the preferred form of the work
-for making modifications to it. "Object code" means any non-source
-form of a work.
-
- A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
- The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
- The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities. However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work. For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
- The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
- The Corresponding Source for a work in source code form is that
-same work.
-
- 2. Basic Permissions.
-
- All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met. This License explicitly affirms your unlimited
-permission to run the unmodified Program. The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work. This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
- You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force. You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright. Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
- Conveying under any other circumstances is permitted solely under
-the conditions stated below. Sublicensing is not allowed; section 10
-makes it unnecessary.
-
- 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
- No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
- When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
- 4. Conveying Verbatim Copies.
-
- You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
- You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
- 5. Conveying Modified Source Versions.
-
- You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
- a) The work must carry prominent notices stating that you modified
- it, and giving a relevant date.
-
- b) The work must carry prominent notices stating that it is
- released under this License and any conditions added under section
- 7. This requirement modifies the requirement in section 4 to
- "keep intact all notices".
-
- c) You must license the entire work, as a whole, under this
- License to anyone who comes into possession of a copy. This
- License will therefore apply, along with any applicable section 7
- additional terms, to the whole of the work, and all its parts,
- regardless of how they are packaged. This License gives no
- permission to license the work in any other way, but it does not
- invalidate such permission if you have separately received it.
-
- d) If the work has interactive user interfaces, each must display
- Appropriate Legal Notices; however, if the Program has interactive
- interfaces that do not display Appropriate Legal Notices, your
- work need not make them do so.
-
- A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit. Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
- 6. Conveying Non-Source Forms.
-
- You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
- a) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by the
- Corresponding Source fixed on a durable physical medium
- customarily used for software interchange.
-
- b) Convey the object code in, or embodied in, a physical product
- (including a physical distribution medium), accompanied by a
- written offer, valid for at least three years and valid for as
- long as you offer spare parts or customer support for that product
- model, to give anyone who possesses the object code either (1) a
- copy of the Corresponding Source for all the software in the
- product that is covered by this License, on a durable physical
- medium customarily used for software interchange, for a price no
- more than your reasonable cost of physically performing this
- conveying of source, or (2) access to copy the
- Corresponding Source from a network server at no charge.
-
- c) Convey individual copies of the object code with a copy of the
- written offer to provide the Corresponding Source. This
- alternative is allowed only occasionally and noncommercially, and
- only if you received the object code with such an offer, in accord
- with subsection 6b.
-
- d) Convey the object code by offering access from a designated
- place (gratis or for a charge), and offer equivalent access to the
- Corresponding Source in the same way through the same place at no
- further charge. You need not require recipients to copy the
- Corresponding Source along with the object code. If the place to
- copy the object code is a network server, the Corresponding Source
- may be on a different server (operated by you or a third party)
- that supports equivalent copying facilities, provided you maintain
- clear directions next to the object code saying where to find the
- Corresponding Source. Regardless of what server hosts the
- Corresponding Source, you remain obligated to ensure that it is
- available for as long as needed to satisfy these requirements.
-
- e) Convey the object code using peer-to-peer transmission, provided
- you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
- charge under subsection 6d.
-
- A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
- A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling. In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage. For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product. A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
- "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source. The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
- If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information. But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
- The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed. Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
- Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
- 7. Additional Terms.
-
- "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law. If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
- When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it. (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.) You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
- Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
- a) Disclaiming warranty or limiting liability differently from the
- terms of sections 15 and 16 of this License; or
-
- b) Requiring preservation of specified reasonable legal notices or
- author attributions in that material or in the Appropriate Legal
- Notices displayed by works containing it; or
-
- c) Prohibiting misrepresentation of the origin of that material, or
- requiring that modified versions of such material be marked in
- reasonable ways as different from the original version; or
-
- d) Limiting the use for publicity purposes of names of licensors or
- authors of the material; or
-
- e) Declining to grant rights under trademark law for use of some
- trade names, trademarks, or service marks; or
-
- f) Requiring indemnification of licensors and authors of that
- material by anyone who conveys the material (or modified versions of
- it) with contractual assumptions of liability to the recipient, for
- any liability that these contractual assumptions directly impose on
- those licensors and authors.
-
- All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10. If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term. If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
- If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
- Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
- 8. Termination.
-
- You may not propagate or modify a covered work except as expressly
-provided under this License. Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
- However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
- Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
- Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License. If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
- 9. Acceptance Not Required for Having Copies.
-
- You are not required to accept this License in order to receive or
-run a copy of the Program. Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance. However,
-nothing other than this License grants you permission to propagate or
-modify any covered work. These actions infringe copyright if you do
-not accept this License. Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
- 10. Automatic Licensing of Downstream Recipients.
-
- Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License. You are not responsible
-for enforcing compliance by third parties with this License.
-
- An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations. If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
- You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License. For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
- 11. Patents.
-
- A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based. The
-work thus licensed is called the contributor's "contributor version".
-
- A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version. For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
- Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
- In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement). To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
- If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients. "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
- If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
- A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License. You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
- Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
- 12. No Surrender of Others' Freedom.
-
- If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all. For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
- 13. Use with the GNU Affero General Public License.
-
- Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work. The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
- 14. Revised Versions of this License.
-
- The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
- Each version is given a distinguishing version number. If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation. If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
- If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
- Later license versions may give you additional or different
-permissions. However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
- 15. Disclaimer of Warranty.
-
- THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. Limitation of Liability.
-
- IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
- 17. Interpretation of Sections 15 and 16.
-
- If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- {one line to give the program's name and a brief idea of what it does.}
- Copyright (C) {year} {name of author}
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- {project} Copyright (C) {year} {fullname}
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/website/Makefile b/website/Makefile
index 9c45346d7f2588e7a3f5fa9f31d0e1c8be212db5..1989e92d92e7efe203fc2417ecbd3f10f56bf817 100644
--- a/website/Makefile
+++ b/website/Makefile
@@ -1,9 +1,16 @@
-.PHONY : build deploy
+.PHONY : build deploy clean
build:
- jekyll build
- chmod -R 755 _site/
+ scripts/build.sh
deploy:
make build
- ./deploy
\ No newline at end of file
+ scripts/deploy.sh
+
+clean:
+ rm -rf output/
+
+# Only use this on the iasteate linux computers
+setup:
+ scripts/setup_pelican.sh
+
diff --git a/website/README.md b/website/README.md
index ff4bcd9ddeb8fe8e189b63712217285d14afaab3..ee88e06ca4f9764e2c1ed8be5a628b0cbb200ad6 100644
--- a/website/README.md
+++ b/website/README.md
@@ -1,50 +1,39 @@
-# jekyll-theme-hackcss
+Contributing
+----
-[Dead simple CSS framework](http://hackcss.com/) now with Jekyll.
+## Setup Environment
-Mobile-ready, modern, stylish, simple.
+Before making any changes, setup your environment with:
-## Theme modes
-
-This theme comes in three modes, which could be configured in `_config.yml`.
-
-
-
-
-
-
-
-## Installation
-
-Clone this repo. Create your own website. Easy.
-
-## Configuration
-
-See [docs](https://github.com/wemake-services/jekyll-theme-hackcss/blob/master/docs.md).
+```
+make setup
+```
-## License
+This will setup Pelican, so that you can build and deploy the website.
+You should only have to run the above command once.
-GNU PGL 3. See [LICENSE](https://github.com/wemake-services/jekyll-theme-hackcss/blob/3cbe97b71a56a19eba386dd928e125b71e50c71e/LICENSE) for more information.
+## Making changes
-## Contributing
+To make changes to the website, keep the following in mind:
+- "Pages" go in `content/pages`. Pages are written in Markdown so use the .md
+ extension
+- Images go in `content/images`. An exmple of how to put an image in a page
+ can be seen in `content/pages/home.md`.
+- Files go in `content/files`. An example of how to put a file linke on a page
+ can be seen in `conent/pages/documents.md`.
-Create or edit a page in this directory. Use the `.md` extension.
+## Building the website
-When you are ready to build the site:
+To build the website:
```
make build
```
-If you want to run the site on localhost:
+## Deploying the website
-```
-bundle exec jekyll serve
-# http://localhost:4000
-```
-
-To deploy the website to our team url:
+To deploy the website to our domain `may1716.sd.ece.iastate.edu`:
```
make deploy
-```
\ No newline at end of file
+```
diff --git a/website/_config.yml b/website/_config.yml
deleted file mode 100644
index e80bb9349b20266c3a48c1fab0b2358d1f82aa9e..0000000000000000000000000000000000000000
--- a/website/_config.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-# Welcome to Jekyll!
-#
-# This config file is meant for settings that affect your whole blog, values
-# which you are expected to set up once and rarely need to edit after that.
-# For technical reasons, this file is *NOT* reloaded automatically when you use
-# 'jekyll serve'. If you change this file, please restart the server process.
-
-# Site settings
-title: MicroCART
-description: > # this means to ignore newlines until "baseurl:"
- A minimalistic theme for Jekyll, based on hack.css
-repository: https://git.ece.iastate.edu/danc/MicroCART_17-18.git
-baseurl: "" # the subpath of your site, e.g. /blog
-url: "http://may1716.sd.ece.iastate.edu/" # the base hostname & protocol for your site
-
-# Build settings
-markdown: kramdown
-
-# Sass settings
-sass:
- style: compressed
-
-# Theme settings
-theme_mode: standard # choices are: 'dark', 'standard', 'markdown'
-
-# Customizations
-your_name: Microcart F16 - S17 Team
-email: microcart_f2016@iastate.edu
-
-navigation:
- - text: Home
- url: /
- - text: Team Members
- url: /members.html
- - text: Documents
- url: /documents.html
- - text: Quadcopter
- url: /quadcopter.html
- - text: Ground Station
- url: /ground.html
- - text: Controls
- url: /controls.html
- - text: Jekyll Theme Docs
- url: /docs.html
-
-
-projects:
-
-social:
-
-exclude:
- - Gemfile
- - Gemfile.lock
- - vendor
- - Makefile
- - README.md
- - LICENSE
- - deploy
- - PASSWORD
\ No newline at end of file
diff --git a/website/_includes/footer.html b/website/_includes/footer.html
deleted file mode 100644
index 0d144057c9596f851899de355a93b34ba5d2a0a6..0000000000000000000000000000000000000000
--- a/website/_includes/footer.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<footer>
- <hr />
-
- <h3 class="footer-heading">{{ site.title }}</h3>
-
- <div class="grid t-hackcss-sm-reversed-grid">
-
- <div class="cell -5of12">
- <div class="contact-list">
- <p>
- {{ site.your_name }},
- <a href="mailto:{{ site.email }}">{{ site.email }}</a>
- </p>
-
- {% for social in site.social %}
- {% assign template = social.service|prepend:"icon-"|append:".html" %}
- <span class="t-hackcss-social">
- <i class="t-hackcss-icon">{% include {{ template }} %}</i>
- <a href="{{ social.link }}">{{ social.username }}</a>
- </span>
- {% endfor %}
- </div>
- </div>
-
- <div id="footer-spacer" class="cell -1of12"></div>
-
- <div class="cell -6of12">
- <p>{{ site.description }}</p>
- </div>
- </div>
-
-</footer>
diff --git a/website/_includes/github-ribbon.html b/website/_includes/github-ribbon.html
deleted file mode 100644
index 5303cfa110e1fb25c81ca423b9e5a6a6444bece6..0000000000000000000000000000000000000000
--- a/website/_includes/github-ribbon.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<a href="{{ site.repository }}" class="github-corner">
-
-{% if site.theme_mode != 'dark' %}
- <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#151513; color:#fff; position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg>
-{% else %}
- <svg width="80" height="80" viewBox="0 0 250 250" style="fill:#fff; color:#151513; position: absolute; top: 0; border: 0; right: 0;"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg>
-{% endif %}
-
-</a>
-
-<style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
diff --git a/website/_includes/head.html b/website/_includes/head.html
deleted file mode 100644
index 5597fed155d5648b51d71838b3248bb6df06765b..0000000000000000000000000000000000000000
--- a/website/_includes/head.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
-
- <link rel="stylesheet" href="http://hackcss.com/prism.css">
-
- <!-- Meta information -->
- <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
- <meta name="description"
- content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
- <link rel="canonical"
- href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}" />
-
- <!-- hack.css -->
- <link rel="stylesheet" href="https://npmcdn.com/hack/dist/hack.css" />
- {% if site.theme_mode == 'standard' %}
- <link rel="stylesheet" href="https://npmcdn.com/hack/dist/standard.css" />
- {% elsif site.theme_mode == 'dark' %}
- <link rel="stylesheet" href="https://npmcdn.com/hack/dist/dark.css" />
- {% endif %}
-
- <!-- Custom style -->
- <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}" />
-
- <!-- Feed -->
- <link rel="alternate" type="application/rss+xml" title="{{ site.title }}"
- href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
-
- <!-- Add seo with 'jekyll-seo' plugin! -->
-</head>
diff --git a/website/_includes/icon-github.html b/website/_includes/icon-github.html
deleted file mode 100644
index 6f8991fe2af34ea8a300197ebd8baad61ebdb6c1..0000000000000000000000000000000000000000
--- a/website/_includes/icon-github.html
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 16 16"><path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"></path></svg>
diff --git a/website/_includes/icon-twitter.html b/website/_includes/icon-twitter.html
deleted file mode 100644
index dcf660e7bb376738d0129a1f8e3e8acbc6ac2aca..0000000000000000000000000000000000000000
--- a/website/_includes/icon-twitter.html
+++ /dev/null
@@ -1 +0,0 @@
-<svg viewBox="0 0 16 16"><path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/></svg>
diff --git a/website/_includes/navigation.html b/website/_includes/navigation.html
deleted file mode 100644
index 0ec42d4ee051c3b64eba141d71cab80a1769ed4d..0000000000000000000000000000000000000000
--- a/website/_includes/navigation.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="t-hackcss-navigation">
- <h2>Menu</h2>
-
- <nav class="menu" role="menubar">
- {% assign url = page.url|remove:'index.html' %}
- {% for link in site.navigation %}
- <a class="menu-item {% if url == link.url %}active{% endif %}"
- role="menuitem" href="{{ link.url }}" title="{{ link.title }}">
- {{ link.text }} <div class="pull-right">»</div>
- </a>
- {% endfor %}
- </nav>
-
-</div>
diff --git a/website/_layouts/default.html b/website/_layouts/default.html
deleted file mode 100644
index 5573896c0fe460e9b4751fc608552ec3b5ca58e8..0000000000000000000000000000000000000000
--- a/website/_layouts/default.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-
- {% include head.html %}
-
-
- {% if site.theme_mode == 'markdown' %}
- <body class="hack">
- {% elsif site.theme_mode == 'standard' %}
- <body class="standard">
- {% elsif site.theme_mode == 'dark' %}
- <body class="hack dark">
- {% endif %}
-
- <div class="container">
- <div class="grid">
- <aside class="cell -3of12" role="navigation">
- {% include navigation.html %}
- </aside>
-
- <main class="cell -9of12">
- {{ content }}
- </main>
- </div>
-
- {% include footer.html %}
-
- </div>
- </body>
-
-</html>
diff --git a/website/_layouts/post.html b/website/_layouts/post.html
deleted file mode 100644
index 5d9023adb1fc4537f286f37ec812fe841f161a4d..0000000000000000000000000000000000000000
--- a/website/_layouts/post.html
+++ /dev/null
@@ -1,27 +0,0 @@
----
-layout: default
----
-<article class="post" itemscope itemtype="http://schema.org/BlogPosting">
-
- <header class="post-header">
- <h1 class="post-title" itemprop="name headline">{{ page.title }}</h1>
- <p class="post-meta">
- <time datetime="{{ page.date | date_to_xmlschema }}"
- itemprop="datePublished"
- class="media-heading">
- {{ page.date | date: "%b %-d, %Y" }}
- </time>
-
- {% if page.author %}
- <span itemprop="author" itemscope itemtype="http://schema.org/Person">
- <span itemprop="name">{{ page.author }}</span>
- </span>
- {% endif %}
- </p>
- </header>
-
- <div class="post-content" itemprop="articleBody">
- {{ content }}
- </div>
-
-</article>
diff --git a/website/_sass/_highlight.scss b/website/_sass/_highlight.scss
deleted file mode 100644
index 723e5a6e6c0c166f85cf28a01b638ca6c7a8a3e7..0000000000000000000000000000000000000000
--- a/website/_sass/_highlight.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file only deal with code highlighting
-
-code.highlighter-rouge {
- padding: 0;
- padding-top: 0.2em;
- padding-bottom: 0.2em;
- margin: 0;
- font-size: 85%;
- background-color: rgba(0,0,0,0.04);
- border-radius: 3px;
-}
diff --git a/website/_sass/_styles.scss b/website/_sass/_styles.scss
deleted file mode 100644
index 5fbc13df70c65577500be2ab72665120b46cd4d8..0000000000000000000000000000000000000000
--- a/website/_sass/_styles.scss
+++ /dev/null
@@ -1,74 +0,0 @@
-// This file contains custom (non hack.css) styles
-
-.t-hackcss { // Main prefix
-
- // navigation.html
-
- &-navigation {
- padding-right: $spacing-unit;
- }
-
- &-social {
- display: inline-block;
- }
-
- &-social + &-social {
- padding-left: $spacing-unit;
- }
-
- &-sm-reversed-grid.grid {
- @include media-query($on-palm) {
- flex-direction: column-reverse;
- }
- }
-
- &-icon {
- display: inline-block;
- vertical-align: middle;
- width: $icon-size;
- height: $icon-size;
-
- > svg {
- width: $icon-size;
- }
- }
-
- // examples.html
-
- &-media-shift {
- max-width: $image-size;
- }
-
- &-media-image {
- display: block;
- max-width: 100%;
- height: auto;
- }
-
- &-cards {
- flex-wrap: wrap;
- @include media-query($on-palm) {
- flex-wrap: nowrap;
- }
- }
-
- &-cards-cell {
- padding-bottom: $spacing-unit;
- padding-right: $spacing-unit;
- }
-
- &-cards-text {
- margin: 0
- }
-
- &-cards-image {
- display: block;
- max-width: 50%;
- height: auto;
- margin: 0 auto;
- }
-
- &-cards-link {
- text-align: center;
- }
-}
diff --git a/website/content/css/main.css b/website/content/css/main.css
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/website/files/DesignDocument1.docx.pdf b/website/content/files/DesignDocument1.docx.pdf
similarity index 100%
rename from website/files/DesignDocument1.docx.pdf
rename to website/content/files/DesignDocument1.docx.pdf
diff --git a/website/files/ProjectPlan1Template.docx.pdf b/website/content/files/ProjectPlan1Template.docx.pdf
similarity index 100%
rename from website/files/ProjectPlan1Template.docx.pdf
rename to website/content/files/ProjectPlan1Template.docx.pdf
diff --git a/website/content/files/weeklyReports/.gitkeep b/website/content/files/weeklyReports/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/website/files/may1716_microCART_report1.pdf b/website/content/files/weeklyReports/may1716_microCART_report1.pdf
similarity index 100%
rename from website/files/may1716_microCART_report1.pdf
rename to website/content/files/weeklyReports/may1716_microCART_report1.pdf
diff --git a/website/content/files/weeklyReports/may1716_microCART_report10.pdf b/website/content/files/weeklyReports/may1716_microCART_report10.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..518b1e5b0b371b2796dab624a8ec0f9ce97e6874
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report10.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report2.pdf b/website/content/files/weeklyReports/may1716_microCART_report2.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5fb2b2abc8e8fea92663c2357c70236ae2863f95
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report2.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report3.pdf b/website/content/files/weeklyReports/may1716_microCART_report3.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..d62dd1023c3c6e73d5447c3ffa62da54f41c677d
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report3.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report4.pdf b/website/content/files/weeklyReports/may1716_microCART_report4.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..c45192ec1eb38982060125e333098c086aa424a3
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report4.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report5.pdf b/website/content/files/weeklyReports/may1716_microCART_report5.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..952a546c65aa517e1f42126d89ad7b1e51777d8f
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report5.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report6.pdf b/website/content/files/weeklyReports/may1716_microCART_report6.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..da93d43e23bfc8b984e8e3b3f0c0b5b2a23612f8
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report6.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report7.pdf b/website/content/files/weeklyReports/may1716_microCART_report7.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..f1c6d99786d6be2c20ce1307dc91aefb0769bad4
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report7.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report8.pdf b/website/content/files/weeklyReports/may1716_microCART_report8.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..587b68193180bbc68fff1c431cadd8174bfd6a1f
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report8.pdf differ
diff --git a/website/content/files/weeklyReports/may1716_microCART_report9.pdf b/website/content/files/weeklyReports/may1716_microCART_report9.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..bb7b0878ec372bce5ea5e303af3104b846dd718f
Binary files /dev/null and b/website/content/files/weeklyReports/may1716_microCART_report9.pdf differ
diff --git a/website/content/images/GroupPicture.jpg b/website/content/images/GroupPicture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..07ed284a3fc606317ea1fa4ab6a3e5dc866abd91
Binary files /dev/null and b/website/content/images/GroupPicture.jpg differ
diff --git a/website/content/images/TaraMinaPicture.png b/website/content/images/TaraMinaPicture.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7321c7b6faac3e01f6bf5f6a0bbe922aa0ae1b9
Binary files /dev/null and b/website/content/images/TaraMinaPicture.png differ
diff --git a/website/images/dark.png b/website/content/images/dark.png
similarity index 100%
rename from website/images/dark.png
rename to website/content/images/dark.png
diff --git a/website/images/markdown.png b/website/content/images/markdown.png
similarity index 100%
rename from website/images/markdown.png
rename to website/content/images/markdown.png
diff --git a/website/images/pid_diagram.png b/website/content/images/pid_diagram.png
similarity index 100%
rename from website/images/pid_diagram.png
rename to website/content/images/pid_diagram.png
diff --git a/website/images/quad_pic.jpg b/website/content/images/quad_pic.jpg
similarity index 100%
rename from website/images/quad_pic.jpg
rename to website/content/images/quad_pic.jpg
diff --git a/website/content/images/quad_pic.png b/website/content/images/quad_pic.png
new file mode 100644
index 0000000000000000000000000000000000000000..afcefab8b62e6a5cb95fd12ca4b02971e4f4a210
Binary files /dev/null and b/website/content/images/quad_pic.png differ
diff --git a/website/images/standard.png b/website/content/images/standard.png
similarity index 100%
rename from website/images/standard.png
rename to website/content/images/standard.png
diff --git a/website/images/zyboBoard.png b/website/content/images/zyboBoard.png
similarity index 100%
rename from website/images/zyboBoard.png
rename to website/content/images/zyboBoard.png
diff --git a/website/images/zybo_pic.jpg b/website/content/images/zybo_pic.jpg
similarity index 100%
rename from website/images/zybo_pic.jpg
rename to website/content/images/zybo_pic.jpg
diff --git a/website/controls.md b/website/content/pages/controls.md
similarity index 88%
rename from website/controls.md
rename to website/content/pages/controls.md
index d630bbff780df769d255e49602dba95ecdae3784..88d5db9b704ea50bb0769f8c7955f8dca833b83a 100644
--- a/website/controls.md
+++ b/website/content/pages/controls.md
@@ -1,6 +1,6 @@
----
-layout: default
----
+Title: Controls
+sortorder: 015
+
# Controls
The quadcopter is stabilized with on-board PID controllers. These controllers
@@ -20,6 +20,6 @@ The model we are developing follows the methods developed by our advising
graduate student Matt Rich in his thesis [Model development, system
identification, and control of a quadrotor helicopter][1].
-<img src="images/pid_diagram.png" width="700">
+<img src="/images/pid_diagram.png" width="700">
-[1]: http://lib.dr.iastate.edu/etd/12770/
\ No newline at end of file
+[1]: http://lib.dr.iastate.edu/etd/12770/
diff --git a/website/content/pages/documents.md b/website/content/pages/documents.md
new file mode 100644
index 0000000000000000000000000000000000000000..fa60084a8a06c91bc7329ec80972bd4e85749973
--- /dev/null
+++ b/website/content/pages/documents.md
@@ -0,0 +1,36 @@
+Title: Documents
+date: 2016-11-21
+sortorder: 005
+
+## Project Plan
+
+[Project Plan 1](/files/ProjectPlan1Template.docx.pdf)
+
+## Design Document
+
+[Design Document 1](/files/DesignDocument1.docx.pdf)
+
+## Weekly Reports
+
+[Weekly Report 1](/files/weeklyReports/may1716_microCART_report1.pdf)
+
+[Weekly Report 2](/files/weeklyReports/may1716_microCART_report2.pdf)
+
+[Weekly Report 3](/files/weeklyReports/may1716_microCART_report3.pdf)
+
+[Weekly Report 4](/files/weeklyReports/may1716_microCART_report4.pdf)
+
+[Weekly Report 5](/files/weeklyReports/may1716_microCART_report5.pdf)
+
+[Weekly Report 6](/files/weeklyReports/may1716_microCART_report6.pdf)
+
+[Weekly Report 7](/files/weeklyReports/may1716_microCART_report7.pdf)
+
+[Weekly Report 8](/files/weeklyReports/may1716_microCART_report8.pdf)
+
+[Weekly Report 9](/files/weeklyReports/may1716_microCART_report9.pdf)
+
+[Weekly Report 10](/files/weeklyReports/may1716_microCART_report10.pdf)
+
+## Documentation
+<iframe src="https://drive.google.com/embeddedfolderview?id=0B7xOyPfCRH4DTlZyaHZCRjN1Wmc#list" width="100%" height="500" frameborder="0"></iframe>
diff --git a/website/content/pages/ground.md b/website/content/pages/ground.md
new file mode 100644
index 0000000000000000000000000000000000000000..9b734d0cb3b6590188f4aa2e6d3699a4ce85c5ca
--- /dev/null
+++ b/website/content/pages/ground.md
@@ -0,0 +1,7 @@
+Title: Ground Station
+sortorder: 020
+
+# Ground Station
+
+TODO
+Gotta get this done
diff --git a/website/index.md b/website/content/pages/home.md
similarity index 75%
rename from website/index.md
rename to website/content/pages/home.md
index 9643e114be8aa1e1170f35b4307cffb651f1c2fd..dca80adc01430c39651866301c5ca368a3265850 100644
--- a/website/index.md
+++ b/website/content/pages/home.md
@@ -1,12 +1,13 @@
----
-layout: default
----
-# MicroCART
-## Microcontroller Controlled Aerial Robot Team
+Title: MicroCART
+url:
+save_as: index.html
+date: 2016-11-19
+sortorder: 001
+## Microprocessor Controlled Aerial Robot Team
**Senior Design Group**: may1716
-<img align="right" src="images/quad_pic.jpg" width="40%">
+<img align="right" src="images/quad_pic.png" width="40%">
MicroCART is an ongoing senior design project focused on the
development of a quadcopter as a research platform for controls and
diff --git a/website/members.md b/website/content/pages/members.md
similarity index 78%
rename from website/members.md
rename to website/content/pages/members.md
index 83e528be174d77505701afb6bfc60d32440a7c0c..7ea7bd279a3042d9f5a2f444081db8047fc99edb 100644
--- a/website/members.md
+++ b/website/content/pages/members.md
@@ -1,7 +1,10 @@
----
-layout: default
----
-# Members
+Title: Team Members
+date: 2016-11-20
+sortorder: 010
+
+<image src="/images/GroupPicture.jpg" style="width: 100%; padding: 0; max-width: 600px">
+
+From left to right: Eric, Brendan, Kris, Andy, Jake, Joe, Tara, David
## David Wehr
**Team Leader**
diff --git a/website/content/pages/quad.md b/website/content/pages/quad.md
new file mode 100644
index 0000000000000000000000000000000000000000..9df032d87e793641cf95dc706d3946c4ad0db7d0
--- /dev/null
+++ b/website/content/pages/quad.md
@@ -0,0 +1,6 @@
+Title: Quadcopter Software
+sortorder: 025
+
+# Quadcopter
+
+Quad software things
diff --git a/website/css/main.scss b/website/css/main.scss
deleted file mode 100644
index f1ff7362d211e601ca53f63ed2bed2cc9878e21b..0000000000000000000000000000000000000000
--- a/website/css/main.scss
+++ /dev/null
@@ -1,38 +0,0 @@
----
-# Only the main Sass file needs front matter (the dashes are enough)
----
-@charset "utf-8";
-
-
-
-// Our variables
-$spacing-unit: 10px;
-$image-size: 50px;
-$icon-size: 15px;
-
-
-// Sizes
-$on-palm: 768px;
-
-
-
-// Use media queries like this:
-// @include media-query($on-palm) {
-// .wrapper {
-// padding-right: $spacing-unit / 2;
-// padding-left: $spacing-unit / 2;
-// }
-// }
-@mixin media-query($device) {
- @media screen and (max-width: $device) {
- @content;
- }
-}
-
-
-
-// Import partials from `sass_dir` (defaults to `_sass`)
-@import
- "styles",
- "highlight"
-;
diff --git a/website/deploy b/website/deploy
deleted file mode 100644
index a15fa0e47389c94b383c42fb3f8d582e5ae5e850..0000000000000000000000000000000000000000
--- a/website/deploy
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-HOST=may1716.sd.ece.iastate.edu
-USERNAME=may1716
-[ -e PASSWORD ] || echo "ERROR: File PASSWORD is missing.
-Create a file called PASSWORD, and put the sftp password in that file.
-No spaces. No newlines."
-[ -e PASSWORD ] || exit 1
-PASSWORD=$(cat PASSWORD)
-
-cd _site || exit 1
-
-lftp<<END_SCRIPT
-open sftp://$HOST
-user $USERNAME $PASSWORD
-cd www
-mirror -R
-exit
-END_SCRIPT
-
-echo "Website updated."
\ No newline at end of file
diff --git a/website/docs.md b/website/docs.md
deleted file mode 100644
index 5f2747bf27350ea8bc2bcd60f665adeb450adc83..0000000000000000000000000000000000000000
--- a/website/docs.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-layout: default
-permalink: docs
----
-
-# Docs
-
-## Configuration
-
-This theme can be configured by modifying the `_config.yml` file.
-
-### Theme settings
-
-This theme supports three different mode provided by `hack.css`:
-
-- `standard`
-- `markdown`
-- `dark`
-
-Set `theme_mode` to the desired value.
-
-### Available customizations
-
-- `your_name` and `email` strings to display them in different places on site
-- `navigation` is an array of `text` and `url` pairs to render the menu
-- `projects` is a setting that contains data for the `examples` page, every item must contain `name` and `link`, `image` and `description` are optional
-- `social` contains an array of three required params: `service` is used to include a service icon by the {% raw %}`{% include icon-{{ service }}.html %}`{% endraw %} command, `username` and `link` are quite obvious
diff --git a/website/documents.md b/website/documents.md
deleted file mode 100644
index d527c54c2d2c7cd4ac8dee3c4fa323ba23aa1ad5..0000000000000000000000000000000000000000
--- a/website/documents.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: default
-permalink: documents
----
-
-# Documents
-
-[Design Document 1](files/DesignDocument1.docx.pdf)
-
-[Project Plan 1](files/ProjectPlan1Template.docx.pdf)
-
-[Weekly Report 1](files/may1716_microCART_report1.pdf)
\ No newline at end of file
diff --git a/website/feed.xml b/website/feed.xml
deleted file mode 100644
index a6628bd842af95a7f423155dd95510941d3a78dc..0000000000000000000000000000000000000000
--- a/website/feed.xml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-layout: null
----
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
- <channel>
- <title>{{ site.title | xml_escape }}</title>
- <description>{{ site.description | xml_escape }}</description>
- <link>{{ site.url }}{{ site.baseurl }}/</link>
- <atom:link href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" rel="self" type="application/rss+xml"/>
- <pubDate>{{ site.time | date_to_rfc822 }}</pubDate>
- <lastBuildDate>{{ site.time | date_to_rfc822 }}</lastBuildDate>
- <generator>Jekyll v{{ jekyll.version }}</generator>
- {% for post in site.posts limit:10 %}
- <item>
- <title>{{ post.title | xml_escape }}</title>
- <description>{{ post.content | xml_escape }}</description>
- <pubDate>{{ post.date | date_to_rfc822 }}</pubDate>
- <link>{{ post.url | prepend: site.baseurl | prepend: site.url }}</link>
- <guid isPermaLink="true">{{ post.url | prepend: site.baseurl | prepend: site.url }}</guid>
- {% for tag in post.tags %}
- <category>{{ tag | xml_escape }}</category>
- {% endfor %}
- {% for cat in post.categories %}
- <category>{{ cat | xml_escape }}</category>
- {% endfor %}
- </item>
- {% endfor %}
- </channel>
-</rss>
diff --git a/website/ground.md b/website/ground.md
deleted file mode 100644
index 48c94d1f7207e5e584f964d2bc4868464554de92..0000000000000000000000000000000000000000
--- a/website/ground.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-layout: default
----
-
-# Ground station page
-
-## Important Stuff
-We have a ground station
-
-## Other things?
-Yeah, there's more
\ No newline at end of file
diff --git a/website/pelicanconf.py b/website/pelicanconf.py
new file mode 100644
index 0000000000000000000000000000000000000000..367a5554cd4c7dcb60396583f2f55003d01d1da2
--- /dev/null
+++ b/website/pelicanconf.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+from __future__ import unicode_literals
+
+AUTHOR = u'microcart'
+SITENAME = u'MicroCART'
+SITEURL = ''
+
+PATH = 'content'
+
+TIMEZONE = 'America/Chicago'
+
+DEFAULT_LANG = u'en'
+
+DEFAULT_DATE = 'fs'
+
+# Feed generation is usually not desired when developing
+FEED_ALL_ATOM = None
+CATEGORY_FEED_ATOM = None
+TRANSLATION_FEED_ATOM = None
+AUTHOR_FEED_ATOM = None
+AUTHOR_FEED_RSS = None
+
+# Blogroll
+# LINKS = (('Pelican', 'http://getpelican.com/'),
+# ('Python.org', 'http://python.org/'),
+# ('Jinja2', 'http://jinja.pocoo.org/'),
+# ('You can modify those links in your config file', '#'),)
+
+# Social widget
+# SOCIAL = (('You can add links in your config file', '#'),
+# ('Another social link', '#'),)
+
+DEFAULT_PAGINATION = False
+
+# Uncomment following line if you want document-relative URLs when developing
+#RELATIVE_URLS = True
+
+# Theme
+THEME = 'themes/notmyidea'
+
+# Static Content
+STATIC_PATHS = ['images', 'files']
+
+# Page Order
+PAGE_ORDER_BY = 'sortorder'
+
+# Temporary Ignore Files
+IGNORE_FILES = ['controls.md', 'ground.md', 'quad.md']
diff --git a/website/publishconf.py b/website/publishconf.py
new file mode 100644
index 0000000000000000000000000000000000000000..85ff8ef6981db9aaf809eeb6b971ea62c7555301
--- /dev/null
+++ b/website/publishconf.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*- #
+from __future__ import unicode_literals
+
+# This file is only used if you use `make publish` or
+# explicitly specify it as your config file.
+
+import os
+import sys
+sys.path.append(os.curdir)
+from pelicanconf import *
+
+SITEURL = ''
+RELATIVE_URLS = False
+
+FEED_ALL_ATOM = 'feeds/all.atom.xml'
+CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+
+DELETE_OUTPUT_DIRECTORY = True
+
+# Following items are often useful when publishing
+
+#DISQUS_SITENAME = ""
+#GOOGLE_ANALYTICS = ""
diff --git a/website/scripts/build.sh b/website/scripts/build.sh
new file mode 100644
index 0000000000000000000000000000000000000000..784ba4bea2faa5442f8311c97fa0fa174cbc5675
--- /dev/null
+++ b/website/scripts/build.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+source bin/activate
+pelican content
\ No newline at end of file
diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh
new file mode 100644
index 0000000000000000000000000000000000000000..19f1813c8dc4016ba814d709a3e144eafd932d79
--- /dev/null
+++ b/website/scripts/deploy.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+HOST=may1716.sd.ece.iastate.edu
+USERNAME=may1716
+
+if [ ! -e PASSWORD ]; then
+ echo "
+
+*****
+ERROR: File PASSWORD is missing.
+Create a file called PASSWORD in the website root directory, and put the sftp
+password in that file. No spaces. No newlines.
+(The SFTP password was given to us in an email. Just search 'sftp password' in
+your CyMail and it will probably be first result.)
+*****
+
+"
+ exit 1
+fi
+
+PASSWORD=$(cat PASSWORD)
+
+chmod -R 755 output || exit 1
+cd output || exit 1
+
+lftp<<END_SCRIPT
+set sftp:connect-program "ssh -a -x -o PubkeyAuthentication=false"
+open sftp://$HOST
+user $USERNAME $PASSWORD
+cd www
+mirror -R --delete-first
+exit
+END_SCRIPT
+
+echo "Website updated."
\ No newline at end of file
diff --git a/website/scripts/setup_pelican.sh b/website/scripts/setup_pelican.sh
new file mode 100644
index 0000000000000000000000000000000000000000..d0dac58674fae106b0feaf63bb036b057dcacce5
--- /dev/null
+++ b/website/scripts/setup_pelican.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+[ -d bin/ ] && rm -rf bin/ lib/ include/
+
+/remote/python/2.7.9/bin/virtualenv ./
+source bin/activate
+pip install pelican
+pip install Markdown
diff --git a/website/test.md b/website/test.md
deleted file mode 100644
index c9fa0025c63095eadb5563288875cd8dd7b0ecc8..0000000000000000000000000000000000000000
--- a/website/test.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-layout: default
----
-
-# This is a test page
-
-I want to see what a page looks like without any work.
-I literally added this with some dirt-simple md. See test.md
-in the root of the wobsite directory.
-
-Foo paragraph. Foo paragraph. Foo paragraph. Foo paragraph.
-Foo paragraph. Foo paragraph. Foo paragraph. Foo paragraph.
-Foo paragraph. Foo paragraph. Foo paragraph. Foo paragraph.
-Foo paragraph. Foo paragraph. Foo paragraph. Foo paragraph.
-
-# Notes on Navigation
-
-I had to edit _config.yml and add this page to Navigation to
-get it to show up on the left bar.
-
-## Foo heading
-
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-
-### Third heading
-
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
-Foo section. Foo section. Foo section. Foo section. Foo section.
diff --git a/website/themes/notmyidea/static/css/main.css b/website/themes/notmyidea/static/css/main.css
new file mode 100644
index 0000000000000000000000000000000000000000..ac849f99bf14080f11be7eb8f4b9ed698b0b38b4
--- /dev/null
+++ b/website/themes/notmyidea/static/css/main.css
@@ -0,0 +1,512 @@
+/*
+ Name: Smashing HTML5
+ Date: July 2009
+ Description: Sample layout for HTML5 and CSS3 goodness.
+ Version: 1.0
+ License: MIT <http://opensource.org/licenses/MIT>
+ Licensed by: Smashing Media GmbH <http://www.smashingmagazine.com/>
+ Original author: Enrique RamÃrez <http://enrique-ramirez.com/>
+*/
+
+/* Imports */
+@import url("reset.css");
+@import url("pygment.css");
+@import url("typogrify.css");
+@import url(https://fonts.googleapis.com/css?family=Yanone+Kaffeesatz&subset=latin);
+
+/***** Global *****/
+/* Body */
+body {
+ background: #F5F4EF;
+ color: #000305;
+ font-size: 87.5%; /* Base font size: 14px */
+ font-family: 'Trebuchet MS', Trebuchet, 'Lucida Sans Unicode', 'Lucida Grande', 'Lucida Sans', Arial, sans-serif;
+ line-height: 1.429;
+ text-align: left;
+ width: 90%;
+ display: inline-block;
+ max-width: 80em;
+}
+
+* {
+ margin: 0;
+ padding: 0;
+ /*! width: 100%; */
+}
+
+/* Headings */
+h1 {font-size: 2em }
+h2 {font-size: 1.571em} /* 22px */
+h3 {font-size: 1.429em} /* 20px */
+h4 {font-size: 1.286em} /* 18px */
+h5 {font-size: 1.143em} /* 16px */
+h6 {font-size: 1em} /* 14px */
+
+h1, h2, h3, h4, h5, h6 {
+ font-weight: 400;
+ line-height: 1.1;
+ margin-bottom: .2em;
+ font-family: 'Calibri', arial, serif;
+}
+
+h3, h4, h5, h6 { margin-top: .8em; }
+
+hr { border: 2px solid #EEEEEE; }
+
+/* Anchors */
+a {outline: 0;}
+a img {border: 0px; text-decoration: none;}
+a:link, a:visited {
+ color: #C74350;
+ /*! padding: 0 1px; */
+ text-decoration: underline;
+}
+a:hover, a:active {
+ background-color: #C74350;
+ color: #fff;
+ text-decoration: none;
+ text-shadow: 1px 1px 1px #333;
+}
+
+h1 a:hover {
+ background-color: inherit
+}
+
+/* Paragraphs */
+div.line-block,
+p { margin-top: 1em;
+ margin-bottom: 1em;}
+
+strong, b {font-weight: bold;}
+em, i {font-style: italic;}
+
+/* Lists */
+ul {
+ list-style: outside disc;
+ /*! margin: 0em 0 0 1.5em; */
+}
+
+ol {
+ list-style: outside decimal;
+ margin: 0em 0 0 1.5em;
+}
+
+li { margin-top: 0.5em;
+ margin-bottom: 1em; }
+
+.post-info {
+ float:right;
+ margin:10px;
+ padding:5px;
+}
+
+.post-info p{
+ margin-top: 1px;
+ margin-bottom: 1px;
+}
+
+.readmore { float: right }
+
+dl {margin: 0 0 1.5em 0;}
+dt {font-weight: bold;}
+dd {margin-left: 1.5em;}
+
+pre{background-color: rgb(238, 238, 238); padding: 10px; margin: 10px; overflow: auto;}
+
+/* Quotes */
+blockquote {
+ margin: 20px;
+ font-style: italic;
+}
+cite {}
+
+q {}
+
+div.note {
+ float: right;
+ margin: 5px;
+ font-size: 85%;
+ max-width: 300px;
+}
+
+/* Tables */
+table {margin: .5em auto 1.5em auto; width: 98%;}
+
+ /* Thead */
+ thead th {padding: .5em .4em; text-align: left;}
+ thead td {}
+
+ /* Tbody */
+ tbody td {padding: .5em .4em;}
+ tbody th {}
+
+ tbody .alt td {}
+ tbody .alt th {}
+
+ /* Tfoot */
+ tfoot th {}
+ tfoot td {}
+
+/* HTML5 tags */
+header, section, footer,
+aside, nav, article, figure {
+ display: block;
+}
+
+/***** Layout *****/
+.body {clear: both; margin: 0; /*! *//*! */text-align: left;padding: 2em;}
+img.right, figure.right {float: right; margin: 0 0 2em 2em;}
+img.left, figure.left {float: left; margin: 0 2em 2em 0;}
+
+/*
+ Header
+*****************/
+#banner {
+ /*! */
+ /*! */
+ padding: 1em 0;
+}
+
+ /* Banner */
+ #banner h1 {font-size: 3.571em; /*! */}
+ #banner h1 a:link, #banner h1 a:visited {
+ color: #000305;
+ display: block;
+ font-weight: bold;
+ /*! margin: 0 0 .6em .2em; */
+ text-decoration: none;
+ }
+ #banner h1 a:hover, #banner h1 a:active {
+ background: none;
+ color: #C74350;
+ text-shadow: none;
+ }
+
+ #banner h1 strong {font-size: 0.36em; font-weight: normal;}
+
+ /* Main Nav */
+ #banner nav {
+ background: #000305;
+ font-size: 1.143em;
+ /*! */
+ line-height: 30px;
+ /*! margin: 0 auto 2em auto; */
+ /*! padding: 0; */
+ /*! text-align: center; */
+ /*! max-width: 800px; */
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
+
+ #banner nav ul {list-style: none; /*! margin: 0 auto; */ /*! */}
+ #banner nav li {/*! float: left; */ display: inline; margin: 0;}
+
+ #banner nav a:link, #banner nav a:visited {
+ color: #fff;
+ display: inline-block;
+ /*! */
+ padding: 5px 1.5em;
+ text-decoration: none;
+ }
+ #banner nav a:hover, #banner nav a:active,
+ #banner nav .active a:link, #banner nav .active a:visited {
+ background: #C74451;
+ color: #fff;
+ text-shadow: none !important;
+ }
+
+ #banner nav li:first-child a {
+ border-top-left-radius: 5px;
+ -moz-border-radius-topleft: 5px;
+ -webkit-border-top-left-radius: 5px;
+
+ border-bottom-left-radius: 5px;
+ -moz-border-radius-bottomleft: 5px;
+ -webkit-border-bottom-left-radius: 5px;
+ }
+
+/*
+ Featured
+*****************/
+#featured {
+ background: #fff;
+ margin-bottom: 2em;
+ overflow: hidden;
+ padding: 20px;
+ width: 760px;
+
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+#featured figure {
+ border: 2px solid #eee;
+ float: right;
+ margin: 0.786em 2em 0 5em;
+ width: 248px;
+}
+#featured figure img {display: block; float: right;}
+
+#featured h2 {color: #C74451; font-size: 1.714em; margin-bottom: 0.333em;}
+#featured h3 {font-size: 1.429em; margin-bottom: .5em;}
+
+#featured h3 a:link, #featured h3 a:visited {color: #000305; text-decoration: none;}
+#featured h3 a:hover, #featured h3 a:active {color: #fff;}
+
+/*
+ Body
+*****************/
+#content {
+ background: #fff;
+ /*! */
+ /*! */
+ /*! */
+ /*! */
+
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+#content img {
+ padding: 1em;
+}
+
+/* #content h1, #content h2, #content p, #content img {
+ padding: 0 20px;
+} */
+
+/*
+ Extras
+*****************/
+#extras {/*! margin: 0 auto 3em auto; */ overflow: hidden;}
+
+#extras ul {list-style: none; margin: 0;}
+#extras li {border-bottom: 1px solid #fff;}
+#extras h2 {
+ color: #C74350;
+ font-size: 1.429em;
+ margin-bottom: .25em;
+ padding: 0 3px;
+}
+
+#extras a:link, #extras a:visited {
+ color: #444;
+ display: block;
+ border-bottom: 1px solid #F4E3E3;
+ text-decoration: none;
+ padding: .3em .25em;
+}
+
+#extras a:hover, #extras a:active {color: #fff;}
+
+ /* Blogroll */
+ #extras .blogroll {
+ float: left;
+ width: 615px;
+ }
+
+ #extras .blogroll li {float: left; margin: 0 20px 0 0; width: 185px;}
+
+ /* Social */
+ #extras .social {
+ float: right;
+ width: 175px;
+ }
+
+ #extras div[class='social'] a {
+ background-repeat: no-repeat;
+ background-position: 3px 6px;
+ padding-left: 25px;
+ }
+
+ /* Icons */
+ .social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
+ .social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
+ .social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
+ .social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
+ .social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
+ .social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
+ .social a[href*='github.com'],
+ .social a[href*='git.io'] {
+ background-image: url('../images/icons/github.png');
+ background-size: 16px 16px;
+ }
+ .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
+ .social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
+ .social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
+ .social a[href*='news.ycombinator.com'],
+ .social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
+ .social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
+ .social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
+ .social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
+ .social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
+ .social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
+ .social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
+ .social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
+ .social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
+ .social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
+ .social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
+
+/*
+ About
+*****************/
+#about {
+ background: #fff;
+ font-style: normal;
+ /*! margin-bottom: 2em; */
+ /*! overflow: hidden; */
+ padding: 1em 2em;
+ text-align: left;
+ /*! width: 760px; */
+
+ border-radius: 10px;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+}
+
+#about .primary {float: left; width: 165px;}
+#about .primary strong {color: #C64350; display: block; font-size: 1.286em;}
+#about .photo {float: left; margin: 5px 20px;}
+
+#about .url:link, #about .url:visited {text-decoration: none;}
+
+#about .bio {float: right; width: 500px;}
+
+/*
+ Footer
+*****************/
+#contentinfo {/*! padding-bottom: 2em; */ text-align: right;padding: 0;}
+
+/***** Sections *****/
+/* Blog */
+.hentry {
+ display: block;
+ clear: both;
+ border-bottom: 1px solid #eee;
+ padding: 1.5em 0;
+}
+li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
+#content > .hentry {padding: 1em 0;}
+.hentry img{display : none ;}
+.entry-title {font-size: 3em; /*! margin-bottom: 10px; */ /*! margin-top: 0; */}
+.entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
+.entry-title a:visited {background-color: #fff;}
+
+.hentry .post-info * {font-style: normal;}
+
+ /* Content */
+ .hentry footer {margin-bottom: 2em;}
+ .hentry footer address {display: inline;}
+ #posts-list footer address {display: block;}
+
+ /* Blog Index */
+ #posts-list {list-style: none; margin: 0;}
+ #posts-list .hentry {padding-left: 10px; position: relative;}
+
+ #posts-list footer {
+ left: 10px;
+ position: relative;
+ float: left;
+ top: 0.5em;
+ width: 190px;
+ }
+
+ /* About the Author */
+ #about-author {
+ background: #f9f9f9;
+ clear: both;
+ font-style: normal;
+ margin: 2em 0;
+ padding: 10px 20px 15px 20px;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
+
+ #about-author strong {
+ color: #C64350;
+ clear: both;
+ display: block;
+ font-size: 1.429em;
+ }
+
+ #about-author .photo {border: 1px solid #ddd; float: left; margin: 5px 1em 0 0;}
+
+ /* Comments */
+ #comments-list {list-style: none; margin: 0 1em;}
+ #comments-list blockquote {
+ background: #f8f8f8;
+ clear: both;
+ font-style: normal;
+ margin: 0;
+ padding: 15px 20px;
+
+ border-radius: 5px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ }
+ #comments-list footer {color: #888; padding: .5em 1em 0 0; text-align: right;}
+
+ #comments-list li:nth-child(2n) blockquote {background: #F5f5f5;}
+
+ /* Add a Comment */
+ #add-comment label {clear: left; float: left; text-align: left; width: 150px;}
+ #add-comment input[type='text'],
+ #add-comment input[type='email'],
+ #add-comment input[type='url'] {float: left; width: 200px;}
+
+ #add-comment textarea {float: left; height: 150px; width: 495px;}
+
+ #add-comment p.req {clear: both; margin: 0 .5em 1em 0; text-align: right;}
+
+ #add-comment input[type='submit'] {float: right; margin: 0 .5em;}
+ #add-comment * {margin-bottom: .5em;}
+
+html {
+ text-align: center;
+}
+
+footer {
+ padding: 0;
+}
+
+@media screen and (max-width:500px) {
+
+ #banner nav li {
+ display: block;
+ /*! margin: 0; */
+ border-radius: 0;
+ text-align: center;
+ }
+
+ #banner nav {
+ border-radius: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ }
+
+ body {
+ width: 100%;
+ }
+
+ #banner nav li:first-child a {
+ border-radius: 0;
+ }
+
+ #banner nav li a {
+ width: ;
+ }
+
+ #banner h1 {
+ text-align: center;
+ }
+
+ footer p {
+ padding: 0 2em;
+ text-align: center;
+ }
+}
diff --git a/website/themes/notmyidea/static/css/pygment.css b/website/themes/notmyidea/static/css/pygment.css
new file mode 100644
index 0000000000000000000000000000000000000000..fdd056f6f8bbe4f98bb887d7d427b1f9d03acde8
--- /dev/null
+++ b/website/themes/notmyidea/static/css/pygment.css
@@ -0,0 +1,205 @@
+.hll {
+background-color:#eee;
+}
+.c {
+color:#408090;
+font-style:italic;
+}
+.err {
+border:1px solid #FF0000;
+}
+.k {
+color:#007020;
+font-weight:bold;
+}
+.o {
+color:#666666;
+}
+.cm {
+color:#408090;
+font-style:italic;
+}
+.cp {
+color:#007020;
+}
+.c1 {
+color:#408090;
+font-style:italic;
+}
+.cs {
+background-color:#FFF0F0;
+color:#408090;
+}
+.gd {
+color:#A00000;
+}
+.ge {
+font-style:italic;
+}
+.gr {
+color:#FF0000;
+}
+.gh {
+color:#000080;
+font-weight:bold;
+}
+.gi {
+color:#00A000;
+}
+.go {
+color:#303030;
+}
+.gp {
+color:#C65D09;
+font-weight:bold;
+}
+.gs {
+font-weight:bold;
+}
+.gu {
+color:#800080;
+font-weight:bold;
+}
+.gt {
+color:#0040D0;
+}
+.kc {
+color:#007020;
+font-weight:bold;
+}
+.kd {
+color:#007020;
+font-weight:bold;
+}
+.kn {
+color:#007020;
+font-weight:bold;
+}
+.kp {
+color:#007020;
+}
+.kr {
+color:#007020;
+font-weight:bold;
+}
+.kt {
+color:#902000;
+}
+.m {
+color:#208050;
+}
+.s {
+color:#4070A0;
+}
+.na {
+color:#4070A0;
+}
+.nb {
+color:#007020;
+}
+.nc {
+color:#0E84B5;
+font-weight:bold;
+}
+.no {
+color:#60ADD5;
+}
+.nd {
+color:#555555;
+font-weight:bold;
+}
+.ni {
+color:#D55537;
+font-weight:bold;
+}
+.ne {
+color:#007020;
+}
+.nf {
+color:#06287E;
+}
+.nl {
+color:#002070;
+font-weight:bold;
+}
+.nn {
+color:#0E84B5;
+font-weight:bold;
+}
+.nt {
+color:#062873;
+font-weight:bold;
+}
+.nv {
+color:#BB60D5;
+}
+.ow {
+color:#007020;
+font-weight:bold;
+}
+.w {
+color:#BBBBBB;
+}
+.mf {
+color:#208050;
+}
+.mh {
+color:#208050;
+}
+.mi {
+color:#208050;
+}
+.mo {
+color:#208050;
+}
+.sb {
+color:#4070A0;
+}
+.sc {
+color:#4070A0;
+}
+.sd {
+color:#4070A0;
+font-style:italic;
+}
+.s2 {
+color:#4070A0;
+}
+.se {
+color:#4070A0;
+font-weight:bold;
+}
+.sh {
+color:#4070A0;
+}
+.si {
+color:#70A0D0;
+font-style:italic;
+}
+.sx {
+color:#C65D09;
+}
+.sr {
+color:#235388;
+}
+.s1 {
+color:#4070A0;
+}
+.ss {
+color:#517918;
+}
+.bp {
+color:#007020;
+}
+.vc {
+color:#BB60D5;
+}
+.vg {
+color:#BB60D5;
+}
+.vi {
+color:#BB60D5;
+}
+.il {
+color:#208050;
+}
diff --git a/website/themes/notmyidea/static/css/reset.css b/website/themes/notmyidea/static/css/reset.css
new file mode 100644
index 0000000000000000000000000000000000000000..1e217566acc77f4b4aa491e92b69806b5d71f950
--- /dev/null
+++ b/website/themes/notmyidea/static/css/reset.css
@@ -0,0 +1,52 @@
+/*
+ Name: Reset Stylesheet
+ Description: Resets browser's default CSS
+ Author: Eric Meyer
+ Author URI: http://meyerweb.com/eric/tools/css/reset/
+*/
+
+/* v1.0 | 20080212 */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+ background: transparent;
+ border: 0;
+ font-size: 100%;
+ margin: 0;
+ outline: 0;
+ padding: 0;
+ vertical-align: baseline;
+}
+
+body {line-height: 1;}
+
+ol, ul {list-style: none;}
+
+blockquote, q {quotes: none;}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+ content: '';
+ content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+ outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {text-decoration: none;}
+del {text-decoration: line-through;}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
\ No newline at end of file
diff --git a/website/themes/notmyidea/static/css/typogrify.css b/website/themes/notmyidea/static/css/typogrify.css
new file mode 100644
index 0000000000000000000000000000000000000000..c9b34dc8a8754da5a484932fbfe976ff60bdca3f
--- /dev/null
+++ b/website/themes/notmyidea/static/css/typogrify.css
@@ -0,0 +1,3 @@
+.caps {font-size:.92em;}
+.amp {color:#666; font-size:1.05em;font-family:"Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua",serif; font-style:italic;}
+.dquo {margin-left:-.38em;}
diff --git a/website/themes/notmyidea/static/css/wide.css b/website/themes/notmyidea/static/css/wide.css
new file mode 100644
index 0000000000000000000000000000000000000000..88fd59ceb7d5c6bbfc989d3a5e9cb4df3cdfb80b
--- /dev/null
+++ b/website/themes/notmyidea/static/css/wide.css
@@ -0,0 +1,48 @@
+@import url("main.css");
+
+body {
+ font:1.3em/1.3 "Hoefler Text","Georgia",Georgia,serif,sans-serif;
+}
+
+.post-info{
+ display: none;
+}
+
+#banner nav {
+ display: none;
+ -moz-border-radius: 0px;
+ margin-bottom: 20px;
+ overflow: hidden;
+ font-size: 1em;
+ background: #F5F4EF;
+}
+
+#banner nav ul{
+ padding-right: 50px;
+}
+
+#banner nav li{
+ float: right;
+ color: #000;
+}
+
+#banner nav li a {
+ color: #000;
+}
+
+#banner h1 {
+ margin-bottom: -18px;
+}
+
+#featured, #extras {
+ padding: 50px;
+}
+
+#featured {
+ padding-top: 20px;
+}
+
+#extras {
+ padding-top: 0px;
+ padding-bottom: 0px;
+}
diff --git a/website/themes/notmyidea/static/images/icons/aboutme.png b/website/themes/notmyidea/static/images/icons/aboutme.png
new file mode 100644
index 0000000000000000000000000000000000000000..9609df3bd9d766cd4b827fb0a8339b700c1abf24
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/aboutme.png differ
diff --git a/website/themes/notmyidea/static/images/icons/bitbucket.png b/website/themes/notmyidea/static/images/icons/bitbucket.png
new file mode 100644
index 0000000000000000000000000000000000000000..d05ba1610eab6ec3f9a4dcae689d4d88bda5433f
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/bitbucket.png differ
diff --git a/website/themes/notmyidea/static/images/icons/delicious.png b/website/themes/notmyidea/static/images/icons/delicious.png
new file mode 100644
index 0000000000000000000000000000000000000000..3dccdd848ec99fba9950e8195d4e73867ada2738
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/delicious.png differ
diff --git a/website/themes/notmyidea/static/images/icons/facebook.png b/website/themes/notmyidea/static/images/icons/facebook.png
new file mode 100644
index 0000000000000000000000000000000000000000..74e7ad52f362b56d584df459bc5141395c32b7ed
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/facebook.png differ
diff --git a/website/themes/notmyidea/static/images/icons/github.png b/website/themes/notmyidea/static/images/icons/github.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b25551a97921681334176ee143b41510a117d86
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/github.png differ
diff --git a/website/themes/notmyidea/static/images/icons/gitorious.png b/website/themes/notmyidea/static/images/icons/gitorious.png
new file mode 100644
index 0000000000000000000000000000000000000000..3eeb3ecec36a73ff505e04ecdecbcc4792ef6786
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/gitorious.png differ
diff --git a/website/themes/notmyidea/static/images/icons/gittip.png b/website/themes/notmyidea/static/images/icons/gittip.png
new file mode 100644
index 0000000000000000000000000000000000000000..af949625ac83d2441215c81650e897c97d9e5d95
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/gittip.png differ
diff --git a/website/themes/notmyidea/static/images/icons/google-groups.png b/website/themes/notmyidea/static/images/icons/google-groups.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de15e68f4d1e4176b46fe6346d42f53e3296b21
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/google-groups.png differ
diff --git a/website/themes/notmyidea/static/images/icons/google-plus.png b/website/themes/notmyidea/static/images/icons/google-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c6b74324031611f20c0a3810131aa74fd0a5a9f
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/google-plus.png differ
diff --git a/website/themes/notmyidea/static/images/icons/hackernews.png b/website/themes/notmyidea/static/images/icons/hackernews.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc7a82d4d68068d5fb032885b93e670c385ae1b4
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/hackernews.png differ
diff --git a/website/themes/notmyidea/static/images/icons/lastfm.png b/website/themes/notmyidea/static/images/icons/lastfm.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a6c6262b644dadbcf6cce5dfe4fed9740a9ec1f
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/lastfm.png differ
diff --git a/website/themes/notmyidea/static/images/icons/linkedin.png b/website/themes/notmyidea/static/images/icons/linkedin.png
new file mode 100644
index 0000000000000000000000000000000000000000..d29c1201bcb0c278d49f573f9ef95ebfe932fb5b
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/linkedin.png differ
diff --git a/website/themes/notmyidea/static/images/icons/reddit.png b/website/themes/notmyidea/static/images/icons/reddit.png
new file mode 100644
index 0000000000000000000000000000000000000000..71ae1215ac8ea274f089cc4aa55eaf8a546dea67
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/reddit.png differ
diff --git a/website/themes/notmyidea/static/images/icons/rss.png b/website/themes/notmyidea/static/images/icons/rss.png
new file mode 100644
index 0000000000000000000000000000000000000000..7862c65afeb66ba9cc7e9576a3a62b850b2e184d
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/rss.png differ
diff --git a/website/themes/notmyidea/static/images/icons/slideshare.png b/website/themes/notmyidea/static/images/icons/slideshare.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecc97410138bb3c457a898b1e868b22ae9db9989
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/slideshare.png differ
diff --git a/website/themes/notmyidea/static/images/icons/speakerdeck.png b/website/themes/notmyidea/static/images/icons/speakerdeck.png
new file mode 100644
index 0000000000000000000000000000000000000000..087d0931caa301f8a1bba1497e1b91b7a7f105a4
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/speakerdeck.png differ
diff --git a/website/themes/notmyidea/static/images/icons/stackoverflow.png b/website/themes/notmyidea/static/images/icons/stackoverflow.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b65e9990dbf423ff652b297f1d0172c8c1cf27
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/stackoverflow.png differ
diff --git a/website/themes/notmyidea/static/images/icons/twitter.png b/website/themes/notmyidea/static/images/icons/twitter.png
new file mode 100644
index 0000000000000000000000000000000000000000..057ab004b5d826e151a4f9cc6a66d88caffa8911
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/twitter.png differ
diff --git a/website/themes/notmyidea/static/images/icons/vimeo.png b/website/themes/notmyidea/static/images/icons/vimeo.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba472022f0fcf7ecdd8f4847a8a3bde90789bc7
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/vimeo.png differ
diff --git a/website/themes/notmyidea/static/images/icons/youtube.png b/website/themes/notmyidea/static/images/icons/youtube.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce6cbe4fdaf6e7dff56c0418a19bd1466a40a02e
Binary files /dev/null and b/website/themes/notmyidea/static/images/icons/youtube.png differ
diff --git a/website/themes/notmyidea/templates/analytics.html b/website/themes/notmyidea/templates/analytics.html
new file mode 100644
index 0000000000000000000000000000000000000000..465754e2836db4f7f1251743d3e1852697ab69cd
--- /dev/null
+++ b/website/themes/notmyidea/templates/analytics.html
@@ -0,0 +1,46 @@
+{% if GOOGLE_ANALYTICS %}
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', '{{GOOGLE_ANALYTICS}}']);
+ _gaq.push(['_trackPageview']);
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = 'https://ssl.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+ </script>
+{% endif %}
+{% if GAUGES %}
+ <script type="text/javascript">
+ var _gauges = _gauges || [];
+ (function() {
+ var t = document.createElement('script');
+ t.type = 'text/javascript';
+ t.async = true;
+ t.id = 'gauges-tracker';
+ t.setAttribute('data-site-id', '{{GAUGES}}');
+ t.src = '//secure.gaug.es/track.js';
+ var s = document.getElementsByTagName('script')[0];
+ s.parentNode.insertBefore(t, s);
+ })();
+ </script>
+{% endif %}
+{% if PIWIK_URL and PIWIK_SITE_ID %}
+ <script type="text/javascript">
+ {% if PIWIK_SSL_URL %}
+ var pkBaseURL = "{{ PIWIK_SSL_URL }}";
+ {% else %}
+ var pkBaseURL = "{{ PIWIK_URL }}";
+ {% endif %}
+ var _paq = _paq || [];
+ _paq.push(["trackPageView"]);
+ _paq.push(["enableLinkTracking"]);
+ (function() {
+ var u=(("https:" == document.location.protocol) ? "https" : "http")+"://"+pkBaseURL+"/";
+ _paq.push(["setTrackerUrl", u+"piwik.php"]);
+ _paq.push(["setSiteId", "{{ PIWIK_SITE_ID }}"]);
+ var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+ g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+ })();
+ </script>
+{% endif %}
diff --git a/website/themes/notmyidea/templates/archives.html b/website/themes/notmyidea/templates/archives.html
new file mode 100644
index 0000000000000000000000000000000000000000..f6784942f45a5dc81b7cf4da3148d90009470b77
--- /dev/null
+++ b/website/themes/notmyidea/templates/archives.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block content %}
+<section id="content" class="body">
+<h1>Archives for {{ SITENAME }}</h1>
+
+<dl>
+{% for article in dates %}
+ <dt>{{ article.locale_date }}</dt>
+ <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+</section>
+{% endblock %}
diff --git a/website/themes/notmyidea/templates/article.html b/website/themes/notmyidea/templates/article.html
new file mode 100644
index 0000000000000000000000000000000000000000..06110b4312142d12bddf3ce098df6d576a861ef9
--- /dev/null
+++ b/website/themes/notmyidea/templates/article.html
@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+{% block title %}{{ article.title|striptags }}{% endblock %}
+{% block content %}
+<section id="content" class="body">
+ <article>
+ <header>
+ <h1 class="entry-title">
+ <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+ title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
+ {% include 'twitter.html' %}
+ </header>
+
+ <div class="entry-content">
+ {% include 'article_infos.html' %}
+ {{ article.content }}
+ </div><!-- /.entry-content -->
+ {% if DISQUS_SITENAME and SITEURL and article.status != "draft" %}
+ <div class="comments">
+ <h2>Comments !</h2>
+ <div id="disqus_thread"></div>
+ <script type="text/javascript">
+ var disqus_shortname = '{{ DISQUS_SITENAME }}';
+ var disqus_identifier = '{{ article.url }}';
+ var disqus_url = '{{ SITEURL }}/{{ article.url }}';
+ (function() {
+ var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+ dsq.src = '//{{ DISQUS_SITENAME }}.disqus.com/embed.js';
+ (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+ })();
+ </script>
+ <noscript>Please enable JavaScript to view the comments.</noscript>
+ </div>
+ {% endif %}
+
+ </article>
+</section>
+{% endblock %}
diff --git a/website/themes/notmyidea/templates/article_infos.html b/website/themes/notmyidea/templates/article_infos.html
new file mode 100644
index 0000000000000000000000000000000000000000..172ad85dd748cad2c5ed9af2914163ad16004f10
--- /dev/null
+++ b/website/themes/notmyidea/templates/article_infos.html
@@ -0,0 +1,23 @@
+<footer class="post-info">
+ <abbr class="published" title="{{ article.date.isoformat() }}">
+ Published: {{ article.locale_date }}
+ </abbr>
+ {% if article.modified %}
+ <br />
+ <abbr class="modified" title="{{ article.modified.isoformat() }}">
+ Updated: {{ article.locale_modified }}
+ </abbr>
+ {% endif %}
+
+ {% if article.authors %}
+ <address class="vcard author">
+ By {% for author in article.authors %}
+ <a class="url fn" href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a>
+ {% endfor %}
+ </address>
+ {% endif %}
+<p>In <a href="{{ SITEURL }}/{{ article.category.url }}">{{ article.category }}</a>.</p>
+{% include 'taglist.html' %}
+{% import 'translations.html' as translations with context %}
+{{ translations.translations_for(article) }}
+</footer><!-- /.post-info -->
diff --git a/website/themes/notmyidea/templates/author.html b/website/themes/notmyidea/templates/author.html
new file mode 100644
index 0000000000000000000000000000000000000000..0b372902d5552cb93a0eed266b6fd851f63bd1be
--- /dev/null
+++ b/website/themes/notmyidea/templates/author.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ author }}{% endblock %}
diff --git a/website/themes/notmyidea/templates/authors.html b/website/themes/notmyidea/templates/authors.html
new file mode 100644
index 0000000000000000000000000000000000000000..e61a332f1e6dfe570b18658b37019141906818ea
--- /dev/null
+++ b/website/themes/notmyidea/templates/authors.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Authors{% endblock %}
+
+{% block content %}
+
+<section id="content" class="body">
+ <h1>Authors on {{ SITENAME }}</h1>
+ <ul>
+ {% for author, articles in authors|sort %}
+ <li><a href="{{ SITEURL }}/{{ author.url }}">{{ author }}</a> ({{ articles|count }})</li>
+ {% endfor %}
+ </ul>
+</section>
+
+{% endblock %}
diff --git a/website/themes/notmyidea/templates/base.html b/website/themes/notmyidea/templates/base.html
new file mode 100644
index 0000000000000000000000000000000000000000..edbb83ffb8855cd6b31e9ad04fb8752ba24820c3
--- /dev/null
+++ b/website/themes/notmyidea/templates/base.html
@@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html lang="{{ DEFAULT_LANG }}">
+<head>
+ <meta charset="utf-8" />
+ <title>{% block title %}{{ SITENAME }}{%endblock%}</title>
+ <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/css/{{ CSS_FILE }}" />
+ {% if FEED_ALL_ATOM %}
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate" title="{{ SITENAME }} Atom Feed" />
+ {% endif %}
+ {% if FEED_ALL_RSS %}
+ <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS Feed" />
+ {% endif %}
+
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+
+ <!--[if IE]>
+ <script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
+</head>
+
+<body id="index" class="home">
+{% include 'github.html' %}
+ <header id="banner" class="body">
+ <h1><a href="{{ SITEURL }}/">{{ SITENAME }} {% if SITESUBTITLE %} <strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1>
+ <nav><ul>
+ {% for title, link in MENUITEMS %}
+ <li><a href="{{ link }}">{{ title }}</a></li>
+ {% endfor %}
+ {% if DISPLAY_PAGES_ON_MENU -%}
+ {% for pg in PAGES %}
+ <li{% if pg == page %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ pg.url }}">{{ pg.title }}</a></li>
+ {% endfor %}
+ {% endif %}
+ {% if DISPLAY_CATEGORIES_ON_MENU -%}
+ {% for cat, null in categories %}
+ <li{% if cat == category %} class="active"{% endif %}><a href="{{ SITEURL }}/{{ cat.url }}">{{ cat }}</a></li>
+ {% endfor %}
+ {% endif %}
+ </ul></nav>
+ </header><!-- /#banner -->
+ {% block content %}
+ {% endblock %}
+ <section id="extras" class="body">
+ {% if LINKS %}
+ <div class="blogroll">
+ <h2>blogroll</h2>
+ <ul>
+ {% for name, link in LINKS %}
+ <li><a href="{{ link }}">{{ name }}</a></li>
+ {% endfor %}
+ </ul>
+ </div><!-- /.blogroll -->
+ {% endif %}
+ {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
+ <div class="social">
+ <h2>social</h2>
+ <ul>
+ {% if FEED_ALL_ATOM %}
+ <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_ATOM }}" type="application/atom+xml" rel="alternate">atom feed</a></li>
+ {% endif %}
+ {% if FEED_ALL_RSS %}
+ <li><a href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate">rss feed</a></li>
+ {% endif %}
+
+ {% for name, link in SOCIAL %}
+ <li><a href="{{ link }}">{{ name }}</a></li>
+ {% endfor %}
+ </ul>
+ </div><!-- /.social -->
+ {% endif %}
+ </section><!-- /#extras -->
+
+ <footer id="contentinfo" class="body">
+ <div id="about" class="vcard">
+ Proudly powered by <a href="http://getpelican.com/">Pelican</a>, which takes great advantage of <a href="http://python.org">Python</a>.
+ </div><!-- /#about -->
+
+ <p>The theme is by <a href="http://coding.smashingmagazine.com/2009/08/04/designing-a-html-5-layout-from-scratch/">Smashing Magazine</a>, thanks!</p>
+ </footer><!-- /#contentinfo -->
+
+{% include 'analytics.html' %}
+{% include 'disqus_script.html' %}
+</body>
+</html>
diff --git a/website/themes/notmyidea/templates/category.html b/website/themes/notmyidea/templates/category.html
new file mode 100644
index 0000000000000000000000000000000000000000..56f8e93e949d635765ff09cdd9a1c7e9209676a9
--- /dev/null
+++ b/website/themes/notmyidea/templates/category.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ category }}{% endblock %}
diff --git a/website/themes/notmyidea/templates/comments.html b/website/themes/notmyidea/templates/comments.html
new file mode 100644
index 0000000000000000000000000000000000000000..bb033c0f4baeae5d2b32851548f9a1d11f55952b
--- /dev/null
+++ b/website/themes/notmyidea/templates/comments.html
@@ -0,0 +1 @@
+{% if DISQUS_SITENAME %}<p>There are <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">comments</a>.</p>{% endif %}
diff --git a/website/themes/notmyidea/templates/disqus_script.html b/website/themes/notmyidea/templates/disqus_script.html
new file mode 100644
index 0000000000000000000000000000000000000000..23ec532a9bf73ea07bbf3b50a7b604483368744d
--- /dev/null
+++ b/website/themes/notmyidea/templates/disqus_script.html
@@ -0,0 +1,11 @@
+{% if DISQUS_SITENAME %}
+<script type="text/javascript">
+ var disqus_shortname = '{{ DISQUS_SITENAME }}';
+ (function () {
+ var s = document.createElement('script'); s.async = true;
+ s.type = 'text/javascript';
+ s.src = 'https://' + disqus_shortname + '.disqus.com/count.js';
+ (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+ }());
+</script>
+{% endif %}
diff --git a/website/themes/notmyidea/templates/github.html b/website/themes/notmyidea/templates/github.html
new file mode 100644
index 0000000000000000000000000000000000000000..ccc401fe6ee9ec671d062ce59f6f1f53b45c097e
--- /dev/null
+++ b/website/themes/notmyidea/templates/github.html
@@ -0,0 +1,9 @@
+{% if GITHUB_URL %}
+<a href="{{ GITHUB_URL }}">
+{% if GITHUB_POSITION != "left" %}
+<img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_red_aa0000.png" alt="Fork me on GitHub" />
+{% else %}
+<img style="position: absolute; top: 0; left: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_left_white_ffffff.png" alt="Fork me on GitHub" />
+{% endif %}
+</a>
+{% endif %}
diff --git a/website/themes/notmyidea/templates/index.html b/website/themes/notmyidea/templates/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..6019987becb4047ed0f838fb26f3214f2f7bd99c
--- /dev/null
+++ b/website/themes/notmyidea/templates/index.html
@@ -0,0 +1,59 @@
+{% extends "base.html" %}
+{% block content_title %}{% endblock %}
+{% block content %}
+{% if articles %}
+ {% for article in articles_page.object_list %}
+
+ {# First item #}
+ {% if loop.first and not articles_page.has_previous() %}
+ <aside id="featured" class="body">
+ <article>
+ <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
+ {% include 'article_infos.html' %}{{ article.content }}{% include 'comments.html' %}
+ </article>
+ </aside><!-- /#featured -->
+ {% if loop.length > 1 %}
+ <section id="content" class="body">
+ <h1>Other articles</h1>
+ <hr />
+ <ol id="posts-list" class="hfeed">
+ {% endif %}
+ {# other items #}
+ {% else %}
+ {% if loop.first %}
+ <section id="content" class="body">
+ <ol id="posts-list" class="hfeed" start="{{ articles_paginator.per_page -1 }}">
+ {% endif %}
+ <li><article class="hentry">
+ <header>
+ <h1><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark"
+ title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h1>
+ </header>
+
+ <div class="entry-content">
+ {% include 'article_infos.html' %}
+ {{ article.summary }}
+ <a class="readmore" href="{{ SITEURL }}/{{ article.url }}">read more</a>
+ {% include 'comments.html' %}
+ </div><!-- /.entry-content -->
+ </article></li>
+ {% endif %}
+ {% if loop.last %}
+ {% if loop.length > 1 or articles_page.has_other_pages() %}
+ </ol><!-- /#posts-list -->
+ {% if articles_page.has_other_pages() %}
+ {% include 'pagination.html' %}
+ {% endif %}
+ </section><!-- /#content -->
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+{% else %}
+<section id="content" class="body">
+<h2>Pages</h2>
+ {% for page in PAGES %}
+ <li><a href="{{ SITEURL }}/{{ page.url }}">{{ page.title }}</a></li>
+ {% endfor %}
+</section>
+{% endif %}
+{% endblock content %}
diff --git a/website/themes/notmyidea/templates/page.html b/website/themes/notmyidea/templates/page.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d8283fe4fd88e565e47f87d8a1532a771c0afda
--- /dev/null
+++ b/website/themes/notmyidea/templates/page.html
@@ -0,0 +1,10 @@
+{% extends "base.html" %}
+{% block title %}{{ page.title }}{% endblock %}
+{% block content %}
+<section id="content" class="body">
+ <h1 class="entry-title">{{ page.title }}</h1>
+ {% import 'translations.html' as translations with context %}
+ {{ translations.translations_for(page) }}
+ {{ page.content }}
+</section>
+{% endblock %}
diff --git a/website/themes/notmyidea/templates/period_archives.html b/website/themes/notmyidea/templates/period_archives.html
new file mode 100644
index 0000000000000000000000000000000000000000..252e002f59466d940a4203354c294a57ec82b7b7
--- /dev/null
+++ b/website/themes/notmyidea/templates/period_archives.html
@@ -0,0 +1,13 @@
+{% extends "base.html" %}
+{% block content %}
+<section id="content" class="body">
+<h1>Archives for {{ period | reverse | join(' ') }}</h1>
+
+<dl>
+{% for article in dates %}
+ <dt>{{ article.locale_date }}</dt>
+ <dd><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></dd>
+{% endfor %}
+</dl>
+</section>
+{% endblock %}
diff --git a/website/themes/notmyidea/templates/tag.html b/website/themes/notmyidea/templates/tag.html
new file mode 100644
index 0000000000000000000000000000000000000000..68cdcba652b9621a24990b45ec734c859914355f
--- /dev/null
+++ b/website/themes/notmyidea/templates/tag.html
@@ -0,0 +1,2 @@
+{% extends "index.html" %}
+{% block title %}{{ SITENAME }} - {{ tag }}{% endblock %}
diff --git a/website/themes/notmyidea/templates/taglist.html b/website/themes/notmyidea/templates/taglist.html
new file mode 100644
index 0000000000000000000000000000000000000000..58f3557638746dc3bbdc75b1c9d55bf7d16892ce
--- /dev/null
+++ b/website/themes/notmyidea/templates/taglist.html
@@ -0,0 +1 @@
+{% if article.tags %}<p>tags: {% for tag in article.tags %}<a href="{{ SITEURL }}/{{ tag.url }}">{{ tag | escape }}</a> {% endfor %}</p>{% endif %}
diff --git a/website/themes/notmyidea/templates/tags.html b/website/themes/notmyidea/templates/tags.html
new file mode 100644
index 0000000000000000000000000000000000000000..fb099557b9747514c90984b8d12a847a4b72fb50
--- /dev/null
+++ b/website/themes/notmyidea/templates/tags.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+
+{% block title %}{{ SITENAME }} - Tags{% endblock %}
+
+{% block content %}
+
+<section id="content" class="body">
+ <h1>Tags for {{ SITENAME }}</h1>
+ <ul>
+ {% for tag, articles in tags|sort %}
+ <li><a href="{{ SITEURL }}/{{ tag.url }}">{{ tag }}</a> ({{ articles|count }})</li>
+ {% endfor %}
+ </ul>
+</section>
+
+{% endblock %}
diff --git a/website/themes/notmyidea/templates/translations.html b/website/themes/notmyidea/templates/translations.html
new file mode 100644
index 0000000000000000000000000000000000000000..7894bb07194c57c3debc2559d2948db79963020a
--- /dev/null
+++ b/website/themes/notmyidea/templates/translations.html
@@ -0,0 +1,8 @@
+{% macro translations_for(article) %}
+{% if article.translations %}
+Translations:
+ {% for translation in article.translations %}
+ <a href="{{ SITEURL }}/{{ translation.url }}">{{ translation.lang }}</a>
+ {% endfor %}
+{% endif %}
+{% endmacro %}
diff --git a/website/themes/notmyidea/templates/twitter.html b/website/themes/notmyidea/templates/twitter.html
new file mode 100644
index 0000000000000000000000000000000000000000..bf78c32dc3043523e9774a90f9cf8e76d218cb9c
--- /dev/null
+++ b/website/themes/notmyidea/templates/twitter.html
@@ -0,0 +1,3 @@
+{% if TWITTER_USERNAME %}
+<a href="https://twitter.com/share" class="twitter-share-button" data-count="horizontal" data-via="{{TWITTER_USERNAME}}">Tweet</a><script type="text/javascript" src="https://platform.twitter.com/widgets.js"></script>
+{% endif %}